diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-05-22 10:18:36 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-05-22 21:39:42 -0700 |
| commit | 398114c1489fbfc9fe487de38ff4a4176755eee6 (patch) | |
| tree | 4dcef569021f297c676f4e7e1ebf37e3967fb41b | |
| parent | dc6efd99887c90bb14e066e46b69ca5ba19b6a09 (diff) | |
XQuartz: Don't crash if CG increases our display resolution
miPaintWindow would cause fbFill() to overwrite pScreen's pixmap which was
sized for the old resolution.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 1fb501ad1521cfedaa5cf3052d45a924ef1866cf)
| -rw-r--r-- | hw/xquartz/quartz.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c index 7de7138c4..226cb2f11 100644 --- a/hw/xquartz/quartz.c +++ b/hw/xquartz/quartz.c @@ -239,8 +239,6 @@ void QuartzUpdateScreens(void) { AppleWMSetScreenOrigin(pRoot); pScreen->ResizeWindow(pRoot, x - sx, y - sy, width, height, NULL); - miPaintWindow(pRoot, &pRoot->borderClip, PW_BACKGROUND); - /* <rdar://problem/7770779> pointer events are clipped to old display region after display reconfiguration * http://xquartz.macosforge.org/trac/ticket/346 */ @@ -268,6 +266,9 @@ void QuartzUpdateScreens(void) { quartzProcs->UpdateScreen(pScreen); + /* miPaintWindow needs to be called after RootlessUpdateScreenPixmap (from xprUpdateScreen) */ + miPaintWindow(pRoot, &pRoot->borderClip, PW_BACKGROUND); + /* Tell RandR about the new size, so new connections get the correct info */ RRScreenSizeNotify(pScreen); } |