fucked up shit
This commit is contained in:
parent
dabac4f740
commit
509e6a8f43
3 changed files with 8 additions and 4 deletions
|
@ -150,6 +150,7 @@ BindingTree *OBBindings::buildtree(const StringVect &keylist, int id)
|
||||||
ret = new BindingTree(id);
|
ret = new BindingTree(id);
|
||||||
if (!p) ret->chain = false;
|
if (!p) ret->chain = false;
|
||||||
ret->first_child = p;
|
ret->first_child = p;
|
||||||
|
printf("adding child %lx\n", (long)p);
|
||||||
if (!translate(*it, ret->binding, true)) {
|
if (!translate(*it, ret->binding, true)) {
|
||||||
destroytree(ret);
|
destroytree(ret);
|
||||||
ret = 0;
|
ret = 0;
|
||||||
|
@ -162,7 +163,7 @@ BindingTree *OBBindings::buildtree(const StringVect &keylist, int id)
|
||||||
|
|
||||||
|
|
||||||
OBBindings::OBBindings()
|
OBBindings::OBBindings()
|
||||||
: _curpos(&_keytree)
|
: _curpos(&_keytree), _mousetree(0)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -49,7 +49,7 @@ private:
|
||||||
BindingTree _keytree; // root node of the tree (this doesn't have siblings!)
|
BindingTree _keytree; // root node of the tree (this doesn't have siblings!)
|
||||||
BindingTree *_curpos; // position in the keytree
|
BindingTree *_curpos; // position in the keytree
|
||||||
|
|
||||||
BindingTree _mousetree; // this tree is a list. it has only siblings
|
BindingTree *_mousetree; // this tree is a list. it has only siblings
|
||||||
|
|
||||||
int find_key(BindingTree *search);
|
int find_key(BindingTree *search);
|
||||||
bool translate(const std::string &str, Binding &b, bool askey);
|
bool translate(const std::string &str, Binding &b, bool askey);
|
||||||
|
|
|
@ -155,10 +155,13 @@ Openbox::Openbox(int argc, char **argv)
|
||||||
v.push_back("v");
|
v.push_back("v");
|
||||||
_bindings->add_key(v, 1);
|
_bindings->add_key(v, 1);
|
||||||
v.clear();
|
v.clear();
|
||||||
// v.push_back("C-x");
|
v.push_back("C-x");
|
||||||
// v.push_back("C-z");
|
v.push_back("C-z");
|
||||||
v.push_back("a");
|
v.push_back("a");
|
||||||
_bindings->add_key(v, 2);
|
_bindings->add_key(v, 2);
|
||||||
|
v.clear();
|
||||||
|
v.push_back("C-a");
|
||||||
|
_bindings->add_key(v, 3);
|
||||||
|
|
||||||
_bindings->add_mouse("A-1", 1);
|
_bindings->add_mouse("A-1", 1);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue