X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_in.c;h=967beac04dbda1d47363297006ff11b641e19a0b;hb=7f0bc778c88ab2f565cc05d5d3d5ee4c8d1388a1;hp=c260b7bdbd1b6ade7cbdaf8ad460d420109fe393;hpb=47ceed78612d48dcda62cc2686fc527d61abe38b;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_in.c b/src/xcb_in.c
index c260b7b..967beac 100644
--- a/src/xcb_in.c
+++ b/src/xcb_in.c
@@ -35,6 +35,11 @@
 #include "xcbext.h"
 #include "xcbint.h"
 
+typedef struct {
+    unsigned int request;
+    enum workarounds workaround;
+} pending_reply;
+
 typedef struct XCBReplyData {
     unsigned int request;
     void *data;
@@ -63,6 +68,90 @@ static void wake_up_next_reader(XCBConnection *c)
     assert(pthreadret == 0);
 }
 
+static int read_packet(XCBConnection *c)
+{
+    XCBGenericRep genrep;
+    int length = 32;
+    unsigned char *buf;
+
+    /* Wait for there to be enough data for us to read a whole packet */
+    if(c->in.queue_len < length)
+        return 0;
+
+    /* Get the response type, length, and sequence number. */
+    memcpy(&genrep, c->in.queue, sizeof(genrep));
+
+    /* Compute 32-bit sequence number of this packet. */
+    if((genrep.response_type & 0x7f) != KeymapNotify)
+    {
+        int lastread = c->in.request_read;
+        c->in.request_read = (lastread & 0xffff0000) | genrep.sequence;
+        if(c->in.request_read != lastread && !_xcb_queue_is_empty(c->in.current_reply))
+        {
+            _xcb_map_put(c->in.replies, lastread, c->in.current_reply);
+            c->in.current_reply = _xcb_queue_new();
+        }
+        if(c->in.request_read < lastread)
+            c->in.request_read += 0x10000;
+    }
+
+    /* For reply packets, check that the entire packet is available. */
+    if(genrep.response_type == 1)
+    {
+        pending_reply *pend = _xcb_list_peek_head(c->in.pending_replies);
+        if(pend && pend->request == c->in.request_read)
+        {
+            switch(pend->workaround)
+            {
+            case WORKAROUND_NONE:
+                break;
+            case WORKAROUND_GLX_GET_FB_CONFIGS_BUG:
+                {
+                    CARD32 *p = (CARD32 *) c->in.queue;
+                    genrep.length = p[2] * p[3] * 2;
+                }
+                break;
+            }
+            free(_xcb_queue_dequeue(c->in.pending_replies));
+        }
+        length += genrep.length * 4;
+    }
+
+    buf = malloc(length);
+    if(!buf)
+        return 0;
+    if(_xcb_in_read_block(c, buf, length) <= 0)
+    {
+        free(buf);
+        return 0;
+    }
+
+    if(buf[0] == 1) /* response is a reply */
+    {
+        XCBReplyData *reader = _xcb_list_find(c->in.readers, match_reply, &c->in.request_read);
+        _xcb_queue_enqueue(c->in.current_reply, buf);
+        if(reader)
+            pthread_cond_signal(reader->data);
+        return 1;
+    }
+
+    if(buf[0] == 0) /* response is an error */
+    {
+        XCBReplyData *reader = _xcb_list_find(c->in.readers, match_reply, &c->in.request_read);
+        if(reader && reader->error)
+        {
+            *reader->error = (XCBGenericError *) buf;
+            pthread_cond_signal(reader->data);
+            return 1;
+        }
+    }
+
+    /* event, or error without a waiting reader */
+    _xcb_queue_enqueue(c->in.events, buf);
+    pthread_cond_signal(&c->in.event_cond);
+    return 1; /* I have something for you... */
+}
+
 /* Public interface */
 
 void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError **e)
@@ -77,7 +166,7 @@ void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError **
 
     /* If this request has not been written yet, write it. */
     if((signed int) (c->out.request_written - request) < 0)
-        if(_xcb_out_flush(c) <= 0)
+        if(!_xcb_out_flush(c))
             goto done; /* error */
 
     if(_xcb_list_find(c->in.readers, match_reply, &request))
@@ -99,7 +188,7 @@ void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError **
     while(!(e && *e) && ((signed int) (c->in.request_read - request) < 0 ||
             (c->in.request_read == request &&
 	     _xcb_queue_is_empty(c->in.current_reply))))
-        if(_xcb_conn_wait(c, /*should_write*/ 0, &cond) <= 0)
+        if(!_xcb_conn_wait(c, /*should_write*/ 0, &cond))
             goto done;
 
     if(c->in.request_read != request)
@@ -140,7 +229,7 @@ XCBGenericEvent *XCBWaitForEvent(XCBConnection *c)
     pthread_mutex_lock(&c->iolock);
     /* _xcb_list_remove_head returns 0 on empty list. */
     while(!(ret = _xcb_queue_dequeue(c->in.events)))
