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 /dix/main.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 'dix/main.c')
| -rw-r--r-- | dix/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/dix/main.c b/dix/main.c index 3e500ba4d..982fedd6b 100644 --- a/dix/main.c +++ b/dix/main.c @@ -249,7 +249,7 @@ int main(int argc, char *argv[], char *envp[]) #endif for (i = 0; i < screenInfo.numScreens; i++) - InitRootWindow(WindowTable[i]); + InitRootWindow(screenInfo.screens[i]->root); InitCoreDevices(); InitInput(argc, argv); @@ -303,7 +303,8 @@ int main(int argc, char *argv[], char *envp[]) CloseInput(); - memset(WindowTable, 0, sizeof(WindowTable)); + for (i = 0; i < screenInfo.numScreens; i++) + screenInfo.screens[i]->root = NullWindow; CloseDownDevices(); CloseDownEvents(); |