add a POPUP_CENTERED option

[chaz/openbox] / scripts / motion.py

diff --git a/scripts/motion.py b/scripts/motion.py
index ef05b2792a49eb1d24c15be3711fccc58f5fd951..410ee4d6c1e775d6330ccfb930ec60e0a654919c 100644 (file)
--- a/scripts/motion.py
+++ b/scripts/motion.py
@@ -9,6 +9,9 @@
 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."""
 MOVE_RUBBERBAND = 0
@@ -81,8 +84,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 +95,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 +138,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,11 +149,14 @@ def _do_move():
             _poplabel = otk.Label(_popwidget)
             _poplabel.setHighlighted(1)
         _poplabel.setText(text)
-        scsize = otk.display.screenInfo(_screen).size()
+        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((scsize.width() - size.width()) / 2,
-                                       (scsize.height() - size.height()) / 2,
-                                       size.width(), size.height()))
+        _popwidget.moveresize(otk.Rect(x, y, size.width(), size.height()))
         _popwidget.show(1)
 
 def _move(data):
@@ -168,7 +173,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 +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
@@ -232,11 +237,14 @@ def _do_resize():
             _poplabel = otk.Label(_popwidget)
             _poplabel.setHighlighted(1)
         _poplabel.setText(text)
-        scsize = otk.display.screenInfo(_screen).size()
+        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((scsize.width() - size.width()) / 2,
-                                       (scsize.height() - size.height()) / 2,
-                                       size.width(), size.height()))
+        _popwidget.moveresize(otk.Rect(x, y, size.width(), size.height()))
         _popwidget.show(1)
 
 def _resize(data):