Change the platform toolset to v140

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

diff --git a/xkeymacsdll/xkeymacsdll.h b/xkeymacsdll/xkeymacsdll.h
index 0bea514..71d7e94 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.h
+++ b/xkeymacsdll/xkeymacsdll.h
@@ -24,15 +24,16 @@ public:
        static BOOL LoadConfig();\r
        static void SetConfig(const Config& config);\r
        static void SetHooks();\r
-       static void SetKeyboardHook(DWORD threadId = 0);\r
        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 SetHookStateDirect(bool enable);\r
+       static void ToggleHookState();\r
+       static bool GetHookState();\r
+       static void ShowHookState();\r
+       static void SetIMEState(bool on);\r
        static void SetM_xTip(LPCTSTR szPath);\r
-       static BOOL SendIconMessage(IconMsg *pMsg, DWORD num);\r
+       static void SendIconMessage(IconState *state, int num);\r
        static BOOL IsDown(BYTE bVk, BOOL bPhysicalKey = TRUE);\r
        static void Kdu(BYTE bVk, DWORD n = 1, BOOL bOriginal = TRUE);\r
        static void DepressKey(BYTE bVk, BOOL bOriginal = TRUE);\r
@@ -42,10 +43,11 @@ public:
        static void AddKillRing(BOOL bNewData = TRUE);\r
        static CClipboardSnap* GetKillRing(CClipboardSnap *pSnap, BOOL bForce = TRUE);\r
        static void IncreaseKillRingIndex(int nKillRing = 1);\r
-       static BOOL GetEnableCUA();\r
-       static BOOL Get326Compatible();\r
-       static BOOL Is106Keyboard();\r
+       static bool GetEnableCUA();\r
+       static bool Get326Compatible();\r
+       static bool Is106Keyboard();\r
        static void SetKbMacro(KbdMacro* kbdMacro);\r
+       static SHORT ConvVkey(SHORT in, int mode);\r
        static int GetAccelerate(void);\r
        static void SetAccelerate(int nAccelerate);\r
        static void SetKeyboardSpeed(int nKeyboardSpeed);\r
@@ -54,20 +56,24 @@ public:
 \r
 private:\r
        static Config m_Config;\r
+       static AppConfig* m_CurrentConfig;\r
+       static BYTE (*m_CmdID)[MAX_KEY];\r
+       static char (*m_FuncID)[MAX_KEY];\r
        static HHOOK m_hHookCallWnd;\r
        static HHOOK m_hHookCallWndRet;\r
        static HHOOK m_hHookGetMessage;\r
        static HHOOK m_hHookShell;\r
        static bool m_bEnableKeyboardHook;\r
-       static BOOL m_bHook;\r
+       static void SetKeyboardHook(DWORD threadId = 0);\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
        static LRESULT CALLBACK GetMsgProc(int nCode, WPARAM wParam, LPARAM lParam);\r
        static LRESULT CALLBACK ShellProc(int nCode, WPARAM wParam, LPARAM lParam);\r
-       static int m_nAppID;\r
-       static void InitKeyboardProc(bool imeState);\r
-       static int GetAppID(LPCSTR szName, int fallback);\r
+       static void InitKeyboardProc();\r
+       static AppConfig* GetAppConfig(LPCTSTR szName, AppConfig* fallback);\r
        static BOOL m_bRightShift;\r
        static BOOL m_bRightControl;\r
        static BOOL m_bRightAlt;\r
@@ -88,11 +94,7 @@ private:
        static CList<CClipboardSnap *, CClipboardSnap *> m_oKillRing;\r
        static int m_nKillRing;\r
        static KbdMacro* m_kbdMacro;\r
-       static void CallFunction(int nFuncID);\r
-       static KeyBind ParseKey(LPCTSTR& def);\r
-       static BOOL IsShift(TCHAR nAscii);\r
-       static BYTE a2v(TCHAR nAscii);\r
-       static BOOL IsMatchWindowText(CString szWindowText);\r
+       static void CallFunction(int id);\r
        static int m_nAccelerate;\r
        static int m_nKeyboardSpeed;\r
        static HCURSOR m_hCurrentCursor;\r