xserver: Branch 'master' - 2 commits

[Jeremy Huddleston]

 hw/darwin/apple/bundle-main.c     |   26 ++++++++++++++------------
 hw/darwin/quartz/X11Application.m |    3 ---
 2 files changed, 14 insertions(+), 15 deletions(-)

New commits:
commit f83d758dcc4878849a851c8466f6fa16b2b7cd8e
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Fri Nov 30 16:11:15 2007 -0800

    Darwin: properly implemented xcb check for stale sockets
    (cherry picked from commit f543cb8fbb3d9213cb03396f4252ab9821319993)

diff --git a/hw/darwin/apple/bundle-main.c b/hw/darwin/apple/bundle-main.c
index 452da76..d46e7b2 100644
--- a/hw/darwin/apple/bundle-main.c
+++ b/hw/darwin/apple/bundle-main.c
@@ -70,9 +70,8 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xauth.h>
-#ifdef USE_XCB
 #include <xcb/xcb.h>
-#endif
+
 #include <CoreFoundation/CoreFoundation.h>
 #include <SystemConfiguration/SystemConfiguration.h>
 
@@ -597,25 +596,28 @@ static Boolean
 display_exists_p (int number)
 {
     char buf[64];
-#ifdef USE_XCB
     xcb_connection_t *conn;
-#endif
-
+    char *fullname = NULL;
+    int idisplay, iscreen;
+    char *conn_auth_name, *conn_auth_data;
+    int conn_auth_namelen, conn_auth_datalen;
+    
+    //    extern void *_X11TransConnectDisplay ();
+    //    extern void _XDisconnectDisplay ();
+	
     /* Since connecting to the display waits for a few seconds if the
 	 display doesn't exist, check for trivial non-existence - if the
 	 socket in /tmp exists or not.. (note: if the socket exists, the
 	 server may still not, so we need to try to connect in that case..) */
 	
     sprintf (buf, "/tmp/.X11-unix/X%d", number);
-    if (access (buf, F_OK) != 0) return FALSE;
-
-#ifdef USE_XCB
+    if (access (buf, F_OK) != 0)
+		return FALSE;
+	
     sprintf (buf, ":%d", number);
-    conn = xcb_connect(buf, NULL);
-    if (conn == NULL) return FALSE;
+    if (xcb_connection_has_error(conn)) return FALSE;
+	
     xcb_disconnect(conn);
-#endif
-
     return TRUE;
 }
 
commit f54b28eeba119c42d0fcccfbe295306dd670221a
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Fri Nov 30 16:09:23 2007 -0800

    Darwin: Undo focus-hack which didn't work right.

diff --git a/hw/darwin/quartz/X11Application.m b/hw/darwin/quartz/X11Application.m
index 514bc49..aef0699 100644
--- a/hw/darwin/quartz/X11Application.m
+++ b/hw/darwin/quartz/X11Application.m
@@ -313,9 +313,6 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
 }
 
 - (void) set_front_process:unused {
-    [NSApp activateIgnoringOtherApps:YES];
-	
-    if ([self modalWindow] == nil) [self activateX:YES];
     QuartzMessageServerThread(kXDarwinBringAllToFront, 0);
 }