Modify or remove some declarations of constants in xkeymacsdll.h.

[xkeymacs/xkeymacs.git] / xkeymacsdll / xkeymacsdll.h

diff --git a/xkeymacsdll/xkeymacsdll.h b/xkeymacsdll/xkeymacsdll.h
index d3c4a67..c822b9a 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.h
+++ b/xkeymacsdll/xkeymacsdll.h
@@ -12,30 +12,26 @@
 #include <list>\r
 #include "ClipboardSnap.h"\r
 \r
-enum { MAX_APP = 64 };\r
-enum { NONE = 0x0, SHIFT = 0x1, CONTROL = 0x2, META = 0x4, CONTROLX = 0x8,\r
-          MAX_COMMAND_TYPE = NONE + SHIFT + CONTROL + META + CONTROLX + 1 };\r
-enum { /* WIN_SHIFT = 0x100, */ WIN_CTRL = 0x200, WIN_ALT = 0x400, WIN_WIN = 0x800 };\r
-enum { MAX_KEY = 256 };\r
-enum { MAX_FUNCTION = 64 };\r
-enum { MAX_DEFINITION = 256 };\r
-\r
-enum { WINDOW_NAME_LENGTH      = 128 };\r
-enum { CLASS_NAME_LENGTH       = 128 };\r
-enum { SUB_KEY_NAME_LENGTH     = 128 };\r
-enum { WINDOW_TEXT_LENGTH   = 128 + 128 + 3};\r
+const int MAX_APP = 64;\r
+const int NONE = 0x0, SHIFT = 0x1, CONTROL = 0x2, META = 0x4, CONTROLX = 0x8,\r
+          MAX_COMMAND_TYPE = NONE + SHIFT + CONTROL + META + CONTROLX + 1;\r
+const int /* WIN_SHIFT = 0x100, */ WIN_CTRL = 0x200, WIN_ALT = 0x400, WIN_WIN = 0x800;\r
+const int MAX_KEY = 256;\r
+const int MAX_FUNCTION = 64;\r
+const int MAX_DEFINITION = 256;\r
+\r
+const int WINDOW_NAME_LENGTH = 128;\r
+const int CLASS_NAME_LENGTH = 128;\r
+const int SUB_KEY_NAME_LENGTH = 128;\r
+const int WINDOW_TEXT_LENGTH = WINDOW_NAME_LENGTH * 2 + 3;\r
 \r
 enum ICON_TYPE { MAIN_ICON, CX_ICON, MX_ICON, META_ICON, SHIFT_ICON, CTRL_ICON, ALT_ICON, MAX_ICON_TYPE };\r
 enum XKEYMACS_STATUS { STATUS_ENABLE, STATUS_DISABLE_TMP, STATUS_DISABLE_WOCQ, STATUS_DISABLE, MAX_STATUS };\r
-enum { ON_ICON, OFF_ICON };    // alias of status\r
+enum { OFF_ICON, ON_ICON };\r
 \r
 enum GOTO { GOTO_DO_NOTHING, GOTO_HOOK, GOTO_RECURSIVE, GOTO_HOOKX, GOTO_HOOK0_9, CONTINUE };\r
 enum SETTING_STYLE { SETTING_DEFAULT, SETTING_SPECIFIC, SETTING_DISABLE, SETTING_UNDEFINED };\r
 \r
-enum { EXTENDED_KEY = 0x01000000 };\r
-enum { REPEATED_KEY = 0x40000000 };\r
-enum { BEING_RELEASED = 0x80000000 };\r
-\r
 #include "ipc.h"\r
 \r
 struct KeyBind\r
@@ -77,7 +73,9 @@ public:
        static void Clear(int nAppID);\r
        static BOOL IsKeyboardHook();\r
        static void ReleaseHooks();\r
+       static void ReleaseKeyboardHook();\r
        static void SetHooks();\r
+       static void SetKeyboardHook();\r
        static void ResetHooks();\r
        static void AddKillRing(BOOL bNewData = TRUE);\r
        static void CallMacro();\r
@@ -98,6 +96,7 @@ public:
        static BOOL SendIconMessage(ICONMSG *pMsg, DWORD num);\r
 \r
 private:\r
+       static bool m_bEnableKeyboardHook;\r
        static DWORD m_nHookAltRelease;\r
        static TCHAR m_M_xTip[128];\r
        static void InvokeM_x(const TCHAR* const szPath);\r
@@ -139,7 +138,7 @@ private:
        static int CheckOriginal(UINT nType, BYTE bVk);\r
        static void InitKeyboardProc(BOOL bImeComposition);\r
        static int m_nAppID;\r
-       static int m_nOriginal[MAX_COMMAND_TYPE][MAX_KEY];\r
+       static BYTE m_nOriginal[MAX_COMMAND_TYPE][MAX_KEY];\r
        static int m_nKillRing;\r
        static CList<CClipboardSnap *, CClipboardSnap *> m_oKillRing;\r
        static BOOL m_bHook;\r
@@ -149,6 +148,4 @@ private:
        static CONFIG m_Config;\r
 };\r
 \r
-extern UINT g_ImeManipulationMessage;\r
-\r
 #endif // !defined(AFX_XKEYMACS_H__88552DEC_1233_4A0A_BE62_9EF7BC618EC6__INCLUDED_)\r