diff options
author | Jeremy Huddleston <jeremyhu@apple.com> | 2010-03-19 17:23:12 -0700 |
---|---|---|
committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2010-03-20 16:35:50 -0700 |
commit | f6bb4b12e026bd2dfa26ae9ad4f191ef6c1ae424 (patch) | |
tree | a1f53e1320e434c6d4f2fc4e5c5bc629f34e438a | |
parent | c3541d5b87f5f722d1e312eae0d99d616fa44d17 (diff) |
XQuartz: Minor cleanup
Move RandRInit to where it will need to be (not yet implemented)
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 7da4f9df9c6490e3e604c170415d5af2d8c8ff29)
-rw-r--r-- | hw/xquartz/quartz.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c index 6a1cad683..c438e2025 100644 --- a/hw/xquartz/quartz.c +++ b/hw/xquartz/quartz.c @@ -173,6 +173,11 @@ void QuartzInitOutput( FatalError("Could not register block and wakeup handlers."); } +#if defined(RANDR) && !defined(FAKE_RANDR) + if(!QuartzRandRInit(pScreen)) + FatalError("Failed to init RandR extension.\n"); +#endif + // Do display mode specific initialization quartzProcs->DisplayInit(); } @@ -267,16 +272,11 @@ static void QuartzUpdateScreens(void) { pScreen->width = width; pScreen->height = height; -#ifndef FAKE_RANDR - if(!QuartzRandRInit(pScreen)) - FatalError("Failed to init RandR extension.\n"); -#endif - DarwinAdjustScreenOrigins(&screenInfo); quartzProcs->UpdateScreen(pScreen); - sx = dixScreenOrigins[pScreen->myNum].x + darwinMainScreenX; - sy = dixScreenOrigins[pScreen->myNum].y + darwinMainScreenY; + sx = x + darwinMainScreenX; + sy = y + darwinMainScreenY; /* Adjust the root window. */ pRoot = WindowTable[pScreen->myNum]; |