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

[Jeremy Huddleston]

 hw/xquartz/darwinEvents.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit dd787b663893ef3bfe24a193b894c7130ca9f0ea
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Tue Feb 24 23:12:57 2009 -0800

    XQuartz: Re-enable support for capslock
    (cherry picked from commit 4901b8147e593d26d7a31a9b73a201254b948916)

diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index 89d2233..374c4e0 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -155,6 +155,7 @@ int darwin_modifier_mask_list[] = {
 #else
     NX_CONTROLMASK, NX_SHIFTMASK, NX_COMMANDMASK, NX_ALTERNATEMASK,
 #endif
+    NX_ALPHASHIFTMASK,
     0
 };
 
@@ -174,7 +175,7 @@ static void DarwinUpdateModifiers(
     }
     
     for(f=darwin_modifier_mask_list; *f; f++)
-        if(*f & flags) {
+        if(*f & flags && *f != NX_ALPHASHIFTMASK) {
             key = DarwinModifierNXMaskToNXKey(*f);
             if(key == -1)
                 ErrorF("DarwinUpdateModifiers: Unsupported NXMask: 0x%x\n", *f);