/* 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>
#include "xcb.h"
#include "xcbext.h"
+#include "xcbint.h"
int XCBPopcount(CARD32 mask)
{
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;
{
/* display specifies TCP */
unsigned short port = X_TCP_PORT + display;
- fd = XCBOpenTCP(host, port);
+ 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)
+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 };
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);
if(!XCBParseDisplay(displayname, &host, &display, screenp))
return 0;
- fd = XCBOpen(host, display);
+ fd = _xcb_open(host, display);
free(host);
if(fd == -1)
return 0;
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);
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);
}