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

[maniac at server.beryl-project.org]

Author: maniac
Date: 2006-12-02 00:22:43 +0100 (Sat, 02 Dec 2006)
New Revision: 1480

Modified:
   trunk/beryl-core/src/event.c
Log:
beryl-core: use mask of modifiers to be ignored for cancel/commit selection


Modified: trunk/beryl-core/src/event.c
===================================================================
--- trunk/beryl-core/src/event.c	2006-12-01 07:56:44 UTC (rev 1479)
+++ trunk/beryl-core/src/event.c	2006-12-01 23:22:43 UTC (rev 1480)
@@ -315,13 +315,14 @@
     unsigned int modMask = REAL_MOD_MASK & ~d->ignoredModMask;
     unsigned int bindMods;
 
-    if (event->xkey.state == 0)
+    if (!(event->xkey.state & modMask))
     {
         if (event->xkey.keycode == d->escapeKeyCode)
 	    state = CompActionStateCancel;
 	else if (event->xkey.keycode == d->returnKeyCode)
     	    state = CompActionStateCommit;
     }
+
     if (state)
     {
         CompOption *o = option;