X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fkeytree.cc;h=94b542b0e3c057a59826e2d27520fd276101e7c5;hb=eb19a6b69e89c6adae1b99705b0a26edc344c87a;hp=5a3515eab449ff3d567a9ba55ef6efbbf211c4e1;hpb=2037631f753753a5c1ee9b2475b55658c3bb6eea;p=chaz%2Fopenbox diff --git a/util/epist/keytree.cc b/util/epist/keytree.cc index 5a3515ea..94b542b0 100644 --- a/util/epist/keytree.cc +++ b/util/epist/keytree.cc @@ -195,13 +195,8 @@ void keytree::addAction(Action::ActionType action, unsigned int mask, } KeySym sym = XStringToKeysym(key.c_str()); - - if (sym == 0) { - std::cerr << "Key " << key << " is invalid! (Action ignored)\n"; - return; - } - keynode *tmp = new keynode; + tmp->action = new Action(action, XKeysymToKeycode(_display, sym), mask, arg); @@ -229,10 +224,10 @@ void keytree::setCurrentNodeProps(Action::ActionType action, unsigned int mask, { if (_current->action) delete _current->action; - + + KeySym sym = XStringToKeysym(key.c_str()); _current->action = new Action(action, - XKeysymToKeycode(_display, - XStringToKeysym(key.c_str())), + XKeysymToKeycode(_display, sym), mask, arg); }