[cairo-commit] cairo/test Makefile.am, 1.47, 1.48 cairo-test.c, 1.31, 1.32 xlib-surface.c, NONE, 1.1

[Owen Taylor]

Committed by: otaylor

Update of /cvs/cairo/cairo/test
In directory gabe:/tmp/cvs-serv27045/test

Modified Files:
	Makefile.am cairo-test.c 
Added Files:
	xlib-surface.c 
Log Message:
2005-05-13  Owen Taylor  <otaylor at redhat.com>

        * src/cairo-xlib-surface.c src/cairo-xlib.h
        doc/public/cairo-sections.txt: Drop the _for_pixmap() and
        _for_window() out of the create functions and use some lazy
        cleverness to sniff the information out as needed.

        * src/cairo-xlib-surface.c src/cairo-xlib-test.h Makefile.am:
        add cairo_test_xlib_disable_render() to turn off RENDER
        for tests.

        * test/xlib-surface.c: Test various different types of
        Xlib surface creation.

        * src/cairo-xlib.h: Remove left-over include of Xrender.h.


Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/test/Makefile.am,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- Makefile.am	12 May 2005 18:02:35 -0000	1.47
+++ Makefile.am	14 May 2005 00:54:43 -0000	1.48
@@ -37,6 +37,10 @@
 TESTS += pdf-surface
 endif
 
+if CAIRO_HAS_XLIB_SURFACE
+TESTS += xlib-surface
+endif
+
 # All tests which have a reference image go here.
 # I really don't like having to repeat this list. Anyone know a good
 # way to avoid it? Can I use a wildcard here?
@@ -149,6 +153,7 @@
 trap_clip_LDADD = $(LDADDS)
 user_data_LDADD = $(LDADDS)
 rel_path_LDADD = $(LDADDS)
+xlib_surface_LDADD = $(LDADDS)
 
 noinst_PROGRAMS = imagediff
 imagediff_LDADD = $(LDADDS)

Index: cairo-test.c
===================================================================
RCS file: /cvs/cairo/cairo/test/cairo-test.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- cairo-test.c	11 May 2005 23:01:56 -0000	1.31
+++ cairo-test.c	14 May 2005 00:54:43 -0000	1.32
@@ -236,8 +236,8 @@
     xtc->pixmap = XCreatePixmap (dpy, DefaultRootWindow (dpy),
 				 width, height, 32);
 
-    surface = cairo_xlib_surface_create_for_pixmap (dpy, xtc->pixmap,
-							 CAIRO_FORMAT_ARGB32);
+    surface = cairo_xlib_surface_create (dpy, xtc->pixmap,
+					 CAIRO_FORMAT_ARGB32);
     cairo_xlib_surface_set_size (surface, width, height);
 
     return surface;

--- NEW FILE: xlib-surface.c ---
(This appears to be a binary file; contents omitted.)