X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fmotion.py;h=88b82e5c4e172b539e6af1da1bfe489d1b08c73c;hb=a81b9674752bab92544f7d160734108a0b84007b;hp=69ae99b423a67032b09a63a2ab135751c213d197;hpb=3409b046a043d8ffabf2e9c33ea037c2e5be15e4;p=chaz%2Fopenbox diff --git a/scripts/motion.py b/scripts/motion.py index 69ae99b4..88b82e5c 100644 --- a/scripts/motion.py +++ b/scripts/motion.py @@ -1,34 +1,57 @@ ############################################################################ -### Functions that provide callbacks for motion events to move and ### -### windows. ### +### Functions that provide callbacks for motion events to move and ### +### resize windows. ### ############################################################################ ############################################################################# -### Options that can be modified to change the functions' behaviors. ### -### ### -# 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 ### -### ### +### 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.""" +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 @@ -37,7 +60,8 @@ _popwidget = 0 _poplabel = 0 # motion state -_inmotion = 0 +_inmove = 0 +_inresize = 0 # last motion data _cx = 0 @@ -51,47 +75,85 @@ _dy = 0 _client = 0 _screen = 0 +_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 + +_last_x = 0 +_last_y = 0 + def _do_move(): global _screen, _client, _cx, _cy, _dx, _dy - x = _cx + _dx - y = _cy + _dy + # get destination x/y for the *frame* + x = _cx + _dx + _client.frame.area().x() - _client.area().x() + y = _cy + _dy + _client.frame.area().y() - _client.area().y() - global move_rubberband - if move_rubberband: + global _last_x, _last_y + 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() + 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: + x = l + # right screen edge + 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: + y = t + # right screen edge + if _last_y < y and y > b and y <= b + EDGE_RESISTANCE: + y = b + + global _inmove + if not _inmove: + _last_x = 0 + _last_y = 0 + else: + _last_x = x + _last_y = y + + if MOVE_RUBBERBAND: # draw the outline ... f=0 else: _client.move(x, y) - 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()) - _popwidget.show(1) - _poplabel.resize(length, font.height()) _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.resize(_poplabel.minSize()) + _popwidget.move(otk.Point((scsize.width() - size.width()) / 2, + (scsize.height() - size.height()) / 2)) + _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 @@ -105,26 +167,32 @@ def move(data): _dx = data.xroot - data.pressx _dy = data.yroot - data.pressy _do_move() - _inmotion = 1 + 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, _inmotion - global _popwidget, _poplabel - if _inmotion: - r = move_rubberband - move_rubberband = 0 +def _end_move(data): + global MOVE_RUBBERBAND + global _inmove, _popwidget, _poplabel + if _inmove: + r = MOVE_RUBBERBAND + MOVE_RUBBERBAND = 0 _do_move() - move_rubberband = r - _inmotion = 0 + MOVE_RUBBERBAND = r + _inmove = 0 _poplabel = 0 _popwidget = 0 + ob.kungrab() def _do_resize(): global _screen, _client, _cx, _cy, _cw, _ch, _px, _py, _dx, _dy + dx = _dx + 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 @@ -132,53 +200,45 @@ def _do_resize(): if y < _ch / 2: if x < _cw / 2: corner = ob.Client.BottomRight - _dx *= -1 + dx *= -1 else: corner = ob.Client.BottomLeft - _dy *= -1 + dy *= -1 else: if x < _cw / 2: corner = ob.Client.TopRight - _dx *= -1 + dx *= -1 else: corner = ob.Client.TopLeft - w = _cw + _dx - h = _ch + _dy + w = _cw + dx + h = _ch + dy + if w < 0: w = 0 + if h < 0: h = 0 - 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()) - _popwidget.show(1) - _poplabel.fitString(text) _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.resize(_poplabel.minSize()) + _popwidget.move(otk.Point((scsize.width() - size.width()) / 2, + (scsize.height() - size.height()) / 2)) + _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 @@ -196,17 +256,20 @@ def resize(data): _dx = data.xroot - _px _dy = data.yroot - _py _do_resize() - _inmotion = 1 + 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, _inmotion +def _end_resize(data): + global RESIZE_RUBBERBAND, _inresize global _popwidget, _poplabel - if _inmotion: - r = resize_rubberband - resize_rubberband = 0 + if _inresize: + r = RESIZE_RUBBERBAND + RESIZE_RUBBERBAND = 0 _do_resize() - resize_rubberband = r - _inmotion = 0 + RESIZE_RUBBERBAND = r + _inresize = 0 _poplabel = 0 _popwidget = 0 + ob.kungrab()