3bc6089394
Summary: So far KWin tried to repeat all pressed keys which should repeat. But this is not how X11 and e.g. QtWayland handle it. There only one key - the last one which got pressed - repeats. And this makes sense as the key is used to generate a keysym and that one KWin caches. Thus the logic so far resulted in incorrect keysyms to be generated during the repeat. E.g. pressing a, pressing b, releasing b would repeat b instead of the hold a as b was the last generated keysym. This change addresses this problem and let's only one key repeat at a time. When the currently repeating key gets released the repeat timer is stopped and other hold keys won't repeat any more. This also matches the behavior of X11 and QtWayland. BUG: 369091 FIXED-IN: 5.8.1 Reviewers: #kwin, #plasma_on_wayland Subscribers: plasma-devel, kwin Tags: #plasma_on_wayland, #kwin Differential Revision: https://phabricator.kde.org/D2941
159 lines
4.1 KiB
C++
159 lines
4.1 KiB
C++
/********************************************************************
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
Copyright (C) 2013, 2016 Martin Gräßlin <mgraesslin@kde.org>
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*********************************************************************/
|
|
#ifndef KWIN_KEYBOARD_INPUT_H
|
|
#define KWIN_KEYBOARD_INPUT_H
|
|
|
|
#include "input.h"
|
|
|
|
#include <QObject>
|
|
#include <QPointer>
|
|
#include <QPointF>
|
|
|
|
#include <QLoggingCategory>
|
|
Q_DECLARE_LOGGING_CATEGORY(KWIN_XKB)
|
|
|
|
class QWindow;
|
|
struct xkb_context;
|
|
struct xkb_keymap;
|
|
struct xkb_state;
|
|
struct xkb_compose_table;
|
|
struct xkb_compose_state;
|
|
typedef uint32_t xkb_mod_index_t;
|
|
typedef uint32_t xkb_keysym_t;
|
|
|
|
namespace KWin
|
|
{
|
|
|
|
class InputRedirection;
|
|
class Toplevel;
|
|
|
|
namespace LibInput
|
|
{
|
|
class Device;
|
|
}
|
|
|
|
class KWIN_EXPORT Xkb
|
|
{
|
|
public:
|
|
Xkb(InputRedirection *input);
|
|
~Xkb();
|
|
void reconfigure();
|
|
|
|
void installKeymap(int fd, uint32_t size);
|
|
void updateModifiers(uint32_t modsDepressed, uint32_t modsLatched, uint32_t modsLocked, uint32_t group);
|
|
void updateKey(uint32_t key, InputRedirection::KeyboardKeyState state);
|
|
xkb_keysym_t toKeysym(uint32_t key);
|
|
xkb_keysym_t currentKeysym() const {
|
|
return m_keysym;
|
|
}
|
|
QString toString(xkb_keysym_t keysym);
|
|
Qt::Key toQtKey(xkb_keysym_t keysym);
|
|
Qt::KeyboardModifiers modifiers() const;
|
|
Qt::KeyboardModifiers modifiersRelevantForGlobalShortcuts() const;
|
|
bool shouldKeyRepeat(quint32 key) const;
|
|
|
|
void switchToNextLayout();
|
|
|
|
private:
|
|
xkb_keymap *loadKeymapFromConfig();
|
|
xkb_keymap *loadDefaultKeymap();
|
|
void updateKeymap(xkb_keymap *keymap);
|
|
void createKeymapFile();
|
|
void updateModifiers();
|
|
void updateConsumedModifiers(uint32_t key);
|
|
InputRedirection *m_input;
|
|
xkb_context *m_context;
|
|
xkb_keymap *m_keymap;
|
|
xkb_state *m_state;
|
|
xkb_mod_index_t m_shiftModifier;
|
|
xkb_mod_index_t m_capsModifier;
|
|
xkb_mod_index_t m_controlModifier;
|
|
xkb_mod_index_t m_altModifier;
|
|
xkb_mod_index_t m_metaModifier;
|
|
Qt::KeyboardModifiers m_modifiers;
|
|
Qt::KeyboardModifiers m_consumedModifiers;
|
|
xkb_keysym_t m_keysym;
|
|
struct {
|
|
uint pressCount = 0;
|
|
Qt::KeyboardModifier modifier = Qt::NoModifier;
|
|
} m_modOnlyShortcut;
|
|
quint32 m_currentLayout = 0;
|
|
|
|
struct {
|
|
xkb_compose_table *table = nullptr;
|
|
xkb_compose_state *state = nullptr;
|
|
} m_compose;
|
|
};
|
|
|
|
class KeyboardInputRedirection : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit KeyboardInputRedirection(InputRedirection *parent);
|
|
virtual ~KeyboardInputRedirection();
|
|
|
|
void init();
|
|
|
|
void update();
|
|
|
|
/**
|
|
* @internal
|
|
*/
|
|
void processKey(uint32_t key, InputRedirection::KeyboardKeyState state, uint32_t time, LibInput::Device *device = nullptr);
|
|
/**
|
|
* @internal
|
|
*/
|
|
void processModifiers(uint32_t modsDepressed, uint32_t modsLatched, uint32_t modsLocked, uint32_t group);
|
|
/**
|
|
* @internal
|
|
**/
|
|
void processKeymapChange(int fd, uint32_t size);
|
|
|
|
Xkb *xkb() const {
|
|
return m_xkb.data();
|
|
}
|
|
Qt::KeyboardModifiers modifiers() const {
|
|
return m_xkb->modifiers();
|
|
}
|
|
|
|
private Q_SLOTS:
|
|
void reconfigure();
|
|
|
|
private:
|
|
InputRedirection *m_input;
|
|
bool m_inited = false;
|
|
QScopedPointer<Xkb> m_xkb;
|
|
QMetaObject::Connection m_activeClientSurfaceChangedConnection;
|
|
struct {
|
|
quint32 key = 0;
|
|
quint32 time = 0;
|
|
QTimer *timer = nullptr;
|
|
} m_keyRepeat;
|
|
};
|
|
|
|
inline
|
|
Qt::KeyboardModifiers Xkb::modifiers() const
|
|
{
|
|
return m_modifiers;
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|