Commit 1798cac6 authored by Kevin E Martin's avatar Kevin E Martin
Browse files

Add kdb <-> keyboard aliasing when UseDeprecatedKeyboardDriver is NO (Bug

    #1072, Kristian Hgsberg).
parent 6cac3425
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 1.3 2004/07/31 09:14:06 kem Exp $ */ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 1.4 2004/08/09 02:08:35 kem Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */
...@@ -374,13 +374,14 @@ xf86DriverlistFromConfig() ...@@ -374,13 +374,14 @@ xf86DriverlistFromConfig()
Bool Bool
xf86BuiltinInputDriver(const char *name) xf86BuiltinInputDriver(const char *name)
{ {
#ifdef USE_DEPRECATED_KEYBOARD_DRIVER
if (xf86NameCmp(name, "keyboard") == 0) if (xf86NameCmp(name, "keyboard") == 0)
return TRUE; return TRUE;
else else
#endif
return FALSE; return FALSE;
} }
char ** char **
xf86InputDriverlistFromConfig() xf86InputDriverlistFromConfig()
{ {
......
...@@ -1025,19 +1025,10 @@ InitInput(argc, argv) ...@@ -1025,19 +1025,10 @@ InitInput(argc, argv)
xf86MsgVerb(X_WARNING, 0, "*** Please consider using the the new \"kbd\" driver for \"%s\".\n", xf86MsgVerb(X_WARNING, 0, "*** Please consider using the the new \"kbd\" driver for \"%s\".\n",
pDev->identifier); pDev->identifier);
continue;
}
#else
if (!xf86NameCmp(pDev->driver, "keyboard")) {
xf86MsgVerb(X_ERROR, 0, "*** ERROR the legacy keyboard driver \"keyboard\" is deprecated\n");
xf86MsgVerb(X_ERROR, 0, "*** and has not been compiled into this X server. It will be removed\n");
xf86MsgVerb(X_ERROR, 0, "*** in the next release of the Xorg server.\n");
xf86MsgVerb(X_ERROR, 0, "*** Please consider using the the new \"kbd\" driver for \"%s\".\n",
pDev->identifier);
continue; continue;
} }
#endif #endif
if ((pDrv = MatchInput(pDev)) == NULL) { if ((pDrv = MatchInput(pDev)) == NULL) {
xf86Msg(X_ERROR, "No Input driver matching `%s'\n", pDev->driver); xf86Msg(X_ERROR, "No Input driver matching `%s'\n", pDev->driver);
/* XXX For now, just continue. */ /* XXX For now, just continue. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment