X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_util.c;h=3eab06a55010ae3ee466492319222122e776ddc4;hb=0d7beff580232d4b7adfc840bcd1cae894b57682;hp=1ca6b43b7a26dde6aaa17b96ac1f7fd7bbae1d70;hpb=bb8cf58015bae083dd77f8679f9a8299603c58a6;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_util.c b/src/xcb_util.c
index 1ca6b43..3eab06a 100644
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -29,6 +29,7 @@
 #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>
@@ -44,7 +45,9 @@
 #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;
@@ -52,7 +55,7 @@ int XCBPopcount(CARD32 mask)
     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;
@@ -203,78 +206,38 @@ static int _xcb_open_unix(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;
+    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;
 
     _xcb_get_auth_info(fd, &auth);
-    c = XCBConnectToFD(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;
+    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);
-}
-
-int XCBSync(XCBConnection *c, XCBGenericError **e)
-{
-    XCBGetInputFocusRep *reply = XCBGetInputFocusReply(c, XCBGetInputFocus(c), e);
-    free(reply);
-    return reply != 0;
-}
-
-
-
+        return (xcb_connection_t *) &error_connection;
 
-/* backwards compatible interfaces: remove before 1.0 release */
-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);
+    return xcb_connect_to_fd(fd, auth);
 }