X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fmotion.py;h=cc17803b794444b6c60c286d9521614aa3602601;hb=56d2f942aedbd212779d40c36eda1a89c931e960;hp=88b82e5c4e172b539e6af1da1bfe489d1b08c73c;hpb=1c97e9fb7bede1607b9680d29a791a72b1768019;p=chaz%2Fopenbox diff --git a/scripts/motion.py b/scripts/motion.py index 88b82e5c..cc17803b 100644 --- a/scripts/motion.py +++ b/scripts/motion.py @@ -9,6 +9,21 @@ 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_IN_WINDOW = 0 +"""When this is non-zero, the coordinates popups will be placed relative to + the window being moved/resized. When zero, they will appear relative to the + entire screen.""" +POPUP_CENTERED = 1 +"""When this is non-zero, the coordinates popups will be centered relative to + the window or screen (see POPUP_IN_WINDOW). When zero, they will be placed + at based upon POPUP_COORDS.""" +POPUP_COORDS = 0, 0 +"""When POPUP_CENTERED is zero, these coordinates will be used to place the + coordinates popup. The popup will be placed relative to the window or the + screen (see POPUP_IN_WINDOW). A value of 0, 0 would place it in the top + left corner, while a value of -1, -1 would place it in the bottom right. + These values behave simmilarly to those passed to the -geometry flag of many + applications.""" MOVE_POPUP = 1 """Display a coordinates popup when moving windows.""" MOVE_RUBBERBAND = 0 @@ -57,7 +72,6 @@ import ob import otk _popwidget = 0 -_poplabel = 0 # motion state _inmove = 0 @@ -77,23 +91,40 @@ _screen = 0 _motion_mask = 0 +def _place_popup(): + if POPUP_IN_WINDOW: + area = _client.frame.area() + else: + area = otk.Rect(otk.Point(0, 0), ob.openbox.screen(_screen).size()) + size = _popwidget.minSize() + if POPUP_CENTERED: + x = area.position().x() + (area.size().width() - size.width()) / 2 + y = area.position().y() + (area.size().height() - size.height()) / 2 + else: + try: x, y = POPUP_COORDS + except: x = y = 0 + if x < 0: x += area.right() - size.width() + 2 + if y < 0: y += area.bottom() - size.height() + 2 + x += area.position.x() + y += area.position.y() + _popwidget.moveresize(otk.Rect(x, y, size.width(), size.height())) + 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* @@ -106,7 +137,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,22 +167,17 @@ def _do_move(): # draw the outline ... f=0 else: - _client.move(x, y) + _client.move(x, y, final) if MOVE_POPUP: - global _popwidget, _poplabel + global _popwidget text = "X: " + str(x) + " Y: " + str(y) if not _popwidget: - _popwidget = otk.Widget(_screen, ob.openbox, - otk.Widget.Horizontal, 0, 1) - _poplabel = otk.Label(_popwidget) - _poplabel.setText(text) - scsize = otk.display.screenInfo(_screen).size() - size = _poplabel.minSize() - _popwidget.resize(_poplabel.minSize()) - _popwidget.move(otk.Point((scsize.width() - size.width()) / 2, - (scsize.height() - size.height()) / 2)) - _popwidget.show(1) + _popwidget = otk.Label(_screen, ob.openbox) + _popwidget.setHighlighted(1) + _popwidget.setText(text) + _place_popup() + _popwidget.show() def _move(data): if not data.client: return @@ -159,14 +185,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) @@ -174,14 +201,13 @@ def _move(data): def _end_move(data): global MOVE_RUBBERBAND - global _inmove, _popwidget, _poplabel + global _inmove, _popwidget if _inmove: r = MOVE_RUBBERBAND MOVE_RUBBERBAND = 0 - _do_move() + _do_move(1) MOVE_RUBBERBAND = r _inmove = 0 - _poplabel = 0 _popwidget = 0 ob.kungrab() @@ -213,8 +239,6 @@ def _do_resize(): w = _cw + dx h = _ch + dy - if w < 0: w = 0 - if h < 0: h = 0 if RESIZE_RUBBERBAND: # draw the outline ... @@ -223,20 +247,15 @@ def _do_resize(): _client.resize(corner, w, h) if RESIZE_POPUP: - global _popwidget, _poplabel + global _popwidget ls = _client.logicalSize() text = "W: " + str(ls.width()) + " H: " + str(ls.height()) if not _popwidget: - _popwidget = otk.Widget(_screen, ob.openbox, - otk.Widget.Horizontal, 0, 1) - _poplabel = otk.Label(_popwidget) - _poplabel.setText(text) - scsize = otk.display.screenInfo(_screen).size() - size = _poplabel.minSize() - _popwidget.resize(_poplabel.minSize()) - _popwidget.move(otk.Point((scsize.width() - size.width()) / 2, - (scsize.height() - size.height()) / 2)) - _popwidget.show(1) + _popwidget = otk.Label(_screen, ob.openbox) + _popwidget.setHighlighted(1) + _popwidget.setText(text) + _place_popup() + _popwidget.show() def _resize(data): if not data.client: return @@ -245,6 +264,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 @@ -255,6 +275,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: @@ -263,13 +284,12 @@ def _resize(data): def _end_resize(data): global RESIZE_RUBBERBAND, _inresize - global _popwidget, _poplabel + global _popwidget if _inresize: r = RESIZE_RUBBERBAND RESIZE_RUBBERBAND = 0 _do_resize() RESIZE_RUBBERBAND = r _inresize = 0 - _poplabel = 0 _popwidget = 0 ob.kungrab()