[xserver-commit] xserver/include pixmapstr.h,1.2,1.3

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/include
In directory pdx:/tmp/cvs-serv8754/include

Modified Files:
	pixmapstr.h 
Log Message:
	* composite/compalloc.c: (compReportDamage), (compRedirectWindow),
	(compFreeClientWindow), (compFreeClientSubwindows),
	(compRedirectOneSubwindow), (compUnredirectOneSubwindow),
	(compAllocPixmap), (compFreePixmap), (compReallocPixmap):
	* composite/compext.c: (CompositeExtensionInit):
	* composite/compinit.c: (compScreenInit):
	* composite/compint.h:
	* composite/compwindow.c: (compCheckRedirect),
	(compReparentWindow), (compCopyWindow), (compDestroyWindow),
	(compSetRedirectBorderClip), (compGetRedirectBorderClip),
	(compWindowUpdateAutomatic), (compWindowUpdate):
	* fb/fb.h:
	* fb/fbpixmap.c: (fbCreatePixmapBpp):
	* fb/fbwindow.c: (fbCopyWindow):
	* hw/kdrive/fbdev/fbdev.c: (fbdevInitialize), (fbdevScreenInit):
	* hw/kdrive/linux/keyboard.c: (readKernelMapping):
	* hw/kdrive/linux/linux.c: (LinuxInit), (LinuxSpecialKey),
	(LinuxFini):
	* hw/kdrive/linux/mouse.c: (MouseWaitForReadable), (MouseReadByte),
	(ps2SkipInit), (MouseRead):
	* hw/kdrive/smi/smi.c: (smiScreenInit):
	* include/pixmapstr.h:
	* mi/mi.h:
	* mi/midispcur.c:
	* mi/mivaltree.c: (miRegisterRedirectBorderClipProc),
	(miComputeClips):
	* miext/damage/damage.c: (DamageDamageRegion):
	* miext/damage/damage.h:
	* render/mipict.c: (miValidatePicture):
	Ok, Composite extension is semi-working; when no-one asks
	for redirection, the server seems to act as before.  With
	RedirectSubwindows (root, automatic), the server looks just
	like a regular X server.  Now to go rewrite the (currently lame)
	compositing manager to get some real action on the screen.
	
	Some of the fixes here are to make valgrind quiet with
	various ioctls used by kdrive/linux.

	Also fixed a bug where fbdev initialization was out of order
	in fbdev.c and smi.c


Index: pixmapstr.h
===================================================================
RCS file: /cvs/xserver/xserver/include/pixmapstr.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pixmapstr.h	14 Dec 2001 19:59:55 -0000	1.2
+++ pixmapstr.h	7 Nov 2003 23:29:29 -0000	1.3
@@ -74,6 +74,16 @@
     DrawableRec		drawable;
     int			refcnt;
     int			devKind;
+    /*
+     * for pixmaps used to hold window contents, these two
+     * coordinates indicate the position of the pixmap relative
+     * to the origin of the screen.  Offset window drawing by 
+     * the negative of this amount.
+     */
+#ifdef COMPOSITE
+    short		screen_x;
+    short		screen_y;
+#endif
     DevUnion		devPrivate;
 #ifdef PIXPRIV
     DevUnion		*devPrivates; /* real devPrivates like gcs & windows */