disable warning about data truncation (810) for icc (this is a useful warning and...

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

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index 9df6307cc3fc530faf9d7b559f28dcc8a594cf59..c31f11ee97d4b372133c637790d00197ca271236 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -53,6 +53,10 @@ static Atom _NET_SUPPORTED = 0;
     if (name == 0) name = XInternAtom((display), #name, False)
 
 
     if (name == 0) name = XInternAtom((display), #name, False)
 
 

+// X11 Window is an int type, so use the macro to suppress warnings when
+// converting to it
+#define WindowCast(w) (Window)(wxPtrToUInt(w))
+

 // Is the window mapped?
 static bool IsMapped(Display *display, Window window)
 {
 // Is the window mapped?
 static bool IsMapped(Display *display, Window window)
 {


@@ -65,12 +69,19 @@ static bool IsMapped(Display *display, Window window)
 
 // Suspends X11 errors. Used when we expect errors but they are not fatal
 // for us.
 
 // Suspends X11 errors. Used when we expect errors but they are not fatal
 // for us.

+extern "C"
+{
+    typedef int (*wxX11ErrorHandler)(Display *, XErrorEvent *);
+
+    static int wxX11ErrorsSuspender_handler(Display*, XErrorEvent*) { return 0; }
+}
+

 class wxX11ErrorsSuspender
 {
 public:
     wxX11ErrorsSuspender(Display *d) : m_display(d)
     {
 class wxX11ErrorsSuspender
 {
 public:
     wxX11ErrorsSuspender(Display *d) : m_display(d)
     {

-        m_old = XSetErrorHandler(handler);
+        m_old = XSetErrorHandler(wxX11ErrorsSuspender_handler);

     }
     ~wxX11ErrorsSuspender()
     {
     }
     ~wxX11ErrorsSuspender()
     {


@@ -80,8 +91,7 @@ public:
 
 private:
     Display *m_display;
 
 private:
     Display *m_display;

-    int (*m_old)(Display*, XErrorEvent *);
-    static int handler(Display *, XErrorEvent *) { return 0; }
+    wxX11ErrorHandler m_old;

 };
 
 
 };
 
 


@@ -153,7 +163,7 @@ void wxSetIconsX11( WXDisplay* display, WXWindow window,
         }
 
         XChangeProperty( (Display*)display,
         }
 
         XChangeProperty( (Display*)display,

-                         (Window)window,
+                         WindowCast(window),

                          _NET_WM_ICON,
                          XA_CARDINAL, 32,
                          PropModeReplace,
                          _NET_WM_ICON,
                          XA_CARDINAL, 32,
                          PropModeReplace,


@@ -163,10 +173,10 @@ void wxSetIconsX11( WXDisplay* display, WXWindow window,
     else
     {
         XDeleteProperty( (Display*)display,
     else
     {
         XDeleteProperty( (Display*)display,

-                         (Window)window,
+                         WindowCast(window),

                          _NET_WM_ICON );
     }
                          _NET_WM_ICON );
     }

-#endif
+#endif // !wxUSE_NANOX

 }
 
 
 }
 
 


@@ -180,7 +190,7 @@ void wxSetIconsX11( WXDisplay* display, WXWindow window,
 //     fullscreen is to remove decorations, resize it to cover entire screen
 //     and set WIN_LAYER_ABOVE_DOCK.
 //
 //     fullscreen is to remove decorations, resize it to cover entire screen
 //     and set WIN_LAYER_ABOVE_DOCK.
 //

-//     This doesn't always work, though. Specifically, at least kwin from 
+//     This doesn't always work, though. Specifically, at least kwin from

 //     KDE 3 ignores the hint. The only way to make kwin accept our request
 //     is to emulate the way Qt does it. That is, unmap the window, set
 //     _NET_WM_WINDOW_TYPE to _KDE_NET_WM_WINDOW_TYPE_OVERRIDE (KDE extension),
 //     KDE 3 ignores the hint. The only way to make kwin accept our request
 //     is to emulate the way Qt does it. That is, unmap the window, set
 //     _NET_WM_WINDOW_TYPE to _KDE_NET_WM_WINDOW_TYPE_OVERRIDE (KDE extension),


@@ -192,13 +202,13 @@ void wxSetIconsX11( WXDisplay* display, WXWindow window,
 //     window state which provides cleanest and simplest possible way of
 //     making a window fullscreen. WM-spec is a de-facto standard adopted
 //     by GNOME and KDE folks, but _NET_WM_STATE_FULLSCREEN isn't yet widely
 //     window state which provides cleanest and simplest possible way of
 //     making a window fullscreen. WM-spec is a de-facto standard adopted
 //     by GNOME and KDE folks, but _NET_WM_STATE_FULLSCREEN isn't yet widely

-//     supported. As of January 2003, only GNOME 2's default WM Metacity 
+//     supported. As of January 2003, only GNOME 2's default WM Metacity

 //     implements, KDE will support it from version 3.2. At toolkits level,
 //     GTK+ >= 2.1.2 uses it as the only method of making windows fullscreen
 //     (that's why wxGTK will *not* switch to using gtk_window_fullscreen
 //     implements, KDE will support it from version 3.2. At toolkits level,
 //     GTK+ >= 2.1.2 uses it as the only method of making windows fullscreen
 //     (that's why wxGTK will *not* switch to using gtk_window_fullscreen

-//     unless it has better compatiblity with older WMs).
+//     unless it has better compatibility with older WMs).
+//

 //
 //

-//     

 //     This is what wxWidgets does in wxSetFullScreenStateX11:
 //       1) if _NET_WM_STATE_FULLSCREEN is supported, use it
 //       2) otherwise try WM-specific hacks (KDE, IceWM)
 //     This is what wxWidgets does in wxSetFullScreenStateX11:
 //       1) if _NET_WM_STATE_FULLSCREEN is supported, use it
 //       2) otherwise try WM-specific hacks (KDE, IceWM)


@@ -214,7 +224,7 @@ static void wxWinHintsSetLayer(Display *display, Window rootWnd,
                                Window window, int layer)
 {
     wxX11ErrorsSuspender noerrors(display);
                                Window window, int layer)
 {
     wxX11ErrorsSuspender noerrors(display);

-    
+

     XEvent xev;
 
     wxMAKE_ATOM( _WIN_LAYER, display );
     XEvent xev;
 
     wxMAKE_ATOM( _WIN_LAYER, display );


@@ -258,7 +268,7 @@ static bool wxQueryWMspecSupport(Display *display, Window rootWnd, Atom feature)
 {
     wxMAKE_ATOM(_NET_SUPPORTING_WM_CHECK, display);
     wxMAKE_ATOM(_NET_SUPPORTED, display);
 {
     wxMAKE_ATOM(_NET_SUPPORTING_WM_CHECK, display);
     wxMAKE_ATOM(_NET_SUPPORTED, display);

-      
+

     // FIXME: We may want to cache these checks. Note that we can't simply
     //        remember the results in global variable because the WM may go
     //        away and be replaced by another one! One possible approach
     // FIXME: We may want to cache these checks. Note that we can't simply
     //        remember the results in global variable because the WM may go
     //        away and be replaced by another one! One possible approach


@@ -273,14 +283,14 @@ static bool wxQueryWMspecSupport(Display *display, Window rootWnd, Atom feature)
     //        is replaced by another one). This is what GTK+ 2 does.
     //        Let's do it only if it is needed, it requires changes to
     //        the event loop.
     //        is replaced by another one). This is what GTK+ 2 does.
     //        Let's do it only if it is needed, it requires changes to
     //        the event loop.

-  
+

     Atom type;
     Window *wins;
     Atom *atoms;
     int format;
     unsigned long after;
     unsigned long nwins, natoms;
     Atom type;
     Window *wins;
     Atom *atoms;
     int format;
     unsigned long after;
     unsigned long nwins, natoms;

-    
+

     // Is the WM ICCCM supporting?
     XGetWindowProperty(display, rootWnd,
                        _NET_SUPPORTING_WM_CHECK, 0, LONG_MAX,
     // Is the WM ICCCM supporting?
     XGetWindowProperty(display, rootWnd,
                        _NET_SUPPORTING_WM_CHECK, 0, LONG_MAX,


@@ -320,7 +330,7 @@ static void wxWMspecSetState(Display *display, Window rootWnd,
                              Window window, int operation, Atom state)
 {
     wxMAKE_ATOM(_NET_WM_STATE, display);
                              Window window, int operation, Atom state)
 {
     wxMAKE_ATOM(_NET_WM_STATE, display);

-  
+

     if ( IsMapped(display, window) )
     {
         XEvent xev;
     if ( IsMapped(display, window) )
     {
         XEvent xev;


@@ -335,7 +345,7 @@ static void wxWMspecSetState(Display *display, Window rootWnd,
         xev.xclient.data.l[0] = operation;
         xev.xclient.data.l[1] = state;
         xev.xclient.data.l[2] = None;
         xev.xclient.data.l[0] = operation;
         xev.xclient.data.l[1] = state;
         xev.xclient.data.l[2] = None;

-  
+

         XSendEvent(display, rootWnd,
                    False,
                    SubstructureRedirectMask | SubstructureNotifyMask,
         XSendEvent(display, rootWnd,
                    False,
                    SubstructureRedirectMask | SubstructureNotifyMask,


@@ -361,7 +371,7 @@ static void wxWMspecSetFullscreen(Display *display, Window rootWnd,
 static bool wxKwinRunning(Display *display, Window rootWnd)
 {
     wxMAKE_ATOM(KWIN_RUNNING, display);
 static bool wxKwinRunning(Display *display, Window rootWnd)
 {
     wxMAKE_ATOM(KWIN_RUNNING, display);

-    
+

     long *data;
     Atom type;
     int format;
     long *data;
     Atom type;
     int format;


@@ -380,7 +390,7 @@ static bool wxKwinRunning(Display *display, Window rootWnd)
     return retval;
 }
 
     return retval;
 }
 

-// KDE's kwin is Qt-centric so much than no normal method of fullscreen 
+// KDE's kwin is Qt-centric so much than no normal method of fullscreen

 // mode will work with it. We have to carefully emulate the Qt way.
 static void wxSetKDEFullscreen(Display *display, Window rootWnd,
                                Window w, bool fullscreen, wxRect *origRect)
 // mode will work with it. We have to carefully emulate the Qt way.
 static void wxSetKDEFullscreen(Display *display, Window rootWnd,
                                Window w, bool fullscreen, wxRect *origRect)


@@ -406,9 +416,9 @@ static void wxSetKDEFullscreen(Display *display, Window rootWnd,
         lng = 1;
     }
 
         lng = 1;
     }
 

-    // it is neccessary to unmap the window, otherwise kwin will ignore us:
+    // it is necessary to unmap the window, otherwise kwin will ignore us:

     XSync(display, False);
     XSync(display, False);

-    
+

     bool wasMapped = IsMapped(display, w);
     if (wasMapped)
     {
     bool wasMapped = IsMapped(display, w);
     if (wasMapped)
     {


@@ -417,7 +427,7 @@ static void wxSetKDEFullscreen(Display *display, Window rootWnd,
     }
 
     XChangeProperty(display, w, _NET_WM_WINDOW_TYPE, XA_ATOM, 32,
     }
 
     XChangeProperty(display, w, _NET_WM_WINDOW_TYPE, XA_ATOM, 32,

-                       PropModeReplace, (unsigned char *) &data, lng);
+                    PropModeReplace, (unsigned char *) &data, lng);

     XSync(display, False);
 
     if (wasMapped)
     XSync(display, False);
 
     if (wasMapped)


@@ -425,20 +435,20 @@ static void wxSetKDEFullscreen(Display *display, Window rootWnd,
         XMapRaised(display, w);
         XSync(display, False);
     }
         XMapRaised(display, w);
         XSync(display, False);
     }

-    
-    wxWMspecSetState(display, rootWnd, w, 
+
+    wxWMspecSetState(display, rootWnd, w,

                      fullscreen ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE,
                      _NET_WM_STATE_STAYS_ON_TOP);
     XSync(display, False);
 
     if (!fullscreen)
     {
                      fullscreen ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE,
                      _NET_WM_STATE_STAYS_ON_TOP);
     XSync(display, False);
 
     if (!fullscreen)
     {

-        // NB: like many other WMs, kwin ignores first request for window
+        // NB: like many other WMs, kwin ignores the first request for a window

         //     position change after the window was mapped. This additional
         //     move+resize event will ensure that the window is restored in
         //     position change after the window was mapped. This additional
         //     move+resize event will ensure that the window is restored in

-        //     exactly same position as before it was made fullscreen (because
-        //     wxTopLevelWindow::ShowFullScreen will call SetSize, thus
-        //     setting the position for second time).
+        //     exactly the same position as before it was made fullscreen
+        //     (because wxTopLevelWindow::ShowFullScreen will call SetSize, thus
+        //     setting the position for the second time).

         XMoveResizeWindow(display, w,
                           origRect->x, origRect->y,
                           origRect->width, origRect->height);
         XMoveResizeWindow(display, w,
                           origRect->x, origRect->y,
                           origRect->width, origRect->height);


@@ -450,7 +460,7 @@ static void wxSetKDEFullscreen(Display *display, Window rootWnd,
 wxX11FullScreenMethod wxGetFullScreenMethodX11(WXDisplay* display,
                                                WXWindow rootWindow)
 {
 wxX11FullScreenMethod wxGetFullScreenMethodX11(WXDisplay* display,
                                                WXWindow rootWindow)
 {

-    Window root = (Window)rootWindow;
+    Window root = WindowCast(rootWindow);

     Display *disp = (Display*)display;
 
     // if WM supports _NET_WM_STATE_FULLSCREEN from wm-spec 1.2, use it:
     Display *disp = (Display*)display;
 
     // if WM supports _NET_WM_STATE_FULLSCREEN from wm-spec 1.2, use it:


@@ -461,7 +471,7 @@ wxX11FullScreenMethod wxGetFullScreenMethodX11(WXDisplay* display,
                    _T("detected _NET_WM_STATE_FULLSCREEN support"));
         return wxX11_FS_WMSPEC;
     }
                    _T("detected _NET_WM_STATE_FULLSCREEN support"));
         return wxX11_FS_WMSPEC;
     }

-    
+

     // if the user is running KDE's kwin WM, use a legacy hack because
     // kwin doesn't understand any other method:
     if (wxKwinRunning(disp, root))
     // if the user is running KDE's kwin WM, use a legacy hack because
     // kwin doesn't understand any other method:
     if (wxKwinRunning(disp, root))


@@ -469,7 +479,7 @@ wxX11FullScreenMethod wxGetFullScreenMethodX11(WXDisplay* display,
         wxLogTrace(_T("fullscreen"), _T("detected kwin"));
         return wxX11_FS_KDE;
     }
         wxLogTrace(_T("fullscreen"), _T("detected kwin"));
         return wxX11_FS_KDE;
     }

-    
+

     // finally, fall back to ICCCM heuristic method:
     wxLogTrace(_T("fullscreen"), _T("unknown WM, using _WIN_LAYER"));
     return wxX11_FS_GENERIC;
     // finally, fall back to ICCCM heuristic method:
     wxLogTrace(_T("fullscreen"), _T("unknown WM, using _WIN_LAYER"));
     return wxX11_FS_GENERIC;


@@ -484,8 +494,8 @@ void wxSetFullScreenStateX11(WXDisplay* display, WXWindow rootWindow,
     // NB: please see the comment under "Fullscreen mode:" title above
     //     for implications of changing this code.
 
     // NB: please see the comment under "Fullscreen mode:" title above
     //     for implications of changing this code.
 

-    Window wnd = (Window)window;
-    Window root = (Window)rootWindow;
+    Window wnd = WindowCast(window);
+    Window root = WindowCast(rootWindow);

     Display *disp = (Display*)display;
 
     if (method == wxX11_FS_AUTODETECT)
     Display *disp = (Display*)display;
 
     if (method == wxX11_FS_AUTODETECT)


@@ -527,7 +537,7 @@ int wxCharCodeXToWX(KeySym keySym)
         case XK_Control_L:
         case XK_Control_R:
             id = WXK_CONTROL; break;
         case XK_Control_L:
         case XK_Control_R:
             id = WXK_CONTROL; break;

-        case XK_Meta_L:  
+        case XK_Meta_L:

         case XK_Meta_R:
             id = WXK_ALT; break;
         case XK_BackSpace:
         case XK_Meta_R:
             id = WXK_ALT; break;
         case XK_BackSpace:


@@ -689,7 +699,7 @@ KeySym wxCharCodeWXToX(int id)
         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_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_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_MENU :         keySym = XK_Menu; break;
         case WXK_PAUSE:         keySym = XK_Pause; break;
         case WXK_ESCAPE:        keySym = XK_Escape; break;


@@ -762,8 +772,11 @@ KeySym wxCharCodeWXToX(int id)
 
 #include <wx/app.h>
 
 
 #include <wx/app.h>
 

-bool wxGetKeyState(const wxKeyCode& key)
+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__)
 #if defined(__WXX11__)
     Display *pDisplay = (Display*) wxApp::GetDisplay();
 #elif defined(__WXGTK__)


@@ -773,7 +786,7 @@ bool wxGetKeyState(const wxKeyCode& key)
 #else
 #error  Add code to get the DISPLAY for this platform
 #endif
 #else
 #error  Add code to get the DISPLAY for this platform
 #endif

-    
+

     int iKey = wxCharCodeWXToX(key);
     int          iKeyMask = 0;
     Window       wDummy1, wDummy2;
     int iKey = wxCharCodeWXToX(key);
     int          iKeyMask = 0;
     Window       wDummy1, wDummy2;


@@ -783,7 +796,7 @@ bool wxGetKeyState(const wxKeyCode& key)
     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 ( map->modifiermap[map->max_keypermod * i] == keyCode)
     for (int i = 0; i < 8; ++i)
     {
         if ( map->modifiermap[map->max_keypermod * i] == keyCode)


@@ -791,14 +804,14 @@ bool wxGetKeyState(const wxKeyCode& key)
             iKeyMask = 1 << i;
         }
     }
             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;
 }
 

-#endif
+#endif // __WXX11__ || __WXGTK__ || __WXMOTIF__