X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.cc;h=97a0ea27f9d55c500c50a0702232b18d9ecc9742;hb=390d447d9ba92878fbd1a0f7955edb5f83256195;hp=f34b9af3d682e0d521bbe8c1cc2e7b191080119c;hpb=a826509b51c03c55363f15356e73046158fe48aa;p=chaz%2Fopenbox diff --git a/src/bindings.cc b/src/bindings.cc index f34b9af3..97a0ea27 100644 --- a/src/bindings.cc +++ b/src/bindings.cc @@ -17,9 +17,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) @@ -33,13 +33,70 @@ static void print_branch(BindingTree *first, std::string str) void OBBindings::display() { - if (_tree.first_child) - print_branch(_tree.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 buttonvalue(const std::string &button, unsigned int *val) +{ + 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; +} -bool OBBindings::translate(const std::string &str, Binding &b) +static bool modvalue(const std::string &mod, unsigned int *val) +{ + 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; +} + +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('-'); @@ -47,83 +104,30 @@ bool OBBindings::translate(const std::string &str, Binding &b) std::string key(str, keybegin); // parse out the requested modifier keys - unsigned int mods = 0; + 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 (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()); + if (!modvalue(mod, &modval)) { +// 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 = mods; - b.key = XKeysymToKeycode(otk::OBDisplay::display, sym); - return b.key != 0; -} - -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; - 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 - - if (!translate(*it, p->binding)) - break; - p->text = *it; - } - 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); } - - // successfully built a tree - return ret; } static void destroytree(BindingTree *tree) @@ -135,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; + 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) { } @@ -146,19 +174,53 @@ OBBindings::~OBBindings() } +bool OBBindings::add_mouse(const std::string &button, int id) +{ + 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; + } + 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 (!_tree.first_child) { + printf("node=%lx\n", (long)node); + if (!_keytree.first_child) { // there are no nodes at this level yet - _tree.first_child = node; - return; + _keytree.first_child = node; } else { - a = _tree.first_child; + a = _keytree.first_child; last = a; b = node; while (a) { + printf("in while.. b=%lx\n", (long)b); last = a; if (a->binding != b->binding) { a = a->next_sibling; @@ -169,6 +231,7 @@ void OBBindings::assimilate(BindingTree *node) a = a->first_child; } } + printf("after while.. b=%lx\n", (long)b); if (last->binding != b->binding) last->next_sibling = b; else @@ -178,19 +241,25 @@ void OBBindings::assimilate(BindingTree *node) } -int OBBindings::find(BindingTree *search) { +int OBBindings::find_key(BindingTree *search) const { BindingTree *a, *b; - a = _tree.first_child; + print_branch(&_keytree, " Searching:"); + print_branch(search, " for..."); + 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) { + printf("Match found with %s\n", a->text.c_str()); return a->id; // found it! (return the actual id, not the search's) - } else - return -2; // the chain status' don't match (conflict!) + } + } else { + printf("Conflict found with %s\n", a->text.c_str()); + return -2; // the chain status' don't match (conflict!) + } b = b->first_child; a = a->first_child; } @@ -198,58 +267,34 @@ int OBBindings::find(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(tree) < -1) { + print_branch(tree, " Adding: "); + + if (find_key(tree) != -1) { // conflicts with another binding + printf("Conflict\n"); destroytree(tree); return false; } // assimilate this built tree into the main tree assimilate(tree); // assimilation destroys/uses the tree + + printf("Added!\n"); + print_branch(&_keytree, ""); + printf("\n"); + return true; } -int OBBindings::find(const StringVect &keylist) +int OBBindings::find_key(const StringVect &keylist) { BindingTree *tree; bool ret; @@ -257,7 +302,7 @@ int OBBindings::find(const StringVect &keylist) if (!(tree = buildtree(keylist, 0))) return false; // invalid binding requested - ret = find(tree) >= 0; + ret = find_key(tree) >= 0; destroytree(tree); @@ -265,7 +310,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 @@ -288,8 +333,36 @@ static void remove_branch(BindingTree *first) void OBBindings::remove_all() { - if (_tree.first_child) - remove_branch(_tree.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 + } + } } }