diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-11-23 17:23:17 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-11-23 17:23:17 -0800 |
| commit | d79621b25ba6784135b1a3aa51e9561fcf72fe7f (patch) | |
| tree | 2bcac9be30b090c69e24ac0a5af120eb166c7523 | |
| parent | 9b79ae49f709707e99b8487b01f9d3f102754bd3 (diff) | |
Apple: Apple launchd cleanup
Added --with-launchd option instead of just using __APPLE__
Fixed opening launchd fd when displayname=NULL
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | src/xcb_util.c | 42 |
2 files changed, 33 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index e16d70d..8390c26 100644 --- a/configure.ac +++ b/configure.ac @@ -139,6 +139,15 @@ XCB_EXTENSION(XTest, "yes") XCB_EXTENSION(Xv, "yes") XCB_EXTENSION(XvMC, "yes") +AC_ARG_WITH(launchd, AS_HELP_STRING([--with-launchd], [Build with support for Apple's launchd (default: auto)]), [LAUNCHD=$withval], [LAUNCHD=auto]) +if test "x$LAUNCHD" = xauto; then + unset LAUNCHD + AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no]) +fi + +if test "x$LAUNCHD" = xyes ; then + AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available]) +fi AC_CONFIG_FILES([ Makefile diff --git a/src/xcb_util.c b/src/xcb_util.c index f5c9431..5bad16a 100644 --- a/src/xcb_util.c +++ b/src/xcb_util.c @@ -315,19 +315,22 @@ xcb_connection_t *xcb_connect(const char *displayname, int *screenp) 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; @@ -348,18 +351,21 @@ xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *displayname, 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; |