From a83cff9f4d622b069c96a68b4e87a669bf1f6446 Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Sun, 23 May 2010 10:11:47 -0700 Subject: 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 Reviewed-by: Tiago Vignatti Tested-by: Tiago Vignatti (i686 GNU/Linux) --- Xi/xiquerypointer.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Xi') 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 -- cgit v1.2.3