xorg-server/trunk/0002-xephyr_Dont_check_for_SeatId_anymore.patch

   1 From 4c03b67d334b05b814239420776f2fdd4c4a98ac Mon Sep 17 00:00:00 2001
   2 From: nerdopolis <bluescreen_avenger@verizon.net>
   3 Date: Tue, 11 Jan 2022 18:41:42 -0500
   4 Subject: [PATCH] xephyr: Don't check for SeatId anymore
   5
   6 After a change for the xserver to automatically determine the seat
   7 based on the XDG_SEAT variable, xephyr stopped working. This was
   8 because of an old feature where xephyr used to handle evdev
   9 directly. This was dropped some time ago, and now this check is
  10 not needed
  11 ---
  12  hw/kdrive/ephyr/ephyrinit.c | 34 ++++++++++++++++------------------
  13  1 file changed, 16 insertions(+), 18 deletions(-)
  14
  15 diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
  16 index 020461db2..09cd28cb3 100644
  17 --- a/hw/kdrive/ephyr/ephyrinit.c
  18 +++ b/hw/kdrive/ephyr/ephyrinit.c
  19 @@ -70,25 +70,23 @@ InitInput(int argc, char **argv)
  20      KdKeyboardInfo *ki;
  21      KdPointerInfo *pi;
  22
  23 -    if (!SeatId) {
  24 -        KdAddKeyboardDriver(&EphyrKeyboardDriver);
  25 -        KdAddPointerDriver(&EphyrMouseDriver);
  26 -
  27 -        if (!kdHasKbd) {
  28 -            ki = KdNewKeyboard();
  29 -            if (!ki)
  30 -                FatalError("Couldn't create Xephyr keyboard\n");
  31 -            ki->driver = &EphyrKeyboardDriver;
  32 -            KdAddKeyboard(ki);
  33 -        }
  34 +    KdAddKeyboardDriver(&EphyrKeyboardDriver);
  35 +    KdAddPointerDriver(&EphyrMouseDriver);
  36 +
  37 +    if (!kdHasKbd) {
  38 +        ki = KdNewKeyboard();
  39 +        if (!ki)
  40 +            FatalError("Couldn't create Xephyr keyboard\n");
  41 +        ki->driver = &EphyrKeyboardDriver;
  42 +        KdAddKeyboard(ki);
  43 +    }
  44
  45 -        if (!kdHasPointer) {
  46 -            pi = KdNewPointer();
  47 -            if (!pi)
  48 -                FatalError("Couldn't create Xephyr pointer\n");
  49 -            pi->driver = &EphyrMouseDriver;
  50 -            KdAddPointer(pi);
  51 -        }
  52 +    if (!kdHasPointer) {
  53 +        pi = KdNewPointer();
  54 +        if (!pi)
  55 +            FatalError("Couldn't create Xephyr pointer\n");
  56 +        pi->driver = &EphyrMouseDriver;
  57 +        KdAddPointer(pi);
  58      }
  59
  60      KdInitInput();
  61 --
  62 GitLab
  63