frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: use the right option traversal list to search for an option 

They're identically laid-out structs but let's use the right type to search
for our desired value.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Peter Hutterer 2016-10-20 15:25:51 +10:00
parent 7fc96fb02d
commit 28d8855cd4
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/xfree86/common/xf86Xinput.c
View File

@ -1541,23 +1541,19 @@ void
xf86InputEnableVTProbe(void) xf86InputEnableVTProbe(void)
{ {
int i, is_auto = 0; int i, is_auto = 0;
InputOption *option = NULL;
DeviceIntPtr pdev; DeviceIntPtr pdev;
for (i = 0; i < new_input_devices_count; i++) { for (i = 0; i < new_input_devices_count; i++) {
InputInfoPtr pInfo = new_input_devices[i]; InputInfoPtr pInfo = new_input_devices[i];
const char *value = xf86findOptionValue(pInfo->options, "_source");
is_auto = 0; is_auto = 0;
nt_list_for_each_entry(option, pInfo->options, list.next) { if (value &&
const char *key = input_option_get_key(option); (strcmp(value, "server/hal") == 0 ||
const char *value = input_option_get_value(option); strcmp(value, "server/udev") == 0 ||
strcmp(value, "server/wscons") == 0))
is_auto = 1;
if (strcmp(key, "_source") == 0 &&
(strcmp(value, "server/hal") == 0 ||
strcmp(value, "server/udev") == 0 ||
strcmp(value, "server/wscons") == 0))
is_auto = 1;
}
xf86NewInputDevice(pInfo, &pdev, xf86NewInputDevice(pInfo, &pdev,
(!is_auto || (!is_auto ||
(is_auto && xf86Info.autoEnableDevices))); (is_auto && xf86Info.autoEnableDevices)));