proper check for modifiers being released, not caring about added.

[chaz/openbox] / scripts / motion.py

diff --git a/scripts/motion.py b/scripts/motion.py
index cdfb9477539822d60e88ab03d4bd84ca58b90e3c..b1e69d846b0ba861fab6753cf95f8ac86a666a8a 100644 (file)
--- a/scripts/motion.py
+++ b/scripts/motion.py
@@ -80,15 +80,14 @@ _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
@@ -97,8 +96,8 @@ def _do_move():
     global _screen, _client, _cx, _cy, _dx, _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()
+    x = _cx + _dx + _client.frame.area().x() - _client.area().x()
+    y = _cy + _dy + _client.frame.area().y() - _client.area().y()
 
     global _last_x, _last_y
     if EDGE_RESISTANCE:
@@ -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()
@@ -140,25 +139,18 @@ def _do_move():
 
     if MOVE_POPUP:
         global _popwidget, _poplabel
-        style = ob.openbox.screen(_screen).style()
-        font = style.labelFont()
         text = "X: " + str(x) + " Y: " + str(y)
-        length = font.measureString(text)
         if not _popwidget:
-            _popwidget = otk.Widget(ob.openbox, style,
-                                    otk.Widget.Horizontal, 0,
-                                    style.bevelWidth(), 1)
-            _popwidget.setTexture(style.titlebarFocusBackground())
+            _popwidget = otk.Widget(_screen, ob.openbox, 
+                                    otk.Widget.Horizontal, 0, 1)
             _poplabel = otk.Label(_popwidget)
-            _poplabel.setTexture(style.labelFocusBackground())
-        _poplabel.fitString(text)
+            _poplabel.setHighlighted(1)
         _poplabel.setText(text)
-        _popwidget.update() 
-        area = otk.display.screenInfo(_screen).rect()
-        _popwidget.move(area.x() + (area.width() -
-                                    _popwidget.width()) / 2,
-                        area.y() + (area.height() -
-                                    _popwidget.height()) / 2)
+        scsize = otk.display.screenInfo(_screen).size()
+        size = _poplabel.minSize()
+        _popwidget.moveresize(otk.Rect((scsize.width() - size.width()) / 2,
+                                       (scsize.height() - size.height()) / 2,
+                                       size.width(), size.height()))
         _popwidget.show(1)
 
 def _move(data):
@@ -167,13 +159,14 @@ 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
+    _motion_mask = data.state
     _do_move()
     global _inmove
     if not _inmove:
@@ -230,24 +223,19 @@ def _do_resize():
 
     if RESIZE_POPUP:
         global _popwidget, _poplabel
-        style = ob.openbox.screen(_screen).style()
         ls = _client.logicalSize()
-        text = "W: " + str(ls.x()) + " H: " + str(ls.y())
+        text = "W: " + str(ls.width()) + " H: " + str(ls.height())
         if not _popwidget:
-            _popwidget = otk.Widget(ob.openbox, style,
-                                    otk.Widget.Horizontal, 0,
-                                    style.bevelWidth(), 1)
-            _popwidget.setTexture(style.titlebarFocusBackground())
+            _popwidget = otk.Widget(_screen, ob.openbox, 
+                                    otk.Widget.Horizontal, 0, 1)
             _poplabel = otk.Label(_popwidget)
-            _poplabel.setTexture(style.labelFocusBackground())
-        _poplabel.fitString(text)
+            _poplabel.setHighlighted(1)
         _poplabel.setText(text)
-        area = otk.display.screenInfo(_screen).rect()
-        _popwidget.update() 
-        _popwidget.move(area.x() + (area.width() -
-                                    _popwidget.width()) / 2,
-                        area.y() + (area.height() -
-                                    _popwidget.height()) / 2)
+        scsize = otk.display.screenInfo(_screen).size()
+        size = _poplabel.minSize()
+        _popwidget.moveresize(otk.Rect((scsize.width() - size.width()) / 2,
+                                       (scsize.height() - size.height()) / 2,
+                                       size.width(), size.height()))
         _popwidget.show(1)
 
 def _resize(data):
@@ -257,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
@@ -267,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: