: _curpos(&_keytree),
_resetkey(0,0),
_timer(Openbox::instance->timerManager(),
- (otk::OBTimeoutHandler)reset, this)
+ (otk::OBTimeoutHandler)resetChains, this)
{
_timer.setTimeout(5000); // chains reset after 5 seconds
OBBindings::~OBBindings()
{
grabKeys(false);
- removeAll();
+ removeAllKeys();
+ removeAllButtons();
}
}
-bool OBBindings::add(const StringVect &keylist, PyObject *callback)
+bool OBBindings::addKey(const StringVect &keylist, PyObject *callback)
{
KeyBindingTree *tree;
bool conflict;
}
-bool OBBindings::remove(const StringVect &keylist)
+bool OBBindings::removeKey(const StringVect &keylist)
{
assert(false); // XXX: function not implemented yet
}
-void OBBindings::removeAll()
+void OBBindings::removeAllKeys()
{
+ grabKeys(false);
if (_keytree.first_child) {
remove_branch(_keytree.first_child);
_keytree.first_child = 0;
}
+ grabKeys(true);
}
}
-void OBBindings::fire(unsigned int modifiers, unsigned int key, Time time)
+void OBBindings::fireKey(unsigned int modifiers, unsigned int key, Time time)
{
if (key == _resetkey.key && modifiers == _resetkey.modifiers) {
- reset(this);
+ resetChains(this);
} else {
KeyBindingTree *p = _curpos->first_child;
while (p) {
KeyData *data = new_key_data(win, time, modifiers, key);
python_callback(p->callback, (PyObject*)data);
Py_DECREF((PyObject*)data);
- reset(this);
+ resetChains(this);
}
break;
}
}
}
-void OBBindings::reset(OBBindings *self)
+void OBBindings::resetChains(OBBindings *self)
{
self->_timer.stop();
self->grabKeys(false);
for (it = _buttons[context].begin(); it != end; ++it)
if ((*it)->binding.key == b.key &&
(*it)->binding.modifiers == b.modifiers) {
- ButtonBinding::CallbackList::iterator c_it,
- c_end = (*it)->callback[action].end();
- for (c_it = (*it)->callback[action].begin(); c_it != c_end; ++c_it)
- if (*c_it == callback)
- return true; // already bound
+ if ((*it)->callback[action] == callback)
+ return true; // already bound
break;
}
bind->binding.key = b.key;
bind->binding.modifiers = b.modifiers;
_buttons[context].push_back(bind);
- printf("adding %d.%d to %d\n", b.key, b.modifiers, context);
- // XXX GRAB the new button everywhere!
+ // 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();
+ for (c_it = s->clients.begin(); c_it != c_end; ++c_it) {
+ grabButton(true, bind->binding, context, *c_it);
+ }
+ }
} else
bind = *it;
- bind->callback[action].push_back(callback);
+ Py_XDECREF(bind->callback[action]); // if it was already bound, unbind it
+ bind->callback[action] = callback;
Py_INCREF(callback);
return true;
}
+void OBBindings::removeAllButtons()
+{
+ for (int i = i; i < NUM_MOUSE_CONTEXT; ++i) {
+ 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;
+ }
+ // 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();
+ for (c_it = s->clients.begin(); c_it != c_end; ++c_it) {
+ grabButton(false, (*it)->binding, (MouseContext)i, *c_it);
+ }
+ }
+ }
+ }
+}
+
+void OBBindings::grabButton(bool grab, const Binding &b, MouseContext context,
+ OBClient *client)
+{
+ Window win;
+ int mode = GrabModeAsync;
+ switch(context) {
+ case MC_Frame:
+ win = client->frame->window();
+ break;
+ case MC_Window:
+ win = client->frame->plate();
+ mode = GrabModeSync; // this is handled in fireButton
+ 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);
+ else
+ otk::OBDisplay::ungrabButton(b.key, b.modifiers, win);
+}
+
void OBBindings::grabButtons(bool grab, OBClient *client)
{
for (int i = 0; i < NUM_MOUSE_CONTEXT; ++i) {
- Window win;
- int mode = GrabModeAsync;
- switch (i) {
- case MC_Frame:
- win = client->frame->window();
- break;
- case MC_Window:
- win = client->frame->plate();
- mode = GrabModeSync; // this is handled in the plate's buttonPressHandler
- break;
- default:
- // any other elements already get button events, don't grab on them
- continue;
- }
ButtonBindingList::iterator it, end = _buttons[i].end();
for (it = _buttons[i].begin(); it != end; ++it)
- if (grab)
- otk::OBDisplay::grabButton((*it)->binding.key,
- (*it)->binding.modifiers, win, false,
- ButtonPressMask | ButtonMotionMask |
- ButtonReleaseMask, mode, GrabModeAsync,
- None, None, false);
- else
- otk::OBDisplay::ungrabButton((*it)->binding.key,
- (*it)->binding.modifiers, win);
+ grabButton(grab, (*it)->binding, (MouseContext)i, client);
}
}
-void OBBindings::fire(ButtonData *data)
+void OBBindings::fireButton(ButtonData *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
+ XAllowEvents(otk::OBDisplay::display, ReplayPointer, data->time);
+ }
+
ButtonBindingList::iterator it, end = _buttons[data->context].end();
for (it = _buttons[data->context].begin(); it != end; ++it)
if ((*it)->binding.key == data->button &&
(*it)->binding.modifiers == data->state) {
- ButtonBinding::CallbackList::iterator c_it,
- c_end = (*it)->callback[data->action].end();
- for (c_it = (*it)->callback[data->action].begin(); c_it != c_end; ++c_it)
- python_callback(*c_it, (PyObject*)data);
+ if ((*it)->callback[data->action])
+ python_callback((*it)->callback[data->action], (PyObject*)data);
}
}
projects / chaz / openbox / blobdiff