xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 24d7d93ff2dc0ef4a0517734f0aae01cd7d57bba
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Tue Jul 26 10:55:49 2022 +0200

    xwayland: Fix "-force-xrandr-emulation"
    
    Commit 7cdcdfea0 introduced a new command line option
    "-force-xrandr-emulation", however it is missing from the
    ddxProcessArgument().
    
    As a result, trying to use that command option would result in a error:
    
    (EE) Unrecognized option: -force-xrandr-emulation
    
    Make sure "-force-xrandr-emulation" is accounted for in Xwayland's
    ddxProcessArgument().
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Fixes: 7cdcdfea0 - xwayland: Add -force-xrandr-emulation switch

diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index 51d3147f1..a15b1f3ee 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -230,6 +230,9 @@ ddxProcessArgument(int argc, char *argv[], int i)
         touchEmulatePointer = FALSE;
         return 1;
     }
+    else if (strcmp(argv[i], "-force-xrandr-emulation") == 0) {
+        return 1;
+    }
     else if (strcmp(argv[i], "-geometry") == 0) {
         CHECK_FOR_REQUIRED_ARGUMENTS(1);
         return 2;