]> Dogcows Code - chaz/openbox/blobdiff - scripts/motion.py
add a POPUP_CENTERED option
[chaz/openbox] / scripts / motion.py
index f2215d309dcbdbe27521322b04ca19683c6dfe62..410ee4d6c1e775d6330ccfb930ec60e0a654919c 100644 (file)
@@ -4,50 +4,57 @@
 ############################################################################
 
 #############################################################################
-### Options that can be modified to change the functions' behaviors.      ###
-###                                                                       ###
-# edge_resistance - the amount of resistance to provide to moving a       ###
-###                 window past a screen boundary. Specify a value of 0   ###
-###                 to disable edge resistance.                           ###
-edge_resistance = 10                                                      ###
-###                                                                       ###
-# move_popup - display a coordinates popup when moving windows.           ###
-move_popup = 1                                                            ###
-###                                                                       ###
-# NOT IMPLEMENTED (yet?)                                                  ###
-# move_rubberband - display an outline while moving instead of moving the ###
-###                 actual window, until the move is completed. Good for  ###
-###                 slower systems.                                       ###
-move_rubberband = 0                                                       ###
-###                                                                       ###
-# resize_popup - display a size popup when resizing windows.              ###
-resize_popup = 1                                                          ###
-###                                                                       ###
-# NOT IMPLEMENTED (yet?)                                                  ###
-# resize_rubberband - display an outline while resizing instead of        ###
-###                   resizing the actual window, until the resize is     ###
-###                   completed. Good for slower systems.                 ###
-resize_rubberband = 0                                                     ###
-###                                                                       ###
-# resize_nearest - 1 to resize from the corner nearest where the mouse    ###
-###                is, 0 to resize always from the bottom right corner.   ###
-resize_nearest = 1                                                        ###
-###                                                                       ###
-###                                                                       ###
-# Provides:                                                               ###
-# def move(data):                                                         ###
-#     """Moves the window interactively. This should only be used with    ###
-#        MouseMotion events. If move_popup or move_rubberband is enabled, ###
-#        then the end_move function needs to be bound as well."""         ###
-# def end_move(data):                                                     ###
-#     """Complete the interactive move of a window."""                    ###
-# def resize(data):                                                       ###
-#     """Resizes the window interactively. This should only be used with  ###
-#        MouseMotion events"""                                            ###
-# def end_resize(data):                                                   ###
-#     """Complete the interactive resize of a window."""                  ###
-###                                                                       ###
+###   Options that can be modified to change the functions' behaviors.    ###
 #############################################################################
+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
+"""NOT IMPLEMENTED (yet?)
+   Display an outline while moving instead of moving the actual window,
+   until the move is completed. Good for slower systems."""
+RESIZE_POPUP = 1
+"""Display a size popup when resizing windows."""
+RESIZE_RUBBERBAND = 0
+"""NOT IMPLEMENTED (yet?)
+   Display an outline while resizing instead of resizing the actual
+   window, until the resize is completed. Good for slower systems."""
+RESIZE_NEAREST = 1
+"""Non-zero to resize from the corner nearest where the mouse is, 0 to
+   resize always from the bottom right corner."""
+#############################################################################
+
+def move(data):
+    """Moves the window interactively. This should only be used with
+       MouseAction.Motion events. If MOVE_POPUP or MOVE_RUBBERBAND is enabled,
+       then the end_move function needs to be bound as well."""
+    _move(data)
+
+def end_move(data):
+    """Complete the interactive move of a window."""
+    _end_move(data)
+
+def resize(data):
+    """Resizes the window interactively. This should only be used with
+       MouseMotion events. If RESIZE_POPUP or RESIZE_RUBBERBAND is enabled,
+       then the end_resize function needs to be bound as well."""
+    _resize(data)
+
+def end_resize(data):
+    """Complete the interactive resize of a window."""
+    _end_resize(data)
+
+###########################################################################
+###########################################################################
+
+###########################################################################
+###      Internal stuff, should not be accessed outside the module.     ###
+###########################################################################
 
 import ob
 import otk
