X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_util.c;h=5bad16ae93239df923897d3f70cf0f33927e66f7;hb=d79621b25ba6784135b1a3aa51e9561fcf72fe7f;hp=f5c7cecc3ddd6c2eacb7602babcd9616544e236c;hpb=829188cdd6274b5b5271dff5612b30c978a61a38;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcb_util.c b/src/xcb_util.c index f5c7cec..5bad16a 100644 --- a/src/xcb_util.c +++ b/src/xcb_util.c @@ -29,6 +29,7 @@ #include #include #include +#include #ifdef DNETCONN #include #include @@ -37,6 +38,7 @@ #include #include #include +#include #include #include @@ -44,22 +46,40 @@ #include "xcbext.h" #include "xcbint.h" -int XCBPopcount(CARD32 mask) +static const int error_connection = 1; + +int xcb_popcount(uint32_t mask) { - unsigned long y; + uint32_t y; y = (mask >> 1) & 033333333333; y = mask - y - ((y >> 1) & 033333333333); return ((y + (y >> 3)) & 030707070707) % 077; } -int XCBParseDisplay(const char *name, char **host, int *displayp, int *screenp) +static int _xcb_parse_display(const char *name, char **host, char **protocol, + int *displayp, int *screenp) { int len, display, screen; - char *colon, *dot, *end; + char *slash, *colon, *dot, *end; if(!name || !*name) name = getenv("DISPLAY"); if(!name) return 0; + slash = strrchr(name, '/'); + if (slash) { + len = slash - name; + if (protocol) { + *protocol = malloc(len + 1); + if(!*protocol) + return 0; + memcpy(*protocol, name, len); + (*protocol)[len] = '\0'; + } + name = slash + 1; + } else + if (protocol) + *protocol = NULL; + colon = strrchr(name, ':'); if(!colon) return 0; @@ -93,51 +113,64 @@ int XCBParseDisplay(const char *name, char **host, int *displayp, int *screenp) return 1; } -static int _xcb_open_tcp(const char *host, const unsigned short port); -static int _xcb_open_unix(const char *file); +int xcb_parse_display(const char *name, char **host, int *displayp, + int *screenp) +{ + return _xcb_parse_display(name, host, NULL, displayp, screenp); +} + +static int _xcb_open_tcp(char *host, char *protocol, const unsigned short port); +static int _xcb_open_unix(char *protocol, const char *file); #ifdef DNETCONN -static int _xcb_open_decnet(const char *host, const unsigned short port); +static int _xcb_open_decnet(const char *host, char *protocol, const unsigned short port); +#endif +#ifdef HAVE_ABSTRACT_SOCKETS +static int _xcb_open_abstract(char *protocol, const char *file); #endif -static int _xcb_open(const char *host, const int display) +static int _xcb_open(char *host, char *protocol, const int display) { int fd; + static const char base[] = "/tmp/.X11-unix/X"; + char file[sizeof(base) + 20]; if(*host) { #ifdef DNETCONN - if (strchr(host, ':')) + /* DECnet displays have two colons, so _xcb_parse_display will have + left one at the end. However, an IPv6 address can end with *two* + colons, so only treat this as a DECnet display if host ends with + exactly one colon. */ + char *colon = strchr(host, ':'); + if(colon && *(colon+1) == '\0') { - /* DECnet displays have two colons, so the parser will have left - one at the end */ - char *dnethost = strdup(host); - - dnethost[strlen(dnethost)-1] = '\0'; - fd = _xcb_open_decnet(dnethost, display); - free(dnethost); + *colon = '\0'; + return _xcb_open_decnet(host, protocol, display); } else #endif - { - /* display specifies TCP */ - unsigned short port = X_TCP_PORT + display; - fd = _xcb_open_tcp(host, port); - } - } - else - { - /* display specifies Unix socket */ - static const char base[] = "/tmp/.X11-unix/X"; - char file[sizeof(base) + 20]; - snprintf(file, sizeof(file), "%s%d", base, display); - fd = _xcb_open_unix(file); + if (protocol + || strcmp("unix",host)) { /* follow the old unix: rule */ + + /* display specifies TCP */ + unsigned short port = X_TCP_PORT + display; + return _xcb_open_tcp(host, protocol, port); + } } - return fd; + /* display specifies Unix socket */ + snprintf(file, sizeof(file), "%s%d", base, display); +#ifdef HAVE_ABSTRACT_SOCKETS + fd = _xcb_open_abstract(protocol, file); + if (fd >= 0 || (errno != ENOENT && errno != ECONNREFUSED)) + return fd; + +#endif + return _xcb_open_unix(protocol, file); } #ifdef DNETCONN -static int _xcb_open_decnet(const char *host, const unsigned short port) +static int _xcb_open_decnet(const char *host, const char *protocol, const unsigned short port) { int fd; struct sockaddr_dn addr; @@ -146,6 +179,8 @@ static int _xcb_open_decnet(const char *host, const unsigned short port) if(!nodeaddr) return -1; + if (protocol && strcmp("dnet",protocol)) + return -1; addr.sdn_family = AF_DECnet; addr.sdn_add.a_len = nodeaddr->n_length; @@ -164,254 +199,175 @@ static int _xcb_open_decnet(const char *host, const unsigned short port) accessdata.acc_accl = strlen((char *)accessdata.acc_acc); setsockopt(fd, DNPROTO_NSP, SO_CONACCESS, &accessdata, sizeof(accessdata)); - if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1) + if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1) { + close(fd); return -1; + } return fd; } #endif -static int _xcb_open_tcp(const char *host, const unsigned short port) +static int _xcb_open_tcp(char *host, char *protocol, const unsigned short port) +{ + int fd = -1; + struct addrinfo hints; + char service[6]; /* "65535" with the trailing '\0' */ + struct addrinfo *results, *addr; + char *bracket; + + if (protocol && strcmp("tcp",protocol)) + return -1; + + memset(&hints, 0, sizeof(hints)); +#ifdef AI_ADDRCONFIG + hints.ai_flags |= AI_ADDRCONFIG; +#endif +#ifdef AI_NUMERICSERV + hints.ai_flags |= AI_NUMERICSERV; +#endif + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + +#ifdef AF_INET6 + /* Allow IPv6 addresses enclosed in brackets. */ + if(host[0] == '[' && (bracket = strrchr(host, ']')) && bracket[1] == '\0') + { + *bracket = '\0'; + ++host; + hints.ai_flags |= AI_NUMERICHOST; + hints.ai_family = AF_INET6; + } +#endif + + snprintf(service, sizeof(service), "%hu", port); + if(getaddrinfo(host, service, &hints, &results)) + /* FIXME: use gai_strerror, and fill in error connection */ + return -1; + + for(addr = results; addr; addr = addr->ai_next) + { + fd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol); + if(fd >= 0) { + if (connect(fd, addr->ai_addr, addr->ai_addrlen) >= 0) + break; + close(fd); + fd = -1; + } + } + freeaddrinfo(results); + return fd; +} + +static int _xcb_open_unix(char *protocol, const char *file) { int fd; - struct sockaddr_in addr; - struct hostent *hostaddr = gethostbyname(host); - if(!hostaddr) + struct sockaddr_un addr; + + if (protocol && strcmp("unix",protocol)) return -1; - addr.sin_family = AF_INET; - addr.sin_port = htons(port); - memcpy(&addr.sin_addr, hostaddr->h_addr_list[0], sizeof(addr.sin_addr)); - fd = socket(PF_INET, SOCK_STREAM, 0); + strcpy(addr.sun_path, file); + addr.sun_family = AF_UNIX; +#ifdef HAVE_SOCKADDR_SUN_LEN + addr.sun_len = SUN_LEN(&addr); +#endif + fd = socket(AF_UNIX, SOCK_STREAM, 0); if(fd == -1) return -1; - if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1) + if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1) { + close(fd); return -1; + } return fd; } -static int _xcb_open_unix(const char *file) +#ifdef HAVE_ABSTRACT_SOCKETS +static int _xcb_open_abstract(char *protocol, const char *file) { int fd; - struct sockaddr_un addr = { AF_UNIX }; - strcpy(addr.sun_path, file); + struct sockaddr_un addr = {0}; + socklen_t namelen; + + if (protocol && strcmp("unix",protocol)) + return -1; + strcpy(addr.sun_path + 1, file); + addr.sun_family = AF_UNIX; + namelen = offsetof(struct sockaddr_un, sun_path) + 1 + strlen(file); +#ifdef HAVE_SOCKADDR_SUN_LEN + addr.sun_len = 1 + strlen(file); +#endif fd = socket(AF_UNIX, SOCK_STREAM, 0); - if(fd == -1) + if (fd == -1) return -1; - if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1) + if (connect(fd, (struct sockaddr *) &addr, namelen) == -1) { + close(fd); return -1; + } return fd; } +#endif -XCBConnection *XCBConnect(const char *displayname, int *screenp) +xcb_connection_t *xcb_connect(const char *displayname, int *screenp) { int fd, display = 0; char *host; - XCBConnection *c; - XCBAuthInfo auth; - - if(!XCBParseDisplay(displayname, &host, &display, screenp)) - return 0; - fd = _xcb_open(host, display); + char *protocol; + xcb_connection_t *c; + xcb_auth_info_t auth; + + 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(NULL, displayname); + else +#endif + if(!parsed) + return (xcb_connection_t *) &error_connection; + else + fd = _xcb_open(host, protocol, display); free(host); + if(fd == -1) - return 0; + return (xcb_connection_t *) &error_connection; - _xcb_get_auth_info(fd, &auth); - c = XCBConnectToFD(fd, &auth); - free(auth.name); - free(auth.data); + if(_xcb_get_auth_info(fd, &auth, display)) + { + c = xcb_connect_to_fd(fd, &auth); + free(auth.name); + free(auth.data); + } + else + c = xcb_connect_to_fd(fd, 0); return c; } -XCBConnection *XCBConnectToDisplayWithAuthInfo(const char *displayname, XCBAuthInfo *auth, int *screenp) +xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *displayname, xcb_auth_info_t *auth, int *screenp) { int fd, display = 0; char *host; - - if(!XCBParseDisplay(displayname, &host, &display, screenp)) - return 0; - fd = _xcb_open(host, display); + char *protocol; + + 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(NULL, displayname); + else +#endif + if(!parsed) + return (xcb_connection_t *) &error_connection; + else + fd = _xcb_open(host, protocol, display); free(host); - if(fd == -1) - return 0; - - return XCBConnectToFD(fd, auth); -} - -/* backwards compatible interfaces: remove before 1.0 release */ -int XCBSync(XCBConnection *c, XCBGenericError **e) -{ - XCBGetInputFocusRep *reply = XCBGetInputFocusReply(c, XCBGetInputFocus(c), e); - free(reply); - return reply != 0; -} - -XCBConnection *XCBConnectBasic() -{ - XCBConnection *c = XCBConnect(0, 0); - if(c) - return c; - perror("XCBConnect"); - abort(); -} -int XCBOpen(const char *host, const int display) -{ - return _xcb_open(host, display); -} - -int XCBOpenTCP(const char *host, const unsigned short port) -{ - return _xcb_open_tcp(host, port); -} - -int XCBOpenUnix(const char *file) -{ - return _xcb_open_unix(file); -} - -int XCBGetAuthInfo(int fd, XCBAuthInfo *info) -{ - return _xcb_get_auth_info(fd, info); -} - -char *XCBConnSetupReqAuthorizationProtocolName(XCBSetupReq *R) -{ - return XCBSetupReqAuthorizationProtocolName(R); -} - -int XCBConnSetupReqAuthorizationProtocolNameLength(XCBSetupReq *R) -{ - return XCBSetupReqAuthorizationProtocolNameLength(R); -} - -XCBGenericIter XCBConnSetupReqAuthorizationProtocolNameEnd(XCBSetupReq *R) -{ - return XCBSetupReqAuthorizationProtocolNameEnd(R); -} - -char *XCBConnSetupReqAuthorizationProtocolData(XCBSetupReq *R) -{ - return XCBSetupReqAuthorizationProtocolData(R); -} - -int XCBConnSetupReqAuthorizationProtocolDataLength(XCBSetupReq *R) -{ - return XCBSetupReqAuthorizationProtocolDataLength(R); -} - -XCBGenericIter XCBConnSetupReqAuthorizationProtocolDataEnd(XCBSetupReq *R) -{ - return XCBSetupReqAuthorizationProtocolDataEnd(R); -} - -void XCBConnSetupReqNext(XCBSetupReqIter *i) -{ - XCBSetupReqNext(i); -} - -XCBGenericIter XCBConnSetupReqEnd(XCBSetupReqIter i) -{ - return XCBSetupReqEnd(i); -} - -char *XCBConnSetupFailedRepReason(XCBSetupFailed *R) -{ - return XCBSetupFailedReason(R); -} - -int XCBConnSetupFailedRepReasonLength(XCBSetupFailed *R) -{ - return XCBSetupFailedReasonLength(R); -} - -XCBGenericIter XCBConnSetupFailedRepReasonEnd(XCBSetupFailed *R) -{ - return XCBSetupFailedReasonEnd(R); -} - -void XCBConnSetupFailedRepNext(XCBSetupFailedIter *i) -{ - XCBSetupFailedNext(i); -} - -XCBGenericIter XCBConnSetupFailedRepEnd(XCBSetupFailedIter i) -{ - return XCBSetupFailedEnd(i); -} - -char *XCBConnSetupAuthenticateRepReason(XCBSetupAuthenticate *R) -{ - return XCBSetupAuthenticateReason(R); -} - -int XCBConnSetupAuthenticateRepReasonLength(XCBSetupAuthenticate *R) -{ - return XCBSetupAuthenticateReasonLength(R); -} - -XCBGenericIter XCBConnSetupAuthenticateRepReasonEnd(XCBSetupAuthenticate *R) -{ - return XCBSetupAuthenticateReasonEnd(R); -} - -void XCBConnSetupAuthenticateRepNext(XCBSetupAuthenticateIter *i) -{ - XCBSetupAuthenticateNext(i); -} - -XCBGenericIter XCBConnSetupAuthenticateRepEnd(XCBSetupAuthenticateIter i) -{ - return XCBSetupAuthenticateEnd(i); -} - -char *XCBConnSetupSuccessRepVendor(XCBSetup *R) -{ - return XCBSetupVendor(R); -} - -int XCBConnSetupSuccessRepVendorLength(XCBSetup *R) -{ - return XCBSetupVendorLength(R); -} - -XCBGenericIter XCBConnSetupSuccessRepVendorEnd(XCBSetup *R) -{ - return XCBSetupVendorEnd(R); -} - -XCBFORMAT *XCBConnSetupSuccessRepPixmapFormats(XCBSetup *R) -{ - return XCBSetupPixmapFormats(R); -} - -int XCBConnSetupSuccessRepPixmapFormatsLength(XCBSetup *R) -{ - return XCBSetupPixmapFormatsLength(R); -} - -XCBFORMATIter XCBConnSetupSuccessRepPixmapFormatsIter(XCBSetup *R) -{ - return XCBSetupPixmapFormatsIter(R); -} - -int XCBConnSetupSuccessRepRootsLength(XCBSetup *R) -{ - return XCBSetupRootsLength(R); -} - -XCBSCREENIter XCBConnSetupSuccessRepRootsIter(XCBSetup *R) -{ - return XCBSetupRootsIter(R); -} - -void XCBConnSetupSuccessRepNext(XCBSetupIter *i) -{ - XCBSetupNext(i); -} + if(fd == -1) + return (xcb_connection_t *) &error_connection; -XCBGenericIter XCBConnSetupSuccessRepEnd(XCBSetupIter i) -{ - return XCBSetupEnd(i); + return xcb_connect_to_fd(fd, auth); }