From 7b2a517ba99f6756e98c4aef47d9b9399b997157 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Wed, 26 Mar 2014 23:24:20 +0100 Subject: [PATCH] Xephyr: restore initial window resize lost in xcb conversion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The XResizeWindow call wasn't replaced by the xcb equivalent, so we were no longer setting the initial window size, only wm size hints. Regression from commit a2b73da "Xephyr: start converting hostx.c over to xcb" Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74849 Signed-off-by: Julien Cristau Reported-by: Laércio de Sousa Tested-by: Jon TURNEY Reviewed-by: Jon TURNEY Signed-off-by: Keith Packard --- hw/kdrive/ephyr/hostx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c index 3054f5f..4f48770 100644 --- a/hw/kdrive/ephyr/hostx.c +++ b/hw/kdrive/ephyr/hostx.c @@ -710,6 +710,12 @@ hostx_screen_init(KdScreenInfo *screen, malloc(scrpriv->ximg->stride * buffer_height); } + { + uint32_t mask = XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT; + uint32_t values[2] = {width, height}; + xcb_configure_window(HostX.conn, scrpriv->win, mask, values); + } + if (scrpriv->win_pre_existing == None && !EphyrWantResize) { /* Ask the WM to keep our size static */ xcb_size_hints_t size_hints = {0}; -- 1.9.3