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

Use kbd driver when xorg.conf specifies "keyboard" or "Keyboard" (bug #11301) 

X.Org Bug #11301 <https://bugs.freedesktop.org/show_bug.cgi?id=11301>
Sun Bug #6560332 <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6560332>
This commit is contained in:
Alan Coopersmith 2007-07-12 16:36:27 -07:00
parent 9fcb30ebf7
commit 6b4231e3b5
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -979,6 +979,17 @@ InitInput(argc, argv)
if (serverGeneration == 1) {
/* Call the PreInit function for each input device instance. */
for (pDev = xf86ConfigLayout.inputs; pDev && *pDev; pDev++) {
/* Replace obsolete keyboard driver with kbd */
if (!xf86NameCmp((*pDev)->driver, "keyboard")) {
xf86MsgVerb(X_WARNING, 0,
"*** WARNING the legacy keyboard driver \"%s\" has been removed\n",
(*pDev)->driver);
xf86MsgVerb(X_WARNING, 0,
"*** Using the new \"kbd\" driver for \"%s\".\n",
(*pDev)->identifier);
strcpy((*pDev)->driver, "kbd");
}
if ((pDrv = xf86LookupInputDriver((*pDev)->driver)) == NULL) {
xf86Msg(X_ERROR, "No Input driver matching `%s'\n", (*pDev)->driver);
/* XXX For now, just continue. */
@ -1834,6 +1845,11 @@ xf86LoadModules(char **list, pointer *optlist)
if (name == NULL || *name == '\0')
continue;
/* Replace obsolete keyboard driver with kbd */
if (!xf86NameCmp(name, "keyboard")) {
strcpy(name, "kbd");
}
if (optlist)
opt = optlist[i];
else