Uli Schlachter
--- a/src/xcb_conn.c
+++ b/src/xcb_conn.c
    pthread_mutex_unlock(&c->iolock);
    do {
 #if USE_POLL
-        ret = poll(&fd, 1, -1);
+        int timeout = -1;
+        if(deadline && now) {
+            struct timeval diff;
+            timersub(deadline, now, &diff);
+            timeout = now->tv_sec * 1000 + now->tv_usec / 1000;
-            timeout = now->tv_sec * 1000 + now->tv_usec / 1000;
+            timeout = diff->tv_sec * 1000 + diff->tv_usec / 1000;
--- a/src/xcb_conn.c
+++ b/src/xcb_conn.c
 #include <fcntl.h>
 #include <errno.h>
 #include <limits.h>
+#include <sys/time.h> /* I bet this does not work on Windows... */
--- a/src/xcb_conn.c
+++ b/src/xcb_conn.c
    /* If the thing I should be doing is already being done, wait for it. */
    if(count ? c->out.writing : c->in.reading)
    {
-        pthread_cond_wait(cond, &c->iolock);
+        if(deadline) {
+            struct timespec spec;
+            spec.tv_sec = deadline->tv_sec;
+            spec.tv_nsec = deadline->tv_usec * 100;
-            spec.tv_nsec = deadline->tv_usec * 100;
+            spec.tv_nsec = deadline->tv_usec * 1000;
--- a/src/xcb_in.c
+++ b/src/xcb_in.c
+    timeout.tv_sec = millisecs_timeout / 1000;
+    timeout.tv_usec = (millisecs_timeout % 1000) * 1000;
+    gettimeofday(&now, NULL); // TODO: Check for errors?
+    timeradd(&now, &timeout, &deadline);
+
+    pthread_mutex_lock(&c->iolock);
+
+    insert_special(&c->in.special_waiters, &special, se);
+
+    /* get_special_event returns 0 on empty list. */
+    while(!(event = get_special_event(c, se))) {
+        if(timercmp(&deadline, &now, <))
+            break;
+        if(!_xcb_conn_timedwait(c, &se->special_event_cond, 0, 0, &now, &deadline))
+            break;
+        gettimeofday(&now, NULL); // TODO: Check for errors?
--- a/src/xcb_conn.c
+++ b/src/xcb_conn.c
            break;
        }
 #else
-        ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
+        struct timeval diff;
+        struct timeval *timeout = NULL;
+        if(deadline && now) {
+            timersub(deadline, now, &diff);
+            timeout = &diff;
+        }
+        ret = select(c->fd + 1, &rfds, &wfds, 0, timeout);
 #endif
    } while (ret == -1 && errno == EINTR);