[Xcb-commit] 3 commits - xcb xcb-proto

[Jamey Sharp]

 xcb-proto/src/xproto.xml |    3 ++-
 xcb/src/xcb_xid.c        |   15 ++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

New commits:
diff-tree ac59944f2a3b5970898374c63a73c2ff92e8336c (from 670bdc24f708f4078892ebf0da065eb1ad7eeb26)
Author: Jamey Sharp <jamey at minilop.net>
Date:   Sat Sep 9 15:52:37 2006 -0700

    Handle XC-MISC request failure when allocating new XIDs. (fixes #7001)

diff --git a/xcb/src/xcb_xid.c b/xcb/src/xcb_xid.c
index 7d7f784..1c53b53 100644
--- a/xcb/src/xcb_xid.c
+++ b/xcb/src/xcb_xid.c
@@ -39,11 +39,16 @@ CARD32 XCBGenerateID(XCBConnection *c)
     pthread_mutex_lock(&c->xid.lock);
     if(c->xid.last == c->xid.max)
     {
-	    XCBXCMiscGetXIDRangeRep *range;
-	    range = XCBXCMiscGetXIDRangeReply(c, XCBXCMiscGetXIDRange(c), 0);
-	    c->xid.last = range->start_id;
-	    c->xid.max = range->start_id + (range->count - 1) * c->xid.inc;
-	    free(range);
+        XCBXCMiscGetXIDRangeRep *range;
+        range = XCBXCMiscGetXIDRangeReply(c, XCBXCMiscGetXIDRange(c), 0);
+        if(!range)
+        {
+            pthread_mutex_unlock(&c->xid.lock);
+            return -1;
+        }
+        c->xid.last = range->start_id;
+        c->xid.max = range->start_id + (range->count - 1) * c->xid.inc;
+        free(range);
     }
     ret = c->xid.last | c->xid.base;
     c->xid.last += c->xid.inc;
diff-tree 670bdc24f708f4078892ebf0da065eb1ad7eeb26 (from parents)
Merge: 083269c444cdfba259f1b5ec474ca7b819c00e74 b0d393f644d1c2eb3eb59a664e7488813805b883
Author: Jamey Sharp <jamey at minilop.net>
Date:   Sat Sep 9 14:35:20 2006 -0700

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb

diff-tree 083269c444cdfba259f1b5ec474ca7b819c00e74 (from 0605cfaef0e4e580c2b243accac59bdfc642b94e)
Author: Jamey Sharp <jamey at minilop.net>
Date:   Mon Aug 7 14:28:08 2006 -0700

    Remove combine-adjacent tag on PolyPoint: it will not work for some forms of the request.

diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index d0c3b1f..dd9ea42 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -1559,7 +1559,8 @@ authorization from the authors.
     <item name="Previous"><value>1</value></item>
   </enum>
 
-  <request name="PolyPoint" opcode="64" combine-adjacent="true">
+  <!-- combine-adjacent doesn't work for mode==Relative -->
+  <request name="PolyPoint" opcode="64">
     <field type="BYTE" name="coordinate_mode" />
     <field type="DRAWABLE" name="drawable" />
     <field type="GCONTEXT" name="gc" />