Updated for recent API changes.

4 files changed, 15 insertions, 15 deletions

diff --git a/xcb-demo/hypnomoire.c b/xcb-demo/hypnomoire.c
index 17ca2e6..b119a16 100644
--- a/xcb-demo/hypnomoire.c
+++ b/xcb-demo/hypnomoire.c
@@ -47,7 +47,7 @@ int main()
 	DRAWABLE rootwin;
 
 	c = XCBConnectBasic();
-	root = XCBConnSetupSuccessRepRoots(c->setup).data;
+	root = XCBConnSetupSuccessRepRoots(XCBGetSetup(c)).data;
 
 	rootwin.window = root->root;
 	white = XCBGCONTEXTNew(c);
diff --git a/xcb-demo/main.c b/xcb-demo/main.c
index 92a716d..6de84a3 100644
--- a/xcb-demo/main.c
+++ b/xcb-demo/main.c
@@ -205,7 +205,7 @@ int main(int argc, char **argv)
 #endif
 
 #ifdef VERBOSE
-    if(XCBListLength(c->reply_data) > 0)
+    if(_xcb_list_length(c->in.replies) > 0)
         printf("Unexpected additional replies waiting, dunno why...\n");
 #endif
 
diff --git a/xcb-demo/rendertest.c b/xcb-demo/rendertest.c
index 9605042..e42198e 100644
--- a/xcb-demo/rendertest.c
+++ b/xcb-demo/rendertest.c
@@ -120,7 +120,7 @@ int draw_window(XCBConnection *conn, XCBRenderQueryPictFormatsRep *reply)
     POINTFIX        trifans[9];
     int index;
 
-    root = XCBConnSetupSuccessRepRoots(c->setup).data;
+    root = XCBConnSetupSuccessRepRoots(XCBGetSetup(c)).data;
     root_drawable.window = root->root;
    
     /* Setting query so that it will search for an 8 bit alpha surface. */
@@ -512,7 +512,7 @@ int main(int argc, char *argv[])
     PICTFORMINFO  forminfo_query, *forminfo_result;
     
     c = XCBConnectBasic();
-    root = XCBConnSetupSuccessRepRoots(c->setup).data;
+    root = XCBConnSetupSuccessRepRoots(XCBGetSetup(c)).data;
     
     version_cookie = XCBRenderQueryVersion(c, (CARD32)0, (CARD32)3);
     version_reply = XCBRenderQueryVersionReply(c, version_cookie, 0);
diff --git a/xcb-demo/xdpyinfo.c b/xcb-demo/xdpyinfo.c
index a686e1c..c813b0f 100644
--- a/xcb-demo/xdpyinfo.c
+++ b/xcb-demo/xdpyinfo.c
@@ -41,25 +41,25 @@ int main(int argc, char **argv)
 
 void print_setup()
 {
-    printf("version number:    %d.%d", c->setup->protocol_major_version, c->setup->protocol_minor_version);
+    printf("version number:    %d.%d", XCBGetSetup(c)->protocol_major_version, XCBGetSetup(c)->protocol_minor_version);
     fputs("\n" "vendor string:    ", stdout);
-    fwrite(XCBConnSetupSuccessRepVendor(c->setup), 1, XCBConnSetupSuccessRepVendorLength(c->setup), stdout);
-    printf("\n" "vendor release number:    %d", (int) c->setup->release_number);
+    fwrite(XCBConnSetupSuccessRepVendor(XCBGetSetup(c)), 1, XCBConnSetupSuccessRepVendorLength(XCBGetSetup(c)), stdout);
+    printf("\n" "vendor release number:    %d", (int) XCBGetSetup(c)->release_number);
     // "\n" "XFree86 version: %d.%d.%d.%d"
-    printf("\n" "maximum request size:  %d bytes", c->setup->maximum_request_length * 4);
-    printf("\n" "motion buffer size:  %d", (int)c->setup->motion_buffer_size);
-    printf("\n" "bitmap unit, bit order, padding:    %d, %s, %d", c->setup->bitmap_format_scanline_unit, (c->setup->bitmap_format_bit_order == LSBFirst) ? "LSBFirst" : "MSBFirst", c->setup->bitmap_format_scanline_pad);
-    printf("\n" "image byte order:    %s", (c->setup->image_byte_order == LSBFirst) ? "LSBFirst" : "MSBFirst");
+    printf("\n" "maximum request size:  %d bytes", XCBGetSetup(c)->maximum_request_length * 4);
+    printf("\n" "motion buffer size:  %d", (int)XCBGetSetup(c)->motion_buffer_size);
+    printf("\n" "bitmap unit, bit order, padding:    %d, %s, %d", XCBGetSetup(c)->bitmap_format_scanline_unit, (XCBGetSetup(c)->bitmap_format_bit_order == LSBFirst) ? "LSBFirst" : "MSBFirst", XCBGetSetup(c)->bitmap_format_scanline_pad);
+    printf("\n" "image byte order:    %s", (XCBGetSetup(c)->image_byte_order == LSBFirst) ? "LSBFirst" : "MSBFirst");
 
     print_formats();
 
-    printf("\n" "keycode range:    minimum %d, maximum %d", c->setup->min_keycode.id, c->setup->max_keycode.id);
+    printf("\n" "keycode range:    minimum %d, maximum %d", XCBGetSetup(c)->min_keycode.id, XCBGetSetup(c)->max_keycode.id);
 }
 
 void print_formats()
 {
-    int i = XCBConnSetupSuccessRepPixmapFormatsLength(c->setup);
-    FORMAT *p = XCBConnSetupSuccessRepPixmapFormats(c->setup);
+    int i = XCBConnSetupSuccessRepPixmapFormatsLength(XCBGetSetup(c));
+    FORMAT *p = XCBConnSetupSuccessRepPixmapFormats(XCBGetSetup(c));
     printf("\n" "number of supported pixmap formats:    %d", i);
     fputs("\n" "supported pixmap formats:", stdout);
     for(--i; i >= 0; --i, ++p)
@@ -132,7 +132,7 @@ void list_screens()
     SCREENIter i;
     int cur;
 
-    i = XCBConnSetupSuccessRepRoots(c->setup);
+    i = XCBConnSetupSuccessRepRoots(XCBGetSetup(c));
     printf("\n" "number of screens:    %d" "\n", i.rem);
     for(cur = 1; i.rem; SCREENNext(&i), ++cur)
     {