X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_util.c;h=93e180cae7772a07be55775c83d1d22c47e7c17a;hb=ff38c17c48c271847d12c81cbf80142c6918dc78;hp=b7f5ffa28ce5b99f22167ebfd887d65899842ef7;hpb=67b2649dc4b6726c6d11fb0e41429ae5de82b0e8;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_util.c b/src/xcb_util.c
index b7f5ffa..93e180c 100644
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -26,9 +26,9 @@
 /* Utility functions implementable using only public APIs. */
 
 #include <assert.h>
+#include <sys/types.h>
 #include <sys/select.h>
 #include <sys/socket.h>
-#include <sys/fcntl.h>
 #include <sys/un.h>
 #include <netinet/in.h>
 #include <netdb.h>
@@ -40,6 +40,7 @@
 
 #include "xcb.h"
 #include "xcbext.h"
+#include "xcbint.h"
 
 int XCBPopcount(CARD32 mask)
 {
@@ -90,7 +91,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 +102,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 +110,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 +135,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 +158,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 +177,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 +185,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,28 +205,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. */
+int XCBOpenTCP(const char *host, const unsigned short port)
+{
+	return _xcb_open_tcp(host, port);
+}
 
-#include "xcbint.h"
+int XCBOpenUnix(const char *file)
+{
+	return _xcb_open_unix(file);
+}
 
-int _xcb_set_fd_flags(const int fd)
+int XCBGetAuthInfo(int fd, XCBAuthInfo *info)
 {
-    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_get_auth_info(fd, info);
 }