diff options
Diffstat (limited to 'hw/xfree86/utils/xorgcfg/text-mode.c')
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/text-mode.c | 37 |
1 files changed, 30 insertions, 7 deletions
diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c index 38e87e78b..5f73fa457 100644 --- a/hw/xfree86/utils/xorgcfg/text-mode.c +++ b/hw/xfree86/utils/xorgcfg/text-mode.c @@ -32,7 +32,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#ifdef _SCO_DS +#if defined(__SCO__) || defined(__UNIXWARE__) #include <curses.h> #else #include <ncurses.h> @@ -200,16 +200,21 @@ TextMode(void) ClearScreen(); refresh(); - if (Dialog( __XSERVERNAME__"Configuration", + if (Dialog( __XSERVERNAME__" Configuration", "This program will create the "__XCONFIGFILE__" file, based on " "menu selections you make.\n" "\n" +#if defined(__SCO__) || defined(__UNIXWARE__) + "The "__XCONFIGFILE__" file usually resides in /etc. A " + "sample "__XCONFIGFILE__" file is supplied with " +#else #ifndef __UNIXOS2__ "The "__XCONFIGFILE__" file usually resides in /usr/X11R6/etc/X11 " #else "The "__XCONFIGFILE__" file usually resides in "XF86CONFIGDIR" " #endif "or /etc/X11. A sample "__XCONFIGFILE__" file is supplied with " +#endif __XSERVERNAME__"; it is configured for a standard VGA card and " "monitor with 640x480 resolution. This program will ask for " "a pathname when it is ready to write the file.\n" @@ -349,9 +354,12 @@ static char *protocols[] = { #ifdef __UNIXOS2__ "OS2Mouse", #endif -#ifdef SCO +#ifdef __SCO__ "OsMouse", #endif +#ifdef __UNIXWARE__ + "Xqueue", +#endif #ifdef WSCONS_SUPPORT "wsmouse", #endif @@ -610,7 +618,8 @@ KeyboardConfig(void) nlist = 0; while (input) { - if (strcmp(input->inp_driver, "keyboard") == 0) { + if ((strcmp(input->inp_driver, "keyboard") == 0) || + (strcmp(input->inp_driver, "kbd") == 0)) { list = (char**)XtRealloc((XtPointer)list, (nlist + 1) * sizeof(char*)); list[nlist] = XtMalloc(sizeof(Edit) + strlen(input->inp_identifier) + 1); @@ -729,7 +738,11 @@ 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); } @@ -805,7 +818,11 @@ 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); } @@ -1883,7 +1900,8 @@ LayoutConfig(void) mouses[nmouses] = input; ++nmouses; } - else if (strcmp(input->inp_driver, "keyboard") == 0) { + else if ((strcmp(input->inp_driver, "keyboard") == 0) || + (strcmp(input->inp_driver, "kbd") == 0)) { keyboards = (XF86ConfInputPtr*)XtRealloc((XtPointer)keyboards, (nkeyboards + 1) * sizeof(XF86ConfInputPtr)); keyboards[nkeyboards] = input; @@ -2118,7 +2136,8 @@ LayoutConfig(void) piref = NULL; iref = layout->lay_input_lst; while (iref) { - if (strcmp(iref->iref_inputdev->inp_driver, "keyboard") == 0) { + if ((strcmp(iref->iref_inputdev->inp_driver, "keyboard") == 0) || + (strcmp(iref->iref_inputdev->inp_driver, "kbd") == 0)) { if (keyboard == NULL) piref = iref; if (xf86findOption(iref->iref_option_lst, "CoreKeyboard")) { @@ -2164,7 +2183,8 @@ LayoutConfig(void) list[nlist++] = keyboard->inp_identifier; input = XF86Config->conf_input_lst; while (input) { - if (input != keyboard && strcmp(input->inp_driver, "keyboard") == 0) { + if (input != keyboard && ((strcmp(input->inp_driver, "keyboard") == 0) || + (strcmp(input->inp_driver, "kbd") == 0))) { list = (char**)XtRealloc((XtPointer)list, (nlist + 1) * sizeof(char*)); list[nlist++] = input->inp_identifier; } @@ -3203,6 +3223,9 @@ DialogInput(char *title, char *prompt, int height, int width, char *init, } } continue; +#if defined(__SCO__) || defined(__UNIXWARE__) + case '\b': +#endif case KEY_BACKSPACE: case 0177: if (input_x || scrlx) { |