[cairo-commit] cairo-demo/X11 ChangeLog, 1.14, 1.15 cairo-demo-xcb.c, 1.1, 1.2 cairo-demo.c, 1.13, 1.14 cairo-knockout.c, 1.15, 1.16 cairo-spline.c, 1.12, 1.13

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo-demo/X11
In directory gabe:/tmp/cvs-serv3289

Modified Files:
	ChangeLog cairo-demo-xcb.c cairo-demo.c cairo-knockout.c 
	cairo-spline.c 
Log Message:

        * cairo-demo-xcb.c: (win_draw):
        * cairo-demo.c: (win_draw):
        * cairo-knockout.c: (main):
        * cairo-spline.c: (win_refresh): Update for yet more cairo API
        changes.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-demo/X11/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ChangeLog	13 May 2005 22:33:59 -0000	1.14
+++ ChangeLog	17 May 2005 14:50:15 -0000	1.15
@@ -1,3 +1,11 @@
+2005-05-17  Carl Worth  <cworth at cworth.org>
+
+	* cairo-demo-xcb.c: (win_draw):
+	* cairo-demo.c: (win_draw):
+	* cairo-knockout.c: (main):
+	* cairo-spline.c: (win_refresh): Update for yet more cairo API
+	changes.
+
 2005-05-13  Carl Worth  <cworth at cworth.org>
 
 	* .cvsignore:

Index: cairo-demo-xcb.c
===================================================================
RCS file: /cvs/cairo/cairo-demo/X11/cairo-demo-xcb.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cairo-demo-xcb.c	13 May 2005 22:33:59 -0000	1.1
+++ cairo-demo-xcb.c	17 May 2005 14:50:15 -0000	1.2
@@ -203,9 +203,8 @@
 
     XCBClearArea(win->dpy, 0, win->win, 0, 0, 0, 0);
 
-    surface = cairo_xcb_surface_create_for_window_with_visual (win->dpy,
-							       win->win,
-							       win->visual);
+    surface = cairo_xcb_surface_create (win->dpy, drawable, win->visual,
+					win->width, win->height);
     cr = cairo_create(surface);
 
     cairo_set_source_rgb(cr, 1, 1, 1);

Index: cairo-demo.c
===================================================================
RCS file: /cvs/cairo/cairo-demo/X11/cairo-demo.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cairo-demo.c	13 May 2005 22:33:59 -0000	1.13
+++ cairo-demo.c	17 May 2005 14:50:15 -0000	1.14
@@ -202,9 +202,8 @@
 
     XClearWindow(win->dpy, win->win);
 
-    surface = cairo_xlib_surface_create_for_window_with_visual (win->dpy,
-								win->win,
-								visual);
+    surface = cairo_xlib_surface_create (win->dpy, win->win, visual,
+					 win->width, win->height);
     cr = cairo_create(surface);
 
     cairo_set_source_rgb(cr, 1, 1, 1);

Index: cairo-knockout.c
===================================================================
RCS file: /cvs/cairo/cairo-demo/X11/cairo-knockout.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cairo-knockout.c	13 May 2005 22:33:59 -0000	1.15
+++ cairo-knockout.c	17 May 2005 14:50:15 -0000	1.16
@@ -13,6 +13,7 @@
  * Keeping log of changes in ChangeLog/CVS now. (2003-11-19) Carl Worth
  */
 #include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <cairo.h>
 #include <cairo-xlib.h>
 #include <math.h>
@@ -291,9 +292,9 @@
       if (!XPending (dpy) && needs_redraw) {
           cairo_surface_t *surface;
           cairo_t *cr;
-          surface = cairo_xlib_surface_create_for_pixmap_with_visual (dpy,
-                                                                      pixmap,
-                                                                      DefaultVisual (dpy, DefaultScreen (dpy)));
+          surface = cairo_xlib_surface_create (dpy, pixmap,
+                                               DefaultVisual (dpy, DefaultScreen (dpy)),
+                                               width, height);
           cr = cairo_create (surface);
 
           draw (cr, width, height);

Index: cairo-spline.c
===================================================================
RCS file: /cvs/cairo/cairo-demo/X11/cairo-spline.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- cairo-spline.c	13 May 2005 22:33:59 -0000	1.12
+++ cairo-spline.c	17 May 2005 14:50:15 -0000	1.13
@@ -236,9 +236,9 @@
 
     XFillRectangle(dpy, win->pix, win->gc, 0, 0, win->width, win->height);
 
-    surface = cairo_xlib_surface_create_for_pixmap_with_visual (dpy,
-								win->pix,
-								DefaultVisual (dpy, win->scr));
+    surface = cairo_xlib_surface_create (dpy, win->pix,
+					 DefaultVisual (dpy, win->scr),
+					 win->width, win->height);
     cr = cairo_create(surface);
 
     cairo_set_source_rgb(cr, 0, 0, 0);