aboutsummaryrefslogtreecommitdiff
path: root/libxcb
diff options
context:
space:
mode:
Diffstat (limited to 'libxcb')
-rw-r--r--libxcb/src/c_client.py15
-rw-r--r--libxcb/src/config.h80
-rw-r--r--libxcb/src/dummyin6.h168
-rw-r--r--libxcb/src/makefile22
-rw-r--r--libxcb/src/makefile.srcs13
-rw-r--r--libxcb/src/xcb.h10
-rw-r--r--libxcb/src/xcb_auth.c11
-rw-r--r--libxcb/src/xcb_conn.c67
-rw-r--r--libxcb/src/xcb_in.c42
-rw-r--r--libxcb/src/xcb_out.c5
-rw-r--r--libxcb/src/xcb_util.c30
-rw-r--r--libxcb/src/xcbext.h2
-rw-r--r--libxcb/src/xcbint.h1
13 files changed, 445 insertions, 21 deletions
diff --git a/libxcb/src/c_client.py b/libxcb/src/c_client.py
index 2d3d78a0b..6241239e6 100644
--- a/libxcb/src/c_client.py
+++ b/libxcb/src/c_client.py
@@ -162,6 +162,7 @@ def c_open(self):
_c('#include <assert.h>')
_c('#include "xcbext.h"')
_c('#include "%s.h"', _ns.header)
+ _c('#include <X11/Xtrans/Xtrans.h>')
if _ns.is_ext:
for (n, h) in self.imports:
@@ -478,7 +479,8 @@ def _c_accessors_field(self, field):
_c('%s (const %s *R /**< */)', field.c_accessor_name, self.c_type)
_c('{')
_c(' xcb_generic_iterator_t prev = %s;', _c_iterator_get_end(field.prev_varsized_field, 'R'))
- _c(' return * (%s *) ((char *) prev.data + XCB_TYPE_PAD(%s, prev.index) + %d);', field.c_field_type, field.first_field_after_varsized.type.c_type, field.prev_varsized_offset)
+ sizeoftype='char' if field.first_field_after_varsized.type.c_type == 'void' else field.first_field_after_varsized.type.c_type
+ _c(' return * (%s *) ((char *) prev.data + XCB_TYPE_PAD(%s, prev.index) + %d);', field.c_field_type, sizeoftype, field.prev_varsized_offset)
_c('}')
else:
_hc('')
@@ -497,7 +499,8 @@ def _c_accessors_field(self, field):
_c('%s (const %s *R /**< */)', field.c_accessor_name, self.c_type)
_c('{')
_c(' xcb_generic_iterator_t prev = %s;', _c_iterator_get_end(field.prev_varsized_field, 'R'))
- _c(' return (%s *) ((char *) prev.data + XCB_TYPE_PAD(%s, prev.index) + %d);', field.c_field_type, field.first_field_after_varsized.type.c_type, field.prev_varsized_offset)
+ sizeoftype='char' if field.first_field_after_varsized.type.c_type == 'void' else field.first_field_after_varsized.type.c_type
+ _c(' return (%s *) ((char *) prev.data + XCB_TYPE_PAD(%s, prev.index) + %d);', field.c_field_type, sizeoftype, field.prev_varsized_offset)
_c('}')
def _c_accessors_list(self, field):
@@ -531,7 +534,8 @@ def _c_accessors_list(self, field):
_c(' return (%s *) (R + 1);', field.c_field_type)
else:
_c(' xcb_generic_iterator_t prev = %s;', _c_iterator_get_end(field.prev_varsized_field, 'R'))
- _c(' return (%s *) ((char *) prev.data + XCB_TYPE_PAD(%s, prev.index) + %d);', field.c_field_type, field.first_field_after_varsized.type.c_type, field.prev_varsized_offset)
+ sizeoftype='char' if field.first_field_after_varsized.type.c_type == 'void' else field.first_field_after_varsized.type.c_type
+ _c(' return (%s *) ((char *) prev.data + XCB_TYPE_PAD(%s, prev.index) + %d);', field.c_field_type, sizeoftype, field.prev_varsized_offset)
_c('}')
@@ -604,7 +608,8 @@ def _c_accessors_list(self, field):
_c(' i.data = (%s *) (R + 1);', field.c_field_type)
else:
_c(' xcb_generic_iterator_t prev = %s;', _c_iterator_get_end(field.prev_varsized_field, 'R'))
- _c(' i.data = (%s *) ((char *) prev.data + XCB_TYPE_PAD(%s, prev.index));', field.c_field_type, field.c_field_type)
+ sizeoftype='char' if field.c_field_type == 'void' else field.c_field_type
+ _c(' i.data = (%s *) ((char *) prev.data + XCB_TYPE_PAD(%s, prev.index));', field.c_field_type, sizeoftype)
_c(' i.rem = %s;', _c_accessor_get_expr(field.type.expr, 'R'))
_c(' i.index = (char *) i.data - (char *) R;')
@@ -1017,7 +1022,7 @@ except getopt.GetoptError, err:
for (opt, arg) in opts:
if opt == '-p':
- sys.path.append(arg)
+ sys.path.insert(0,arg)
# Import the module class
try:
diff --git a/libxcb/src/config.h b/libxcb/src/config.h
new file mode 100644
index 000000000..6c701936c
--- /dev/null
+++ b/libxcb/src/config.h
@@ -0,0 +1,80 @@
+/* src/config.h.in. Generated from configure.ac by autoheader. */
+
+/* Defined if GCC supports the visibility feature */
+#undef GCC_HAS_VISIBILITY
+
+/* Has Wraphelp.c needed for XDM AUTH protocols */
+#undef HASXDMAUTH
+
+/* Define if your platform supports abstract sockets */
+#undef HAVE_ABSTRACT_SOCKETS
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* launchd support available */
+#undef HAVE_LAUNCHD
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Have the sockaddr_un.sun_len member. */
+#undef HAVE_SOCKADDR_SUN_LEN
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* poll() function is available */
+#undef USE_POLL
+
+/* Version number of package */
+#undef VERSION
+
+/* XCB buffer queue size */
+#define XCB_QUEUE_BUFFER_SIZE 4096
diff --git a/libxcb/src/dummyin6.h b/libxcb/src/dummyin6.h
new file mode 100644
index 000000000..b86b250e4
--- /dev/null
+++ b/libxcb/src/dummyin6.h
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2001, 2003 Motoyuki Kasahara
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef DUMMYIN6_H
+#define DUMMYIN6_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/types.h>
+
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+
+#ifndef AF_INET6
+#define AF_INET6 (AF_INET + 1)
+#endif
+
+#ifndef PF_INET6
+#define PF_INET6 (PF_INET + 1)
+#endif
+
+#ifndef AF_UNSPEC
+#define AF_UNSPEC AF_INET
+#endif
+
+#ifndef PF_UNSPEC
+#define PF_UNSPEC PF_INET
+#endif
+
+#ifndef INET6_ADDRSTRLEN
+#define INET6_ADDRSTRLEN 46
+#endif
+
+#ifndef INET_ADDRSTRLEN
+#define INET_ADDRSTRLEN 16
+#endif
+
+#ifndef HAVE_STRUCT_IN6_ADDR
+struct in6_addr {
+ unsigned char s6_addr[16];
+};
+#endif
+
+#ifndef HAVE_STRUCT_SOCKADDR_IN6
+struct sockaddr_in6 {
+ sa_family_t sin6_family;
+ in_port_t sin6_port;
+ unsigned long sin6_flowinfo;
+ struct in6_addr sin6_addr;
+ unsigned long sin6_scope_id;
+};
+#endif
+
+#if !defined(HAVE_STRUCT_SOCKADDR_STORAGE) && !defined(sockaddr_storage)
+#define sockaddr_storage sockaddr_in
+#endif
+
+#ifndef IN6ADDR_ANY_DECLARED
+extern const struct in6_addr in6addr_any;
+#endif
+
+#ifndef IN6ADDR_LOOPBACK_DECLARED
+extern const struct in6_addr in6addr_loopback;
+#endif
+
+#ifndef IN6ADDR_ANY_INIT
+#define IN6ADDR_ANY_INIT \
+ {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}
+#endif
+
+#ifndef IN6ADDR_LOOPBACK_INIT
+#define IN6ADDR_LOOPBACK_INIT \
+ {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01}}
+#endif
+
+#ifndef IN6_IS_ADDR_UNSPECIFIED
+#define IN6_IS_ADDR_UNSPECIFIED(a) \
+ ( (a)->s6_addr[ 0] == 0 && (a)->s6_addr[ 1] == 0 \
+ && (a)->s6_addr[ 2] == 0 && (a)->s6_addr[ 3] == 0 \
+ && (a)->s6_addr[ 4] == 0 && (a)->s6_addr[ 5] == 0 \
+ && (a)->s6_addr[ 6] == 0 && (a)->s6_addr[ 7] == 0 \
+ && (a)->s6_addr[ 8] == 0 && (a)->s6_addr[ 9] == 0 \
+ && (a)->s6_addr[10] == 0 && (a)->s6_addr[11] == 0 \
+ && (a)->s6_addr[12] == 0 && (a)->s6_addr[13] == 0 \
+ && (a)->s6_addr[14] == 0 && (a)->s6_addr[15] == 0)
+#endif
+
+#ifndef IN6_IS_ADDR_LOOPBACK
+#define IN6_IS_ADDR_LOOPBACK(a) \
+ ( (a)->s6_addr[ 0] == 0 && (a)->s6_addr[ 1] == 0 \
+ && (a)->s6_addr[ 2] == 0 && (a)->s6_addr[ 3] == 0 \
+ && (a)->s6_addr[ 4] == 0 && (a)->s6_addr[ 5] == 0 \
+ && (a)->s6_addr[ 6] == 0 && (a)->s6_addr[ 7] == 0 \
+ && (a)->s6_addr[ 8] == 0 && (a)->s6_addr[ 9] == 0 \
+ && (a)->s6_addr[10] == 0 && (a)->s6_addr[11] == 0 \
+ && (a)->s6_addr[12] == 0 && (a)->s6_addr[13] == 0 \
+ && (a)->s6_addr[14] == 0 && (a)->s6_addr[15] == 1)
+#endif
+
+#ifndef IN6_IS_ADDR_MULTICAST
+#define IN6_IS_ADDR_MULTICAST(a) \
+ ((a)->s6_addr[0] == 0xff)
+#endif
+
+#ifndef IN6_IS_ADDR_LINKLOCAL
+#define IN6_IS_ADDR_LINKLOCAL(a) \
+ (((a)->s6_addr[0] == 0xfe) && (((a)->s6_addr[1] & 0xc0) == 0x80))
+#endif
+
+#ifndef IN6_IS_ADDR_SITELOCAL
+#define IN6_IS_ADDR_SITELOCAL(a) \
+ (((a)->s6_addr[0] == 0xfe) && (((a)->s6_addr[1] & 0xc0) == 0xc0))
+#endif
+
+#ifndef IN6_IS_ADDR_V4MAPPED
+#define IN6_IS_ADDR_V4MAPPED(a) \
+ ( (a)->s6_addr[ 0] == 0 && (a)->s6_addr[ 1] == 0 \
+ && (a)->s6_addr[ 2] == 0 && (a)->s6_addr[ 3] == 0 \
+ && (a)->s6_addr[ 4] == 0 && (a)->s6_addr[ 5] == 0 \
+ && (a)->s6_addr[ 6] == 0 && (a)->s6_addr[ 7] == 0 \
+ && (a)->s6_addr[ 8] == 0 && (a)->s6_addr[ 9] == 0 \
+ && (a)->s6_addr[10] == 0xff && (a)->s6_addr[11] == 0xff)
+#endif
+
+#ifndef IN6_IS_ADDR_V4COMPAT
+#define IN6_IS_ADDR_V4COMPAT(a) \
+ ( (a)->s6_addr[ 0] == 0 && (a)->s6_addr[ 1] == 0 \
+ && (a)->s6_addr[ 2] == 0 && (a)->s6_addr[ 3] == 0 \
+ && (a)->s6_addr[ 4] == 0 && (a)->s6_addr[ 5] == 0 \
+ && (a)->s6_addr[ 6] == 0 && (a)->s6_addr[ 7] == 0 \
+ && (a)->s6_addr[ 8] == 0 && (a)->s6_addr[ 9] == 0 \
+ && (a)->s6_addr[10] == 0 && (a)->s6_addr[11] == 0 \
+ && ((a)->s6_addr[12] != 0 || (a)->s6_addr[13] != 0 \
+ || (a)->s6_addr[14] != 0 \
+ || ((a)->s6_addr[15] != 0 && (a)->s6_addr[15] != 1)))
+#endif
+
+#endif /* not DUMMYIN6_H */
diff --git a/libxcb/src/makefile b/libxcb/src/makefile
new file mode 100644
index 000000000..97705cc24
--- /dev/null
+++ b/libxcb/src/makefile
@@ -0,0 +1,22 @@
+
+LIBRARY=libxcb
+
+CSRCS = \
+ xcb_conn.c xcb_out.c xcb_in.c xcb_ext.c xcb_xid.c \
+ xcb_list.c xcb_util.c xcb_auth.c
+
+DEFINES += PTW32_STATIC_LIB
+
+XCBPROTO_XCBINCLUDEDIR = ..\xcb-proto\src
+
+XMLFILES := $(notdir $(wildcard $(XCBPROTO_XCBINCLUDEDIR)\*.xml))
+XMLFILES := $(filter-out xkb.xml, $(XMLFILES))
+
+EXTSOURCES := $(XMLFILES:%.xml=%.c)
+CSRCS += $(EXTSOURCES)
+
+EXTHEADERS = $(XMLFILES:%.xml=%.h)
+
+$(EXTHEADERS) $(EXTSOURCES): c_client.py
+
+load_makefile NORELDBG=1 makefile.srcs
diff --git a/libxcb/src/makefile.srcs b/libxcb/src/makefile.srcs
new file mode 100644
index 000000000..2d4846a89
--- /dev/null
+++ b/libxcb/src/makefile.srcs
@@ -0,0 +1,13 @@
+ifneq ($(NORELDBG),1)
+$(error NORELDBG should have been set to 1)
+endif
+
+XCBPROTO_XCBPYTHONDIR = ..\xcb-proto
+XCBPROTO_XCBINCLUDEDIR = ..\xcb-proto\src
+
+%.h: $(XCBPROTO_XCBINCLUDEDIR)\%.xml
+ python c_client.py -p $(XCBPROTO_XCBPYTHONDIR) $<
+
+%.c: $(XCBPROTO_XCBINCLUDEDIR)\%.xml
+ python c_client.py -p $(XCBPROTO_XCBPYTHONDIR) $<
+
diff --git a/libxcb/src/xcb.h b/libxcb/src/xcb.h
index 35d876883..ad32051b2 100644
--- a/libxcb/src/xcb.h
+++ b/libxcb/src/xcb.h
@@ -35,9 +35,19 @@
#include <stdint.h>
#endif
+#ifndef _MSC_VER
#include <sys/uio.h>
+#else
+#define HANDLE void *
+typedef int pid_t;
+#endif
#include <pthread.h>
+#ifdef _MSC_VER
+#undef HANDLE
+typedef unsigned uint32_t;
+typedef int int32_t;
+#endif
#ifdef __cplusplus
extern "C" {
diff --git a/libxcb/src/xcb_auth.c b/libxcb/src/xcb_auth.c
index d774d1069..99b2fbbcc 100644
--- a/libxcb/src/xcb_auth.c
+++ b/libxcb/src/xcb_auth.c
@@ -25,6 +25,10 @@
/* Authorization systems for the X protocol. */
+#ifdef WIN32
+#define INCL_WINSOCK_API_TYPEDEFS 1 /* Needed for LPFN_GETPEERNAME */
+#endif
+
#include <assert.h>
#include <X11/Xauth.h>
#include <sys/socket.h>
@@ -245,13 +249,14 @@ static int compute_auth(xcb_auth_info_t *info, Xauth *authptr, struct sockaddr *
/* `sockaddr_un.sun_path' typical size usually ranges between 92 and 108 */
#define INITIAL_SOCKNAME_SLACK 108
+#ifndef WIN32
+typedef int (*LPFN_GETPEERNAME)(int,struct sockaddr *,socklen_t *);
+#endif
/* Return a dynamically allocated socket address structure according
to the value returned by either getpeername() or getsockname()
(according to POSIX, applications should not assume a particular
length for `sockaddr_un.sun_path') */
-static struct sockaddr *get_peer_sock_name(int (*socket_func)(int,
- struct sockaddr *,
- socklen_t *),
+static struct sockaddr *get_peer_sock_name(LPFN_GETPEERNAME socket_func,
int fd)
{
socklen_t socknamelen = sizeof(struct sockaddr) + INITIAL_SOCKNAME_SLACK;
diff --git a/libxcb/src/xcb_conn.c b/libxcb/src/xcb_conn.c
index 2ab84eac0..0723423f2 100644
--- a/libxcb/src/xcb_conn.c
+++ b/libxcb/src/xcb_conn.c
@@ -30,7 +30,12 @@
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
+#ifdef _MSC_VER
+#include <X11/Xwinsock.h>
+#define STDERR_FILENO stderr
+#else
#include <netinet/in.h>
+#endif
#include <fcntl.h>
#include <errno.h>
@@ -42,6 +47,8 @@
#include <sys/select.h>
#endif
+#include <X11/Xtrans/Xtrans.h>
+
/* SHUT_RDWR is fairly recent and is not available on all platforms */
#if !defined(SHUT_RDWR)
#define SHUT_RDWR 2
@@ -55,8 +62,50 @@ typedef struct {
static const int error_connection = 1;
+#ifdef _MSC_VER
+#undef close
+#define close(fd) closesocket(fd)
+
+size_t writev(int fildes, const struct iovec *iov, int iovcnt)
+{
+ int i, r;
+ char *p;
+ size_t l, sum;
+
+ /* We should buffer */
+ sum= 0;
+ for (i= 0; i<iovcnt; i++)
+ {
+ p= iov[i].iov_base;
+ l= iov[i].iov_len;
+ while (l > 0)
+ {
+ r= send(fildes, p, l, 0);
+ if (r <= 0)
+ {
+ errno =WSAGetLastError();
+ if(errno == WSAEWOULDBLOCK)
+ errno = EAGAIN;
+ if (sum)
+ return sum;
+ else
+ return r;
+ }
+ p += r;
+ l -= r;
+ sum += r;
+ }
+ }
+ return sum;
+}
+#endif
+
static int set_fd_flags(const int fd)
{
+#ifdef _MSC_VER
+ unsigned long arg = 1;
+ int ret = ioctlsocket (fd, FIONBIO, &arg);
+#else
int flags = fcntl(fd, F_GETFL, 0);
if(flags == -1)
return 0;
@@ -65,6 +114,7 @@ static int set_fd_flags(const int fd)
return 0;
if(fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
return 0;
+#endif
return 1;
}
@@ -89,7 +139,7 @@ static int write_setup(xcb_connection_t *c, xcb_auth_info_t *auth_info)
out.authorization_protocol_name_len = 0;
out.authorization_protocol_data_len = 0;
parts[count].iov_len = sizeof(xcb_setup_request_t);
- parts[count++].iov_base = &out;
+ parts[count++].iov_base = (caddr_t) &out;
parts[count].iov_len = XCB_PAD(sizeof(xcb_setup_request_t));
parts[count++].iov_base = (char *) pad;
@@ -212,14 +262,6 @@ xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t *auth_info)
{
xcb_connection_t* c;
-#ifndef USE_POLL
- if(fd >= FD_SETSIZE) /* would overflow in FD_SET */
- {
- close(fd);
- return (xcb_connection_t *) &error_connection;
- }
-#endif
-
c = calloc(1, sizeof(xcb_connection_t));
if(!c) {
close(fd);
@@ -321,6 +363,13 @@ int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec
ret = poll(&fd, 1, -1);
#else
ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
+ if (ret==SOCKET_ERROR)
+ {
+ ret=-1;
+ errno = WSAGetLastError();
+ if (errno == WSAEINTR)
+ errno=EINTR;
+ }
#endif
} while (ret == -1 && errno == EINTR);
if(ret < 0)
diff --git a/libxcb/src/xcb_in.c b/libxcb/src/xcb_in.c
index 6072cea9a..aaec5c8b4 100644
--- a/libxcb/src/xcb_in.c
+++ b/libxcb/src/xcb_in.c
@@ -30,6 +30,9 @@
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
+#ifdef _MSC_VER
+#include <X11/Xwinsock.h>
+#endif
#include <errno.h>
#include "xcb.h"
@@ -252,6 +255,37 @@ static void free_reply_list(struct reply_list *head)
static int read_block(const int fd, void *buf, const ssize_t len)
{
+#ifdef _MSC_VER
+ int done = 0;
+ while(done < len)
+ {
+ int Err;
+ int ret = recv(fd, ((char *) buf) + done, len - done,0);
+ if(ret > 0)
+ done += ret;
+ else
+ Err=WSAGetLastError();
+ if(ret < 0 && Err == WSAEWOULDBLOCK)
+ {
+ fd_set fds;
+ FD_ZERO(&fds);
+ FD_SET(fd, &fds);
+ do {
+ ret = select(fd + 1, &fds, 0, 0, 0);
+ if (ret==SOCKET_ERROR)
+ {
+ ret=-1;
+ errno = WSAGetLastError();
+ if (errno == WSAEINTR)
+ errno=EINTR;
+ }
+ } while (ret == -1 && errno == EINTR);
+ }
+ if(ret <= 0)
+ return ret;
+ }
+ return len;
+#else
int done = 0;
while(done < len)
{
@@ -281,6 +315,7 @@ static int read_block(const int fd, void *buf, const ssize_t len)
return ret;
}
return len;
+#endif
}
static int poll_for_reply(xcb_connection_t *c, unsigned int request, void **reply, xcb_generic_error_t **error)
@@ -663,11 +698,16 @@ void _xcb_in_replies_done(xcb_connection_t *c)
int _xcb_in_read(xcb_connection_t *c)
{
- int n = read(c->fd, c->in.queue + c->in.queue_len, sizeof(c->in.queue) - c->in.queue_len);
+ int n = recv(c->fd, c->in.queue + c->in.queue_len, sizeof(c->in.queue) - c->in.queue_len,0); //MH
if(n > 0)
c->in.queue_len += n;
while(read_packet(c))
/* empty */;
+#ifdef _MSC_VER
+ errno=WSAGetLastError();
+ if (errno==WSAEWOULDBLOCK)
+ errno=EAGAIN;
+#endif
if((n > 0) || (n < 0 && errno == EAGAIN))
return 1;
_xcb_conn_shutdown(c);
diff --git a/libxcb/src/xcb_out.c b/libxcb/src/xcb_out.c
index fbce7a0ea..8347c37cd 100644
--- a/libxcb/src/xcb_out.c
+++ b/libxcb/src/xcb_out.c
@@ -29,6 +29,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
+#include <X11/Xtrans/Xtrans.h>
#include "xcb.h"
#include "xcbext.h"
@@ -239,11 +240,11 @@ unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vect
if(prefix[2])
{
prefix[1] = ((uint32_t *) vector[1].iov_base)[0];
- vector[1].iov_base = (uint32_t *) vector[1].iov_base + 1;
+ vector[1].iov_base = (caddr_t)((uint32_t *) vector[1].iov_base + 1);
vector[1].iov_len -= sizeof(uint32_t);
}
vector[0].iov_len = sizeof(uint32_t) * ((prefix[0] ? 1 : 0) + (prefix[2] ? 2 : 0));
- vector[0].iov_base = prefix + !prefix[0];
+ vector[0].iov_base = (caddr_t)(prefix + !prefix[0]);
}
if(!write_block(c, vector, veclen))
diff --git a/libxcb/src/xcb_util.c b/libxcb/src/xcb_util.c
index 9cdfbff3f..af163185a 100644
--- a/libxcb/src/xcb_util.c
+++ b/libxcb/src/xcb_util.c
@@ -49,6 +49,10 @@
#include "xcbext.h"
#include "xcbint.h"
+#ifdef _MSC_VER
+#define close(fd) closesocket(fd)
+#endif
+
static const int error_connection = 1;
int xcb_popcount(uint32_t mask)
@@ -232,8 +236,10 @@ static int _xcb_socket(int family, int type, int proto)
#endif
{
fd = socket(family, type, proto);
+#ifndef _MSC_VER
if (fd >= 0)
fcntl(fd, F_SETFD, FD_CLOEXEC);
+#endif
}
return fd;
}
@@ -278,6 +284,23 @@ static int _xcb_open_decnet(const char *host, const char *protocol, const unsign
}
#endif
+#ifdef WIN32
+int InitWSA(void)
+{
+ static WSADATA wsadata;
+
+ if (!wsadata.wVersion)
+ {
+ ptw32_processInitialize();
+ if (WSAStartup(0x0202, &wsadata))
+ return -1;
+ }
+ return 0;
+}
+#else
+#define InitWSA()
+#endif
+
static int _xcb_open_tcp(const char *host, char *protocol, const unsigned short port)
{
int fd = -1;
@@ -317,6 +340,11 @@ static int _xcb_open_tcp(const char *host, char *protocol, const unsigned short
}
#endif
+#ifdef WIN32
+ if (InitWSA()<0)
+ return -1;
+#endif
+
snprintf(service, sizeof(service), "%hu", port);
if(getaddrinfo(host, service, &hints, &results))
/* FIXME: use gai_strerror, and fill in error connection */
@@ -326,7 +354,7 @@ static int _xcb_open_tcp(const char *host, char *protocol, const unsigned short
{
fd = _xcb_socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
if(fd >= 0) {
- int on = 1;
+ char on = 1;
setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on));
diff --git a/libxcb/src/xcbext.h b/libxcb/src/xcbext.h
index 2e10ba203..ea5a2d355 100644
--- a/libxcb/src/xcbext.h
+++ b/libxcb/src/xcbext.h
@@ -28,6 +28,8 @@
#ifndef __XCBEXT_H
#define __XCBEXT_H
+#include <unistd.h>
+
#include "xcb.h"
#ifdef __cplusplus
diff --git a/libxcb/src/xcbint.h b/libxcb/src/xcbint.h
index f07add8b9..2de7e3f22 100644
--- a/libxcb/src/xcbint.h
+++ b/libxcb/src/xcbint.h
@@ -28,6 +28,7 @@
#ifndef __XCBINT_H
#define __XCBINT_H
+#include <unistd.h>
#include "bigreq.h"
#ifdef HAVE_CONFIG_H