summaryrefslogtreecommitdiff
path: root/composite
diff options
context:
space:
mode:
authorJamey Sharp <jamey@minilop.net>2010-05-21 23:13:51 -0700
committerJamey Sharp <jamey@minilop.net>2010-06-03 14:03:22 -0700
commit80b5d3a3264d2c5167e5ac85a3b04af0f89cece1 (patch)
tree678ee80f7856b7c8d93ca702ce733fe87ddc9ac8 /composite
parent5030540d6cd2aa9bbd4ecb7f4487616f9ef0140a (diff)
Move each screen's screensaver data into ScreenRec.
Most references to the savedScreenInfo array already had the corresponding screen pointer handy, which meant they usually looked like "savedScreenInfo[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. 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 'composite')
-rw-r--r--composite/compwindow.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/composite/compwindow.c b/composite/compwindow.c
index f2f6ea3cd..3b16bf980 100644
--- a/composite/compwindow.c
+++ b/composite/compwindow.c
@@ -800,7 +800,7 @@ CompositeRealChildHead (WindowPtr pWin)
if (!pWin->parent &&
(screenIsSaved == SCREEN_SAVER_ON) &&
- (HasSaverWindow (pWin->drawable.pScreen->myNum))) {
+ (HasSaverWindow (pWin->drawable.pScreen))) {
/* First child is the screen saver; see if next child is the overlay */
pChildBefore = pWin->firstChild;