[29366] trunk/dports/xfce/xfwm4

[source_changes at macosforge.org]

Revision: 29366
          http://trac.macosforge.org/projects/macports/changeset/29366
Author:   afb at macports.org
Date:     2007-09-22 04:56:26 -0700 (Sat, 22 Sep 2007)

Log Message:
-----------
if keymap doesn't have any alt keys mapped at all, use the default mapping for option modifier instead of no modifier

Modified Paths:
--------------
    trunk/dports/xfce/xfwm4/Portfile

Added Paths:
-----------
    trunk/dports/xfce/xfwm4/files/patch-keyboard.c

Modified: trunk/dports/xfce/xfwm4/Portfile
===================================================================
--- trunk/dports/xfce/xfwm4/Portfile	2007-09-22 11:12:16 UTC (rev 29365)
+++ trunk/dports/xfce/xfwm4/Portfile	2007-09-22 11:56:26 UTC (rev 29366)
@@ -4,7 +4,7 @@
 
 name		xfwm4
 version		4.2.4
-revision	1
+revision	2
 categories	xfce
 platforms	darwin
 maintainers	nomaintainer at macports.org
@@ -20,4 +20,4 @@
 ###		--enable-startup-notification  --enable-compositor
 depends_lib	port:xfce-mcs-manager port:gtk2
 
-patchfiles	patch-events.c
+patchfiles	patch-events.c patch-keyboard.c

Added: trunk/dports/xfce/xfwm4/files/patch-keyboard.c
===================================================================
--- trunk/dports/xfce/xfwm4/files/patch-keyboard.c	                        (rev 0)
+++ trunk/dports/xfce/xfwm4/files/patch-keyboard.c	2007-09-22 11:56:26 UTC (rev 29366)
@@ -0,0 +1,28 @@
+--- src/keyboard.c.orig	2007-09-22 13:32:29.000000000 +0200
++++ src/keyboard.c	2007-09-22 13:51:01.000000000 +0200
+@@ -255,6 +255,7 @@
+     int max_keycode;
+ 
+     AltMask = 0;
++    int ModeMask = 0;
+     MetaMask = 0;
+     NumLockMask = 0;
+     ScrollLockMask = 0;
+@@ -303,9 +304,17 @@
+                 {
+                     AltMask |= (1 << ( i / modmap->max_keypermod));
+                 }
++                else if (syms[j] == XK_Mode_switch)
++                {
++                    ModeMask |= (1 << ( i / modmap->max_keypermod));
++                }
+             }
+         }
+     }
++     
++    if (AltMask == 0) /* if we don't have any alt keys, use the option keys */
++        AltMask = ModeMask;
++    
+     KeyMask =
+         ControlMask | ShiftMask | AltMask | MetaMask | SuperMask | HyperMask;
+ 


Property changes on: trunk/dports/xfce/xfwm4/files/patch-keyboard.c
___________________________________________________________________
Name: svn:eol-style
   + native

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070922/7c1eaa0b/attachment.html