xserver: Branch 'server-1.15-branch'

[Matt Dew]

 hw/kdrive/ephyr/hostx.c |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit d6268c25a8d33241d817977a84f127f8ef0cb9ee
Author: Julien Cristau <jcristau at debian.org>
Date:   Wed Mar 26 23:24:20 2014 +0100

    Xephyr: restore initial window resize lost in xcb conversion
    
    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 <jcristau at debian.org>
    Reported-by: Laércio de Sousa <lbsousajr at gmail.com>
    Tested-by: Jon TURNEY <jon.turney at dronecode.org.uk>
    Reviewed-by: Jon TURNEY <jon.turney at dronecode.org.uk>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index 3e01a47..57e7dc2 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -695,6 +695,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};