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 /Xi | |
| 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 'Xi')
| -rw-r--r-- | Xi/xiquerypointer.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Xi/xiquerypointer.c b/Xi/xiquerypointer.c index a0c26ba99..b521c48ef 100644 --- a/Xi/xiquerypointer.c +++ b/Xi/xiquerypointer.c @@ -43,6 +43,7 @@ #include "exevents.h" #include "exglobals.h" #include "eventconvert.h" +#include "scrnintstr.h" #include "xkbsrv.h" #ifdef PANORAMIX @@ -181,12 +182,12 @@ ProcXIQueryPointer(ClientPtr client) #ifdef PANORAMIX if(!noPanoramiXExtension) { - rep.root_x += FP1616(dixScreenOrigins[0].x, 0); - rep.root_y += FP1616(dixScreenOrigins[0].y, 0); + rep.root_x += FP1616(screenInfo.screens[0]->x, 0); + rep.root_y += FP1616(screenInfo.screens[0]->y, 0); if (stuff->win == rep.root) { - rep.win_x += FP1616(dixScreenOrigins[0].x, 0); - rep.win_y += FP1616(dixScreenOrigins[0].y, 0); + rep.win_x += FP1616(screenInfo.screens[0]->x, 0); + rep.win_y += FP1616(screenInfo.screens[0]->y, 0); } } #endif |