diff options
| author | Ian Osgood <iano@quirkster.com> | 2006-05-04 14:29:03 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2006-05-04 14:29:03 -0700 |
| commit | 8c9da52dc285576e47b4e527487f0b2451ab87cc (patch) | |
| tree | e794452330637255a9c1fa20dae78a6488605f55 /src/cairo-xcb-surface.c | |
| parent | 450e29ce091e352569518bb5d6a9bf5236f14bfe (diff) | |
Fix the XCB backend build for the XCB 0.9 release.
* use split out xcb-render package
* fix deprecated calls
* use XCB-specific symbols
Diffstat (limited to 'src/cairo-xcb-surface.c')
| -rw-r--r-- | src/cairo-xcb-surface.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c index 8f0932da..a2816946 100644 --- a/src/cairo-xcb-surface.c +++ b/src/cairo-xcb-surface.c @@ -287,8 +287,8 @@ _cairo_xcb_surface_finish (void *abstract_surface) 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 *surface, { 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 *surface, 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 *surface, _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 (XCBConnection *dpy, /* 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); |