[xserver-commit] xserver/dix Makefile.am,3.7,3.8 cursor.c,3.11,3.12 dispatch.c,3.31,3.32 extension.c,3.14,3.15 property.c,3.14,3.15 window.c,3.34,3.35 xpstubs.c,1.5,1.6

[Keith Packard]

Committed by: keithp

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

Modified Files:
	Makefile.am cursor.c dispatch.c extension.c property.c 
	window.c xpstubs.c 
Log Message:
	merge xfixes_2_branch back to HEAD


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/dix/Makefile.am,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -d -r3.7 -r3.8
--- Makefile.am	1 Oct 2003 06:43:50 -0000	3.7
+++ Makefile.am	2 Nov 2003 19:56:10 -0000	3.8
@@ -1,5 +1,5 @@
 INCLUDES = 			\
-	$(XSERVER_CFLAGS)
+	@XSERVER_CFLAGS@
 
 noinst_LIBRARIES = libdix.a libxpstubs.a
 

Index: cursor.c
===================================================================
RCS file: /cvs/xserver/xserver/dix/cursor.c,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -d -r3.11 -r3.12
--- cursor.c	9 Oct 2003 06:36:26 -0000	3.11
+++ cursor.c	2 Nov 2003 19:56:10 -0000	3.12
@@ -203,6 +203,7 @@
     pCurs->refcnt = 1;		
 #ifdef XFIXES
     pCurs->serialNumber = ++cursorSerial;
+    pCurs->name = None;
 #endif
 
     pCurs->foreRed = foreRed;
@@ -396,6 +397,7 @@
     pCurs->refcnt = 1;
 #ifdef XFIXES
     pCurs->serialNumber = ++cursorSerial;
+    pCurs->name = None;
 #endif
 
     pCurs->foreRed = foreRed;

Index: dispatch.c
===================================================================
RCS file: /cvs/xserver/xserver/dix/dispatch.c,v
retrieving revision 3.31
retrieving revision 3.32
diff -u -d -r3.31 -r3.32
--- dispatch.c	9 Oct 2003 06:36:26 -0000	3.31
+++ dispatch.c	2 Nov 2003 19:56:10 -0000	3.32
@@ -2127,7 +2127,9 @@
     Mask		plane = 0;
     char		*pBuf;
     xGetImageReply	xgi;
+#ifdef XCSECURITY
     RegionPtr pVisibleRegion = NULL;
+#endif
 
     if ((format != XYPixmap) && (format != ZPixmap))
     {

Index: extension.c
===================================================================
RCS file: /cvs/xserver/xserver/dix/extension.c,v
retrieving revision 3.14
retrieving revision 3.15
diff -u -d -r3.14 -r3.15
--- extension.c	11 Sep 2003 05:12:50 -0000	3.14
+++ extension.c	2 Nov 2003 19:56:10 -0000	3.15
@@ -73,8 +73,6 @@
 #define LAST_EVENT  128
 #define LAST_ERROR 255
 
-ScreenProcEntry AuxillaryScreenProcs[MAXSCREENS];
-
 static ExtensionEntry **extensions = (ExtensionEntry **)NULL;
 
 int lastEvent = EXTENSION_EVENT_BASE;
@@ -294,18 +292,6 @@
     extensions = (ExtensionEntry **)NULL;
     lastEvent = EXTENSION_EVENT_BASE;
     lastError = FirstExtensionError;
-    for (i=0; i<MAXSCREENS; i++)
-    {
-	register ScreenProcEntry *spentry = &AuxillaryScreenProcs[i];
-
-	while (spentry->num)
-	{
-	    spentry->num--;
-	    xfree(spentry->procList[spentry->num].name);
-	}
-	xfree(spentry->procList);
-	spentry->procList = (ProcEntryPtr)NULL;
-    }
 }
 
 
@@ -413,77 +399,3 @@
     }
     return(client->noClientException);
 }
-
-
-ExtensionLookupProc 
-LookupProc(name, pGC)
-    char *name;
-    GCPtr pGC;
-{
-    register int i;
-    register ScreenProcEntry *spentry;
-    spentry  = &AuxillaryScreenProcs[pGC->pScreen->myNum];
-    if (spentry->num)    
-    {
-        for (i = 0; i < spentry->num; i++)
-            if (strcmp(name, spentry->procList[i].name) == 0)
-                return(spentry->procList[i].proc);
-    }
-    return (ExtensionLookupProc)NULL;
-}
-
-Bool
-RegisterProc(name, pGC, proc)
-    char *name;
-    GC *pGC;
-    ExtensionLookupProc proc;
-{
-    return RegisterScreenProc(name, pGC->pScreen, proc);
-}
-
-Bool
-RegisterScreenProc(name, pScreen, proc)
-    char *name;
-    ScreenPtr pScreen;
-    ExtensionLookupProc proc;
-{
-    register ScreenProcEntry *spentry;
-    register ProcEntryPtr procEntry = (ProcEntryPtr)NULL;
-    char *newname;
-    int i;
-
-    spentry = &AuxillaryScreenProcs[pScreen->myNum];
-    /* first replace duplicates */
-    if (spentry->num)
-    {
-        for (i = 0; i < spentry->num; i++)
-            if (strcmp(name, spentry->procList[i].name) == 0)
-	    {
-                procEntry = &spentry->procList[i];
-		break;
-	    }
-    }
-    if (procEntry)
-        procEntry->proc = proc;
-    else
-    {
-	newname = (char *)xalloc(strlen(name)+1);
-	if (!newname)
-	    return FALSE;
-	procEntry = (ProcEntryPtr)
-			    xrealloc(spentry->procList,
-				     sizeof(ProcEntryRec) * (spentry->num+1));
-	if (!procEntry)
-	{
-	    xfree(newname);
-	    return FALSE;
-	}
-	spentry->procList = procEntry;
-        procEntry += spentry->num;
-        procEntry->name = newname;
-        strcpy(newname, name);
-        procEntry->proc = proc;
-        spentry->num++;        
-    }
-    return TRUE;
-}

