X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.cc;h=df1de3ecaa4032f848a998c749c76620c217c4e2;hb=1da8531a7b4eea22592b6d0760352d2a34e9b6b0;hp=a8dfaed0bc8c5efa4512c08406108b5e3977e6f9;hpb=2a6c730f02fcd127cc831297eacca6f5a80fb44c;p=chaz%2Fopenbox diff --git a/src/bindings.cc b/src/bindings.cc index a8dfaed0..df1de3ec 100644 --- a/src/bindings.cc +++ b/src/bindings.cc @@ -19,6 +19,8 @@ extern "C" { #define _(str) gettext(str) } +#include + namespace ob { static bool buttonvalue(const std::string &button, unsigned int *val) @@ -98,7 +100,7 @@ bool Bindings::translate(const std::string &str, Binding &b,bool askey) const printf(_("Invalid Key name in key binding: %s\n"), key.c_str()); return false; } - if (!(b.key = XKeysymToKeycode(otk::Display::display, sym))) + if (!(b.key = XKeysymToKeycode(**otk::display, sym))) printf(_("No valid keycode for Key in key binding: %s\n"), key.c_str()); return b.key != 0; } else { @@ -145,20 +147,20 @@ KeyBindingTree *Bindings::buildtree(const StringVect &keylist, Bindings::Bindings() : _curpos(&_keytree), _resetkey(0,0), - _timer(Openbox::instance->timerManager(), - (otk::TimeoutHandler)resetChains, this) + _timer((otk::Timer *) 0), + _keybgrab_callback(0) { - _timer.setTimeout(5000); // chains reset after 5 seconds - // setResetKey("C-g"); // set the default reset key } Bindings::~Bindings() { - grabKeys(false); + if (_timer) + delete _timer; + removeAllKeys(); -// removeAllButtons(); XXX + //removeAllButtons(); // this is done by each client as they are unmanaged removeAllEvents(); } @@ -239,19 +241,18 @@ bool Bindings::addKey(const StringVect &keylist, PyObject *callback) 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::Display::grab(); + otk::display->grab(); grabKeys(false); // assimilate this built tree into the main tree assimilate(tree); // assimilation destroys/uses the tree grabKeys(true); - otk::Display::ungrab(); + otk::display->ungrab(); } Py_INCREF(callback); @@ -259,7 +260,7 @@ bool Bindings::addKey(const StringVect &keylist, PyObject *callback) return true; } - +/* bool Bindings::removeKey(const StringVect &keylist, PyObject *callback) { assert(false); // XXX: function not implemented yet @@ -277,7 +278,7 @@ bool Bindings::removeKey(const StringVect &keylist, PyObject *callback) callback); if (it != t->callbacks.end()) { // grab the server here to make sure no key pressed go missed - otk::Display::grab(); + otk::display->grab(); grabKeys(false); _curpos = &_keytree; @@ -286,26 +287,26 @@ bool Bindings::removeKey(const StringVect &keylist, PyObject *callback) Py_XDECREF(*it); grabKeys(true); - otk::Display::ungrab(); + otk::display->ungrab(); return true; } } return false; } - +*/ void Bindings::setResetKey(const std::string &key) { Binding b(0, 0); if (translate(key, b)) { // grab the server here to make sure no key pressed go missed - otk::Display::grab(); + otk::display->grab(); grabKeys(false); _resetkey.key = b.key; _resetkey.modifiers = b.modifiers; grabKeys(true); - otk::Display::ungrab(); + otk::display->ungrab(); } } @@ -341,37 +342,93 @@ void Bindings::removeAllKeys() void Bindings::grabKeys(bool grab) { - for (int i = 0; i < Openbox::instance->screenCount(); ++i) { - Window root = otk::Display::screenInfo(i)->rootWindow(); + for (int i = 0; i < ScreenCount(**otk::display); ++i) { + Screen *sc = openbox->screen(i); + if (!sc) continue; // not a managed screen + Window root = otk::display->screenInfo(i)->rootWindow(); KeyBindingTree *p = _curpos->first_child; while (p) { if (grab) { - otk::Display::grabKey(p->binding.key, p->binding.modifiers, + otk::display->grabKey(p->binding.key, p->binding.modifiers, root, false, GrabModeAsync, GrabModeAsync, false); } else - otk::Display::ungrabKey(p->binding.key, p->binding.modifiers, + otk::display->ungrabKey(p->binding.key, p->binding.modifiers, root); p = p->next_sibling; } if (_resetkey.key) if (grab) - otk::Display::grabKey(_resetkey.key, _resetkey.modifiers, + otk::display->grabKey(_resetkey.key, _resetkey.modifiers, root, false, GrabModeAsync, GrabModeAsync, false); else - otk::Display::ungrabKey(_resetkey.key, _resetkey.modifiers, + otk::display->ungrabKey(_resetkey.key, _resetkey.modifiers, root); } } +bool Bindings::grabKeyboard(int screen, PyObject *callback) +{ + assert(callback); + if (_keybgrab_callback) return false; // already grabbed + + if (!openbox->screen(screen)) + return false; // the screen is not managed + + Window root = otk::display->screenInfo(screen)->rootWindow(); + if (XGrabKeyboard(**otk::display, root, false, GrabModeAsync, + GrabModeAsync, CurrentTime)) + return false; + _keybgrab_callback = callback; + return true; +} + + +void Bindings::ungrabKeyboard() +{ + if (!_keybgrab_callback) return; // not grabbed + + _keybgrab_callback = 0; + XUngrabKeyboard(**otk::display, CurrentTime); + XUngrabPointer(**otk::display, CurrentTime); +} + + +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) + Time time, KeyAction::KA action) { + if (_keybgrab_callback) { + Client *c = openbox->focusedClient(); + KeyData data(screen, c, time, modifiers, key, action); + python_callback(_keybgrab_callback, &data); + } + + // KeyRelease events only occur during keyboard grabs + if (action == KeyAction::Release) return; + if (key == _resetkey.key && modifiers == _resetkey.modifiers) { resetChains(this); } else { @@ -379,16 +436,20 @@ void Bindings::fireKey(int screen, unsigned int modifiers, unsigned int key, while (p) { 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::Display::grab(); + if (_timer) + delete _timer; + _timer = new otk::Timer(5000, // 5 second timeout + (otk::Timer::TimeoutHandler)resetChains, + this); + // grab the server here to make sure no key presses get missed + otk::display->grab(); grabKeys(false); _curpos = p; grabKeys(true); - otk::Display::ungrab(); + otk::display->ungrab(); } else { - Client *c = Openbox::instance->focusedClient(); - KeyData data(screen, c, time, modifiers, key); + Client *c = openbox->focusedClient(); + KeyData data(screen, c, time, modifiers, key, action); CallbackList::iterator it, end = p->callbacks.end(); for (it = p->callbacks.begin(); it != end; ++it) python_callback(*it, &data); @@ -403,20 +464,23 @@ void Bindings::fireKey(int screen, unsigned int modifiers, unsigned int key, void Bindings::resetChains(Bindings *self) { - self->_timer.stop(); + if (self->_timer) { + delete self->_timer; + self->_timer = (otk::Timer *) 0; + } // grab the server here to make sure no key pressed go missed - otk::Display::grab(); + otk::display->grab(); self->grabKeys(false); self->_curpos = &self->_keytree; self->grabKeys(true); - otk::Display::ungrab(); + otk::display->ungrab(); } -bool Bindings::addButton(const std::string &but, MouseContext context, - MouseAction action, PyObject *callback) +bool Bindings::addButton(const std::string &but, MouseContext::MC context, + MouseAction::MA action, PyObject *callback) { - assert(context >= 0 && context < NUM_MOUSE_CONTEXT); + assert(context >= 0 && context < MouseContext::NUM_MOUSE_CONTEXT); Binding b(0,0); if (!translate(but, b, false)) @@ -440,8 +504,9 @@ bool Bindings::addButton(const std::string &but, MouseContext context, bind->binding.modifiers = b.modifiers; _buttons[context].push_back(bind); // grab the button on all clients - for (int sn = 0; sn < Openbox::instance->screenCount(); ++sn) { - Screen *s = Openbox::instance->screen(sn); + for (int sn = 0; sn < ScreenCount(**otk::display); ++sn) { + Screen *s = openbox->screen(sn); + if (!s) continue; // not managed Client::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); @@ -456,39 +521,40 @@ bool Bindings::addButton(const std::string &but, MouseContext context, void Bindings::removeAllButtons() { - for (int i = 0; i < NUM_MOUSE_CONTEXT; ++i) { + for (int i = 0; i < MouseContext::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) { + for (int a = 0; a < MouseAction::NUM_MOUSE_ACTION; ++a) { 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) { - Screen *s = Openbox::instance->screen(sn); + for (int sn = 0; sn < ScreenCount(**otk::display); ++sn) { + Screen *s = openbox->screen(sn); + if (!s) continue; // not managed Client::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); + grabButton(false, (*it)->binding, (MouseContext::MC)i, *c_it); } } } } } -void Bindings::grabButton(bool grab, const Binding &b, MouseContext context, - Client *client) +void Bindings::grabButton(bool grab, const Binding &b, + MouseContext::MC context, Client *client) { Window win; int mode = GrabModeAsync; unsigned int mask; switch(context) { - case MC_Frame: + case MouseContext::Frame: win = client->frame->window(); mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask; break; - case MC_Window: + case MouseContext::Window: win = client->frame->plate(); mode = GrabModeSync; // this is handled in fireButton mask = ButtonPressMask; // can't catch more than this with Sync mode @@ -500,26 +566,26 @@ void Bindings::grabButton(bool grab, const Binding &b, MouseContext context, return; } if (grab) - otk::Display::grabButton(b.key, b.modifiers, win, false, mask, mode, - GrabModeAsync, None, None, false); + otk::display->grabButton(b.key, b.modifiers, win, false, mask, mode, + GrabModeAsync, None, None, false); else - otk::Display::ungrabButton(b.key, b.modifiers, win); + otk::display->ungrabButton(b.key, b.modifiers, win); } void Bindings::grabButtons(bool grab, Client *client) { - for (int i = 0; i < NUM_MOUSE_CONTEXT; ++i) { + for (int i = 0; i < MouseContext::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); + grabButton(grab, (*it)->binding, (MouseContext::MC)i, client); } } void Bindings::fireButton(MouseData *data) { - if (data->context == MC_Window) { - // Replay the event, so it goes to the client, and ungrab the device. - XAllowEvents(otk::Display::display, ReplayPointer, data->time); + if (data->context == MouseContext::Window) { + // Replay the event, so it goes to the client + XAllowEvents(**otk::display, ReplayPointer, data->time); } ButtonBindingList::iterator it, end = _buttons[data->context].end(); @@ -534,14 +600,14 @@ void Bindings::fireButton(MouseData *data) } -bool Bindings::addEvent(EventAction action, PyObject *callback) +bool Bindings::addEvent(EventAction::EA action, PyObject *callback) { - if (action < 0 || action >= NUM_EVENTS) { + if (action < 0 || action >= EventAction::NUM_EVENTS) { return false; } #ifdef XKB - if (action == EventBell && _eventlist[action].empty()) - XkbSelectEvents(otk::Display::display, XkbUseCoreKbd, + if (action == EventAction::Bell && _eventlist[action].empty()) + XkbSelectEvents(**otk::display, XkbUseCoreKbd, XkbBellNotifyMask, XkbBellNotifyMask); #endif // XKB _eventlist[action].push_back(callback); @@ -549,9 +615,9 @@ bool Bindings::addEvent(EventAction action, PyObject *callback) return true; } -bool Bindings::removeEvent(EventAction action, PyObject *callback) +bool Bindings::removeEvent(EventAction::EA action, PyObject *callback) { - if (action < 0 || action >= NUM_EVENTS) { + if (action < 0 || action >= EventAction::NUM_EVENTS) { return false; } @@ -562,8 +628,8 @@ bool Bindings::removeEvent(EventAction action, PyObject *callback) Py_XDECREF(*it); _eventlist[action].erase(it); #ifdef XKB - if (action == EventBell && _eventlist[action].empty()) - XkbSelectEvents(otk::Display::display, XkbUseCoreKbd, + if (action == EventAction::Bell && _eventlist[action].empty()) + XkbSelectEvents(**otk::display, XkbUseCoreKbd, XkbBellNotifyMask, 0); #endif // XKB return true; @@ -573,7 +639,7 @@ bool Bindings::removeEvent(EventAction action, PyObject *callback) void Bindings::removeAllEvents() { - for (int i = 0; i < NUM_EVENTS; ++i) { + for (int i = 0; i < EventAction::NUM_EVENTS; ++i) { while (!_eventlist[i].empty()) { Py_XDECREF(_eventlist[i].front()); _eventlist[i].pop_front();