xserver: Branch 'master' - 2 commits

[GitLab Mirror]

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

New commits:
commit 1a42fe40d04d8bb18e7b9db6f6a40e552462f980
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Wed Jul 24 10:52:59 2024 +0200

    xwayland/ei: Log the type name of unhandled events
    
    Currently, we would log only the event type, use the libei API to also
    log the name in plain text, so we can quickly identify the events we're
    missing out.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1620>

diff --git a/hw/xwayland/xwayland-xtest.c b/hw/xwayland/xwayland-xtest.c
index 47507181c..91006dde0 100644
--- a/hw/xwayland/xwayland-xtest.c
+++ b/hw/xwayland/xwayland-xtest.c
@@ -859,7 +859,7 @@ xwl_handle_ei_event(int fd, int ready, void *data)
                 /* Don't care */
                 break;
             default:
-                error_ei("Unhandled event %d\n", type);
+                error_ei("Unhandled event %s (%d)\n", ei_event_type_to_string(type), type);
                 break;
         }
         ei_event_unref(e);
commit bfabd3bdab6b357a79ea092a03383bbaf1321866
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Wed Jul 24 10:48:51 2024 +0200

    xwayland/ei: Handle EI_EVENT_KEYBOARD_MODIFIERS
    
    Although we do not do anything with that event, handle it so we don't
    end up in the "Unhandled event" territory.
    
    Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1722
    Fixes: a133334270 - xwayland: Add XTEST support using EIS
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1620>

diff --git a/hw/xwayland/xwayland-xtest.c b/hw/xwayland/xwayland-xtest.c
index 4976a3d7e..47507181c 100644
--- a/hw/xwayland/xwayland-xtest.c
+++ b/hw/xwayland/xwayland-xtest.c
@@ -854,6 +854,10 @@ xwl_handle_ei_event(int fd, int ready, void *data)
                     /* All events dequeued and client has disconnected in the meantime */
                     xwl_ei_stop_emulating(xwl_ei_client);
                 break;
+            case EI_EVENT_KEYBOARD_MODIFIERS:
+                debug_ei("Ignored event %s (%d)\n", ei_event_type_to_string(type), type);
+                /* Don't care */
+                break;
             default:
                 error_ei("Unhandled event %d\n", type);
                 break;