fix: 修复Boat后端1.21.9+无法使用Shift/Ctrl/Alt快捷键的问题 #1330

Author: ShirosakiMio

FCL/src/main/java/com/tungsten/fcl/control/FCLInput.java

@@ -110,13 +110,13 @@ public void sendKeyEvent(int keycode, boolean press) {
             if (MOUSE_MAP.containsKey(keycode) && MOUSE_MAP.get(keycode) != null) {
                 menu.getBridge().pushEventMouseButton(MOUSE_MAP.get(keycode), press);
             } else {
-                menu.getBridge().pushEventKey(keycode, 0, press);
                 if (!FCLBridge.BACKEND_IS_BOAT) {
-                    int code = LwjglKeycodeMap.convertKeycode(keycode);
-                    if (code >= 0) {
-                        CallbackBridge.setModifiers(code, press);
-                    }
                 }
+                int code = LwjglKeycodeMap.convertKeycode(keycode);
+                if (code >= 0) {
+                    CallbackBridge.setModifiers(code, press);
+                }
+                menu.getBridge().pushEventKey(keycode, 0, press);
             }
         }
     }

FCLauncher/src/main/java/com/tungsten/fclauncher/bridge/FCLBridge.java

@@ -126,7 +126,7 @@ public FCLBridge() {
 
     public native void setEventPipe();
 
-    public native void pushEvent(long time, int type, int keycode, int keyChar);
+    public native void pushEvent(long time, int type, int keycode, int keyChar, int modifiers);
 
     public static native int nativeGetFps();
 
@@ -185,7 +185,7 @@ public void pushEventMouseButton(int button, boolean press) {
             } else if (button == Button3) {
                 button = Button2;
             }
-            pushEvent(System.nanoTime(), press ? ButtonPress : ButtonRelease, button + 1, 0);
+            pushEvent(System.nanoTime(), press ? ButtonPress : ButtonRelease, button + 1, 0, CallbackBridge.getCurrentMods());
         } else {
             switch (button) {
                 case Button4:
@@ -206,7 +206,7 @@ public void pushEventMouseButton(int button, boolean press) {
 
     public void pushEventPointer(int x, int y) {
         if (BACKEND_IS_BOAT) {
-            pushEvent(System.nanoTime(), MotionNotify, x, y);
+            pushEvent(System.nanoTime(), MotionNotify, x, y, CallbackBridge.getCurrentMods());
         } else {
             CallbackBridge.sendCursorPos(x, y);
         }
@@ -222,30 +222,30 @@ public void pushEventPointer(float x, float y) {
 
     public void pushEventKey(int keyCode, int keyChar, boolean press) {
         if (BACKEND_IS_BOAT) {
-            pushEvent(System.nanoTime(), press ? KeyPress : KeyRelease, keyCode, keyChar);
+            pushEvent(System.nanoTime(), press ? KeyPress : KeyRelease, keyCode, keyChar, CallbackBridge.getCurrentMods());
         } else {
             CallbackBridge.sendKeycode(keyCode, (char) keyChar, 0, CallbackBridge.getCurrentMods(), press);
         }
     }
 
     public void pushEventChar(char keyChar) {
         if (BACKEND_IS_BOAT) {
-            pushEvent(System.nanoTime(), KeyChar, FCLKeycodes.KEY_RESERVED, keyChar);
+            pushEvent(System.nanoTime(), KeyChar, FCLKeycodes.KEY_RESERVED, keyChar, CallbackBridge.getCurrentMods());
         } else {
             CallbackBridge.sendChar(keyChar, 0);
         }
     }
 
     public void pushEventWindow(int width, int height) {
         if (BACKEND_IS_BOAT) {
-            pushEvent(System.nanoTime(), ConfigureNotify, width, height);
+            pushEvent(System.nanoTime(), ConfigureNotify, width, height, 0);
         } else {
             CallbackBridge.sendUpdateWindowSize(width, height);
         }
     }
 
     public void pushEventMessage(int msg) {
-        pushEvent(System.nanoTime(), FCLMessage, msg, 0);
+        pushEvent(System.nanoTime(), FCLMessage, msg, 0, 0);
     }
 
     // FCLBridge callbacks

FCLauncher/src/main/jni/fcl/fcl_event.c

@@ -120,7 +120,7 @@ int fclPollEvent(FCLEvent* event) {
     return ret;
 }
 
-JNIEXPORT void JNICALL Java_com_tungsten_fclauncher_bridge_FCLBridge_pushEvent(JNIEnv* env, jclass clazz, jlong time, jint type, jint p1, jint p2) {
+JNIEXPORT void JNICALL Java_com_tungsten_fclauncher_bridge_FCLBridge_pushEvent(JNIEnv* env, jclass clazz, jlong time, jint type, jint p1, jint p2, jint modifiers) {
     if (!fcl->has_event_pipe) {
         return;
     }
@@ -135,7 +135,7 @@ JNIEXPORT void JNICALL Java_com_tungsten_fclauncher_bridge_FCLBridge_pushEvent(J
     }
     event->time = time;
     event->type = type;
-    event->state = 0;
+    event->state = modifiers;
     switch (type) {
         case KeyChar:
             event->keychar = p2;

FCLauncher/src/main/jni/glfw/fcl_window.c

@@ -20,22 +20,22 @@
 //
 static int translateState(int state)
 {
-    int mods = 0;
-
-    if (state & ShiftMask)
-        mods |= GLFW_MOD_SHIFT;
-    if (state & ControlMask)
-        mods |= GLFW_MOD_CONTROL;
-    if (state & Mod1Mask)
-        mods |= GLFW_MOD_ALT;
-    if (state & Mod4Mask)
-        mods |= GLFW_MOD_SUPER;
-    if (state & LockMask)
-        mods |= GLFW_MOD_CAPS_LOCK;
-    if (state & Mod2Mask)
-        mods |= GLFW_MOD_NUM_LOCK;
-
-    return mods;
+//    int mods = 0;
+//
+//    if (state & ShiftMask)
+//        mods |= GLFW_MOD_SHIFT;
+//    if (state & ControlMask)
+//        mods |= GLFW_MOD_CONTROL;
+//    if (state & Mod1Mask)
+//        mods |= GLFW_MOD_ALT;
+//    if (state & Mod4Mask)
+//        mods |= GLFW_MOD_SUPER;
+//    if (state & LockMask)
+//        mods |= GLFW_MOD_CAPS_LOCK;
+//    if (state & Mod2Mask)
+//        mods |= GLFW_MOD_NUM_LOCK;
+
+    return state;
 }
 
 // Translates an FCL key code to a GLFW key token