X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fbindings.cc;h=ef14d585638f918e3e251b0301abb6448f3317fb;hb=1161a90a70b21d3064a9dee62c72dd4be3025ada;hp=4517f29d89b7f3bcc7b9b0b659dfef410b659639;hpb=1369b32df813bfad0a19ec77751c2d3594e944c6;p=chaz%2Fopenbox diff --git a/src/bindings.cc b/src/bindings.cc index 4517f29d..ef14d585 100644 --- a/src/bindings.cc +++ b/src/bindings.cc @@ -5,146 +5,144 @@ #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" { #include + +#include "gettext.h" +#define _(str) gettext(str) } namespace ob { -#include -static void print_branch(BindingTree *first, std::string str) +static bool buttonvalue(const std::string &button, unsigned int *val) { - BindingTree *p = first; - - while (p) { - if (p->first_child) - print_branch(p->first_child, str + " " + p->text); - if (!p->chain) - printf("%d%s\n", p->id, (str + " " + p->text).c_str()); - BindingTree *s = p->next_sibling; - delete p; - p = s; - } + 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; } - -void OBBindings::display() +static bool modvalue(const std::string &mod, unsigned int *val) { - if (_tree.first_child) - print_branch(_tree.first_child, ""); + 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 OBBindings::translate(const std::string &str, Binding &b) const { - unsigned int mods = 0; - // 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); - // XXX: get some modifiers up in the hizzie // 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 (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; + if (!modvalue(mod, &modval)) { + printf(_("Invalid modifier element in key binding: %s\n"), mod.c_str()); + return false; } - printf("got modifier: got modifier: %s\n", mod.c_str()); begin = end + 1; } - + + // set the binding + b.modifiers = modval; KeySym sym = XStringToKeysym(const_cast(key.c_str())); - if (sym == NoSymbol) return false; - b.modifiers = mods; - b.key = XKeysymToKeycode(otk::OBDisplay::display, sym); + if (sym == NoSymbol) { + printf(_("Invalid Key name in key binding: %s\n"), key.c_str()); + return false; + } + if (!(b.key = XKeysymToKeycode(otk::OBDisplay::display, sym))) + printf(_("No valid keycode for Key in key binding: %s\n"), key.c_str()); return b.key != 0; } -BindingTree *OBBindings::buildtree(const StringVect &keylist, int id) +static void destroytree(BindingTree *tree) +{ + while (tree) { + BindingTree *c = tree->first_child; + delete tree; + tree = c; + } +} + +BindingTree *OBBindings::buildtree(const StringVect &keylist, int id) const { if (keylist.empty()) return 0; // nothing in the list.. return 0 - BindingTree *ret = new BindingTree(id), *p = 0; + BindingTree *ret = 0, *p; - 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 + StringVect::const_reverse_iterator it, end = keylist.rend(); + for (it = keylist.rbegin(); it != end; ++it) { p = ret; - while (p->first_child) { - BindingTree *c = p->first_child; - delete p; - p = c; + ret = new BindingTree(id); + if (!p) ret->chain = false; // only the first built node + ret->first_child = p; + if (!translate(*it, ret->binding)) { + destroytree(ret); + ret = 0; + break; } - delete p; - return 0; - } else { - // set the proper chain status on the last node - p->chain = false; } - - printf("BUILDING:\n"); - print_branch(ret, ""); - - // successfully built a tree return ret; } -static void destroytree(BindingTree *tree) -{ - while (tree) { - BindingTree *c = tree->first_child; - delete tree; - tree = c; - } -} OBBindings::OBBindings() + : _curpos(&_tree), _resetkey(0,0) { + setResetKey("C-g"); // set the default reset key } OBBindings::~OBBindings() { + grabKeys(false); remove_all(); } @@ -156,12 +154,11 @@ void OBBindings::assimilate(BindingTree *node) if (!_tree.first_child) { // there are no nodes at this level yet _tree.first_child = node; - return; } else { a = _tree.first_child; last = a; b = node; - while (a->first_child) { + while (a) { last = a; if (a->binding != b->binding) { a = a->next_sibling; @@ -172,13 +169,17 @@ void OBBindings::assimilate(BindingTree *node) a = a->first_child; } } - last->first_child = b->first_child; - delete b; + if (last->binding != b->binding) + last->next_sibling = b; + else { + last->first_child = b->first_child; + delete b; + } } } -int OBBindings::find(BindingTree *search) { +int OBBindings::find(BindingTree *search) const { BindingTree *a, *b; a = _tree.first_child; b = search; @@ -187,10 +188,12 @@ int OBBindings::find(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; } @@ -198,37 +201,6 @@ 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) { @@ -237,14 +209,19 @@ bool OBBindings::add(const StringVect &keylist, int id) if (!(tree = buildtree(keylist, id))) return false; // invalid binding requested - if (find(tree) < -1) { + if (find(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; } @@ -269,6 +246,26 @@ int OBBindings::remove(const StringVect &keylist) { (void)keylist; assert(false); // XXX: function not implemented yet + + grabKeys(false); + _curpos = &_tree; + + // do shit here... + + grabKeys(true); + +} + + +void OBBindings::setResetKey(const std::string &key) +{ + Binding b(0, 0); + if (translate(key, b)) { + grabKeys(false); + _resetkey.key = b.key; + _resetkey.modifiers = b.modifiers; + grabKeys(true); + } } @@ -288,8 +285,67 @@ static void remove_branch(BindingTree *first) void OBBindings::remove_all() { - if (_tree.first_child) + if (_tree.first_child) { remove_branch(_tree.first_child); + _tree.first_child = 0; + } +} + + +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; + } + + if (grab) + otk::OBDisplay::grabKey(_resetkey.key, _resetkey.modifiers, + root, true, GrabModeAsync, GrabModeAsync, + false); + else + otk::OBDisplay::ungrabKey(_resetkey.key, _resetkey.modifiers, + root); + } +} + + +void OBBindings::fire(Window window, unsigned int modifiers, unsigned int key, + Time time) +{ + if (key == _resetkey.key && modifiers == _resetkey.modifiers) { + grabKeys(false); + _curpos = &_tree; + 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, window, modifiers, key, time); + grabKeys(false); + _curpos = &_tree; + grabKeys(true); + } + break; + } + p = p->next_sibling; + } + } } }