More return value changes, and make _xcb_in_read_packet static since it is not called...

[free-sw/xcb/libxcb] / src / xcb_out.c

diff --git a/src/xcb_out.c b/src/xcb_out.c
index b3a556a..62d7053 100644 (file)
--- a/src/xcb_out.c
+++ b/src/xcb_out.c
@@ -75,6 +75,7 @@ int XCBSendRequest(XCBConnection *c, unsigned int *request, struct iovec *vector
     struct iovec prefix[2];
     CARD16 shortlen = 0;
     CARD32 longlen = 0;
+    enum workarounds workaround = WORKAROUND_NONE;
 
     assert(c != 0);
     assert(request != 0);
@@ -121,6 +122,12 @@ int XCBSendRequest(XCBConnection *c, unsigned int *request, struct iovec *vector
         assert(extension && extension->present);
         ((CARD8 *) prefix[0].iov_base)[0] = extension->major_opcode;
         ((CARD8 *) prefix[0].iov_base)[1] = req->opcode;
+
+        /* do we need to work around the X server bug described in glx.xml? */
+        if(strcmp(req->ext->name, "GLX") &&
+                ((req->opcode == 17 && ((CARD32 *) vector[0].iov_base)[0] == 0x10004) ||
+                 req->opcode == 21))
+            workaround = WORKAROUND_GLX_GET_FB_CONFIGS_BUG;
     }
     else
         ((CARD8 *) prefix[0].iov_base)[0] = req->opcode;
@@ -136,7 +143,7 @@ int XCBSendRequest(XCBConnection *c, unsigned int *request, struct iovec *vector
     *request = ++c->out.request;
 
     if(!req->isvoid)
-        _xcb_in_expect_reply(c, *request);
+        _xcb_in_expect_reply(c, *request, workaround);
 
     ret = _xcb_out_write_block(c, prefix, i);
     if(ret > 0)
@@ -167,7 +174,6 @@ int _xcb_out_init(_xcb_out *out)
     out->vec = 0;
     out->vec_len = 0;
 
-    out->last_request = 0;
     out->request = 0;
     out->request_written = 0;
 
@@ -193,8 +199,9 @@ int _xcb_out_write(XCBConnection *c)
     else
         n = _xcb_write(c->fd, &c->out.queue, &c->out.queue_len);
 
-    if(n < 0 && errno == EAGAIN)
-        n = 1;
+    /* XXX: should "nothing was written" be considered failure or
+     * success for this function? it's not an I/O error, but... */
+    n = (n > 0) || (n < 0 && errno == EAGAIN);
 
     if(c->out.vec_len)
     {
@@ -252,7 +259,7 @@ int _xcb_out_write_block(XCBConnection *c, struct iovec *vector, size_t count)
         c->out.vec[c->out.vec_len].iov_base = (void *) pad;
         c->out.vec[c->out.vec_len++].iov_len = XCB_PAD(vector[i].iov_len);
     }
-    if(_xcb_out_flush(c) <= 0)
+    if(!_xcb_out_flush(c))
         len = -1;
     free(c->out.vec);
     c->out.vec = 0;
@@ -263,10 +270,9 @@ int _xcb_out_write_block(XCBConnection *c, struct iovec *vector, size_t count)
 int _xcb_out_flush(XCBConnection *c)
 {
     int ret = 1;
-    while(ret > 0 && (c->out.queue_len || c->out.vec_len))
-        ret = _xcb_conn_wait(c, /*should_write*/ 1, &c->out.cond);
-    c->out.last_request = 0;
     c->out.request_written = c->out.request;
+    while(ret && (c->out.queue_len || c->out.vec_len))
+        ret = _xcb_conn_wait(c, /*should_write*/ 1, &c->out.cond);
     pthread_cond_broadcast(&c->out.cond);
     return ret;
 }