Remove Clear and rewrite IsPassThrough in CXkeymacsDll.

diff --git a/xkeymacsdll/xkeymacsdll.cpp b/xkeymacsdll/xkeymacsdll.cpp
index 0e49144..aad62e3 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.cpp
+++ b/xkeymacsdll/xkeymacsdll.cpp
@@ -934,19 +934,6 @@ void CXkeymacsDll::SetModifierIcons()
        SendIconMessage(msg, 6);\r
 }\r
 \r
-void CXkeymacsDll::Clear(int nAppID)\r
-{\r
-       if (0 <= nAppID && nAppID < MAX_APP) {\r
-               ZeroMemory(m_Config.szSpecialApp[nAppID], sizeof(m_Config.szSpecialApp[nAppID]));\r
-               ZeroMemory(m_Config.nCommandID[nAppID], sizeof(m_Config.nCommandID[nAppID]));\r
-               m_Config.nKillRingMax[nAppID] = 0;\r
-               m_Config.bUseDialogSetting[nAppID] = FALSE;\r
-               m_Config.nSettingStyle[nAppID] = 0;\r
-       } else {\r
-               ASSERT(0);\r
-       }\r
-}\r
-\r
 BOOL CXkeymacsDll::IsDepressedModifier(int (__cdecl *Modifier)(void), BOOL bPhysicalKey)\r
 {\r
        BYTE bVk = 0;\r
@@ -1142,13 +1129,11 @@ BOOL CXkeymacsDll::Is106Keyboard()
 int CXkeymacsDll::IsPassThrough(BYTE nKey)\r
 {\r
        BYTE bVk = 0;\r
+       const BYTE *pnID = m_Config.nCommandID[m_nAppID][NONE]; \r
        do {\r
-               if (IsDown(bVk)\r
-                && (Commands[m_Config.nCommandID[m_nAppID][NONE][bVk]].fCommand == CCommands::PassThrough)) {\r
-                       if (bVk == nKey) {\r
+               if (IsDown(bVk) && Commands[pnID[bVk]].fCommand == CCommands::PassThrough) {\r
+                       if (bVk == nKey)\r
                                return GOTO_HOOK;\r
-                       }\r
-\r
                        return GOTO_DO_NOTHING;\r
                }\r
        } while (++bVk);\r

diff --git a/xkeymacsdll/xkeymacsdll.h b/xkeymacsdll/xkeymacsdll.h
index 208f274..90713ed 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.h
+++ b/xkeymacsdll/xkeymacsdll.h
@@ -70,7 +70,6 @@ public:
        static void SetKeyboardSpeed(int nKeyboardSpeed);\r
        static int GetAccelerate(void);\r
        static void SetAccelerate(int nAccelerate);\r
-       static void Clear(int nAppID);\r
        static BOOL IsKeyboardHook();\r
        static void ReleaseHooks();\r
        static void ReleaseKeyboardHook();\r