1 files changed, 41 insertions, 3 deletions

diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.cpp b/src/plugins/platforms/xcb/qxcbkeyboard.cpp
index 20c169fc53..c5dc7b21ad 100644
--- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp
+++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp
@@ -1190,9 +1190,10 @@ QXcbKeyboard::QXcbKeyboard(QXcbConnection *connection)
 #if QT_CONFIG(xkb)
     core_device_id = 0;
     if (connection->hasXKB()) {
+        selectEvents();
         core_device_id = xkb_x11_get_core_keyboard_device_id(xcb_connection());
         if (core_device_id == -1) {
-            qWarning("Qt: couldn't get core keyboard device info");
+            qCWarning(lcQpaXcb, "failed to get core keyboard device info");
             return;
         }
     } else {
@@ -1210,6 +1211,42 @@ QXcbKeyboard::~QXcbKeyboard()
         xcb_key_symbols_free(m_key_symbols);
 }
 
+void QXcbKeyboard::selectEvents()
+{
+#if QT_CONFIG(xkb)
+    const uint16_t required_map_parts = (XCB_XKB_MAP_PART_KEY_TYPES |
+        XCB_XKB_MAP_PART_KEY_SYMS |
+        XCB_XKB_MAP_PART_MODIFIER_MAP |
+        XCB_XKB_MAP_PART_EXPLICIT_COMPONENTS |
+        XCB_XKB_MAP_PART_KEY_ACTIONS |
+        XCB_XKB_MAP_PART_KEY_BEHAVIORS |
+        XCB_XKB_MAP_PART_VIRTUAL_MODS |
+        XCB_XKB_MAP_PART_VIRTUAL_MOD_MAP);
+
+    const uint16_t required_events = (XCB_XKB_EVENT_TYPE_NEW_KEYBOARD_NOTIFY |
+        XCB_XKB_EVENT_TYPE_MAP_NOTIFY |
+        XCB_XKB_EVENT_TYPE_STATE_NOTIFY);
+
+    // XKB events are reported to all interested clients without regard
+    // to the current keyboard input focus or grab state
+    xcb_void_cookie_t select = xcb_xkb_select_events_checked(
+                xcb_connection(),
+                XCB_XKB_ID_USE_CORE_KBD,
+                required_events,
+                0,
+                required_events,
+                required_map_parts,
+                required_map_parts,
+                0);
+
+    xcb_generic_error_t *error = xcb_request_check(xcb_connection(), select);
+    if (error) {
+        free(error);
+        qCWarning(lcQpaXcb, "failed to select notify events from XKB");
+    }
+#endif
+}
+
 void QXcbKeyboard::updateVModMapping()
 {
 #if QT_CONFIG(xkb)
@@ -1541,7 +1578,8 @@ void QXcbKeyboard::handleKeyEvent(xcb_window_t sourceWindow, QEvent::Type type,
     } else {
         m_isAutoRepeat = false;
         // Look at the next event in the queue to see if we are auto-repeating.
-        connection()->checkEvent([this, time, code](xcb_generic_event_t *event, int type) {
+        connection()->eventQueue()->peek(QXcbEventQueue::PeekRetainMatch,
+                                         [this, time, code](xcb_generic_event_t *event, int type) {
             if (type == XCB_KEY_PRESS) {
                 auto keyPress = reinterpret_cast<xcb_key_press_event_t *>(event);
                 m_isAutoRepeat = keyPress->time == time && keyPress->detail == code;
@@ -1549,7 +1587,7 @@ void QXcbKeyboard::handleKeyEvent(xcb_window_t sourceWindow, QEvent::Type type,
                     m_autoRepeatCode = code;
             }
             return true;
-        }, false /* removeFromQueue */);
+        });
     }
 
     bool filtered = false;