Remove typedef of KeyBind_t, KbdMacro_t, Modifier_t, and KeyName_t

in xkeymacsdll.h. Remove typedef of TASK_LIST, ScanCode_t,
ScanCodeMapping_t, and KeyboardLayout_t, and CommandTypeName_t in
profile.h.

diff --git a/xkeymacs/104keyboard.cpp b/xkeymacs/104keyboard.cpp
index 38dec5d..a66c7ff 100644 (file)
--- a/xkeymacs/104keyboard.cpp
+++ b/xkeymacs/104keyboard.cpp
@@ -89,7 +89,7 @@ BOOL C104Keyboard::OnInitDialog()
                KeyboardLayouts[i].pCurrentKey->SubclassDlgItem(KeyboardLayouts[i].nCurrentControlID, this);\r
                m_ToolTip.AddTool(GetDlgItem(KeyboardLayouts[i].nCurrentControlID), CProfile::GetToolTipID(KeyboardLayouts[i].nToolTipID));\r
 \r
-               ScanCode_t current = {'\0'};\r
+               ScanCode current = {'\0'};\r
                if (CProfile::GetScanCodeMap(m_HkeyType, KeyboardLayouts[i].scancode, &current)) {\r
                        KeyboardLayouts[i].pCurrentKey->SetKeyType(REMAPPED_KEY);\r
 \r
@@ -97,7 +97,7 @@ BOOL C104Keyboard::OnInitDialog()
                        GetDlgItem(CProfile::GetBaseControlID(current))->GetWindowText(szWindowText);\r
                        GetDlgItem(KeyboardLayouts[i].nCurrentControlID)->SetWindowText(szWindowText);\r
 \r
-                       KeyboardLayout_t *pKeyboardLayout = CProfile::GetKeyboardLayouts(CProfile::GetBaseControlID(current));\r
+                       KeyboardLayout *pKeyboardLayout = CProfile::GetKeyboardLayouts(CProfile::GetBaseControlID(current));\r
                        if (pKeyboardLayout) {\r
                                m_ToolTip.UpdateTipText(CProfile::GetToolTipID(pKeyboardLayout->nToolTipID), GetDlgItem(KeyboardLayouts[i].nCurrentControlID));\r
                        }\r

diff --git a/xkeymacs/109keyboard.cpp b/xkeymacs/109keyboard.cpp
index 17b0433..9bacb41 100644 (file)
--- a/xkeymacs/109keyboard.cpp
+++ b/xkeymacs/109keyboard.cpp
@@ -89,7 +89,7 @@ BOOL C109Keyboard::OnInitDialog()
                KeyboardLayouts[i].pCurrentKey->SubclassDlgItem(KeyboardLayouts[i].nCurrentControlID, this);\r
                m_ToolTip.AddTool(GetDlgItem(KeyboardLayouts[i].nCurrentControlID), CProfile::GetToolTipID(KeyboardLayouts[i].nToolTipID));\r
 \r
-               ScanCode_t current = {'\0'};\r
+               ScanCode current = {'\0'};\r
                if (CProfile::GetScanCodeMap(m_HkeyType, KeyboardLayouts[i].scancode, &current)) {\r
                        KeyboardLayouts[i].pCurrentKey->SetKeyType(REMAPPED_KEY);\r
 \r
@@ -97,7 +97,7 @@ BOOL C109Keyboard::OnInitDialog()
                        GetDlgItem(CProfile::GetBaseControlID(current))->GetWindowText(szWindowText);\r
                        GetDlgItem(KeyboardLayouts[i].nCurrentControlID)->SetWindowText(szWindowText);\r
 \r
-                       KeyboardLayout_t *pKeyboardLayout = CProfile::GetKeyboardLayouts(CProfile::GetBaseControlID(current));\r
+                       KeyboardLayout *pKeyboardLayout = CProfile::GetKeyboardLayouts(CProfile::GetBaseControlID(current));\r
                        if (pKeyboardLayout) {\r
                                m_ToolTip.UpdateTipText(CProfile::GetToolTipID(pKeyboardLayout->nToolTipID), GetDlgItem(KeyboardLayouts[i].nCurrentControlID));\r
                        }\r

diff --git a/xkeymacs/key.cpp b/xkeymacs/key.cpp
index 54e98be..4374193 100644 (file)
--- a/xkeymacs/key.cpp
+++ b/xkeymacs/key.cpp
@@ -151,7 +151,7 @@ void CKey::OnLButtonUp(const UINT nFlags, const CPoint point)
 \r
        if (m_nKeyType == REMAPPED_PUSHED_KEY) {\r
                if (m_nKey == GetPointedKey(point)) {\r
-                       KeyboardLayout_t *pKeyboardLayout = CProfile::GetKeyboardLayouts(m_nKey);\r
+                       KeyboardLayout *pKeyboardLayout = CProfile::GetKeyboardLayouts(m_nKey);\r
                        if (pKeyboardLayout) {\r
                                CString szWindowText;\r
                                GetParent()->GetDlgItem(pKeyboardLayout->nBaseControlID)->GetWindowText(szWindowText);\r
@@ -163,8 +163,8 @@ void CKey::OnLButtonUp(const UINT nFlags, const CPoint point)
                                        ((C104Keyboard*)GetParent())->m_ToolTip.UpdateTipText(CProfile::GetToolTipID(pKeyboardLayout->nToolTipID), this);\r
                                }\r
 \r
-                               ScanCodeMapping_t ScanCodeMapping = {{0, 0}, {pKeyboardLayout->scancode.nScanCode, pKeyboardLayout->scancode.nPrefixedScanCode}};\r
-                               CProfile::SetScanCodeMap(m_HkeyType, ScanCodeMapping);\r
+                               ScanCodeMapping mapping = {{0, 0}, {pKeyboardLayout->scancode.nScanCode, pKeyboardLayout->scancode.nPrefixedScanCode}};\r
+                               CProfile::SetScanCodeMap(m_HkeyType, mapping);\r
                        }\r
                        SetKeyType(ORIGINAL_KEY);\r
                } else {\r
@@ -184,8 +184,8 @@ void CKey::OnLButtonUp(const UINT nFlags, const CPoint point)
                }\r
 \r
                if (m_nDroppableKey) {\r
-                       KeyboardLayout_t *pKeyboardLayout = CProfile::GetKeyboardLayouts(m_nDroppableKey);\r
-                       KeyboardLayout_t *pBaseKeyboardLayout = CProfile::GetKeyboardLayouts(m_nKey);\r
+                       KeyboardLayout *pKeyboardLayout = CProfile::GetKeyboardLayouts(m_nDroppableKey);\r
+                       KeyboardLayout *pBaseKeyboardLayout = CProfile::GetKeyboardLayouts(m_nKey);\r
                        if (pKeyboardLayout && pBaseKeyboardLayout) {\r
                                CString szWindowText;\r
                                GetWindowText(szWindowText);\r
@@ -200,9 +200,9 @@ void CKey::OnLButtonUp(const UINT nFlags, const CPoint point)
                                ((CKey*)GetParent()->GetDlgItem(pKeyboardLayout->nBaseControlID))->SetKeyType(NORMAL_KEY);\r
                                ((CKey*)GetParent()->GetDlgItem(pKeyboardLayout->nCurrentControlID))->SetKeyType(REMAPPED_KEY);\r
 \r
-                               ScanCodeMapping_t ScanCodeMapping = {{pBaseKeyboardLayout->scancode.nScanCode, pBaseKeyboardLayout->scancode.nPrefixedScanCode}, \r
-                                                                                                        {pKeyboardLayout->scancode.nScanCode, pKeyboardLayout->scancode.nPrefixedScanCode}};\r
-                               CProfile::SetScanCodeMap(m_HkeyType, ScanCodeMapping);\r
+                               ScanCodeMapping mapping = {{pBaseKeyboardLayout->scancode.nScanCode, pBaseKeyboardLayout->scancode.nPrefixedScanCode}, \r
+                                                                                       {pKeyboardLayout->scancode.nScanCode, pKeyboardLayout->scancode.nPrefixedScanCode}};\r
+                               CProfile::SetScanCodeMap(m_HkeyType, mapping);\r
                        }\r
                }\r
        }\r

diff --git a/xkeymacs/profile.cpp b/xkeymacs/profile.cpp
index 384b526..a26f5ff 100644 (file)
--- a/xkeymacs/profile.cpp
+++ b/xkeymacs/profile.cpp
@@ -21,8 +21,8 @@ static char THIS_FILE[]=__FILE__;
 CXkeymacsData CProfile::m_XkeymacsData[MAX_APP];\r
 TASK_LIST CProfile::m_TaskList[MAX_TASKS];\r
 DWORD CProfile::m_dwTasks;\r
-ScanCode_t CProfile::m_CurrentScanCodeMap[MAX_HKEY_TYPE][4][256];\r
-ScanCode_t CProfile::m_ScanCodeMap[MAX_HKEY_TYPE][4][256];\r
+ScanCode CProfile::m_CurrentScanCodeMap[MAX_HKEY_TYPE][4][256];\r
+ScanCode CProfile::m_ScanCodeMap[MAX_HKEY_TYPE][4][256];\r
 \r
 enum { INITIAL_SIZE    = 51200 };\r
 enum { EXTEND_SIZE     = 25600 };\r
@@ -1406,13 +1406,12 @@ void CProfile::LoadScanCodeMap(const HKEY_TYPE hkeyType)
                                        // illegal data\r
                                } else {\r
                                        while (offset < dwData - 4) {\r
-                                               ScanCodeMapping_t *pScanCodeMapping = (ScanCodeMapping_t *)(lpData + offset);\r
+                                               ScanCodeMapping *pMapping = (ScanCodeMapping *)(lpData + offset);\r
                                                offset += 4;    // go to next data\r
-\r
-                                               m_CurrentScanCodeMap[hkeyType][PrefixedScanCode2ID(pScanCodeMapping->original.nPrefixedScanCode)][pScanCodeMapping->original.nScanCode].nPrefixedScanCode = pScanCodeMapping->current.nPrefixedScanCode;\r
-                                               m_CurrentScanCodeMap[hkeyType][PrefixedScanCode2ID(pScanCodeMapping->original.nPrefixedScanCode)][pScanCodeMapping->original.nScanCode].nScanCode = pScanCodeMapping->current.nScanCode;\r
-                                               m_ScanCodeMap[hkeyType][PrefixedScanCode2ID(pScanCodeMapping->original.nPrefixedScanCode)][pScanCodeMapping->original.nScanCode].nPrefixedScanCode = pScanCodeMapping->current.nPrefixedScanCode;\r
-                                               m_ScanCodeMap[hkeyType][PrefixedScanCode2ID(pScanCodeMapping->original.nPrefixedScanCode)][pScanCodeMapping->original.nScanCode].nScanCode = pScanCodeMapping->current.nScanCode;\r
+                                               m_CurrentScanCodeMap[hkeyType][PrefixedScanCode2ID(pMapping->original.nPrefixedScanCode)][pMapping->original.nScanCode].nPrefixedScanCode = pMapping->current.nPrefixedScanCode;\r
+                                               m_CurrentScanCodeMap[hkeyType][PrefixedScanCode2ID(pMapping->original.nPrefixedScanCode)][pMapping->original.nScanCode].nScanCode = pMapping->current.nScanCode;\r
+                                               m_ScanCodeMap[hkeyType][PrefixedScanCode2ID(pMapping->original.nPrefixedScanCode)][pMapping->original.nScanCode].nPrefixedScanCode = pMapping->current.nPrefixedScanCode;\r
+                                               m_ScanCodeMap[hkeyType][PrefixedScanCode2ID(pMapping->original.nPrefixedScanCode)][pMapping->original.nScanCode].nScanCode = pMapping->current.nScanCode;\r
                                        }\r
                                }\r
                        }\r
