OSDN Git Service

Move some declarations in xkeymacsdll/xkeymacsdll.h to
authorKazuhiro Fujieda <fujieda@users.sourceforge.jp>
Fri, 13 May 2011 04:03:58 +0000 (13:03 +0900)
committerKazuhiro Fujieda <fujieda@users.sourceforge.jp>
Thu, 26 May 2011 23:35:53 +0000 (08:35 +0900)
xkeymacsdll/xkeymacsdll.cpp.

xkeymacsdll/xkeymacsdll.cpp
xkeymacsdll/xkeymacsdll.h

index 0470477..194647f 100644 (file)
 static char THIS_FILE[] = __FILE__;\r
 #endif\r
 \r
+struct KbdMacro\r
+{\r
+       int nCode;\r
+       WPARAM wParam;\r
+       LPARAM lParam;\r
+       BOOL bOriginal;\r
+};\r
+\r
+struct Modifier {\r
+       LPCTSTR name;\r
+       int id;\r
+};\r
+\r
+static const Modifier Modifiers[] = {\r
+//     { _T("A-"), ALT },\r
+       { _T("C-"), CONTROL},\r
+//     { _T("H-"), HYPER },\r
+       { _T("M-"), META },\r
+       { _T("S-"), SHIFT },\r
+//     { _T("s-"), SUPER },\r
+       { _T("Ctrl+"), WIN_CTRL },\r
+       { _T("Alt+"), WIN_ALT },\r
+       { _T("Win+"), WIN_WIN },\r
+};\r
+\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
+//     { VK_MBUTTON,           _T("mouse-2") },                                // does not work well\r
+       { VK_BACK,                      _T("backspace") },\r
+       { VK_TAB,                       _T("tab") },\r
+       { VK_RETURN,            _T("return") },\r
+       { VK_CAPITAL,           _T("capslock") },\r
+       { VK_KANA,                      _T("kana") },\r
+       { VK_KANJI,                     _T("kanji") },\r
+       { VK_ESCAPE,            _T("escape") },\r
+       { VK_CONVERT,           _T("convert") },\r
+       { VK_NONCONVERT,        _T("nonconvert") },\r
+//     { VK_SPACE,                     _T("SPC") },                                    // [? ]\r
+       { VK_PRIOR,                     _T("prior") },\r
+       { VK_NEXT,                      _T("next") },\r
+       { VK_END,                       _T("end") },\r
+       { VK_HOME,                      _T("home") },\r
+       { VK_LEFT,                      _T("left") },\r
+       { VK_UP,                        _T("up") },\r
+       { VK_RIGHT,                     _T("right") },\r
+       { VK_DOWN,                      _T("down") },\r
+       { VK_SELECT,            _T("select") },\r
+       { VK_PRINT,                     _T("print") },\r
+       { VK_EXECUTE,           _T("execute") },\r
+       { VK_SNAPSHOT,          _T("printscreen") },                    // work as print\r
+       { VK_INSERT,            _T("insert") },\r
+       { VK_DELETE,            _T("delete") },\r
+       { VK_LWIN,                      _T("lwindow") },\r
+       { VK_RWIN,                      _T("rwindow") },\r
+       { VK_APPS,                      _T("apps") },\r
+       { VK_SLEEP,                     _T("sleep") },\r
+       { VK_NUMPAD0,           _T("kp-0") },\r
+       { VK_NUMPAD1,           _T("kp-1") },\r
+       { VK_NUMPAD2,           _T("kp-2") },\r
+       { VK_NUMPAD3,           _T("kp-3") },\r
+       { VK_NUMPAD4,           _T("kp-4") },\r
+       { VK_NUMPAD5,           _T("kp-5") },\r
+       { VK_NUMPAD6,           _T("kp-6") },\r
+       { VK_NUMPAD7,           _T("kp-7") },\r
+       { VK_NUMPAD8,           _T("kp-8") },\r
+       { VK_NUMPAD9,           _T("kp-9") },\r
+       { VK_MULTIPLY,          _T("kp-multiply") },\r
+       { VK_ADD,                       _T("kp-add") },\r
+       { VK_SUBTRACT,          _T("kp-subtract") },\r
+       { VK_DECIMAL,           _T("kp-decimal") },\r
+       { VK_DIVIDE,            _T("kp-divide") },\r
+//     { VK_F1,                        _T("f1") },                                             // FIXME\r
+//     { VK_F2,                        _T("f2") },                                             // Move at the end of definition of funcgtion keys to keep away confliction f1/f2 and f1?/f2? by _tcsncmp() i.e. strncmp()\r
+       { VK_F3,                        _T("f3") },\r
+       { VK_F4,                        _T("f4") },\r
+       { VK_F5,                        _T("f5") },\r
+       { VK_F6,                        _T("f6") },\r
+       { VK_F7,                        _T("f7") },\r
+       { VK_F8,                        _T("f8") },\r
+       { VK_F9,                        _T("f9") },\r
+       { VK_F10,                       _T("f10") },\r
+       { VK_F11,                       _T("f11") },\r
+       { VK_F12,                       _T("f12") },\r
+       { VK_F13,                       _T("f13") },\r
+       { VK_F14,                       _T("f14") },\r
+       { VK_F15,                       _T("f15") },\r
+       { VK_F16,                       _T("f16") },\r
+       { VK_F17,                       _T("f17") },\r
+       { VK_F18,                       _T("f18") },\r
+       { VK_F19,                       _T("f19") },\r
+       { VK_F20,                       _T("f20") },\r
+       { VK_F21,                       _T("f21") },\r
+       { VK_F22,                       _T("f22") },\r
+       { VK_F23,                       _T("f23") },\r
+       { VK_F24,                       _T("f24") },\r
+       { VK_F1,                        _T("f1") },\r
+       { VK_F2,                        _T("f2") },\r
+       { VK_NUMLOCK,           _T("kp-numlock") },\r
+       { VK_SCROLL,            _T("scroll") },\r
+       { 0xa6,                         _T("browser-back") },                   // VK_BROWSER_BACK\r
+       { 0xa7,                         _T("browser-forward") },                // VK_BROWSER_FORWARD\r
+       { 0xa8,                         _T("browser-refresh") },                // VK_BROWSER_REFRESH\r
+       { 0xa9,                         _T("browser-stop") },                   // VK_BROWSER_STOP\r
+       { 0xaa,                         _T("browser-search") },                 // VK_BROWSER_SEARCH\r
+       { 0xab,                         _T("browser-favorites") },              // VK_BROWSER_FAVORITES\r
+       { 0xac,                         _T("browser-home") },                   // VK_BROWSER_HOME\r
+       { 0xad,                         _T("volume-mute") },                    // VK_VOLUME_MUTE\r
+       { 0xae,                         _T("volume-down") },                    // VK_VOLUME_DOWN\r
+       { 0xaf,                         _T("volume-up") },                              // VK_VOLUME_UP\r
+       { 0xb0,                         _T("media-next-track") },               // VK_MEDIA_NEXT_TRACK\r
+       { 0xb1,                         _T("media-prev-track") },               // VK_MEDIA_PREV_TRACK\r
+       { 0xb2,                         _T("media-stop") },                             // VK_MEDIA_STOP\r
+       { 0xb3,                         _T("media-play-pause") },               // VK_MEDIA_PLAY_PAUSE\r
+       { 0xb4,                         _T("launch-mail") },                    // VK_LAUNCH_MAIL\r
+       { 0xb5,                         _T("launch-media-select") },    // VK_LAUNCH_MEDIA_SELECT\r
+       { 0xb6,                         _T("launch-1") },                               // VK_LAUNCH_APP1\r
+       { 0xb7,                         _T("launch-2") },                               // VK_LAUNCH_APP2\r
+};\r
 \r
 static AFX_EXTENSION_MODULE XkeymacsdllDLL = { NULL, NULL };\r
 \r
