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

[Jeremy Huddleston]

 hw/xquartz/X11Application.m     |   10 +++++++++-
 miext/rootless/rootlessScreen.c |    3 +--
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 78e874fe17174ac8f61586573edaf7f16ece7b21
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Thu Oct 23 11:39:04 2008 -0700

    Rootless: Properly typed expose_1

diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c
index be881cf..c21c7b2 100644
--- a/miext/rootless/rootlessScreen.c
+++ b/miext/rootless/rootlessScreen.c
@@ -471,8 +471,7 @@ RootlessMarkOverlappedWindows(WindowPtr pWin, WindowPtr pFirst,
     return result;
 }
 
-expose_1 (WindowPtr pWin)
-{
+void expose_1 (WindowPtr pWin) {
     WindowPtr pChild;
     
     if (!pWin->realized)
commit bf561a06b2bf60395d26026ac7627d0cb254bc07
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Thu Oct 23 11:37:13 2008 -0700

    XQuartz: Honor the Spaces preference for "When switching to an application, switch to a space with open windows for the application"

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 4851b31..57dfcc9 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -293,7 +293,15 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
                         _appFlags._active = YES;
                         
                         [self activateX:YES];
-                        if ([e data2] & 0x10) 
+                        
+                        /* Get the Spaces preference for SwitchOnActivate */
+                        (void)CFPreferencesAppSynchronize(CFSTR(".GlobalPreferences"));
+                        BOOL switch_on_activate, ok;
+                        switch_on_activate = CFPreferencesGetAppBooleanValue(CFSTR("AppleSpacesSwitchOnActivate"), CFSTR(".GlobalPreferences"), &ok);
+                        if(!ok)
+                            switch_on_activate = YES;
+                        
+                        if ([e data2] & 0x10 && switch_on_activate)
                             DarwinSendDDXEvent(kXquartzBringAllToFront, 0);
                     }
                     break;