X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.cc;h=138aba8194de9689d488345309b6dba41eebaa51;hb=c735d49979a995d59f1095d6048766f35e337497;hp=757f66b589d5c96cde988adf5dcc2655a5aadea7;hpb=a20c78f789d653be9f337fbb9c61860a7378f9a3;p=chaz%2Fopenbox diff --git a/src/bindings.cc b/src/bindings.cc index 757f66b5..138aba81 100644 --- a/src/bindings.cc +++ b/src/bindings.cc @@ -1,15 +1,12 @@ // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif +#include "config.h" #include "bindings.hh" #include "screen.hh" #include "openbox.hh" #include "client.hh" #include "frame.hh" -#include "python.hh" #include "otk/display.hh" extern "C" { @@ -118,7 +115,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 @@ -131,7 +128,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)) { @@ -148,7 +145,7 @@ Bindings::Bindings() : _curpos(&_keytree), _resetkey(0,0), _timer((otk::Timer *) 0), - _keybgrab_callback(0) + _keybgrab_callback(0, 0) { // setResetKey("C-g"); // set the default reset key } @@ -159,9 +156,8 @@ Bindings::~Bindings() if (_timer) delete _timer; - grabKeys(false); removeAllKeys(); -// removeAllButtons(); XXX + //removeAllButtons(); // this is done by each client as they are unmanaged removeAllEvents(); } @@ -225,12 +221,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); @@ -242,8 +239,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 @@ -257,13 +253,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 @@ -275,9 +269,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(); @@ -296,7 +290,7 @@ bool Bindings::removeKey(const StringVect &keylist, PyObject *callback) } return false; } - +*/ void Bindings::setResetKey(const std::string &key) { @@ -322,7 +316,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; @@ -374,10 +367,10 @@ void Bindings::grabKeys(bool grab) } -bool Bindings::grabKeyboard(int screen, PyObject *callback) +bool Bindings::grabKeyboard(int screen, KeyCallback callback, void *data) { assert(callback); - if (_keybgrab_callback) return false; // already grabbed + if (_keybgrab_callback.callback) return false; // already grabbed if (!openbox->screen(screen)) return false; // the screen is not managed @@ -386,31 +379,47 @@ bool Bindings::grabKeyboard(int screen, PyObject *callback) if (XGrabKeyboard(**otk::display, root, false, GrabModeAsync, GrabModeAsync, CurrentTime)) return false; - // the pointer grab causes pointer events during the keyboard grab to go away - XGrabPointer(**otk::display, root, false, 0, GrabModeAsync, - GrabModeAsync, None, None, CurrentTime); - _keybgrab_callback = callback; + _keybgrab_callback.callback = callback; + _keybgrab_callback.data = data; return true; } void Bindings::ungrabKeyboard() { - if (!_keybgrab_callback) return; // not grabbed + if (!_keybgrab_callback.callback) return; // not grabbed - _keybgrab_callback = 0; + _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, KeyAction::KA action) { - if (_keybgrab_callback) { + if (_keybgrab_callback.callback) { Client *c = openbox->focusedClient(); KeyData data(screen, c, time, modifiers, key, action); - python_callback(_keybgrab_callback, &data); + _keybgrab_callback.fire(&data); } // KeyRelease events only occur during keyboard grabs @@ -428,7 +437,7 @@ void Bindings::fireKey(int screen, unsigned int modifiers, unsigned int key, _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; @@ -437,9 +446,9 @@ void Bindings::fireKey(int screen, unsigned int modifiers, unsigned int key, } else { Client *c = openbox->focusedClient(); KeyData data(screen, c, time, modifiers, key, action); - CallbackList::iterator it, end = p->callbacks.end(); + 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; @@ -465,9 +474,11 @@ void Bindings::resetChains(Bindings *self) bool Bindings::addButton(const std::string &but, MouseContext::MC context, - MouseAction::MA action, PyObject *callback) + MouseAction::MA action, MouseCallback callback, + void *data) { 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)) @@ -501,8 +512,7 @@ bool Bindings::addButton(const std::string &but, MouseContext::MC context, } } else bind = *it; - bind->callbacks[action].push_back(callback); - Py_INCREF(callback); + bind->callbacks[action].push_back(MouseCallbackData(callback, data)); return true; } @@ -513,7 +523,6 @@ void Bindings::removeAllButtons() for (it = _buttons[i].begin(); it != end; ++it) { 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(); } } @@ -579,17 +588,19 @@ 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::EA action, PyObject *callback) +bool Bindings::addEvent(EventAction::EA action, EventCallback callback, + void *data) { - if (action < 0 || action >= EventAction::NUM_EVENTS) { + if (action < 0 || action >= EventAction::NUM_EVENT_ACTION) { return false; } #ifdef XKB @@ -597,22 +608,22 @@ bool Bindings::addEvent(EventAction::EA action, PyObject *callback) 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::EA action, PyObject *callback) +bool Bindings::removeEvent(EventAction::EA action, EventCallback callback, + void *data) { - if (action < 0 || action >= EventAction::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 == EventAction::Bell && _eventlist[action].empty()) @@ -626,9 +637,8 @@ bool Bindings::removeEvent(EventAction::EA action, PyObject *callback) void Bindings::removeAllEvents() { - for (int i = 0; i < EventAction::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(); } } @@ -636,9 +646,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); } }