Track window positions

[libs/gui.git] / source / graphics / x11 / window.cpp

diff --git a/source/graphics/x11/window.cpp b/source/graphics/x11/window.cpp
index 2c03bf745570f7d2680257e30491e4fd56af2403..9b46e4e16593cfe4abe1e760d2cdf832a4593d26 100644 (file)
--- a/source/graphics/x11/window.cpp
+++ b/source/graphics/x11/window.cpp
@@ -26,6 +26,9 @@ void Window::platform_init()
 
        priv->wm_delete_window = XInternAtom(dpy, "WM_DELETE_WINDOW", true);
        priv->invisible_cursor = 0;
+       priv->reparented = false;
+       priv->rel_x = 0;
+       priv->rel_y = 0;
 
        XSetWindowAttributes attr;
        attr.override_redirect = options.fullscreen;
@@ -185,6 +188,46 @@ bool Window::event(const Event &evnt)
                        resizing = false;
                        signal_resize.emit(options.width, options.height);
                }
+
+               {
+                       int x = ev.xconfigure.x;
+                       int y = ev.xconfigure.y;
+
+                       if(priv->reparented)
+                       {
+                               if(!ev.xconfigure.send_event)
+                               {
+                                       /* If the window manager reparented us, the coordinates of a
+                                       real event are in the parent window's space. */
+                                       priv->rel_x = ev.xconfigure.x;
+                                       priv->rel_y = ev.xconfigure.y;
+
+                                       const Display::Private &dpy_priv = display.get_private();
+                                       WindowHandle dummy;
+                                       XTranslateCoordinates(dpy_priv.display, priv->window, dpy_priv.root_window, 0, 0, &x, &y, &dummy);
+                               }
+
+                               // Use the coordinates of the window manager frame
+                               x -= priv->rel_x;
+                               y -= priv->rel_y;
+                       }
+
+                       if(x!=options.x || y!=options.y)
+                       {
+                               options.x = x;
+                               options.y = y;
+                               signal_move.emit(options.x, options.y);
+                       }
+               }
+
+               break;
+       case ReparentNotify:
+               priv->reparented = (ev.xreparent.parent!=display.get_private().root_window);
+               if(!priv->reparented)
+               {
+                       priv->rel_x = 0;
+                       priv->rel_y = 0;
+               }
                break;
        case ClientMessage:
                if(ev.xclient.data.l[0]==static_cast<long>(priv->wm_delete_window))