From 8091b301c941473ab99626a6e66f72acdb6750f7 Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Mon, 6 Dec 2004 21:54:19 +0000 Subject: [PATCH] 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. --- hw/xfree86/common/xf86Config.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 94ec9e75d..f38b2dc94 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -1592,17 +1592,17 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) confInput = xf86findInput(CONF_IMPLICIT_KEYBOARD, xf86configptr->conf_input_lst); if (!confInput) { - confInput = xf86findInputByDriver("keyboard", + confInput = xf86findInputByDriver("kbd", xf86configptr->conf_input_lst); } if (!confInput) { - confInput = xf86findInputByDriver("kbd", + confInput = xf86findInputByDriver("keyboard", xf86configptr->conf_input_lst); } if (confInput) { foundKeyboard = TRUE; from = X_DEFAULT; - pointerMsg = "first keyboard device"; + keyboardMsg = "first keyboard device"; } } @@ -1610,7 +1610,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) if (!foundKeyboard) { bzero(&defKbd, sizeof(defKbd)); defKbd.inp_identifier = ""; - defKbd.inp_driver = "keyboard"; + defKbd.inp_driver = "kbd"; confInput = &defKbd; foundKeyboard = TRUE; keyboardMsg = "default keyboard configuration";