Index: property.c
===================================================================
RCS file: /cvs/xserver/xserver/dix/property.c,v
retrieving revision 3.14
retrieving revision 3.15
diff -u -d -r3.14 -r3.15
--- property.c	11 Sep 2003 05:12:50 -0000	3.14
+++ property.c	2 Nov 2003 19:56:10 -0000	3.15
@@ -470,11 +470,10 @@
 }
 
 static int
-NullPropertyReply(client, propertyType, format, reply)
-    ClientPtr client;
-    ATOM propertyType;
-    int format;
-    xGetPropertyReply *reply;
+NullPropertyReply(ClientPtr	    client,
+		  ATOM		    propertyType,
+		  int		    format,
+		  xGetPropertyReply *reply)
 {
     reply->nItems = 0;
     reply->length = 0;

Index: window.c
===================================================================
RCS file: /cvs/xserver/xserver/dix/window.c,v
retrieving revision 3.34
retrieving revision 3.35
diff -u -d -r3.34 -r3.35
--- window.c	9 Oct 2003 06:36:26 -0000	3.34
+++ window.c	2 Nov 2003 19:56:10 -0000	3.35
@@ -300,6 +300,9 @@
     pWin->srcBuffer = DBE_FRONT_BUFFER;
     pWin->dstBuffer = DBE_FRONT_BUFFER;
 #endif
+#ifdef APPORTION
+    pWin->redirectDraw = 0;
+#endif
 }
 
 static void
@@ -1672,9 +1675,21 @@
 }
 
 void
-SetWinSize (pWin)
-    register WindowPtr pWin;
+SetWinSize (WindowPtr pWin)
 {
+#ifdef APPORTION
+    if (pWin->redirectDraw)
+    {
+	BoxRec	box;
+
+	box.x1 = pWin->drawable.x;
+	box.y1 = pWin->drawable.y;
+	box.x2 = pWin->drawable.x + pWin->drawable.width;
+	box.y2 = pWin->drawable.y + pWin->drawable.height;
+	REGION_RESET (pScreen, &pWin->winSize, &box);
+    }
+    else
+#endif
     ClippedRegionFromBox(pWin->parent, &pWin->winSize,
 			 pWin->drawable.x, pWin->drawable.y,
 			 (int)pWin->drawable.width,
@@ -1698,13 +1713,25 @@
 }
 
 void
-SetBorderSize (pWin)
-    register WindowPtr pWin;
+SetBorderSize (WindowPtr pWin)
 {
     int	bw;
 
     if (HasBorder (pWin)) {
 	bw = wBorderWidth (pWin);
+#ifdef APPORTION
+	if (pWin->redirectDraw)
+	{
+	    BoxRec	box;
+
+	    box.x1 = pWin->drawable.x - bw;
+	    box.y1 = pWin->drawable.y - bw;
+	    box.x2 = pWin->drawable.x + pWin->drawable.width + (bw << 1);
+	    box.y2 = pWin->drawable.y + pWin->drawable.height + (bw << 1);
+	    REGION_RESET (pScreen, &pWin->winSize, &box);
+	}
+	else
+#endif
 	ClippedRegionFromBox(pWin->parent, &pWin->borderSize,
 		pWin->drawable.x - bw, pWin->drawable.y - bw,
 		(int)(pWin->drawable.width + (bw<<1)),
@@ -3310,6 +3337,33 @@
     return(pReg);
 }
 
+
+RegionPtr
+CreateBoundingShape (pWin)
+    WindowPtr	pWin;
+{
+    BoxRec	extents;
+
+    extents.x1 = -wBorderWidth (pWin);
+    extents.y1 = -wBorderWidth (pWin);
+    extents.x2 = pWin->drawable.width + wBorderWidth (pWin);
+    extents.y2 = pWin->drawable.height + wBorderWidth (pWin);
+    return REGION_CREATE(pWin->drawable.pScreen, &extents, 1);
+}
+
+RegionPtr
+CreateClipShape (pWin)
+    WindowPtr	pWin;
+{
+    BoxRec	extents;
+
+    extents.x1 = 0;
+    extents.y1 = 0;
+    extents.x2 = pWin->drawable.width;
+    extents.y2 = pWin->drawable.height;
+    return REGION_CREATE(pWin->drawable.pScreen, &extents, 1);
+}
+
 void
 SendVisibilityNotify(pWin)
     WindowPtr pWin;

Index: xpstubs.c
===================================================================
RCS file: /cvs/xserver/xserver/dix/xpstubs.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- xpstubs.c	11 Sep 2003 05:12:50 -0000	1.5
+++ xpstubs.c	2 Nov 2003 19:56:10 -0000	1.6
@@ -34,24 +34,19 @@
 #include "font.h"
 
 Bool
-XpClientIsBitmapClient(client)
-    ClientPtr client;
+XpClientIsBitmapClient(ClientPtr client)
 {
     return TRUE;
 }
 
 Bool
-XpClientIsPrintClient(client, fpe)
-    ClientPtr client;
-    FontPathElementPtr fpe;
+XpClientIsPrintClient(ClientPtr client, FontPathElementPtr fpe)
 {
     return FALSE;
 }
+
 int
-XprintOptions(argc, argv, i)
-    int argc;
-    char **argv;
-    int i;
+XprintOptions(int argc, char **argv, int i)
 {
     return i;
 }