d6c0a5414e
Summary: So far the implementation of keyboard layout handling was split between KeyboardInputRedirection and Xkb. KeyboardInputRedirection registered the global shortcut and did the handling for layout switch and config changes. Xkb did the notification on layout change. Layout changes can nowadays be detected through an InputEventSpy. It can only happen after a key change or an explicit layout switch. Thus it does not need to be in Xkb anymore which allows to reduce Xkb to only care about the Xkb keymap and state tracking. This change introduces a new class KeyboardLayout which is an InputEventSpy and takes over the task of the layout change notification from Xkb and the layout management from KeyboardInputRedirection. Thus everything related to management of keyboard layout is together in one class. This allows in future to add unit test to it (requires further cleanup of Xkb to be able to use it and drop the InputRedirection dependency) and opens the possibility to also take over keyboard layout management on X11 for the Plasma desktop. Test Plan: Manual testing Reviewers: #kwin, #plasma_on_wayland Subscribers: plasma-devel, kwin Tags: #plasma_on_wayland, #kwin Differential Revision: https://phabricator.kde.org/D4135
56 lines
1.5 KiB
C++
56 lines
1.5 KiB
C++
/********************************************************************
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
Copyright (C) 2016, 2017 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_LAYOUT_H
|
|
#define KWIN_KEYBOARD_LAYOUT_H
|
|
|
|
#include "input_event_spy.h"
|
|
#include <QObject>
|
|
typedef uint32_t xkb_layout_index_t;
|
|
|
|
namespace KWin
|
|
{
|
|
class Xkb;
|
|
|
|
class KeyboardLayout : public QObject, public InputEventSpy
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit KeyboardLayout(Xkb *xkb);
|
|
~KeyboardLayout() override;
|
|
|
|
void init();
|
|
|
|
void checkLayoutChange();
|
|
void resetLayout();
|
|
|
|
void keyEvent(KeyEvent *event) override;
|
|
|
|
private Q_SLOTS:
|
|
void reconfigure();
|
|
|
|
private:
|
|
void notifyLayoutChange();
|
|
Xkb *m_xkb;
|
|
xkb_layout_index_t m_layout = 0;
|
|
};
|
|
|
|
}
|
|
|
|
#endif
|