@@ -1510,7 +1509,7 @@ void CProfile::SaveScanCodeMap(const HKEY_TYPE hkeyType)
                                for (int nPrefixedScanCodeID = 0; nPrefixedScanCodeID < 3; ++nPrefixedScanCodeID) {\r
                                        for (int nScanCode = 0; nScanCode < 256; ++nScanCode) {\r
                                                if (m_ScanCodeMap[hkeyType][nPrefixedScanCodeID][nScanCode].nScanCode) {\r
-                                                       ScanCodeMapping_t sScanCodeMapping = {'\0'};\r
+                                                       ScanCodeMapping sScanCodeMapping = {'\0'};\r
                                                        sScanCodeMapping.original.nPrefixedScanCode = PrefixedScanCodeID2Code(nPrefixedScanCodeID);\r
                                                        sScanCodeMapping.original.nScanCode = (BYTE)nScanCode;\r
                                                        sScanCodeMapping.current.nPrefixedScanCode = m_ScanCodeMap[hkeyType][nPrefixedScanCodeID][nScanCode].nPrefixedScanCode;\r
@@ -1582,7 +1581,7 @@ void CProfile::RestartComputer()
        ExitWindowsEx(EWX_REBOOT, 0);\r
 }\r
 \r
-int CProfile::GetControlID(const ScanCode_t scancode, const BOOL bBase)\r
+int CProfile::GetControlID(const ScanCode scancode, const BOOL bBase)\r
 {\r
        for (int i = 0; ; ++i) {\r
                if (KeyboardLayouts[i].scancode.nPrefixedScanCode == scancode.nPrefixedScanCode\r
@@ -1597,17 +1596,17 @@ int CProfile::GetControlID(const ScanCode_t scancode, const BOOL bBase)
        return 0;\r
 }\r
 \r
-int CProfile::GetBaseControlID(const ScanCode_t scancode)\r
+int CProfile::GetBaseControlID(const ScanCode scancode)\r
 {\r
        return GetControlID(scancode, TRUE);\r
 }\r
 \r
-int CProfile::GetCurrentControlID(const ScanCode_t scancode)\r
+int CProfile::GetCurrentControlID(const ScanCode scancode)\r
 {\r
        return GetControlID(scancode, FALSE);\r
 }\r
 \r
-BOOL CProfile::GetScanCodeMap(const HKEY_TYPE hkeyType, const ScanCode_t original, ScanCode_t *const current)\r
+BOOL CProfile::GetScanCodeMap(const HKEY_TYPE hkeyType, const ScanCode original, ScanCode *const current)\r
 {\r
        if (!current) {\r
                return FALSE;\r
@@ -1616,7 +1615,7 @@ BOOL CProfile::GetScanCodeMap(const HKEY_TYPE hkeyType, const ScanCode_t origina
        return 0 < current->nScanCode;\r
 }\r
 \r
-void CProfile::SetScanCodeMap(const HKEY_TYPE hkeyType, const ScanCodeMapping_t ScanCodeMappeing)\r
+void CProfile::SetScanCodeMap(const HKEY_TYPE hkeyType, const ScanCodeMapping ScanCodeMappeing)\r
 {\r
        m_ScanCodeMap[hkeyType][PrefixedScanCode2ID(ScanCodeMappeing.original.nPrefixedScanCode)][ScanCodeMappeing.original.nScanCode] = ScanCodeMappeing.current;\r
 }\r
@@ -1746,7 +1745,7 @@ int CProfile::GetToolTipID(int nToolTipID)
        return nToolTipID;\r
 }\r
 \r
-KeyboardLayout_t* CProfile::GetKeyboardLayouts(const int nKey)\r
+KeyboardLayout* CProfile::GetKeyboardLayouts(const int nKey)\r
 {\r
        for (int i = 0; i < sizeof(KeyboardLayouts) / sizeof(KeyboardLayouts[0]); ++i) {\r
                if (KeyboardLayouts[i].nBaseControlID == nKey\r

diff --git a/xkeymacs/profile.h b/xkeymacs/profile.h
index bde529d..5f5c76c 100644 (file)
--- a/xkeymacs/profile.h
+++ b/xkeymacs/profile.h
@@ -23,41 +23,42 @@
 typedef BOOL (WINAPI *PROCESSWALK)(HANDLE hSnapshot, LPPROCESSENTRY32 lppe);\r
 typedef HANDLE (WINAPI *CREATESNAPSHOT)(DWORD dwFlags, DWORD th32ProcessID);\r
 \r
-typedef struct _TASK_LIST {\r
+struct TASK_LIST {\r
     DWORD dwProcessId;\r
     CHAR ProcessName[PROCESS_SIZE];\r
-} TASK_LIST, *PTASK_LIST;\r
+};\r
+typedef TASK_LIST *PTASK_LIST;\r
 \r
 enum { MAX_TASKS = 256 };\r
 \r
 enum KEY_TYPE { NORMAL_KEY, PUSHED_KEY, DROPPABLE_KEY, ORIGINAL_KEY, REMAPPED_KEY, REMAPPED_PUSHED_KEY };\r
 enum HKEY_TYPE { CURRENT_USER, LOCAL_MACHINE, MAX_HKEY_TYPE }; // USERS, CLASSES_ROOT, CURRENT_CONFIG, \r
 \r
-typedef struct ScanCode\r
+struct ScanCode\r
 {\r
        BYTE nScanCode;\r
        BYTE nPrefixedScanCode; // 0x00, 0xE0 or 0xE1   cf. Keyboard Scan Code Specification -- 16\r
-} ScanCode_t;\r
+};\r
 \r
-typedef struct ScanCodeMapping\r
+struct ScanCodeMapping\r
 {\r
-       ScanCode_t current;\r
-       ScanCode_t original;\r
-} ScanCodeMapping_t;\r
+       ScanCode current;\r
+       ScanCode original;\r
+};\r
 \r
 class CKey;\r
 \r
 typedef struct KeyboardLayout\r
 {\r
-       ScanCode_t scancode;\r
+       ScanCode scancode;\r
        int nBaseControlID;\r
        int nCurrentControlID;\r
        int nToolTipID;\r
        CKey *pBaseKey;\r
        CKey *pCurrentKey;\r
-} KeyboardLayout_t;\r
+} KeyboardLayout;\r
 \r
-static KeyboardLayout_t KeyboardLayouts[] = {\r
+static KeyboardLayout KeyboardLayouts[] = {\r
        {{0x01, 0x00}, IDC_ESC,                         IDC_ESC_,                       IDS_ESC},\r
        {{0x02, 0x00}, IDC_1,                           IDC_1_,                         IDS_1},\r
        {{0x03, 0x00}, IDC_2,                           IDC_2_,                         IDS_2},\r
@@ -183,15 +184,15 @@ public:
        static BOOL GetEnableCUA(int nApplicationID);\r
        static void ImportProperties();\r
        static void ExportProperties();\r
-       static KeyboardLayout_t* GetKeyboardLayouts(int nKey);\r
+       static KeyboardLayout* GetKeyboardLayouts(int nKey);\r
        static int GetToolTipID(int nToolTipID);\r
        static void SetNoCursor();\r
        static void SetNormalCursor();\r
        static void SetDraggingCursor();\r
-       static void SetScanCodeMap(HKEY_TYPE hkeyType, ScanCodeMapping_t ScanCodeMappeing);\r
-       static int GetCurrentControlID(ScanCode_t scancode);\r
-       static int GetBaseControlID(ScanCode_t scancode);\r
-       static BOOL GetScanCodeMap(HKEY_TYPE hkeyType, ScanCode_t original, ScanCode_t *current);\r
+       static void SetScanCodeMap(HKEY_TYPE hkeyType, ScanCodeMapping mapping);\r
+       static int GetCurrentControlID(ScanCode scancode);\r
+       static int GetBaseControlID(ScanCode scancode);\r
+       static BOOL GetScanCodeMap(HKEY_TYPE hkeyType, ScanCode original, ScanCode *current);\r
        static void RestartComputer();\r
        static BOOL IsVistaOrLater();\r
        static BOOL IsNT();\r
@@ -239,9 +240,9 @@ private:
        static BYTE PrefixedScanCodeID2Code(int nPrefixedScanCodeID);\r
        static DWORD GetScanCodeLength(HKEY_TYPE hkeyType);\r
        static int PrefixedScanCode2ID(BYTE nPrefixedScanCode);\r
-       static ScanCode_t m_CurrentScanCodeMap[MAX_HKEY_TYPE][4][256];\r
-       static ScanCode_t m_ScanCodeMap[MAX_HKEY_TYPE][4][256];\r
-       static int GetControlID(ScanCode_t scancode, BOOL bBase);\r
+       static ScanCode m_CurrentScanCodeMap[MAX_HKEY_TYPE][4][256];\r
+       static ScanCode m_ScanCodeMap[MAX_HKEY_TYPE][4][256];\r
+       static int GetControlID(ScanCode scancode, BOOL bBase);\r
        static void Item2AppName(CString *sz);\r
        static int IsNotSameString(CComboBox *pApplication, CString szListItem);\r
        static int CountSeparator(CString szMainString, CString szSeparator);\r
@@ -264,13 +265,13 @@ private:
        static void UpdateRegistryData(BOOL bSaveAndValidate);\r
 };\r
 \r
-typedef struct CommandTypeName\r
+struct CommandTypeName\r
 {\r
        int nCommandType;\r
        LPCTSTR szCommandTypeName;\r
-} CommandTypeName_t;\r
+};\r
 \r
-static const CommandTypeName_t CommandTypes[] = {\r
+static const CommandTypeName CommandTypes[] = {\r
        {NONE,                                                  _T("")},\r
        {SHIFT,                                                 _T("Shift+")},\r
        {CONTROL,                                               _T("Ctrl+")},\r

diff --git a/xkeymacs/xkeymacs.h b/xkeymacs/xkeymacs.h
index 4d31a06..52e99aa 100644 (file)
--- a/xkeymacs/xkeymacs.h
+++ b/xkeymacs/xkeymacs.h
@@ -87,7 +87,7 @@ protected:
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 \r
-static const KeyName_t KeyNames[] = {\r
+static const KeyName KeyNames[] = {\r
        {0,                             _T("")},\r
        {VK_LBUTTON,    _T("Left mouse button")},\r
        {VK_RBUTTON,    _T("Right mouse button")},\r

diff --git a/xkeymacsdll/Commands.h b/xkeymacsdll/Commands.h
index 375a7cb..b413d0f 100644 (file)
--- a/xkeymacsdll/Commands.h
+++ b/xkeymacsdll/Commands.h
@@ -248,7 +248,7 @@ typedef struct Command
        int nDescriptionID;\r
        int nToolTipID;\r
        int (*fCommand)();\r
-       KeyBind_t keybind[MAX_KEY_BIND];\r
+       KeyBind keybind[MAX_KEY_BIND];\r
 } Command_t;\r
 \r
 #include "../xkeymacs/resource.h"\r

diff --git a/xkeymacsdll/xkeymacsdll.cpp b/xkeymacsdll/xkeymacsdll.cpp
index f1e2b8b..0470477 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.cpp
+++ b/xkeymacsdll/xkeymacsdll.cpp
@@ -1129,7 +1129,7 @@ DO_NOTHING:
 \r
                        if ((!(lParam & BEING_RELEASED)) || bDown[wParam]) {\r
                                try {\r
-                                       KbdMacro_t *pKbdMacro = new KbdMacro;\r
+                                       KbdMacro *pKbdMacro = new KbdMacro;\r
                                        if (pKbdMacro) {\r
                                                pKbdMacro->nCode = nCode;\r
                                                pKbdMacro->wParam = wParam;\r
@@ -1774,7 +1774,7 @@ void CXkeymacsDll::DefiningMacro(BOOL bDefiningMacro)
                }\r
        } else {                                // end-kbd-macro\r
                while (!m_Macro.IsEmpty()) {\r
-                       KbdMacro_t *pKbdMacro = (KbdMacro_t *)m_Macro.GetTail();\r
+                       KbdMacro *pKbdMacro = (KbdMacro *)m_Macro.GetTail();\r
                        if (pKbdMacro->lParam & BEING_RELEASED) {\r
                                break;\r
                        } else {\r
@@ -1798,9 +1798,9 @@ void CXkeymacsDll::DefiningMacro(BOOL bDefiningMacro)
 //                                     CUtils::Log(_T("Macro MemMap: 2.5"));\r
                                        for (int i = 0; i < m_Macro.GetCount(); ++i) {\r
 //                                             CUtils::Log(_T("Macro MemMap: 3-1 %d"), i);\r
-                                               KbdMacro_t *pKbdMacro = (KbdMacro_t *)m_Macro.GetAt(m_Macro.FindIndex(i));\r
+                                               KbdMacro *pKbdMacro = (KbdMacro *)m_Macro.GetAt(m_Macro.FindIndex(i));\r
 //                                             CUtils::Log(_T("Macro MemMap: 3-2 %d"), i);\r
-                                               memcpy((LPTSTR) pView + i * sizeof(KbdMacro_t), pKbdMacro, sizeof(KbdMacro_t));\r
+                                               memcpy((LPTSTR) pView + i * sizeof(KbdMacro), pKbdMacro, sizeof(KbdMacro));\r
 //                                             CUtils::Log(_T("Macro MemMap: 3-3 %d"), i);\r
                                        }\r
 //                                     CUtils::Log(_T("Macro MemMap: 4"));\r
@@ -1839,7 +1839,7 @@ void CXkeymacsDll::CallMacro()
        }\r
 \r
        for (POSITION pos = m_Macro.GetHeadPosition(); pos; ) {\r
-               KbdMacro_t *pKbdMacro = (KbdMacro_t *)m_Macro.GetNext(pos);\r
+               KbdMacro *pKbdMacro = (KbdMacro *)m_Macro.GetNext(pos);\r
                if (pKbdMacro->lParam & BEING_RELEASED) {\r
                        ReleaseKey((BYTE)pKbdMacro->wParam);\r
                } else {\r
@@ -1942,7 +1942,7 @@ void CXkeymacsDll::SetFunctionDefinition(int nFunctionID, CString szDefinition)
 // call an original command which is defined in dot.xkeymacs\r
 void CXkeymacsDll::CallFunction(int nFunctionID)\r
 {\r
-       CArray<KeyBind_t, KeyBind_t> keybinds;\r
+       CArray<KeyBind, KeyBind> keybinds;\r
 \r
        if (nFunctionID < 0 || MAX_FUNCTION <= nFunctionID || !_tcslen(m_szFunctionDefinition[nFunctionID])) {\r
                return;\r
@@ -1964,7 +1964,7 @@ void CXkeymacsDll::CallFunction(int nFunctionID)
                        } else {                                                                                                // [ControlCharacter]\r
                                for (int nKeyID = 0; nKeyID < sizeof(ControlCharacters) / sizeof(ControlCharacters[0]); ++nKeyID) {\r
                                        if (!_tcsncmp(m_szFunctionDefinition[nFunctionID] + i, ControlCharacters[nKeyID].name, _tcslen(ControlCharacters[nKeyID].name))) {\r
-                                               KeyBind_t keybind = {NONE, ControlCharacters[nKeyID].bVk};\r
+                                               KeyBind keybind = {NONE, ControlCharacters[nKeyID].bVk};\r
                                                keybinds.Add(keybind);\r
                                                i += _tcslen(ControlCharacters[nKeyID].name);\r
                                                break;\r
@@ -2088,7 +2088,7 @@ void CXkeymacsDll::CallFunction(int nFunctionID)
        return;\r
 }\r
 \r
-KeyBind_t CXkeymacsDll::ParseKey(const int nFunctionID, unsigned int &i)\r
+KeyBind CXkeymacsDll::ParseKey(const int nFunctionID, unsigned int &i)\r
 {\r
        KeyBind keybind = {NONE};\r
 \r

diff --git a/xkeymacsdll/xkeymacsdll.h b/xkeymacsdll/xkeymacsdll.h
index b611fef..84b6df4 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.h
+++ b/xkeymacsdll/xkeymacsdll.h
@@ -35,27 +35,27 @@ enum { EXTENDED_KEY = 0x01000000 };
 enum { REPEATED_KEY = 0x40000000 };\r
 enum { BEING_RELEASED = 0x80000000 };\r
 \r
-typedef struct KeyBind\r
+struct KeyBind\r
 {\r
        int nCommandType;\r
        BYTE bVk;\r
        int nControlID;\r
-} KeyBind_t;\r
+};\r
 \r
-typedef struct KbdMacro\r
+struct KbdMacro\r
 {\r
        int nCode;\r
        WPARAM wParam;\r
        LPARAM lParam;\r
        BOOL bOriginal;\r
-} KbdMacro_t;\r
+};\r
 \r
-typedef struct Modifier {\r
+struct Modifier {\r
        LPCTSTR name;\r
        int id;\r
-} Modifier_t;\r
+};\r
 \r
-static const Modifier_t Modifiers[] = {\r
+static const Modifier Modifiers[] = {\r
 //     { _T("A-"), ALT },\r
        { _T("C-"), CONTROL},\r
 //     { _T("H-"), HYPER },\r
@@ -67,13 +67,13 @@ static const Modifier_t Modifiers[] = {
        { _T("Win+"), WIN_WIN },\r
 };\r
 \r
-typedef struct KeyName\r
+struct KeyName\r
 {\r
        BYTE bVk;\r
        LPCTSTR name;\r
-} KeyName_t;\r
+};\r
 \r
-static const KeyName_t ControlCharacters[] = {\r
+static const KeyName ControlCharacters[] = {\r
 //     { VK_LBUTTON,           _T("mouse-1") },                                // does not work well\r
 //     { VK_RBUTTON,           _T("mouse-3") },                                // does not work well\r
        { VK_CANCEL,            _T("break") },\r
@@ -247,7 +247,7 @@ private:
        static LRESULT CALLBACK CallWndProc(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 KeyBind_t ParseKey(const int nFunctionID, unsigned int &i);\r
+       static KeyBind ParseKey(const int nFunctionID, unsigned int &i);\r
        static BYTE a2v(TCHAR nAscii);\r
        static BOOL IsShift(TCHAR nAscii);\r
        static TCHAR m_szFunctionDefinition[MAX_FUNCTION][MAX_DEFINITION];\r