keep track of if the move is the final move or not, and pass it along

[chaz/openbox] / scripts / motion.py

diff --git a/scripts/motion.py b/scripts/motion.py
index 2d6939c519c6f4416d98abe370d79550ca1a960c..e6d26f450dcf3c28166f40e16e4e34c409f5fc9b 100644 (file)
--- a/scripts/motion.py
+++ b/scripts/motion.py
@@ -80,20 +80,19 @@ _motion_mask = 0
 def _motion_grab(data):
     global _motion_mask, _inmove, _inresize;
 
-    if data.action == ob.KeyAction.Release:
-        # have all the modifiers this started with been released?
-        if not _motion_mask & data.state:
-            if _inmove:
-                _end_move(data)
-            elif _inresize:
-                _end_resize(data)
-            else:
-                raise RuntimeError
+    # are all the modifiers this started with still pressed?
+    if not _motion_mask & data.state:
+        if _inmove:
+            _end_move(data)
+        elif _inresize:
+            _end_resize(data)
+        else:
+            raise RuntimeError
 
 _last_x = 0
 _last_y = 0
 
-def _do_move():
+def _do_move(final):
     global _screen, _client, _cx, _cy, _dx, _dy
 
     # get destination x/y for the *frame*
@@ -106,7 +105,7 @@ def _do_move():
         w = _client.area().width() + fs.left + fs.right
         h = _client.area().height() + fs.top + fs.bottom
         # use the area based on the struts
-        area = ob.openbox.screen(_screen).area()
+        area = ob.openbox.screen(_screen).area(_client.desktop())
         l = area.left()
         r = area.right() - w + 1
         t = area.top()
@@ -136,7 +135,7 @@ def _do_move():
         # draw the outline ...
         f=0
     else:
-        _client.move(x, y)
+        _client.move(x, y, final)
 
     if MOVE_POPUP:
         global _popwidget, _poplabel
@@ -147,7 +146,7 @@ def _do_move():
             _poplabel = otk.Label(_popwidget)
             _poplabel.setHighlighted(1)
         _poplabel.setText(text)
-        scsize = otk.display.screenInfo(_screen).size()
+        scsize = ob.openbox.screen(_screen).size()
         size = _poplabel.minSize()
         _popwidget.moveresize(otk.Rect((scsize.width() - size.width()) / 2,
                                        (scsize.height() - size.height()) / 2,
@@ -160,14 +159,15 @@ def _move(data):
     # not-normal windows dont get moved
     if not data.client.normal(): return
 
-    global _screen, _client, _cx, _cy, _dx, _dy
+    global _screen, _client, _cx, _cy, _dx, _dy, _motion_mask
     _screen = data.screen
     _client = data.client
     _cx = data.press_clientx
     _cy = data.press_clienty
     _dx = data.xroot - data.pressx
     _dy = data.yroot - data.pressy
-    _do_move()
+    _motion_mask = data.state
+    _do_move(0)
     global _inmove
     if not _inmove:
         ob.kgrab(_screen, _motion_grab)
@@ -179,7 +179,7 @@ def _end_move(data):
     if _inmove:
         r = MOVE_RUBBERBAND
         MOVE_RUBBERBAND = 0
-        _do_move()
+        _do_move(1)
         MOVE_RUBBERBAND = r
         _inmove = 0
     _poplabel = 0
@@ -231,7 +231,7 @@ def _do_resize():
             _poplabel = otk.Label(_popwidget)
             _poplabel.setHighlighted(1)
         _poplabel.setText(text)
-        scsize = otk.display.screenInfo(_screen).size()
+        scsize = ob.openbox.screen(_screen).size()
         size = _poplabel.minSize()
         _popwidget.moveresize(otk.Rect((scsize.width() - size.width()) / 2,
                                        (scsize.height() - size.height()) / 2,
@@ -245,6 +245,7 @@ def _resize(data):
     if not data.client.normal(): return
 
     global _screen, _client, _cx, _cy, _cw, _ch, _px, _py, _dx, _dy
+    global _motion_mask
     _screen = data.screen
     _client = data.client
     _cx = data.press_clientx
@@ -255,6 +256,7 @@ def _resize(data):
     _py = data.pressy
     _dx = data.xroot - _px
     _dy = data.yroot - _py
+    _motion_mask = data.state
     _do_resize()
     global _inresize
     if not _inresize: