nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

grab the server around key ungrab/grabs to prevent losing keys

Browse source
This commit is contained in:
Dana Jansens 2003-01-08 06:41:31 +00:00
parent 9bfc977827
commit 2a40cebfdc
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/bindings.cc
View file

@ -243,12 +243,15 @@ bool OBBindings::addKey(const StringVect &keylist, PyObject *callback)
t->callbacks.push_back(callback); t->callbacks.push_back(callback);
destroytree(tree); destroytree(tree);
} else { } else {
// grab the server here to make sure no key pressed go missed
otk::OBDisplay::grab();
grabKeys(false); grabKeys(false);
// assimilate this built tree into the main tree // assimilate this built tree into the main tree
assimilate(tree); // assimilation destroys/uses the tree assimilate(tree); // assimilation destroys/uses the tree
grabKeys(true); grabKeys(true);
otk::OBDisplay::ungrab();
} }
Py_INCREF(callback); Py_INCREF(callback);
@ -273,6 +276,8 @@ bool OBBindings::removeKey(const StringVect &keylist, PyObject *callback)
t->callbacks.end(), t->callbacks.end(),
callback); callback);
if (it != t->callbacks.end()) { if (it != t->callbacks.end()) {
// grab the server here to make sure no key pressed go missed
otk::OBDisplay::grab();
grabKeys(false); grabKeys(false);
_curpos = &_keytree; _curpos = &_keytree;
@ -281,6 +286,8 @@ bool OBBindings::removeKey(const StringVect &keylist, PyObject *callback)
Py_XDECREF(*it); Py_XDECREF(*it);
grabKeys(true); grabKeys(true);
otk::OBDisplay::ungrab();
return true; return true;
} }
} }
@ -292,10 +299,13 @@ void OBBindings::setResetKey(const std::string &key)
{ {
Binding b(0, 0); Binding b(0, 0);
if (translate(key, b)) { if (translate(key, b)) {
// grab the server here to make sure no key pressed go missed
otk::OBDisplay::grab();
grabKeys(false); grabKeys(false);
_resetkey.key = b.key; _resetkey.key = b.key;
_resetkey.modifiers = b.modifiers; _resetkey.modifiers = b.modifiers;
grabKeys(true); grabKeys(true);
otk::OBDisplay::ungrab();
} }
} }
@ -370,9 +380,12 @@ void OBBindings::fireKey(int screen, unsigned int modifiers, unsigned int key,
if (p->binding.key == key && p->binding.modifiers == modifiers) { if (p->binding.key == key && p->binding.modifiers == modifiers) {
if (p->chain) { if (p->chain) {
_timer.start(); // start/restart the timer _timer.start(); // start/restart the timer
// grab the server here to make sure no key pressed go missed
otk::OBDisplay::grab();
grabKeys(false); grabKeys(false);
_curpos = p; _curpos = p;
grabKeys(true); grabKeys(true);
otk::OBDisplay::ungrab();
} else { } else {
Window win = None; Window win = None;
OBClient *c = Openbox::instance->focusedClient(); OBClient *c = Openbox::instance->focusedClient();
@ -394,9 +407,12 @@ void OBBindings::fireKey(int screen, unsigned int modifiers, unsigned int key,
void OBBindings::resetChains(OBBindings *self) void OBBindings::resetChains(OBBindings *self)
{ {
self->_timer.stop(); self->_timer.stop();
// grab the server here to make sure no key pressed go missed
otk::OBDisplay::grab();
self->grabKeys(false); self->grabKeys(false);
self->_curpos = &self->_keytree; self->_curpos = &self->_keytree;
self->grabKeys(true); self->grabKeys(true);
otk::OBDisplay::ungrab();
} }