summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorAlberto Mardegan <alberto.mardegan@canonical.com>2013-03-07 16:29:11 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-15 08:24:16 +0100
commit1a60bfdcd1260aad8e8daeb117d4526970aa8228 (patch)
tree587cb9664c972a06ae613dfde392c463f0912de6 /src/plugins
parentee328adb2eb4d6e7baeda39db13f693628eaa0cf (diff)
XCB: don't map hidden windows
This bug was introduced by the XEMBED implementation (carried over from Qt4, but there it applied to QX11EmbedWidget only): the _XEMBED_INFO property is used to inform the *embedder* whether the embedded window should be mapped when embedded. Task-number: QTBUG-30084 Change-Id: I8d1c467874bdee3300a1b18b8174b2d62f498713 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.cpp18
1 files changed, 0 insertions, 18 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index 27cd163c36..20d312216a 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -1781,24 +1781,6 @@ void QXcbWindow::handlePropertyNotifyEvent(const xcb_property_notify_event_t *ev
}
return;
}
-
- const xcb_atom_t xEmbedInfoAtom = atom(QXcbAtom::_XEMBED_INFO);
- if (event->atom == xEmbedInfoAtom) {
- const xcb_get_property_cookie_t get_cookie =
- xcb_get_property(xcb_connection(), 0, m_window, xEmbedInfoAtom,
- XCB_ATOM_ANY, 0, 3);
-
- xcb_get_property_reply_t *reply =
- xcb_get_property_reply(xcb_connection(), get_cookie, NULL);
- if (reply && reply->length >= 2) {
- const long *data = (const long *)xcb_get_property_value(reply);
- if (data[1] & XEMBED_MAPPED)
- Q_XCB_CALL(xcb_map_window(xcb_connection(), m_window));
- else
- Q_XCB_CALL(xcb_unmap_window(xcb_connection(), m_window));
- }
- free(reply);
- }
}
void QXcbWindow::handleFocusInEvent(const xcb_focus_in_event_t *)