From 7213e99cbc38a60f0076bc2115b144798ea4c3ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?La=C3=A9rcio=20de=20Sousa?= Date: Fri, 11 Dec 2015 11:43:13 -0200 Subject: [PATCH 03/56] ephyr: ignore Xorg multiseat command line options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Multi-seat-capable display managers commonly pass command-line options like "-novtswitch", "-sharevts", or "-layout seatXXXX" to Xorg server, but Xephyr currently refuses to start if these options are passed to it, which may break Xephyr-based single-GPU multiseat setups. [ajax: shortened summary] Reviewed-by: Adam Jackson Signed-off-by: Laércio de Sousa --- hw/kdrive/ephyr/ephyrinit.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index 6b6c4b1..9ddf86e 100644 --- a/hw/kdrive/ephyr/ephyrinit.c +++ b/hw/kdrive/ephyr/ephyrinit.c @@ -356,6 +356,13 @@ ddxProcessArgument(int argc, char **argv, int i) EphyrWantNoHostGrab = 1; return 1; } + else if (!strcmp(argv[i], "-sharevts") || + !strcmp(argv[i], "-novtswitch")) { + return 1; + } + else if (!strcmp(argv[i], "-layout")) { + return 2; + } return KdProcessArgument(argc, argv, i); } -- 2.6.2