add a POPUP_CENTERED option

[chaz/openbox] / scripts / motion.py

diff --git a/scripts/motion.py b/scripts/motion.py
index 8cc890503072351565a791135f7d405296f902c6..410ee4d6c1e775d6330ccfb930ec60e0a654919c 100644 (file)
--- a/scripts/motion.py
+++ b/scripts/motion.py
@@ -9,8 +9,11 @@
 EDGE_RESISTANCE = 10
 """The amount of resistance to provide to moving a window past a screen
    boundary. Specify a value of 0 to disable edge resistance."""
+POPUP_CENTERED = 1
+"""When this is non-zero, the coordinates popups will be centered on the
+   screen. When zero, they will appear in the upper-left corner."""
 MOVE_POPUP = 1
-"""Display a coordinates popup when moving windows."
+"""Display a coordinates popup when moving windows."""
 MOVE_RUBBERBAND = 0
 """NOT IMPLEMENTED (yet?)
    Display an outline while moving instead of moving the actual window,
@@ -80,25 +83,24 @@ _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*
-    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 +108,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,29 +138,25 @@ def _do_move():
         # draw the outline ...
         f=0
     else:
-        _client.move(x, y)
+        _client.move(x, y, final)
 
     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)
+        if POPUP_CENTERED:
+            scsize = ob.openbox.screen(_screen).size()
+            x = (scsize.width() - size.width()) / 2
+            y = (scsize.height() - size.height()) / 2
+        else:
+            x = y = 0
+        size = _poplabel.minSize()
+        _popwidget.moveresize(otk.Rect(x, y, size.width(), size.height()))
         _popwidget.show(1)
 
 def _move(data):
@@ -167,14 +165,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)
@@ -186,7 +185,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
@@ -230,24 +229,22 @@ 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)
+        if POPUP_CENTERED:
+            scsize = ob.openbox.screen(_screen).size()
+            x = (scsize.width() - size.width()) / 2
+            y = (scsize.height() - size.height()) / 2
+        else:
+            x = y = 0
+        size = _poplabel.minSize()
+        _popwidget.moveresize(otk.Rect(x, y, size.width(), size.height()))
         _popwidget.show(1)
 
 def _resize(data):
@@ -257,6 +254,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 +265,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: