xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland-xtest.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1bf4d60acd18463af56371bc89b79720c954f485
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Tue Dec 12 11:48:30 2023 +0100

    xwayland: Pass the correct oeffis device types
    
    Xwayland uses OEFFIS_DEVICE_ALL_DEVICES to get all possible device types
    enabled.
    
    Be more selective and specify explicitly keyboard and pointer instead of
    relying on what "all devices" translates to in the stack.
    
    See-also: https://gitlab.gnome.org/GNOME/mutter/-/issues/3194
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>

diff --git a/hw/xwayland/xwayland-xtest.c b/hw/xwayland/xwayland-xtest.c
index b5eef57e6..def8926d8 100644
--- a/hw/xwayland/xwayland-xtest.c
+++ b/hw/xwayland/xwayland-xtest.c
@@ -300,7 +300,8 @@ setup_oeffis(struct xwl_ei_client *xwl_ei_client)
     SetNotifyFd(xwl_ei_client->oeffis_fd, xwl_handle_oeffis_event,
         X_NOTIFY_READ, xwl_ei_client);
 
-    oeffis_create_session(xwl_ei_client->oeffis, OEFFIS_DEVICE_ALL_DEVICES);
+    oeffis_create_session(xwl_ei_client->oeffis,
+                          OEFFIS_DEVICE_KEYBOARD | OEFFIS_DEVICE_POINTER);
 
     return true;
 #else