X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_util.c;h=eeee1dd3023c78b5857787c429b0dcc0e532b7cd;hb=2ec1383a68bf9f4baf7125a7d6544167f38d8d62;hp=352489910e165ddc1e060c95fa18c7d956ab843f;hpb=d69c403cba9bdebd1bd41b62ae7e28f5852248d4;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcb_util.c b/src/xcb_util.c index 3524899..eeee1dd 100644 --- a/src/xcb_util.c +++ b/src/xcb_util.c @@ -27,10 +27,13 @@ #include #include -#include #include #include #include +#ifdef DNETCONN +#include +#include +#endif #include #include #include @@ -40,16 +43,19 @@ #include "xcb.h" #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) +int xcb_parse_display(const char *name, char **host, int *displayp, int *screenp) { int len, display, screen; char *colon, *dot, *end; @@ -90,15 +96,36 @@ int XCBParseDisplay(const char *name, char **host, int *displayp, int *screenp) return 1; } -int XCBOpen(const char *host, const int display) +static int _xcb_open_tcp(char *host, const unsigned short port); +static int _xcb_open_unix(const char *file); +#ifdef DNETCONN +static int _xcb_open_decnet(const char *host, const unsigned short port); +#endif + +static int _xcb_open(char *host, const int display) { int fd; if(*host) { - /* display specifies TCP */ - unsigned short port = X_TCP_PORT + display; - fd = XCBOpenTCP(host, port); +#ifdef DNETCONN + /* 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') + { + *colon = '\0'; + fd = _xcb_open_decnet(host, display); + } + else +#endif + { + /* display specifies TCP */ + unsigned short port = X_TCP_PORT + display; + fd = _xcb_open_tcp(host, port); + } } else { @@ -106,32 +133,87 @@ int XCBOpen(const char *host, const int display) static const char base[] = "/tmp/.X11-unix/X"; char file[sizeof(base) + 20]; snprintf(file, sizeof(file), "%s%d", base, display); - fd = XCBOpenUnix(file); + fd = _xcb_open_unix(file); } return fd; } -int XCBOpenTCP(const char *host, const unsigned short port) +#ifdef DNETCONN +static int _xcb_open_decnet(const char *host, const unsigned short port) { int fd; - struct sockaddr_in addr; - struct hostent *hostaddr = gethostbyname(host); - if(!hostaddr) + struct sockaddr_dn addr; + struct accessdata_dn accessdata; + struct nodeent *nodeaddr = getnodebyname(host); + + if(!nodeaddr) 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)); + addr.sdn_family = AF_DECnet; + + addr.sdn_add.a_len = nodeaddr->n_length; + memcpy(addr.sdn_add.a_addr, nodeaddr->n_addr, addr.sdn_add.a_len); - fd = socket(PF_INET, SOCK_STREAM, 0); + sprintf((char *)addr.sdn_objname, "X$X%d", port); + addr.sdn_objnamel = strlen((char *)addr.sdn_objname); + addr.sdn_objnum = 0; + + fd = socket(PF_DECnet, SOCK_STREAM, 0); if(fd == -1) return -1; + + memset(&accessdata, 0, sizeof(accessdata)); + sprintf((char*)accessdata.acc_acc, "%d", getuid()); + 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) return -1; return fd; } +#endif -int XCBOpenUnix(const char *file) +static int _xcb_open_tcp(char *host, const unsigned short port) +{ + int fd = -1; + struct addrinfo hints = { 0 +#ifdef AI_ADDRCONFIG + | AI_ADDRCONFIG +#endif +#ifdef AI_NUMERICSERV + | AI_NUMERICSERV +#endif + , AF_UNSPEC, SOCK_STREAM }; + char service[6]; /* "65535" with the trailing '\0' */ + struct addrinfo *results, *addr; + char *bracket; + + /* 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; + } + + 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 && connect(fd, addr->ai_addr, addr->ai_addrlen) >= 0) + break; + fd = -1; + } + freeaddrinfo(results); + return fd; +} + +static int _xcb_open_unix(const char *file) { int fd; struct sockaddr_un addr = { AF_UNIX }; @@ -145,55 +227,42 @@ int XCBOpenUnix(const char *file) return fd; } -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; + xcb_connection_t *c; + xcb_auth_info_t auth; - if(!XCBParseDisplay(displayname, &host, &display, screenp)) - return 0; - fd = XCBOpen(host, display); + if(!xcb_parse_display(displayname, &host, &display, screenp)) + return (xcb_connection_t *) &error_connection; + fd = _xcb_open(host, display); free(host); if(fd == -1) - return 0; + return (xcb_connection_t *) &error_connection; - XCBGetAuthInfo(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 = XCBOpen(host, display); + if(!xcb_parse_display(displayname, &host, &display, screenp)) + return (xcb_connection_t *) &error_connection; + fd = _xcb_open(host, display); free(host); if(fd == -1) - return 0; - - return XCBConnectToFD(fd, auth); -} + return (xcb_connection_t *) &error_connection; -/* backwards compatible interface: remove before 1.0 release */ -XCBConnection *XCBConnectBasic() -{ - XCBConnection *c = XCBConnect(0, 0); - if(c) - return c; - perror("XCBConnect"); - abort(); -} - -int XCBSync(XCBConnection *c, XCBGenericError **e) -{ - XCBGetInputFocusRep *reply = XCBGetInputFocusReply(c, XCBGetInputFocus(c), e); - free(reply); - return reply != 0; + return xcb_connect_to_fd(fd, auth); }