Attachment 492 Details for Bug 890 – Patch to deprecate old keyboard driver and disable compilation by default.

[patch] Patch to deprecate old keyboard driver and disable compilation by default.

deprecate-old-keyboard.patch (text/plain), 5.07 KB, created by Kristian Høgsberg on 2004-07-19 13:24:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kristian Høgsberg

Created: 2004-07-19 13:24:08 UTC

Size: 5.07 KB

patch

obsolete

>Index: config/cf/xorg.cf
>===================================================================
>RCS file: /cvs/xorg/xc/config/cf/xorg.cf,v
>retrieving revision 1.9
>diff -u -p -r1.9 xorg.cf
>--- config/cf/xorg.cf	30 Jun 2004 20:06:51 -0000	1.9
>+++ config/cf/xorg.cf	14 Jul 2004 23:15:17 -0000
>@@ -214,6 +214,12 @@ RELEASE_VERSION = ReleaseVersion
> 				palmax OSXInputDrivers ExtraXInputDrivers
> #endif
> 
>+
>+/* Deprecated keyboard driver */
>+#ifndef UseDeprecatedKeyboardDriver
>+#define UseDeprecatedKeyboardDriver NO
>+#endif
>+
> /* <linux/input.h> support mainly for USB support */
> #ifndef HasLinuxInput
> # define HasLinuxInput NO
>Index: config/cf/xorgsite.def
>===================================================================
>RCS file: /cvs/xorg/xc/config/cf/xorgsite.def,v
>retrieving revision 1.6
>diff -u -p -r1.6 xorgsite.def
>--- config/cf/xorgsite.def	30 Jun 2004 20:06:51 -0000	1.6
>+++ config/cf/xorgsite.def	14 Jul 2004 23:15:17 -0000
>@@ -121,6 +121,15 @@ XCOMM $XFree86: xc/config/cf/xf86site.de
>  */
> 
> /*
>+ * To use the deprecated, old keyboard driver, uncomment this.  But
>+ * even better, make the new keyboard driver (hw/xfree86/input/keyboard)
>+ * work for your architechture.  The old driver will be removed in the
>+ * next release.
>+ *
>+#define UseDeprecatedKeyboardDriver YES
>+ */
>+
>+/*
>  * There are three parameters that determine where and how the Matrox HAL
>  * library is used:
>  *
>Index: programs/Xserver/hw/xfree86/common/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/Imakefile,v
>retrieving revision 1.2
>diff -u -p -r1.2 Imakefile
>--- programs/Xserver/hw/xfree86/common/Imakefile	23 Apr 2004 19:20:32 -0000	1.2
>+++ programs/Xserver/hw/xfree86/common/Imakefile	14 Jul 2004 23:15:38 -0000
>@@ -30,6 +30,10 @@ XCOMM $XFree86: xc/programs/Xserver/hw/x
> # endif
> #endif
> 
>+#if UseDeprecatedKeyboardDriver
>+	KEYBOARD_DEFS = -DUSE_DEPRECATED_KEYBOARD_DRIVER
>+#endif
>+
> #if defined(SparcArchitecture) || defined(Sparc64Architecture)
>         SBUSSRC = xf86sbusBus.c
>         SBUSOBJ = xf86sbusBus.o
>@@ -213,7 +221,7 @@ XCONFIGUREDEFINES = -DXF86CONFIGFILE='"$
> AllTarget($(OFILES))
> 
> SpecialCObjectRule(xf86Bus,NullParameter,$(BUGMSG) $(VGAINCLUDES))
>-SpecialCObjectRule(xf86Init,$(ICONFIGFILES),$(OSNAMEDEF) $(BUILDERMSG) $(BUGMSG) $(CUSTOMVERDEF) $(XORGREL_DEF) $(EXT_DEFINES) $(BETADEFS) $(MDEBUGDEFS))
>+SpecialCObjectRule(xf86Init,$(ICONFIGFILES),$(OSNAMEDEF) $(BUILDERMSG) $(BUGMSG) $(CUSTOMVERDEF) $(XORGREL_DEF) $(EXT_DEFINES) $(BETADEFS) $(MDEBUGDEFS) $(KEYBOARD_DEFS))
> SpecialCObjectRule(xf86Events,$(ICONFIGFILES),$(EXT_DEFINES) $(MDEBUGDEFS))
> SpecialCObjectRule(xf86Globals,$(ICONFIGFILES),$(EXT_DEFINES) $(MODPATHDEFINES) $(LOGDEFINES))
> SpecialCObjectRule(xf86AutoConfig,$(ICONFIGFILES),$(XCONFIGDEFINES))
>Index: programs/Xserver/hw/xfree86/common/xf86Init.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v
>retrieving revision 1.2
>diff -u -p -r1.2 xf86Init.c
>--- programs/Xserver/hw/xfree86/common/xf86Init.c	23 Apr 2004 19:20:32 -0000	1.2
>+++ programs/Xserver/hw/xfree86/common/xf86Init.c	14 Jul 2004 23:15:39 -0000
>@@ -418,8 +420,10 @@ InitOutput(ScreenInfo *pScreenInfo, int 
>       xfree(modulelist);
>     }
> 
>+#ifdef USE_DEPRECATED_KEYBOARD_DRIVER
>     /* Setup the builtin input drivers */
>     xf86AddInputDriver(&xf86KEYBOARD, NULL, 0);
>+#endif
>     /* Load all input driver modules specified in the config file. */
>     if ((modulelist = xf86InputDriverlistFromConfig())) {
>       xf86LoadModules(modulelist, NULL);
>@@ -1008,12 +1012,17 @@ InitInput(argc, argv)
>     if (serverGeneration == 1) {
> 	/* Call the PreInit function for each input device instance. */
> 	for (pDev = xf86ConfigLayout.inputs; pDev && pDev->identifier; pDev++) {
>+#ifdef USE_DEPRECATED_KEYBOARD_DRIVER
> 	    /* XXX The keyboard driver is a special case for now. */
> 	    if (!xf86NameCmp(pDev->driver, "keyboard")) {
>-		xf86Msg(X_INFO, "Keyboard \"%s\" handled by legacy driver\n",
>+		xf86MsgVerb(X_WARNING, 0, "*** WARNING the legacy keyboard driver \"keyboard\" is deprecated\n");
>+		xf86MsgVerb(X_WARNING, 0, "*** and will be removed in the next release of the Xorg server.\n");
>+		xf86MsgVerb(X_WARNING, 0, "*** Please consider using the the new \"kdb\" driver for \"%s\".\n",
> 			pDev->identifier);
>+
> 		continue;
> 	    }
>+#endif
> 	    if ((pDrv = MatchInput(pDev)) == NULL) {
> 		xf86Msg(X_ERROR, "No Input driver matching `%s'\n", pDev->driver);
> 		/* XXX For now, just continue. */
>@@ -1093,11 +1102,15 @@ InitInput(argc, argv)
>       xf86Info.kbdEvents = NULL; /* to prevent the internal keybord driver usage*/
>     }
>     else {
>+#ifdef USE_DEPRECATED_KEYBOARD_DRIVER
>+      /* Only set this if we're allowing the old driver. */
>       xf86Info.pKeyboard = AddInputDevice(xf86Info.kbdProc, TRUE);
>+#endif
>     }
>     if (corePointer)
> 	xf86Info.pMouse = corePointer->dev;
>-    RegisterKeyboardDevice(xf86Info.pKeyboard); 
>+    if (xf86Info.pKeyboard)
>+      RegisterKeyboardDevice(xf86Info.pKeyboard); 
> 
>   miRegisterPointerDevice(screenInfo.screens[0], xf86Info.pMouse);
> #ifdef XINPUT

Actions: View | Splinter Review

Attachments on bug 890: 492 | 493 | 6295

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.