starred/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2026-08-24 10:04:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

keybinds: fix subchord matching for release binds (#15904)

Browse Source
This commit is contained in:
Vaxry
2026-08-20 17:24:01 +02:00
committed by GitHub
parent 52b368f1d7
commit 8d50be06aa
6 changed files with 128 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/keybinds/MatchResolver.cpp
+32 -4
View File
@@ -63,7 +63,7 @@ TEST(KeybindsMatchResolver, FullPrefixWaitsForLongerChord) {
EXPECT_EQ(RESOLUTION.deferred.front(), SHORT);
}
TEST(KeybindsMatchResolver, ReverseOrderDoesNotDeferShortChord) {
TEST(KeybindsMatchResolver, NonPrefixSubChordWaitsForLongerChord) {
const auto SHORT = makeResolverBind({"SUPER", "Q"});
const auto LONG = makeResolverBind({"SUPER", "K", "Q"});
const auto Q = resolverKey("Q", 24);
@@ -79,9 +79,37 @@ TEST(KeybindsMatchResolver, ReverseOrderDoesNotDeferShortChord) {
};
const auto RESOLUTION = resolveChordMatches(CANDIDATES, CONTEXT);
ASSERT_EQ(RESOLUTION.immediate.size(), 1);
EXPECT_EQ(RESOLUTION.immediate.front(), SHORT);
EXPECT_TRUE(RESOLUTION.deferred.empty());
EXPECT_TRUE(RESOLUTION.immediate.empty());
ASSERT_EQ(RESOLUTION.deferred.size(), 1);
EXPECT_EQ(RESOLUTION.deferred.front(), SHORT);
}
TEST(KeybindsMatchResolver, MiddleSubChordWaitsForLongerChord) {
const auto SHORT = makeResolverBind({"SUPER", "D"});
const auto LONG = makeResolverBind({"SUPER", "X", "D", "F"});
const auto X = resolverKey("X", 53);
const auto D = resolverKey("D", 40);
const std::array HELD = {X, D};
const SBindEventContext CONTEXT{
.heldKeys = HELD,
.trigger = D,
.modifiersNow = HL_MODIFIER_META,
};
const std::array CANDIDATES = {
SBindMatchCandidate{SHORT, SHORT->matches(CONTEXT)},
SBindMatchCandidate{LONG, LONG->matches(CONTEXT)},
};
const std::array REVERSED_CANDIDATES = {
SBindMatchCandidate{LONG, LONG->matches(CONTEXT)},
SBindMatchCandidate{SHORT, SHORT->matches(CONTEXT)},
};
for (const auto& candidates : {CANDIDATES, REVERSED_CANDIDATES}) {
const auto RESOLUTION = resolveChordMatches(candidates, CONTEXT);
EXPECT_TRUE(RESOLUTION.immediate.empty());
ASSERT_EQ(RESOLUTION.deferred.size(), 1);
EXPECT_EQ(RESOLUTION.deferred.front(), SHORT);
}
}
TEST(KeybindsMatchResolver, SidedModifierDoesNotIncreaseChordLength) {