diff options
| -rw-r--r-- | scripts/focus.py | 7 | ||||
| -rw-r--r-- | scripts/motion.py | 44 | ||||
| -rw-r--r-- | src/bindings.cc | 21 | ||||
| -rw-r--r-- | src/bindings.hh | 3 | ||||
| -rw-r--r-- | src/python.cc | 15 | ||||
| -rw-r--r-- | src/python.hh | 3 |
6 files changed, 80 insertions, 13 deletions
diff --git a/scripts/focus.py b/scripts/focus.py index adba3725..00e53cbc 100644 --- a/scripts/focus.py +++ b/scripts/focus.py @@ -136,7 +136,8 @@ def _focus_stacked_ungrab(data): # have all the modifiers this started with been released? if not _cyc_mask & data.state: _destroy_popup_list() - ob.kungrab() # ungrab ourself + ob.kungrab() + ob.mungrab() _doing_stacked = 0; if cycle_raise: client = ob.openbox.findClient(_cyc_w) @@ -246,6 +247,10 @@ def focus_next_stacked(data, forward=1): _create_popup_list(data) ob.kgrab(data.screen, _focus_stacked_ungrab) + # the pointer grab causes pointer events during the keyboard grab to + # go away, which means we don't get enter notifies when the popup + # disappears, screwing up the focus + ob.mgrab(data.screen) focus_next_stacked(data, forward) # start with the first press def focus_prev_stacked(data): diff --git a/scripts/motion.py b/scripts/motion.py index 69ae99b4..e8aa1f3e 100644 --- a/scripts/motion.py +++ b/scripts/motion.py @@ -37,7 +37,8 @@ _popwidget = 0 _poplabel = 0 # motion state -_inmotion = 0 +_inmove = 0 +_inresize = 0 # last motion data _cx = 0 @@ -51,6 +52,21 @@ _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 + def _do_move(): global _screen, _client, _cx, _cy, _dx, _dy @@ -105,20 +121,26 @@ 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) + print "GRAB" + _inmove = 1 def end_move(data): """Complete the interactive move of a window.""" - global move_rubberband, _inmotion + global move_rubberband, _inmove global _popwidget, _poplabel - if _inmotion: + if _inmove: r = move_rubberband move_rubberband = 0 _do_move() move_rubberband = r - _inmotion = 0 + _inmove = 0 _poplabel = 0 _popwidget = 0 + print "UNGRAB" + ob.kungrab() def _do_resize(): global _screen, _client, _cx, _cy, _cw, _ch, _px, _py, _dx, _dy @@ -196,17 +218,21 @@ 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 + global resize_rubberband, _inresize global _popwidget, _poplabel - if _inmotion: + if _inresize: r = resize_rubberband resize_rubberband = 0 _do_resize() resize_rubberband = r - _inmotion = 0 + _inresize = 0 _poplabel = 0 _popwidget = 0 + ob.kungrab() diff --git a/src/bindings.cc b/src/bindings.cc index 783b6479..a3694102 100644 --- a/src/bindings.cc +++ b/src/bindings.cc @@ -385,9 +385,6 @@ bool Bindings::grabKeyboard(int screen, PyObject *callback) if (XGrabKeyboard(**otk::display, root, false, GrabModeAsync, GrabModeAsync, CurrentTime)) return false; - // the pointer grab causes pointer events during the keyboard grab to go away - XGrabPointer(**otk::display, root, false, 0, GrabModeAsync, - GrabModeAsync, None, None, CurrentTime); _keybgrab_callback = callback; return true; } @@ -403,6 +400,24 @@ void Bindings::ungrabKeyboard() } +bool Bindings::grabPointer(int screen) +{ + if (!openbox->screen(screen)) + return false; // the screen is not managed + + Window root = otk::display->screenInfo(screen)->rootWindow(); + XGrabPointer(**otk::display, root, false, 0, GrabModeAsync, + GrabModeAsync, None, None, CurrentTime); + return true; +} + + +void Bindings::ungrabPointer() +{ + XUngrabPointer(**otk::display, CurrentTime); +} + + void Bindings::fireKey(int screen, unsigned int modifiers, unsigned int key, Time time, KeyAction::KA action) { diff --git a/src/bindings.hh b/src/bindings.hh index 2b2260e2..d120ffc0 100644 --- a/src/bindings.hh +++ b/src/bindings.hh @@ -123,6 +123,9 @@ public: bool grabKeyboard(int screen, PyObject *callback); void ungrabKeyboard(); + bool grabPointer(int screen); + void ungrabPointer(); + bool addButton(const std::string &but, MouseContext::MC context, MouseAction::MA action, PyObject *callback); diff --git a/src/python.cc b/src/python.cc index 9feddbd8..2a9a912a 100644 --- a/src/python.cc +++ b/src/python.cc @@ -144,6 +144,21 @@ PyObject *kungrab() Py_INCREF(Py_None); return Py_None; } +PyObject *mgrab(int screen) +{ + if (!ob::openbox->bindings()->grabPointer(screen)) { + PyErr_SetString(PyExc_RuntimeError,"Unable to grab pointer."); + return NULL; + } + Py_INCREF(Py_None); return Py_None; +} + +PyObject *mungrab() +{ + ob::openbox->bindings()->ungrabPointer(); + Py_INCREF(Py_None); return Py_None; +} + PyObject *kbind(PyObject *keylist, ob::KeyContext::KC context, PyObject *func) { if (!PyCallable_Check(func)) { diff --git a/src/python.hh b/src/python.hh index 90df3e10..8b6c4ae8 100644 --- a/src/python.hh +++ b/src/python.hh @@ -249,6 +249,9 @@ PyObject *kbind(PyObject *keylist, ob::KeyContext::KC context, PyObject *func); PyObject *kgrab(int screen, PyObject *func); PyObject *kungrab(); +PyObject *mgrab(int screen); +PyObject *mungrab(); + PyObject *ebind(ob::EventAction::EA action, PyObject *func); void set_reset_key(const std::string &key); |