Update xcb-util for ConnSetup renaming and constness fixes.

5 files changed, 15 insertions, 15 deletions

diff --git a/convenient/xcb_aux.c b/convenient/xcb_aux.c
index 3241e49..608d83e 100644
--- a/convenient/xcb_aux.c
+++ b/convenient/xcb_aux.c
@@ -32,7 +32,7 @@ XCBSCREEN *
 XCBAuxGetScreen (XCBConnection *c,
 		 int            screen)
 {
-  XCBSCREENIter i = XCBConnSetupSuccessRepRootsIter((XCBConnSetupSuccessRep *)XCBGetSetup(c));
+  XCBSCREENIter i = XCBSetupRootsIter(XCBGetSetup(c));
   for (; i.rem; --screen, XCBSCREENNext(&i))
     if (screen == 0)
       return i.data;
diff --git a/image/xcb_image.c b/image/xcb_image.c
index 40e4b2a..43906cb 100644
--- a/image/xcb_image.c
+++ b/image/xcb_image.c
@@ -36,8 +36,8 @@ static unsigned int Ones(                /* HACKMEM 169 */
 static CARD8
 xcb_bits_per_pixel (XCBConnection *c, CARD8 depth)
 { 
-  XCBFORMAT *fmt = XCBConnSetupSuccessRepPixmapFormats(XCBGetSetup(c));
-  XCBFORMAT *fmtend = fmt + XCBConnSetupSuccessRepPixmapFormatsLength(XCBGetSetup(c));
+  XCBFORMAT *fmt = XCBSetupPixmapFormats(XCBGetSetup(c));
+  XCBFORMAT *fmtend = fmt + XCBSetupPixmapFormatsLength(XCBGetSetup(c));
   
   for(; fmt != fmtend; ++fmt)
     if(fmt->depth == depth)
@@ -62,8 +62,8 @@ static CARD8
 xcb_scanline_pad_get (XCBConnection *conn,
 		      CARD8          depth)
 {
-  XCBFORMAT *fmt = XCBConnSetupSuccessRepPixmapFormats(XCBGetSetup(conn));
-  XCBFORMAT *fmtend = fmt + XCBConnSetupSuccessRepPixmapFormatsLength(XCBGetSetup(conn));
+  XCBFORMAT *fmt = XCBSetupPixmapFormats(XCBGetSetup(conn));
+  XCBFORMAT *fmtend = fmt + XCBSetupPixmapFormatsLength(XCBGetSetup(conn));
   
   for(; fmt != fmtend; ++fmt)
     if(fmt->depth == depth)
@@ -105,9 +105,9 @@ XCBImageCreate (XCBConnection *conn,
 		CARD8          xpad,
 		CARD32         bytes_per_line)
 {
-  XCBImage               *image;
-  XCBConnSetupSuccessRep *rep;
-  CARD8                   bpp = 1; /* bits per pixel */
+  XCBImage       *image;
+  const XCBSetup *rep;
+  CARD8          bpp = 1; /* bits per pixel */
 
   if (format_invalid(depth, format, xpad))
     return (XCBImage *) NULL;
@@ -308,7 +308,7 @@ XCBImagePut (XCBConnection *conn,
       dest_bits_per_pixel = image->bits_per_pixel;
       dest_scanline_pad = image->bitmap_format_scanline_pad;
       left_pad = 0;
-      iter =  XCBConnSetupSuccessRepPixmapFormatsIter (XCBGetSetup (conn));
+      iter = XCBSetupPixmapFormatsIter (XCBGetSetup (conn));
       for (; iter.rem ; XCBFORMATNext (&iter))
 	if (iter.data->depth == image->depth)
 	  {
@@ -319,7 +319,7 @@ XCBImagePut (XCBConnection *conn,
       if (dest_bits_per_pixel != image->bits_per_pixel) {
 	XCBImage       img;
 	register INT32 i, j;
-	XCBConnSetupSuccessRep *rep;
+	const XCBSetup *rep;
 	
 	/* XXX slow, but works */
 	rep = XCBGetSetup (conn);
@@ -382,8 +382,8 @@ XCBImageSHMCreate (XCBConnection *conn,
 		   CARD16         width,
 		   CARD16         height)
 {
-  XCBImage               *image;
-  XCBConnSetupSuccessRep *rep;
+  XCBImage       *image;
+  const XCBSetup *rep;
 
   image = (XCBImage *)malloc (sizeof (XCBImage));
   if (!image)
diff --git a/property/prop.c b/property/prop.c
index cb857ca..cbe2ec8 100644
--- a/property/prop.c
+++ b/property/prop.c
@@ -118,7 +118,7 @@ int SetDefaultPropertyHandler(PropertyHandlers *prophs, CARD32 long_len, Generic
 
 int rootOfScreen(XCBConnection *c, int screen, XCBWINDOW *root)
 {
-	XCBSCREENIter i = XCBConnSetupSuccessRepRootsIter(XCBGetSetup(c));
+	XCBSCREENIter i = XCBSetupRootsIter(XCBGetSetup(c));
 	if(screen >= i.rem)
 		return 0;
 	for(; screen && i.rem; --screen, XCBSCREENNext(&i))
diff --git a/wm/manage.c b/wm/manage.c
index 68d85a8..8c5a29c 100644
--- a/wm/manage.c
+++ b/wm/manage.c
@@ -74,7 +74,7 @@ int handleUnmapNotifyEvent(void *data, XCBConnection *c, XCBUnmapNotifyEvent *e)
 		return 0;
 	}
 
-	root = XCBConnSetupSuccessRepRootsIter(XCBGetSetup(c)).data->root;
+	root = XCBSetupRootsIter(XCBGetSetup(c)).data->root;
 	printf("child of 0x%08lx.\n", client->parent.xid);
 	XCBReparentWindow(c, client->child, root, 0, 0);
 	XCBDestroyWindow(c, client->parent);
diff --git a/wm/xcbwm-test.c b/wm/xcbwm-test.c
index c2455a2..0f09823 100644
--- a/wm/xcbwm-test.c
+++ b/wm/xcbwm-test.c
@@ -81,7 +81,7 @@ void reparentWindow(XCBConnection *c, XCBWINDOW child,
 	XCBDRAWABLE drawable;
 	CARD32 mask = 0;
 	CARD32 values[3];
-	XCBSCREEN *root = XCBConnSetupSuccessRepRootsIter(XCBGetSetup(c)).data;
+	XCBSCREEN *root = XCBSetupRootsIter(XCBGetSetup(c)).data;
 	XCBGCONTEXT titlegc;
 
 	w = XCBWINDOWNew(c);