gnome-settings-daemon r386 - in trunk: . plugins/common

[jensg svn gnome org]

Author: jensg
Date: Sat Jun 28 17:40:01 2008
New Revision: 386
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=386&view=rev

Log:
2008-06-28  Jens Granseuer  <jensgr gmx net>

	* plugins/common/gsd-keygrab.c: don't ignore any ModX modifiers.
	This should finally make g-s-d recognize keybindings with Super
	and Meta although we still don't handle the corresponding virtual
	modifiers (bug #165343)


Modified:
   trunk/ChangeLog
   trunk/plugins/common/gsd-keygrab.c

Modified: trunk/plugins/common/gsd-keygrab.c
==============================================================================
--- trunk/plugins/common/gsd-keygrab.c	(original)
+++ trunk/plugins/common/gsd-keygrab.c	Sat Jun 28 17:40:01 2008
@@ -35,11 +35,13 @@
 /* we exclude shift, GDK_CONTROL_MASK and GDK_MOD1_MASK since we know what
    these modifiers mean
    these are the mods whose combinations are bound by the keygrabbing code */
-#define GSD_IGNORED_MODS (0x2000 /*Xkb modifier*/ | GDK_LOCK_MASK  | \
-        GDK_MOD2_MASK | GDK_MOD3_MASK | GDK_MOD4_MASK | GDK_MOD5_MASK)
+#define GSD_IGNORED_MODS (0x2000 /*Xkb modifier*/ | GDK_LOCK_MASK | GDK_HYPER_MASK)
+
 /* these are the ones we actually use for global keys, we always only check
  * for these set */
-#define GSD_USED_MODS (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK)
+#define GSD_USED_MODS (GDK_SHIFT_MASK | GDK_CONTROL_MASK |\
+		       GDK_MOD1_MASK | GDK_MOD2_MASK | GDK_MOD3_MASK | GDK_MOD4_MASK |\
+		       GDK_MOD5_MASK | GDK_SUPER_MASK | GDK_META_MASK)
 
 
 static gboolean