: _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
- setResetKey("C-g"); // set the default reset key
+// setResetKey("C-g"); // set the default reset key
+
+ for (int i = 0; i < NUM_EVENTS; ++i)
+ _events[i] = 0;
}
OBBindings::~OBBindings()
{
grabKeys(false);
- removeAll();
+ removeAllKeys();
+ removeAllButtons();
+ removeAllEvents();
}
}
-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);
}
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::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) {
Window win = None;
OBClient *c = Openbox::instance->focusedClient();
if (c) win = c->window();
- python_callback(p->callback, win, modifiers, key, time);
- reset(this);
+ KeyData *data = new_key_data(win, time, modifiers, key);
+ python_callback(p->callback, (PyObject*)data);
+ Py_DECREF((PyObject*)data);
+ 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);
+ 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;
- 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::grabButtons(bool grab, OBClient *client)
+void OBBindings::removeAllButtons()
{
- for (int i = 0; i < NUM_MOUSE_CONTEXT; ++i) {
- Window win[3] = {0, 0, 0}; // at most 2 windows
- switch (i) {
- case MC_Frame:
- win[0] = client->frame->window();
- break;
- case MC_Titlebar:
- win[0] = client->frame->titlebar();
- win[1] = client->frame->label();
- break;
- case MC_Window:
- win[0] = client->frame->plate();
- break;
- case MC_MaximizeButton:
-// win[0] = client->frame->button_max();
- break;
- case MC_CloseButton:
-// win[0] = client->frame->button_close();
- break;
- case MC_IconifyButton:
-// win[0] = client->frame->button_iconify();
- break;
- case MC_StickyButton:
-// win[0] = client->frame->button_stick();
- break;
- case MC_Grip:
-// win[0] = client->frame->grip_left();
-// win[1] = client->frame->grip_right();
- break;
- case MC_Root:
-// win[0] = otk::OBDisplay::screenInfo(client->screen())->rootWindow();
- break;
- case MC_MenuItem:
- break;
- default:
- assert(false); // invalid mouse context
- }
+ 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 (Window *w = win; *w; ++w) {
- if (grab) {
- otk::OBDisplay::grabButton((*it)->binding.key,
- (*it)->binding.modifiers, *w, false,
- ButtonPressMask | ButtonMotionMask |
- ButtonReleaseMask, GrabModeAsync,
- GrabModeAsync, None, None, false);
+ 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);
+ 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);
}
- else
- otk::OBDisplay::ungrabButton((*it)->binding.key,
- (*it)->binding.modifiers, *w);
+ }
}
}
}
-void OBBindings::fire(MouseAction action, OBWidget::WidgetType type,
- Window win, unsigned int modifiers, unsigned int button,
- int xroot, int yroot, Time time)
+void OBBindings::grabButton(bool grab, const Binding &b, MouseContext context,
+ OBClient *client)
{
- assert(action >= 0 && action < NUM_MOUSE_ACTION);
-
- MouseContext context;
- switch (type) {
- case OBWidget::Type_Frame:
- context = MC_Frame; break;
- case OBWidget::Type_Titlebar:
- context = MC_Titlebar; break;
- case OBWidget::Type_Handle:
- context = MC_Frame; break;
- case OBWidget::Type_Plate:
- context = MC_Window; break;
- case OBWidget::Type_Label:
- context = MC_Titlebar; break;
- case OBWidget::Type_MaximizeButton:
- context = MC_MaximizeButton; break;
- case OBWidget::Type_CloseButton:
- context = MC_CloseButton; break;
- case OBWidget::Type_IconifyButton:
- context = MC_IconifyButton; break;
- case OBWidget::Type_StickyButton:
- context = MC_StickyButton; break;
- case OBWidget::Type_LeftGrip:
- context = MC_Grip; break;
- case OBWidget::Type_RightGrip:
- context = MC_Grip; break;
- case OBWidget::Type_Client:
- context = MC_Window; break;
- case OBWidget::Type_Root:
- context = MC_Root; break;
+ 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:
- assert(false); // unhandled type
+ // 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);
+}
- modifiers &= (ControlMask | ShiftMask | Mod1Mask | Mod2Mask | Mod3Mask |
- Mod4Mask | Mod5Mask);
+void OBBindings::grabButtons(bool grab, OBClient *client)
+{
+ for (int i = 0; i < NUM_MOUSE_CONTEXT; ++i) {
+ ButtonBindingList::iterator it, end = _buttons[i].end();
+ for (it = _buttons[i].begin(); it != end; ++it)
+ grabButton(grab, (*it)->binding, (MouseContext)i, client);
+ }
+}
- printf("but.mods %d.%d\n", button, modifiers);
+void OBBindings::fireButton(ButtonData *data)
+{
+ 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[context].end();
- for (it = _buttons[context].begin(); it != end; ++it)
- if ((*it)->binding.key == button &&
- (*it)->binding.modifiers == 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)
- python_callback(*c_it, action, win, context, modifiers,
- button, xroot, yroot, 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) {
+ if ((*it)->callback[data->action])
+ python_callback((*it)->callback[data->action], (PyObject*)data);
}
}
+
+bool OBBindings::addEvent(EventAction action, PyObject *callback)
+{
+ if (action < 0 || action >= NUM_EVENTS) {
+ return false;
+ }
+
+ Py_XDECREF(_events[action]);
+ _events[action] = callback;
+ Py_INCREF(callback);
+ return true;
+}
+
+bool OBBindings::removeEvent(EventAction action)
+{
+ if (action < 0 || action >= NUM_EVENTS) {
+ return false;
+ }
+
+ Py_XDECREF(_events[action]);
+ _events[action] = 0;
+ return true;
+}
+
+void OBBindings::removeAllEvents()
+{
+ for (int i = 0; i < NUM_EVENTS; ++i) {
+ Py_XDECREF(_events[i]);
+ _events[i] = 0;
+ }
+}
+
+void OBBindings::fireEvent(EventData *data)
+{
+ if (_events[data->action])
+ python_callback(_events[data->action], (PyObject*)data);
+}
+
}
projects / chaz / openbox / blobdiff