summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2002-12-30 20:41:33 +0000
committerDana Jansens <danakj@orodu.net>2002-12-30 20:41:33 +0000
commit509e6a8f439bba220d71393b4da9597b7f8fa180 (patch)
tree1e6af0e911c79ed47a8ddcbc9853cbe4e438bf26 /src
parentdabac4f740d2c43206bb6f6b99c2543120c99024 (diff)
fucked up shit
Diffstat (limited to 'src')
-rw-r--r--src/bindings.cc3
-rw-r--r--src/bindings.hh2
-rw-r--r--src/openbox.cc7
3 files changed, 8 insertions, 4 deletions
diff --git a/src/bindings.cc b/src/bindings.cc
index 8d889932..b854ba25 100644
--- a/src/bindings.cc
+++ b/src/bindings.cc
@@ -150,6 +150,7 @@ BindingTree *OBBindings::buildtree(const StringVect &keylist, int id)
ret = new BindingTree(id);
if (!p) ret->chain = false;
ret->first_child = p;
+ printf("adding child %lx\n", (long)p);
if (!translate(*it, ret->binding, true)) {
destroytree(ret);
ret = 0;
@@ -162,7 +163,7 @@ BindingTree *OBBindings::buildtree(const StringVect &keylist, int id)
OBBindings::OBBindings()
- : _curpos(&_keytree)
+ : _curpos(&_keytree), _mousetree(0)
{
}
diff --git a/src/bindings.hh b/src/bindings.hh
index e4bd65f3..be73b51f 100644
--- a/src/bindings.hh
+++ b/src/bindings.hh
@@ -49,7 +49,7 @@ private:
BindingTree _keytree; // root node of the tree (this doesn't have siblings!)
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);
bool translate(const std::string &str, Binding &b, bool askey);
diff --git a/src/openbox.cc b/src/openbox.cc
index 69092eca..e7ffb76b 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -155,10 +155,13 @@ Openbox::Openbox(int argc, char **argv)
v.push_back("v");
_bindings->add_key(v, 1);
v.clear();
-// v.push_back("C-x");
-// v.push_back("C-z");
+ v.push_back("C-x");
+ v.push_back("C-z");
v.push_back("a");
_bindings->add_key(v, 2);
+ v.clear();
+ v.push_back("C-a");
+ _bindings->add_key(v, 3);
_bindings->add_mouse("A-1", 1);