4a976d58ec
Summary: With this change the ModifierOnlyShortcut starts to track the actual pressed keys instead using a counter of combined pressed keys. This should help for the cases that we get unsynced key codes. E.g. if we get two key presses for the same key and only one release we don't get out of sync. Similar if we get a key release for a key which wasn't pressed, we don't go out of sync. Test Plan: Auto test still passes Reviewers: #kwin, #plasma Subscribers: plasma-devel, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D4617
102 lines
3.4 KiB
C++
102 lines
3.4 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/>.
|
|
*********************************************************************/
|
|
#include "modifier_only_shortcuts.h"
|
|
#include "input_event.h"
|
|
#include "options.h"
|
|
#include "screenlockerwatcher.h"
|
|
#include "workspace.h"
|
|
|
|
#include <QDBusConnection>
|
|
#include <QDBusMessage>
|
|
#include <QDBusPendingCall>
|
|
|
|
namespace KWin
|
|
{
|
|
|
|
ModifierOnlyShortcuts::ModifierOnlyShortcuts()
|
|
: QObject()
|
|
, InputEventSpy()
|
|
{
|
|
connect(ScreenLockerWatcher::self(), &ScreenLockerWatcher::locked, this, &ModifierOnlyShortcuts::reset);
|
|
}
|
|
|
|
ModifierOnlyShortcuts::~ModifierOnlyShortcuts() = default;
|
|
|
|
void ModifierOnlyShortcuts::keyEvent(KeyEvent *event)
|
|
{
|
|
if (event->isAutoRepeat()) {
|
|
return;
|
|
}
|
|
if (event->type() == QEvent::KeyPress) {
|
|
const bool wasEmpty = m_pressedKeys.isEmpty();
|
|
m_pressedKeys.insert(event->nativeScanCode());
|
|
if (wasEmpty && m_pressedKeys.size() == 1 &&
|
|
!ScreenLockerWatcher::self()->isLocked() &&
|
|
m_buttonPressCount == 0 &&
|
|
m_cachedMods == Qt::NoModifier) {
|
|
m_modifier = Qt::KeyboardModifier(int(event->modifiersRelevantForGlobalShortcuts()));
|
|
} else {
|
|
m_modifier = Qt::NoModifier;
|
|
}
|
|
} else if (!m_pressedKeys.isEmpty()) {
|
|
m_pressedKeys.remove(event->nativeScanCode());
|
|
if (m_pressedKeys.isEmpty() &&
|
|
event->modifiersRelevantForGlobalShortcuts() == Qt::NoModifier &&
|
|
!workspace()->globalShortcutsDisabled()) {
|
|
if (m_modifier != Qt::NoModifier) {
|
|
const auto list = options->modifierOnlyDBusShortcut(m_modifier);
|
|
if (list.size() >= 4) {
|
|
auto call = QDBusMessage::createMethodCall(list.at(0), list.at(1), list.at(2), list.at(3));
|
|
QVariantList args;
|
|
for (int i = 4; i < list.size(); ++i) {
|
|
args << list.at(i);
|
|
}
|
|
call.setArguments(args);
|
|
QDBusConnection::sessionBus().asyncCall(call);
|
|
}
|
|
}
|
|
}
|
|
m_modifier = Qt::NoModifier;
|
|
} else {
|
|
m_modifier = Qt::NoModifier;
|
|
}
|
|
m_cachedMods = event->modifiersRelevantForGlobalShortcuts();
|
|
}
|
|
|
|
void ModifierOnlyShortcuts::pointerEvent(MouseEvent *event)
|
|
{
|
|
if (event->type() == QEvent::MouseMove) {
|
|
return;
|
|
}
|
|
if (event->type() == QEvent::MouseButtonPress) {
|
|
m_buttonPressCount++;
|
|
} else if (event->type() == QEvent::MouseButtonRelease) {
|
|
m_buttonPressCount--;
|
|
}
|
|
reset();
|
|
}
|
|
|
|
void ModifierOnlyShortcuts::wheelEvent(WheelEvent *event)
|
|
{
|
|
Q_UNUSED(event)
|
|
reset();
|
|
}
|
|
|
|
}
|