/* Utility functions implementable using only public APIs. */
#include <assert.h>
-#include <sys/select.h>
+#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <netinet/in.h>
+#ifdef DNETCONN
+#include <netdnet/dnetdb.h>
+#include <netdnet/dn.h>
+#endif
#include <netdb.h>
#include <errno.h>
#include <stdio.h>
#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;
y = (mask >> 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;
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
{
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;
return fd;
}
-int XCBOpenUnix(const char *file)
+static int _xcb_open_unix(const char *file)
{
int fd;
struct sockaddr_un addr = { AF_UNIX };
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);
+ _xcb_get_auth_info(fd, &auth);
+ c = xcb_connect_to_fd(fd, &auth);
free(auth.name);
free(auth.data);
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);
}