toggleGrabs action added

diff --git a/util/epist/actions.hh b/util/epist/actions.hh
index 89b99eca9291ca7008ebabf076308b7c3df33faf..6fdd48f0e9820e7407af7eef68cb3d899a97bde9 100644 (file)
--- a/util/epist/actions.hh
+++ b/util/epist/actions.hh
@@ -89,6 +89,7 @@ public:
     showWorkspaceMenu,
     toggleDecorations,
 
+    toggleGrabs,
     stringChain, 
     keyChain,
     numberChain,

diff --git a/util/epist/keytree.cc b/util/epist/keytree.cc
index e9fa2cab49c860bd65604996eb2539f8e008ba13..6dcba312ccac832cd14128ea00b40d5a1e3447a0 100644 (file)
--- a/util/epist/keytree.cc
+++ b/util/epist/keytree.cc
@@ -82,7 +82,7 @@ void keytree::ungrabDefaults(screen *scr)
 {
   ChildList::const_iterator it, end = _head->children.end();
   for (it = _head->children.begin(); it != end; ++it)
-    if ( (*it)->action )
+    if ( (*it)->action && (*it)->action->type() != Action::toggleGrabs)
       scr->ungrabKey( (*it)->action->keycode(), (*it)->action->modifierMask() );
 }
 
@@ -175,6 +175,14 @@ 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
+    // to that key. which kinda defeats the purpose of this function.
+    return;
+  }
+
   tmp->action = new Action(action,
                            XKeysymToKeycode(_display,
                                             XStringToKeysym(key.c_str())),

diff --git a/util/epist/parser.cc b/util/epist/parser.cc
index 548212c45d7f96a1ac7efbf13f19166f556162bb..d7ac2c13bd3a49eeab9e421c6b5101ea19482e91 100644 (file)
--- a/util/epist/parser.cc
+++ b/util/epist/parser.cc
@@ -102,6 +102,7 @@ void parser::setAction(string act)
     { "showrootmenu", Action::showRootMenu },
     { "showworkspacemenu", Action::showWorkspaceMenu },
     { "toggledecorations", Action::toggleDecorations },
+    { "togglegrabs", Action::toggleGrabs },
     { "stringchain", Action::stringChain },
     { "keychain", Action::keyChain },
     { "numberchain", Action::numberChain },

diff --git a/util/epist/screen.cc b/util/epist/screen.cc
index 2862b870148519cc3087a3f4a8060dd6f14d964b..0f8dfa5640ed58e7bcd020552a45c036b3bd329c 100644 (file)
--- a/util/epist/screen.cc
+++ b/util/epist/screen.cc
@@ -59,6 +59,7 @@ screen::screen(epist *epist, int number)
   _number = number;
   _info = _epist->getScreenInfo(_number);
   _root = _info->getRootWindow();
+  _grabbed = true;
 
   // find a window manager supporting NETWM, waiting for it to load if we must
   int count = 20;  // try for 20 seconds
@@ -151,8 +152,9 @@ void screen::handleKeypress(const XEvent &e) {
   // Mask out the lock modifiers. We want our keys to always work
   // This should be made an option
   unsigned int state = e.xkey.state & ~(LockMask|scrolllockMask|numlockMask);
-  const Action *it = _epist->getKeyTree().getAction(e, state, this);
-  
+  keytree &ktree = _epist->getKeyTree();
+  const Action *it = ktree.getAction(e, state, this);
+
   if (!it)
     return;
 
@@ -252,6 +254,17 @@ void screen::handleKeypress(const XEvent &e) {
                               None);
     return;
 
+  case Action::toggleGrabs: {
+    if (_grabbed) {
+      ktree.ungrabDefaults(this);
+      _grabbed = false;
+    } else {
+      ktree.grabDefaults(this);
+      _grabbed = true;
+    }
+    return;
+  }
+
   default:
     break;
   }

diff --git a/util/epist/screen.hh b/util/epist/screen.hh
index 98f8a351023ff03b24349cdb5c061432e6c9ccae..34e3c77f15af29e9b3a59159c5d9efce1ae32a6d 100644 (file)
--- a/util/epist/screen.hh
+++ b/util/epist/screen.hh
@@ -53,6 +53,7 @@ class screen {
   unsigned int _num_desktops;
 
   bool _managed;
+  bool _grabbed; // used for keygrab toggle function
 
   XWindow *findWindow(const XEvent &e) const;
   void updateNumDesktops();