Eliminated C++ RTTI (typeid etc) use. Eliminated wxPGVariantData (default default...

[wxWidgets.git] / src / unix / utilsx11.cpp

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index f0e7659695c16929f19e57706d1612545c97233a..efb3be521c40ca8062297f7d9cf1a6ea717c8869 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -15,16 +15,22 @@
 #include "wx/wxprec.h"
 
 #include "wx/unix/utilsx11.h"
 #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/iconbndl.h"

-#include "wx/image.h"
-#include "wx/icon.h"
-#include "wx/log.h"

 
 #ifdef __VMS
 #pragma message disable nosimpint
 #endif
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
 #ifdef __VMS
 #pragma message disable nosimpint
 #endif
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>

+#include <X11/Xutil.h>

 #ifdef __VMS
 #pragma message enable nosimpint
 #endif
 #ifdef __VMS
 #pragma message enable nosimpint
 #endif


@@ -35,7 +41,6 @@
 #endif
 
 // Various X11 Atoms used in this file:
 #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;
 static Atom _NET_WM_STATE = 0;
 static Atom _NET_WM_STATE_FULLSCREEN = 0;
 static Atom _NET_WM_STATE_STAYS_ON_TOP = 0;


@@ -100,31 +105,35 @@ private:
 // Setting icons for window manager:
 // ----------------------------------------------------------------------------
 
 // 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 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);
 
 
     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;
 
         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();
             unsigned char* imageData = image.GetData();
             unsigned char* imageDataEnd = imageData + ( width * height * 3 );
             bool hasMask = image.HasMask();


@@ -147,7 +156,8 @@ void wxSetIconsX11( WXDisplay* display, WXWindow window,
             *ptr++ = width;
             *ptr++ = height;
 
             *ptr++ = width;
             *ptr++ = height;
 

-            while( imageData < imageDataEnd ) {
+            while ( imageData < imageDataEnd )
+            {

                 r = imageData[0];
                 g = imageData[1];
                 b = imageData[2];
                 r = imageData[0];
                 g = imageData[1];
                 b = imageData[2];


@@ -176,9 +186,9 @@ void wxSetIconsX11( WXDisplay* display, WXWindow window,
                          WindowCast(window),
                          _NET_WM_ICON );
     }
                          WindowCast(window),
                          _NET_WM_ICON );
     }

-#endif // !wxUSE_NANOX

 }
 
 }
 

+#endif // wxUSE_IMAGE && !wxUSE_NANOX

 
 // ----------------------------------------------------------------------------
 // Fullscreen mode:
 
 // ----------------------------------------------------------------------------
 // Fullscreen mode:


@@ -372,20 +382,20 @@ static bool wxKwinRunning(Display *display, Window rootWnd)
 {
     wxMAKE_ATOM(KWIN_RUNNING, display);
 
 {
     wxMAKE_ATOM(KWIN_RUNNING, display);
 

-    long *data;
+    unsigned char* data;

     Atom type;
     int format;
     unsigned long nitems, after;
     if (XGetWindowProperty(display, rootWnd,
                            KWIN_RUNNING, 0, 1, False, KWIN_RUNNING,
                            &type, &format, &nitems, &after,
     Atom type;
     int format;
     unsigned long nitems, after;
     if (XGetWindowProperty(display, rootWnd,
                            KWIN_RUNNING, 0, 1, False, KWIN_RUNNING,
                            &type, &format, &nitems, &after,

-                           (unsigned char**)&data) != Success)
+                           &data) != Success)

     {
         return false;
     }
 
     bool retval = (type == KWIN_RUNNING &&
     {
         return false;
     }
 
     bool retval = (type == KWIN_RUNNING &&

-                   nitems == 1 && data && data[0] == 1);
+                   nitems == 1 && data && ((long*)data)[0] == 1);

     XFree(data);
     return retval;
 }
     XFree(data);
     return retval;
 }


