diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2006-07-21 16:33:28 -0400 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-07-21 16:33:28 -0400 |
| commit | 3eeb62e8f587732e6b433c2b9c6879eb26a3f1b4 (patch) | |
| tree | c0d8610aece1bd9e07c0ed2f734c83ad36794341 /hw/xfree86/utils | |
| parent | 60ea7b51fe2b8a19a08b63db48504971a7a50ee6 (diff) | |
bug #890: completely remove deprecated keyboard driver
Remove all remnants of the old built-in keyboard driver.
Diffstat (limited to 'hw/xfree86/utils')
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/interface.c | 3 | ||||
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/keyboard-cfg.c | 7 | ||||
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/text-mode.c | 11 | ||||
| -rw-r--r-- | hw/xfree86/utils/xorgconfig/xorgconfig.c | 4 |
4 files changed, 3 insertions, 22 deletions
diff --git a/hw/xfree86/utils/xorgcfg/interface.c b/hw/xfree86/utils/xorgcfg/interface.c index b6ac82a06..9c280e079 100644 --- a/hw/xfree86/utils/xorgcfg/interface.c +++ b/hw/xfree86/utils/xorgcfg/interface.c @@ -68,8 +68,7 @@ #define DefaultXFree86Dir "/usr" #endif -#define IS_KBDDRIV(S) ((strcasecmp((S),"kbd") == 0) || \ - (strcasecmp((S), "keyboard") == 0)) +#define IS_KBDDRIV(S) ((strcasecmp((S),"kbd") == 0) /* * Prototypes diff --git a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c index 2e82323be..dc457366e 100644 --- a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c +++ b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c @@ -38,8 +38,7 @@ #include <X11/Xaw/SimpleMenu.h> #include <X11/Xaw/SmeBSB.h> -#define IS_KBDDRIV(X) ((strcasecmp((X),"kbd") == 0) || \ - (strcasecmp((X), "keyboard") == 0)) +#define IS_KBDDRIV(X) ((strcasecmp((X),"kbd") == 0) /* * Types @@ -255,11 +254,7 @@ KeyboardConfig(XtPointer config) keyboard = XtNew(XF86ConfInputRec); keyboard->list.next = NULL; keyboard->inp_identifier = XtNewString(ident_string); -#if defined(USE_DEPRECATED_KEYBOARD_DRIVER) - keyboard->inp_driver = XtNewString("keyboard"); -#else keyboard->inp_driver = XtNewString("kbd"); -#endif keyboard->inp_option_lst = xf86newOption(XtNewString(XkbRules), XtNewString(rules)); xf86addNewOption(keyboard->inp_option_lst, diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c index 8537252e6..0acc51354 100644 --- a/hw/xfree86/utils/xorgcfg/text-mode.c +++ b/hw/xfree86/utils/xorgcfg/text-mode.c @@ -48,8 +48,7 @@ #include "xf86config.h" #include "loader.h" -#define IS_KBDDRIV(X) ((strcmp((X),"kbd") == 0) || \ - (strcmp((X), "keyboard") == 0)) +#define IS_KBDDRIV(X) ((strcmp((X),"kbd") == 0) #ifndef PROJECT_ROOT #define PROJECT_ROOT "/usr" @@ -746,11 +745,7 @@ KeyboardConfig(void) input->inp_option_lst = xf86addNewOption(input->inp_option_lst, XtNewString("XkbLayout"), XtNewString("us")); -#if defined(USE_DEPRECATED_KEYBOARD_DRIVER) - input->inp_driver = XtNewString("keyboard"); -#else input->inp_driver = XtNewString("kbd"); -#endif XF86Config->conf_input_lst = xf86addInput(XF86Config, input); } @@ -826,11 +821,7 @@ KeyboardConfig(void) XtNewString("XkbLayout"), XtNewString(layout)); if (input->inp_driver == NULL) { -#if defined(USE_DEPRECATED_KEYBOARD_DRIVER) - input->inp_driver = XtNewString("keyboard"); -#else input->inp_driver = XtNewString("kbd"); -#endif XF86Config->conf_input_lst = xf86addInput(XF86Config->conf_input_lst, input); } diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c index ab3c1d03c..3bc05b83b 100644 --- a/hw/xfree86/utils/xorgconfig/xorgconfig.c +++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c @@ -2068,11 +2068,7 @@ static char *XF86Config_fontpathchunk_text = "Section \"InputDevice\"\n" "\n" " Identifier \"Keyboard1\"\n" -#ifdef USE_DEPRECATED_KEYBOARD_DRIVER -" Driver \"Keyboard\"\n" -#else " Driver \"kbd\"\n" -#endif "\n" "# For most OSs the protocol can be omitted (it defaults to \"Standard\").\n" "# When using XQUEUE (only for SVR3 and SVR4, but not Solaris),\n" |