tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-09 06:54:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

[NEW] Add new API NPPM_GETCURRENTVIEW.

Browse Source 
Add new capacity in existent API NPPM_GETMENUHANDLE.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1028 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2013-03-03 01:04:09 +00:00
parent f98e5fd8ad
commit d6ea29c577
5 changed files with 80 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
View File

@ -42,7 +42,6 @@ enum LangType {L_TEXT, L_PHP , L_C, L_CPP, L_CS, L_OBJC, L_JAVA, L_RC,\
enum winVer{WV_UNKNOWN, WV_WIN32S, WV_95, WV_98, WV_ME, WV_NT, WV_W2K, WV_XP, WV_S2003, WV_XPX64, WV_VISTA, WV_WIN7, WV_WIN8}; enum winVer{WV_UNKNOWN, WV_WIN32S, WV_95, WV_98, WV_ME, WV_NT, WV_W2K, WV_XP, WV_S2003, WV_XPX64, WV_VISTA, WV_WIN7, WV_WIN8};
//#include "deprecatedSymbols.h"
//Here you can find how to use these messages : http://notepad-plus.sourceforge.net/uk/plugins-HOWTO.php //Here you can find how to use these messages : http://notepad-plus.sourceforge.net/uk/plugins-HOWTO.php
#define NPPMSG (WM_USER + 1000) #define NPPMSG (WM_USER + 1000)
@ -95,6 +94,9 @@ enum winVer{WV_UNKNOWN, WV_WIN32S, WV_95, WV_98, WV_ME, WV_NT, WV_W2K, WV_XP, WV
#define NPPM_GETMENUHANDLE (NPPMSG + 25) #define NPPM_GETMENUHANDLE (NPPMSG + 25)
#define NPPPLUGINMENU 0 #define NPPPLUGINMENU 0
#define NPPMAINMENU 1
// INT NPPM_GETMENUHANDLE(INT menuChoice, 0)
// Return: menu handle (HMENU) of choice (plugin menu handle or Notepad++ main menu handle)
#define NPPM_ENCODESCI (NPPMSG + 26) #define NPPM_ENCODESCI (NPPMSG + 26)
//ascii file to unicode //ascii file to unicode
@ -113,9 +115,13 @@ enum winVer{WV_UNKNOWN, WV_WIN32S, WV_95, WV_98, WV_ME, WV_NT, WV_W2K, WV_XP, WV
//void NPPM_LAUNCHFINDINFILESDLG(TCHAR * dir2Search, TCHAR * filtre) //void NPPM_LAUNCHFINDINFILESDLG(TCHAR * dir2Search, TCHAR * filtre)
#define NPPM_DMMSHOW (NPPMSG + 30) #define NPPM_DMMSHOW (NPPMSG + 30)
//void NPPM_DMMSHOW(0, tTbData->hClient)
#define NPPM_DMMHIDE (NPPMSG + 31) #define NPPM_DMMHIDE (NPPMSG + 31)
//void NPPM_DMMHIDE(0, tTbData->hClient)
#define NPPM_DMMUPDATEDISPINFO (NPPMSG + 32) #define NPPM_DMMUPDATEDISPINFO (NPPMSG + 32)
//void NPPM_DMMxxx(0, tTbData->hClient) //void NPPM_DMMUPDATEDISPINFO(0, tTbData->hClient)
#define NPPM_DMMREGASDCKDLG (NPPMSG + 33) #define NPPM_DMMREGASDCKDLG (NPPMSG + 33)
//void NPPM_DMMREGASDCKDLG(0, &tTbData) //void NPPM_DMMREGASDCKDLG(0, &tTbData)
@ -219,53 +225,62 @@ enum winVer{WV_UNKNOWN, WV_WIN32S, WV_95, WV_98, WV_ME, WV_NT, WV_W2K, WV_XP, WV
// allocate fullFilePath with the return values + 1, then call it again to get full path file name // allocate fullFilePath with the return values + 1, then call it again to get full path file name
#define NPPM_GETBUFFERIDFROMPOS (NPPMSG + 59) #define NPPM_GETBUFFERIDFROMPOS (NPPMSG + 59)
//wParam: Position of document // INT NPPM_GETBUFFERIDFROMPOS(INT index, INT iView)
//lParam: View to use, 0 = Main, 1 = Secondary // wParam: Position of document
//Returns 0 if invalid // lParam: View to use, 0 = Main, 1 = Secondary
// Returns 0 if invalid
#define NPPM_GETCURRENTBUFFERID (NPPMSG + 60) #define NPPM_GETCURRENTBUFFERID (NPPMSG + 60)
//Returns active Buffer // INT NPPM_GETCURRENTBUFFERID(0, 0)
// Returns active Buffer
#define NPPM_RELOADBUFFERID (NPPMSG + 61) #define NPPM_RELOADBUFFERID (NPPMSG + 61)
//Reloads Buffer // VOID NPPM_RELOADBUFFERID(0, 0)
//wParam: Buffer to reload // Reloads Buffer
//lParam: 0 if no alert, else alert // wParam: Buffer to reload
// lParam: 0 if no alert, else alert
#define NPPM_GETBUFFERLANGTYPE (NPPMSG + 64) #define NPPM_GETBUFFERLANGTYPE (NPPMSG + 64)
//wParam: BufferID to get LangType from // INT NPPM_GETBUFFERLANGTYPE(INT bufferID, 0)
//lParam: 0 // wParam: BufferID to get LangType from
//Returns as int, see LangType. -1 on error // lParam: 0
// Returns as int, see LangType. -1 on error
#define NPPM_SETBUFFERLANGTYPE (NPPMSG + 65) #define NPPM_SETBUFFERLANGTYPE (NPPMSG + 65)
//wParam: BufferID to set LangType of // BOOL NPPM_SETBUFFERLANGTYPE(INT bufferID, INT langType)
//lParam: LangType // wParam: BufferID to set LangType of
//Returns TRUE on success, FALSE otherwise // lParam: LangType
//use int, see LangType for possible values // Returns TRUE on success, FALSE otherwise
//L_USER and L_EXTERNAL are not supported // use int, see LangType for possible values
// L_USER and L_EXTERNAL are not supported
#define NPPM_GETBUFFERENCODING (NPPMSG + 66) #define NPPM_GETBUFFERENCODING (NPPMSG + 66)
//wParam: BufferID to get encoding from // INT NPPM_GETBUFFERENCODING(INT bufferID, 0)
//lParam: 0 // wParam: BufferID to get encoding from
//returns as int, see UniMode. -1 on error // lParam: 0
// returns as int, see UniMode. -1 on error
#define NPPM_SETBUFFERENCODING (NPPMSG + 67) #define NPPM_SETBUFFERENCODING (NPPMSG + 67)
//wParam: BufferID to set encoding of // BOOL NPPM_SETBUFFERENCODING(INT bufferID, INT encoding)
//lParam: format // wParam: BufferID to set encoding of
//Returns TRUE on success, FALSE otherwise // lParam: encoding
//use int, see UniMode // Returns TRUE on success, FALSE otherwise
//Can only be done on new, unedited files // use int, see UniMode
// Can only be done on new, unedited files
#define NPPM_GETBUFFERFORMAT (NPPMSG + 68) #define NPPM_GETBUFFERFORMAT (NPPMSG + 68)
//wParam: BufferID to get format from // INT NPPM_GETBUFFERFORMAT(INT bufferID, 0)
//lParam: 0 // wParam: BufferID to get format from
//returns as int, see formatType. -1 on error // lParam: 0
// returns as int, see formatType. -1 on error
#define NPPM_SETBUFFERFORMAT (NPPMSG + 69) #define NPPM_SETBUFFERFORMAT (NPPMSG + 69)
//wParam: BufferID to set format of // BOOL NPPM_SETBUFFERFORMAT(INT bufferID, INT format)
//lParam: format // wParam: BufferID to set format of
//Returns TRUE on success, FALSE otherwise // lParam: format
//use int, see formatType // Returns TRUE on success, FALSE otherwise
// use int, see formatType
/* /*
#define NPPM_ADDREBAR (NPPMSG + 57) #define NPPM_ADDREBAR (NPPMSG + 57)
@ -371,6 +386,10 @@ enum winVer{WV_UNKNOWN, WV_WIN32S, WV_95, WV_98, WV_ME, WV_NT, WV_W2K, WV_XP, WV
// BOOL NPPM_GETAPPDATAPLUGINSALLOWED(0, 0) // BOOL NPPM_GETAPPDATAPLUGINSALLOWED(0, 0)
// Check to see if loading plugins from "%APPDATA%\Notepad++\plugins" is allowed. // Check to see if loading plugins from "%APPDATA%\Notepad++\plugins" is allowed.
#define NPPM_GETCURRENTVIEW (NPPMSG + 88)
// INT NPPM_GETCURRENTVIEW(0, 0)
// Return: current edit view of Notepad++. Only 2 possible values: 0 = Main, 1 = Secondary
#define RUNCOMMAND_USER (WM_USER + 3000) #define RUNCOMMAND_USER (WM_USER + 3000)
#define NPPM_GETFULLCURRENTPATH (RUNCOMMAND_USER + FULL_CURRENT_PATH) #define NPPM_GETFULLCURRENTPATH (RUNCOMMAND_USER + FULL_CURRENT_PATH)
#define NPPM_GETCURRENTDIRECTORY (RUNCOMMAND_USER + CURRENT_DIRECTORY) #define NPPM_GETCURRENTDIRECTORY (RUNCOMMAND_USER + CURRENT_DIRECTORY)

6
PowerEditor/src/NppBigSwitch.cpp
View File

@ -1114,6 +1114,8 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
{ {
if (wParam == NPPPLUGINMENU) if (wParam == NPPPLUGINMENU)
return (LRESULT)_pluginsManager.getMenuHandle(); return (LRESULT)_pluginsManager.getMenuHandle();
else if (wParam == NPPMAINMENU)
return (LRESULT)_mainMenuHandle;
else else
return NULL; return NULL;
} }
@ -1766,6 +1768,10 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
return !nppGUI._statusBarShow; return !nppGUI._statusBarShow;
} }
case NPPM_GETCURRENTVIEW :
{
return _activeView;
}
/* /*
case NPPM_ADDREBAR : case NPPM_ADDREBAR :
{ {

8
PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp
View File

@ -198,8 +198,14 @@ BOOL CALLBACK VerticalFileSwitcher::run_dlgProc(UINT message, WPARAM wParam, LPA
void VerticalFileSwitcher::activateDoc(TaskLstFnStatus *tlfs) const void VerticalFileSwitcher::activateDoc(TaskLstFnStatus *tlfs) const
{ {
int view = tlfs->_iView; int view = tlfs->_iView;
//int bufferID = _fileListView.getBufferInfoFromIndex(i, view);
int bufferID = (int)tlfs->_bufID; int bufferID = (int)tlfs->_bufID;
int currentView = ::SendMessage(_hParent, NPPM_GETCURRENTVIEW, 0, 0);
int currentBufID = ::SendMessage(_hParent, NPPM_GETCURRENTBUFFERID, 0, 0);
if (bufferID == currentBufID && view == currentView)
return;
int docPosInfo = ::SendMessage(_hParent, NPPM_GETPOSFROMBUFFERID, bufferID, view); int docPosInfo = ::SendMessage(_hParent, NPPM_GETPOSFROMBUFFERID, bufferID, view);
int view2set = docPosInfo >> 30; int view2set = docPosInfo >> 30;
int index2Switch = (docPosInfo << 2) >> 2 ; int index2Switch = (docPosInfo << 2) >> 2 ;

3
PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.cpp
View File

@ -118,7 +118,8 @@ void VerticalFileSwitcherListView::initList()
} }
} }
int VerticalFileSwitcherListView::getBufferInfoFromIndex(int index, int & view) const { int VerticalFileSwitcherListView::getBufferInfoFromIndex(int index, int & view) const
{
int nbItem = ListView_GetItemCount(_hSelf); int nbItem = ListView_GetItemCount(_hSelf);
if (index < 0 || index >= nbItem) if (index < 0 || index >= nbItem)
return -1; return -1;

27
PowerEditor/src/functionList.xml
View File

@ -49,19 +49,20 @@
</parser> </parser>
<parser id="js_function" displayName="Javascript"> <parser id="js_function" displayName="Javascript">
<function <function
mainExpr="function[\s]+[\w]*[\s]+\([^\)\(]*\)[\n\s]*\{" mainExpr="function([\s]+[\w]*[\s]*|[\s]*)\([^\)\(]*\)[\n\s]*\{"
displayMode="$className->$functionName"> displayMode="$className->$functionName">
<functionName> <comment expr="((/\*.*?\*)/|(//.*?$))" />
<nameExpr expr="(?!(if|whil|for))[\w_]+[\s]*\("/> <functionName>
<nameExpr expr="(?!(if|whil|for))[\w_]+"/> <nameExpr expr="(?!(if|whil|for))[\w_]+[\s]*\("/>
</functionName> <nameExpr expr="(?!(if|whil|for))[\w_]+"/>
<className> </functionName>
<nameExpr expr="[\w_]+(?=[\s]*::)"/> <className>
</className> <nameExpr expr="[\w_]+(?=[\s]*::)"/>
</function> </className>
</parser> </function>
</parser>
</parsers> </parsers>
</functionList> </functionList>
</NotepadPlus> </NotepadPlus>