diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-05-21 23:13:51 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2010-06-03 14:03:22 -0700 |
| commit | 80b5d3a3264d2c5167e5ac85a3b04af0f89cece1 (patch) | |
| tree | 678ee80f7856b7c8d93ca702ce733fe87ddc9ac8 /include/windowstr.h | |
| parent | 5030540d6cd2aa9bbd4ecb7f4487616f9ef0140a (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 'include/windowstr.h')
| -rw-r--r-- | include/windowstr.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/include/windowstr.h b/include/windowstr.h index 96bee9b93..29b95fc37 100644 --- a/include/windowstr.h +++ b/include/windowstr.h @@ -204,24 +204,15 @@ extern _X_EXPORT Mask DontPropagateMasks[]; #define HasBorder(w) ((w)->borderWidth || wClipShape(w)) -typedef struct _ScreenSaverStuff { - WindowPtr pWindow; - XID wid; - char blanked; - Bool (*ExternalScreenSaver)( - ScreenPtr /*pScreen*/, - int /*xstate*/, - Bool /*force*/); -} ScreenSaverStuffRec, *ScreenSaverStuffPtr; +typedef struct _ScreenSaverStuff *ScreenSaverStuffPtr; #define SCREEN_IS_BLANKED 0 #define SCREEN_ISNT_SAVED 1 #define SCREEN_IS_TILED 2 #define SCREEN_IS_BLACK 3 -#define HasSaverWindow(i) (savedScreenInfo[i].pWindow != NullWindow) +#define HasSaverWindow(pScreen) (pScreen->screensaver.pWindow != NullWindow) extern _X_EXPORT int screenIsSaved; -extern _X_EXPORT ScreenSaverStuffRec savedScreenInfo[MAXSCREENS]; #endif /* WINDOWSTRUCT_H */ |