diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-05-23 10:11:47 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2010-06-03 14:03:23 -0700 |
| commit | a83cff9f4d622b069c96a68b4e87a669bf1f6446 (patch) | |
| tree | b29de5e363feb6b7546ce69dfa0685316bf0b234 /include | |
| parent | 217ccaa5a341018457f468a774c035c0df47d918 (diff) | |
Move each screen's x/y origin into ScreenRec.
Many references to the dixScreenOrigins array already had the
corresponding screen pointer handy, which meant they usually looked like
"dixScreenOrigins[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 declared the dixScreenOrigins array, I figure allocating a
screen private for these values is overkill.
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')
| -rw-r--r-- | include/globals.h | 2 | ||||
| -rw-r--r-- | include/scrnintstr.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/globals.h b/include/globals.h index 7de262fe3..8b80a652b 100644 --- a/include/globals.h +++ b/include/globals.h @@ -22,8 +22,6 @@ extern _X_EXPORT int defaultColorVisualClass; extern _X_EXPORT int GrabInProgress; extern _X_EXPORT Bool noTestExtensions; -extern _X_EXPORT DDXPointRec dixScreenOrigins[MAXSCREENS]; - extern _X_EXPORT char *ConnectionInfo; #ifdef DPMSExtension diff --git a/include/scrnintstr.h b/include/scrnintstr.h index f8171ca5c..d67b26411 100644 --- a/include/scrnintstr.h +++ b/include/scrnintstr.h @@ -456,7 +456,7 @@ typedef void (* DeviceCursorCleanupProcPtr)( typedef struct _Screen { int myNum; /* index of this instance in Screens[] */ ATOM id; - short width, height; + short x, y, width, height; short mmWidth, mmHeight; short numDepths; unsigned char rootDepth; |