forked from pool/xorg-x11-server
Egbert Eich
7aff496244
- Backport upstream patches for Xephyr input hot-plugging /
single-GPU multi-seat support:
* U_kdrive-fix-up-NewInputDeviceRequest-implementation.patch
* U_kdrive-set-evdev-driver-for-input-devices-automatica.patch
* U_ephyr-don-t-load-ephyr-input-driver-if-seat-option-i.patch
* U_kdrive-don-t-let-evdev-driver-overwrite-existing-dev.patch
* U_ephyr-ignore-Xorg-multiseat-command-line-options.patch
* U_ephyr-enable-option-sw-cursor-by-default-in-multi-se.patch
* U_kdrive-introduce-input-hot-plugging-support-for-udev.patch
* U_kdrive-add-options-to-set-default-XKB-properties.patch
* U_kdrive-evdev-update-keyboard-LEDs-22302.patch
* U_config-udev-distinguish-between-real-keyboards-and-o.patch
OBS-URL: https://build.opensuse.org/request/show/367497
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=616
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
From edd443f69ea385a957b8eae0b066ad8e77fb947b Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?La=C3=A9rcio=20de=20Sousa?=
|
|
<laerciosousa@sme-mogidascruzes.sp.gov.br>
|
|
Date: Fri, 11 Dec 2015 11:43:11 -0200
|
|
Subject: [PATCH 02/56] kdrive: don't let evdev driver overwrite existing
|
|
device names
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
KDrive evdev driver deliberately name grabbed devices as "Evdev mouse"
|
|
or "Evdev keyboard". This patch will make it skip this step if grabbed
|
|
devices are already named (i.e. from udev).
|
|
|
|
Reviewed-by: Adam Jackson <ajax@redhat.com>
|
|
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
|
|
---
|
|
hw/kdrive/linux/evdev.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/hw/kdrive/linux/evdev.c b/hw/kdrive/linux/evdev.c
|
|
index 63e8409..cdd45e7 100644
|
|
--- a/hw/kdrive/linux/evdev.c
|
|
+++ b/hw/kdrive/linux/evdev.c
|
|
@@ -220,7 +220,8 @@ EvdevPtrInit(KdPointerInfo * pi)
|
|
|
|
close(fd);
|
|
|
|
- pi->name = strdup("Evdev mouse");
|
|
+ if (!pi->name)
|
|
+ pi->name = strdup("Evdev mouse");
|
|
|
|
return Success;
|
|
}
|
|
@@ -390,7 +391,8 @@ EvdevKbdInit(KdKeyboardInfo * ki)
|
|
|
|
close(fd);
|
|
|
|
- ki->name = strdup("Evdev keyboard");
|
|
+ if (!ki->name)
|
|
+ ki->name = strdup("Evdev keyboard");
|
|
|
|
readMapping(ki);
|
|
|
|
--
|
|
2.6.2
|
|
|