X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17a1ebd101f0653e69736416a2a28d0ada423141..eba91e51e8d7cce2c5c9a99d8ddcad5b29a114a8:/src/unix/utilsx11.cpp diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp index c31f11ee97..e1cf437119 100644 --- a/src/unix/utilsx11.cpp +++ b/src/unix/utilsx11.cpp @@ -15,16 +15,22 @@ #include "wx/wxprec.h" #include "wx/unix/utilsx11.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" + #include "wx/icon.h" + #include "wx/image.h" +#endif + #include "wx/iconbndl.h" -#include "wx/image.h" -#include "wx/icon.h" -#include "wx/log.h" #ifdef __VMS #pragma message disable nosimpint #endif #include #include +#include #ifdef __VMS #pragma message enable nosimpint #endif @@ -297,7 +303,7 @@ static bool wxQueryWMspecSupport(Display *display, Window rootWnd, Atom feature) False, XA_WINDOW, &type, &format, &nwins, &after, (unsigned char **)&wins); if ( type != XA_WINDOW || nwins <= 0 || wins[0] == None ) - return FALSE; + return false; XFree(wins); // Query for supported features: @@ -306,7 +312,7 @@ static bool wxQueryWMspecSupport(Display *display, Window rootWnd, Atom feature) False, XA_ATOM, &type, &format, &natoms, &after, (unsigned char **)&atoms); if ( type != XA_ATOM || atoms == NULL ) - return FALSE; + return false; // Lookup the feature we want: for (unsigned i = 0; i < natoms; i++) @@ -314,11 +320,11 @@ static bool wxQueryWMspecSupport(Display *display, Window rootWnd, Atom feature) if ( atoms[i] == feature ) { XFree(atoms); - return TRUE; + return true; } } XFree(atoms); - return FALSE; + return false; } #endif @@ -381,7 +387,7 @@ static bool wxKwinRunning(Display *display, Window rootWnd) &type, &format, &nitems, &after, (unsigned char**)&data) != Success) { - return FALSE; + return false; } bool retval = (type == KWIN_RUNNING && @@ -427,7 +433,7 @@ static void wxSetKDEFullscreen(Display *display, Window rootWnd, } XChangeProperty(display, w, _NET_WM_WINDOW_TYPE, XA_ATOM, 32, - PropModeReplace, (unsigned char *) &data, lng); + PropModeReplace, (unsigned char *) &data[0], lng); XSync(display, False); if (wasMapped) @@ -540,6 +546,8 @@ int wxCharCodeXToWX(KeySym keySym) case XK_Meta_L: case XK_Meta_R: id = WXK_ALT; break; + case XK_Caps_Lock: + id = WXK_CAPITAL; break; case XK_BackSpace: id = WXK_BACK; break; case XK_Delete: @@ -575,9 +583,9 @@ int wxCharCodeXToWX(KeySym keySym) case XK_Down: id = WXK_DOWN; break; case XK_Next: - id = WXK_NEXT; break; + id = WXK_PAGEDOWN; break; case XK_Prior: - id = WXK_PRIOR; break; + id = WXK_PAGEUP; break; case XK_Menu: id = WXK_MENU; break; case XK_Select: @@ -594,23 +602,23 @@ int wxCharCodeXToWX(KeySym keySym) id = WXK_HELP; break; case XK_KP_Multiply: - id = WXK_MULTIPLY; break; + id = WXK_NUMPAD_MULTIPLY; break; case XK_KP_Add: - id = WXK_ADD; break; + id = WXK_NUMPAD_ADD; break; case XK_KP_Subtract: - id = WXK_SUBTRACT; break; + id = WXK_NUMPAD_SUBTRACT; break; case XK_KP_Divide: - id = WXK_DIVIDE; break; + id = WXK_NUMPAD_DIVIDE; break; case XK_KP_Decimal: - id = WXK_DECIMAL; break; + id = WXK_NUMPAD_DECIMAL; break; case XK_KP_Equal: - id = '='; break; + id = WXK_NUMPAD_EQUAL; break; case XK_KP_Space: - id = ' '; break; + id = WXK_NUMPAD_SPACE; break; case XK_KP_Tab: - id = WXK_TAB; break; + id = WXK_NUMPAD_TAB; break; case XK_KP_Enter: - id = WXK_RETURN; break; + id = WXK_NUMPAD_ENTER; break; case XK_KP_0: id = WXK_NUMPAD0; break; case XK_KP_1: @@ -631,6 +639,24 @@ int wxCharCodeXToWX(KeySym keySym) id = WXK_NUMPAD8; break; case XK_KP_9: id = WXK_NUMPAD9; break; + case XK_KP_Insert: + id = WXK_NUMPAD_INSERT; break; + case XK_KP_End: + id = WXK_NUMPAD_END; break; + case XK_KP_Down: + id = WXK_NUMPAD_DOWN; break; + case XK_KP_Page_Down: + id = WXK_NUMPAD_PAGEDOWN; break; + case XK_KP_Left: + id = WXK_NUMPAD_LEFT; break; + case XK_KP_Right: + id = WXK_NUMPAD_RIGHT; break; + case XK_KP_Home: + id = WXK_NUMPAD_HOME; break; + case XK_KP_Up: + id = WXK_NUMPAD_UP; break; + case XK_KP_Page_Up: + id = WXK_NUMPAD_PAGEUP; break; case XK_F1: id = WXK_F1; break; case XK_F2: @@ -700,12 +726,13 @@ KeySym wxCharCodeWXToX(int id) 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_CAPITAL: keySym = XK_Caps_Lock; 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_PAGEUP: keySym = XK_Prior; break; + case WXK_PAGEDOWN: 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; @@ -718,21 +745,23 @@ KeySym wxCharCodeWXToX(int id) 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_NUMPAD0: keySym = XK_KP_0; break; case WXK_NUMPAD_INSERT: keySym = XK_KP_Insert; break; + case WXK_NUMPAD1: keySym = XK_KP_1; break; case WXK_NUMPAD_END: keySym = XK_KP_End; break; + case WXK_NUMPAD2: keySym = XK_KP_2; break; case WXK_NUMPAD_DOWN: keySym = XK_KP_Down; break; + case WXK_NUMPAD3: keySym = XK_KP_3; break; case WXK_NUMPAD_PAGEDOWN: keySym = XK_KP_Page_Down; break; + case WXK_NUMPAD4: keySym = XK_KP_4; break; case WXK_NUMPAD_LEFT: keySym = XK_KP_Left; 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_NUMPAD6: keySym = XK_KP_6; break; case WXK_NUMPAD_RIGHT: keySym = XK_KP_Right; break; + case WXK_NUMPAD7: keySym = XK_KP_7; break; case WXK_NUMPAD_HOME: keySym = XK_KP_Home; break; + case WXK_NUMPAD8: keySym = XK_KP_8; break; case WXK_NUMPAD_UP: keySym = XK_KP_Up; break; + case WXK_NUMPAD9: keySym = XK_KP_9; break; case WXK_NUMPAD_PAGEUP: keySym = XK_KP_Page_Up; break; + case WXK_NUMPAD_DECIMAL: keySym = XK_KP_Decimal; break; case WXK_NUMPAD_DELETE: keySym = XK_KP_Delete; break; + case WXK_NUMPAD_MULTIPLY: keySym = XK_KP_Multiply; break; + case WXK_NUMPAD_ADD: keySym = XK_KP_Add; break; + case WXK_NUMPAD_SUBTRACT: keySym = XK_KP_Subtract; break; + case WXK_NUMPAD_DIVIDE: keySym = XK_KP_Divide; break; + case WXK_NUMPAD_ENTER: keySym = XK_KP_Enter; break; + case WXK_NUMPAD_SEPARATOR: keySym = XK_KP_Separator; break; case WXK_F1: keySym = XK_F1; break; case WXK_F2: keySym = XK_F2; break; case WXK_F3: keySym = XK_F3; break; @@ -770,8 +799,6 @@ KeySym wxCharCodeWXToX(int id) // check current state of a key // ---------------------------------------------------------------------------- -#include - bool wxGetKeyState(wxKeyCode key) { wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key != @@ -797,7 +824,8 @@ bool wxGetKeyState(wxKeyCode key) if (keyCode == NoSymbol) return false; - for (int i = 0; i < 8; ++i) + if ( IsModifierKey(iKey) ) // If iKey is a modifier key, use a different method + { for (int i = 0; i < 8; ++i) { if ( map->modifiermap[map->max_keypermod * i] == keyCode) { @@ -809,11 +837,15 @@ bool wxGetKeyState(wxKeyCode key) &iDummy3, &iDummy4, &iDummy5, &iDummy6, &iMask ); XFreeModifiermap(map); return (iMask & iKeyMask) != 0; + } + // From the XLib manual: + // The XQueryKeymap() function returns a bit vector for the logical state of the keyboard, + // where each bit set to 1 indicates that the corresponding key is currently pressed down. + // The vector is represented as 32 bytes. Byte N (from 0) contains the bits for keys 8N to 8N + 7 + // with the least-significant bit in the byte representing key 8N. + char key_vector[32]; + XQueryKeymap(pDisplay, key_vector); + return key_vector[keyCode >> 3] & (1 << (keyCode & 7)); } #endif // __WXX11__ || __WXGTK__ || __WXMOTIF__ - - - - -