Move each screen's root-window pointer into ScreenRec.

 Backported from X.org:

 commit e7fae9ecc42ab5e73b89117722dbf4117d928f9a
 Author: Jamey Sharp <jamey@minilop.net>
 Date:   Sat May 22 00:26:28 2010 -0700

    Move each screen's root-window pointer into ScreenRec.

    Many references to the WindowTable array already had the corresponding
    screen pointer handy, which meant they usually looked like
    "WindowTable[pScreen->myNum]". Adding a field to ScreenRec instead of
    keeping this information in a parallel array simplifies those
    expressions, and eliminates a MAXSCREENS-sized array.

    Since dix uses this data, a screen private entry isn't appropriate.

    xf86-video-dummy currently uses WindowTable, so it needs to be updated
    to reflect this change.

    Signed-off-by: Jamey Sharp <jamey@minilop.net>
    Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
    Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (i686 GNU/Linux)

 Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

1 files changed, 10 insertions, 10 deletions

diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
index adeaff870..5e89e67bd 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
@@ -344,13 +344,13 @@ InitSelections()
 
       CurrentSelections[0].selection = XA_PRIMARY;
       CurrentSelections[0].lastTimeChanged = ClientTimeToServerTime(0);
-      CurrentSelections[0].window = WindowTable[0]->drawable.id;
+      CurrentSelections[0].window = screenInfo.screens[0]->root->drawable.id;
       CurrentSelections[0].pWin = NULL;
       CurrentSelections[0].client = NullClient;
 
       CurrentSelections[1].selection = MakeAtom("CLIPBOARD", 9, 1);
       CurrentSelections[1].lastTimeChanged = ClientTimeToServerTime(0);
-      CurrentSelections[1].window = WindowTable[0]->drawable.id;
+      CurrentSelections[1].window = screenInfo.screens[0]->root->drawable.id;
       CurrentSelections[1].pWin = NULL;
       CurrentSelections[1].client = NullClient;
     }
@@ -374,8 +374,8 @@ FlushClientCaches(XID id)
 	{
             if (client->lastDrawableID == id)
 	    {
-		client->lastDrawableID = WindowTable[0]->drawable.id;
-		client->lastDrawable = (DrawablePtr)WindowTable[0];
+		client->lastDrawableID = screenInfo.screens[0]->root->drawable.id;
+		client->lastDrawable = (DrawablePtr)screenInfo.screens[0]->root;
 	    }
             else if (client->lastGCID == id)
 	    {
@@ -1161,7 +1161,7 @@ GetGeometry(register ClientPtr client, xGetGeometryReply *rep)
     rep->type = X_Reply;
     rep->length = 0;
     rep->sequenceNumber = client->sequence;
-    rep->root = WindowTable[pDraw->pScreen->myNum]->drawable.id;
+    rep->root = pDraw->pScreen->root->drawable.id;
     rep->depth = pDraw->depth;
     rep->width = pDraw->width;
     rep->height = pDraw->height;
@@ -1221,7 +1221,7 @@ ProcQueryTree(register ClientPtr client)
         return(BadWindow);
     memset(&reply, 0, sizeof(xQueryTreeReply));
     reply.type = X_Reply;
-    reply.root = WindowTable[pWin->drawable.pScreen->myNum]->drawable.id;
+    reply.root = pWin->drawable.pScreen->root->drawable.id;
     reply.sequenceNumber = client->sequence;
     if (pWin->parent)
 	reply.parent = pWin->parent->drawable.id;
@@ -4319,8 +4319,8 @@ void InitClient(ClientPtr client, int i, void * ospriv)
     if (i)
     {
 	client->closeDownMode = DestroyAll;
-	client->lastDrawable = (DrawablePtr)WindowTable[0];
-	client->lastDrawableID = WindowTable[0]->drawable.id;
+	client->lastDrawable = (DrawablePtr)screenInfo.screens[0]->root;
+	client->lastDrawableID = screenInfo.screens[0]->root->drawable.id;
     }
     else
     {
@@ -4563,8 +4563,8 @@ SendConnSetup(register ClientPtr client, char *reason)
 	register unsigned int j;
 	register xDepth *pDepth;
 
-        root->currentInputMask = WindowTable[i]->eventMask |
-			         wOtherEventMasks (WindowTable[i]);
+        root->currentInputMask = screenInfo.screens[i]->root->eventMask |
+			         wOtherEventMasks (screenInfo.screens[i]->root);
 	pDepth = (xDepth *)(root + 1);
 	for (j = 0; j < root->nDepths; j++)
 	{