svn merge ^/branches/released .

1 files changed, 75 insertions, 80 deletions

diff --git a/xorg-server/Xext/panoramiX.c b/xorg-server/Xext/panoramiX.c
index 65af9a71f..1b340e80e 100644
--- a/xorg-server/Xext/panoramiX.c
+++ b/xorg-server/Xext/panoramiX.c
@@ -70,7 +70,6 @@ int 		PanoramiXPixWidth = 0;
 int 		PanoramiXPixHeight = 0;

 int 		PanoramiXNumScreens = 0;

 

-PanoramiXData *panoramiXdataPtr = NULL;

 static RegionRec   	PanoramiXScreenRegion = {{0, 0, 0, 0}, NULL};

 

 static int		PanoramiXNumDepths;

@@ -104,10 +103,10 @@ static void PanoramiXResetProc(ExtensionEntry*);
 

 int (* SavedProcVector[256]) (ClientPtr client) = { NULL, };

 

-static int PanoramiXGCKeyIndex;

-static DevPrivateKey PanoramiXGCKey = &PanoramiXGCKeyIndex;

-static int PanoramiXScreenKeyIndex;

-static DevPrivateKey PanoramiXScreenKey = &PanoramiXScreenKeyIndex;

+static DevPrivateKeyRec PanoramiXGCKeyRec;

+#define PanoramiXGCKey (&PanoramiXGCKeyRec)

+static DevPrivateKeyRec PanoramiXScreenKeyRec;

