xfree86: when implicitly choosing a core device, set the option to a value
Devices are core pointers/keyboards by default now anyway, but let's set the option to some value instead of just NULL. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
parent
44d53728a6
commit
4527e2b776
|
@ -1216,7 +1216,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
|
||||||
*devs[count - 1] = Pointer;
|
*devs[count - 1] = Pointer;
|
||||||
devs[count - 1]->options =
|
devs[count - 1]->options =
|
||||||
xf86addNewOption(devs[count -1]->options,
|
xf86addNewOption(devs[count -1]->options,
|
||||||
xnfstrdup("CorePointer"), NULL);
|
xnfstrdup("CorePointer"), "on");
|
||||||
devs[count] = NULL;
|
devs[count] = NULL;
|
||||||
servlayoutp->inputs = devs;
|
servlayoutp->inputs = devs;
|
||||||
}
|
}
|
||||||
|
@ -1261,7 +1261,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
|
||||||
Pointer.fd = -1;
|
Pointer.fd = -1;
|
||||||
*devs[count - 1] = Pointer;
|
*devs[count - 1] = Pointer;
|
||||||
devs[count - 1]->options =
|
devs[count - 1]->options =
|
||||||
xf86addNewOption(NULL, xnfstrdup("AlwaysCore"), NULL);
|
xf86addNewOption(NULL, xnfstrdup("AlwaysCore"), "on");
|
||||||
devs[count] = NULL;
|
devs[count] = NULL;
|
||||||
servlayoutp->inputs = devs;
|
servlayoutp->inputs = devs;
|
||||||
}
|
}
|
||||||
|
@ -1359,7 +1359,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
|
||||||
*devs[count - 1] = Keyboard;
|
*devs[count - 1] = Keyboard;
|
||||||
devs[count - 1]->options =
|
devs[count - 1]->options =
|
||||||
xf86addNewOption(devs[count - 1]->options,
|
xf86addNewOption(devs[count - 1]->options,
|
||||||
xnfstrdup("CoreKeyboard"), NULL);
|
xnfstrdup("CoreKeyboard"), "on");
|
||||||
devs[count] = NULL;
|
devs[count] = NULL;
|
||||||
servlayoutp->inputs = devs;
|
servlayoutp->inputs = devs;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user