[xserver-commit] xserver ChangeLog,3.30,3.31 Makefile.am,3.8,3.9 configure.ac,3.30,3.31

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver
In directory pdx:/tmp/cvs-serv6826

Modified Files:
	ChangeLog Makefile.am configure.ac 
Log Message:
	* Makefile.am:
	* composite/Makefile.am:
	* composite/compalloc.c: (compReportDamage), (compDestroyDamage),
	(compAllocPixmap), (compFreePixmap), (compReallocPixmap):
	* composite/compinit.c: (compCloseScreen), (compScreenUpdate),
	(compBlockHandler), (compScreenInit), (CompositeExtensionInit):
	* composite/compint.h:
	* composite/compwindow.c: (compCheckWindow), (compCheckTree),
	(compSetPixmapVisitWindow), (compSetPixmap),
	(compShouldBeRedirected), (compCheckRedirect),
	(compPositionWindow), (compRealizeWindow), (compUnrealizeWindow),
	(compReparentWindow), (compCopyWindow), (compCreateWindow),
	(compDestroyWindow), (compRedirectBorderClip),
	(compGetWindowVisual), (compWindowFormat),
	(compWindowUpdateAutomatic), (compWindowPaintBackground),
	(compWindowUpdate):
	* configure.ac:
	* dix/window.c: (SetWinSize), (SetBorderSize):
	* fb/fb.h:
	* fb/fbpict.c: (fbIn24), (fbCompositeTrans_0565xnx0565),
	(fbCompositeSrcSrc_nxn), (fbComposite):
	* fb/fbpict.h:
	* include/picturestr.h:
	* include/windowstr.h:
	* mi/Makefile.am:
	* mi/mi.h:
	* mi/miinitext.c:
	* mi/mivaltree.c: (miRegisterRedirectBorderClipProc),
	(miGetRedirectBorderClipProc), (miComputeClips):
	* miext/damage/damage.c: (damageDestroyPixmap):
	* render/mipict.c: (miValidatePicture):
	* render/picture.c: (SetPictureClipRects), (SetPictureClipRegion):
	* xfixes/region.c: (ProcXFixesSetPictureClipRegion):
	Initial import of Composite extension along with
	name change from Apportion.
	Added some accelerated code to fbpict to make this initial
	hack a bit faster.  "real" extension bits to follow.


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.30
retrieving revision 3.31
diff -u -d -r3.30 -r3.31
--- ChangeLog	2 Nov 2003 20:10:26 -0000	3.30
+++ ChangeLog	5 Nov 2003 05:45:30 -0000	3.31
@@ -1,3 +1,43 @@
+2003-11-04  Keith Packard  <keithp@keithp.com>
+
+	* Makefile.am:
+	* composite/Makefile.am:
+	* composite/compalloc.c: (compReportDamage), (compDestroyDamage),
+	(compAllocPixmap), (compFreePixmap), (compReallocPixmap):
+	* composite/compinit.c: (compCloseScreen), (compScreenUpdate),
+	(compBlockHandler), (compScreenInit), (CompositeExtensionInit):
+	* composite/compint.h:
+	* composite/compwindow.c: (compCheckWindow), (compCheckTree),
+	(compSetPixmapVisitWindow), (compSetPixmap),
+	(compShouldBeRedirected), (compCheckRedirect),
+	(compPositionWindow), (compRealizeWindow), (compUnrealizeWindow),
+	(compReparentWindow), (compCopyWindow), (compCreateWindow),
+	(compDestroyWindow), (compRedirectBorderClip),
+	(compGetWindowVisual), (compWindowFormat),
+	(compWindowUpdateAutomatic), (compWindowPaintBackground),
+	(compWindowUpdate):
+	* configure.ac:
+	* dix/window.c: (SetWinSize), (SetBorderSize):
+	* fb/fb.h:
+	* fb/fbpict.c: (fbIn24), (fbCompositeTrans_0565xnx0565),
+	(fbCompositeSrcSrc_nxn), (fbComposite):
+	* fb/fbpict.h:
+	* include/picturestr.h:
+	* include/windowstr.h:
+	* mi/Makefile.am:
+	* mi/mi.h:
+	* mi/miinitext.c:
+	* mi/mivaltree.c: (miRegisterRedirectBorderClipProc),
+	(miGetRedirectBorderClipProc), (miComputeClips):
+	* miext/damage/damage.c: (damageDestroyPixmap):
+	* render/mipict.c: (miValidatePicture):
+	* render/picture.c: (SetPictureClipRects), (SetPictureClipRegion):
+	* xfixes/region.c: (ProcXFixesSetPictureClipRegion):
+	Initial import of Composite extension along with
+	name change from Apportion.
+	Added some accelerated code to fbpict to make this initial
+	hack a bit faster.  "real" extension bits to follow.
+
 2003-11-02  Keith Packard  <keithp@keithp.com>
 
 	* os/osdep.h:

Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/Makefile.am,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -d -r3.8 -r3.9
--- Makefile.am	2 Nov 2003 19:56:09 -0000	3.8
+++ Makefile.am	5 Nov 2003 05:45:30 -0000	3.9
@@ -1,4 +1,8 @@
 AUTOMAKE_OPTIONS=dist-bzip2
