1 files changed, 16 insertions, 33 deletions

diff --git a/src/compositor/compositor_api/qwaylandkeyboard_p.h b/src/compositor/compositor_api/qwaylandkeyboard_p.h
index 96d174310..a91c60e43 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard_p.h
+++ b/src/compositor/compositor_api/qwaylandkeyboard_p.h
@@ -1,32 +1,6 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Copyright (C) 2017 Klarälvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// Copyright (C) 2017 Klarälvdalens Datakonsult AB (KDAB).
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #ifndef QTWAYLAND_QWLKEYBOARD_P_H
 #define QTWAYLAND_QWLKEYBOARD_P_H
@@ -51,17 +25,17 @@
 #include <QtCore/private/qobject_p.h>
 #include <QtWaylandCompositor/private/qwayland-server-wayland.h>
 
-#include <QtCore/QVector>
+#include <QtCore/QList>
 
 #if QT_CONFIG(xkbcommon)
 #include <xkbcommon/xkbcommon.h>
-#include <QtXkbCommonSupport/private/qxkbcommon_p.h>
+#include <QtGui/private/qxkbcommon_p.h>
 #endif
 
 
 QT_BEGIN_NAMESPACE
 
-class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandKeyboardPrivate : public QObjectPrivate
+class Q_WAYLANDCOMPOSITOR_EXPORT QWaylandKeyboardPrivate : public QObjectPrivate
                                                   , public QtWaylandServer::wl_keyboard
 {
 public:
@@ -83,11 +57,13 @@ public:
     }
     uint32_t xkbModsMask() const { return modsDepressed | modsLatched | modsLocked; }
     void maybeUpdateXkbScanCodeTable();
+    void resetKeyboardState();
 #endif
 
     void keyEvent(uint code, uint32_t state);
     void sendKeyEvent(uint code, uint32_t state);
     void updateModifierState(uint code, uint32_t state);
+    void checkAndRepairModifierState(QKeyEvent *ke);
     void maybeUpdateKeymap();
 
     void checkFocusResource(Resource *resource);
@@ -104,6 +80,7 @@ private:
     void createXKBState(xkb_keymap *keymap);
 #endif
     static uint toWaylandKey(const uint nativeScanCode);
+    static uint fromWaylandKey(const uint key);
 
     void sendRepeatInfo();
 
@@ -113,12 +90,18 @@ private:
     Resource *focusResource = nullptr;
     QWaylandDestroyListener focusDestroyListener;
 
-    QVector<uint32_t> keys;
+    QList<uint32_t> keys;
     uint32_t modsDepressed = 0;
     uint32_t modsLatched = 0;
     uint32_t modsLocked = 0;
     uint32_t group = 0;
 
+    uint32_t shiftIndex = 0;
+    uint32_t controlIndex = 0;
+    uint32_t altIndex = 0;
+
+    Qt::KeyboardModifiers currentModifierState;
+
     bool pendingKeymap = false;
 #if QT_CONFIG(xkbcommon)
     size_t keymap_size;