diff options
author | nerdopolis <bluescreen_avenger@verizon.net> | 2022-01-11 18:41:42 -0500 |
---|---|---|
committer | n3rdopolis <bluescreenavenger@gmail.com> | 2022-02-03 22:34:03 +0000 |
commit | 4c03b67d334b05b814239420776f2fdd4c4a98ac (patch) | |
tree | e2fc377a338ff0511f05748cb7e31e876610f652 | |
parent | 0217cc6e0cf5013366105a90f5f91ccc4bab5425 (diff) | |
download | xserver-4c03b67d334b05b814239420776f2fdd4c4a98ac.tar.gz |
xephyr: Don't check for SeatId anymore
After a change for the xserver to automatically determine the seat
based on the XDG_SEAT variable, xephyr stopped working. This was
because of an old feature where xephyr used to handle evdev
directly. This was dropped some time ago, and now this check is
not needed
-rw-r--r-- | hw/kdrive/ephyr/ephyrinit.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index 020461db2..09cd28cb3 100644 --- a/hw/kdrive/ephyr/ephyrinit.c +++ b/hw/kdrive/ephyr/ephyrinit.c @@ -70,25 +70,23 @@ InitInput(int argc, char **argv) KdKeyboardInfo *ki; KdPointerInfo *pi; - if (!SeatId) { - KdAddKeyboardDriver(&EphyrKeyboardDriver); - KdAddPointerDriver(&EphyrMouseDriver); - - if (!kdHasKbd) { - ki = KdNewKeyboard(); - if (!ki) - FatalError("Couldn't create Xephyr keyboard\n"); - ki->driver = &EphyrKeyboardDriver; - KdAddKeyboard(ki); - } + KdAddKeyboardDriver(&EphyrKeyboardDriver); + KdAddPointerDriver(&EphyrMouseDriver); + + if (!kdHasKbd) { + ki = KdNewKeyboard(); + if (!ki) + FatalError("Couldn't create Xephyr keyboard\n"); + ki->driver = &EphyrKeyboardDriver; + KdAddKeyboard(ki); + } - if (!kdHasPointer) { - pi = KdNewPointer(); - if (!pi) - FatalError("Couldn't create Xephyr pointer\n"); - pi->driver = &EphyrMouseDriver; - KdAddPointer(pi); - } + if (!kdHasPointer) { + pi = KdNewPointer(); + if (!pi) + FatalError("Couldn't create Xephyr pointer\n"); + pi->driver = &EphyrMouseDriver; + KdAddPointer(pi); } KdInitInput(); |