[cairo-commit] configure.in src/cairo-xcb-surface.c

[Carl Worth]

 configure.in            |    2 +-
 src/cairo-xcb-surface.c |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
diff-tree 8c9da52dc285576e47b4e527487f0b2451ab87cc (from 450e29ce091e352569518bb5d6a9bf5236f14bfe)
Author: Ian Osgood <iano at quirkster.com>
Date:   Thu May 4 14:29:03 2006 -0700

    Fix the XCB backend build for the XCB 0.9 release.
    
    * use split out xcb-render package
    * fix deprecated calls
    * use XCB-specific symbols

diff --git a/configure.in b/configure.in
index 2699c3c..5aa09bb 100644
--- a/configure.in
+++ b/configure.in
@@ -166,7 +166,7 @@ CAIRO_LIBS="$CAIRO_LIBS $QUARTZ_LIBS"
 dnl ===========================================================================
 
 CAIRO_BACKEND_ENABLE(xcb, XCB, no, [
-  PKG_CHECK_MODULES(XCB, xcb, [use_xcb=yes], [
+  PKG_CHECK_MODULES(XCB, xcb xcb-render, [use_xcb=yes], [
   use_xcb="no (requires XCB http://xcb.freedesktop.org)"])
 ])
 
diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
index 8f0932d..a281694 100644
--- a/src/cairo-xcb-surface.c
+++ b/src/cairo-xcb-surface.c
@@ -287,8 +287,8 @@ _cairo_xcb_surface_finish (void *abstrac
 static int
 _bits_per_pixel(XCBConnection *c, int 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)
@@ -405,7 +405,7 @@ _get_image_surface (cairo_xcb_surface_t 
     {
 	XCBGenericError *error;
 	imagerep = XCBGetImageReply(surface->dpy,
-				    XCBGetImage(surface->dpy, ZPixmap,
+				    XCBGetImage(surface->dpy, XCBImageFormatZPixmap,
 						surface->drawable,
 						x1, y1,
 						x2 - x1, y2 - y1,
@@ -444,7 +444,7 @@ _get_image_surface (cairo_xcb_surface_t 
 		     x1, y1, 0, 0, x2 - x1, y2 - y1);
 
 	imagerep = XCBGetImageReply(surface->dpy,
-				    XCBGetImage(surface->dpy, ZPixmap,
+				    XCBGetImage(surface->dpy, XCBImageFormatZPixmap,
 						drawable,
 						x1, y1,
 						x2 - x1, y2 - y1,
@@ -558,7 +558,7 @@ _draw_image_surface (cairo_xcb_surface_t
     _cairo_xcb_surface_ensure_gc (surface);
     bpp = _bits_per_pixel(surface->dpy, image->depth);
     data_len = _bytes_per_line(surface->dpy, image->width, bpp) * image->height;
-    XCBPutImage(surface->dpy, ZPixmap, surface->drawable, surface->gc,
+    XCBPutImage(surface->dpy, XCBImageFormatZPixmap, surface->drawable, surface->gc,
 	      image->width,
 	      image->height,
 	      dst_x, dst_y,
@@ -1130,7 +1130,7 @@ _cairo_xcb_surface_create_internal (XCBC
 	/* This is ugly, but we have to walk over all visuals
 	 * for the display to find the depth.
 	 */
-        roots = XCBConnSetupSuccessRepRootsIter(XCBGetSetup(surface->dpy));
+        roots = XCBSetupRootsIter(XCBGetSetup(surface->dpy));
         for(; roots.rem; XCBSCREENNext(&roots))
         {
 	    depths = XCBSCREENAllowedDepthsIter(roots.data);