Fixed binds without modifiers not matching while a modifier is held

[dekrom]

Type of change

• Bug fix
• New feature

Description

Since 56a7703 ("Fixed modifier keybinds triggering non modifier varients", #6586), a keybind
that has no modifiers only matches when no modifier at all is held:

if (!hasMods()) return modifiers.stream().noneMatch(m -> m == Modifier.SHIFT || m == Modifier.CONTROL || m == Modifier.ALT || m == Modifier.SUPER);

That breaks two ordinary cases:

1. Binds on a bare modifier key never trigger. KeyboardHandlerMixin deliberately sets a
modifier key's own bit on its press event (the workaround for glfw/glfw#1630), so pressing
Left Alt arrives as key=342, modifiers=MOD_ALT. A module bound to plain Left Alt therefore
never matches on press. Mine (Free Look on Left Alt) went dead after updating, and only
toggling from the module list still worked. Release does match, but that path only fires for
toggleOnBindRelease.

2. Any bind dies while a modifier is held for an unrelated reason. Sneaking holds Shift,
sprinting holds Ctrl. Press a plain bind during either and it no longer matches.

The underlying issue is that #6586 treats a held modifier as disqualifying, when what it
actually wanted is for Ctrl + G not to also trigger a module bound to plain G. That is a
question of precedence between binds, not of what the bind itself matches, so this moves it to
where the binds are dispatched:

• Keybind#matches goes back to ignoring modifiers for a bind that has none.
• Modules#onAction first checks whether any module's bind with modifiers matches the event;
  if one does, binds without modifiers are skipped for that event.

Ctrl + G still fires only the chorded bind, G alone still fires the plain one, and plain
binds work again while sneaking, sprinting, or when the bound key is itself a modifier.

Related issues

Regression from #6586 (56a7703).

How Has This Been Tested?

Built and run on 26.2 (production, Fabric) with Free Look bound to plain Left Alt:

• Tapping Alt toggles the module again. Verified at the dispatch level too, by logging
  Modules#onAction: the press arrives as value=342 mods=4 and now matches, where before it
  did not.
• Ctrl held (sprinting) or Shift held (sneaking) + Alt still toggles it.
• With one module bound to G and another to Ctrl + G: Ctrl + G toggles only the chorded
  module, G alone toggles only the plain one.

Checklist:

• My code follows the style guidelines of this project.
• I have added comments to my code in more complex areas.
• I have tested the code in both development and production environments.

[crosby-moe]

im not a big fan of the idea that introducing a new keybind can affect the behavior of an existing keybind, i think a better solution would be to add a toggle into the keybind setting controlling whether to strictly match modifiers

[Wide-Cat]

Almost perfect, but one issue. If I have:

Module 1 bound to C
Module 2 bound to Ctrl + C

and I press Ctrl + Shift+ C, then module 1 will toggle, but I think it should be module 2. If you fix this, I will merge.

[Wide-Cat]

I've tried fixing this issue myself a couple times and getting all the edge cases lined up might not be worth the effort and added complexity. This fixes the actual issues we have and my earlier comment is technically a dispute over behaviour rather than a real bug. Might come back and see if I can make the system perfect but this is good enough for now.