-        if(_xcb_conn_wait(c, /*should_write*/ 0, &c->in.event_cond) <= 0)
+        if(!_xcb_conn_wait(c, /*should_write*/ 0, &c->in.event_cond))
             break;
 
     wake_up_next_reader(c);
@@ -160,7 +249,7 @@ XCBGenericEvent *XCBPollForEvent(XCBConnection *c, int *error)
     if(error)
         *error = 0;
     /* FIXME: follow X meets Z architecture changes. */
-    if(_xcb_in_read(c) >= 0)
+    if(_xcb_in_read(c))
         ret = _xcb_queue_dequeue(c->in.events);
     else if(error)
         *error = -1;
@@ -200,7 +289,9 @@ int _xcb_in_init(_xcb_in *in)
     in->replies = _xcb_map_new();
     in->events = _xcb_queue_new();
     in->readers = _xcb_list_new();
-    if(!in->current_reply || !in->replies || !in->events || !in->readers)
+
+    in->pending_replies = _xcb_queue_new();
+    if(!in->current_reply || !in->replies || !in->events || !in->readers || !in->pending_replies)
         return 0;
 
     return 1;
@@ -213,89 +304,33 @@ void _xcb_in_destroy(_xcb_in *in)
     _xcb_map_delete(in->replies, free);
     _xcb_queue_delete(in->events, free);
     _xcb_list_delete(in->readers, 0);
+    _xcb_queue_delete(in->pending_replies, free);
 }
 
-int _xcb_in_expect_reply(XCBConnection *c, unsigned int request)
+int _xcb_in_expect_reply(XCBConnection *c, unsigned int request, enum workarounds workaround)
 {
-    /* XXX: currently a no-op */
-    return 1;
-}
-
-int _xcb_in_read_packet(XCBConnection *c)
-{
-    XCBGenericRep genrep;
-    int length = 32;
-    unsigned char *buf;
-
-    /* Wait for there to be enough data for us to read a whole packet */
-    if(c->in.queue_len < length)
-        return 0;
-
-    /* Get the response type, length, and sequence number. */
-    memcpy(&genrep, c->in.queue, sizeof(genrep));
-
-    /* For reply packets, check that the entire packet is available. */
-    if(genrep.response_type == 1)
-        length += genrep.length * 4;
-
-    buf = malloc(length);
-    if(!buf)
-        return 0;
-    if(_xcb_in_read_block(c, buf, length) <= 0)
-    {
-        free(buf);
-        return 0;
-    }
-
-    /* Compute 32-bit sequence number of this packet. */
-    /* XXX: do "sequence lost" check here */
-    if((genrep.response_type & 0x7f) != KeymapNotify)
+    if(workaround != WORKAROUND_NONE)
     {
-        int lastread = c->in.request_read;
-        c->in.request_read = (lastread & 0xffff0000) | genrep.sequence;
-        if(c->in.request_read != lastread && !_xcb_queue_is_empty(c->in.current_reply))
+        pending_reply *pend = malloc(sizeof(pending_reply));
+        if(!pend)
+            return 0;
+        pend->request = request;
+        pend->workaround = workaround;
+        if(!_xcb_queue_enqueue(c->in.pending_replies, pend))
         {
-            _xcb_map_put(c->in.replies, lastread, c->in.current_reply);
-            c->in.current_reply = _xcb_queue_new();
+            free(pend);
+            return 0;
         }
-        if(c->in.request_read < lastread)
-            c->in.request_read += 0x10000;
     }
-
-    if(buf[0] == 1) /* response is a reply */
-    {
-        XCBReplyData *reader = _xcb_list_find(c->in.readers, match_reply, &c->in.request_read);
-        _xcb_queue_enqueue(c->in.current_reply, buf);
-        if(reader)
-            pthread_cond_signal(reader->data);
-        return 1;
-    }
-
-    if(buf[0] == 0) /* response is an error */
-    {
-        XCBReplyData *reader = _xcb_list_find(c->in.readers, match_reply, &c->in.request_read);
-        if(reader && reader->error)
-        {
-            *reader->error = (XCBGenericError *) buf;
-            pthread_cond_signal(reader->data);
-            return 1;
-        }
-    }
-
-    /* event, or error without a waiting reader */
-    _xcb_queue_enqueue(c->in.events, buf);
-    pthread_cond_signal(&c->in.event_cond);
-    return 1; /* I have something for you... */
+    return 1;
 }
 
 int _xcb_in_read(XCBConnection *c)
 {
     int n = _xcb_readn(c->fd, c->in.queue, sizeof(c->in.queue), &c->in.queue_len);
-    if(n < 0 && errno == EAGAIN)
-        n = 1;
-    while(_xcb_in_read_packet(c) > 0)
+    while(read_packet(c))
         /* empty */;
-    return n;
+    return (n > 0) || (n < 0 && errno == EAGAIN);
 }
 
 int _xcb_in_read_block(XCBConnection *c, void *buf, int len)