#include "openbox.hh"
#include "client.hh"
#include "frame.hh"
-#include "python.hh"
#include "otk/display.hh"
extern "C" {
}
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
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)) {
: _curpos(&_keytree),
_resetkey(0,0),
_timer((otk::Timer *) 0),
- _keybgrab_callback(0)
+ _keybgrab_callback(0, 0)
{
// setResetKey("C-g"); // set the default reset key
}
}
-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);
if (t) {
// already bound to something
- 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
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
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();
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;
}
-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
if (XGrabKeyboard(**otk::display, root, false, GrabModeAsync,
GrabModeAsync, CurrentTime))
return false;
- _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);
}
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
} 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;
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);
}
} else
bind = *it;
- bind->callbacks[action].push_back(callback);
- Py_INCREF(callback);
+ bind->callbacks[action].push_back(MouseCallbackData(callback, data));
return true;
}
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();
}
}
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
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())
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();
}
}
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);
}
}
projects / chaz / openbox / blobdiff