diff options
Diffstat (limited to 'dix/window.c')
| -rw-r--r-- | dix/window.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/dix/window.c b/dix/window.c index bdad749e8..71edd4681 100644 --- a/dix/window.c +++ b/dix/window.c @@ -212,3 +212,3 @@ PrintWindowTree(void) ErrorF("[dix] WINDOW %d\n", i); - pWin = WindowTable[i]; + pWin = screenInfo.screens[i]->root; miPrintRegion(&pWin->clipList); @@ -258,3 +258,3 @@ WalkTree(ScreenPtr pScreen, VisitWindowProcPtr func, pointer data) { - return(TraverseTree(WindowTable[pScreen->myNum], func, data)); + return(TraverseTree(pScreen->root, func, data)); } @@ -368,3 +368,3 @@ CreateRootWindow(ScreenPtr pScreen) - WindowTable[pScreen->myNum] = pWin; + pScreen->root = pWin; @@ -1329,3 +1329,3 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client) { - if (pWin == WindowTable[pWin->drawable.pScreen->myNum]) + if (pWin == pWin->drawable.pScreen->root) pCursor = rootCursor; @@ -2966,3 +2966,3 @@ HandleSaveSet(ClientPtr client) if (SaveSetToRoot(client->saveSet[j])) - pParent = WindowTable[pWin->drawable.pScreen->myNum]; + pParent = pWin->drawable.pScreen->root; else @@ -3252,3 +3252,2 @@ TileScreenSaver(ScreenPtr pScreen, int kind) { - int i = pScreen->myNum; int j; @@ -3268,5 +3267,5 @@ TileScreenSaver(ScreenPtr pScreen, int kind) case SCREEN_IS_TILED: - switch (WindowTable[i]->backgroundState) { + switch (pScreen->root->backgroundState) { case BackgroundPixel: - attributes[attri++] = WindowTable[i]->background.pixel; + attributes[attri++] = pScreen->root->background.pixel; mask |= CWBackPixel; @@ -3282,3 +3281,3 @@ TileScreenSaver(ScreenPtr pScreen, int kind) case SCREEN_IS_BLACK: - attributes[attri++] = WindowTable[i]->drawable.pScreen->blackPixel; + attributes[attri++] = pScreen->root->drawable.pScreen->blackPixel; mask |= CWBackPixel; @@ -3331,3 +3330,3 @@ TileScreenSaver(ScreenPtr pScreen, int kind) CreateWindow(pScreen->screensaver.wid, - WindowTable[i], + pScreen->root, -RANDOM_WIDTH, -RANDOM_WIDTH, @@ -3336,3 +3335,3 @@ TileScreenSaver(ScreenPtr pScreen, int kind) 0, InputOutput, mask, attributes, 0, serverClient, - wVisual (WindowTable[i]), &result); + wVisual (pScreen->root), &result); |