xkeymacs (git) - XKeymacs - SourceForge.JP

--- a/xkeymacs/mainfrm.cpp

+++ b/xkeymacs/mainfrm.cpp

		@@ -352,7 +352,7 @@ void CMainFrame::ShowRightMenu(const ICON_TYPE icon)
352	352	popUp->SetDefaultItem(IDC_PROPERTIES);
353	353
354	354	CString szDisable(MAKEINTRESOURCE(IDS_ENABLE));
355		- if (CXkeymacsDll::IsKeyboardHook()) {
	355	+ if (CXkeymacsDll::GetHookState()) {
356	356	szDisable.LoadString(IDS_DISABLE);
357	357	}
358	358	szDisable += _T("\tCtrl+Q");

		@@ -447,7 +447,7 @@ void CMainFrame::OnOptions()
447	447	// stop/start keyboard hook
448	448	void CMainFrame::OnDisable()
449	449	{
450		- CXkeymacsDll::ToggleKeyboardHookState();
	450	+ CXkeymacsDll::ToggleHookState();
451	451	}
452	452
453	453	// Close the Dialog if it is opened.

--- a/xkeymacsdll/Commands.cpp

+++ b/xkeymacsdll/Commands.cpp

		@@ -2904,7 +2904,7 @@ BOOL CCommands::IsTemporarilyDisableXKeymacs()
2904	2904	void CCommands::SetTemporarilyDisableXKeymacs(BOOL bTemporarilyDisableXKeymacs)
2905	2905	{
2906	2906	m_bTemporarilyDisableXKeymacs = bTemporarilyDisableXKeymacs;
2907		- CXkeymacsDll::ShowKeyboardHookState();
	2907	+ CXkeymacsDll::ShowHookState();
2908	2908	}
2909	2909
2910	2910	int CCommands::New()

--- a/xkeymacsdll/xkeymacsdll.cpp

+++ b/xkeymacsdll/xkeymacsdll.cpp

		@@ -91,7 +91,7 @@ DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
91	91	#pragma data_seg(".xkmcs")
92	92	Config CXkeymacsDll::m_Config = {0};
93	93	bool CXkeymacsDll::m_bEnableKeyboardHook = false;
94		-BOOL CXkeymacsDll::m_bHook = TRUE;
	94	+bool CXkeymacsDll::m_bHook = true;
95	95	int CXkeymacsDll::m_nAccelerate = 0;
96	96	int CXkeymacsDll::m_nKeyboardSpeed = 31;
97	97	HCURSOR CXkeymacsDll::m_hCurrentCursor = NULL;

		@@ -206,18 +206,23 @@ void CXkeymacsDll::ReleaseKeyboardHook()
206	206	unhook(*phHook);
207	207	}
208	208
209		-void CXkeymacsDll::ToggleKeyboardHookState()
	209	+void CXkeymacsDll::ToggleHookState()
210	210	{
211		- m_bHook = !m_bHook;
212		- ShowKeyboardHookState();
	211	+ SetHookState(!m_bHook);
213	212	}
214	213
215		-BOOL CXkeymacsDll::IsKeyboardHook()
	214	+void CXkeymacsDll::SetHookState(bool enable)
	215	+{
	216	+ m_bHook = enable;
	217	+ ShowHookState();
	218	+}
	219	+
	220	+bool CXkeymacsDll::GetHookState()
216	221	{
217	222	return m_bHook;
218	223	}
219	224
220		-void CXkeymacsDll::ShowKeyboardHookState()
	225	+void CXkeymacsDll::ShowHookState()
221	226	{
222	227	IconMsg msg = {MAIN_ICON,};
223	228	if (m_bHook) {

		@@ -259,14 +264,14 @@ LRESULT CALLBACK CXkeymacsDll::CallWndProc(int nCode, WPARAM wParam, LPARAM lPar
259	264	if (cwps->hwnd == GetForegroundWindow()) {
260	265	AppName::SetIMEState(false);
261	266	InitKeyboardProc();
262		- ShowKeyboardHookState();
	267	+ ShowHookState();
263	268	}
264	269	break;
265	270	case WM_NCACTIVATE:
266	271	if (cwps->wParam && cwps->hwnd == GetForegroundWindow()) {
267	272	AppName::SetIMEState(false);
268	273	InitKeyboardProc();
269		- ShowKeyboardHookState();
	274	+ ShowHookState();
270	275	}
271	276	break;
272	277	}

		@@ -320,7 +325,7 @@ LRESULT CALLBACK CXkeymacsDll::ShellProc(int nCode, WPARAM wParam, LPARAM lParam
320	325	if (!_tcsicmp(className, _T("ConsoleWindowClass"))) {
321	326	AppName::SetIMEState(false);
322	327	InitKeyboardProc();
323		- ShowKeyboardHookState();
	328	+ ShowHookState();
324	329	}
325	330	}
326	331	return CallNextHookEx(NULL, nCode, wParam, lParam);

		@@ -502,17 +507,15 @@ LRESULT CALLBACK CXkeymacsDll::KeyboardProc(int nCode, WPARAM wParam, LPARAM lPa
502	507
503	508	int (*fCommand)() = CmdTable::Command(m_CmdID[nType][nKey]);
504	509	if (fCommand == CCommands::EnableOrDisableXKeymacs) {
505		- ToggleKeyboardHookState();
	510	+ ToggleHookState();
506	511	goto HOOK;
507	512	}
508	513	if (fCommand == CCommands::EnableXKeymacs) {
509		- if (!m_bHook)
510		- ToggleKeyboardHookState();
	514	+ SetHookState(true);
511	515	goto HOOK;
512	516	}
513	517	if (fCommand == CCommands::DisableXKeymacs) {
514		- if (m_bHook)
515		- ToggleKeyboardHookState();
	518	+ SetHookState(false);
516	519	goto HOOK;
517	520	}
518	521	if (!m_bHook)

--- a/xkeymacsdll/xkeymacsdll.h

+++ b/xkeymacsdll/xkeymacsdll.h

		@@ -28,9 +28,9 @@ public:
28	28	static void ResetHooks();
29	29	static void ReleaseHooks();
30	30	static void ReleaseKeyboardHook();
31		- static void ToggleKeyboardHookState();
32		- static BOOL IsKeyboardHook();
33		- static void ShowKeyboardHookState();
	31	+ static void ToggleHookState();
	32	+ static bool GetHookState();
	33	+ static void ShowHookState();
34	34	static void SetM_xTip(LPCTSTR szPath);
35	35	static BOOL SendIconMessage(IconMsg *pMsg, DWORD num);
36	36	static BOOL IsDown(BYTE bVk, BOOL bPhysicalKey = TRUE);

		@@ -63,7 +63,8 @@ private:
63	63	static HHOOK m_hHookGetMessage;
64	64	static HHOOK m_hHookShell;
65	65	static bool m_bEnableKeyboardHook;
66		- static BOOL m_bHook;
	66	+ static bool m_bHook;
	67	+ static void SetHookState(bool enable);
67	68	static DWORD m_nHookAltRelease;
68	69	static LRESULT CALLBACK CallWndProc(int nCode, WPARAM wParam, LPARAM lParam);
69	70	static LRESULT CALLBACK CallWndRetProc(int nCode, WPARAM wParam, LPARAM lParam);

XKeymacs