extern "C" {
#include <X11/Xlib.h>
+
+#include "gettext.h"
+#define _(str) gettext(str)
}
namespace ob {
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;
+ p = p->next_sibling;
}
}
bool OBBindings::translate(const std::string &str, Binding &b)
{
- 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 mods = 0;
std::string::size_type begin = 0, end;
while (begin != keybegin) {
end = str.find_first_of('-', begin);
} 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;
}
- printf("got modifier: got modifier: %s\n", mod.c_str());
-
begin = end + 1;
}
p->chain = false;
}
- printf("BUILDING:\n");
- print_branch(ret, "");
-
// successfully built a tree
return ret;
}
{
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;
+ _tree.first_child = node;
return;
} else {
- a = parent->first_child;
+ 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;
a = a->first_child;
}
}
- last->first_child = b->first_child;
+ if (last->binding != b->binding)
+ last->next_sibling = b;
+ else
+ last->first_child = b->first_child;
delete b;
}
}