diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2024-01-07 11:11:58 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2024-01-07 11:11:58 +0000 |
commit | adbd9592cce30725ccda3b517aee7e737bdc40d6 (patch) | |
tree | 0254ef6e5ba52c2c55638a5074746bf9ad750a50 /xserver/hw | |
parent | 15c5d2308389555a3dbf92f7a269a8e020bfd192 (diff) |
Update xserver to 21.1.10.
The security fixes have already been committed.
Diffstat (limited to 'xserver/hw')
-rw-r--r-- | xserver/hw/kdrive/ephyr/ephyrinit.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/xserver/hw/kdrive/ephyr/ephyrinit.c b/xserver/hw/kdrive/ephyr/ephyrinit.c index 1a92b9727..63a031112 100644 --- a/xserver/hw/kdrive/ephyr/ephyrinit.c +++ b/xserver/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(); |