X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.cc;h=6d1d420ecf71c81c5ebc0d9af4b3e62153561cc0;hb=d7a30f93b517ac76816d0acea92e9c56ad5d6594;hp=8f474b37adc32addeca940ebca3a00323dfb9b24;hpb=d4853f108c1d22c344c1cb9a8a8b7cdc46648983;p=chaz%2Fopenbox diff --git a/src/bindings.cc b/src/bindings.cc index 8f474b37..6d1d420e 100644 --- a/src/bindings.cc +++ b/src/bindings.cc @@ -5,6 +5,11 @@ #endif #include "bindings.hh" +#include "screen.hh" +#include "openbox.hh" +#include "client.hh" +#include "frame.hh" +#include "python.hh" #include "otk/display.hh" extern "C" { @@ -17,9 +22,9 @@ extern "C" { namespace ob { #include -static void print_branch(BindingTree *first, std::string str) +static void print_branch(const BindingTree *first, std::string str) { - BindingTree *p = first; + const BindingTree *p = first; while (p) { if (p->first_child) @@ -37,9 +42,9 @@ void OBBindings::display() printf("Key Tree:\n"); print_branch(_keytree.first_child, ""); } - if (_mousetree.next_sibling) { + if (_mousetree) { printf("Mouse Tree:\n"); - BindingTree *p = _mousetree.next_sibling; + BindingTree *p = _mousetree; while (p) { printf("%d %s\n", p->id, p->text.c_str()); p = p->next_sibling; @@ -95,7 +100,8 @@ static bool modvalue(const std::string &mod, unsigned int *val) return true; } -bool OBBindings::translate(const std::string &str, Binding &b, bool askey) +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('-'); @@ -138,7 +144,7 @@ static void destroytree(BindingTree *tree) } } -BindingTree *OBBindings::buildtree(const StringVect &keylist, int id) +BindingTree *OBBindings::buildtree(const StringVect &keylist, int id) const { if (keylist.empty()) return 0; // nothing in the list.. return 0 @@ -148,7 +154,7 @@ BindingTree *OBBindings::buildtree(const StringVect &keylist, int id) for (it = keylist.rbegin(); it != end; ++it) { p = ret; ret = new BindingTree(id); - if (!p) ret->chain = false; + if (!p) ret->chain = false; // only the first built node ret->first_child = p; if (!translate(*it, ret->binding, true)) { destroytree(ret); @@ -162,13 +168,15 @@ BindingTree *OBBindings::buildtree(const StringVect &keylist, int id) OBBindings::OBBindings() - : _curpos(&_keytree) + : _curpos(&_keytree), _mousetree(0) { } OBBindings::~OBBindings() { + grabMouseOnAll(false); // ungrab everything + grabKeys(false); remove_all(); } @@ -180,20 +188,24 @@ bool OBBindings::add_mouse(const std::string &button, int id) if (!translate(button, n.binding, false)) return false; - BindingTree *p = _mousetree.next_sibling, *last = &_mousetree; + BindingTree *p = _mousetree, **newp = &_mousetree; while (p) { if (p->binding == n.binding) return false; // conflict - last = p; p = p->next_sibling; + newp = &p->next_sibling; } - display(); - last->next_sibling = new BindingTree(id); - display(); - last->next_sibling->chain = false; - last->next_sibling->binding.key = n.binding.key; - last->next_sibling->binding.modifiers = n.binding.modifiers; - + + grabMouseOnAll(false); // ungrab everything + + *newp = new BindingTree(id); + (*newp)->text = button; + (*newp)->chain = false; + (*newp)->binding.key = n.binding.key; + (*newp)->binding.modifiers = n.binding.modifiers; + + grabMouseOnAll(true); + return true; } @@ -202,6 +214,12 @@ 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); } @@ -212,7 +230,6 @@ void OBBindings::assimilate(BindingTree *node) if (!_keytree.first_child) { // there are no nodes at this level yet _keytree.first_child = node; - return; } else { a = _keytree.first_child; last = a; @@ -230,14 +247,15 @@ void OBBindings::assimilate(BindingTree *node) } if (last->binding != b->binding) last->next_sibling = b; - else + else { last->first_child = b->first_child; - delete b; + delete b; + } } } -int OBBindings::find_key(BindingTree *search) { +int OBBindings::find_key(BindingTree *search) const { BindingTree *a, *b; a = _keytree.first_child; b = search; @@ -246,10 +264,12 @@ int OBBindings::find_key(BindingTree *search) { a = a->next_sibling; } else { if (a->chain == b->chain) { - if (!a->chain) + if (!a->chain) { return a->id; // found it! (return the actual id, not the search's) - } else - return -2; // the chain status' don't match (conflict!) + } + } else { + return -2; // the chain status' don't match (conflict!) + } b = b->first_child; a = a->first_child; } @@ -257,6 +277,7 @@ int OBBindings::find_key(BindingTree *search) { return -1; // it just isn't in here } + bool OBBindings::add_key(const StringVect &keylist, int id) { BindingTree *tree; @@ -264,14 +285,19 @@ bool OBBindings::add_key(const StringVect &keylist, int id) if (!(tree = buildtree(keylist, id))) return false; // invalid binding requested - if (find_key(tree) < -1) { + if (find_key(tree) != -1) { // 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 + + grabKeys(true); + return true; } @@ -296,6 +322,14 @@ 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); + } @@ -319,13 +353,13 @@ void OBBindings::remove_all() remove_branch(_keytree.first_child); _keytree.first_child = 0; } - BindingTree *p = _mousetree.next_sibling; + BindingTree *p = _mousetree; while (p) { BindingTree *n = p->next_sibling; delete p; p = n; } - _mousetree.next_sibling = 0; + _mousetree = 0; } @@ -347,4 +381,89 @@ void OBBindings::process(unsigned int modifiers, unsigned int key) } } + +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); + } +} + + +void OBBindings::grabKeys(bool grab) +{ + for (int i = 0; i < Openbox::instance->screenCount(); ++i) { + Window root = otk::OBDisplay::screenInfo(i)->rootWindow(); + + BindingTree *p = _curpos->first_child; + while (p) { + 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); + p = p->next_sibling; + } + } +} + + +void OBBindings::fire(OBActions::ActionType type, Window window, + unsigned int modifiers, unsigned int key, Time time) +{ + if (type == OBActions::Action_KeyPress) { + 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); + _curpos = &_keytree; + } + break; + } + p = p->next_sibling; + } + + assert(false); + } else { + BindingTree *p = _mousetree; + while (p) { + if (p->binding.key == key && p->binding.modifiers == modifiers) { + python_callback_binding(p->id, type, window, modifiers, key, time); + break; + } + p = p->next_sibling; + } + } +} + + }