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

[Jeremy Huddleston]

 hw/xquartz/X11Controller.m |   24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

New commits:
commit 55d9973b053f25bb95b26e00351dc5531caf5b04
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Apr 11 17:49:51 2008 -0700

    Xquartz: Added applicationShouldHandleReopen:hasVisibleWindows to handle dock icon clicking

diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 5bf4f4d..2fd9886 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -743,15 +743,21 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
 
 - (BOOL) application:(NSApplication *)app openFile:(NSString *)filename
 {
-  const char *name = [filename UTF8String];
-	
-  if (finished_launching)
-    [self launch_client:filename];
-  else if (name[0] != ':')		/* ignore display names */
-    pending_apps = x_list_prepend (pending_apps, [filename retain]);
-	
-  /* FIXME: report failures. */
-  return YES;
+    const char *name = [filename UTF8String];
+    
+    if (finished_launching)
+        [self launch_client:filename];
+    else if (name[0] != ':')		/* ignore display names */
+        pending_apps = x_list_prepend (pending_apps, [filename retain]);
+    
+    /* FIXME: report failures. */
+    return YES;
+}
+
+- (BOOL) applicationShouldHandleReopen:(NSApplication *)app
+                     hasVisibleWindows:(BOOL)hasVis {
+    DarwinSendDDXEvent(kXquartzBringAllToFront, 0);
+    return YES;
 }
 
 @end