sawfish r4474 - in trunk: . man src

[chrisb svn gnome org]

Author: chrisb
Date: Tue Apr 14 20:49:39 2009
New Revision: 4474
URL: http://svn.gnome.org/viewvc/sawfish?rev=4474&view=rev

Log:
2009-04-14  Christopher Bratusek <zanghar freenet de>
        * src/keys.c : - added AltGR as synonyme for Mod5
                       - make sure we don't mix Super and Hyper [Denis Barbier]

Modified:
   trunk/ChangeLog
   trunk/man/news.texi
   trunk/src/keys.c

Modified: trunk/man/news.texi
==============================================================================
--- trunk/man/news.texi	(original)
+++ trunk/man/news.texi	Tue Apr 14 20:49:39 2009
@@ -60,6 +60,8 @@
 @item Don't ignore datarootdir setting [Christopher Bratusek]
 
 @item Make Sawfish more error-tolerant if an app has an icomplete WM_CLASS [Martin Mares]
+
+ item Make sure we don't mix Super and Hyper [Denis Barbier]
 @end itemize
 
 @item New features:
@@ -80,6 +82,8 @@
 @item Make Viewport commands appear in Sawfish-UI [Christopher Bratusek]
 
 @item Make Window History appear in Sawfish-UI [Christopher Bratusek]
+
+ item Added AltGR as synonym for Mod5 [Christopher Bratusek]
 @end itemize
 
 @item Other changes:

Modified: trunk/src/keys.c
==============================================================================
--- trunk/src/keys.c	(original)
+++ trunk/src/keys.c	Tue Apr 14 20:49:39 2009
@@ -79,7 +79,7 @@
 
 DEFSYM(multi_click_delay, "multi-click-delay");
 
-/* The X modifiers being used for Meta, Alt, and Hyper */
+/* The X modifiers being used for Meta, Alt, Hyper, Super */
 static unsigned long meta_mod, alt_mod, hyper_mod, super_mod;
 
 /* The user-customizable modifier; used for default key bindings. This
@@ -664,6 +664,7 @@
     { "Mod2",     Mod2Mask },
     { "Mod3",     Mod3Mask },
     { "Mod4",     Mod4Mask },
+    { "AltGR",    Mod5Mask },
     { "Mod5",     Mod5Mask },
     { "Button1",  Button1Mask },
     { "Button2",  Button2Mask },
@@ -1522,6 +1523,9 @@
 		{
 		    int sym = syms[((code - min_code) * syms_per_code)
 				  + code_col];
+		    /* Is this a fake key? */
+		    if (code_col == 0 && sym == NoSymbol)
+			break;
 		    switch(sym)
 		    {
 		    case XK_Meta_L: case XK_Meta_R: