Fix Ctrl held down while clicking

bruderstein · bruderstein · commit 040fdf3d836e · 2010-07-10T12:55:00.000+02:00
- now checks that menu item has been clicked, and not a
    ctrl+xxx shortcut been pressed.
diff --git a/PythonScript/src/MenuManager.cpp b/PythonScript/src/MenuManager.cpp
@@ -15,6 +15,9 @@ WNDPROC MenuManager::s_origWndProc;
 
 int MenuManager::s_startCommandID;
 int MenuManager::s_endCommandID;
+int MenuManager::s_startFixedID;
+int MenuManager::s_endFixedID;
+bool MenuManager::s_menuItemClicked;
 
 void (*MenuManager::s_runScript)(int);
 
@@ -175,6 +178,10 @@ bool MenuManager::populateScriptsMenu()
 
 		s_endCommandID = findScripts(hScriptsMenu, userScriptsPath.size(), nextID, userScriptsPath);
 
+		// Assume here that the func items are assigned from start to finish
+		s_startFixedID = m_funcItems[m_dynamicStartIndex]._cmdID;
+		s_endFixedID = m_funcItems[m_funcItemCount - 1]._cmdID;
+
 		subclassNotepadPlusPlus();
 		
 	}
@@ -300,9 +307,15 @@ LRESULT CALLBACK notepadWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l
 	{
 		if (LOWORD(wParam) >= MenuManager::s_startCommandID && LOWORD(wParam) < MenuManager::s_endCommandID && HIWORD(wParam) == 0)
 		{
+			MenuManager::s_menuItemClicked = true;
 			MenuManager::getInstance()->menuCommand(LOWORD(wParam));
 			return TRUE;
 		}
+		else if (LOWORD(wParam) >= MenuManager::s_startFixedID && LOWORD(wParam) < MenuManager::s_endFixedID && HIWORD(wParam) == 0)
+		{
+			MenuManager::s_menuItemClicked = true;
+		}
+
 	}
 	
 	return CallWindowProc(MenuManager::s_origWndProc, hWnd, message, wParam, lParam);
@@ -332,6 +345,8 @@ FuncItem* MenuManager::getFuncItemArray(int *nbF, ItemVectorTD items, void (*run
 	// Remove one from the count of menu items if the list is empty
 	// as we'll only have one separator
 	*nbF =  menuItems.size() + items.size() + (menuItems.empty() ? 0 : 1);
+	
+	m_funcItemCount = *nbF;
 
 	m_funcItems = new FuncItem[*nbF];
 
@@ -379,7 +394,8 @@ FuncItem* MenuManager::getFuncItemArray(int *nbF, ItemVectorTD items, void (*run
 	}
 
 	
-	
+	m_dynamicStartIndex = dynamicStartIndex;
+	m_dynamicCount = menuItems.size();
 	m_scriptsMenuIndex = scriptsMenuIndex;
 	m_stopScriptIndex = stopScriptIndex;
 	
diff --git a/PythonScript/src/MenuManager.h b/PythonScript/src/MenuManager.h
@@ -29,6 +29,9 @@ class MenuManager
 
 	static int s_startCommandID;
 	static int s_endCommandID;
+	static int s_startFixedID;
+	static int s_endFixedID;
+	static bool s_menuItemClicked;
 	static WNDPROC s_origWndProc;
 	
 	
@@ -53,11 +56,13 @@ class MenuManager
 
 	HWND		m_hNotepad;
 	HINSTANCE	m_hInst;
-	int			m_validCommandID;
+	int			m_dynamicStartIndex;
+	int			m_dynamicCount;
 	int			m_scriptsMenuIndex;
 	int			m_stopScriptIndex;
 	HMENU		m_pythonPluginMenu;
 	FuncItem*   m_funcItems;
+	int         m_funcItemCount;
 
 	// Function pointer to the real run script function
 	static void (*s_runScript)(int);
diff --git a/PythonScript/src/PythonScript.cpp b/PythonScript/src/PythonScript.cpp
@@ -186,8 +186,6 @@ FuncItem* getGeneratedFuncItemArray(int *nbF)
 	items.push_back(pair<tstring, void(*)()>(_T("--"), reinterpret_cast<void(*)()>(NULL)));
 	scriptsMenuIndex = items.size() - 1;
 
-	// items.push_back(pair<tstring, void(*)()>(_T("--"), reinterpret_cast<void(*)()>(NULL)));
-	
 	
 	items.push_back(pair<tstring, void(*)()>(_T("About"), doAbout));
 	// Add dynamic scripts right above "About" - a separator will automatically
@@ -348,7 +346,7 @@ void runScript(const char *filename)
 	::GetKeyboardState(keyState);
 
 	// If either control held down, then edit the file
-	if ((keyState[VK_LCONTROL] & 0x80) || (keyState[VK_RCONTROL] & 0x80))
+	if (MenuManager::s_menuItemClicked && ((keyState[VK_LCONTROL] & 0x80) || (keyState[VK_RCONTROL] & 0x80)))
 	{
 		NotepadPlusWrapper wrapper(nppData._nppHandle);
 		if (!wrapper.activateFile(filename))
@@ -364,6 +362,9 @@ void runScript(const char *filename)
 			MessageBox(NULL, _T("Cannot run a script when a script is already running"), _T("Python Script"), 0);
 		}
 	}
+
+	MenuManager::s_menuItemClicked = false;
+
 }
 
 void showShortcutDlg()

Original file line number	Diff line number	Diff line change
`@@ -186,8 +186,6 @@ FuncItem* getGeneratedFuncItemArray(int *nbF)`
`186`	`186`	`items.push_back(pair<tstring, void()()>(_T("--"), reinterpret_cast<void()()>(NULL)));`
`187`	`187`	`scriptsMenuIndex = items.size() - 1;`
`188`	`188`
`189`		`- // items.push_back(pair<tstring, void()()>(_T("--"), reinterpret_cast<void()()>(NULL)));`
`190`		`-`
`191`	`189`
`192`	`190`	`items.push_back(pair<tstring, void(*)()>(_T("About"), doAbout));`
`193`	`191`	`// Add dynamic scripts right above "About" - a separator will automatically`
`@@ -348,7 +346,7 @@ void runScript(const char *filename)`
`348`	`346`	`::GetKeyboardState(keyState);`
`349`	`347`
`350`	`348`	`// If either control held down, then edit the file`
`351`		`- if ((keyState[VK_LCONTROL] & 0x80) \|\| (keyState[VK_RCONTROL] & 0x80))`
	`349`	`+ if (MenuManager::s_menuItemClicked && ((keyState[VK_LCONTROL] & 0x80) \|\| (keyState[VK_RCONTROL] & 0x80)))`
`352`	`350`	`{`
`353`	`351`	`NotepadPlusWrapper wrapper(nppData._nppHandle);`
`354`	`352`	`if (!wrapper.activateFile(filename))`
`@@ -364,6 +362,9 @@ void runScript(const char *filename)`
`364`	`362`	`MessageBox(NULL, _T("Cannot run a script when a script is already running"), _T("Python Script"), 0);`
`365`	`363`	`}`
`366`	`364`	`}`
	`365`	`+`
	`366`	`+ MenuManager::s_menuItemClicked = false;`
	`367`	`+`
`367`	`368`	`}`
`368`	`369`
`369`	`370`	`void showShortcutDlg()`