summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-03-15 09:36:41 (GMT)
committerSamuel Rødal <samuel.rodal@nokia.com>2011-03-15 09:37:45 (GMT)
commitf7cbd336ba532e29a07d1f81f62e1b12ca53f835 (patch)
tree3fe144f4db66461e7bf1355b6516f951b5f5cc18
parent369ad09515fc8dac87613930114f4b3cf6381e81 (diff)
downloadQt-f7cbd336ba532e29a07d1f81f62e1b12ca53f835.zip
Qt-f7cbd336ba532e29a07d1f81f62e1b12ca53f835.tar.gz
Qt-f7cbd336ba532e29a07d1f81f62e1b12ca53f835.tar.bz2
Properly set the window event masks etc for screens and GL windows too.
-rw-r--r--src/plugins/platforms/xcb/qxcbscreen.cpp2
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.cpp6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp
index 519db63..f868db8 100644
--- a/src/plugins/platforms/xcb/qxcbscreen.cpp
+++ b/src/plugins/platforms/xcb/qxcbscreen.cpp
@@ -66,7 +66,7 @@ QXcbScreen::QXcbScreen(QXcbConnection *connection, xcb_screen_t *screen, int num
| XCB_EVENT_MASK_PROPERTY_CHANGE
};
- xcb_configure_window(xcb_connection(), screen->root, mask, values);
+ xcb_change_window_attributes(xcb_connection(), screen->root, mask, values);
}
QXcbScreen::~QXcbScreen()
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index 005aa0e..9478b5b 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -155,12 +155,14 @@ QXcbWindow::QXcbWindow(QWidget *tlw)
0, // border width
XCB_WINDOW_CLASS_INPUT_OUTPUT, // window class
m_screen->screen()->root_visual, // visual
- mask, // value mask
- values); // value list
+ 0, // value mask
+ 0); // value list
printf("created regular window: %d\n", m_window);
}
+ xcb_change_window_attributes(xcb_connection(), m_window, mask, values);
+
xcb_atom_t properties[4];
int propertyCount = 0;
properties[propertyCount++] = atom(QXcbAtom::WM_DELETE_WINDOW);