Updating for XCB API change around iterators.

This commit is contained in:
Jamey Sharp 2004-07-24 19:30:05 +00:00
parent 7f87ea9a9e
commit fe2ca7e7af
3 changed files with 13 additions and 8 deletions

View file

@ -1,3 +1,8 @@
2004-07-24 Jamey Sharp <jamey@minilop.net>
* src/cairo_xcb_surface.c:
Updating for XCB API change around iterators.
2004-07-20 David Reveman <c99drn@cs.umu.se>
* src/cairo_gl_surface.c (_cairo_gl_surface_get_image): Use new

View file

@ -48,9 +48,9 @@ format_from_visual(XCBConnection *c, XCBVISUALID visual)
if(!r)
return nil;
for(si = XCBRenderQueryPictFormatsScreens(r); si.rem; XCBRenderPICTSCREENNext(&si))
for(di = XCBRenderPICTSCREENDepths(si.data); di.rem; XCBRenderPICTDEPTHNext(&di))
for(vi = XCBRenderPICTDEPTHVisuals(di.data); vi.rem; XCBRenderPICTVISUALNext(&vi))
for(si = XCBRenderQueryPictFormatsScreensIter(r); si.rem; XCBRenderPICTSCREENNext(&si))
for(di = XCBRenderPICTSCREENDepthsIter(si.data); di.rem; XCBRenderPICTDEPTHNext(&di))
for(vi = XCBRenderPICTDEPTHVisualsIter(di.data); vi.rem; XCBRenderPICTVISUALNext(&vi))
if(vi.data->visual.id == visual.id)
{
XCBRenderPICTFORMAT ret = vi.data->format;
@ -123,7 +123,7 @@ format_from_cairo(XCBConnection *c, cairo_format_t fmt)
if(!r)
return ret;
for(fi = XCBRenderQueryPictFormatsFormats(r); fi.rem; XCBRenderPICTFORMINFONext(&fi))
for(fi = XCBRenderQueryPictFormatsFormatsIter(r); fi.rem; XCBRenderPICTFORMINFONext(&fi))
{
const XCBRenderDIRECTFORMAT *t, *f;
if(fi.data->type != XCBRenderPictTypeDirect)

View file

@ -48,9 +48,9 @@ format_from_visual(XCBConnection *c, XCBVISUALID visual)
if(!r)
return nil;
for(si = XCBRenderQueryPictFormatsScreens(r); si.rem; XCBRenderPICTSCREENNext(&si))
for(di = XCBRenderPICTSCREENDepths(si.data); di.rem; XCBRenderPICTDEPTHNext(&di))
for(vi = XCBRenderPICTDEPTHVisuals(di.data); vi.rem; XCBRenderPICTVISUALNext(&vi))
for(si = XCBRenderQueryPictFormatsScreensIter(r); si.rem; XCBRenderPICTSCREENNext(&si))
for(di = XCBRenderPICTSCREENDepthsIter(si.data); di.rem; XCBRenderPICTDEPTHNext(&di))
for(vi = XCBRenderPICTDEPTHVisualsIter(di.data); vi.rem; XCBRenderPICTVISUALNext(&vi))
if(vi.data->visual.id == visual.id)
{
XCBRenderPICTFORMAT ret = vi.data->format;
@ -123,7 +123,7 @@ format_from_cairo(XCBConnection *c, cairo_format_t fmt)
if(!r)
return ret;
for(fi = XCBRenderQueryPictFormatsFormats(r); fi.rem; XCBRenderPICTFORMINFONext(&fi))
for(fi = XCBRenderQueryPictFormatsFormatsIter(r); fi.rem; XCBRenderPICTFORMINFONext(&fi))
{
const XCBRenderDIRECTFORMAT *t, *f;
if(fi.data->type != XCBRenderPictTypeDirect)