X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fmotion.py;h=e6d26f450dcf3c28166f40e16e4e34c409f5fc9b;hb=60cd451a23daa8df35d5a51b61101fdb5a63fa78;hp=ef05b2792a49eb1d24c15be3711fccc58f5fd951;hpb=6ae8608aede5e9972f19ea29ce1790a68a507ef9;p=chaz%2Fopenbox

diff --git a/scripts/motion.py b/scripts/motion.py
index ef05b279..e6d26f45 100644
--- a/scripts/motion.py
+++ b/scripts/motion.py
@@ -81,8 +81,7 @@ def _motion_grab(data):
     global _motion_mask, _inmove, _inresize;
 
     # are all the modifiers this started with still pressed?
-    print _motion_mask, data.state
-    if not _motion_mask == data.state:
+    if not _motion_mask & data.state:
         if _inmove:
             _end_move(data)
         elif _inresize:
@@ -93,7 +92,7 @@ def _motion_grab(data):
 _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*
@@ -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,
@@ -168,7 +167,7 @@ def _move(data):
     _dx = data.xroot - data.pressx
     _dy = data.yroot - data.pressy
     _motion_mask = data.state
-    _do_move()
+    _do_move(0)
     global _inmove
     if not _inmove:
         ob.kgrab(_screen, _motion_grab)
@@ -180,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
@@ -232,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,