aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2006-07-20 10:22:31 (GMT)
committermarkt <markt>2006-07-20 10:22:31 (GMT)
commit25a9a3158530075b606dc9ba28b7a30d64d624e2 (patch)
tree7b69f3cbda07ec2d5099b11ff43d771d16abc6a3
parentf9ade8947c08a7f1a4485b44da2403a55a3c04e1 (diff)
downloadfluxbox_pavel-25a9a3158530075b606dc9ba28b7a30d64d624e2.zip
fluxbox_pavel-25a9a3158530075b606dc9ba28b7a30d64d624e2.tar.bz2
fix _NET_WM_MOVERESIZE to interpret x_root and y_root correctly
-rw-r--r--ChangeLog2
-rw-r--r--src/Ewmh.cc10
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 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*06/07/20: 3*06/07/20:
4 * Fix _NET_WM_MOVERESIZE, bug #1525542 (Mark)
5 Ewmh.cc
4 * Properly revert focus when two windows close simultaneously (Mark) 6 * Properly revert focus when two windows close simultaneously (Mark)
5 WinClient.cc/hh FbTk/FbWindow.hh fluxbox.cc Window.cc 7 WinClient.cc/hh FbTk/FbWindow.hh fluxbox.cc Window.cc
6*06/07/19: 8*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,
891 case _NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT: 891 case _NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT:
892 case _NET_WM_MOVERESIZE_SIZE_LEFT: 892 case _NET_WM_MOVERESIZE_SIZE_LEFT:
893 case _NET_WM_MOVERESIZE_SIZE_KEYBOARD: 893 case _NET_WM_MOVERESIZE_SIZE_KEYBOARD:
894 winclient->fbwindow()->startResizing(ce.data.l[0], ce.data.l[1], 894 // startResizing uses relative coordinates
895 static_cast<FluxboxWindow::ResizeDirection> 895 winclient->fbwindow()->startResizing(ce.data.l[0] -
896 (ce.data.l[2])); 896 winclient->fbwindow()->x() -
897 winclient->fbwindow()->frame().window().borderWidth(),
898 ce.data.l[1] - winclient->fbwindow()->y() -
899 winclient->fbwindow()->frame().window().borderWidth(),
900 static_cast<FluxboxWindow::ResizeDirection>(ce.data.l[2]));
897 break; 901 break;
898 case _NET_WM_MOVERESIZE_MOVE: 902 case _NET_WM_MOVERESIZE_MOVE:
899 case _NET_WM_MOVERESIZE_MOVE_KEYBOARD: 903 case _NET_WM_MOVERESIZE_MOVE_KEYBOARD: