aboutsummaryrefslogtreecommitdiff
path: root/libxcb
diff options
context:
space:
mode:
Diffstat (limited to 'libxcb')
-rw-r--r--libxcb/src/bigreq.c1
-rw-r--r--libxcb/src/makefile75
-rw-r--r--libxcb/src/xc_misc.c1
-rw-r--r--libxcb/src/xcb.h10
-rw-r--r--libxcb/src/xcb_auth.c13
-rw-r--r--libxcb/src/xcb_conn.c54
-rw-r--r--libxcb/src/xcb_in.c45
-rw-r--r--libxcb/src/xcb_out.c3
-rw-r--r--libxcb/src/xcb_util.c24
-rw-r--r--libxcb/src/xcbxlib.h3
-rw-r--r--libxcb/src/xproto.c1
11 files changed, 223 insertions, 7 deletions
diff --git a/libxcb/src/bigreq.c b/libxcb/src/bigreq.c
index 53dfe029b..8c591aa65 100644
--- a/libxcb/src/bigreq.c
+++ b/libxcb/src/bigreq.c
@@ -6,6 +6,7 @@
#include <assert.h>
#include "xcbext.h"
#include "bigreq.h"
+#include <X11/Xtrans/Xtrans.h>
xcb_extension_t xcb_big_requests_id = { "BIG-REQUESTS" };
diff --git a/libxcb/src/makefile b/libxcb/src/makefile
new file mode 100644
index 000000000..3716a1356
--- /dev/null
+++ b/libxcb/src/makefile
@@ -0,0 +1,75 @@
+CSRCS = xproto.c \
+ bigreq.c \
+ composite.c \
+ damage.c \
+ dpms.c \
+ glx.c \
+ randr.c \
+ record.c \
+ render.c \
+ res.c \
+ screensaver.c \
+ shape.c \
+ shm.c \
+ sync.c \
+ xc_misc.c \
+ xevie.c \
+ xf86dri.c \
+ xfixes.c \
+ xinerama.c \
+ xprint.c \
+ xtest.c \
+ xv.c \
+ xvmc.c
+
+EXTENSION_XML = xproto.xml \
+ bigreq.xml \
+ composite.xml \
+ damage.xml \
+ dpms.xml \
+ glx.xml \
+ randr.xml \
+ record.xml \
+ render.xml \
+ res.xml \
+ screensaver.xml \
+ shape.xml \
+ shm.xml \
+ sync.xml \
+ xc_misc.xml \
+ xevie.xml \
+ xf86dri.xml \
+ xfixes.xml \
+ xinerama.xml \
+ xprint.xml \
+ xtest.xml \
+ xvmc.xml \
+ xv.xml
+
+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 xcb_xlib.c \
+ xproto.c bigreq.c xc_misc.c
+# c-client.xsl \
+#CSRCS = xproto.c
+
+DEFINES += PTW32_STATIC_LIB
+#.xml.h:
+# @n=`dirname $*`; test -d $$n || (echo mkdir $$n; mkdir $$n)
+# $(XSLTPROC) --stringparam mode header \
+# --stringparam base-path $(XCBPROTO_XCBINCLUDEDIR)/ \
+# --stringparam extension-path $(XCBPROTO_XCBINCLUDEDIR)/ \
+# -o $@ $(srcdir)/c-client.xsl $<
+
+#.xml.c:
+# @n=`dirname $*`; test -d $$n || (echo mkdir $$n; mkdir $$n)
+# $(XSLTPROC) --stringparam mode source \
+# --stringparam base-path $(XCBPROTO_XCBINCLUDEDIR)/ \
+# --stringparam extension-path $(XCBPROTO_XCBINCLUDEDIR)/ \
+# -o $@ $(srcdir)/c-client.xsl $<
+
+#$(EXTENSION_XML):
+# $(LN_S) -f $(XCBPROTO_XCBINCLUDEDIR)/$@ $@
+
diff --git a/libxcb/src/xc_misc.c b/libxcb/src/xc_misc.c
index 582dd4580..9176a91c7 100644
--- a/libxcb/src/xc_misc.c
+++ b/libxcb/src/xc_misc.c
@@ -6,6 +6,7 @@
#include <assert.h>
#include "xcbext.h"
#include "xc_misc.h"
+#include <X11/Xtrans/Xtrans.h>
xcb_extension_t xcb_xc_misc_id = { "XC-MISC" };
diff --git a/libxcb/src/xcb.h b/libxcb/src/xcb.h
index 5a1c01ab1..323a31fb2 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 ffc051547..ab8480372 100644
--- a/libxcb/src/xcb_auth.c
+++ b/libxcb/src/xcb_auth.c
@@ -27,12 +27,19 @@
#include <assert.h>
#include <X11/Xauth.h>
+#include <X11/Xwinsock.h>
+#include <stdlib.h>
+#ifndef _MSC_VER
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/un.h>
#include <sys/param.h>
#include <unistd.h>
-#include <stdlib.h>
+#else
+typedef unsigned in_addr_t;
+#define MAXPATHLEN 255
+#define snprintf _snprintf
+#endif
#include "xcb.h"
#include "xcbint.h"
@@ -41,6 +48,10 @@
#include <X11/Xdmcp.h>
#endif
+#ifndef HAVE_GETADDRINFO
+#include "dummyin6.h"
+#endif
+
enum auth_protos {
#ifdef HASXDMAUTH
AUTH_XA1,
diff --git a/libxcb/src/xcb_conn.c b/libxcb/src/xcb_conn.c
index e7856c355..e1d2e762c 100644
--- a/libxcb/src/xcb_conn.c
+++ b/libxcb/src/xcb_conn.c
@@ -28,16 +28,23 @@
#include <assert.h>
#include <string.h>
#include <stdio.h>
-#include <unistd.h>
#include <stdlib.h>
+#ifdef _MSC_VER
+#include <X11/Xwinsock.h>
+#define STDERR_FILENO stderr
+#else
+#include <unistd.h>
#include <netinet/in.h>
#include <sys/select.h>
+#endif
#include <fcntl.h>
#include <errno.h>
#include "xcb.h"
#include "xcbint.h"
+#include <X11/Xtrans/Xtrans.h>
+
typedef struct {
uint8_t status;
uint8_t pad0[5];
@@ -46,8 +53,45 @@ typedef struct {
static const int error_connection = 1;
+#ifdef _MSC_VER
+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;
+ assert(sum == 0);
+ 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;
@@ -56,6 +100,7 @@ static int set_fd_flags(const int fd)
return 0;
if(fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
return 0;
+#endif
return 1;
}
@@ -338,6 +383,13 @@ int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec
_xcb_unlock_io(c);
do {
ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
+ if (ret==SOCKET_ERROR)
+ {
+ ret=-1;
+ errno = WSAGetLastError();
+ if (errno == WSAEINTR)
+ errno=EINTR;
+ }
} while (ret == -1 && errno == EINTR);
if (ret < 0)
{
diff --git a/libxcb/src/xcb_in.c b/libxcb/src/xcb_in.c
index 2997de4c4..40c32bbbd 100644
--- a/libxcb/src/xcb_in.c
+++ b/libxcb/src/xcb_in.c
@@ -28,9 +28,13 @@
#include <assert.h>
#include <string.h>
#include <stdlib.h>
-#include <unistd.h>
#include <stdio.h>
+#ifndef _MSC_VER
+#include <unistd.h>
#include <sys/select.h>
+#else
+#include <X11/Xwinsock.h>
+#endif
#include <errno.h>
#include "xcb.h"
@@ -233,6 +237,37 @@ static void free_reply_list(struct reply_list *head)
static int read_block(const int fd, void *buf, const size_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)
{
@@ -252,6 +287,7 @@ static int read_block(const int fd, void *buf, const size_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)
@@ -495,11 +531,16 @@ int _xcb_in_expect_reply(xcb_connection_t *c, unsigned int request, enum workaro
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 60226e581..52a2abc87 100644
--- a/libxcb/src/xcb_out.c
+++ b/libxcb/src/xcb_out.c
@@ -27,8 +27,11 @@
#include <assert.h>
#include <stdlib.h>
+#ifndef _MSC_VER
#include <unistd.h>
+#endif
#include <string.h>
+#include <X11/Xtrans/Xtrans.h>
#include "xcb.h"
#include "xcbext.h"
diff --git a/libxcb/src/xcb_util.c b/libxcb/src/xcb_util.c
index dd2305abd..9103e6acc 100644
--- a/libxcb/src/xcb_util.c
+++ b/libxcb/src/xcb_util.c
@@ -26,6 +26,10 @@
/* Utility functions implementable using only public APIs. */
#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#ifndef _MSC_VER
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
@@ -35,16 +39,30 @@
#include <netdnet/dn.h>
#endif
#include <netdb.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <unistd.h>
+
+#else
+#include <X11/Xwinsock.h>
+#include <X11\Xos.h>
+#define snprintf _snprintf
+#define HAVE_GETADDRINFO
+#endif
+
#include <string.h>
#include "xcb.h"
#include "xcbext.h"
#include "xcbint.h"
+#ifndef HAVE_GETADDRINFO
+#include "dummyin6.h"
+#include "getaddrinfo.h"
+#else
+#ifdef _MSC_VER
+#include <Ws2tcpip.h>
+#endif
+#endif
+
static const int error_connection = 1;
int xcb_popcount(uint32_t mask)
diff --git a/libxcb/src/xcbxlib.h b/libxcb/src/xcbxlib.h
index 4cb5cd4bf..53821afce 100644
--- a/libxcb/src/xcbxlib.h
+++ b/libxcb/src/xcbxlib.h
@@ -31,6 +31,9 @@
#ifndef __XCBXLIB_H
#define __XCBXLIB_H
+#ifdef _MSC_VER
+typedef int pid_t;
+#endif
#include <pthread.h>
#include "xcb.h"
diff --git a/libxcb/src/xproto.c b/libxcb/src/xproto.c
index 1b7a50d82..1ded9abe6 100644
--- a/libxcb/src/xproto.c
+++ b/libxcb/src/xproto.c
@@ -7,6 +7,7 @@
#include <assert.h>
#include "xcbext.h"
#include "xproto.h"
+#include <X11/Xtrans/Xtrans.h>
/*****************************************************************************
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 09:42:46 +0000