[xserver-commit] xserver/Xext shm.c,3.40.2.1,3.40.2.2 shmint.h,1.1.2.1,1.1.2.2

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/Xext
In directory pdx:/tmp/cvs-serv21043/Xext

Modified Files:
      Tag: xfixes_2_branch
	shm.c shmint.h 
Log Message:
	* Xext/shm.c: (ShmRegisterFbFuncs):
	* Xext/shmint.h:
	* dix/window.c: (SetWinSize), (SetBorderSize):
	* fb/Makefile.am:
	* fb/fbcmap.c:
	* fb/fboverlay.c:
	* include/windowstr.h:
	* mi/mivaltree.c: (miComputeClips):
	Move MIT-SHM server declarations to shmint.h
	Start APPORTION dix hooks
	Comment out fbHasVisualTypes as it appears unused


Index: shm.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/shm.c,v
retrieving revision 3.40.2.1
retrieving revision 3.40.2.2
diff -u -d -r3.40.2.1 -r3.40.2.2
--- shm.c	29 Oct 2003 16:26:28 -0000	3.40.2.1
+++ shm.c	31 Oct 2003 21:48:09 -0000	3.40.2.2
@@ -322,8 +322,7 @@
 }
 
 void
-ShmRegisterFbFuncs(pScreen)
-    ScreenPtr pScreen;
+ShmRegisterFbFuncs(ScreenPtr pScreen)
 {
     shmFuncs[pScreen->myNum] = &fbFuncs;
 }

Index: shmint.h
===================================================================
RCS file: /cvs/xserver/xserver/Xext/Attic/shmint.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- shmint.h	29 Oct 2003 16:26:28 -0000	1.1.2.1
+++ shmint.h	31 Oct 2003 21:48:09 -0000	1.1.2.2
@@ -25,10 +25,41 @@
 #ifndef _SHMINT_H_
 #define _SHMINT_H_
 
+#define _XSHM_SERVER_
+#include <X11/extensions/shmstr.h>
+
+#include "screenint.h"
+#include "pixmap.h"
+#include "gc.h"
+
+typedef struct _ShmFuncs {
+    PixmapPtr	(* CreatePixmap)(ScreenPtr	pScreen,
+				 int		width,
+				 int		height,
+				 int		depth,
+				 char		*addr);
+    void	(* PutImage)(DrawablePtr	dst,
+			     GCPtr		pGC,
+			     int		depth,
+			     unsigned int	format,
+			     int		w,
+			     int		h,
+			     int	    	sx,
+			     int	    	sy,
+			     int	    	sw,
+			     int	    	sh,
+			     int	    	dx,
+			     int	    	dy,
+			     char		*data);
+} ShmFuncs, *ShmFuncsPtr;
+
 void
 ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
 
 void
 ShmSetPixmapFormat(ScreenPtr pScreen, int format);
 
+void
+ShmRegisterFbFuncs(ScreenPtr pScreen);
+
 #endif /* _SHMINT_H_ */