XQuartz: UpdateScreen at the end of SetRootless
This will ensure that pRoot is unlocked after the miPaintWindow Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
parent
4fc4cab98d
commit
ee7fd8fc58
|
@ -265,7 +265,6 @@ void QuartzUpdateScreens(void) {
|
||||||
pScreen->height = height;
|
pScreen->height = height;
|
||||||
|
|
||||||
DarwinAdjustScreenOrigins(&screenInfo);
|
DarwinAdjustScreenOrigins(&screenInfo);
|
||||||
quartzProcs->UpdateScreen(pScreen);
|
|
||||||
|
|
||||||
/* DarwinAdjustScreenOrigins or UpdateScreen may change pScreen->x/y,
|
/* DarwinAdjustScreenOrigins or UpdateScreen may change pScreen->x/y,
|
||||||
* so use it rather than x/y
|
* so use it rather than x/y
|
||||||
|
@ -277,6 +276,7 @@ void QuartzUpdateScreens(void) {
|
||||||
pRoot = pScreen->root;
|
pRoot = pScreen->root;
|
||||||
AppleWMSetScreenOrigin(pRoot);
|
AppleWMSetScreenOrigin(pRoot);
|
||||||
pScreen->ResizeWindow(pRoot, x - sx, y - sy, width, height, NULL);
|
pScreen->ResizeWindow(pRoot, x - sx, y - sy, width, height, NULL);
|
||||||
|
|
||||||
miPaintWindow(pRoot, &pRoot->borderClip, PW_BACKGROUND);
|
miPaintWindow(pRoot, &pRoot->borderClip, PW_BACKGROUND);
|
||||||
|
|
||||||
/* <rdar://problem/7770779> pointer events are clipped to old display region after display reconfiguration
|
/* <rdar://problem/7770779> pointer events are clipped to old display region after display reconfiguration
|
||||||
|
@ -303,6 +303,8 @@ void QuartzUpdateScreens(void) {
|
||||||
e.u.configureNotify.borderWidth = wBorderWidth(pRoot);
|
e.u.configureNotify.borderWidth = wBorderWidth(pRoot);
|
||||||
e.u.configureNotify.override = pRoot->overrideRedirect;
|
e.u.configureNotify.override = pRoot->overrideRedirect;
|
||||||
DeliverEvents(pRoot, &e, 1, NullWindow);
|
DeliverEvents(pRoot, &e, 1, NullWindow);
|
||||||
|
|
||||||
|
quartzProcs->UpdateScreen(pScreen);
|
||||||
|
|
||||||
#ifdef FAKE_RANDR
|
#ifdef FAKE_RANDR
|
||||||
RREditConnectionInfo(pScreen);
|
RREditConnectionInfo(pScreen);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user