From c61bb8cc59bf645f1bf4dbc5fd5464d559b3ecad Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 20 Jun 2016 12:18:53 +0200
Subject: 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>
---
 nx-X11/programs/Xserver/Xi/chgptr.c   | 2 +-
 nx-X11/programs/Xserver/Xi/closedev.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'nx-X11/programs/Xserver/Xi')

diff --git a/nx-X11/programs/Xserver/Xi/chgptr.c b/nx-X11/programs/Xserver/Xi/chgptr.c
index 925d43c07..4877fcc84 100644
--- a/nx-X11/programs/Xserver/Xi/chgptr.c
+++ b/nx-X11/programs/Xserver/Xi/chgptr.c
@@ -208,7 +208,7 @@ SendEventToAllWindows (dev, mask, ev, count)
 
     for (i=0; i<screenInfo.numScreens; i++)
 	{
-	pWin = WindowTable[i];
+	pWin = screenInfo.screens[i]->root;
 	(void)DeliverEventsToWindow(pWin, ev, count, mask, NullGrab, dev->id);
 	p1 = pWin->firstChild;
 	FindInterestedChildren (dev, p1, mask, ev, count);
diff --git a/nx-X11/programs/Xserver/Xi/closedev.c b/nx-X11/programs/Xserver/Xi/closedev.c
index ae46f50c6..5f90b57a4 100644
--- a/nx-X11/programs/Xserver/Xi/closedev.c
+++ b/nx-X11/programs/Xserver/Xi/closedev.c
@@ -124,7 +124,7 @@ ProcXCloseDevice(client)
 
     for (i=0; i<screenInfo.numScreens; i++)
 	{
-	pWin = WindowTable[i];
+	pWin = screenInfo.screens[i]->root;
         DeleteDeviceEvents (d, pWin, client);
 	p1 = pWin->firstChild;
 	DeleteEventsFromChildren (d, p1, client);
-- 
cgit v1.2.3