yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: localize checkLayoutChange() check

Browse source 
We don't have to postpone the check until client would be actually
switched any more, so do it where it actually needed
This commit is contained in:
Andrey Butirsky 2020-12-07 18:34:32 +03:00
parent b127b5f45e
commit c459faba5a
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
keyboard_input.cpp
View file

@ -197,9 +197,14 @@ void KeyboardInputRedirection::processKey(uint32_t key, InputRedirection::Keyboa
Q_UNREACHABLE(); Q_UNREACHABLE();
} }
const quint32 previousLayout = m_xkb->currentLayout();
if (!autoRepeat) { if (!autoRepeat) {
const quint32 previousLayout = m_xkb->currentLayout();
m_xkb->updateKey(key, state); m_xkb->updateKey(key, state);
if (m_xkb->modifiers() == Qt::KeyboardModifier::NoModifier && type != QEvent::KeyRelease) {
m_keyboardLayout->checkLayoutChange(previousLayout);
}
} }
const xkb_keysym_t keySym = m_xkb->currentKeysym(); const xkb_keysym_t keySym = m_xkb->currentKeysym();
@ -221,10 +226,6 @@ void KeyboardInputRedirection::processKey(uint32_t key, InputRedirection::Keyboa
m_input->processFilters(std::bind(&InputEventFilter::keyEvent, std::placeholders::_1, &event)); m_input->processFilters(std::bind(&InputEventFilter::keyEvent, std::placeholders::_1, &event));
m_xkb->forwardModifiers(); m_xkb->forwardModifiers();
if (event.modifiersRelevantForGlobalShortcuts() == Qt::KeyboardModifier::NoModifier && type != QEvent::KeyRelease) {
m_keyboardLayout->checkLayoutChange(previousLayout);
}
} }
void KeyboardInputRedirection::processModifiers(uint32_t modsDepressed, uint32_t modsLatched, uint32_t modsLocked, uint32_t group) void KeyboardInputRedirection::processModifiers(uint32_t modsDepressed, uint32_t modsLatched, uint32_t modsLocked, uint32_t group)