xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/common/xf86Module.h |    2 +-
 hw/xwayland/xwayland-input.c   |    7 +++++--
 include/inputstr.h             |    2 ++
 xkb/xkbActions.c               |    9 ++++++---
 xkb/xkbPrKeyEv.c               |    2 +-
 5 files changed, 15 insertions(+), 7 deletions(-)

New commits:
commit 45c1d22ff6fe484b0088128a997e33b81bc8282d
Author: Julian Orth <ju.orth at gmail.com>
Date:   Sat Jan 11 17:50:12 2025 +0100

    xwayland: Don't run key behaviors and actions
    
    Consider the following keymap:
    
    ```xkb
    xkb_keymap {
        xkb_keycodes {
            <compose> = 135;
        };
        xkb_symbols {
            key <compose> {
                [ SetGroup(group = +1) ]
            };
        };
    };
    ```
    
    When the user presses the compose key, the following happens:
    
    1. The compositor forwards the key to Xwayland.
    2. Xwayland executes the SetGroup action and sets the base_group to 1
       and the effective group to 1.
    3. The compositor updates its own state and sends the effective group,
       1, to Xwayland.
    4. Xwayland sets the locked group to 1 and the effective group to
       1 + 1 = 2.
    
    This is wrong since pressing compose should set the effective group to 1
    but to X applications the effective group appears to be 2.
    
    This commit makes it so that Xwayland completely ignores the key
    behaviors and actions of the keymap and only updates the modifier and
    group components in response to the wayland modifiers events.
    
    Signed-off-by: Julian Orth <ju.orth at gmail.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1758>

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index b6eb80622..fffeb82c9 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -75,7 +75,7 @@
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
 #define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(27, 0)
-#define ABI_XINPUT_VERSION	SET_ABI_VERSION(24, 4)
+#define ABI_XINPUT_VERSION	SET_ABI_VERSION(25, 0)
 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(10, 0)
 
 #define MODINFOSTRING1	0xef23fdc5
diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
index df2ed6907..f62cb7a25 100644
--- a/hw/xwayland/xwayland-input.c
+++ b/hw/xwayland/xwayland-input.c
@@ -1288,11 +1288,12 @@ keyboard_handle_modifiers(void *data, struct wl_keyboard *keyboard,
         old_state = dev->key->xkbInfo->state;
         new_state = &dev->key->xkbInfo->state;
 
+        new_state->base_group = 0;
+        new_state->latched_group = 0;
         new_state->locked_group = group & XkbAllGroupsMask;
         new_state->base_mods = mods_depressed & XkbAllModifiersMask;
+        new_state->latched_mods = mods_latched & XkbAllModifiersMask;
         new_state->locked_mods = mods_locked & XkbAllModifiersMask;
-        XkbLatchModifiers(dev, XkbAllModifiersMask,
-                          mods_latched & XkbAllModifiersMask);
 
         XkbComputeDerivedState(dev->key->xkbInfo);
 
@@ -1680,6 +1681,7 @@ add_device(struct xwl_seat *xwl_seat,
     dev->public.devicePrivate = xwl_seat;
     dev->type = SLAVE;
     dev->spriteInfo->spriteOwner = FALSE;
+    dev->ignoreXkbActionsBehaviors = TRUE;
 
     return dev;
 }
@@ -3634,6 +3636,7 @@ InitInput(int argc, char *argv[])
 
     mieqInit();
 
+    inputInfo.keyboard->ignoreXkbActionsBehaviors = TRUE;
     xwl_screen->input_registry = wl_display_get_registry(xwl_screen->display);
     wl_registry_add_listener(xwl_screen->input_registry, &input_listener,
                              xwl_screen);
diff --git a/include/inputstr.h b/include/inputstr.h
index 24dd48841..269399e1d 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -631,6 +631,8 @@ typedef struct _DeviceIntRec {
     DeviceSendEventsProc sendEventsProc;
 
     struct _SyncCounter *idle_counter;
+
+    Bool ignoreXkbActionsBehaviors; /* TRUE if keys don't trigger behaviors and actions */
 } DeviceIntRec;
 
 typedef struct {
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 1743e107f..64801a42f 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -1372,9 +1372,12 @@ XkbHandleActions(DeviceIntPtr dev, DeviceIntPtr kbd, DeviceEvent *event)
                   (event->type == ET_ButtonPress));
 
     if (pressEvent) {
-        if (keyEvent)
-            act = XkbGetKeyAction(xkbi, &xkbi->state, key);
-        else {
+        if (keyEvent) {
+            if (kbd->ignoreXkbActionsBehaviors)
+                act.type = XkbSA_NoAction;
+            else
+                act = XkbGetKeyAction(xkbi, &xkbi->state, key);
+        } else {
             act = XkbGetButtonAction(kbd, dev, key);
             key |= BTN_ACT_FLAG;
         }
diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c
index 19dce29ab..f768bedff 100644
--- a/xkb/xkbPrKeyEv.c
+++ b/xkb/xkbPrKeyEv.c
@@ -67,7 +67,7 @@ XkbProcessKeyboardEvent(DeviceEvent *event, DeviceIntPtr keybd)
     /* do anything to implement the behavior, but it *does* report that */
     /* key is hardwired */
 
-    if (!(behavior.type & XkbKB_Permanent)) {
+    if (!keybd->ignoreXkbActionsBehaviors && !(behavior.type & XkbKB_Permanent)) {
         switch (behavior.type) {
         case XkbKB_Default:
             /* Neither of these should happen in practice, but ignore them