frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Darwin: properly implemented xcb check for stale sockets 

(cherry picked from commit f543cb8fbb3d9213cb03396f4252ab9821319993)
This commit is contained in:
Jeremy Huddleston 2007-11-30 16:11:15 -08:00
parent f54b28eeba
commit f83d758dcc
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/darwin/apple/bundle-main.c
View File

@ -70,9 +70,8 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xauth.h> #include <X11/Xauth.h>
#ifdef USE_XCB
#include <xcb/xcb.h> #include <xcb/xcb.h>
#endif
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include <SystemConfiguration/SystemConfiguration.h> #include <SystemConfiguration/SystemConfiguration.h>
@ -597,25 +596,28 @@ static Boolean
display_exists_p (int number) display_exists_p (int number)
{ {
char buf[64]; char buf[64];
#ifdef USE_XCB
xcb_connection_t *conn; 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 /* Since connecting to the display waits for a few seconds if the
display doesn't exist, check for trivial non-existence - 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 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..) */ server may still not, so we need to try to connect in that case..) */
sprintf (buf, "/tmp/.X11-unix/X%d", number); sprintf (buf, "/tmp/.X11-unix/X%d", number);
if (access (buf, F_OK) != 0) return FALSE; if (access (buf, F_OK) != 0)
return FALSE;
#ifdef USE_XCB
sprintf (buf, ":%d", number); sprintf (buf, ":%d", number);
conn = xcb_connect(buf, NULL); if (xcb_connection_has_error(conn)) return FALSE;
if (conn == NULL) return FALSE;
xcb_disconnect(conn); xcb_disconnect(conn);
#endif
return TRUE; return TRUE;
} }