From: Ian Osgood <iano@quirkster.com>
Date: Tue, 30 May 2006 18:54:25 +0000 (-0700)
Subject: Deprecate XCBSync, move to XCBAuxSync.
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6a85ba0b0e85254fdd917e91a3613b550d4b414;p=free-sw%2Fxcb%2Fdemo

Deprecate XCBSync, move to XCBAuxSync.
---

diff --git a/hypnomoire.c b/hypnomoire.c
index cb4600b..46e2999 100644
--- a/hypnomoire.c
+++ b/hypnomoire.c
@@ -95,6 +95,7 @@ void paint(int idx)
 {
 	XCBCopyArea(c, windows[idx].p, windows[idx].w, white, 0, 0, 0, 0,
 		windows[idx].width, windows[idx].height);
+	/* TODO: better error detection for broken pipe */
 	if(!XCBSync(c, 0))
 	{
 		perror("XCBSync failed");
@@ -149,7 +150,7 @@ void *run(void *param)
 		XCBPolyFillRectangle(c, windows[idx].p, white, 1, &rect);
 	}
 
-	XCBSync(c, 0);
+	XCBFlush(c);
 
 	while(1)
 	{
diff --git a/rendertest.c b/rendertest.c
index d738288..82900ba 100644
--- a/rendertest.c
+++ b/rendertest.c
@@ -398,7 +398,7 @@ int draw_window(XCBConnection *conn, XCBRenderQueryPictFormatsRep *reply)
     XCBRenderFreePicture(conn, root_picture);
    
     /* sync up and leave the function */
-    XCBSync(conn, 0);
+    XCBFlush(conn);
     return 0;
 }
 
diff --git a/tests/flames.c b/tests/flames.c
index 89fd331..1db9b1c 100644
--- a/tests/flames.c
+++ b/tests/flames.c
@@ -139,7 +139,7 @@ flame_init ()
   XCBPolyFillRectangle(f->xcb.c, f->xcb.pixmap, gc, 1, &rect_coord);
 
   XCBMapWindow (f->xcb.c, f->xcb.draw.window);
-  XCBSync (f->xcb.c, 0);
+  XCBFlush (f->xcb.c);
 
   f->xcb.cmap = XCBCOLORMAPNew (f->xcb.c);
   XCBCreateColormap (f->xcb.c,
@@ -216,7 +216,7 @@ main ()
 	    case XCBExpose:
 	      XCBCopyArea(f->xcb.c, f->xcb.pixmap, f->xcb.draw, gc,
 		          0, 0, 0, 0, BG_W, BG_H);
-	      XCBSync (f->xcb.c, 0);
+	      XCBFlush (f->xcb.c);
 	      break;
             case XCBButtonPress:
               printf ("Exiting...\n");
diff --git a/tests/julia.c b/tests/julia.c
index 6e5b9c2..b22cd5d 100644
--- a/tests/julia.c
+++ b/tests/julia.c
@@ -177,7 +177,7 @@ main (int argc, char *argv[])
 
   palette_julia (&data);
 
-  XCBSync (data.conn, 0); 
+  XCBFlush (data.conn); 
 
   while ((e = XCBWaitForEvent(data.conn)))
     {
@@ -188,7 +188,7 @@ main (int argc, char *argv[])
 	    XCBCopyArea(data.conn, rect, data.draw, bgcolor,
 			0, 0, 0, 0, W_W, W_H);
 	    draw_julia (&data);
-	    XCBSync (data.conn, 0);
+	    XCBFlush (data.conn);
 	    break;
 	  }
 	case XCBKeyRelease:
diff --git a/tests/lissajoux.c b/tests/lissajoux.c
index f8c8e91..1e787bf 100644
--- a/tests/lissajoux.c
+++ b/tests/lissajoux.c
@@ -251,7 +251,7 @@ main (int argc, char *argv[])
   XCBPolyFillRectangle(data.conn, rect, bgcolor, 1, &rect_coord);
 
   data.format = XCBImageFormatZPixmap;
-  XCBSync (data.conn, 0); 
+  XCBFlush (data.conn); 
 
   if (try_shm)
     shm_test (&data);
@@ -273,7 +273,6 @@ main (int argc, char *argv[])
 	    case XCBExpose:
 	      XCBCopyArea(data.conn, rect, data.draw, bgcolor,
 		          0, 0, 0, 0, W_W, W_H);
-	      XCBSync (data.conn, 0);
 	      break;
 	    }
 	  free (e);