fix _NET_WM_MOVERESIZE to interpret x_root and y_root correctly

2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 1c362e4..00f592d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc3:
 *06/07/20:
+   * Fix _NET_WM_MOVERESIZE, bug #1525542 (Mark)
+     Ewmh.cc
    * Properly revert focus when two windows close simultaneously (Mark)
      WinClient.cc/hh FbTk/FbWindow.hh fluxbox.cc Window.cc
 *06/07/19:
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index 78a2b3c..30fee85 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -891,9 +891,13 @@ bool Ewmh::checkClientMessage(const XClientMessageEvent &ce,
         case _NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT:
         case _NET_WM_MOVERESIZE_SIZE_LEFT:
         case _NET_WM_MOVERESIZE_SIZE_KEYBOARD:
-            winclient->fbwindow()->startResizing(ce.data.l[0], ce.data.l[1],
-                                                 static_cast<FluxboxWindow::ResizeDirection>
-                                                 (ce.data.l[2]));
+            // startResizing uses relative coordinates
+            winclient->fbwindow()->startResizing(ce.data.l[0] -
+                winclient->fbwindow()->x() -
+                winclient->fbwindow()->frame().window().borderWidth(),
+                ce.data.l[1] - winclient->fbwindow()->y() -
+                winclient->fbwindow()->frame().window().borderWidth(),
+                static_cast<FluxboxWindow::ResizeDirection>(ce.data.l[2]));
             break;
         case _NET_WM_MOVERESIZE_MOVE:
         case _NET_WM_MOVERESIZE_MOVE_KEYBOARD: