fix: Properly determine keysym for non-printable keys sent to X11

app/src/main/java/com/winlator/xserver/Keyboard.java

@@ -22,6 +22,47 @@ public class Keyboard {
     private final ArrayList<OnKeyboardListener> onKeyboardListeners = new ArrayList<>();
     private final XServer xServer;
 
+    private static final int[] NON_PRINTABLE_KEYCODES = new int[] {
+            // Modifier keys
+            KeyEvent.KEYCODE_SHIFT_LEFT,
+            KeyEvent.KEYCODE_SHIFT_RIGHT,
+            KeyEvent.KEYCODE_CTRL_LEFT,
+            KeyEvent.KEYCODE_CTRL_RIGHT,
+            KeyEvent.KEYCODE_ALT_LEFT,
+            KeyEvent.KEYCODE_ALT_RIGHT,
+            KeyEvent.KEYCODE_CAPS_LOCK,
+            KeyEvent.KEYCODE_NUM_LOCK,
+
+            // Control and navigation keys
+            KeyEvent.KEYCODE_ESCAPE,
+            KeyEvent.KEYCODE_TAB,
+            KeyEvent.KEYCODE_ENTER,
+            KeyEvent.KEYCODE_DEL,
+            KeyEvent.KEYCODE_FORWARD_DEL,
+            KeyEvent.KEYCODE_DPAD_UP,
+            KeyEvent.KEYCODE_DPAD_DOWN,
+            KeyEvent.KEYCODE_DPAD_LEFT,
+            KeyEvent.KEYCODE_DPAD_RIGHT,
+            KeyEvent.KEYCODE_MOVE_HOME,
+            KeyEvent.KEYCODE_MOVE_END,
+            KeyEvent.KEYCODE_PAGE_UP,
+            KeyEvent.KEYCODE_PAGE_DOWN,
+
+            // Function keys
+            KeyEvent.KEYCODE_F1,
+            KeyEvent.KEYCODE_F2,
+            KeyEvent.KEYCODE_F3,
+            KeyEvent.KEYCODE_F4,
+            KeyEvent.KEYCODE_F5,
+            KeyEvent.KEYCODE_F6,
+            KeyEvent.KEYCODE_F7,
+            KeyEvent.KEYCODE_F8,
+            KeyEvent.KEYCODE_F9,
+            KeyEvent.KEYCODE_F10,
+            KeyEvent.KEYCODE_F11,
+            KeyEvent.KEYCODE_F12,
+    };
+
     public interface OnKeyboardListener {
         void onKeyPress(byte keycode, int keysym);
 
@@ -49,6 +90,13 @@ public boolean hasKeysym(byte keycode, int keysym) {
         return keysyms[index*KEYSYMS_PER_KEYCODE+0] == keysym || keysyms[index*KEYSYMS_PER_KEYCODE+1] == keysym;
     }
 
+    public static boolean isNonPrintable(int keyCode) {
+        for (int code : NON_PRINTABLE_KEYCODES) {
+            if (code == keyCode) return true;
+        }
+        return false;
+    }
+
     public void setKeyPress(byte keycode, int keysym) {
         triggerOnKeyPress(keycode, keysym);
         pressedKeys.add(keycode);
@@ -99,9 +147,10 @@ public boolean onVirtualKeyEvent(KeyEvent event) {
             if (xKeycode == null) return false;
 
             if (action == KeyEvent.ACTION_DOWN) {
+                int keySym = !isNonPrintable(keyCode) ? event.getUnicodeChar() : 0;
                 boolean shiftPressed = event.isShiftPressed() || keyCode == KeyEvent.KEYCODE_AT || keyCode == KeyEvent.KEYCODE_STAR || keyCode == KeyEvent.KEYCODE_POUND || keyCode == KeyEvent.KEYCODE_PLUS;
                 if (shiftPressed) xServer.injectKeyPress(XKeycode.KEY_SHIFT_L);
-                xServer.injectKeyPress(xKeycode, xKeycode != XKeycode.KEY_ENTER ? event.getUnicodeChar() : 0);
+                xServer.injectKeyPress(xKeycode, keySym);
             }
             else if (action == KeyEvent.ACTION_UP) {
                 xServer.injectKeyRelease(XKeycode.KEY_SHIFT_L);
@@ -124,7 +173,8 @@ public boolean onKeyEvent(KeyEvent event) {
             return false;
 
         if (action == KeyEvent.ACTION_DOWN) {
-            xServer.injectKeyPress(xKeycode);
+            int keySym = !isNonPrintable(keyCode) ? event.getUnicodeChar() : 0;
+            xServer.injectKeyPress(xKeycode, keySym);
         } else if (action == KeyEvent.ACTION_UP) {
             xServer.injectKeyRelease(xKeycode);
         }
@@ -335,6 +385,8 @@ public static Keyboard createKeyboard(XServer xServer) {
         keyboard.setKeysyms(XKeycode.KEY_F10.getId(), 65479, 0);
         keyboard.setKeysyms(XKeycode.KEY_F11.getId(), 65480, 0);
         keyboard.setKeysyms(XKeycode.KEY_F12.getId(), 65481, 0);
+        keyboard.setKeysyms(XKeycode.KEY_NUM_LOCK.getId(), 65407, 0);
+        keyboard.setKeysyms(XKeycode.KEY_CAPS_LOCK.getId(), 65509, 0);
         return keyboard;
     }