diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-08-12 20:39:08 +0300 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-08-12 20:39:08 +0300 |
| commit | 59dcc62906d8ee597cd43aa307f414cb47995cea (patch) | |
| tree | 750bf3689c68008e5d20f9416af6a63a656b345c /hw/xfree86/utils | |
| parent | 26c3cd1c9e3f52548389817a6d89a377e20c4269 (diff) | |
xfree86: remove Xqueue support completely
Diffstat (limited to 'hw/xfree86/utils')
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/mouse-cfg.c | 3 | ||||
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/text-mode.c | 3 | ||||
| -rw-r--r-- | hw/xfree86/utils/xorgconfig/xorgconfig.c | 17 |
3 files changed, 1 insertions, 22 deletions
diff --git a/hw/xfree86/utils/xorgcfg/mouse-cfg.c b/hw/xfree86/utils/xorgcfg/mouse-cfg.c index 6c29c1f07..5bae6d326 100644 --- a/hw/xfree86/utils/xorgcfg/mouse-cfg.c +++ b/hw/xfree86/utils/xorgcfg/mouse-cfg.c @@ -60,9 +60,6 @@ static struct MouseProtocol { #ifdef __SCO__ {"OsMouse", MTYPE_AUTOMOUSE}, #endif -#if defined(__UNIXWARE__) - {"Xqueue", MTYPE_XQUEUE}, -#endif #ifdef WSCONS_SUPPORT {"wsmouse", MTYPE_AUTOMOUSE}, #endif diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c index 5bb56481f..74647fdb7 100644 --- a/hw/xfree86/utils/xorgcfg/text-mode.c +++ b/hw/xfree86/utils/xorgcfg/text-mode.c @@ -361,9 +361,6 @@ static char *protocols[] = { #ifdef __SCO__ "OsMouse", #endif -#ifdef __UNIXWARE__ - "Xqueue", -#endif #ifdef WSCONS_SUPPORT "wsmouse", #endif diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c index e00830aa9..f7174832e 100644 --- a/hw/xfree86/utils/xorgconfig/xorgconfig.c +++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c @@ -2068,12 +2068,6 @@ static char *XF86Config_fontpathchunk_text = " Identifier \"Keyboard1\"\n" " Driver \"kbd\"\n" "\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" -"# uncomment the following line.\n" -"\n" -"# Option \"Protocol\" \"Xqueue\"\n" -"\n" " Option \"AutoRepeat\" \"500 30\"\n" "\n" "# Specify which keyboard LEDs can be user-controlled (eg, with xset(1))\n" @@ -2125,7 +2119,7 @@ static char *pointersection_text1 = "\n" "# Identifier and driver\n" "\n" -#if defined(__UNIXWARE__) || defined(XQUEUE) +#if defined(__UNIXWARE__) "# Identifier \"Mouse1\"\n" "# Driver \"mouse\"\n" #else @@ -2136,15 +2130,6 @@ static char *pointersection_text1 = static char *pointersection_text2 = "\n" -"# When using XQUEUE, comment out the above two lines, and uncomment\n" -"# the following line.\n" -"\n" -#if defined(__UNIXWARE__) || defined(XQUEUE) -" Option \"Protocol\" \"Xqueue\"\n" -#else -"# Option \"Protocol\" \"Xqueue\"\n" -#endif -"\n" "# Mouse-speed setting for PS/2 mouse.\n" "\n" "# Option \"Resolution\" \"256\"\n" |