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