diff options
Diffstat (limited to '0002-xephyr_Dont_check_for_SeatId_anymore.patch')
| -rw-r--r-- | 0002-xephyr_Dont_check_for_SeatId_anymore.patch | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/0002-xephyr_Dont_check_for_SeatId_anymore.patch b/0002-xephyr_Dont_check_for_SeatId_anymore.patch deleted file mode 100644 index f0158bfe1ad3..000000000000 --- a/0002-xephyr_Dont_check_for_SeatId_anymore.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 4c03b67d334b05b814239420776f2fdd4c4a98ac Mon Sep 17 00:00:00 2001 -From: nerdopolis <bluescreen_avenger@verizon.net> -Date: Tue, 11 Jan 2022 18:41:42 -0500 -Subject: [PATCH] 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 ---- - hw/kdrive/ephyr/ephyrinit.c | 34 ++++++++++++++++------------------ - 1 file 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(); --- -GitLab - |