[Xfce4-commits] r25867 - xfwm4/trunk/src

[Olivier Fourdan]

Author: olivier
Date: 2007-06-27 22:02:01 +0000 (Wed, 27 Jun 2007)
New Revision: 25867

Modified:
   xfwm4/trunk/src/screen.c
   xfwm4/trunk/src/settings.h
Log:
Do not grab the Escape key by default

Modified: xfwm4/trunk/src/screen.c
===================================================================
--- xfwm4/trunk/src/screen.c	2007-06-27 21:39:15 UTC (rev 25866)
+++ xfwm4/trunk/src/screen.c	2007-06-27 22:02:01 UTC (rev 25867)
@@ -414,7 +414,17 @@
 
     dpy = myScreenGetXDisplay (screen_info);
 
-    for (i = 0; i < KEY_COUNT; i++)
+    /*
+       Ugly hack: KEY_CANCEL is used just for cancelling window ops
+       it should not be grabbed all the time (especially when you
+       realize that it's mapped to Esc by default, damn, I can't
+       switch back to command mode in vi anymore, I'm stuck in 
+       edition mode ;)
+
+       That's why we start at FIRST_KEY which is defined after 
+       KEY_CANCEL...
+     */
+    for (i = FIRST_KEY; i < KEY_COUNT; i++)
     {
         grabKey (dpy, &screen_info->params->keys[i], screen_info->xroot);
     }

Modified: xfwm4/trunk/src/settings.h
===================================================================
--- xfwm4/trunk/src/settings.h	2007-06-27 21:39:15 UTC (rev 25866)
+++ xfwm4/trunk/src/settings.h	2007-06-27 22:02:01 UTC (rev 25867)
@@ -40,10 +40,11 @@
     TITLE_SHADOW_FRAME
 };
 
+#define FIRST_KEY KEY_ADD_WORKSPACE
 enum
 {
+    KEY_CANCEL = 0,
     KEY_ADD_WORKSPACE,
-    KEY_CANCEL,
     KEY_CLOSE_WINDOW,
     KEY_CYCLE_WINDOWS,
     KEY_DEL_WORKSPACE,