7adf69dece
Summary: For XWayland windows the window might be activated before the Wayland Surface is set for it. Thus the keyboard focus is not passed to the window. Only on the next activate after the window got created the window got keyboard focus. This change addresses this problem by emitting a signal from Toplevel when the surface changes. The KeyboardInput listens to this signal for the active client and updates keyboard focus again if the surface changes. Thus keyboard focus is properly passed to XWayland windows. Test Plan: Test case which creates an X11 window is adjusted to verify the condition. Reviewers: #plasma_on_wayland, #kwin Subscribers: plasma-devel, kwin Tags: #plasma_on_wayland, #kwin Differential Revision: https://phabricator.kde.org/D2009
140 lines
3.6 KiB
C++
140 lines
3.6 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;
|
|
typedef uint32_t xkb_mod_index_t;
|
|
typedef uint32_t xkb_keysym_t;
|
|
|
|
namespace KWin
|
|
{
|
|
|
|
class InputRedirection;
|
|
class Toplevel;
|
|
|
|
namespace LibInput
|
|
{
|
|
class Device;
|
|
}
|
|
|
|
class 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);
|
|
QString toString(xkb_keysym_t keysym);
|
|
Qt::Key toQtKey(xkb_keysym_t keysym);
|
|
Qt::KeyboardModifiers modifiers() const;
|
|
bool shouldKeyRepeat(quint32 key) const;
|
|
|
|
void switchToNextLayout();
|
|
|
|
private:
|
|
xkb_keymap *loadKeymapFromConfig();
|
|
xkb_keymap *loadDefaultKeymap();
|
|
void updateKeymap(xkb_keymap *keymap);
|
|
void createKeymapFile();
|
|
void updateModifiers();
|
|
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_controlModifier;
|
|
xkb_mod_index_t m_altModifier;
|
|
xkb_mod_index_t m_metaModifier;
|
|
Qt::KeyboardModifiers m_modifiers;
|
|
struct {
|
|
uint pressCount = 0;
|
|
Qt::KeyboardModifier modifier = Qt::NoModifier;
|
|
} m_modOnlyShortcut;
|
|
quint32 m_currentLayout = 0;
|
|
};
|
|
|
|
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;
|
|
QHash<quint32, QTimer*> m_repeatTimers;
|
|
QMetaObject::Connection m_activeClientSurfaceChangedConnection;
|
|
};
|
|
|
|
inline
|
|
Qt::KeyboardModifiers Xkb::modifiers() const
|
|
{
|
|
return m_modifiers;
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|