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

xf86Config.c references USE_DEPRECATED_KEYBOARD_DRIVER so define it if 

needed when building this file
- bug fix: pointerMsg -> keyboardMsg in auto-configuration code.
- make the 'kbd' driver the default for autoconfiguration everywhere.
This commit is contained in:
Matthieu Herrb 2004-12-06 21:54:19 +00:00
parent cde3a17500
commit 8091b301c9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xfree86/common/xf86Config.c
View File

@ -1592,17 +1592,17 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
confInput = xf86findInput(CONF_IMPLICIT_KEYBOARD, confInput = xf86findInput(CONF_IMPLICIT_KEYBOARD,
xf86configptr->conf_input_lst); xf86configptr->conf_input_lst);
if (!confInput) { if (!confInput) {
confInput = xf86findInputByDriver("keyboard", confInput = xf86findInputByDriver("kbd",
xf86configptr->conf_input_lst); xf86configptr->conf_input_lst);
} }
if (!confInput) { if (!confInput) {
confInput = xf86findInputByDriver("kbd", confInput = xf86findInputByDriver("keyboard",
xf86configptr->conf_input_lst); xf86configptr->conf_input_lst);
} }
if (confInput) { if (confInput) {
foundKeyboard = TRUE; foundKeyboard = TRUE;
from = X_DEFAULT; from = X_DEFAULT;
pointerMsg = "first keyboard device"; keyboardMsg = "first keyboard device";
} }
} }
@ -1610,7 +1610,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
if (!foundKeyboard) { if (!foundKeyboard) {
bzero(&defKbd, sizeof(defKbd)); bzero(&defKbd, sizeof(defKbd));
defKbd.inp_identifier = "<default keyboard>"; defKbd.inp_identifier = "<default keyboard>";
defKbd.inp_driver = "keyboard"; defKbd.inp_driver = "kbd";
confInput = &defKbd; confInput = &defKbd;
foundKeyboard = TRUE; foundKeyboard = TRUE;
keyboardMsg = "default keyboard configuration"; keyboardMsg = "default keyboard configuration";