static int _xcb_open(char *host, char *protocol, const int display)
{
+#ifdef HAVE_ABSTRACT_SOCKETS
int fd;
+#endif
static const char base[] = "/tmp/.X11-unix/X";
char file[sizeof(base) + 20];
char *protocol;
xcb_connection_t *c;
xcb_auth_info_t auth;
+
+ int parsed = _xcb_parse_display(displayname, &host, &protocol, &display, screenp);
-#ifdef __APPLE__
+#ifdef HAVE_LAUNCHD
+ if(!displayname)
+ displayname = getenv("DISPLAY");
if(displayname && strlen(displayname)>11 && !strncmp(displayname, "/tmp/launch", 11))
- fd = _xcb_open_unix(protocol, displayname);
- else {
-#endif
- if(!_xcb_parse_display(displayname, &host, &protocol, &display, screenp))
+ fd = _xcb_open_unix(NULL, displayname);
+ else
+#endif
+ if(!parsed)
return (xcb_connection_t *) &error_connection;
- fd = _xcb_open(host, protocol, display);
+ else
+ fd = _xcb_open(host, protocol, display);
free(host);
-#ifdef __APPLE__
- }
-#endif
+
if(fd == -1)
return (xcb_connection_t *) &error_connection;
char *host;
char *protocol;
-#ifdef __APPLE__
+ int parsed = _xcb_parse_display(displayname, &host, &protocol, &display, screenp);
+
+#ifdef HAVE_LAUNCHD
+ if(!displayname)
+ displayname = getenv("DISPLAY");
if(displayname && strlen(displayname)>11 && !strncmp(displayname, "/tmp/launch", 11))
- fd = _xcb_open_unix(protocol, displayname);
- else {
-#endif
- if(!_xcb_parse_display(displayname, &host, &protocol, &display, screenp))
+ fd = _xcb_open_unix(NULL, displayname);
+ else
+#endif
+ if(!parsed)
return (xcb_connection_t *) &error_connection;
- fd = _xcb_open(host, protocol, display);
+ else
+ fd = _xcb_open(host, protocol, display);
free(host);
-#ifdef __APPLE__
- }
-#endif
+
if(fd == -1)
return (xcb_connection_t *) &error_connection;