diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-05-22 00:26:28 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2010-06-03 14:03:23 -0700 |
| commit | e7fae9ecc42ab5e73b89117722dbf4117d928f9a (patch) | |
| tree | b7897e7a64fe01e3989ec1e7a5a7db69797126e6 /Xext/saver.c | |
| parent | 80b5d3a3264d2c5167e5ac85a3b04af0f89cece1 (diff) | |
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)
Diffstat (limited to 'Xext/saver.c')
| -rw-r--r-- | Xext/saver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Xext/saver.c b/Xext/saver.c index da61fbe60..696c4aa22 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -503,7 +503,7 @@ SendScreenSaverNotify (ScreenPtr pScreen, int state, Bool forced) ev.type = ScreenSaverNotify + ScreenSaverEventBase; ev.state = state; ev.timestamp = currentTime.milliseconds; - ev.root = WindowTable[pScreen->myNum]->drawable.id; + ev.root = pScreen->root->drawable.id; ev.window = pScreen->screensaver.wid; ev.kind = kind; ev.forced = forced; @@ -580,7 +580,7 @@ CreateSaverWindow (ScreenPtr pScreen) if (GrabInProgress && GrabInProgress != pAttr->client->index) return FALSE; - pWin = CreateWindow (pSaver->wid, WindowTable[pScreen->myNum], + pWin = CreateWindow (pSaver->wid, pScreen->root, pAttr->x, pAttr->y, pAttr->width, pAttr->height, pAttr->borderWidth, pAttr->class, pAttr->mask, (XID *)pAttr->values, @@ -866,7 +866,7 @@ ScreenSaverSetAttributes (ClientPtr client) if (ret != Success) return ret; pScreen = pDraw->pScreen; - pParent = WindowTable[pScreen->myNum]; + pParent = pScreen->root; ret = XaceHook(XACE_SCREENSAVER_ACCESS, client, pScreen, DixSetAttrAccess); if (ret != Success) |