mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 08:04:30 +00:00
panoramiX: XineramaGetImageData(): add walkScreen temp variable
Instead of always accessing the global screens array, do it only once and put it into a walk variable. Also prepration for upcoming commits which are moving the looping logic into a generic macro. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
be425a933c
commit
e4081afa65
@@ -1158,6 +1158,7 @@ XineramaGetImageData(DrawablePtr *pDrawables,
|
||||
int i;
|
||||
FOR_NSCREENS_BACKWARD(i) {
|
||||
BoxRec TheBox;
|
||||
ScreenPtr walkScreen = screenInfo.screens[i];
|
||||
|
||||
DrawablePtr pWalkDraw = pDrawables[i];
|
||||
ScreenPtr pScreen = pWalkDraw->pScreen;
|
||||
@@ -1177,9 +1178,9 @@ XineramaGetImageData(DrawablePtr *pDrawables,
|
||||
if (inOut == rgnIN) {
|
||||
pScreen->GetImage(pWalkDraw,
|
||||
SrcBox.x1 - pWalkDraw->x -
|
||||
screenInfo.screens[i]->x,
|
||||
walkScreen->x,
|
||||
SrcBox.y1 - pWalkDraw->y -
|
||||
screenInfo.screens[i]->y, width, height,
|
||||
walkScreen->y, width, height,
|
||||
format, planemask, data);
|
||||
break;
|
||||
}
|
||||
@@ -1211,8 +1212,8 @@ XineramaGetImageData(DrawablePtr *pDrawables,
|
||||
}
|
||||
}
|
||||
|
||||
int x = pbox->x1 - pWalkDraw->x - screenInfo.screens[i]->x;
|
||||
int y = pbox->y1 - pWalkDraw->y - screenInfo.screens[i]->y;
|
||||
int x = pbox->x1 - pWalkDraw->x - walkScreen->x;
|
||||
int y = pbox->y1 - pWalkDraw->y - walkScreen->y;
|
||||
|
||||
(*pScreen->GetImage) (pWalkDraw, x, y, w, h,
|
||||
format, planemask, ScratchMem);
|
||||
|
||||
Reference in New Issue
Block a user