force a binding with a modifier

[chaz/openbox] / scripts / motion.py

diff --git a/scripts/motion.py b/scripts/motion.py
index 7714c0dee11f2cd5da847a2505dc38ad19f390f2..03546b84e74147ee01fdf0621053f7987e3b0484 100644 (file)
--- a/scripts/motion.py
+++ b/scripts/motion.py
@@ -92,10 +92,12 @@ _last_y = 0
 def _do_move():
     global _screen, _client, _cx, _cy, _dx, _dy
 
-    x = _cx + _dx
-    y = _cy + _dy
+    # get destination x/y for the *frame*
+    x = _cx + _dx + _client.frame.rect().x() - _client.area().x()
+    y = _cy + _dy + _client.frame.rect().y() - _client.area().y()
 
-    global edge_resistance, _last_x, _last_y
+    global edge_resistance
+    global _last_x, _last_y
     if edge_resistance:
         fs = _client.frame.size()
         w = _client.area().width() + fs.left + fs.right
@@ -119,8 +121,13 @@ def _do_move():
         if _last_y < y and y > b and y <= b + edge_resistance:
             y = b
 
-    _last_x = x
-    _last_y = y
+    global _inmove
+    if not _inmove:
+        _last_x = 0
+        _last_y = 0
+    else:
+        _last_x = x
+        _last_y = y
 
     global move_rubberband
     if move_rubberband: