From 6232362cca7021e5b436d267e07f9d6875a20a4c Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Mon, 21 Dec 2015 23:09:50 +0000 Subject: [PATCH 5/6] Check for null geometry in client window BUG: 355463 --- xembed-sni-proxy/sniproxy.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/xembed-sni-proxy/sniproxy.cpp b/xembed-sni-proxy/sniproxy.cpp index 7a51767..9f3ef81 100644 --- a/xembed-sni-proxy/sniproxy.cpp +++ b/xembed-sni-proxy/sniproxy.cpp @@ -158,23 +158,30 @@ SNIProxy::SNIProxy(xcb_window_t wid, QObject* parent): windowMoveConfigVals); + QSize clientWindowSize; + + if (clientGeom) { + clientWindowSize = QSize(clientGeom->width, clientGeom->height); + } //if the window is a clearly stupid size resize to be something sensible //this is needed as chormium and such when resized just fill the icon with transparent space and only draw in the middle //however spotify does need this as by default the window size is 900px wide. //use an artbitrary heuristic to make sure icons are always sensible - if (clientGeom->width > s_embedSize || clientGeom->height > s_embedSize ) + if (clientWindowSize.isEmpty() || clientWindowSize.width() > s_embedSize || clientWindowSize.height() > s_embedSize ) { + qCDebug(SNIPROXY) << "Resizing window" << wid << Title() << "from w*h" << clientWindowSize; + const uint32_t windowMoveConfigVals[2] = { s_embedSize, s_embedSize }; xcb_configure_window(c, wid, XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT, windowMoveConfigVals); - qCDebug(SNIPROXY) << "Resizing window" << wid << Title() << "from w*h" << clientGeom->width << clientGeom->height; + clientWindowSize = QSize(s_embedSize, s_embedSize); } //show the embedded window otherwise nothing happens xcb_map_window(c, wid); - xcb_clear_area(c, 0, wid, 0, 0, qMin(clientGeom->width, s_embedSize), qMin(clientGeom->height, s_embedSize)); + xcb_clear_area(c, 0, wid, 0, 0, clientWindowSize.width(), clientWindowSize.height()); xcb_flush(c); @@ -246,6 +253,10 @@ QImage SNIProxy::getImageNonComposite() const QScopedPointer geom(xcb_get_geometry_reply(c, cookie, Q_NULLPTR)); + if (!geom) { + return QImage(); + } + xcb_image_t *image = xcb_image_get(c, m_windowId, 0, 0, geom->width, geom->height, 0xFFFFFF, XCB_IMAGE_FORMAT_Z_PIXMAP); // Don't hook up cleanup yet, we may use a different QImage after all -- 2.5.0