[cairo-commit] cairo/src cairo_xcb_surface.c,NONE,1.1 Makefile.am,1.19,1.20 cairo-features.h.in,1.2,1.3 cairo.h,1.42,1.43

[Jamey Sharp]

Committed by: jamey

Update of /cvs/cairo/cairo/src
In directory pdx:/tmp/cvs-serv30227/src

Modified Files:
	Makefile.am cairo-features.h.in cairo.h 
Added Files:
	cairo_xcb_surface.c 
Log Message:
Ported the Xlib surface backend to XCB.


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

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/src/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Makefile.am	23 Jan 2004 04:47:24 -0000	1.19
--- Makefile.am	3 Feb 2004 07:24:14 -0000	1.20
***************
*** 10,13 ****
--- 10,17 ----
  endif
  
+ if CAIRO_HAS_XCB_SURFACE
+ libcairo_xcb_sources = cairo_xcb_surface.c
+ endif
+ 
  # These names match automake style variable definition conventions so
  # without these lines, automake will complain during the handling of 
***************
*** 41,49 ****
  	$(libcairo_ps_sources)  \
  	$(libcairo_xlib_sources)\
  	cairoint.h
  
  libcairo_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
  
! INCLUDES = -I$(srcdir) $(CAIRO_CFLAGS) $(FONTCONFIG_CFLAGS) $(XRENDER_CFLAGS) $(X_CFLAGS)
  
! libcairo_la_LIBADD = $(CAIRO_LIBS) $(FONTCONFIG_LIBS) $(XRENDER_LIBS) $(X_LIBS) -lm
--- 45,54 ----
  	$(libcairo_ps_sources)  \
  	$(libcairo_xlib_sources)\
+ 	$(libcairo_xcb_sources) \
  	cairoint.h
  
  libcairo_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
  
! INCLUDES = -I$(srcdir) $(CAIRO_CFLAGS) $(FONTCONFIG_CFLAGS) $(XRENDER_CFLAGS) $(X_CFLAGS) $(XCB_CFLAGS)
  
! libcairo_la_LIBADD = $(CAIRO_LIBS) $(FONTCONFIG_LIBS) $(XRENDER_LIBS) $(X_LIBS) $(XCB_LIBS) -lm

Index: cairo-features.h.in
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-features.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cairo-features.h.in	12 Dec 2003 19:44:16 -0000	1.2
--- cairo-features.h.in	3 Feb 2004 07:24:14 -0000	1.3
***************
*** 33,35 ****
--- 33,37 ----
  #define @XLIB_SURFACE_FEATURE@
  
+ #define @XCB_SURFACE_FEATURE@
+ 
  #endif

Index: cairo.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** cairo.h	30 Jan 2004 22:44:18 -0000	1.42
--- cairo.h	3 Feb 2004 07:24:14 -0000	1.43
***************
*** 114,117 ****
--- 114,130 ----
  #endif /* CAIRO_HAS_XLIB_SURFACE */
  
+ #ifdef CAIRO_HAS_XCB_SURFACE
+ 
+ #include <X11/XCB/xcb.h>
+ #include <X11/XCB/render.h>
+ 
+ void
+ cairo_set_target_xcb (cairo_t		*cr,
+ 		      XCBConnection	*dpy,
+ 		      DRAWABLE		drawable,
+ 		      VISUALTYPE	*visual,
+ 		      cairo_format_t	format);
+ #endif /* CAIRO_HAS_XCB_SURFACE */
+ 
  typedef enum cairo_operator { 
      CAIRO_OPERATOR_CLEAR,