#include "openbox.hh"
#include "client.hh"
#include "frame.hh"
-#include "python.hh"
#include "otk/display.hh"
extern "C" {
#define _(str) gettext(str)
}
+#include <algorithm>
+
namespace ob {
static bool buttonvalue(const std::string &button, unsigned int *val)
{
- if (button == "1" || button == "Button1") {
+ if (button == "Left" || button == "1" || button == "Button1") {
*val |= Button1;
- } else if (button == "2" || button == "Button2") {
+ } else if (button == "Middle" || button == "2" || button == "Button2") {
*val |= Button2;
- } else if (button == "3" || button == "Button3") {
+ } else if (button == "Right" || button == "3" || button == "Button3") {
*val |= Button3;
- } else if (button == "4" || button == "Button4") {
+ } else if (button == "Up" || button == "4" || button == "Button4") {
*val |= Button4;
- } else if (button == "5" || button == "Button5") {
+ } else if (button == "Down" || button == "5" || button == "Button5") {
*val |= Button5;
} else
return false;
return true;
}
-bool OBBindings::translate(const std::string &str, Binding &b,bool askey) const
+bool Bindings::translate(const std::string &str, Binding &b,bool askey) const
{
// parse out the base key name
std::string::size_type keybegin = str.find_last_of('-');
printf(_("Invalid Key name in key binding: %s\n"), key.c_str());
return false;
}
- if (!(b.key = XKeysymToKeycode(otk::OBDisplay::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 {
}
}
-KeyBindingTree *OBBindings::buildtree(const StringVect &keylist,
- PyObject *callback) const
+KeyBindingTree *Bindings::buildtree(const StringVect &keylist,
+ KeyCallback callback, void *data) const
{
if (keylist.empty()) return 0; // nothing in the list.. return 0
StringVect::const_reverse_iterator it, end = keylist.rend();
for (it = keylist.rbegin(); it != end; ++it) {
p = ret;
- ret = new KeyBindingTree(callback);
- if (!p) ret->chain = false; // only the first built node
+ ret = new KeyBindingTree();
+ if (!p) {
+ // this is the first built node, the bottom node of the tree
+ ret->chain = false;
+ ret->callbacks.push_back(KeyCallbackData(callback, data));
+ }
ret->first_child = p;
if (!translate(*it, ret->binding)) {
destroytree(ret);
}
-OBBindings::OBBindings()
+Bindings::Bindings()
: _curpos(&_keytree),
_resetkey(0,0),
- _timer(Openbox::instance->timerManager(),
- (otk::OBTimeoutHandler)resetChains, this)
+ _timer((otk::Timer *) 0),
+ _keybgrab_callback(0, 0)
{
- _timer.setTimeout(5000); // chains reset after 5 seconds
-
// setResetKey("C-g"); // set the default reset key
-
- for (int i = 0; i < NUM_EVENTS; ++i)
- _events[i] = 0;
}
-OBBindings::~OBBindings()
+Bindings::~Bindings()
{
- grabKeys(false);
+ if (_timer)
+ delete _timer;
+
removeAllKeys();
- removeAllButtons();
+ //removeAllButtons(); // this is done by each client as they are unmanaged
removeAllEvents();
}
-void OBBindings::assimilate(KeyBindingTree *node)
+void Bindings::assimilate(KeyBindingTree *node)
{
KeyBindingTree *a, *b, *tmp, *last;
}
-PyObject *OBBindings::find(KeyBindingTree *search, bool *conflict) const {
+KeyBindingTree *Bindings::find(KeyBindingTree *search,
+ bool *conflict) const {
*conflict = false;
KeyBindingTree *a, *b;
a = _keytree.first_child;
if (a->chain == b->chain) {
if (!a->chain) {
// found it! (return the actual id, not the search's)
- return a->callback;
+ return a;
}
} else {
*conflict = true;
}
-bool OBBindings::addKey(const StringVect &keylist, PyObject *callback)
+bool Bindings::addKey(const StringVect &keylist, KeyCallback callback,
+ void *data)
{
- KeyBindingTree *tree;
+ KeyBindingTree *tree, *t;
bool conflict;
- if (!(tree = buildtree(keylist, callback)))
+ if (!(tree = buildtree(keylist, callback, data)))
return false; // invalid binding requested
- if (find(tree, &conflict) || conflict) {
+ t = find(tree, &conflict);
+ if (conflict) {
// conflicts with another binding
destroytree(tree);
return false;
}
- grabKeys(false);
-
- // assimilate this built tree into the main tree
- assimilate(tree); // assimilation destroys/uses the tree
+ if (t) {
+ // already bound to something
+ t->callbacks.push_back(KeyCallbackData(callback, data));
+ destroytree(tree);
+ } else {
+ // grab the server here to make sure no key pressed go missed
+ otk::display->grab();
+ grabKeys(false);
- Py_INCREF(callback);
+ // assimilate this built tree into the main tree
+ assimilate(tree); // assimilation destroys/uses the tree
- grabKeys(true);
+ grabKeys(true);
+ otk::display->ungrab();
+ }
return true;
}
-
-bool OBBindings::removeKey(const StringVect &keylist)
+/*
+bool Bindings::removeKey(const StringVect &keylist, KeyCallback callback, void *data)
{
assert(false); // XXX: function not implemented yet
if (!(tree = buildtree(keylist, 0)))
return false; // invalid binding requested
- PyObject *func = find(tree, &conflict);
- if (func) {
- grabKeys(false);
-
- _curpos = &_keytree;
-
- // XXX do shit here ...
- Py_DECREF(func);
-
- grabKeys(true);
- return true;
+ KeyBindingTree *t = find(tree, &conflict);
+ if (t) {
+ 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();
+ grabKeys(false);
+
+ _curpos = &_keytree;
+
+ // XXX do shit here ...
+ Py_XDECREF(*it);
+
+ grabKeys(true);
+ otk::display->ungrab();
+
+ return true;
+ }
}
return false;
}
+*/
-
-void OBBindings::setResetKey(const std::string &key)
+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();
grabKeys(false);
_resetkey.key = b.key;
_resetkey.modifiers = b.modifiers;
grabKeys(true);
+ otk::display->ungrab();
}
}
if (p->first_child)
remove_branch(p->first_child);
KeyBindingTree *s = p->next_sibling;
- Py_XDECREF(p->callback);
+ while(!p->callbacks.empty()) {
+ p->callbacks.pop_front();
+ }
delete p;
p = s;
}
}
-void OBBindings::removeAllKeys()
+void Bindings::removeAllKeys()
{
grabKeys(false);
if (_keytree.first_child) {
}
-void OBBindings::grabKeys(bool grab)
+void Bindings::grabKeys(bool grab)
{
- for (int i = 0; i < Openbox::instance->screenCount(); ++i) {
- Window root = otk::OBDisplay::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::OBDisplay::grabKey(p->binding.key, p->binding.modifiers,
+ otk::display->grabKey(p->binding.key, p->binding.modifiers,
root, false, GrabModeAsync, GrabModeAsync,
false);
}
else
- otk::OBDisplay::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::OBDisplay::grabKey(_resetkey.key, _resetkey.modifiers,
+ otk::display->grabKey(_resetkey.key, _resetkey.modifiers,
root, false, GrabModeAsync, GrabModeAsync,
false);
else
- otk::OBDisplay::ungrabKey(_resetkey.key, _resetkey.modifiers,
+ otk::display->ungrabKey(_resetkey.key, _resetkey.modifiers,
root);
}
}
-void OBBindings::fireKey(unsigned int modifiers, unsigned int key, Time time)
+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, 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 {
while (p) {
if (p->binding.key == key && p->binding.modifiers == modifiers) {
if (p->chain) {
- _timer.start(); // start/restart the 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 presses get missed
+ otk::display->grab();
grabKeys(false);
_curpos = p;
grabKeys(true);
+ otk::display->ungrab();
} else {
- Window win = None;
- OBClient *c = Openbox::instance->focusedClient();
- if (c) win = c->window();
- KeyData *data = new_key_data(win, time, modifiers, key);
- python_callback(p->callback, (PyObject*)data);
- Py_DECREF((PyObject*)data);
+ Client *c = openbox->focusedClient();
+ KeyData data(screen, c, time, modifiers, key, action);
+ KeyCallbackList::iterator it, end = p->callbacks.end();
+ for (it = p->callbacks.begin(); it != end; ++it)
+ it->fire(&data);
resetChains(this);
}
break;
}
}
-void OBBindings::resetChains(OBBindings *self)
+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();
self->grabKeys(false);
self->_curpos = &self->_keytree;
self->grabKeys(true);
+ otk::display->ungrab();
}
-bool OBBindings::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))
for (it = _buttons[context].begin(); it != end; ++it)
if ((*it)->binding.key == b.key &&
(*it)->binding.modifiers == b.modifiers) {
- if ((*it)->callback[action] == callback)
- return true; // already bound
break;
}
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) {
- OBScreen *s = Openbox::instance->screen(sn);
- OBClient::List::iterator c_it, c_end = s->clients.end();
+ 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);
}
}
} else
bind = *it;
- Py_XDECREF(bind->callback[action]); // if it was already bound, unbind it
- bind->callback[action] = callback;
- Py_INCREF(callback);
+ bind->callbacks[action].push_back(MouseCallbackData(callback, data));
return true;
}
-void OBBindings::removeAllButtons()
+void Bindings::removeAllButtons()
{
- for (int i = i; 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) {
- Py_XDECREF((*it)->callback[a]);
- (*it)->callback[a] = 0;
+ for (int a = 0; a < MouseAction::NUM_MOUSE_ACTION; ++a) {
+ while (!(*it)->callbacks[a].empty()) {
+ (*it)->callbacks[a].pop_front();
+ }
}
// 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 (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 OBBindings::grabButton(bool grab, const Binding &b, MouseContext context,
- OBClient *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
+ // the release event is manufactured by the
+ // master buttonPressHandler
break;
default:
// 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);
+ otk::display->grabButton(b.key, b.modifiers, win, false, mask, mode,
+ GrabModeAsync, None, None, false);
else
- otk::OBDisplay::ungrabButton(b.key, b.modifiers, win);
+ otk::display->ungrabButton(b.key, b.modifiers, win);
}
-void OBBindings::grabButtons(bool grab, OBClient *client)
+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 OBBindings::fireButton(ButtonData *data)
+void Bindings::fireButton(MouseData *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);
+ 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();
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);
+ 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)
+ c_it->fire(data);
}
}
-bool OBBindings::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;
}
-
- Py_XDECREF(_events[action]);
- _events[action] = callback;
- Py_INCREF(callback);
+#ifdef XKB
+ if (action == EventAction::Bell && _eventlist[action].empty())
+ XkbSelectEvents(**otk::display, XkbUseCoreKbd,
+ XkbBellNotifyMask, XkbBellNotifyMask);
+#endif // XKB
+ _eventlist[action].push_back(EventCallbackData(callback, data));
return true;
}
-bool OBBindings::removeEvent(EventAction action)
+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;
}
- Py_XDECREF(_events[action]);
- _events[action] = 0;
- return true;
+ EventCallbackList::iterator it = std::find(_eventlist[action].begin(),
+ _eventlist[action].end(),
+ EventCallbackData(callback,
+ data));
+ if (it != _eventlist[action].end()) {
+ _eventlist[action].erase(it);
+#ifdef XKB
+ if (action == EventAction::Bell && _eventlist[action].empty())
+ XkbSelectEvents(**otk::display, XkbUseCoreKbd,
+ XkbBellNotifyMask, 0);
+#endif // XKB
+ return true;
+ }
+ return false;
}
-void OBBindings::removeAllEvents()
+void Bindings::removeAllEvents()
{
- for (int i = 0; i < NUM_EVENTS; ++i) {
- Py_XDECREF(_events[i]);
- _events[i] = 0;
+ for (int i = 0; i < EventAction::NUM_EVENT_ACTION; ++i) {
+ while (!_eventlist[i].empty()) {
+ _eventlist[i].pop_front();
+ }
}
}
-void OBBindings::fireEvent(EventData *data)
+void Bindings::fireEvent(EventData *data)
{
- if (_events[data->action])
- python_callback(_events[data->action], (PyObject*)data);
+ EventCallbackList::iterator c_it, c_end = _eventlist[data->action].end();
+ for (c_it = _eventlist[data->action].begin(); c_it != c_end; ++c_it)
+ c_it->fire(data);
}
}
projects / chaz / openbox / blobdiff