X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fbindings.cc;h=f34b9af3d682e0d521bbe8c1cc2e7b191080119c;hb=a826509b51c03c55363f15356e73046158fe48aa;hp=4bb651aa77d5010e9633aba1e2b0a28e93e585d6;hpb=98c4b4cfe58c712e70575d8d8b00e7a261a2e729;p=chaz%2Fopenbox diff --git a/src/bindings.cc b/src/bindings.cc index 4bb651aa..f34b9af3 100644 --- a/src/bindings.cc +++ b/src/bindings.cc @@ -9,6 +9,9 @@ extern "C" { #include + +#include "gettext.h" +#define _(str) gettext(str) } namespace ob { @@ -21,38 +24,79 @@ static void print_branch(BindingTree *first, std::string str) 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 (_tree.first_child) + print_branch(_tree.first_child, ""); } -static bool translate(const std::string str, Binding &b) +bool OBBindings::translate(const std::string &str, Binding &b) { - KeySym sym = XStringToKeysym(const_cast(str.c_str())); + // 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 mods = 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 (mod == "C") { // control + mods |= ControlMask; + } else if (mod == "S") { // shift + mods |= ShiftMask; + } else if (mod == "A" || // alt/mod1 + mod == "M" || + mod == "M1" || + mod == "Mod1") { + mods |= Mod1Mask; + } else if (mod == "M2" || // mod2 + mod == "Mod2") { + mods |= Mod2Mask; + } else if (mod == "M3" || // mod3 + mod == "Mod3") { + mods |= Mod3Mask; + } else if (mod == "W" || // windows/mod4 + mod == "M4" || + mod == "Mod4") { + mods |= Mod4Mask; + } else if (mod == "M5" || // mod5 + mod == "Mod5") { + mods |= Mod5Mask; + } else { // invalid + printf(_("Invalid modifier element in key binding: %s\n"), mod.c_str()); + return false; + } + begin = end + 1; + } + + KeySym sym = XStringToKeysym(const_cast(key.c_str())); if (sym == NoSymbol) return false; - b.modifiers = Mod1Mask; + b.modifiers = mods; b.key = XKeysymToKeycode(otk::OBDisplay::display, sym); return b.key != 0; } -static BindingTree *buildtree(const OBBindings::StringVect &keylist, int id) +BindingTree *OBBindings::buildtree(const StringVect &keylist, int id) { if (keylist.empty()) return 0; // nothing in the list.. return 0 BindingTree *ret = new BindingTree(id), *p = 0; - OBBindings::StringVect::const_iterator it, end = keylist.end(); + StringVect::const_iterator it, end = keylist.end(); for (it = keylist.begin(); it != end; ++it) { if (p) p = p->first_child = new BindingTree(id); @@ -78,10 +122,6 @@ static BindingTree *buildtree(const OBBindings::StringVect &keylist, int id) p->chain = false; } - printf("\n"); - print_branch(ret); - printf("\n"); - // successfully built a tree return ret; } @@ -106,43 +146,41 @@ OBBindings::~OBBindings() } -static void assimilate(BindingTree *parent, BindingTree *node) +void OBBindings::assimilate(BindingTree *node) { - BindingTree *p, *lastsib, *nextparent, *nextnode = node->first_child; + BindingTree *a, *b, *tmp, *last; - if (!parent->first_child) { + if (!_tree.first_child) { // there are no nodes at this level yet - parent->first_child = node; - nextparent = node; + _tree.first_child = node; + return; } 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 = _tree.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; - } - nextparent = p; + if (last->binding != b->binding) + last->next_sibling = b; + else + last->first_child = b->first_child; + delete b; } - - if (nextnode) - assimilate(nextparent, nextnode); } -static int find_bind(BindingTree *tree, BindingTree *search) { +int OBBindings::find(BindingTree *search) { BindingTree *a, *b; - a = tree; + a = _tree.first_child; b = search; while (a && b) { if (a->binding != b->binding) { @@ -199,14 +237,14 @@ bool OBBindings::add(const StringVect &keylist, int id) if (!(tree = buildtree(keylist, id))) return false; // invalid binding requested - if (find_bind(_bindings.first_child, tree) < -1) { + if (find(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; } @@ -219,7 +257,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(tree) >= 0; destroytree(tree); @@ -250,8 +288,8 @@ static void remove_branch(BindingTree *first) void OBBindings::remove_all() { - if (_bindings.first_child) - remove_branch(_bindings.first_child); + if (_tree.first_child) + remove_branch(_tree.first_child); } }