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

[Jeremy Huddleston]

 hw/xquartz/X11Application.m |    3 ++-
 hw/xquartz/X11Controller.m  |    6 ------
 hw/xquartz/xpr/xprScreen.c  |    2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit c0eddabdbed6c838f7341559f07ada37e9f5f3a9
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Mon Apr 21 23:39:13 2008 -0700

    XQuartz: Fixed cmd-tab to bring all windows forward.

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 2146375..1175299 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -282,7 +282,8 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
 	_appFlags._active = YES;
 	
 	[self activateX:YES];
-	if ([e data2] & 0x10) X11ApplicationSetFrontProcess();
+	if ([e data2] & 0x10) 
+        QuartzMessageServerThread (kXquartzBringAllToFront, 0);
       }
       break;
       
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 0093a5a..fd7e334 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -756,12 +756,6 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
     return YES;
 }
 
-- (BOOL) applicationShouldHandleReopen:(NSApplication *)app
-                     hasVisibleWindows:(BOOL)hasVis {
-    QuartzMessageServerThread (kXquartzBringAllToFront, 0);
-    return YES;
-}
-
 @end
 
 void X11ControllerMain(int argc, const char **argv, void (*server_thread) (void *), void *server_arg) {
commit b6fd3fc40c2df7572051beca156868a1f992fe95
Author: Ben Byer <bbyer at apple.com>
Date:   Mon Apr 21 17:52:10 2008 -0700

    Fix for pointer-offset issue when using a multi-display environment on X11.app.
    (cherry picked from commit 9a7e14286ced55c5e2a4512e2629e03836443009)

diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
index fc66bed..10bcb04 100644
--- a/hw/xquartz/xpr/xprScreen.c
+++ b/hw/xquartz/xpr/xprScreen.c
@@ -149,7 +149,7 @@ displayScreenBounds(CGDirectDisplayID id)
 
     /* Remove menubar to help standard X11 window managers. */
 
-    if (frame.origin.x == 0 && frame.origin.y == 0)
+    if (frame.origin.y == 0)
     {
         frame.origin.y += aquaMenuBarHeight;
         frame.size.height -= aquaMenuBarHeight;