@@ -540,6 +550,8 @@ int wxCharCodeXToWX(KeySym keySym)
         case XK_Meta_L:
         case XK_Meta_R:
             id = WXK_ALT; break;
         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:
         case XK_BackSpace:
             id = WXK_BACK; break;
         case XK_Delete:


@@ -575,9 +587,9 @@ int wxCharCodeXToWX(KeySym keySym)
         case XK_Down:
             id = WXK_DOWN; break;
         case XK_Next:
         case XK_Down:
             id = WXK_DOWN; break;
         case XK_Next:

-            id = WXK_NEXT; break;
+            id = WXK_PAGEDOWN; break;

         case XK_Prior:
         case XK_Prior:

-            id = WXK_PRIOR; break;
+            id = WXK_PAGEUP; break;

         case XK_Menu:
             id = WXK_MENU; break;
         case XK_Select:
         case XK_Menu:
             id = WXK_MENU; break;
         case XK_Select:


@@ -594,23 +606,23 @@ int wxCharCodeXToWX(KeySym keySym)
             id = WXK_HELP; break;
 
         case XK_KP_Multiply:
             id = WXK_HELP; break;
 
         case XK_KP_Multiply:

-            id = WXK_MULTIPLY; break;
+            id = WXK_NUMPAD_MULTIPLY; break;

         case XK_KP_Add:
         case XK_KP_Add:

-            id = WXK_ADD; break;
+            id = WXK_NUMPAD_ADD; break;

         case XK_KP_Subtract:
         case XK_KP_Subtract:

-            id = WXK_SUBTRACT; break;
+            id = WXK_NUMPAD_SUBTRACT; break;

         case XK_KP_Divide:
         case XK_KP_Divide:

-            id = WXK_DIVIDE; break;
+            id = WXK_NUMPAD_DIVIDE; break;

         case XK_KP_Decimal:
         case XK_KP_Decimal:

-            id = WXK_DECIMAL; break;
+            id = WXK_NUMPAD_DECIMAL; break;

         case XK_KP_Equal:
         case XK_KP_Equal:

-            id = '='; break;
+            id = WXK_NUMPAD_EQUAL; break;

         case XK_KP_Space:
         case XK_KP_Space:

-            id = ' '; break;
+            id = WXK_NUMPAD_SPACE; break;

         case XK_KP_Tab:
         case XK_KP_Tab:

-            id = WXK_TAB; break;
+            id = WXK_NUMPAD_TAB; break;

         case XK_KP_Enter:
         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:
         case XK_KP_0:
             id = WXK_NUMPAD0; break;
         case XK_KP_1:


@@ -631,6 +643,24 @@ int wxCharCodeXToWX(KeySym keySym)
             id = WXK_NUMPAD8; break;
         case XK_KP_9:
             id = WXK_NUMPAD9; break;
             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 XK_F1:
             id = WXK_F1; break;
         case XK_F2:


@@ -700,12 +730,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_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_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;
         case WXK_END:           keySym = XK_End; break;
         case WXK_HOME :         keySym = XK_Home; break;
         case WXK_LEFT :         keySym = XK_Left; break;


@@ -718,21 +749,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_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_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;
         case WXK_F1:            keySym = XK_F1; break;
         case WXK_F2:            keySym = XK_F2; break;
         case WXK_F3:            keySym = XK_F3; break;


@@ -770,45 +803,49 @@ KeySym wxCharCodeWXToX(int id)
 // check current state of a key
 // ----------------------------------------------------------------------------
 
 // check current state of a key
 // ----------------------------------------------------------------------------
 

-#include "wx/app.h"
-

 bool wxGetKeyState(wxKeyCode key)
 {
     wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key !=
         WXK_MBUTTON, wxT("can't use wxGetKeyState() for mouse buttons"));
 
 bool wxGetKeyState(wxKeyCode key)
 {
     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;
 
     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;
 
     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__
 }
 
 #endif // __WXX11__ || __WXGTK__ || __WXMOTIF__