]> git.saurik.com Git - wxWidgets.git/commitdiff
Implemented wxGetKeyState for wxGTK (and wxX11 too, but I havn't
authorRobin Dunn <robin@alldunn.com>
Thu, 20 May 2004 23:37:20 +0000 (23:37 +0000)
committerRobin Dunn <robin@alldunn.com>
Thu, 20 May 2004 23:37:20 +0000 (23:37 +0000)
tested it there.)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/utils.h
src/unix/utilsx11.cpp
src/x11/utils.cpp

index 41577006b39795d2701ba0b2f722fd3972fe3247..8830abcb6a1cf1274c6d1abb9053d9d4d2e3f60e 100644 (file)
@@ -97,15 +97,12 @@ WXDLLIMPEXP_BASE wxString wxGetDataDir();
 
 
 #if wxUSE_GUI
-#if defined(__WXMSW__) || defined(__WXMAC__)
-       // Get the state of a key (true if pressed, false if not)
-       // This is generally most useful getting the state of
-       // Caps Lock, Num Lock and Scroll Lock...
-
-       // Note - There is a X11/GTK version which will be here
-       // soon
-       WXDLLEXPORT bool wxGetKeyState(wxKeyCode key);
-#endif
+
+// Get the state of a key (true if pressed, false if not)
+// This is generally most useful getting the state of
+// the modifier or toggle keys.
+WXDLLEXPORT bool wxGetKeyState(wxKeyCode key);
+
 
 // Don't synthesize KeyUp events holding down a key and producing
 // KeyDown events with autorepeat. On by default and always on
index d4b4d521a30fee7ace59e1238595bf2077acfc06..4f16da9388bb79acfbc74caba2dc335cef272c1a 100644 (file)
@@ -506,5 +506,299 @@ void wxSetFullScreenStateX11(WXDisplay* display, WXWindow rootWindow,
     }
 }
 
