diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2022-03-28 12:26:03 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2022-03-29 12:07:04 +0000 |
| commit | c104e87825fcd8272ee9720e301570cbe48f82fa (patch) | |
| tree | b6a46879e9ddf22a1da6fd7dda41f0694a1e7313 /src/compositor/compositor_api/qwaylandkeyboard.cpp | |
| parent | 2aa3e55f7f4514cda9c0d0fa6de35f55584810ad (diff) | |
Move internal function to private class
checkAndRepairModifierState() was never meant to be a public function.
Change-Id: Ia8946523b5ae79170490dc78a509ed1e132d9832
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandkeyboard.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandkeyboard.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp index aee9e7e77..97cc3138c 100644 --- a/src/compositor/compositor_api/qwaylandkeyboard.cpp +++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp @@ -513,12 +513,11 @@ void QWaylandKeyboard::sendKeyReleaseEvent(uint code) d->sendKeyEvent(code, WL_KEYBOARD_KEY_STATE_RELEASED); } -void QWaylandKeyboard::checkAndRepairModifierState(QKeyEvent *ke) +void QWaylandKeyboardPrivate::checkAndRepairModifierState(QKeyEvent *ke) { #if QT_CONFIG(xkbcommon) - Q_D(QWaylandKeyboard); - if (ke->modifiers() != d->currentModifierState) { - if (d->focusResource && ke->key() != Qt::Key_Shift + if (ke->modifiers() != currentModifierState) { + if (focusResource && ke->key() != Qt::Key_Shift && ke->key() != Qt::Key_Control && ke->key() != Qt::Key_Alt) { // Only repair the state for non-modifier keys // ### slightly awkward because the standard modifier handling @@ -526,19 +525,19 @@ void QWaylandKeyboard::checkAndRepairModifierState(QKeyEvent *ke) // key event is delivered uint32_t mods = 0; - if (d->shiftIndex == 0 && d->controlIndex == 0) - d->maybeUpdateXkbScanCodeTable(); + if (shiftIndex == 0 && controlIndex == 0) + maybeUpdateXkbScanCodeTable(); if (ke->modifiers() & Qt::ShiftModifier) - mods |= 1 << d->shiftIndex; + mods |= 1 << shiftIndex; if (ke->modifiers() & Qt::ControlModifier) - mods |= 1 << d->controlIndex; + mods |= 1 << controlIndex; if (ke->modifiers() & Qt::AltModifier) - mods |= 1 << d->altIndex; - qCDebug(qLcWaylandCompositor) << "Keyboard modifier state mismatch detected for event" << ke << "state:" << d->currentModifierState << "repaired:" << Qt::hex << mods; - d->send_modifiers(d->focusResource->handle, compositor()->nextSerial(), mods, - 0, 0, d->group); - d->currentModifierState = ke->modifiers(); + mods |= 1 << altIndex; + qCDebug(qLcWaylandCompositor) << "Keyboard modifier state mismatch detected for event" << ke << "state:" << currentModifierState << "repaired:" << Qt::hex << mods; + send_modifiers(focusResource->handle, compositor()->nextSerial(), mods, + 0, 0, group); + currentModifierState = ke->modifiers(); } } #else |