@@ -76,49 +83,47 @@ _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 edge_resistance
     global _last_x, _last_y
-    if edge_resistance:
+    if EDGE_RESISTANCE:
         fs = _client.frame.size()
         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()
         b = area.bottom() - h + 1
         # left screen edge
-        if _last_x > x and x < l and x >= l - edge_resistance:
+        if _last_x > x and x < l and x >= l - EDGE_RESISTANCE:
             x = l
         # right screen edge
-        if _last_x < x and x > r and x <= r + edge_resistance:
+        if _last_x < x and x > r and x <= r + EDGE_RESISTANCE:
             x = r
         # top screen edge
-        if _last_y > y and y < t and y >= t - edge_resistance:
+        if _last_y > y and y < t and y >= t - EDGE_RESISTANCE:
             y = t
         # right screen edge
-        if _last_y < y and y > b and y <= b + edge_resistance:
+        if _last_y < y and y > b and y <= b + EDGE_RESISTANCE:
             y = b
 
     global _inmove
@@ -129,68 +134,59 @@ def _do_move():
         _last_x = x
         _last_y = y
 
-    global move_rubberband
-    if move_rubberband:
+    if MOVE_RUBBERBAND:
         # draw the outline ...
         f=0
     else:
-        _client.move(x, y, 1) # move the *frame*
+        _client.move(x, y, final)
 
-    global move_popup
-    if move_popup:
+    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):
-    """Moves the window interactively. This should only be used with
-       MouseMotion events. If move_popup or move_rubberband is enabled, then
-       the end_move function needs to be bound as well."""
+def _move(data):
     if not data.client: return
 
     # 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)
         _inmove = 1
 
-def end_move(data):
-    """Complete the interactive move of a window."""
-    global move_rubberband, _inmove
-    global _popwidget, _poplabel
+def _end_move(data):
+    global MOVE_RUBBERBAND
+    global _inmove, _popwidget, _poplabel
     if _inmove:
-        r = move_rubberband
-        move_rubberband = 0
-        _do_move()
-        move_rubberband = r
+        r = MOVE_RUBBERBAND
+        MOVE_RUBBERBAND = 0
+        _do_move(1)
+        MOVE_RUBBERBAND = r
         _inmove = 0
     _poplabel = 0
     _popwidget = 0
@@ -203,7 +199,7 @@ def _do_resize():
     dy = _dy
     
     # pick a corner to anchor
-    if not (resize_nearest or _context == ob.MouseContext.Grip):
+    if not (RESIZE_NEAREST or _context == ob.MouseContext.Grip):
         corner = ob.Client.TopLeft
     else:
         x = _px - _cx
@@ -225,45 +221,40 @@ def _do_resize():
     w = _cw + dx
     h = _ch + dy
 
-    global resize_popup
-    if resize_rubberband:
+    if RESIZE_RUBBERBAND:
         # draw the outline ...
         f=0
     else:
         _client.resize(corner, w, h)
 
-    global resize_popup
-    if resize_popup:
+    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):
-    """Resizes the window interactively. This should only be used with
-       MouseMotion events"""
+def _resize(data):
     if not data.client: return
 
     # not-normal windows dont get resized
     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
@@ -274,21 +265,21 @@ 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:
         ob.kgrab(_screen, _motion_grab)
         _inresize = 1
 
-def end_resize(data):
-    """Complete the interactive resize of a window."""
-    global resize_rubberband, _inresize
+def _end_resize(data):
+    global RESIZE_RUBBERBAND, _inresize
     global _popwidget, _poplabel
     if _inresize:
-        r = resize_rubberband
-        resize_rubberband = 0
+        r = RESIZE_RUBBERBAND
+        RESIZE_RUBBERBAND = 0
         _do_resize()
-        resize_rubberband = r
+        RESIZE_RUBBERBAND = r
         _inresize = 0
     _poplabel = 0
     _popwidget = 0
This page took 0.030818 seconds and 4 git commands to generate.