+if COMPOSITE
+COMPOSITE_SUBDIR = composite
+endif
+
 SUBDIRS=	\
 	dix 	\
 	fb	\
@@ -10,5 +14,6 @@
 	render  \
 	xfixes  \
 	damageext \
+	$(COMPOSITE_SUBDIR) \
 	hw
 

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.30
retrieving revision 3.31
diff -u -d -r3.30 -r3.31
--- configure.ac	2 Nov 2003 19:56:09 -0000	3.30
+++ configure.ac	5 Nov 2003 05:45:30 -0000	3.31
@@ -83,6 +83,7 @@
 
 AC_ARG_ENABLE(shape,         [  --disable-shape ],[SHAPE=$enableval],[SHAPE=yes])
 AC_ARG_ENABLE(xv,            [  --enable-xv ],[XV=$enableval],[XV=no])
+AC_ARG_ENABLE(composite,     [  --enable-composite ],[COMPOSITE=$enableval],[COMPOSITE=no])
 AC_ARG_ENABLE(mitshm,        [  --disable-shm ],[MITSHM=$enableval],[MITSHM=yes])
 AC_ARG_ENABLE(xres,          [  --disable-res ],[RES=$enableval],[RES=yes])
 AC_ARG_ENABLE(kdriveserver,  [  --disable-kdriveserver ],[KDRIVESERVER=$enableval],[KDRIVESERVER=yes])
@@ -115,6 +116,11 @@
 	AC_DEFINE(XV,1,[Support Xv Extension])
 fi
 
+AM_CONDITIONAL(COMPOSITE, [test x$COMPOSITE = xyes])
+if test "$COMPOSITE" = yes; then
+	AC_DEFINE(COMPOSITE,1,[Support Composite Extension])
+fi
+
 AM_CONDITIONAL(MITSHM, [test x$MITSHM = xyes])
 if test "$MITSHM" = yes; then
 	AC_DEFINE(MITSHM,1,[Support MIT-SHM Extension])
@@ -248,6 +254,12 @@
 EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/damageext/libdamageext.a'
 EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/damageext'
 
+if test "$COMPOSITE" = yes; then
+	EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/composite/libcomposite.a'
+	EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/composite'
+fi
+	
+
 DIX_LIB='$(top_builddir)/dix/libdix.a'
 OS_LIB='$(top_builddir)/os/libos.a'
 MI_LIB='$(top_builddir)/mi/libmi.a'
@@ -316,6 +328,7 @@
 render/Makefile
 xfixes/Makefile
 damageext/Makefile
+composite/Makefile
 Xext/Makefile
 hw/Makefile
 hw/kdrive/Makefile