X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.cc;h=1a102b5452b78c30e65a05f6716bbc36f9e885d9;hb=db1fb534b8f5a1f19710ac77ef2ce85c4c1270ec;hp=a6f7addbb54dc912d2ede0dc2dcad9120e983923;hpb=c9ca0e797de3f8b67b47333476a98b18445cdb67;p=chaz%2Fopenbox diff --git a/src/bindings.cc b/src/bindings.cc index a6f7addb..1a102b54 100644 --- a/src/bindings.cc +++ b/src/bindings.cc @@ -9,81 +9,125 @@ extern "C" { #include + +#include "gettext.h" +#define _(str) gettext(str) } 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) print_branch(p->first_child, str + " " + p->text); - printf("%d%s\n", p->id, (str + " " + p->text).c_str()); - BindingTree *s = p->next_sibling; - delete p; - p = s; + if (!p->chain) + printf("%d%s\n", p->id, (str + " " + p->text).c_str()); + p = p->next_sibling; } } void OBBindings::display() { - if (_bindings.first_child) - print_branch(_bindings.first_child, ""); + if (_keytree.first_child) { + printf("Key Tree:\n"); + print_branch(_keytree.first_child, ""); + } + if (_mousetree) { + printf("Mouse Tree:\n"); + BindingTree *p = _mousetree; + while (p) { + printf("%d %s\n", p->id, p->text.c_str()); + p = p->next_sibling; + } + } } - -static bool translate(const std::string str, Binding &b) +static bool buttonvalue(const std::string &button, unsigned int *val) { - KeySym sym = XStringToKeysym(const_cast(str.c_str())); - if (sym == NoSymbol) return false; - b.modifiers = Mod1Mask; - b.key = XKeysymToKeycode(otk::OBDisplay::display, sym); - return b.key != 0; + if (button == "1" || button == "Button1") { + *val |= Button1; + } else if (button == "2" || button == "Button2") { + *val |= Button2; + } else if (button == "3" || button == "Button3") { + *val |= Button3; + } else if (button == "4" || button == "Button4") { + *val |= Button4; + } else if (button == "5" || button == "Button5") { + *val |= Button5; + } else + return false; + return true; } -static BindingTree *buildtree(const OBBindings::StringVect &keylist, int id) +static bool modvalue(const std::string &mod, unsigned int *val) { - if (keylist.empty()) return 0; // nothing in the list.. return 0 - - BindingTree *ret = new BindingTree(id), *p = 0; + if (mod == "C") { // control + *val |= ControlMask; + } else if (mod == "S") { // shift + *val |= ShiftMask; + } else if (mod == "A" || // alt/mod1 + mod == "M" || + mod == "Mod1" || + mod == "M1") { + *val |= Mod1Mask; + } else if (mod == "Mod2" || // mod2 + mod == "M2") { + *val |= Mod2Mask; + } else if (mod == "Mod3" || // mod3 + mod == "M3") { + *val |= Mod3Mask; + } else if (mod == "W" || // windows/mod4 + mod == "Mod4" || + mod == "M4") { + *val |= Mod4Mask; + } else if (mod == "Mod5" || // mod5 + mod == "M5") { + *val |= Mod5Mask; + } else { // invalid + return false; + } + return true; +} - OBBindings::StringVect::const_iterator it, end = keylist.end(); - for (it = keylist.begin(); it != end; ++it) { - if (p) - p = p->first_child = new BindingTree(id); - else - p = ret; // the first node +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('-'); + keybegin = (keybegin == std::string::npos) ? 0 : keybegin + 1; + std::string key(str, keybegin); + + // parse out the requested modifier keys + unsigned int modval = 0; + std::string::size_type begin = 0, end; + while (begin != keybegin) { + end = str.find_first_of('-', begin); + + std::string mod(str, begin, end-begin); + if (!modvalue(mod, &modval)) { +// printf(_("Invalid modifier element in key binding: %s\n"), mod.c_str()); + return false; + } - if (!translate(*it, p->binding)) - break; - p->text = *it; + begin = end + 1; } - if (it != end) { - // build failed.. clean up and return 0 - p = ret; - while (p->first_child) { - BindingTree *c = p->first_child; - delete p; - p = c; - } - delete p; - return 0; + + // set the binding + b.modifiers = modval; + if (askey) { + KeySym sym = XStringToKeysym(const_cast(key.c_str())); + if (sym == NoSymbol) return false; + b.key = XKeysymToKeycode(otk::OBDisplay::display, sym); + return b.key != 0; } else { - // set the proper chain status on the last node - p->chain = false; + return buttonvalue(key, &b.key); } - - printf("\n"); - print_branch(ret, ""); - printf("\n"); - - // successfully built a tree - return ret; } static void destroytree(BindingTree *tree) @@ -95,7 +139,31 @@ static void destroytree(BindingTree *tree) } } +BindingTree *OBBindings::buildtree(const StringVect &keylist, int id) const +{ + if (keylist.empty()) return 0; // nothing in the list.. return 0 + + BindingTree *ret = 0, *p; + + StringVect::const_reverse_iterator it, end = keylist.rend(); + for (it = keylist.rbegin(); it != end; ++it) { + p = ret; + ret = new BindingTree(id); + if (!p) ret->chain = false; // only the first built node + ret->first_child = p; + if (!translate(*it, ret->binding, true)) { + destroytree(ret); + ret = 0; + break; + } + ret->text = *it; // XXX: rm me + } + return ret; +} + + OBBindings::OBBindings() + : _curpos(&_keytree), _mousetree(0) { } @@ -106,53 +174,86 @@ OBBindings::~OBBindings() } -static void assimilate(BindingTree *parent, BindingTree *node) +bool OBBindings::add_mouse(const std::string &button, int id) { - BindingTree *p, *lastsib, *nextparent, *nextnode = node->first_child; + BindingTree n; + + if (!translate(button, n.binding, false)) + return false; - if (!parent->first_child) { + BindingTree *p = _mousetree, **newp = &_mousetree; + while (p) { + if (p->binding == n.binding) + return false; // conflict + p = p->next_sibling; + newp = &p->next_sibling; + } + display(); + *newp = new BindingTree(id); + display(); + (*newp)->text = button; + (*newp)->chain = false; + (*newp)->binding.key = n.binding.key; + (*newp)->binding.modifiers = n.binding.modifiers; + + return true; +} + + +int OBBindings::remove_mouse(const std::string &button) +{ + (void)button; + assert(false); // XXX: function not implemented yet +} + + +void OBBindings::assimilate(BindingTree *node) +{ + BindingTree *a, *b, *tmp, *last; + + if (!_keytree.first_child) { // there are no nodes at this level yet - parent->first_child = node; - nextparent = node; + _keytree.first_child = node; } else { - p = lastsib = parent->first_child; - - while (p->next_sibling) { - p = p->next_sibling; - lastsib = p; // finds the last sibling - if (p->binding == node->binding) { - // found an identical binding.. - assert(node->chain && p->chain); - delete node; // kill the one we aren't using - break; + a = _keytree.first_child; + last = a; + b = node; + while (a) { + last = a; + if (a->binding != b->binding) { + a = a->next_sibling; + } else { + tmp = b; + b = b->first_child; + delete tmp; + a = a->first_child; } } - if (!p) { - // couldn't find an existing binding, use this new one, and insert it - // into the list - p = lastsib->next_sibling = node; + if (last->binding != b->binding) + last->next_sibling = b; + else { + last->first_child = b->first_child; + delete b; } - nextparent = p; } - - if (nextnode) - assimilate(nextparent, nextnode); } -static int find_bind(BindingTree *tree, BindingTree *search) { +int OBBindings::find_key(BindingTree *search) const { BindingTree *a, *b; - a = tree; + a = _keytree.first_child; b = search; while (a && b) { if (a->binding != b->binding) { 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; } @@ -160,58 +261,27 @@ static int find_bind(BindingTree *tree, BindingTree *search) { return -1; // it just isn't in here } -/* -static int find(BindingTree *parent, BindingTree *node) { - BindingTree *p, *lastsib, *nextparent, *nextnode = node->first_child; - - if (!parent->first_child) - return -1; - - p = parent->first_child; - while (p) { - if (node->binding == p->binding) { - if (node->chain == p->chain) { - if (!node->chain) { - return p->id; // found it! (return the actual id, not the search's) - } else { - break; // go on to the next child in the chain - } - } else { - return -2; // the chain status' don't match (conflict!) - } - } - p = p->next_sibling; - } - if (!p) return -1; // doesn't exist - - if (node->chain) { - assert(node->first_child); - return find(p, node->first_child); - } else - return -1; // it just isnt in here -} -*/ - -bool OBBindings::add(const StringVect &keylist, int id) +bool OBBindings::add_key(const StringVect &keylist, int id) { BindingTree *tree; if (!(tree = buildtree(keylist, id))) return false; // invalid binding requested - if (find_bind(_bindings.first_child, tree) < -1) { + if (find_key(tree) != -1) { // conflicts with another binding destroytree(tree); return false; } // assimilate this built tree into the main tree - assimilate(&_bindings, tree); // assimilation destroys/uses the tree + assimilate(tree); // assimilation destroys/uses the tree + return true; } -int OBBindings::find(const StringVect &keylist) +int OBBindings::find_key(const StringVect &keylist) { BindingTree *tree; bool ret; @@ -219,7 +289,7 @@ int OBBindings::find(const StringVect &keylist) if (!(tree = buildtree(keylist, 0))) return false; // invalid binding requested - ret = find_bind(_bindings.first_child, tree) >= 0; + ret = find_key(tree) >= 0; destroytree(tree); @@ -227,7 +297,7 @@ int OBBindings::find(const StringVect &keylist) } -int OBBindings::remove(const StringVect &keylist) +int OBBindings::remove_key(const StringVect &keylist) { (void)keylist; assert(false); // XXX: function not implemented yet @@ -250,8 +320,36 @@ static void remove_branch(BindingTree *first) void OBBindings::remove_all() { - if (_bindings.first_child) - remove_branch(_bindings.first_child); + 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::process(unsigned int modifiers, unsigned int key) +{ + BindingTree *c = _curpos->first_child; + + while (c) { + if (c->binding.key == key && c->binding.modifiers == modifiers) { + _curpos = c; + break; + } + } + if (c) { + if (!_curpos->chain) { + // XXX execute command for _curpos->id + _curpos = &_keytree; // back to the start + } + } } }