JBR-5678: Refactor Wayland keyboard support

andreaippo · Nov 8, 2024 · 070ec5b · 070ec5b
1 parent c0247ea
commit 070ec5b
Show file tree

Hide file tree

Showing 17 changed files with 3,245 additions and 1,623 deletions.
diff --git a/src/java.desktop/share/native/libwakefield/protocol/wakefield.xml b/src/java.desktop/share/native/libwakefield/protocol/wakefield.xml
@@ -115,6 +115,18 @@
             <arg name="amount" type="int" />
         </request>
 
+        <request name="set_xkb_rule_names">
+            <description summary="facilitates switching keyboard layouts">
+                This requests the compositor to load the specified XKB layout and use it in all
+                further keyboard handling.
+            </description>
+            <arg name="rules" type="string" />
+            <arg name="model" type="string" />
+            <arg name="layout" type="string" />
+            <arg name="variant" type="string" />
+            <arg name="options" type="string" />
+        </request>
+
         <enum name="error">
             <entry name="no_error" value="0" summary="error code 0 reserved for the absence of error"/>
             <entry name="invalid_coordinates" value="1" summary="supplied absolute coordinates point

diff --git a/src/java.desktop/share/native/libwakefield/src/wakefield.c b/src/java.desktop/share/native/libwakefield/src/wakefield.c
diff --git a/src/java.desktop/unix/classes/sun/awt/wl/WLInputState.java b/src/java.desktop/unix/classes/sun/awt/wl/WLInputState.java
@@ -38,7 +38,6 @@
  * @param pointerButtonPressedEvent null or the latest PointerButtonEvent such that getIsButtonPressed() == true
  * @param modifiers a bit set of modifiers reflecting currently pressed keys (@see WLInputState.getNewModifiers())
  * @param surfaceForKeyboardInput represents 'struct wl_surface*' that keyboards events should go to
- * @param lockingKeyState a bit set of locking modifiers currently active
  */
 record WLInputState(WLPointerEvent eventWithSurface,
                     WLPointerEvent eventWithSerial,
@@ -47,8 +46,7 @@ record WLInputState(WLPointerEvent eventWithSurface,
                     PointerButtonEvent pointerButtonPressedEvent,
                     int modifiers,
                     long surfaceForKeyboardInput,
-                    boolean isPointerOverSurface,
-                    int lockingKeyState) {
+                    boolean isPointerOverSurface) {
     /**
      * Groups together information about a mouse pointer button event.
      * @param surface 'struct wl_surface*' the button was pressed over
@@ -62,7 +60,7 @@ record PointerButtonEvent(long surface, long serial, long timestamp, int clickCo
 
     static WLInputState initialState() {
         return new WLInputState(null, null, null, null,
-                null, 0, 0, false, 0);
+                null, 0, 0, false);
     }
 
     /**
@@ -94,8 +92,7 @@ WLInputState update(WLPointerEvent pointerEvent) {
                 newPointerButtonEvent,
                 newModifiers,
                 surfaceForKeyboardInput,
-                newPointerOverSurface,
-                lockingKeyState);
+                newPointerOverSurface);
     }
 
     public WLInputState updatedFromKeyboardEnterEvent(long serial, long surfacePtr) {
@@ -108,11 +105,10 @@ public WLInputState updatedFromKeyboardEnterEvent(long serial, long surfacePtr)
                 pointerButtonPressedEvent,
                 modifiers,
                 surfacePtr,
-                isPointerOverSurface,
-                lockingKeyState);
+                isPointerOverSurface);
     }
 
-    public WLInputState updatedFromKeyboardModifiersEvent(long serial, int keyboardModifiers, int newLockingKeyState) {
+    public WLInputState updatedFromKeyboardModifiersEvent(long serial, int keyboardModifiers) {
         // "The compositor must send the wl_keyboard.modifiers event after this event".
         final int oldPointerModifiers = modifiers & WLPointerEvent.PointerButtonCodes.combinedMask();
         final int newModifiers = oldPointerModifiers | keyboardModifiers;
@@ -124,8 +120,7 @@ public WLInputState updatedFromKeyboardModifiersEvent(long serial, int keyboardM
                 pointerButtonPressedEvent,
                 newModifiers,
                 surfaceForKeyboardInput,
-                isPointerOverSurface,
-                newLockingKeyState);
+                isPointerOverSurface);
     }
 
     public WLInputState updatedFromKeyboardLeaveEvent(long serial, long surfacePtr) {
@@ -140,8 +135,7 @@ public WLInputState updatedFromKeyboardLeaveEvent(long serial, long surfacePtr)
                 pointerButtonPressedEvent,
                 newModifiers,
                 0,
-                isPointerOverSurface,
-                lockingKeyState);
+                isPointerOverSurface);
     }
 
     public WLInputState resetPointerState() {
@@ -153,8 +147,7 @@ public WLInputState resetPointerState() {
                 pointerButtonPressedEvent,
                 0,
                 surfaceForKeyboardInput,
-                false,
-                lockingKeyState);
+                false);
     }
 
     private PointerButtonEvent getNewPointerButtonEvent(WLPointerEvent pointerEvent,