#endif
#include <X11/Xlib.h>
#include <X11/Xatom.h>
+#include <X11/Xutil.h>
#ifdef __VMS
#pragma message enable nosimpint
#endif
#endif
// Various X11 Atoms used in this file:
-static Atom _NET_WM_ICON = 0;
static Atom _NET_WM_STATE = 0;
static Atom _NET_WM_STATE_FULLSCREEN = 0;
static Atom _NET_WM_STATE_STAYS_ON_TOP = 0;
// Setting icons for window manager:
// ----------------------------------------------------------------------------
-void wxSetIconsX11( WXDisplay* display, WXWindow window,
- const wxIconBundle& ib )
+#if wxUSE_IMAGE && !wxUSE_NANOX
+
+static Atom _NET_WM_ICON = 0;
+
+void
+wxSetIconsX11(WXDisplay* display, WXWindow window, const wxIconBundle& ib)
{
-#if !wxUSE_NANOX
size_t size = 0;
- size_t i, max = ib.m_icons.GetCount();
- for( i = 0; i < max; ++i )
- if( ib.m_icons[i].Ok() )
- size += 2 + ib.m_icons[i].GetWidth() * ib.m_icons[i].GetHeight();
+ const size_t numIcons = ib.GetIconCount();
+ for ( size_t i = 0; i < numIcons; ++i )
+ {
+ const wxIcon icon = ib.GetIconByIndex(i);
+
+ size += 2 + icon.GetWidth() * icon.GetHeight();
+ }
wxMAKE_ATOM(_NET_WM_ICON, (Display*)display);
- if( size > 0 )
+ if ( size > 0 )
{
-// The code below is correct for 64-bit machines also.
-// wxUint32* data = new wxUint32[size];
-// wxUint32* ptr = data;
unsigned long* data = new unsigned long[size];
unsigned long* ptr = data;
- for( i = 0; i < max; ++i )
+ for ( size_t i = 0; i < numIcons; ++i )
{
- const wxImage image = ib.m_icons[i].ConvertToImage();
- int width = image.GetWidth(), height = image.GetHeight();
+ const wxImage image = ib.GetIconByIndex(i).ConvertToImage();
+ int width = image.GetWidth(),
+ height = image.GetHeight();
unsigned char* imageData = image.GetData();
unsigned char* imageDataEnd = imageData + ( width * height * 3 );
bool hasMask = image.HasMask();
*ptr++ = width;
*ptr++ = height;
- while( imageData < imageDataEnd ) {
+ while ( imageData < imageDataEnd )
+ {
r = imageData[0];
g = imageData[1];
b = imageData[2];
WindowCast(window),
_NET_WM_ICON );
}
-#endif // !wxUSE_NANOX
}
+#endif // wxUSE_IMAGE && !wxUSE_NANOX
// ----------------------------------------------------------------------------
// Fullscreen mode:
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:
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:
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:
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_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;
wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key !=
WXK_MBUTTON, wxT("can't use wxGetKeyState() for mouse buttons"));
-#if defined(__WXX11__)
- Display *pDisplay = (Display*) wxApp::GetDisplay();
-#elif defined(__WXGTK__)
- Display *pDisplay = GDK_DISPLAY();
-#elif defined(__WXMOTIF__)
- Display *pDisplay = (Display*) (wxTheApp ? wxTheApp->GetInitialDisplay() : NULL);
-#else
-#error Add code to get the DISPLAY for this platform
-#endif
+ Display *pDisplay = (Display*) wxGetDisplay();
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 ( IsModifierKey(iKey) ) // If iKey is a modifier key, use a different method
{
- if ( map->modifiermap[map->max_keypermod * i] == keyCode)
+ XModifierKeymap *map = XGetModifierMapping(pDisplay);
+ wxCHECK_MSG( map, false, _T("failed to get X11 modifiers map") );
+
+ for (int i = 0; i < 8; ++i)
{
- iKeyMask = 1 << 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;
}
- XQueryPointer(pDisplay, DefaultRootWindow(pDisplay), &wDummy1, &wDummy2,
- &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__
projects / wxWidgets.git / blobdiff