diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2010-03-28 13:46:23 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2010-03-29 15:27:17 -0700 |
| commit | 16706e8da0342a21835ffb263fa9d23653fba308 (patch) | |
| tree | 603379b1b087105860476ed9e4f068f7521d4782 | |
| parent | 1e5a2c49cb48dfb6696d157c54bfb878547a4936 (diff) | |
XQuartz: Re-query dixScreenOrigins as the value could've changed.
Fix a regression in 9c9c3a85b094a3c7b2763a572715d710325091aa
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Acked-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit 28a5f14b4089dccb8045cc4fdc923542a73dd22d)
| -rw-r--r-- | hw/xquartz/quartz.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c index c438e2025..1488b85ee 100644 --- a/hw/xquartz/quartz.c +++ b/hw/xquartz/quartz.c @@ -275,8 +275,11 @@ static void QuartzUpdateScreens(void) { DarwinAdjustScreenOrigins(&screenInfo); quartzProcs->UpdateScreen(pScreen); - sx = x + darwinMainScreenX; - sy = y + darwinMainScreenY; + /* DarwinAdjustScreenOrigins or UpdateScreen may change dixScreenOrigins, + * so use it rather than x/y + */ + sx = dixScreenOrigins[pScreen->myNum].x + darwinMainScreenX; + sy = dixScreenOrigins[pScreen->myNum].y + darwinMainScreenY; /* Adjust the root window. */ pRoot = WindowTable[pScreen->myNum]; |