projects
/
free-sw
/
xcb
/
libxcb
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
43b612a
)
Apple: Enable support for launchd DISPLAY socket
author
Jeremy Huddleston
<jeremyhu@freedesktop.org>
Sat, 8 Nov 2008 22:41:23 +0000
(14:41 -0800)
committer
Jeremy Huddleston
<jeremyhu@freedesktop.org>
Mon, 24 Nov 2008 00:18:25 +0000
(16:18 -0800)
src/xcb_util.c
patch
|
blob
|
history
diff --git
a/src/xcb_util.c
b/src/xcb_util.c
index
7c6a4dd
..
f5c9431
100644
(file)
--- a/
src/xcb_util.c
+++ b/
src/xcb_util.c
@@
-316,10
+316,18
@@
xcb_connection_t *xcb_connect(const char *displayname, int *screenp)
xcb_connection_t *c;
xcb_auth_info_t auth;
xcb_connection_t *c;
xcb_auth_info_t auth;
+#ifdef __APPLE__
+ 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))
return (xcb_connection_t *) &error_connection;
fd = _xcb_open(host, protocol, display);
free(host);
if(!_xcb_parse_display(displayname, &host, &protocol, &display, screenp))
return (xcb_connection_t *) &error_connection;
fd = _xcb_open(host, protocol, display);
free(host);
+#ifdef __APPLE__
+ }
+#endif
if(fd == -1)
return (xcb_connection_t *) &error_connection;
if(fd == -1)
return (xcb_connection_t *) &error_connection;
@@
-340,10
+348,18
@@
xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *displayname,
char *host;
char *protocol;
char *host;
char *protocol;
+#ifdef __APPLE__
+ 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))
return (xcb_connection_t *) &error_connection;
fd = _xcb_open(host, protocol, display);
free(host);
if(!_xcb_parse_display(displayname, &host, &protocol, &display, screenp))
return (xcb_connection_t *) &error_connection;
fd = _xcb_open(host, protocol, display);
free(host);
+#ifdef __APPLE__
+ }
+#endif
if(fd == -1)
return (xcb_connection_t *) &error_connection;
if(fd == -1)
return (xcb_connection_t *) &error_connection;