Skip to content

Add Keybind Modifier Fallthrough #2000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Cvolton wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add Keybind Modifier Fallthrough #2000

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebd0acf
add modifier fallthrough
Cvolton Apr 3, 2026
ced0434
make the 1st comment less stupid
Cvolton Apr 3, 2026
7169597
move out the imeActive assignment so we save 3 cpu cycles
Cvolton Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 41 additions & 18 deletions loader/src/loader/LoaderImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,32 +406,55 @@ void Loader::Impl::populateModList(std::vector<ModMetadata>& modQueue) {
});
}

auto it = m_keybindSettings.find(keybind);
if (it == m_keybindSettings.end()) {
return ListenerResult::Propagate;
// build up all keybinds to look for, starting with the most specific to least specific
// this is for modifier fallthrough functionality
std::vector<Keybind> keybindsToCheck;
int baseMask = keybind.modifiers.value;

for (int submask = baseMask; ; submask = (submask - 1) & baseMask) {
keybindsToCheck.push_back(Keybind(keybind.key, submask));

if (submask == 0) {
break;
}
}

std::ranges::sort(keybindsToCheck, [](const Keybind& a, const Keybind& b) {
return std::popcount(a.modifiers.value) > std::popcount(b.modifiers.value);
});

// now we run the code that already existed before the
// modifier fallthrough functionality was added but we
// loop it through all modifier combinations we just found
bool imeActive = CCIMEDispatcher::sharedDispatcher()->hasDelegate();

if (down) {
for (auto& setting : it->second) {
if (imeActive && !setting->getAllowInTextInputs()) {
continue;
}
if (!repeat) m_activeKeybinds[setting.get()] = keybind;
if (KeybindSettingPressedEventV3(setting->getModID(), setting->getKey()).send(keybind, down, repeat, data.timestamp)) {
return ListenerResult::Stop;
}
for(const auto& keybind : keybindsToCheck) {
auto it = m_keybindSettings.find(keybind);
if (it == m_keybindSettings.end()) {
continue;
}
} else {
for (auto& setting : it->second) {
auto it2 = m_activeKeybinds.find(setting.get());
if (it2 != m_activeKeybinds.end() && it2->second.key == data.key) {
KeybindSettingPressedEventV3(setting->getModID(), setting->getKey()).send(keybind, down, repeat, data.timestamp);
m_activeKeybinds.erase(it2);

if (down) {
for (auto& setting : it->second) {
if (imeActive && !setting->getAllowInTextInputs()) {
continue;
}
if (!repeat) m_activeKeybinds[setting.get()] = keybind;
if (KeybindSettingPressedEventV3(setting->getModID(), setting->getKey()).send(keybind, down, repeat, data.timestamp)) {
return ListenerResult::Stop;
}
}
} else {
for (auto& setting : it->second) {
auto it2 = m_activeKeybinds.find(setting.get());
if (it2 != m_activeKeybinds.end() && it2->second.key == data.key) {
KeybindSettingPressedEventV3(setting->getModID(), setting->getKey()).send(keybind, down, repeat, data.timestamp);
m_activeKeybinds.erase(it2);
}
}
}
}

return ListenerResult::Propagate;
}).leak();

Expand Down
Loading