X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_util.c;h=343e21ff6f79ec57026600de36758b735d9e5850;hb=53971ea183d9d1dcfbaec18b135e49c9c118fabb;hp=b25a2d84b83a188f0f1ffb77b93b6cc4cfc3cdbd;hpb=47ceed78612d48dcda62cc2686fc527d61abe38b;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_util.c b/src/xcb_util.c
index b25a2d8..343e21f 100644
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -26,9 +26,8 @@
 /* Utility functions implementable using only public APIs. */
 
 #include <assert.h>
-#include <sys/select.h>
+#include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/fcntl.h>
 #include <sys/un.h>
 #include <netinet/in.h>
 #include <netdb.h>
@@ -40,6 +39,7 @@
 
 #include "xcb.h"
 #include "xcbext.h"
+#include "xcbint.h"
 
 int XCBPopcount(CARD32 mask)
 {
@@ -90,7 +90,10 @@ 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);
+
+static int _xcb_open(const char *host, const int display)
 {
     int fd;
 
@@ -98,7 +101,7 @@ int XCBOpen(const char *host, const int display)
     {
         /* display specifies TCP */
         unsigned short port = X_TCP_PORT + display;
-        fd = XCBOpenTCP(host, port);
+        fd = _xcb_open_tcp(host, port);
     }
     else
     {
@@ -106,13 +109,13 @@ 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)
+static int _xcb_open_tcp(const char *host, const unsigned short port)
 {
     int fd;
     struct sockaddr_in addr;
@@ -131,7 +134,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 +157,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 +176,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,16 +184,6 @@ XCBConnection *XCBConnectToDisplayWithAuthInfo(const char *displayname, XCBAuthI
     return XCBConnectToFD(fd, auth);
 }
 
-/* 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);
@@ -198,82 +191,35 @@ int XCBSync(XCBConnection *c, XCBGenericError **e)
     return reply != 0;
 }
 
-/* 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 _xcb_set_fd_flags(const int fd)
+
+/* backwards compatible interfaces: remove before 1.0 release */
+XCBConnection *XCBConnectBasic()
 {
-    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;
+    XCBConnection *c = XCBConnect(0, 0);
+    if(c)
+        return c;
+    perror("XCBConnect");
+    abort();
 }
 
-int _xcb_readn(const int fd, void *buf, const int buflen, int *count)
+int XCBOpen(const char *host, const int display)
 {
-    int n = read(fd, ((char *) buf) + *count, buflen - *count);
-    if(n > 0)
-        *count += n;
-    return n;
+	return _xcb_open(host, display);
 }
 
-int _xcb_read_block(const int fd, void *buf, const size_t len)
+int XCBOpenTCP(const char *host, const unsigned short port)
 {
-    int done = 0;
-    while(done < len)
-    {
-        int ret = _xcb_readn(fd, buf, len, &done);
-        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_open_tcp(host, port);
 }
 
-int _xcb_write(const int fd, char (*buf)[], int *count)
+int XCBOpenUnix(const char *file)
 {
-    int n = write(fd, *buf, *count);
-    if(n > 0)
-    {
-        *count -= n;
-        if(*count)
-            memmove(*buf, *buf + n, *count);
-    }
-    return n;
+	return _xcb_open_unix(file);
 }
 
-int _xcb_writev(const int fd, struct iovec *vec, int count)
+int XCBGetAuthInfo(int fd, XCBAuthInfo *info)
 {
-    int n = writev(fd, vec, count);
-    if(n > 0)
-    {
-        int rem = n;
-        for(; count; --count, ++vec)
-        {
-            int cur = vec->iov_len;
-            if(cur > rem)
-                cur = rem;
-            vec->iov_len -= cur;
-            vec->iov_base = (char *) vec->iov_base + cur;
-            rem -= cur;
-            if(vec->iov_len)
-                break;
-        }
-        assert(rem == 0);
-    }
-    return n;
+	return _xcb_get_auth_info(fd, info);
 }