Merge pull request #45 from giucam/xkb

Don't update the keymap every time a key is pressed

src/compositor/wayland_wrapper/qwlkeyboard.cpp

@@ -144,14 +144,13 @@ void Keyboard::setFocus(Surface* surface)
 void Keyboard::setKeymap(const QWaylandKeymap &keymap)
 {
     m_keymap = keymap;
+    m_pendingKeymap = true;
 
     // If there is no key currently pressed, update right away the keymap
     // Otherwise, delay the update when keys are released
     // see http://lists.freedesktop.org/archives/wayland-devel/2013-October/011395.html
     if (m_keys.isEmpty()) {
         updateKeymap();
-    } else {
-        m_pendingKeymap = true;
     }
 }
 
@@ -279,6 +278,11 @@ void Keyboard::updateModifierState(uint code, uint32_t state)
 
 void Keyboard::updateKeymap()
 {
+    // There must be no keys pressed when changing the keymap,
+    // see http://lists.freedesktop.org/archives/wayland-devel/2013-October/011395.html
+    if (!m_pendingKeymap || !m_keys.isEmpty())
+        return;
+
     m_pendingKeymap = false;
 #ifndef QT_NO_WAYLAND_XKB
     createXKBKeymap();