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
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()
# 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
+ _motion_mask = data.state
_do_move()
global _inmove
if not _inmove:
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
_py = data.pressy
_dx = data.xroot - _px
_dy = data.yroot - _py
+ _motion_mask = data.state
_do_resize()
global _inresize
if not _inresize: