Skip to content

fixed keybind issue with linux/x11 #4581 #4600

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

Merged
MineGame159 merged 2 commits into from
Jun 21, 2024
Merged

fixed keybind issue with linux/x11 #4581 #4600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19166da
fixed keybind issue with linux/x11 #4581
19MisterX98 May 23, 2024
42811c8
change imports
19MisterX98 May 23, 2024
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
8 changes: 8 additions & 0 deletions src/main/java/meteordevelopment/meteorclient/mixin/KeyboardMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ public abstract class KeyboardMixin {
@Inject(method = "onKey", at = @At("HEAD"), cancellable = true)
public void onKey(long window, int key, int scancode, int action, int modifiers, CallbackInfo info) {
if (key != GLFW.GLFW_KEY_UNKNOWN) {
// on Linux/X11 the modifier is not active when the key is pressed and still active when the key is released
// https://github.com/glfw/glfw/issues/1630
if (action == GLFW.GLFW_PRESS) {
modifiers |= Input.getModifier(key);
} else if (action == GLFW.GLFW_RELEASE) {
modifiers &= ~Input.getModifier(key);
}

if (client.currentScreen instanceof WidgetScreen && action == GLFW.GLFW_REPEAT) {
((WidgetScreen) client.currentScreen).keyRepeated(key, modifiers);
}
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/meteordevelopment/meteorclient/utils/misc/input/Input.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,14 @@ public static void setCursorStyle(CursorStyle style) {
lastCursorStyle = style;
}
}

public static int getModifier(int key) {
return switch (key) {
case GLFW.GLFW_KEY_LEFT_SHIFT, GLFW.GLFW_KEY_RIGHT_SHIFT -> GLFW.GLFW_MOD_SHIFT;
case GLFW.GLFW_KEY_LEFT_CONTROL, GLFW.GLFW_KEY_RIGHT_CONTROL -> GLFW.GLFW_MOD_CONTROL;
case GLFW.GLFW_KEY_LEFT_ALT, GLFW.GLFW_KEY_RIGHT_ALT -> GLFW.GLFW_MOD_ALT;
case GLFW.GLFW_KEY_LEFT_SUPER, GLFW.GLFW_KEY_RIGHT_SUPER -> GLFW.GLFW_MOD_SUPER;
default -> 0;
};
}
}