X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.cc;h=167d0a854439ded9415da00bde70c404bc3b7fb5;hb=c54d92b784036a4d9e829592aab938e661287fca;hp=054bec25e864cb24d47e012ecd8212443c2607a5;hpb=96a9196cbb71b7f8d5e3d98a92b2e59bb1b591a8;p=chaz%2Fopenbox diff --git a/src/bindings.cc b/src/bindings.cc index 054bec25..167d0a85 100644 --- a/src/bindings.cc +++ b/src/bindings.cc @@ -9,7 +9,6 @@ #include "openbox.hh" #include "client.hh" #include "frame.hh" -#include "python.hh" #include "otk/display.hh" extern "C" { @@ -19,6 +18,8 @@ extern "C" { #define _(str) gettext(str) } +#include + namespace ob { static bool buttonvalue(const std::string &button, unsigned int *val) @@ -116,7 +117,7 @@ static void destroytree(KeyBindingTree *tree) } KeyBindingTree *Bindings::buildtree(const StringVect &keylist, - PyObject *callback) const + KeyCallback callback, void *data) const { if (keylist.empty()) return 0; // nothing in the list.. return 0 @@ -129,7 +130,7 @@ KeyBindingTree *Bindings::buildtree(const StringVect &keylist, if (!p) { // this is the first built node, the bottom node of the tree ret->chain = false; - ret->callbacks.push_back(callback); + ret->callbacks.push_back(KeyCallbackData(callback, data)); } ret->first_child = p; if (!translate(*it, ret->binding)) { @@ -145,7 +146,8 @@ KeyBindingTree *Bindings::buildtree(const StringVect &keylist, Bindings::Bindings() : _curpos(&_keytree), _resetkey(0,0), - _timer((otk::Timer *) 0) + _timer((otk::Timer *) 0), + _keybgrab_callback(0, 0) { // setResetKey("C-g"); // set the default reset key } @@ -156,9 +158,8 @@ Bindings::~Bindings() if (_timer) delete _timer; - grabKeys(false); removeAllKeys(); -// removeAllButtons(); XXX + //removeAllButtons(); // this is done by each client as they are unmanaged removeAllEvents(); } @@ -222,12 +223,13 @@ KeyBindingTree *Bindings::find(KeyBindingTree *search, } -bool Bindings::addKey(const StringVect &keylist, PyObject *callback) +bool Bindings::addKey(const StringVect &keylist, KeyCallback callback, + void *data) { KeyBindingTree *tree, *t; bool conflict; - if (!(tree = buildtree(keylist, callback))) + if (!(tree = buildtree(keylist, callback, data))) return false; // invalid binding requested t = find(tree, &conflict); @@ -239,8 +241,7 @@ 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); + t->callbacks.push_back(KeyCallbackData(callback, data)); destroytree(tree); } else { // grab the server here to make sure no key pressed go missed @@ -254,13 +255,11 @@ bool Bindings::addKey(const StringVect &keylist, PyObject *callback) otk::display->ungrab(); } - Py_INCREF(callback); - return true; } - -bool Bindings::removeKey(const StringVect &keylist, PyObject *callback) +/* +bool Bindings::removeKey(const StringVect &keylist, KeyCallback callback, void *data) { assert(false); // XXX: function not implemented yet @@ -272,9 +271,9 @@ bool Bindings::removeKey(const StringVect &keylist, PyObject *callback) KeyBindingTree *t = find(tree, &conflict); if (t) { - CallbackList::iterator it = std::find(t->callbacks.begin(), - t->callbacks.end(), - callback); + KeyCallbackList::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::display->grab(); @@ -293,7 +292,7 @@ bool Bindings::removeKey(const StringVect &keylist, PyObject *callback) } return false; } - +*/ void Bindings::setResetKey(const std::string &key) { @@ -319,7 +318,6 @@ static void remove_branch(KeyBindingTree *first) remove_branch(p->first_child); KeyBindingTree *s = p->next_sibling; while(!p->callbacks.empty()) { - Py_XDECREF(p->callbacks.front()); p->callbacks.pop_front(); } delete p; @@ -341,7 +339,9 @@ void Bindings::removeAllKeys() void Bindings::grabKeys(bool grab) { - for (int i = 0; i < openbox->screenCount(); ++i) { + 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; @@ -369,9 +369,64 @@ void Bindings::grabKeys(bool grab) } +bool Bindings::grabKeyboard(int screen, KeyCallback callback, void *data) +{ + assert(callback); + if (_keybgrab_callback.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 = callback; + _keybgrab_callback.data = data; + return true; +} + + +void Bindings::ungrabKeyboard() +{ + if (!_keybgrab_callback.callback) return; // not grabbed + + _keybgrab_callback = KeyCallbackData(0, 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.callback) { + Client *c = openbox->focusedClient(); + KeyData data(screen, c, time, modifiers, key, action); + _keybgrab_callback.fire(&data); + } + + // KeyRelease events only occur during keyboard grabs + if (action == KeyAction::Release) return; + if (key == _resetkey.key && modifiers == _resetkey.modifiers) { resetChains(this); } else { @@ -379,12 +434,12 @@ 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) { - if (_timer) + 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 pressed go missed + // grab the server here to make sure no key presses get missed otk::display->grab(); grabKeys(false); _curpos = p; @@ -392,10 +447,10 @@ void Bindings::fireKey(int screen, unsigned int modifiers, unsigned int key, otk::display->ungrab(); } else { Client *c = openbox->focusedClient(); - KeyData data(screen, c, time, modifiers, key); - CallbackList::iterator it, end = p->callbacks.end(); + KeyData data(screen, c, time, modifiers, key, action); + KeyCallbackList::iterator it, end = p->callbacks.end(); for (it = p->callbacks.begin(); it != end; ++it) - python_callback(*it, &data); + it->fire(&data); resetChains(this); } break; @@ -420,10 +475,12 @@ void Bindings::resetChains(Bindings *self) } -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, MouseCallback callback, + void *data) { - assert(context >= 0 && context < NUM_MOUSE_CONTEXT); + assert(context >= 0 && context < MouseContext::NUM_MOUSE_CONTEXT); + assert(action >= 0 && action < MouseAction::NUM_MOUSE_ACTION); Binding b(0,0); if (!translate(but, b, false)) @@ -447,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->screenCount(); ++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,46 +514,45 @@ bool Bindings::addButton(const std::string &but, MouseContext context, } } else bind = *it; - bind->callbacks[action].push_back(callback); - Py_INCREF(callback); + bind->callbacks[action].push_back(MouseCallbackData(callback, data)); return true; } 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->screenCount(); ++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 @@ -515,17 +572,17 @@ void Bindings::grabButton(bool grab, const Binding &b, MouseContext context, 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. + if (data->context == MouseContext::Window) { + // Replay the event, so it goes to the client XAllowEvents(**otk::display, ReplayPointer, data->time); } @@ -533,43 +590,45 @@ void Bindings::fireButton(MouseData *data) for (it = _buttons[data->context].begin(); it != end; ++it) if ((*it)->binding.key == data->button && (*it)->binding.modifiers == data->state) { - CallbackList::iterator c_it,c_end = (*it)->callbacks[data->action].end(); + MouseCallbackList::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); + c_it->fire(data); } } -bool Bindings::addEvent(EventAction action, PyObject *callback) +bool Bindings::addEvent(EventAction::EA action, EventCallback callback, + void *data) { - if (action < 0 || action >= NUM_EVENTS) { + if (action < 0 || action >= EventAction::NUM_EVENT_ACTION) { return false; } #ifdef XKB - if (action == EventBell && _eventlist[action].empty()) + if (action == EventAction::Bell && _eventlist[action].empty()) XkbSelectEvents(**otk::display, XkbUseCoreKbd, XkbBellNotifyMask, XkbBellNotifyMask); #endif // XKB - _eventlist[action].push_back(callback); - Py_INCREF(callback); + _eventlist[action].push_back(EventCallbackData(callback, data)); return true; } -bool Bindings::removeEvent(EventAction action, PyObject *callback) +bool Bindings::removeEvent(EventAction::EA action, EventCallback callback, + void *data) { - if (action < 0 || action >= NUM_EVENTS) { + if (action < 0 || action >= EventAction::NUM_EVENT_ACTION) { return false; } - CallbackList::iterator it = std::find(_eventlist[action].begin(), - _eventlist[action].end(), - callback); + EventCallbackList::iterator it = std::find(_eventlist[action].begin(), + _eventlist[action].end(), + EventCallbackData(callback, + data)); if (it != _eventlist[action].end()) { - Py_XDECREF(*it); _eventlist[action].erase(it); #ifdef XKB - if (action == EventBell && _eventlist[action].empty()) + if (action == EventAction::Bell && _eventlist[action].empty()) XkbSelectEvents(**otk::display, XkbUseCoreKbd, XkbBellNotifyMask, 0); #endif // XKB @@ -580,9 +639,8 @@ 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_EVENT_ACTION; ++i) { while (!_eventlist[i].empty()) { - Py_XDECREF(_eventlist[i].front()); _eventlist[i].pop_front(); } } @@ -590,9 +648,9 @@ void Bindings::removeAllEvents() void Bindings::fireEvent(EventData *data) { - CallbackList::iterator c_it, c_end = _eventlist[data->action].end(); + EventCallbackList::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); + c_it->fire(data); } }