X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_util.c;h=1ca6b43b7a26dde6aaa17b96ac1f7fd7bbae1d70;hb=1476dcecfd3e817236ae996314c10482aae8e3e9;hp=c9c7f9228aa1dac78d5ea640cde63384c6a31a9e;hpb=3f8d0bd5322749132626e8f203017b6da6448fd0;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcb_util.c b/src/xcb_util.c index c9c7f92..1ca6b43 100644 --- a/src/xcb_util.c +++ b/src/xcb_util.c @@ -26,11 +26,13 @@ /* Utility functions implementable using only public APIs. */ #include -#include +#include #include -#include #include -#include +#ifdef DNETCONN +#include +#include +#endif #include #include #include @@ -40,6 +42,7 @@ #include "xcb.h" #include "xcbext.h" +#include "xcbint.h" int XCBPopcount(CARD32 mask) { @@ -90,15 +93,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(const 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(const 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 + if (strchr(host, ':')) + { + /* 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); + } + else +#endif + { + /* display specifies TCP */ + unsigned short port = X_TCP_PORT + display; + fd = _xcb_open_tcp(host, port); + } } else { @@ -106,13 +130,47 @@ 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_dn addr; + struct accessdata_dn accessdata; + struct nodeent *nodeaddr = getnodebyname(host); + + if(!nodeaddr) + return -1; + 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); + + 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 + +static int _xcb_open_tcp(const char *host, const unsigned short port) { int fd; struct sockaddr_in addr; @@ -131,7 +189,7 @@ int XCBOpenTCP(const char *host, const unsigned short port) return fd; } -int XCBOpenUnix(const char *file) +static int _xcb_open_unix(const char *file) { int fd; struct sockaddr_un addr = { AF_UNIX }; @@ -154,12 +212,12 @@ XCBConnection *XCBConnect(const char *displayname, int *screenp) if(!XCBParseDisplay(displayname, &host, &display, screenp)) return 0; - fd = XCBOpen(host, display); + fd = _xcb_open(host, display); free(host); if(fd == -1) return 0; - XCBGetAuthInfo(fd, &auth); + _xcb_get_auth_info(fd, &auth); c = XCBConnectToFD(fd, &auth); free(auth.name); free(auth.data); @@ -173,7 +231,7 @@ XCBConnection *XCBConnectToDisplayWithAuthInfo(const char *displayname, XCBAuthI if(!XCBParseDisplay(displayname, &host, &display, screenp)) return 0; - fd = XCBOpen(host, display); + fd = _xcb_open(host, display); free(host); if(fd == -1) return 0; @@ -181,7 +239,17 @@ XCBConnection *XCBConnectToDisplayWithAuthInfo(const char *displayname, XCBAuthI return XCBConnectToFD(fd, auth); } -/* backwards compatible interface: remove before 1.0 release */ +int XCBSync(XCBConnection *c, XCBGenericError **e) +{ + XCBGetInputFocusRep *reply = XCBGetInputFocusReply(c, XCBGetInputFocus(c), e); + free(reply); + return reply != 0; +} + + + + +/* backwards compatible interfaces: remove before 1.0 release */ XCBConnection *XCBConnectBasic() { XCBConnection *c = XCBConnect(0, 0); @@ -191,49 +259,22 @@ XCBConnection *XCBConnectBasic() abort(); } -int XCBSync(XCBConnection *c, XCBGenericError **e) +int XCBOpen(const char *host, const int display) { - XCBGetInputFocusRep *reply = XCBGetInputFocusReply(c, XCBGetInputFocus(c), e); - free(reply); - return reply != 0; + return _xcb_open(host, display); } -/* The functions beyond this point still use only public interfaces, - * but are not themselves part of the public interface. So their - * prototypes are in xcbint.h. */ - -#include "xcbint.h" +int XCBOpenTCP(const char *host, const unsigned short port) +{ + return _xcb_open_tcp(host, port); +} -int _xcb_set_fd_flags(const int fd) +int XCBOpenUnix(const char *file) { - long flags = fcntl(fd, F_GETFL, 0); - if(flags == -1) - return 0; - flags |= O_NONBLOCK; - if(fcntl(fd, F_SETFL, flags) == -1) - return 0; - if(fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) - return 0; - return 1; + return _xcb_open_unix(file); } -int _xcb_read_block(const int fd, void *buf, const size_t len) +int XCBGetAuthInfo(int fd, XCBAuthInfo *info) { - int done = 0; - while(done < len) - { - int ret = read(fd, ((char *) buf) + done, len - done); - if(ret > 0) - done += ret; - if(ret < 0 && errno == EAGAIN) - { - fd_set fds; - FD_ZERO(&fds); - FD_SET(fd, &fds); - ret = select(fd + 1, &fds, 0, 0, 0); - } - if(ret <= 0) - return ret; - } - return len; + return _xcb_get_auth_info(fd, info); }