[beryl-commits] r1455 - trunk/beryl-core/src

[onestone at server.beryl-project.org]

Author: onestone
Date: 2006-12-02 00:22:00 +0100 (Sat, 02 Dec 2006)
New Revision: 1455

Modified:
   trunk/beryl-core/src/event.c
Log:
beryl-core: use only "Escape" without modifiers to terminate plugins, with modifiers "Escape" can now be used to execute actions.

Modified: trunk/beryl-core/src/event.c
===================================================================
--- trunk/beryl-core/src/event.c	2006-11-29 19:55:18 UTC (rev 1454)
+++ trunk/beryl-core/src/event.c	2006-12-01 23:22:00 UTC (rev 1455)
@@ -315,11 +315,13 @@
     unsigned int modMask = REAL_MOD_MASK & ~d->ignoredModMask;
     unsigned int bindMods;
 
-    if (event->xkey.keycode == d->escapeKeyCode)
-        state = CompActionStateCancel;
-    else if (event->xkey.keycode == d->returnKeyCode)
-        state = CompActionStateCommit;
-
+    if (event->xkey.state == 0)
+    {
+        if (event->xkey.keycode == d->escapeKeyCode)
+	    state = CompActionStateCancel;
+	else if (event->xkey.keycode == d->returnKeyCode)
+    	    state = CompActionStateCommit;
+    }
     if (state)
     {
         CompOption *o = option;