Stefan Dirsch
e5c7bd793d
* fix mouse/keyboard focus in Xephyr (boo#1194658,
github issue#1289)
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=818
64 lines
2.0 KiB
Diff
64 lines
2.0 KiB
Diff
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();
|
|
--
|
|
2.34.1
|
|
|