diff options
| author | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-02-08 13:01:25 +0100 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-02-25 13:18:41 +0000 |
| commit | 669070c404b9cbeac9ad8050600ec6b90bdcb756 (patch) | |
| tree | 4ba7f2887d4652a6fb042d1df9b68368d927b205 /src/plugins/platforms/xcb/qxcbconnection.cpp | |
| parent | 1a341d8333c95708759706aa78fbc7828d837bf2 (diff) | |
xcb: simplify handling of keymap updates
The old code was somewhat too scattered.
Change-Id: Ib0445c66653f757ccac28778f34f4bcb5df49a70
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index c6fd006f95..2431f99ab8 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -1132,7 +1132,7 @@ void QXcbConnection::handleXcbEvent(xcb_generic_event_t *event) m_keyboard->updateXKBStateFromCore(((xcb_key_release_event_t *)event)->state); HANDLE_KEYBOARD_EVENT(xcb_key_release_event_t, handleKeyReleaseEvent); case XCB_MAPPING_NOTIFY: - m_keyboard->handleMappingNotifyEvent(reinterpret_cast<xcb_mapping_notify_event_t *>(event)); + m_keyboard->updateKeymap(reinterpret_cast<xcb_mapping_notify_event_t *>(event)); break; case XCB_SELECTION_REQUEST: { @@ -1220,7 +1220,7 @@ void QXcbConnection::handleXcbEvent(xcb_generic_event_t *event) handled = true; break; case XCB_XKB_MAP_NOTIFY: - m_keyboard->handleMappingNotifyEvent(&xkb_event->map_notify); + m_keyboard->updateKeymap(); handled = true; break; case XCB_XKB_NEW_KEYBOARD_NOTIFY: { |