return true;
}
-bool OBBindings::translate(const std::string &str, Binding &b,
- bool askey) const
+bool OBBindings::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(_("No valid keycode for Key in key binding: %s\n"), key.c_str());
return b.key != 0;
} else {
- if (!buttonvalue(key, &b.key)) {
- printf(_("Invalid Button name in mouse binding: %s\n"), key.c_str());
- return false;
- } else
- return true;
+ return buttonvalue(key, &b.key);
}
}
-static void destroytree(BindingTree *tree)
+static void destroytree(KeyBindingTree *tree)
{
while (tree) {
- BindingTree *c = tree->first_child;
+ KeyBindingTree *c = tree->first_child;
delete tree;
tree = c;
}
}
-BindingTree *OBBindings::buildtree(const StringVect &keylist, int id) const
+KeyBindingTree *OBBindings::buildtree(const StringVect &keylist,
+ PyObject *callback) const
{
if (keylist.empty()) return 0; // nothing in the list.. return 0
- BindingTree *ret = 0, *p;
+ KeyBindingTree *ret = 0, *p;
StringVect::const_reverse_iterator it, end = keylist.rend();
for (it = keylist.rbegin(); it != end; ++it) {
p = ret;
- ret = new BindingTree(id);
+ ret = new KeyBindingTree(callback);
if (!p) ret->chain = false; // only the first built node
ret->first_child = p;
- if (!translate(*it, ret->binding, true)) {
+ if (!translate(*it, ret->binding)) {
destroytree(ret);
ret = 0;
break;
OBBindings::OBBindings()
- : _curpos(&_keytree), _mousetree(0), _resetkey(0,0)
+ : _curpos(&_keytree),
+ _resetkey(0,0),
+ _timer(Openbox::instance->timerManager(),
+ (otk::OBTimeoutHandler)reset, this)
{
+ _timer.setTimeout(5000); // chains reset after 5 seconds
+
setResetKey("C-g"); // set the default reset key
}
OBBindings::~OBBindings()
{
- grabMouseOnAll(false); // ungrab everything
grabKeys(false);
- remove_all();
+ removeAll();
}
-bool OBBindings::add_mouse(const std::string &button, int id)
+void OBBindings::assimilate(KeyBindingTree *node)
{
- BindingTree n;
-
- if (!translate(button, n.binding, false))
- return false;
-
- BindingTree *p = _mousetree, **newp = &_mousetree;
- while (p) {
- if (p->binding == n.binding)
- return false; // conflict
- p = p->next_sibling;
- newp = &p->next_sibling;
- }
-
- grabMouseOnAll(false); // ungrab everything
-
- *newp = new BindingTree(id);
- (*newp)->chain = false;
- (*newp)->binding.key = n.binding.key;
- (*newp)->binding.modifiers = n.binding.modifiers;
-
- grabMouseOnAll(true);
-
- return true;
-}
-
-
-int OBBindings::remove_mouse(const std::string &button)
-{
- (void)button;
- assert(false); // XXX: function not implemented yet
-
- grabMouseOnAll(false); // ungrab everything
-
- // do shit...
-
- grabMouseOnAll(true);
-}
-
-
-void OBBindings::assimilate(BindingTree *node)
-{
- BindingTree *a, *b, *tmp, *last;
+ KeyBindingTree *a, *b, *tmp, *last;
if (!_keytree.first_child) {
// there are no nodes at this level yet
}
-int OBBindings::find_key(BindingTree *search) const {
- BindingTree *a, *b;
+PyObject *OBBindings::find(KeyBindingTree *search, bool *conflict) const {
+ *conflict = false;
+ KeyBindingTree *a, *b;
a = _keytree.first_child;
b = search;
while (a && b) {
} else {
if (a->chain == b->chain) {
if (!a->chain) {
- return a->id; // found it! (return the actual id, not the search's)
+ // found it! (return the actual id, not the search's)
+ return a->callback;
}
} else {
- return -2; // the chain status' don't match (conflict!)
+ *conflict = true;
+ return 0; // the chain status' don't match (conflict!)
}
b = b->first_child;
a = a->first_child;
}
}
- return -1; // it just isn't in here
+ return 0; // it just isn't in here
}
-bool OBBindings::add_key(const StringVect &keylist, int id)
+bool OBBindings::add(const StringVect &keylist, PyObject *callback)
{
- BindingTree *tree;
+ KeyBindingTree *tree;
+ bool conflict;
- if (!(tree = buildtree(keylist, id)))
+ if (!(tree = buildtree(keylist, callback)))
return false; // invalid binding requested
- if (find_key(tree) != -1) {
+ if (find(tree, &conflict) || conflict) {
// conflicts with another binding
destroytree(tree);
return false;
// assimilate this built tree into the main tree
assimilate(tree); // assimilation destroys/uses the tree
+ Py_INCREF(callback);
+
grabKeys(true);
return true;
}
-int OBBindings::find_key(const StringVect &keylist)
+bool OBBindings::remove(const StringVect &keylist)
{
- BindingTree *tree;
- bool ret;
+ assert(false); // XXX: function not implemented yet
+
+ KeyBindingTree *tree;
+ bool conflict;
if (!(tree = buildtree(keylist, 0)))
return false; // invalid binding requested
- ret = find_key(tree) >= 0;
-
- destroytree(tree);
-
- return ret;
-}
-
-
-int OBBindings::remove_key(const StringVect &keylist)
-{
- (void)keylist;
- assert(false); // XXX: function not implemented yet
-
- grabKeys(false);
- _curpos = &_keytree;
-
- // do shit here...
-
- grabKeys(true);
+ PyObject *func = find(tree, &conflict);
+ if (func) {
+ grabKeys(false);
+ _curpos = &_keytree;
+
+ // XXX do shit here ...
+ Py_DECREF(func);
+
+ grabKeys(true);
+ return true;
+ }
+ return false;
}
void OBBindings::setResetKey(const std::string &key)
{
Binding b(0, 0);
- if (translate(key, b, true)) {
+ if (translate(key, b)) {
grabKeys(false);
_resetkey.key = b.key;
_resetkey.modifiers = b.modifiers;
}
-static void remove_branch(BindingTree *first)
+static void remove_branch(KeyBindingTree *first)
{
- BindingTree *p = first;
+ KeyBindingTree *p = first;
while (p) {
if (p->first_child)
remove_branch(p->first_child);
- BindingTree *s = p->next_sibling;
+ KeyBindingTree *s = p->next_sibling;
+ Py_XDECREF(p->callback);
delete p;
p = s;
}
}
-void OBBindings::remove_all()
+void OBBindings::removeAll()
{
if (_keytree.first_child) {
remove_branch(_keytree.first_child);
_keytree.first_child = 0;
}
- BindingTree *p = _mousetree;
- while (p) {
- BindingTree *n = p->next_sibling;
- delete p;
- p = n;
- }
- _mousetree = 0;
-}
-
-
-void OBBindings::grabMouse(bool grab, const OBClient *client)
-{
- BindingTree *p = _mousetree;
- while (p) {
- if (grab)
- otk::OBDisplay::grabButton(p->binding.key, p->binding.modifiers,
- client->frame->window(), false,
- ButtonMotionMask | ButtonPressMask |
- ButtonReleaseMask, GrabModeAsync,
- GrabModeAsync, None, None, false);
- else
- otk::OBDisplay::ungrabButton(p->binding.key, p->binding.modifiers,
- client->frame->window());
- p = p->next_sibling;
- }
-}
-
-
-void OBBindings::grabMouseOnAll(bool grab)
-{
- for (int i = 0; i < Openbox::instance->screenCount(); ++i) {
- OBScreen *s = Openbox::instance->screen(i);
- assert(s);
- OBScreen::ClientList::iterator it, end = s->clients.end();
- for (it = s->clients.begin(); it != end; ++it)
- grabMouse(grab, *it);
- }
}
for (int i = 0; i < Openbox::instance->screenCount(); ++i) {
Window root = otk::OBDisplay::screenInfo(i)->rootWindow();
- BindingTree *p = _curpos->first_child;
+ KeyBindingTree *p = _curpos->first_child;
while (p) {
- if (grab)
+ if (grab) {
otk::OBDisplay::grabKey(p->binding.key, p->binding.modifiers,
root, false, GrabModeAsync, GrabModeAsync,
false);
+ }
else
otk::OBDisplay::ungrabKey(p->binding.key, p->binding.modifiers,
root);
}
-void OBBindings::fire(OBActions::ActionType type, Window window,
- unsigned int modifiers, unsigned int key, Time time)
+void OBBindings::fire(unsigned int modifiers, unsigned int key, Time time)
{
- if (type == OBActions::Action_KeyPress) {
- if (key == _resetkey.key && modifiers == _resetkey.modifiers) {
- grabKeys(false);
- _curpos = &_keytree;
- grabKeys(true);
- } else {
- BindingTree *p = _curpos->first_child;
- while (p) {
- if (p->binding.key == key && p->binding.modifiers == modifiers) {
- if (p->chain) {
- grabKeys(false);
- _curpos = p;
- grabKeys(true);
- } else {
- python_callback_binding(p->id, type, window, modifiers, key, time);
- grabKeys(false);
- _curpos = &_keytree;
- grabKeys(true);
- }
- break;
- }
- p = p->next_sibling;
- }
- }
+ if (key == _resetkey.key && modifiers == _resetkey.modifiers) {
+ reset(this);
} else {
- BindingTree *p = _mousetree;
+ KeyBindingTree *p = _curpos->first_child;
while (p) {
if (p->binding.key == key && p->binding.modifiers == modifiers) {
- python_callback_binding(p->id, type, window, modifiers, key, time);
+ if (p->chain) {
+ _timer.start(); // start/restart the timer
+ grabKeys(false);
+ _curpos = p;
+ grabKeys(true);
+ } 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);
+ reset(this);
+ }
break;
}
p = p->next_sibling;
}
}
+void OBBindings::reset(OBBindings *self)
+{
+ self->_timer.stop();
+ self->grabKeys(false);
+ self->_curpos = &self->_keytree;
+ self->grabKeys(true);
+}
+
+
+bool OBBindings::addButton(const std::string &but, MouseContext context,
+ MouseAction action, PyObject *callback)
+{
+ assert(context >= 0 && context < NUM_MOUSE_CONTEXT);
+
+ Binding b(0,0);
+ if (!translate(but, b, false))
+ return false;
+
+ ButtonBindingList::iterator it, end = _buttons[context].end();
+
+ // look for a duplicate binding
+ for (it = _buttons[context].begin(); it != end; ++it)
+ if ((*it)->binding.key == b.key &&
+ (*it)->binding.modifiers == b.modifiers) {
+ ButtonBinding::CallbackList::iterator c_it,
+ c_end = (*it)->callback[action].end();
+ for (c_it = (*it)->callback[action].begin(); c_it != c_end; ++c_it)
+ if (*c_it == callback)
+ return true; // already bound
+ break;
+ }
+
+ ButtonBinding *bind;
+
+ // the binding didnt exist yet, add it
+ if (it == end) {
+ bind = new ButtonBinding();
+ bind->binding.key = b.key;
+ bind->binding.modifiers = b.modifiers;
+ _buttons[context].push_back(bind);
+ printf("adding %d.%d to %d\n", b.key, b.modifiers, context);
+ // XXX GRAB the new button everywhere!
+ } else
+ bind = *it;
+ bind->callback[action].push_back(callback);
+ Py_INCREF(callback);
+ return true;
+}
+
+void OBBindings::grabButtons(bool grab, OBClient *client)
+{
+ for (int i = 0; i < NUM_MOUSE_CONTEXT; ++i) {
+ Window win;
+ int mode = GrabModeAsync;
+ switch (i) {
+ case MC_Frame:
+ win = client->frame->window();
+ break;
+ case MC_Window:
+ win = client->frame->plate();
+ mode = GrabModeSync; // this is handled in the plate's buttonPressHandler
+ break;
+ default:
+ // any other elements already get button events, don't grab on them
+ continue;
+ }
+ ButtonBindingList::iterator it, end = _buttons[i].end();
+ for (it = _buttons[i].begin(); it != end; ++it)
+ if (grab)
+ otk::OBDisplay::grabButton((*it)->binding.key,
+ (*it)->binding.modifiers, win, false,
+ ButtonPressMask | ButtonMotionMask |
+ ButtonReleaseMask, mode, GrabModeAsync,
+ None, None, false);
+ else
+ otk::OBDisplay::ungrabButton((*it)->binding.key,
+ (*it)->binding.modifiers, win);
+ }
+}
+
+void OBBindings::fire(ButtonData *data)
+{
+ printf("but.mods %d.%d\n", data->button, data->state);
+
+ 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) {
+ ButtonBinding::CallbackList::iterator c_it,
+ c_end = (*it)->callback[data->action].end();
+ for (c_it = (*it)->callback[data->action].begin(); c_it != c_end; ++c_it)
+ python_callback(*c_it, (PyObject*)data);
+ }
+}
}
projects / chaz / openbox / blobdiff