frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: Minor cleanup 

Move RandRInit to where it will need to be (not yet implemented)

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston 2010-03-19 17:23:12 -07:00
parent bb75d0df8b
commit 9c9c3a85b0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/xquartz/quartz.c
View File

@ -166,6 +166,11 @@ void QuartzInitOutput(
FatalError("Could not register block and wakeup handlers."); 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 // Do display mode specific initialization
quartzProcs->DisplayInit(); quartzProcs->DisplayInit();
} }
@ -259,16 +264,11 @@ void QuartzUpdateScreens(void) {
pScreen->width = width; pScreen->width = width;
pScreen->height = height; pScreen->height = height;
#ifndef FAKE_RANDR
if(!QuartzRandRInit(pScreen))
FatalError("Failed to init RandR extension.\n");
#endif
DarwinAdjustScreenOrigins(&screenInfo); DarwinAdjustScreenOrigins(&screenInfo);
quartzProcs->UpdateScreen(pScreen); quartzProcs->UpdateScreen(pScreen);
sx = dixScreenOrigins[pScreen->myNum].x + darwinMainScreenX; sx = x + darwinMainScreenX;
sy = dixScreenOrigins[pScreen->myNum].y + darwinMainScreenY; sy = y + darwinMainScreenY;
/* Adjust the root window. */ /* Adjust the root window. */
pRoot = WindowTable[pScreen->myNum]; pRoot = WindowTable[pScreen->myNum];