65ddd32d1a
Summary: The functionality regarding triggering modifier only shortcuts is moved out of Xkb - where it doesn't belong to - and is turned into an input event spy listening for the changes it is interested in. Previously the state got queried by asking e.g. for the pressed buttons, now it's tracked directly. The X11 side needs a larger change due to that as now pushing the events into Xkb does not trigger modifier only shortcuts any more. Instead the "normal" way through the platform API needs to be used which triggers the processing of filters and spies. The problem here is that our redirections only process events if they are inited and that only happens on Wayland. We cannot call init on them as that would create all the Wayland filters and spies and processing would probably break. As an intermediate solution the spies are now processed and there we know that it won't matter. A future solution would be to remove the init checks completely and just send through both filters and spies and ensure that on X11 only the supported ones are loaded. Closes T5220 Test Plan: Tested on Wayland and X11 Reviewers: #kwin, #plasma Subscribers: plasma-devel, kwin Tags: #kwin Maniphest Tasks: T5220 Differential Revision: https://phabricator.kde.org/D4578
69 lines
1.9 KiB
C++
69 lines
1.9 KiB
C++
/********************************************************************
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
Copyright (C) 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_XINPUTINTEGRATION_H
|
|
#define KWIN_XINPUTINTEGRATION_H
|
|
|
|
#include <QObject>
|
|
#include <QPointer>
|
|
#include <QScopedPointer>
|
|
typedef struct _XDisplay Display;
|
|
|
|
namespace KWin
|
|
{
|
|
|
|
class XInputEventFilter;
|
|
class XKeyPressReleaseEventFilter;
|
|
class X11Cursor;
|
|
|
|
class XInputIntegration : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit XInputIntegration(Display *display, QObject *parent);
|
|
virtual ~XInputIntegration();
|
|
|
|
void init();
|
|
void startListening();
|
|
|
|
bool hasXinput() const {
|
|
return m_hasXInput;
|
|
}
|
|
void setCursor(X11Cursor *cursor);
|
|
|
|
private:
|
|
Display *display() const {
|
|
return m_x11Display;
|
|
}
|
|
|
|
bool m_hasXInput = false;
|
|
int m_xiOpcode = 0;
|
|
int m_majorVersion = 0;
|
|
int m_minorVersion = 0;
|
|
QPointer<X11Cursor> m_x11Cursor;
|
|
Display *m_x11Display;
|
|
|
|
QScopedPointer<XInputEventFilter> m_xiEventFilter;
|
|
QScopedPointer<XKeyPressReleaseEventFilter> m_keyPressFilter;
|
|
QScopedPointer<XKeyPressReleaseEventFilter> m_keyReleaseFilter;
|
|
};
|
|
|
|
}
|
|
|
|
#endif
|