From 2037631f753753a5c1ee9b2475b55658c3bb6eea Mon Sep 17 00:00:00 2001 From: Marius Nita Date: Mon, 14 Oct 2002 04:07:44 +0000 Subject: [PATCH] Fixing the stupid case when an invalid key is given and epist would hog the keyboard --- util/epist/keytree.cc | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/util/epist/keytree.cc b/util/epist/keytree.cc index 009cb355..5a3515ea 100644 --- a/util/epist/keytree.cc +++ b/util/epist/keytree.cc @@ -29,6 +29,7 @@ #include "config.hh" #include +#include using std::string; @@ -84,18 +85,26 @@ void keytree::grabDefaults(screen *scr) void keytree::ungrabDefaults(screen *scr) { + Action *act; + ChildList::const_iterator it, end = _head->children.end(); - for (it = _head->children.begin(); it != end; ++it) - if ( (*it)->action && (*it)->action->type() != Action::toggleGrabs) - scr->ungrabKey( (*it)->action->keycode(), (*it)->action->modifierMask() ); + for (it = _head->children.begin(); it != end; ++it) { + act = (*it)->action; + if (act && act->type() != Action::toggleGrabs) + scr->ungrabKey(act->keycode(), act->modifierMask()); + } } void keytree::grabChildren(keynode *node, screen *scr) { + Action *act; + ChildList::const_iterator it, end = node->children.end(); - for (it = node->children.begin(); it != end; ++it) - if ( (*it)->action ) - scr->grabKey( (*it)->action->keycode(), (*it)->action->modifierMask() ); + for (it = node->children.begin(); it != end; ++it) { + act = (*it)->action; + if (act) + scr->grabKey(act->keycode(), act->modifierMask()); + } } void keytree::ungrabChildren(keynode *node, screen *scr) @@ -178,8 +187,6 @@ const Action * keytree::getAction(const XEvent &e, unsigned int state, void keytree::addAction(Action::ActionType action, unsigned int mask, string key, string arg) { - keynode *tmp = new keynode; - if (action == Action::toggleGrabs && _current != _head) { // the toggleGrabs key can only be set up as a root key, since if // it was a chain key, we'd have to not ungrab the whole chain up @@ -187,9 +194,16 @@ void keytree::addAction(Action::ActionType action, unsigned int mask, return; } + 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, - XStringToKeysym(key.c_str())), + XKeysymToKeycode(_display, sym), mask, arg); tmp->parent = _current; _current->children.push_back(tmp); -- 2.45.2