xserver: Branch 'xorg-server-1.4-apple'

[Jeremy Huddleston]

 hw/xquartz/darwinEvents.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit b5ec3be6b5449b5d575bc1472fdd1c9cb15cb8be
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Apr 11 13:53:38 2009 -0700

    XQuartz: Re-enable Fn as an option for 3button mouse simulation.
    
    Patch from Martin Otte <otte at duke.edu>

diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index f663457..de34273 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -155,7 +155,7 @@ int darwin_modifier_mask_list[] = {
 #else
     NX_CONTROLMASK, NX_SHIFTMASK, NX_COMMANDMASK, NX_ALTERNATEMASK,
 #endif
-    NX_ALPHASHIFTMASK,
+    NX_ALPHASHIFTMASK, NX_SECONDARYFNMASK
     0
 };
 
@@ -175,7 +175,10 @@ static void DarwinUpdateModifiers(
     }
     
     for(f=darwin_modifier_mask_list; *f; f++)
-        if(*f & flags && *f != NX_ALPHASHIFTMASK) {
+        /* NX_ALPHASHIFTMASK is handled above and NX_SECONDARYFNMASK is not
+         * mapped to a key (it is just useful for 3button mouse simulation
+         */
+        if(*f & flags && *f != NX_ALPHASHIFTMASK && *f != NX_SECONDARYFNMASK) {
             key = DarwinModifierNXMaskToNXKey(*f);
             if(key == -1)
                 ErrorF("DarwinUpdateModifiers: Unsupported NXMask: 0x%x\n", *f);