[xserver-commit] xserver/include cursorstr.h,1.11,1.12 extnsionst.h,3.9,3.10 os.h,3.47,3.48 picture.h,1.20,1.21 window.h,1.5,1.6 windowstr.h,1.8,1.9

[Keith Packard]

Committed by: keithp

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

Modified Files:
	cursorstr.h extnsionst.h os.h picture.h window.h windowstr.h 
Log Message:
	merge xfixes_2_branch back to HEAD


Index: cursorstr.h
===================================================================
RCS file: /cvs/xserver/xserver/include/cursorstr.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cursorstr.h	9 Oct 2003 06:36:26 -0000	1.11
+++ cursorstr.h	2 Nov 2003 19:56:10 -0000	1.12
@@ -79,6 +79,7 @@
     pointer devPriv[MAXSCREENS];		/* set by pScr->RealizeCursor*/
 #ifdef XFIXES
     CARD32 serialNumber;
+    Atom name;
 #endif
 } CursorRec;
 

Index: extnsionst.h
===================================================================
RCS file: /cvs/xserver/xserver/include/extnsionst.h,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -d -r3.9 -r3.10
--- extnsionst.h	11 Sep 2003 05:12:51 -0000	3.9
+++ extnsionst.h	2 Nov 2003 19:56:10 -0000	3.10
@@ -88,28 +88,6 @@
 	xEvent *,
 	xEvent *);
 
-typedef void (* ExtensionLookupProc)(	/*args indeterminate*/
-#ifdef	EXTENSION_PROC_ARGS
-	EXTENSION_PROC_ARGS
-#endif
-);
-
-typedef struct _ProcEntry {
-    char *name;
-    ExtensionLookupProc proc;
-} ProcEntryRec, *ProcEntryPtr;
-
-typedef struct _ScreenProcEntry {
-    int num;
-    ProcEntryPtr procList;
-} ScreenProcEntry;
-
-#define    SetGCVector(pGC, VectorElement, NewRoutineAddress, Atom)    \
-    pGC->VectorElement = NewRoutineAddress;
-
-#define    GetGCValue(pGC, GCElement)    (pGC->GCElement)
-
-
 extern ExtensionEntry *AddExtension(
     char* /*name*/,
     int /*NumEvents*/,
@@ -126,20 +104,6 @@
 
 extern ExtensionEntry *CheckExtension(const char *extname);
 
-extern ExtensionLookupProc LookupProc(
-    char* /*name*/,
-    GCPtr /*pGC*/);
-
-extern Bool RegisterProc(
-    char* /*name*/,
-    GCPtr /*pGC*/,
-    ExtensionLookupProc /*proc*/);
-
-extern Bool RegisterScreenProc(
-    char* /*name*/,
-    ScreenPtr /*pScreen*/,
-    ExtensionLookupProc /*proc*/);
-
 extern void DeclareExtensionSecurity(
     char * /*extname*/,
     Bool /*secure*/);

Index: os.h
===================================================================
RCS file: /cvs/xserver/xserver/include/os.h,v
retrieving revision 3.47
retrieving revision 3.48
diff -u -d -r3.47 -r3.48
--- os.h	29 Sep 2003 01:42:40 -0000	3.47
+++ os.h	2 Nov 2003 19:56:10 -0000	3.48
@@ -53,16 +53,14 @@
 #include "misc.h"
 #if HAVE_ALLOCA
 /* AIX requires this to be the first thing in the file.  */
-# ifndef __GNUC__
-#  if HAVE_ALLOCA_H
+# if HAVE_ALLOCA_H
 #   include <alloca.h>
-#  else
-#   ifdef _AIX
+# else
+#  ifdef _AIX
  #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
+#  else
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
 char *alloca ();
-#    endif
 #   endif
 #  endif
 # endif

Index: picture.h
===================================================================
RCS file: /cvs/xserver/xserver/include/picture.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- picture.h	11 Sep 2003 05:12:51 -0000	1.20
+++ picture.h	2 Nov 2003 19:56:10 -0000	1.21
@@ -160,6 +160,9 @@
 
 int	PictureParseCmapPolicy (const char *name);
 
+extern int	RenderErrBase;
+extern int	RenderClientPrivateIndex;
+
 /* Fixed point updates from Carl Worth, USC, Information Sciences Institute */
 
 #ifdef WIN32

Index: window.h
===================================================================
RCS file: /cvs/xserver/xserver/include/window.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- window.h	27 Apr 2003 21:31:05 -0000	1.5
+++ window.h	2 Nov 2003 19:56:10 -0000	1.6
@@ -251,4 +251,10 @@
     int /*dw*/,
     int /*dh*/);
 
+RegionPtr
+CreateBoundingShape (WindowPtr pWin);
+
+RegionPtr
+CreateClipShape (WindowPtr pWin);
+
 #endif /* WINDOW_H */

Index: windowstr.h
===================================================================
RCS file: /cvs/xserver/xserver/include/windowstr.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- windowstr.h	11 Sep 2003 05:12:51 -0000	1.8
+++ windowstr.h	2 Nov 2003 19:56:10 -0000	1.9
@@ -136,6 +136,9 @@
     unsigned		dstBuffer:1;	/* destination buffer for rendering */
     unsigned		srcBuffer:1;	/* source buffer for rendering */
 #endif
+#ifdef APPORTION
+    unsigned		redirectDraw:1;	/* rendering is redirected from here */
+#endif
     DevUnion		*devPrivates;
 } WindowRec;