From e03b08f4f236065f4bbda7acf76a794402b8c385 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Thu, 19 Aug 2010 19:49:39 -0700 Subject: XQuartz: UpdateScreen at the end of SetRootless This will ensure that pRoot is unlocked after the miPaintWindow Signed-off-by: Jeremy Huddleston (cherry picked from commit ee7fd8fc58d9fadfbb92302ddea224537f068538) Conflicts: hw/xquartz/quartz.c --- hw/xquartz/quartz.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c index aceb8058b..0726465af 100644 --- a/hw/xquartz/quartz.c +++ b/hw/xquartz/quartz.c @@ -274,7 +274,6 @@ static void QuartzUpdateScreens(void) { pScreen->height = height; DarwinAdjustScreenOrigins(&screenInfo); - quartzProcs->UpdateScreen(pScreen); /* DarwinAdjustScreenOrigins or UpdateScreen may change dixScreenOrigins, * so use it rather than x/y @@ -286,7 +285,7 @@ static void QuartzUpdateScreens(void) { pRoot = WindowTable[pScreen->myNum]; AppleWMSetScreenOrigin(pRoot); pScreen->ResizeWindow(pRoot, x - sx, y - sy, width, height, NULL); - //pScreen->PaintWindowBackground (pRoot, &pRoot->borderClip, PW_BACKGROUND); + miPaintWindow(pRoot, &pRoot->borderClip, PW_BACKGROUND); DefineInitialRootWindow(pRoot); @@ -303,6 +302,8 @@ static void QuartzUpdateScreens(void) { e.u.configureNotify.borderWidth = wBorderWidth(pRoot); e.u.configureNotify.override = pRoot->overrideRedirect; DeliverEvents(pRoot, &e, 1, NullWindow); + + quartzProcs->UpdateScreen(pScreen); #ifdef FAKE_RANDR RREditConnectionInfo(pScreen); -- cgit v1.2.3