+#define PanoramiXScreenKey (&PanoramiXScreenKeyRec)

 

 typedef struct {

   DDXPointRec clipOrg;

@@ -120,8 +119,6 @@ typedef struct {
   CloseScreenProcPtr	CloseScreen;

 } PanoramiXScreenRec, *PanoramiXScreenPtr;

 

-RegionRec XineramaScreenRegions[MAXSCREENS];

-

 static void XineramaValidateGC(GCPtr, unsigned long, DrawablePtr);

 static void XineramaChangeGC(GCPtr, unsigned long);

 static void XineramaCopyGC(GCPtr, unsigned long, GCPtr);

@@ -154,9 +151,8 @@ XineramaCloseScreen (int i, ScreenPtr pScreen)
     pScreen->CloseScreen = pScreenPriv->CloseScreen;

     pScreen->CreateGC = pScreenPriv->CreateGC;

 

-    REGION_UNINIT(pScreen, &XineramaScreenRegions[pScreen->myNum]);

     if (pScreen->myNum == 0)

-	REGION_UNINIT(pScreen, &PanoramiXScreenRegion);

+	RegionUninit(&PanoramiXScreenRegion);

 

     free((pointer) pScreenPriv);

 

@@ -199,8 +195,8 @@ XineramaValidateGC(
 

     if((pDraw->type == DRAWABLE_WINDOW) && !(((WindowPtr)pDraw)->parent)) {

 	/* the root window */

-	int x_off = panoramiXdataPtr[pGC->pScreen->myNum].x;

-	int y_off = panoramiXdataPtr[pGC->pScreen->myNum].y;

+	int x_off = pGC->pScreen->x;

+	int y_off = pGC->pScreen->y;

 	int new_val;

 

 	new_val = pGCPriv->clipOrg.x - x_off;

@@ -343,7 +339,7 @@ XineramaFindIDByScrnum(pointer resource, XID id, pointer privdata)
     PanoramiXRes *res = (PanoramiXRes*)resource;

     PanoramiXSearchData *data = (PanoramiXSearchData*)privdata;

     

-    return (res->info[data->screen].id == data->id);

+    return res->info[data->screen].id == data->id;

 }

 

 PanoramiXRes *

@@ -390,33 +386,31 @@ static void XineramaInitData(ScreenPtr pScreen)
 {

     int i, w, h;

 

-    REGION_NULL(pScreen, &PanoramiXScreenRegion)

+    RegionNull(&PanoramiXScreenRegion);

     for (i = 0; i < PanoramiXNumScreens; i++) {

 	BoxRec TheBox;

+	RegionRec ScreenRegion;

 

         pScreen = screenInfo.screens[i];

 

-	panoramiXdataPtr[i].x = dixScreenOrigins[i].x;

-	panoramiXdataPtr[i].y = dixScreenOrigins[i].y;

-	panoramiXdataPtr[i].width = pScreen->width;

-	panoramiXdataPtr[i].height = pScreen->height;

-

-	TheBox.x1 = panoramiXdataPtr[i].x;

-	TheBox.x2 = TheBox.x1 + panoramiXdataPtr[i].width;

-	TheBox.y1 = panoramiXdataPtr[i].y;

-	TheBox.y2 = TheBox.y1 + panoramiXdataPtr[i].height;

+	TheBox.x1 = pScreen->x;

+	TheBox.x2 = TheBox.x1 + pScreen->width;

+	TheBox.y1 = pScreen->y;

+	TheBox.y2 = TheBox.y1 + pScreen->height;

 

-	REGION_INIT(pScreen, &XineramaScreenRegions[i], &TheBox, 1);

-	REGION_UNION(pScreen, &PanoramiXScreenRegion, &PanoramiXScreenRegion,

-		     &XineramaScreenRegions[i]);

+	RegionInit(&ScreenRegion, &TheBox, 1);

+	RegionUnion(&PanoramiXScreenRegion, &PanoramiXScreenRegion,

+		     &ScreenRegion);

+	RegionUninit(&ScreenRegion);

     }

 

-    PanoramiXPixWidth = panoramiXdataPtr[0].x + panoramiXdataPtr[0].width;

-    PanoramiXPixHeight = panoramiXdataPtr[0].y + panoramiXdataPtr[0].height;

+    PanoramiXPixWidth = screenInfo.screens[0]->x + screenInfo.screens[0]->width;

+    PanoramiXPixHeight = screenInfo.screens[0]->y + screenInfo.screens[0]->height;

 

     for (i = 1; i < PanoramiXNumScreens; i++) {

-	w = panoramiXdataPtr[i].x + panoramiXdataPtr[i].width;

-	h = panoramiXdataPtr[i].y + panoramiXdataPtr[i].height;

+	pScreen = screenInfo.screens[i];

+	w = pScreen->x + pScreen->width;

+	h = pScreen->y + pScreen->height;

 

 	if (PanoramiXPixWidth < w)

 	    PanoramiXPixWidth = w;

@@ -427,12 +421,7 @@ static void XineramaInitData(ScreenPtr pScreen)
 

 void XineramaReinitData(ScreenPtr pScreen)

 {

-    int i;

-

-    REGION_UNINIT(pScreen, &PanoramiXScreenRegion);

-    for (i = 0; i < PanoramiXNumScreens; i++)

-	REGION_UNINIT(pScreen, &XineramaScreenRegions[i]);

-

+    RegionUninit(&PanoramiXScreenRegion);

     XineramaInitData(pScreen);

 }

 

@@ -454,6 +443,16 @@ void PanoramiXExtensionInit(int argc, char *argv[])
     if (noPanoramiXExtension) 

 	return;

 

+    if (!dixRegisterPrivateKey(&PanoramiXScreenKeyRec, PRIVATE_SCREEN, 0)) {

+	noPanoramiXExtension = TRUE;

+	return;

+    }

+

+    if (!dixRegisterPrivateKey(&PanoramiXGCKeyRec, PRIVATE_GC, sizeof(PanoramiXGCRec))) {

+	noPanoramiXExtension = TRUE;

+	return;

+    }

+

     PanoramiXNumScreens = screenInfo.numScreens;

     if (PanoramiXNumScreens == 1) {		/* Only 1 screen 	*/

 	noPanoramiXExtension = TRUE;

@@ -473,17 +472,6 @@ void PanoramiXExtensionInit(int argc, char *argv[])
 	 *	run in non-PanoramiXeen mode.

 	 */

 

-	panoramiXdataPtr = (PanoramiXData *) 

-		calloc(PanoramiXNumScreens, sizeof(PanoramiXData));

-

-	if (!panoramiXdataPtr)

-	    break;

-

-	if (!dixRequestPrivate(PanoramiXGCKey, sizeof(PanoramiXGCRec))) {

-		noPanoramiXExtension = TRUE;

-		return;

-	}

-	

 	for (i = 0; i < PanoramiXNumScreens; i++) {

 	   pScreen = screenInfo.screens[i];

 	   pScreenPriv = malloc(sizeof(PanoramiXScreenRec));

@@ -836,13 +824,14 @@ PanoramiXConsolidate(void)
     saver->type = XRT_WINDOW;

 

     for (i =  0; i < PanoramiXNumScreens; i++) {

-	root->info[i].id = WindowTable[i]->drawable.id;

+	ScreenPtr pScreen = screenInfo.screens[i];

+	root->info[i].id = pScreen->root->drawable.id;

 	root->u.win.class = InputOutput;

         root->u.win.root = TRUE;

-        saver->info[i].id = savedScreenInfo[i].wid;

+        saver->info[i].id = pScreen->screensaver.wid;

         saver->u.win.class = InputOutput;

         saver->u.win.root = TRUE;

-	defmap->info[i].id = (screenInfo.screens[i])->defColormap;

+	defmap->info[i].id = pScreen->defColormap;

     }

 

     AddResource(root->info[0].id, XRT_WINDOW, root);

@@ -896,8 +885,6 @@ static void PanoramiXResetProc(ExtensionEntry* extEntry)
     screenInfo.numScreens = PanoramiXNumScreens;

     for (i = 256; i--; )

 	ProcVector[i] = SavedProcVector[i];

-

-    free(panoramiXdataPtr);

 }

 

 

@@ -999,8 +986,8 @@ ProcPanoramiXGetScreenSize(ClientPtr client)
 	rep.length = 0;

 	rep.sequenceNumber = client->sequence;

 		/* screen dimensions */

-	rep.width  = panoramiXdataPtr[stuff->screen].width; 

-	rep.height = panoramiXdataPtr[stuff->screen].height; 

+	rep.width  = screenInfo.screens[stuff->screen]->width;

+	rep.height = screenInfo.screens[stuff->screen]->height;

 	rep.window = stuff->window;

 	rep.screen = stuff->screen;

     	if (client->swapped) {

@@ -1072,10 +1059,10 @@ ProcXineramaQueryScreens(ClientPtr client)
 	int i;

 

 	for(i = 0; i < PanoramiXNumScreens; i++) {

-	    scratch.x_org  = panoramiXdataPtr[i].x;

-	    scratch.y_org  = panoramiXdataPtr[i].y;

-	    scratch.width  = panoramiXdataPtr[i].width;

-	    scratch.height = panoramiXdataPtr[i].height;

+	    scratch.x_org  = screenInfo.screens[i]->x;

+	    scratch.y_org  = screenInfo.screens[i]->y;

+	    scratch.width  = screenInfo.screens[i]->width;

+	    scratch.height = screenInfo.screens[i]->height;

 	

 	    if(client->swapped) {

 		int n;

@@ -1153,7 +1140,7 @@ XineramaGetImageData(
     int pitch,

     Bool isRoot

 ){

-    RegionRec SrcRegion, GrabRegion;

+    RegionRec SrcRegion, ScreenRegion, GrabRegion;

     BoxRec SrcBox, *pbox;

     int x, y, w, h, i, j, nbox, size, sizeNeeded, ScratchPitch, inOut, depth;

     DrawablePtr pDraw = pDrawables[0];

@@ -1165,38 +1152,47 @@ XineramaGetImageData(
     SrcBox.x1 = left;

     SrcBox.y1 = top;

     if(!isRoot) {

-	SrcBox.x1 += pDraw->x + panoramiXdataPtr[0].x;

-	SrcBox.y1 += pDraw->y + panoramiXdataPtr[0].y;

+	SrcBox.x1 += pDraw->x + screenInfo.screens[0]->x;

+	SrcBox.y1 += pDraw->y + screenInfo.screens[0]->y;

     }

     SrcBox.x2 = SrcBox.x1 + width;

     SrcBox.y2 = SrcBox.y1 + height;

     

-    REGION_INIT(pScreen, &SrcRegion, &SrcBox, 1);

-    REGION_NULL(pScreen, &GrabRegion);

+    RegionInit(&SrcRegion, &SrcBox, 1);

+    RegionNull(&GrabRegion);

 

     depth = (format == XYPixmap) ? 1 : pDraw->depth;

 

     for(i = 0; i < PanoramiXNumScreens; i++) {

+	BoxRec TheBox;

+	ScreenPtr pScreen;

 	pDraw = pDrawables[i];

+	pScreen = pDraw->pScreen;

+

+	TheBox.x1 = pScreen->x;

+	TheBox.x2 = TheBox.x1 + pScreen->width;

+	TheBox.y1 = pScreen->y;

+	TheBox.y2 = TheBox.y1 + pScreen->height;

 

-	inOut = RECT_IN_REGION(pScreen,&XineramaScreenRegions[i],&SrcBox);

+	RegionInit(&ScreenRegion, &TheBox, 1);

+	inOut = RegionContainsRect(&ScreenRegion, &SrcBox);

+	if(inOut == rgnPART)

+	    RegionIntersect(&GrabRegion, &SrcRegion, &ScreenRegion);

+	RegionUninit(&ScreenRegion);

 

 	if(inOut == rgnIN) {	   

-	    (*pDraw->pScreen->GetImage)(pDraw, 

-			SrcBox.x1 - pDraw->x - panoramiXdataPtr[i].x,

-			SrcBox.y1 - pDraw->y - panoramiXdataPtr[i].y, 

+	    (*pScreen->GetImage)(pDraw,

+			SrcBox.x1 - pDraw->x - screenInfo.screens[i]->x,

+			SrcBox.y1 - pDraw->y - screenInfo.screens[i]->y,

 			width, height, format, planemask, data);

 	    break;

 	} else if (inOut == rgnOUT)

 	    continue;

 

-	REGION_INTERSECT(pScreen, &GrabRegion, &SrcRegion, 

-					&XineramaScreenRegions[i]);

-

-	nbox = REGION_NUM_RECTS(&GrabRegion);

+	nbox = RegionNumRects(&GrabRegion);

 

 	if(nbox) {

-	    pbox = REGION_RECTS(&GrabRegion);

+	    pbox = RegionRects(&GrabRegion);

 

 	    while(nbox--) {

 		w = pbox->x2 - pbox->x1;

@@ -1215,10 +1211,10 @@ XineramaGetImageData(
 		    }	

 		}

 

-		x = pbox->x1 - pDraw->x - panoramiXdataPtr[i].x;

-		y = pbox->y1 - pDraw->y - panoramiXdataPtr[i].y;

+		x = pbox->x1 - pDraw->x - screenInfo.screens[i]->x;

+		y = pbox->y1 - pDraw->y - screenInfo.screens[i]->y;

 

-		(*pDraw->pScreen->GetImage)(pDraw, x, y, w, h, 

+		(*pScreen->GetImage)(pDraw, x, y, w, h,

 					format, planemask, ScratchMem);

 		

 		/* copy the memory over */

@@ -1273,16 +1269,15 @@ XineramaGetImageData(
 		pbox++;

 	    }

 

-	    REGION_SUBTRACT(pScreen, &SrcRegion, &SrcRegion, &GrabRegion);

-	    if(!REGION_NOTEMPTY(pScreen, &SrcRegion))

+	    RegionSubtract(&SrcRegion, &SrcRegion, &GrabRegion);

+	    if(!RegionNotEmpty(&SrcRegion))

 		break;

 	}

 	

     }

 

-    if(ScratchMem)

-	free(ScratchMem);

+    free(ScratchMem);

 

-    REGION_UNINIT(pScreen, &SrcRegion);

-    REGION_UNINIT(pScreen, &GrabRegion);

+    RegionUninit(&SrcRegion);

+    RegionUninit(&GrabRegion);

 }