Modify the code related to m_bHook in CXkeymacsDll.

diff --git a/xkeymacs/mainfrm.cpp b/xkeymacs/mainfrm.cpp
index 9010eb1..c4b8c39 100644 (file)
--- a/xkeymacs/mainfrm.cpp
+++ b/xkeymacs/mainfrm.cpp
@@ -352,7 +352,7 @@ void CMainFrame::ShowRightMenu(const ICON_TYPE icon)
                popUp->SetDefaultItem(IDC_PROPERTIES);\r
 \r
                CString szDisable(MAKEINTRESOURCE(IDS_ENABLE));\r
-               if (CXkeymacsDll::IsKeyboardHook()) {\r
+               if (CXkeymacsDll::GetHookState()) {\r
                        szDisable.LoadString(IDS_DISABLE);\r
                }\r
                szDisable += _T("\tCtrl+Q");\r
@@ -447,7 +447,7 @@ void CMainFrame::OnOptions()
 // stop/start keyboard hook\r
 void CMainFrame::OnDisable() \r
 {\r
-       CXkeymacsDll::ToggleKeyboardHookState();\r
+       CXkeymacsDll::ToggleHookState();\r
 }\r
 \r
 // Close the Dialog if it is opened.\r

diff --git a/xkeymacsdll/Commands.cpp b/xkeymacsdll/Commands.cpp
index 71ad912..2651a76 100644 (file)
--- a/xkeymacsdll/Commands.cpp
+++ b/xkeymacsdll/Commands.cpp
@@ -2904,7 +2904,7 @@ BOOL CCommands::IsTemporarilyDisableXKeymacs()
 void CCommands::SetTemporarilyDisableXKeymacs(BOOL bTemporarilyDisableXKeymacs)\r
 {\r
        m_bTemporarilyDisableXKeymacs = bTemporarilyDisableXKeymacs;\r
-       CXkeymacsDll::ShowKeyboardHookState();\r
+       CXkeymacsDll::ShowHookState();\r
 }\r
 \r
 int CCommands::New()\r

diff --git a/xkeymacsdll/xkeymacsdll.cpp b/xkeymacsdll/xkeymacsdll.cpp
index 5a93dfa..e1e969c 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.cpp
+++ b/xkeymacsdll/xkeymacsdll.cpp
@@ -91,7 +91,7 @@ DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
 #pragma data_seg(".xkmcs")\r
 Config CXkeymacsDll::m_Config = {0};\r
 bool CXkeymacsDll::m_bEnableKeyboardHook = false;\r
-BOOL CXkeymacsDll::m_bHook = TRUE;\r
+bool CXkeymacsDll::m_bHook = true;\r
 int CXkeymacsDll::m_nAccelerate = 0;\r
 int CXkeymacsDll::m_nKeyboardSpeed = 31;\r
 HCURSOR CXkeymacsDll::m_hCurrentCursor = NULL;\r
@@ -206,18 +206,23 @@ void CXkeymacsDll::ReleaseKeyboardHook()
                unhook(*phHook);\r
 }\r
 \r
-void CXkeymacsDll::ToggleKeyboardHookState()\r
+void CXkeymacsDll::ToggleHookState()\r
 {\r
-       m_bHook = !m_bHook;\r
-       ShowKeyboardHookState();\r
+       SetHookState(!m_bHook);\r
 }\r
 \r
-BOOL CXkeymacsDll::IsKeyboardHook()\r
+void CXkeymacsDll::SetHookState(bool enable)\r
+{\r
+       m_bHook = enable;\r
+       ShowHookState();\r
+}\r
+\r
+bool CXkeymacsDll::GetHookState()\r
 {\r
        return m_bHook;\r
 }\r
 \r
-void CXkeymacsDll::ShowKeyboardHookState()\r
+void CXkeymacsDll::ShowHookState()\r
 {\r
        IconMsg msg = {MAIN_ICON,};\r
        if (m_bHook) {\r
@@ -259,14 +264,14 @@ LRESULT CALLBACK CXkeymacsDll::CallWndProc(int nCode, WPARAM wParam, LPARAM lPar
                        if (cwps->hwnd == GetForegroundWindow()) {\r
                                AppName::SetIMEState(false);\r
                                InitKeyboardProc();\r
-                               ShowKeyboardHookState();\r
+                               ShowHookState();\r
                        }\r
                        break;\r
                case WM_NCACTIVATE:\r
                        if (cwps->wParam && cwps->hwnd == GetForegroundWindow()) {\r
                                AppName::SetIMEState(false);\r
                                InitKeyboardProc();\r
-                               ShowKeyboardHookState();\r
+                               ShowHookState();\r
                        }\r
                        break;\r
                }\r
@@ -320,7 +325,7 @@ LRESULT CALLBACK CXkeymacsDll::ShellProc(int nCode, WPARAM wParam, LPARAM lParam
                if (!_tcsicmp(className, _T("ConsoleWindowClass"))) {\r
                        AppName::SetIMEState(false);\r
                        InitKeyboardProc();\r
-                       ShowKeyboardHookState();\r
+                       ShowHookState();\r
                }\r
        }\r
        return CallNextHookEx(NULL, nCode, wParam, lParam);\r
@@ -502,17 +507,15 @@ LRESULT CALLBACK CXkeymacsDll::KeyboardProc(int nCode, WPARAM wParam, LPARAM lPa
 \r
        int (*fCommand)() = CmdTable::Command(m_CmdID[nType][nKey]);\r
        if (fCommand == CCommands::EnableOrDisableXKeymacs) {\r
-               ToggleKeyboardHookState();\r
+               ToggleHookState();\r
                goto HOOK;\r
        }\r
        if (fCommand == CCommands::EnableXKeymacs) {\r
-               if (!m_bHook)\r
-                       ToggleKeyboardHookState();\r
+               SetHookState(true);\r
                goto HOOK;\r
        }\r
        if (fCommand == CCommands::DisableXKeymacs) {\r
-               if (m_bHook)\r
-                       ToggleKeyboardHookState();\r
+               SetHookState(false);\r
                goto HOOK;\r
        }\r
        if (!m_bHook)\r

diff --git a/xkeymacsdll/xkeymacsdll.h b/xkeymacsdll/xkeymacsdll.h
index 7839dc8..4e50603 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.h
+++ b/xkeymacsdll/xkeymacsdll.h
@@ -28,9 +28,9 @@ public:
        static void ResetHooks();\r
        static void ReleaseHooks();\r
        static void ReleaseKeyboardHook();\r
-       static void ToggleKeyboardHookState();\r
-       static BOOL IsKeyboardHook();\r
-       static void ShowKeyboardHookState();\r
+       static void ToggleHookState();\r
+       static bool GetHookState();\r
+       static void ShowHookState();\r
        static void SetM_xTip(LPCTSTR szPath);\r
        static BOOL SendIconMessage(IconMsg *pMsg, DWORD num);\r
        static BOOL IsDown(BYTE bVk, BOOL bPhysicalKey = TRUE);\r
@@ -63,7 +63,8 @@ private:
        static HHOOK m_hHookGetMessage;\r
        static HHOOK m_hHookShell;\r
        static bool m_bEnableKeyboardHook;\r
-       static BOOL m_bHook;\r
+       static bool m_bHook;\r
+       static void SetHookState(bool enable);\r
        static DWORD m_nHookAltRelease;\r
        static LRESULT CALLBACK CallWndProc(int nCode, WPARAM wParam, LPARAM lParam);\r
        static LRESULT CALLBACK CallWndRetProc(int nCode, WPARAM wParam, LPARAM lParam);\r