Skip to content

Fix stuck hold-actions when modifiers change before key release #8097

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
MadeByGabe wants to merge 1 commit into
base: master
Choose a base branch
from
+33 −10
Open

Fix stuck hold-actions when modifiers change before key release #8097

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 33 additions & 10 deletions luaui/actions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ local actionHandler = {
keyPressActions = {},
keyRepeatActions = {},
keyReleaseActions = {},
syncActions = {}
syncActions = {},
-- actions triggered by currently held physical key (keyed by scancode) captured at press time so their release can be dispatched reliably
pressedKeyActions = {},
}

--------------------------------------------------------------------------------
Expand Down Expand Up @@ -203,22 +205,43 @@ local function TryAction(actionMap, cmd, optLine, optWords, isRepeat, release, a
end


function actionHandler:KeyAction(press, _, _, isRepeat, _, actions)
if (not(actions and next(actions))) then return false end

local actionSet
function actionHandler:KeyAction(press, _, _, isRepeat, scanCode, actions)
if (press) then
actionSet = isRepeat and self.keyRepeatActions or self.keyPressActions
else
actionSet = self.keyReleaseActions
if (not(actions and next(actions))) then return false end

-- Remember which actions this physical key triggered, so their release can still be dispatched even when the modifier state no longer matches the bind at release time.
if (scanCode and not isRepeat) then
self.pressedKeyActions[scanCode] = actions
end

local actionSet = isRepeat and self.keyRepeatActions or self.keyPressActions
for _, bAction in ipairs(actions) do
local cmd = bAction["command"]
local extra = bAction["extra"]
local words = string.split(extra)

if (TryAction(actionSet, cmd, extra, words, isRepeat, false, actions)) then
return true
end
end

return false
end

for _, bAction in ipairs(actions) do
-- Release: prefer the action list captured at press time.
local releaseActions = (scanCode and self.pressedKeyActions[scanCode]) or actions
if (scanCode) then
self.pressedKeyActions[scanCode] = nil
end

if (not(releaseActions and next(releaseActions))) then return false end

for _, bAction in ipairs(releaseActions) do
local cmd = bAction["command"]
local extra = bAction["extra"]
local words = string.split(extra)

if (TryAction(actionSet, cmd, extra, words, isRepeat, not press, actions)) then
if (TryAction(self.keyReleaseActions, cmd, extra, words, false, true, actions)) then
return true
end
end
Expand Down
Loading