summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorJeremy Huddleston Sequoia <jeremyhu@apple.com>2023-01-01 10:57:46 -0800
committerJeremy Huddleston Sequoia <jeremyhu@apple.com>2023-01-20 17:10:54 +0000
commit16e7cdba489b7e419b3732cb56f26de2b71d3504 (patch)
treedaae7ba367ba9938b6f737671839a0231e803893 /dix
parent820b1dc461157b54fd49a787dbaf9d68a92debd9 (diff)
rootless: Use screen_x and screen_y instead of pixmap pointer hacks
This updates rootless to treat pixmaps consistently with COMPOSITE, using the screen_x and screen_y values rather than doing hacky math. This will allow for proper bounds checking on a given PixmapRec. Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Diffstat (limited to 'dix')
-rw-r--r--dix/dispatch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 9c26753a9..efcec5c81 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -2182,7 +2182,7 @@ DoGetImage(ClientPtr client, int format, Drawable drawable,
PixmapPtr pPix = (*pDraw->pScreen->GetWindowPixmap) (pWin);
pBoundingDraw = &pPix->drawable;
-#ifdef COMPOSITE
+#if defined(COMPOSITE) || defined(ROOTLESS)
relx -= pPix->screen_x;
rely -= pPix->screen_y;
#endif