enhance feature request bruderstein#54 (bruderstein#67)

* enhance feature request bruderstein#54

* another enhancement to bruderstein#54

Author: ClaudiaFrank

PythonScript/src/ConsoleDialog.cpp

@@ -9,6 +9,7 @@
 #include "Docking.h"
 #include "WcharMbcsConverter.h"
 #include "MenuManager.h"
+#include "PythonScript.h"
 
 
 namespace NppPythonScript
@@ -25,7 +26,8 @@ ConsoleDialog::ConsoleDialog() :
 	m_hTabIcon(NULL),
 	m_currentHistory(0),
 	m_runButtonIsRun(true),
-	m_hContext(NULL)
+	m_hContext(NULL),
+	m_nppData{0,0,0}
 {
     m_historyIter = m_history.end();
 }
@@ -98,6 +100,7 @@ void ConsoleDialog::initDialog(HINSTANCE hInst, NppData& nppData, ConsoleInterfa
 	mi.dwTypeData = _T("To Input");
 	InsertMenuItem(m_hContext, 4, TRUE, &mi);
 
+	m_nppData = nppData;
 }
 
 INT_PTR CALLBACK ConsoleDialog::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam)
@@ -238,13 +241,16 @@ INT_PTR CALLBACK ConsoleDialog::run_dlgProc(UINT message, WPARAM wParam, LPARAM
                 }
                 break;
             }
+		case WM_SHOWWINDOW:
+			{
+				MenuManager::getInstance()->checkShowConsole(wParam);
+			}
         default:
             break;
 
     }
 
     return DockingDlgInterface::run_dlgProc(message, wParam, lParam);
-
 }
 
 
@@ -626,14 +632,26 @@ void ConsoleDialog::doDialog()
 			callScintilla(SCI_COLOURISE, 0, -1);
 		}
     }
-	MenuManager::getInstance()->checkShowConsole(true);
     display(true);
 }
 
 void ConsoleDialog::hide()
 {
-	MenuManager::getInstance()->checkShowConsole(false);
     display(false);
+	HWND current_HWND = ::GetFocus();
+	if (m_hInput == current_HWND || m_scintilla == current_HWND)
+	{
+		intptr_t currentView = MAIN_VIEW;
+		::SendMessage(m_nppData._nppHandle, NPPM_GETCURRENTSCINTILLA, 0, (LPARAM)&currentView);
+		HWND sci = (currentView == MAIN_VIEW) ? m_nppData._scintillaMainHandle : m_nppData._scintillaSecondHandle;
+		
+		DWORD currentThreadId = GetCurrentThreadId();
+		DWORD otherThreadId = GetWindowThreadProcessId(sci, NULL);
+
+		AttachThreadInput(currentThreadId, otherThreadId, TRUE);
+		SetFocus(sci);
+		AttachThreadInput(currentThreadId, otherThreadId, FALSE);
+	}
 }
 
 void ConsoleDialog::runEnabled(bool enabled)

PythonScript/src/ConsoleDialog.h

@@ -36,6 +36,8 @@ class ConsoleDialog : public DockingDlgInterface
 	void giveInputFocus() { SetFocus(m_hInput); }
 
 	void runEnabled(bool enabled);
+
+	NppData m_nppData;
 
 protected:
 	virtual INT_PTR CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam);

PythonScript/src/MenuManager.cpp

@@ -16,6 +16,7 @@ WNDPROC MenuManager::s_origWndProc;
 
 
 bool MenuManager::s_menuItemClicked;
+bool MenuManager::s_menuItemConsoleChecked = false;
 
 MenuManager::runScriptIDFunc MenuManager::s_runScript;
 
@@ -1136,4 +1137,5 @@ bool MenuManager::inFixedRange(idx_t commandID)
 void MenuManager::checkShowConsole(bool checked)
 {
 	::SendMessage(m_hNotepad, NPPM_SETMENUITEMCHECK, (WPARAM)m_funcItems[1]._cmdID, (LPARAM)checked);
+	s_menuItemConsoleChecked = checked;
 }

PythonScript/src/MenuManager.h

@@ -82,6 +82,7 @@ class MenuManager
 	static WNDPROC s_origWndProc;
 
 	void checkShowConsole(bool checked);
+	static bool s_menuItemConsoleChecked;
 
 
 private:

PythonScript/src/PythonConsole.cpp

@@ -136,7 +136,6 @@ void PythonConsole::pythonShowDialog()
 		else
 		{
 			mp_consoleDlg->doDialog();
-			consoleVisible = true;
 		}
 	}
 }
@@ -148,7 +147,6 @@ void PythonConsole::showDialog()
 	{
         GILRelease release;
 		mp_consoleDlg->doDialog();
-		consoleVisible = true;
 	}
 }
 
@@ -159,7 +157,6 @@ void PythonConsole::hideDialog()
 	{
         GILRelease release;
 		mp_consoleDlg->hide();
-		consoleVisible = false;
 	}
 }
 

PythonScript/src/PythonConsole.h

@@ -73,8 +73,6 @@ class PythonConsole : public PyProducerConsumer<std::string>, public ConsoleInte
 
 	static boost::python::str getEncoding() { return boost::python::str("utf-8"); }
 
-	bool consoleVisible = false;
-
 protected:
 	virtual void consume(std::shared_ptr<std::string> statement);
 	virtual void queueComplete();

PythonScript/src/PythonScript.cpp

@@ -573,7 +573,7 @@ static void toggleConsole()
 	if (g_console)
 	{
 		CHECK_INITIALISED();
-		if (g_console->consoleVisible)
+		if (MenuManager::getInstance()->s_menuItemConsoleChecked)
 		{
 			g_console->hideDialog();
 		}