Skip to content

Add strict flag for keybinds to prevent key binding clashes #6595

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
Elpersonn wants to merge 9 commits into
base: master
Choose a base branch
from
+37 −6
Open

Add strict flag for keybinds to prevent key binding clashes #6595

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6be248c
altgr
Elpersonn May 26, 2026
3d49972
altgr revert, to make good
Elpersonn May 26, 2026
e7ae6b8
make it a foreach and lowk done I think
Elpersonn May 26, 2026
2fa65c2
foreach epicstyle
Elpersonn May 27, 2026
092260a
who tf are you
Elpersonn May 27, 2026
f75bca7
stupid moment
Elpersonn May 27, 2026
5b27485
maybe the real keybinds were they keys we made along the keyboard
Elpersonn May 27, 2026
7529dc4
rerun NOW
Elpersonn May 27, 2026
7f00b29
tests will be ran until morale improves
Elpersonn May 30, 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
1 change: 1 addition & 0 deletions Robust.Client/Input/InputDevices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ public enum Key : byte
Pause,
World1,
CapsLock,
AltGr
}

public static bool IsMouseKey(this Key key)
Expand Down
7 changes: 7 additions & 0 deletions Robust.Client/Input/InputManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,13 @@ public void KeyDown(KeyEventArgs args)

_keysPressed[(int)args.Key] = true;

if (_keysPressed[(int)Key.Alt] && _keysPressed[(int)Key.Control])
{
_keysPressed[(int)Key.Alt] = false;
_keysPressed[(int)Key.Control] = false;
_keysPressed[(int)Key.AltGr] = true;
}

PackedKeyCombo matchedCombo = default;

var bindsDown = new List<KeyBinding>();
Expand Down
Loading