aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-05-04 13:55:39 (GMT)
committerrathnor <rathnor>2003-05-04 13:55:39 (GMT)
commitcd3379270b388cbfe5040d43a4c90f976c06e1b7 (patch)
tree76b0b0f873fda4d020e7ff348397a58957c94ef2
parentc21b6fb29fd51cbd5ebb49dda1d10698d8ba2e32 (diff)
downloadfluxbox_paul-cd3379270b388cbfe5040d43a4c90f976c06e1b7.zip
fluxbox_paul-cd3379270b388cbfe5040d43a4c90f976c06e1b7.tar.bz2
fix warping with multiple screens
-rw-r--r--ChangeLog2
-rw-r--r--src/Window.cc6
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6c51c1f..698b9bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.2: 2Changes for 0.9.2:
3*03/05/04: 3*03/05/04:
4 * Fix warping with multiple screens (Simon)
5 Window.cc
4 * Set many key events/commands to act on the screen the mouse is on, 6 * Set many key events/commands to act on the screen the mouse is on,
5 rather than the focused window (Simon) 7 rather than the focused window (Simon)
6 fluxbox.cc 8 fluxbox.cc
diff --git a/src/Window.cc b/src/Window.cc
index 33bf9bc..fb7b169 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.cc,v 1.156 2003/05/01 13:19:36 rathnor Exp $ 25// $Id: Window.cc,v 1.157 2003/05/04 13:55:39 rathnor Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -2273,7 +2273,7 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
2273 2273
2274 if (! isMoving()) { 2274 if (! isMoving()) {
2275 startMoving(me.window); 2275 startMoving(me.window);
2276 } else { 2276 } else {
2277 int dx = me.x_root - button_grab_x, 2277 int dx = me.x_root - button_grab_x,
2278 dy = me.y_root - button_grab_y; 2278 dy = me.y_root - button_grab_y;
2279 2279
@@ -2627,7 +2627,7 @@ void FluxboxWindow::startMoving(Window win) {
2627 // freely map and unmap the window we're moving. 2627 // freely map and unmap the window we're moving.
2628 XGrabPointer(display, screen.getRootWindow(), False, Button1MotionMask | 2628 XGrabPointer(display, screen.getRootWindow(), False, Button1MotionMask |
2629 ButtonReleaseMask, GrabModeAsync, GrabModeAsync, 2629 ButtonReleaseMask, GrabModeAsync, GrabModeAsync,
2630 None, fluxbox->getMoveCursor(), CurrentTime); 2630 screen.getRootWindow(), fluxbox->getMoveCursor(), CurrentTime);
2631 2631
2632 if (m_windowmenu.isVisible()) 2632 if (m_windowmenu.isVisible())
2633 m_windowmenu.hide(); 2633 m_windowmenu.hide();