+
+
+// ----------------------------------------------------------------------------
+// keycode translations
+// ----------------------------------------------------------------------------
+
+#include <X11/keysym.h>
+
+// FIXME what about tables??
+
+int wxCharCodeXToWX(KeySym keySym)
+{
+    int id;
+    switch (keySym)
+    {
+        case XK_Shift_L:
+        case XK_Shift_R:
+            id = WXK_SHIFT; break;
+        case XK_Control_L:
+        case XK_Control_R:
+            id = WXK_CONTROL; break;
+        case XK_Meta_L:  
+        case XK_Meta_R:
+            id = WXK_ALT; break;
+        case XK_BackSpace:
+            id = WXK_BACK; break;
+        case XK_Delete:
+            id = WXK_DELETE; break;
+        case XK_Clear:
+            id = WXK_CLEAR; break;
+        case XK_Tab:
+            id = WXK_TAB; break;
+        case XK_numbersign:
+            id = '#'; break;
+        case XK_Return:
+            id = WXK_RETURN; break;
+        case XK_Escape:
+            id = WXK_ESCAPE; break;
+        case XK_Pause:
+        case XK_Break:
+            id = WXK_PAUSE; break;
+        case XK_Num_Lock:
+            id = WXK_NUMLOCK; break;
+        case XK_Scroll_Lock:
+            id = WXK_SCROLL; break;
+
+        case XK_Home:
+            id = WXK_HOME; break;
+        case XK_End:
+            id = WXK_END; break;
+        case XK_Left:
+            id = WXK_LEFT; break;
+        case XK_Right:
+            id = WXK_RIGHT; break;
+        case XK_Up:
+            id = WXK_UP; break;
+        case XK_Down:
+            id = WXK_DOWN; break;
+        case XK_Next:
+            id = WXK_NEXT; break;
+        case XK_Prior:
+            id = WXK_PRIOR; break;
+        case XK_Menu:
+            id = WXK_MENU; break;
+        case XK_Select:
+            id = WXK_SELECT; break;
+        case XK_Cancel:
+            id = WXK_CANCEL; break;
+        case XK_Print:
+            id = WXK_PRINT; break;
+        case XK_Execute:
+            id = WXK_EXECUTE; break;
+        case XK_Insert:
+            id = WXK_INSERT; break;
+        case XK_Help:
+            id = WXK_HELP; break;
+
+        case XK_KP_Multiply:
+            id = WXK_MULTIPLY; break;
+        case XK_KP_Add:
+            id = WXK_ADD; break;
+        case XK_KP_Subtract:
+            id = WXK_SUBTRACT; break;
+        case XK_KP_Divide:
+            id = WXK_DIVIDE; break;
+        case XK_KP_Decimal:
+            id = WXK_DECIMAL; break;
+        case XK_KP_Equal:
+            id = '='; break;
+        case XK_KP_Space:
+            id = ' '; break;
+        case XK_KP_Tab:
+            id = WXK_TAB; break;
+        case XK_KP_Enter:
+            id = WXK_RETURN; break;
+        case XK_KP_0:
+            id = WXK_NUMPAD0; break;
+        case XK_KP_1:
+            id = WXK_NUMPAD1; break;
+        case XK_KP_2:
+            id = WXK_NUMPAD2; break;
+        case XK_KP_3:
+            id = WXK_NUMPAD3; break;
+        case XK_KP_4:
+            id = WXK_NUMPAD4; break;
+        case XK_KP_5:
+            id = WXK_NUMPAD5; break;
+        case XK_KP_6:
+            id = WXK_NUMPAD6; break;
+        case XK_KP_7:
+            id = WXK_NUMPAD7; break;
+        case XK_KP_8:
+            id = WXK_NUMPAD8; break;
+        case XK_KP_9:
+            id = WXK_NUMPAD9; break;
+        case XK_F1:
+            id = WXK_F1; break;
+        case XK_F2:
+            id = WXK_F2; break;
+        case XK_F3:
+            id = WXK_F3; break;
+        case XK_F4:
+            id = WXK_F4; break;
+        case XK_F5:
+            id = WXK_F5; break;
+        case XK_F6:
+            id = WXK_F6; break;
+        case XK_F7:
+            id = WXK_F7; break;
+        case XK_F8:
+            id = WXK_F8; break;
+        case XK_F9:
+            id = WXK_F9; break;
+        case XK_F10:
+            id = WXK_F10; break;
+        case XK_F11:
+            id = WXK_F11; break;
+        case XK_F12:
+            id = WXK_F12; break;
+        case XK_F13:
+            id = WXK_F13; break;
+        case XK_F14:
+            id = WXK_F14; break;
+        case XK_F15:
+            id = WXK_F15; break;
+        case XK_F16:
+            id = WXK_F16; break;
+        case XK_F17:
+            id = WXK_F17; break;
+        case XK_F18:
+            id = WXK_F18; break;
+        case XK_F19:
+            id = WXK_F19; break;
+        case XK_F20:
+            id = WXK_F20; break;
+        case XK_F21:
+            id = WXK_F21; break;
+        case XK_F22:
+            id = WXK_F22; break;
+        case XK_F23:
+            id = WXK_F23; break;
+        case XK_F24:
+            id = WXK_F24; break;
+        default:
+            id = (keySym <= 255) ? (int)keySym : -1;
+    }
+
+    return id;
+}
+
+KeySym wxCharCodeWXToX(int id)
+{
+    KeySym keySym;
+
+    switch (id)
+    {
+        case WXK_CANCEL:        keySym = XK_Cancel; break;
+        case WXK_BACK:          keySym = XK_BackSpace; break;
+        case WXK_TAB:           keySym = XK_Tab; break;
+        case WXK_CLEAR:         keySym = XK_Clear; break;
+        case WXK_RETURN:        keySym = XK_Return; break;
+        case WXK_SHIFT:         keySym = XK_Shift_L; break;
+        case WXK_CONTROL:       keySym = XK_Control_L; break;
+        case WXK_ALT:           keySym = XK_Meta_L; break;            
+        case WXK_MENU :         keySym = XK_Menu; break;
+        case WXK_PAUSE:         keySym = XK_Pause; break;
+        case WXK_ESCAPE:        keySym = XK_Escape; break;
+        case WXK_SPACE:         keySym = ' '; break;
+        case WXK_PRIOR:         keySym = XK_Prior; break;
+        case WXK_NEXT :         keySym = XK_Next; break;
+        case WXK_END:           keySym = XK_End; break;
+        case WXK_HOME :         keySym = XK_Home; break;
+        case WXK_LEFT :         keySym = XK_Left; break;
+        case WXK_UP:            keySym = XK_Up; break;
+        case WXK_RIGHT:         keySym = XK_Right; break;
+        case WXK_DOWN :         keySym = XK_Down; break;
+        case WXK_SELECT:        keySym = XK_Select; break;
+        case WXK_PRINT:         keySym = XK_Print; break;
+        case WXK_EXECUTE:       keySym = XK_Execute; break;
+        case WXK_INSERT:        keySym = XK_Insert; break;
+        case WXK_DELETE:        keySym = XK_Delete; break;
+        case WXK_HELP :         keySym = XK_Help; break;
+        case WXK_NUMPAD0:       keySym = XK_KP_0; break;
+        case WXK_NUMPAD1:       keySym = XK_KP_1; break;
+        case WXK_NUMPAD2:       keySym = XK_KP_2; break;
+        case WXK_NUMPAD3:       keySym = XK_KP_3; break;
+        case WXK_NUMPAD4:       keySym = XK_KP_4; break;
+        case WXK_NUMPAD5:       keySym = XK_KP_5; break;
+        case WXK_NUMPAD6:       keySym = XK_KP_6; break;
+        case WXK_NUMPAD7:       keySym = XK_KP_7; break;
+        case WXK_NUMPAD8:       keySym = XK_KP_8; break;
+        case WXK_NUMPAD9:       keySym = XK_KP_9; break;
+        case WXK_MULTIPLY:      keySym = XK_KP_Multiply; break;
+        case WXK_ADD:           keySym = XK_KP_Add; break;
+        case WXK_SUBTRACT:      keySym = XK_KP_Subtract; break;
+        case WXK_DECIMAL:       keySym = XK_KP_Decimal; break;
+        case WXK_DIVIDE:        keySym = XK_KP_Divide; break;
+        case WXK_F1:            keySym = XK_F1; break;
+        case WXK_F2:            keySym = XK_F2; break;
+        case WXK_F3:            keySym = XK_F3; break;
+        case WXK_F4:            keySym = XK_F4; break;
+        case WXK_F5:            keySym = XK_F5; break;
+        case WXK_F6:            keySym = XK_F6; break;
+        case WXK_F7:            keySym = XK_F7; break;
+        case WXK_F8:            keySym = XK_F8; break;
+        case WXK_F9:            keySym = XK_F9; break;
+        case WXK_F10:           keySym = XK_F10; break;
+        case WXK_F11:           keySym = XK_F11; break;
+        case WXK_F12:           keySym = XK_F12; break;
+        case WXK_F13:           keySym = XK_F13; break;
+        case WXK_F14:           keySym = XK_F14; break;
+        case WXK_F15:           keySym = XK_F15; break;
+        case WXK_F16:           keySym = XK_F16; break;
+        case WXK_F17:           keySym = XK_F17; break;
+        case WXK_F18:           keySym = XK_F18; break;
+        case WXK_F19:           keySym = XK_F19; break;
+        case WXK_F20:           keySym = XK_F20; break;
+        case WXK_F21:           keySym = XK_F21; break;
+        case WXK_F22:           keySym = XK_F22; break;
+        case WXK_F23:           keySym = XK_F23; break;
+        case WXK_F24:           keySym = XK_F24; break;
+        case WXK_NUMLOCK:       keySym = XK_Num_Lock; break;
+        case WXK_SCROLL:        keySym = XK_Scroll_Lock; break;
+        default:                keySym = id <= 255 ? (KeySym)id : 0;
+    }
+
+    return keySym;
+}
+
+
+// ----------------------------------------------------------------------------
+// check current state of a key
+// ----------------------------------------------------------------------------
+
+#include <wx/app.h>
+
+bool wxGetKeyState(wxKeyCode key)
+{
+#if defined(__WXX11__)
+    Display *pDisplay = wxApp::GetDisplay();
+#elif defined(__WXGTK__)
+    Display *pDisplay = GDK_DISPLAY();
+#else
+#error  Add code to get the DISPLAY for this platform
 #endif
+    
+    int iKey = wxCharCodeWXToX(key);
+    int          iKeyMask = 0;
+    Window       wDummy1, wDummy2;
+    int          iDummy3, iDummy4, iDummy5, iDummy6;
+    unsigned int iMask;
+    XModifierKeymap* map = XGetModifierMapping(pDisplay);
+    KeyCode keyCode = XKeysymToKeycode(pDisplay,iKey);
+    if (keyCode == NoSymbol)
+        return false;
+    
+    for (int i = 0; i < 8; ++i)
+    {
+        if ( map->modifiermap[map->max_keypermod * i] == keyCode)
+        {
+            iKeyMask = 1 << i;
+        }
+    }
+    
+    XQueryPointer(pDisplay, DefaultRootWindow(pDisplay), &wDummy1, &wDummy2,
+                  &iDummy3, &iDummy4, &iDummy5, &iDummy6, &iMask );
+    XFreeModifiermap(map);
+    return (iMask & iKeyMask) != 0;
+}
+
+#endif
+
+
+
+
 
index 604a87e828392ce7cd4e55ef957ff05b71f74a24..071f4f6b98cbe5a7c04e250a0ff4d49533f69c4a 100644 (file)
@@ -228,249 +228,6 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
     return wxGenericFindWindowAtPoint(pt);
 }
 
-// ----------------------------------------------------------------------------
-// keycode translations
-// ----------------------------------------------------------------------------
-
-#include <X11/keysym.h>
-
-// FIXME what about tables??
-
-int wxCharCodeXToWX(KeySym keySym)
-{
-    int id;
-    switch (keySym)
-    {
-        case XK_Shift_L:
-        case XK_Shift_R:
-            id = WXK_SHIFT; break;
-        case XK_Control_L:
-        case XK_Control_R:
-            id = WXK_CONTROL; break;
-        case XK_BackSpace:
-            id = WXK_BACK; break;
-        case XK_Delete:
-            id = WXK_DELETE; break;
-        case XK_Clear:
-            id = WXK_CLEAR; break;
-        case XK_Tab:
-            id = WXK_TAB; break;
-        case XK_numbersign:
-            id = '#'; break;
-        case XK_Return:
-            id = WXK_RETURN; break;
-        case XK_Escape:
-            id = WXK_ESCAPE; break;
-        case XK_Pause:
-        case XK_Break:
-            id = WXK_PAUSE; break;
-        case XK_Num_Lock:
-            id = WXK_NUMLOCK; break;
-        case XK_Scroll_Lock:
-            id = WXK_SCROLL; break;
-
-        case XK_Home:
-            id = WXK_HOME; break;
-        case XK_End:
-            id = WXK_END; break;
-        case XK_Left:
-            id = WXK_LEFT; break;
-        case XK_Right:
-            id = WXK_RIGHT; break;
-        case XK_Up:
-            id = WXK_UP; break;
-        case XK_Down:
-            id = WXK_DOWN; break;
-        case XK_Next:
-            id = WXK_NEXT; break;
-        case XK_Prior:
-            id = WXK_PRIOR; break;
-        case XK_Menu:
-            id = WXK_MENU; break;
-        case XK_Select:
-            id = WXK_SELECT; break;
-        case XK_Cancel:
-            id = WXK_CANCEL; break;
-        case XK_Print:
-            id = WXK_PRINT; break;
-        case XK_Execute:
-            id = WXK_EXECUTE; break;
-        case XK_Insert:
-            id = WXK_INSERT; break;
-        case XK_Help:
-            id = WXK_HELP; break;
-
-        case XK_KP_Multiply:
-            id = WXK_MULTIPLY; break;
-        case XK_KP_Add:
-            id = WXK_ADD; break;
-        case XK_KP_Subtract:
-            id = WXK_SUBTRACT; break;
-        case XK_KP_Divide:
-            id = WXK_DIVIDE; break;
-        case XK_KP_Decimal:
-            id = WXK_DECIMAL; break;
-        case XK_KP_Equal:
-            id = '='; break;
-        case XK_KP_Space:
-            id = ' '; break;
-        case XK_KP_Tab:
-            id = WXK_TAB; break;
-        case XK_KP_Enter:
-            id = WXK_RETURN; break;
-        case XK_KP_0:
-            id = WXK_NUMPAD0; break;
-        case XK_KP_1:
-            id = WXK_NUMPAD1; break;
-        case XK_KP_2:
-            id = WXK_NUMPAD2; break;
-        case XK_KP_3:
-            id = WXK_NUMPAD3; break;
-        case XK_KP_4:
-            id = WXK_NUMPAD4; break;
-        case XK_KP_5:
-            id = WXK_NUMPAD5; break;
-        case XK_KP_6:
-            id = WXK_NUMPAD6; break;
-        case XK_KP_7:
-            id = WXK_NUMPAD7; break;
-        case XK_KP_8:
-            id = WXK_NUMPAD8; break;
-        case XK_KP_9:
-            id = WXK_NUMPAD9; break;
-        case XK_F1:
-            id = WXK_F1; break;
-        case XK_F2:
-            id = WXK_F2; break;
-        case XK_F3:
-            id = WXK_F3; break;
-        case XK_F4:
-            id = WXK_F4; break;
-        case XK_F5:
-            id = WXK_F5; break;
-        case XK_F6:
-            id = WXK_F6; break;
-        case XK_F7:
-            id = WXK_F7; break;
-        case XK_F8:
-            id = WXK_F8; break;
-        case XK_F9:
-            id = WXK_F9; break;
-        case XK_F10:
-            id = WXK_F10; break;
-        case XK_F11:
-            id = WXK_F11; break;
-        case XK_F12:
-            id = WXK_F12; break;
-        case XK_F13:
-            id = WXK_F13; break;
-        case XK_F14:
-            id = WXK_F14; break;
-        case XK_F15:
-            id = WXK_F15; break;
-        case XK_F16:
-            id = WXK_F16; break;
-        case XK_F17:
-            id = WXK_F17; break;
-        case XK_F18:
-            id = WXK_F18; break;
-        case XK_F19:
-            id = WXK_F19; break;
-        case XK_F20:
-            id = WXK_F20; break;
-        case XK_F21:
-            id = WXK_F21; break;
-        case XK_F22:
-            id = WXK_F22; break;
-        case XK_F23:
-            id = WXK_F23; break;
-        case XK_F24:
-            id = WXK_F24; break;
-        default:
-            id = (keySym <= 255) ? (int)keySym : -1;
-    }
-
-    return id;
-}
-
-KeySym wxCharCodeWXToX(int id)
-{
-    KeySym keySym;
-
-    switch (id)
-    {
-        case WXK_CANCEL:            keySym = XK_Cancel; break;
-        case WXK_BACK:              keySym = XK_BackSpace; break;
-        case WXK_TAB:            keySym = XK_Tab; break;
-        case WXK_CLEAR:        keySym = XK_Clear; break;
-        case WXK_RETURN:        keySym = XK_Return; break;
-        case WXK_SHIFT:        keySym = XK_Shift_L; break;
-        case WXK_CONTROL:        keySym = XK_Control_L; break;
-        case WXK_MENU :        keySym = XK_Menu; break;
-        case WXK_PAUSE:        keySym = XK_Pause; break;
-        case WXK_ESCAPE:        keySym = XK_Escape; break;
-        case WXK_SPACE:        keySym = ' '; break;
-        case WXK_PRIOR:        keySym = XK_Prior; break;
-        case WXK_NEXT :        keySym = XK_Next; break;
-        case WXK_END:        keySym = XK_End; break;
-        case WXK_HOME :        keySym = XK_Home; break;
-        case WXK_LEFT :        keySym = XK_Left; break;
-        case WXK_UP:        keySym = XK_Up; break;
-        case WXK_RIGHT:        keySym = XK_Right; break;
-        case WXK_DOWN :        keySym = XK_Down; break;
-        case WXK_SELECT:        keySym = XK_Select; break;
-        case WXK_PRINT:        keySym = XK_Print; break;
-        case WXK_EXECUTE:        keySym = XK_Execute; break;
-        case WXK_INSERT:        keySym = XK_Insert; break;
-        case WXK_DELETE:        keySym = XK_Delete; break;
-        case WXK_HELP :        keySym = XK_Help; break;
-        case WXK_NUMPAD0:        keySym = XK_KP_0; break;
-        case WXK_NUMPAD1:        keySym = XK_KP_1; break;
-        case WXK_NUMPAD2:        keySym = XK_KP_2; break;
-        case WXK_NUMPAD3:        keySym = XK_KP_3; break;
-        case WXK_NUMPAD4:        keySym = XK_KP_4; break;
-        case WXK_NUMPAD5:        keySym = XK_KP_5; break;
-        case WXK_NUMPAD6:        keySym = XK_KP_6; break;
-        case WXK_NUMPAD7:        keySym = XK_KP_7; break;
-        case WXK_NUMPAD8:        keySym = XK_KP_8; break;
-        case WXK_NUMPAD9:        keySym = XK_KP_9; break;
-        case WXK_MULTIPLY:        keySym = XK_KP_Multiply; break;
-        case WXK_ADD:        keySym = XK_KP_Add; break;
-        case WXK_SUBTRACT:        keySym = XK_KP_Subtract; break;
-        case WXK_DECIMAL:        keySym = XK_KP_Decimal; break;
-        case WXK_DIVIDE:        keySym = XK_KP_Divide; break;
-        case WXK_F1:        keySym = XK_F1; break;
-        case WXK_F2:        keySym = XK_F2; break;
-        case WXK_F3:        keySym = XK_F3; break;
-        case WXK_F4:        keySym = XK_F4; break;
-        case WXK_F5:        keySym = XK_F5; break;
-        case WXK_F6:        keySym = XK_F6; break;
-        case WXK_F7:        keySym = XK_F7; break;
-        case WXK_F8:        keySym = XK_F8; break;
-        case WXK_F9:        keySym = XK_F9; break;
-        case WXK_F10:        keySym = XK_F10; break;
-        case WXK_F11:        keySym = XK_F11; break;
-        case WXK_F12:        keySym = XK_F12; break;
-        case WXK_F13:        keySym = XK_F13; break;
-        case WXK_F14:        keySym = XK_F14; break;
-        case WXK_F15:        keySym = XK_F15; break;
-        case WXK_F16:        keySym = XK_F16; break;
-        case WXK_F17:        keySym = XK_F17; break;
-        case WXK_F18:        keySym = XK_F18; break;
-        case WXK_F19:        keySym = XK_F19; break;
-        case WXK_F20:        keySym = XK_F20; break;
-        case WXK_F21:        keySym = XK_F21; break;
-        case WXK_F22:        keySym = XK_F22; break;
-        case WXK_F23:        keySym = XK_F23; break;
-        case WXK_F24:        keySym = XK_F24; break;
-        case WXK_NUMLOCK:    keySym = XK_Num_Lock; break;
-        case WXK_SCROLL:     keySym = XK_Scroll_Lock; break;
-        default:             keySym = id <= 255 ? (KeySym)id : 0;
-    }
-
-    return keySym;
-}
-
 // ----------------------------------------------------------------------------
 // Some colour manipulation routines
 // ----------------------------------------------------------------------------