}
KeyBindingTree *OBBindings::buildtree(const StringVect &keylist,
- PyObject *callback) const
+ PyObject *callback) const
{
if (keylist.empty()) return 0; // nothing in the list.. return 0
StringVect::const_reverse_iterator it, end = keylist.rend();
for (it = keylist.rbegin(); it != end; ++it) {
p = ret;
- ret = new KeyBindingTree(callback);
- if (!p) ret->chain = false; // only the first built node
+ ret = new KeyBindingTree();
+ if (!p) {
+ // this is the first built node, the bottom node of the tree
+ ret->chain = false;
+ ret->callbacks.push_back(callback);
+ }
ret->first_child = p;
if (!translate(*it, ret->binding)) {
destroytree(ret);
{
_timer.setTimeout(5000); // chains reset after 5 seconds
- setResetKey("C-g"); // set the default reset key
-
- for (int i = 0; i < NUM_EVENTS; ++i)
- _events[i] = 0;
+// setResetKey("C-g"); // set the default reset key
}
}
-PyObject *OBBindings::find(KeyBindingTree *search, bool *conflict) const {
+KeyBindingTree *OBBindings::find(KeyBindingTree *search,
+ bool *conflict) const {
*conflict = false;
KeyBindingTree *a, *b;
a = _keytree.first_child;
if (a->chain == b->chain) {
if (!a->chain) {
// found it! (return the actual id, not the search's)
- return a->callback;
+ return a;
}
} else {
*conflict = true;
bool OBBindings::addKey(const StringVect &keylist, PyObject *callback)
{
- KeyBindingTree *tree;
+ KeyBindingTree *tree, *t;
bool conflict;
if (!(tree = buildtree(keylist, callback)))
return false; // invalid binding requested
- if (find(tree, &conflict) || conflict) {
+ t = find(tree, &conflict);
+ if (conflict) {
// conflicts with another binding
destroytree(tree);
return false;
}
- grabKeys(false);
-
- // assimilate this built tree into the main tree
- assimilate(tree); // assimilation destroys/uses the tree
+ if (t) {
+ // already bound to something
+ // XXX: look if callback is already bound to this key?
+ t->callbacks.push_back(callback);
+ destroytree(tree);
+ } else {
+ // grab the server here to make sure no key pressed go missed
+ otk::OBDisplay::grab();
+ grabKeys(false);
- Py_INCREF(callback);
+ // assimilate this built tree into the main tree
+ assimilate(tree); // assimilation destroys/uses the tree
- grabKeys(true);
+ grabKeys(true);
+ otk::OBDisplay::ungrab();
+ }
+ Py_INCREF(callback);
+
return true;
}
-bool OBBindings::removeKey(const StringVect &keylist)
+bool OBBindings::removeKey(const StringVect &keylist, PyObject *callback)
{
assert(false); // XXX: function not implemented yet
if (!(tree = buildtree(keylist, 0)))
return false; // invalid binding requested
- PyObject *func = find(tree, &conflict);
- if (func) {
- grabKeys(false);
-
- _curpos = &_keytree;
-
- // XXX do shit here ...
- Py_DECREF(func);
-
- grabKeys(true);
- return true;
+ KeyBindingTree *t = find(tree, &conflict);
+ if (t) {
+ CallbackList::iterator it = std::find(t->callbacks.begin(),
+ t->callbacks.end(),
+ callback);
+ if (it != t->callbacks.end()) {
+ // grab the server here to make sure no key pressed go missed
+ otk::OBDisplay::grab();
+ grabKeys(false);
+
+ _curpos = &_keytree;
+
+ // XXX do shit here ...
+ Py_XDECREF(*it);
+
+ grabKeys(true);
+ otk::OBDisplay::ungrab();
+
+ return true;
+ }
}
return false;
}
{
Binding b(0, 0);
if (translate(key, b)) {
+ // grab the server here to make sure no key pressed go missed
+ otk::OBDisplay::grab();
grabKeys(false);
_resetkey.key = b.key;
_resetkey.modifiers = b.modifiers;
grabKeys(true);
+ otk::OBDisplay::ungrab();
}
}
if (p->first_child)
remove_branch(p->first_child);
KeyBindingTree *s = p->next_sibling;
- Py_XDECREF(p->callback);
+ while(!p->callbacks.empty()) {
+ Py_XDECREF(p->callbacks.front());
+ p->callbacks.pop_front();
+ }
delete p;
p = s;
}
p = p->next_sibling;
}
- if (grab)
- otk::OBDisplay::grabKey(_resetkey.key, _resetkey.modifiers,
- root, true, GrabModeAsync, GrabModeAsync,
- false);
- else
- otk::OBDisplay::ungrabKey(_resetkey.key, _resetkey.modifiers,
- root);
+ if (_resetkey.key)
+ if (grab)
+ otk::OBDisplay::grabKey(_resetkey.key, _resetkey.modifiers,
+ root, false, GrabModeAsync, GrabModeAsync,
+ false);
+ else
+ otk::OBDisplay::ungrabKey(_resetkey.key, _resetkey.modifiers,
+ root);
}
}
-void OBBindings::fireKey(unsigned int modifiers, unsigned int key, Time time)
+void OBBindings::fireKey(int screen, unsigned int modifiers, unsigned int key,
+ Time time)
{
if (key == _resetkey.key && modifiers == _resetkey.modifiers) {
resetChains(this);
if (p->binding.key == key && p->binding.modifiers == modifiers) {
if (p->chain) {
_timer.start(); // start/restart the timer
+ // grab the server here to make sure no key pressed go missed
+ otk::OBDisplay::grab();
grabKeys(false);
_curpos = p;
grabKeys(true);
+ otk::OBDisplay::ungrab();
} else {
- Window win = None;
OBClient *c = Openbox::instance->focusedClient();
- if (c) win = c->window();
- KeyData *data = new_key_data(win, time, modifiers, key);
- python_callback(p->callback, (PyObject*)data);
- Py_DECREF((PyObject*)data);
+ KeyData data(screen, c, time, modifiers, key);
+ CallbackList::iterator it, end = p->callbacks.end();
+ for (it = p->callbacks.begin(); it != end; ++it)
+ python_callback(*it, &data);
resetChains(this);
}
break;
void OBBindings::resetChains(OBBindings *self)
{
self->_timer.stop();
+ // grab the server here to make sure no key pressed go missed
+ otk::OBDisplay::grab();
self->grabKeys(false);
self->_curpos = &self->_keytree;
self->grabKeys(true);
+ otk::OBDisplay::ungrab();
}
for (it = _buttons[context].begin(); it != end; ++it)
if ((*it)->binding.key == b.key &&
(*it)->binding.modifiers == b.modifiers) {
- if ((*it)->callback[action] == callback)
- return true; // already bound
break;
}
// grab the button on all clients
for (int sn = 0; sn < Openbox::instance->screenCount(); ++sn) {
OBScreen *s = Openbox::instance->screen(sn);
- OBScreen::ClientList::iterator c_it, c_end = s->clients.end();
+ OBClient::List::iterator c_it, c_end = s->clients.end();
for (c_it = s->clients.begin(); c_it != c_end; ++c_it) {
grabButton(true, bind->binding, context, *c_it);
}
}
} else
bind = *it;
- Py_XDECREF(bind->callback[action]); // if it was already bound, unbind it
- bind->callback[action] = callback;
+ bind->callbacks[action].push_back(callback);
Py_INCREF(callback);
return true;
}
ButtonBindingList::iterator it, end = _buttons[i].end();
for (it = _buttons[i].begin(); it != end; ++it) {
for (int a = 0; a < NUM_MOUSE_ACTION; ++a) {
- Py_XDECREF((*it)->callback[a]);
- (*it)->callback[a] = 0;
+ while (!(*it)->callbacks[a].empty()) {
+ Py_XDECREF((*it)->callbacks[a].front());
+ (*it)->callbacks[a].pop_front();
+ }
}
// ungrab the button on all clients
for (int sn = 0; sn < Openbox::instance->screenCount(); ++sn) {
OBScreen *s = Openbox::instance->screen(sn);
- OBScreen::ClientList::iterator c_it, c_end = s->clients.end();
+ OBClient::List::iterator c_it, c_end = s->clients.end();
for (c_it = s->clients.begin(); c_it != c_end; ++c_it) {
grabButton(false, (*it)->binding, (MouseContext)i, *c_it);
}
{
Window win;
int mode = GrabModeAsync;
+ unsigned int mask;
switch(context) {
case MC_Frame:
win = client->frame->window();
+ mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask;
break;
case MC_Window:
win = client->frame->plate();
mode = GrabModeSync; // this is handled in fireButton
+ mask = ButtonPressMask; // can't catch more than this with Sync mode
+ // the release event is manufactured by the
+ // master buttonPressHandler
break;
default:
// any other elements already get button events, don't grab on them
return;
}
if (grab)
- otk::OBDisplay::grabButton(b.key, b.modifiers, win, false,
- ButtonPressMask | ButtonMotionMask |
- ButtonReleaseMask, mode, GrabModeAsync,
- None, None, false);
+ otk::OBDisplay::grabButton(b.key, b.modifiers, win, false, mask, mode,
+ GrabModeAsync, None, None, false);
else
otk::OBDisplay::ungrabButton(b.key, b.modifiers, win);
}
}
}
-void OBBindings::fireButton(ButtonData *data)
+void OBBindings::fireButton(MouseData *data)
{
- printf("but.mods %d.%d\n", data->button, data->state);
-
if (data->context == MC_Window) {
- // these are grabbed in Sync mode to allow the press to be normal to the
- // client
+ // Replay the event, so it goes to the client, and ungrab the device.
XAllowEvents(otk::OBDisplay::display, ReplayPointer, data->time);
}
for (it = _buttons[data->context].begin(); it != end; ++it)
if ((*it)->binding.key == data->button &&
(*it)->binding.modifiers == data->state) {
- if ((*it)->callback[data->action])
- python_callback((*it)->callback[data->action], (PyObject*)data);
+ CallbackList::iterator c_it,c_end = (*it)->callbacks[data->action].end();
+ for (c_it = (*it)->callbacks[data->action].begin();
+ c_it != c_end; ++c_it)
+ python_callback(*c_it, data);
}
}
if (action < 0 || action >= NUM_EVENTS) {
return false;
}
-
- Py_XDECREF(_events[action]);
- _events[action] = callback;
+#ifdef XKB
+ if (action == EventBell && _eventlist[action].empty())
+ XkbSelectEvents(otk::OBDisplay::display, XkbUseCoreKbd,
+ XkbBellNotifyMask, XkbBellNotifyMask);
+#endif // XKB
+ _eventlist[action].push_back(callback);
Py_INCREF(callback);
return true;
}
-bool OBBindings::removeEvent(EventAction action)
+bool OBBindings::removeEvent(EventAction action, PyObject *callback)
{
if (action < 0 || action >= NUM_EVENTS) {
return false;
}
- Py_XDECREF(_events[action]);
- _events[action] = 0;
- return true;
+ CallbackList::iterator it = std::find(_eventlist[action].begin(),
+ _eventlist[action].end(),
+ callback);
+ if (it != _eventlist[action].end()) {
+ Py_XDECREF(*it);
+ _eventlist[action].erase(it);
+#ifdef XKB
+ if (action == EventBell && _eventlist[action].empty())
+ XkbSelectEvents(otk::OBDisplay::display, XkbUseCoreKbd,
+ XkbBellNotifyMask, 0);
+#endif // XKB
+ return true;
+ }
+ return false;
}
void OBBindings::removeAllEvents()
{
for (int i = 0; i < NUM_EVENTS; ++i) {
- Py_XDECREF(_events[i]);
- _events[i] = 0;
+ while (!_eventlist[i].empty()) {
+ Py_XDECREF(_eventlist[i].front());
+ _eventlist[i].pop_front();
+ }
}
}
void OBBindings::fireEvent(EventData *data)
{
- if (_events[data->action])
- python_callback(_events[data->action], (PyObject*)data);
+ CallbackList::iterator c_it, c_end = _eventlist[data->action].end();
+ for (c_it = _eventlist[data->action].begin(); c_it != c_end; ++c_it)
+ python_callback(*c_it, data);
}
}
projects / chaz / openbox / blobdiff