index 84b6df4..ade4e2b 100644 (file)
@@ -42,133 +42,12 @@ struct KeyBind
        int nControlID;\r
 };\r
 \r
-struct KbdMacro\r
-{\r
-       int nCode;\r
-       WPARAM wParam;\r
-       LPARAM lParam;\r
-       BOOL bOriginal;\r
-};\r
-\r
-struct Modifier {\r
-       LPCTSTR name;\r
-       int id;\r
-};\r
-\r
-static const Modifier Modifiers[] = {\r
-//     { _T("A-"), ALT },\r
-       { _T("C-"), CONTROL},\r
-//     { _T("H-"), HYPER },\r
-       { _T("M-"), META },\r
-       { _T("S-"), SHIFT },\r
-//     { _T("s-"), SUPER },\r
-       { _T("Ctrl+"), WIN_CTRL },\r
-       { _T("Alt+"), WIN_ALT },\r
-       { _T("Win+"), WIN_WIN },\r
-};\r
-\r
 struct KeyName\r
 {\r
        BYTE bVk;\r
        LPCTSTR name;\r
 };\r
 \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
-//     { VK_MBUTTON,           _T("mouse-2") },                                // does not work well\r
-       { VK_BACK,                      _T("backspace") },\r
-       { VK_TAB,                       _T("tab") },\r
-       { VK_RETURN,            _T("return") },\r
-       { VK_CAPITAL,           _T("capslock") },\r
-       { VK_KANA,                      _T("kana") },\r
-       { VK_KANJI,                     _T("kanji") },\r
-       { VK_ESCAPE,            _T("escape") },\r
-       { VK_CONVERT,           _T("convert") },\r
-       { VK_NONCONVERT,        _T("nonconvert") },\r
-//     { VK_SPACE,                     _T("SPC") },                                    // [? ]\r
-       { VK_PRIOR,                     _T("prior") },\r
-       { VK_NEXT,                      _T("next") },\r
-       { VK_END,                       _T("end") },\r
-       { VK_HOME,                      _T("home") },\r
-       { VK_LEFT,                      _T("left") },\r
-       { VK_UP,                        _T("up") },\r
-       { VK_RIGHT,                     _T("right") },\r
-       { VK_DOWN,                      _T("down") },\r
-       { VK_SELECT,            _T("select") },\r
-       { VK_PRINT,                     _T("print") },\r
-       { VK_EXECUTE,           _T("execute") },\r
-       { VK_SNAPSHOT,          _T("printscreen") },                    // work as print\r
-       { VK_INSERT,            _T("insert") },\r
-       { VK_DELETE,            _T("delete") },\r
-       { VK_LWIN,                      _T("lwindow") },\r
-       { VK_RWIN,                      _T("rwindow") },\r
-       { VK_APPS,                      _T("apps") },\r
-       { VK_SLEEP,                     _T("sleep") },\r
-       { VK_NUMPAD0,           _T("kp-0") },\r
-       { VK_NUMPAD1,           _T("kp-1") },\r
-       { VK_NUMPAD2,           _T("kp-2") },\r
-       { VK_NUMPAD3,           _T("kp-3") },\r
-       { VK_NUMPAD4,           _T("kp-4") },\r
-       { VK_NUMPAD5,           _T("kp-5") },\r
-       { VK_NUMPAD6,           _T("kp-6") },\r
-       { VK_NUMPAD7,           _T("kp-7") },\r
-       { VK_NUMPAD8,           _T("kp-8") },\r
-       { VK_NUMPAD9,           _T("kp-9") },\r
-       { VK_MULTIPLY,          _T("kp-multiply") },\r
-       { VK_ADD,                       _T("kp-add") },\r
-       { VK_SUBTRACT,          _T("kp-subtract") },\r
-       { VK_DECIMAL,           _T("kp-decimal") },\r
-       { VK_DIVIDE,            _T("kp-divide") },\r
-//     { VK_F1,                        _T("f1") },                                             // FIXME\r
-//     { VK_F2,                        _T("f2") },                                             // Move at the end of definition of funcgtion keys to keep away confliction f1/f2 and f1?/f2? by _tcsncmp() i.e. strncmp()\r
-       { VK_F3,                        _T("f3") },\r
-       { VK_F4,                        _T("f4") },\r
-       { VK_F5,                        _T("f5") },\r
-       { VK_F6,                        _T("f6") },\r
-       { VK_F7,                        _T("f7") },\r
-       { VK_F8,                        _T("f8") },\r
-       { VK_F9,                        _T("f9") },\r
-       { VK_F10,                       _T("f10") },\r
-       { VK_F11,                       _T("f11") },\r
-       { VK_F12,                       _T("f12") },\r
-       { VK_F13,                       _T("f13") },\r
-       { VK_F14,                       _T("f14") },\r
-       { VK_F15,                       _T("f15") },\r
-       { VK_F16,                       _T("f16") },\r
-       { VK_F17,                       _T("f17") },\r
-       { VK_F18,                       _T("f18") },\r
-       { VK_F19,                       _T("f19") },\r
-       { VK_F20,                       _T("f20") },\r
-       { VK_F21,                       _T("f21") },\r
-       { VK_F22,                       _T("f22") },\r
-       { VK_F23,                       _T("f23") },\r
-       { VK_F24,                       _T("f24") },\r
-       { VK_F1,                        _T("f1") },\r
-       { VK_F2,                        _T("f2") },\r
-       { VK_NUMLOCK,           _T("kp-numlock") },\r
-       { VK_SCROLL,            _T("scroll") },\r
-       { 0xa6,                         _T("browser-back") },                   // VK_BROWSER_BACK\r
-       { 0xa7,                         _T("browser-forward") },                // VK_BROWSER_FORWARD\r
-       { 0xa8,                         _T("browser-refresh") },                // VK_BROWSER_REFRESH\r
-       { 0xa9,                         _T("browser-stop") },                   // VK_BROWSER_STOP\r
-       { 0xaa,                         _T("browser-search") },                 // VK_BROWSER_SEARCH\r
-       { 0xab,                         _T("browser-favorites") },              // VK_BROWSER_FAVORITES\r
-       { 0xac,                         _T("browser-home") },                   // VK_BROWSER_HOME\r
-       { 0xad,                         _T("volume-mute") },                    // VK_VOLUME_MUTE\r
-       { 0xae,                         _T("volume-down") },                    // VK_VOLUME_DOWN\r
-       { 0xaf,                         _T("volume-up") },                              // VK_VOLUME_UP\r
-       { 0xb0,                         _T("media-next-track") },               // VK_MEDIA_NEXT_TRACK\r
-       { 0xb1,                         _T("media-prev-track") },               // VK_MEDIA_PREV_TRACK\r
-       { 0xb2,                         _T("media-stop") },                             // VK_MEDIA_STOP\r
-       { 0xb3,                         _T("media-play-pause") },               // VK_MEDIA_PLAY_PAUSE\r
-       { 0xb4,                         _T("launch-mail") },                    // VK_LAUNCH_MAIL\r
-       { 0xb5,                         _T("launch-media-select") },    // VK_LAUNCH_MEDIA_SELECT\r
-       { 0xb6,                         _T("launch-1") },                               // VK_LAUNCH_APP1\r
-       { 0xb7,                         _T("launch-2") },                               // VK_LAUNCH_APP2\r
-};\r
-\r
 class AFX_EXT_CLASS CXkeymacsDll  \r
 {\r
 public:\r