From 6614c78914e2b2b23200bf8e22713991c4407609 Mon Sep 17 00:00:00 2001 From: Kazutaka YOKOTA Date: Mon, 23 Mar 1998 06:08:55 +0000 Subject: [PATCH] - Remove the notice that psm0 must be enabled before using the PS/2 mouse; the device is enabled by default in the GENERIC kernel. - Kill the mouse daemon, if any, when the user wants to disable it. - Minor update on mouse menus. --- release/sysinstall/menus.c | 33 ++++++++++++++++---------------- release/sysinstall/mouse.c | 16 ++++++++++++++-- release/sysinstall/sysinstall.h | 3 ++- usr.sbin/sade/menus.c | 33 ++++++++++++++++---------------- usr.sbin/sade/sade.h | 3 ++- usr.sbin/sysinstall/menus.c | 33 ++++++++++++++++---------------- usr.sbin/sysinstall/mouse.c | 16 ++++++++++++++-- usr.sbin/sysinstall/sysinstall.h | 3 ++- 8 files changed, 85 insertions(+), 55 deletions(-) diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index 5e1cb74c8a3f..83c8b2c7c6ce 100644 --- a/release/sysinstall/menus.c +++ b/release/sysinstall/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.161 1998/03/15 17:10:11 jkh Exp $ + * $Id: menus.c,v 1.162 1998/03/15 19:30:49 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -366,8 +366,8 @@ DMenu MenuMouseType = { DMenu MenuMousePort = { DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS, "Select your mouse port from the following menu", - "Please note that for PS/2 mice, you need to enable the psm driver\n" - "in the kernel configuration menu when installing for the first time.", + "The built-in pointing device of laptop/notebook computers is usually\n" + "a PS/2 style device.", NULL, NULL, { { "COM1", "Serial mouse on COM1 (/dev/cuaa0)", @@ -380,7 +380,7 @@ DMenu MenuMousePort = { dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa3" }, { "BusMouse", "Logitech, ATI or MS bus mouse (/dev/mse0)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/mse0" }, - { "PS/2", "PS/2 style mouse (must enable /dev/psm0)", + { "PS/2", "PS/2 style mouse (/dev/psm0)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/psm0" }, { NULL } }, }; @@ -388,19 +388,20 @@ DMenu MenuMousePort = { DMenu MenuMouse = { DMENU_NORMAL_TYPE, "Please configure your mouse", - "There are many different types of mice currently on the market,\n" - "but this configuration menu should at least narrow down the choices\n" - "somewhat. Once you've done with the following menus, you can specify\n" - "\"/dev/sysmouse\" as your mouse device and \"SysMouse\" or \"MouseSystems\"\n" - "as mouse protocol when running the X configuration utility (see \n" - "Configuration menu).", - "Choose 3 after selecting a protocol and a port.", + "You can cut and paste text in the text console by running the mouse\n" + "daemon. Specify a port and a protocol type of your mouse and enable\n" + "the mouse daemon. If you don't want this feature, select 4 to disable\n" + "the daemon.\n" + "Once you've enabled the mouse daemon, you can specify \"/dev/sysmouse\"\n" + "as your mouse device and \"SysMouse\" or \"MouseSystems\" as mouse\n" + "protocol when running the X configuration utility (see Configuration\n" + "menu).", NULL, - { { "1 Type", "Select mouse protocol", NULL, dmenuSubmenu, NULL, &MenuMouseType }, + NULL, + { { "1 Type", "Select mouse protocol type", NULL, dmenuSubmenu, NULL, &MenuMouseType }, { "2 Port", "Select mouse port", NULL, dmenuSubmenu, NULL, &MenuMousePort }, - { "3 Daemon", "Test and run the mouse daemon", NULL, mousedTest, NULL, NULL }, - { "4 No mouse", "Clear mouse configuration", NULL, dmenuSetVariables, - NULL, VAR_MOUSED "=NO, " VAR_MOUSED_TYPE "=NO, " VAR_MOUSED_PORT "=" }, + { "3 Enable", "Test and run the mouse daemon", NULL, mousedTest, NULL, NULL }, + { "4 Disable", "Disable the mouse daemon", NULL, mousedDisable, NULL, NULL }, { "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1334,7 +1335,7 @@ DMenu MenuSysconsKeymap = { { "Icelandic (accent)", "Icelandic ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=icelandic.iso.acc" }, { "Icelandic", "Icelandic ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=icelandic.iso" }, { "Italian", "Italian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=it.iso" }, - { "Latin American", "Latin American ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=lat-amer.iso" }, + { "Latin American", "Latin American ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=lat-amer" }, { "Japanese 106", "Japanese 106 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=jp.106" }, { "Norway ISO", "Norwegian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=norwegian.iso" }, { "Russia CP866", "Russian CP866 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.cp866" }, diff --git a/release/sysinstall/mouse.c b/release/sysinstall/mouse.c index 76d6c34884bb..f02dcf995c50 100644 --- a/release/sysinstall/mouse.c +++ b/release/sysinstall/mouse.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mouse.c,v 1.2 1998/03/10 13:42:05 jkh Exp $ + * $Id: mouse.c,v 1.3 1998/03/23 05:59:18 jkh Exp $ */ #include "sysinstall.h" @@ -57,8 +57,8 @@ mousedTest(dialogMenuItem *self) ret = msgYesNo("Now move the mouse and see if it works.\n" "(Note that buttons don't have any effect for now.)\n\n" " Is the mouse cursor moving?\n"); + systemExecute("vidcontrol -m off"); if (ret) { - systemExecute("vidcontrol -m off"); if (file_readable("/var/run/moused.pid")) vsystem("kill `cat /var/run/moused.pid`"); variable_set2(VAR_MOUSED, "NO"); @@ -69,3 +69,15 @@ mousedTest(dialogMenuItem *self) return DITEM_SUCCESS; } + +int +mousedDisable(dialogMenuItem *self) +{ + if (file_readable("/var/run/moused.pid")) + vsystem("kill `cat /var/run/moused.pid`"); + variable_set2(VAR_MOUSED, "NO"); + variable_set2(VAR_MOUSED_TYPE, "NO"); + variable_unset(VAR_MOUSED_PORT); + msgConfirm("The mouse daemon is disabled."); + return DITEM_SUCCESS; +} diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h index e155070d3ba9..bd6b1d7b953f 100644 --- a/release/sysinstall/sysinstall.h +++ b/release/sysinstall/sysinstall.h @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: sysinstall.h,v 1.143 1997/10/14 18:17:35 jkh Exp $ + * $Id: sysinstall.h,v 1.144 1998/03/07 08:59:32 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -641,6 +641,7 @@ extern char *sstrncpy(char *dst, const char *src, int size); /* mouse.c */ extern int mousedTest(dialogMenuItem *self); +extern int mousedDisable(dialogMenuItem *self); /* msg.c */ extern Boolean isDebug(void); diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 5e1cb74c8a3f..83c8b2c7c6ce 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.161 1998/03/15 17:10:11 jkh Exp $ + * $Id: menus.c,v 1.162 1998/03/15 19:30:49 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -366,8 +366,8 @@ DMenu MenuMouseType = { DMenu MenuMousePort = { DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS, "Select your mouse port from the following menu", - "Please note that for PS/2 mice, you need to enable the psm driver\n" - "in the kernel configuration menu when installing for the first time.", + "The built-in pointing device of laptop/notebook computers is usually\n" + "a PS/2 style device.", NULL, NULL, { { "COM1", "Serial mouse on COM1 (/dev/cuaa0)", @@ -380,7 +380,7 @@ DMenu MenuMousePort = { dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa3" }, { "BusMouse", "Logitech, ATI or MS bus mouse (/dev/mse0)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/mse0" }, - { "PS/2", "PS/2 style mouse (must enable /dev/psm0)", + { "PS/2", "PS/2 style mouse (/dev/psm0)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/psm0" }, { NULL } }, }; @@ -388,19 +388,20 @@ DMenu MenuMousePort = { DMenu MenuMouse = { DMENU_NORMAL_TYPE, "Please configure your mouse", - "There are many different types of mice currently on the market,\n" - "but this configuration menu should at least narrow down the choices\n" - "somewhat. Once you've done with the following menus, you can specify\n" - "\"/dev/sysmouse\" as your mouse device and \"SysMouse\" or \"MouseSystems\"\n" - "as mouse protocol when running the X configuration utility (see \n" - "Configuration menu).", - "Choose 3 after selecting a protocol and a port.", + "You can cut and paste text in the text console by running the mouse\n" + "daemon. Specify a port and a protocol type of your mouse and enable\n" + "the mouse daemon. If you don't want this feature, select 4 to disable\n" + "the daemon.\n" + "Once you've enabled the mouse daemon, you can specify \"/dev/sysmouse\"\n" + "as your mouse device and \"SysMouse\" or \"MouseSystems\" as mouse\n" + "protocol when running the X configuration utility (see Configuration\n" + "menu).", NULL, - { { "1 Type", "Select mouse protocol", NULL, dmenuSubmenu, NULL, &MenuMouseType }, + NULL, + { { "1 Type", "Select mouse protocol type", NULL, dmenuSubmenu, NULL, &MenuMouseType }, { "2 Port", "Select mouse port", NULL, dmenuSubmenu, NULL, &MenuMousePort }, - { "3 Daemon", "Test and run the mouse daemon", NULL, mousedTest, NULL, NULL }, - { "4 No mouse", "Clear mouse configuration", NULL, dmenuSetVariables, - NULL, VAR_MOUSED "=NO, " VAR_MOUSED_TYPE "=NO, " VAR_MOUSED_PORT "=" }, + { "3 Enable", "Test and run the mouse daemon", NULL, mousedTest, NULL, NULL }, + { "4 Disable", "Disable the mouse daemon", NULL, mousedDisable, NULL, NULL }, { "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1334,7 +1335,7 @@ DMenu MenuSysconsKeymap = { { "Icelandic (accent)", "Icelandic ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=icelandic.iso.acc" }, { "Icelandic", "Icelandic ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=icelandic.iso" }, { "Italian", "Italian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=it.iso" }, - { "Latin American", "Latin American ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=lat-amer.iso" }, + { "Latin American", "Latin American ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=lat-amer" }, { "Japanese 106", "Japanese 106 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=jp.106" }, { "Norway ISO", "Norwegian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=norwegian.iso" }, { "Russia CP866", "Russian CP866 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.cp866" }, diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h index e155070d3ba9..bd6b1d7b953f 100644 --- a/usr.sbin/sade/sade.h +++ b/usr.sbin/sade/sade.h @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: sysinstall.h,v 1.143 1997/10/14 18:17:35 jkh Exp $ + * $Id: sysinstall.h,v 1.144 1998/03/07 08:59:32 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -641,6 +641,7 @@ extern char *sstrncpy(char *dst, const char *src, int size); /* mouse.c */ extern int mousedTest(dialogMenuItem *self); +extern int mousedDisable(dialogMenuItem *self); /* msg.c */ extern Boolean isDebug(void); diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 5e1cb74c8a3f..83c8b2c7c6ce 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.161 1998/03/15 17:10:11 jkh Exp $ + * $Id: menus.c,v 1.162 1998/03/15 19:30:49 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -366,8 +366,8 @@ DMenu MenuMouseType = { DMenu MenuMousePort = { DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS, "Select your mouse port from the following menu", - "Please note that for PS/2 mice, you need to enable the psm driver\n" - "in the kernel configuration menu when installing for the first time.", + "The built-in pointing device of laptop/notebook computers is usually\n" + "a PS/2 style device.", NULL, NULL, { { "COM1", "Serial mouse on COM1 (/dev/cuaa0)", @@ -380,7 +380,7 @@ DMenu MenuMousePort = { dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa3" }, { "BusMouse", "Logitech, ATI or MS bus mouse (/dev/mse0)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/mse0" }, - { "PS/2", "PS/2 style mouse (must enable /dev/psm0)", + { "PS/2", "PS/2 style mouse (/dev/psm0)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/psm0" }, { NULL } }, }; @@ -388,19 +388,20 @@ DMenu MenuMousePort = { DMenu MenuMouse = { DMENU_NORMAL_TYPE, "Please configure your mouse", - "There are many different types of mice currently on the market,\n" - "but this configuration menu should at least narrow down the choices\n" - "somewhat. Once you've done with the following menus, you can specify\n" - "\"/dev/sysmouse\" as your mouse device and \"SysMouse\" or \"MouseSystems\"\n" - "as mouse protocol when running the X configuration utility (see \n" - "Configuration menu).", - "Choose 3 after selecting a protocol and a port.", + "You can cut and paste text in the text console by running the mouse\n" + "daemon. Specify a port and a protocol type of your mouse and enable\n" + "the mouse daemon. If you don't want this feature, select 4 to disable\n" + "the daemon.\n" + "Once you've enabled the mouse daemon, you can specify \"/dev/sysmouse\"\n" + "as your mouse device and \"SysMouse\" or \"MouseSystems\" as mouse\n" + "protocol when running the X configuration utility (see Configuration\n" + "menu).", NULL, - { { "1 Type", "Select mouse protocol", NULL, dmenuSubmenu, NULL, &MenuMouseType }, + NULL, + { { "1 Type", "Select mouse protocol type", NULL, dmenuSubmenu, NULL, &MenuMouseType }, { "2 Port", "Select mouse port", NULL, dmenuSubmenu, NULL, &MenuMousePort }, - { "3 Daemon", "Test and run the mouse daemon", NULL, mousedTest, NULL, NULL }, - { "4 No mouse", "Clear mouse configuration", NULL, dmenuSetVariables, - NULL, VAR_MOUSED "=NO, " VAR_MOUSED_TYPE "=NO, " VAR_MOUSED_PORT "=" }, + { "3 Enable", "Test and run the mouse daemon", NULL, mousedTest, NULL, NULL }, + { "4 Disable", "Disable the mouse daemon", NULL, mousedDisable, NULL, NULL }, { "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1334,7 +1335,7 @@ DMenu MenuSysconsKeymap = { { "Icelandic (accent)", "Icelandic ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=icelandic.iso.acc" }, { "Icelandic", "Icelandic ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=icelandic.iso" }, { "Italian", "Italian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=it.iso" }, - { "Latin American", "Latin American ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=lat-amer.iso" }, + { "Latin American", "Latin American ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=lat-amer" }, { "Japanese 106", "Japanese 106 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=jp.106" }, { "Norway ISO", "Norwegian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=norwegian.iso" }, { "Russia CP866", "Russian CP866 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.cp866" }, diff --git a/usr.sbin/sysinstall/mouse.c b/usr.sbin/sysinstall/mouse.c index 76d6c34884bb..f02dcf995c50 100644 --- a/usr.sbin/sysinstall/mouse.c +++ b/usr.sbin/sysinstall/mouse.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mouse.c,v 1.2 1998/03/10 13:42:05 jkh Exp $ + * $Id: mouse.c,v 1.3 1998/03/23 05:59:18 jkh Exp $ */ #include "sysinstall.h" @@ -57,8 +57,8 @@ mousedTest(dialogMenuItem *self) ret = msgYesNo("Now move the mouse and see if it works.\n" "(Note that buttons don't have any effect for now.)\n\n" " Is the mouse cursor moving?\n"); + systemExecute("vidcontrol -m off"); if (ret) { - systemExecute("vidcontrol -m off"); if (file_readable("/var/run/moused.pid")) vsystem("kill `cat /var/run/moused.pid`"); variable_set2(VAR_MOUSED, "NO"); @@ -69,3 +69,15 @@ mousedTest(dialogMenuItem *self) return DITEM_SUCCESS; } + +int +mousedDisable(dialogMenuItem *self) +{ + if (file_readable("/var/run/moused.pid")) + vsystem("kill `cat /var/run/moused.pid`"); + variable_set2(VAR_MOUSED, "NO"); + variable_set2(VAR_MOUSED_TYPE, "NO"); + variable_unset(VAR_MOUSED_PORT); + msgConfirm("The mouse daemon is disabled."); + return DITEM_SUCCESS; +} diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h index e155070d3ba9..bd6b1d7b953f 100644 --- a/usr.sbin/sysinstall/sysinstall.h +++ b/usr.sbin/sysinstall/sysinstall.h @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: sysinstall.h,v 1.143 1997/10/14 18:17:35 jkh Exp $ + * $Id: sysinstall.h,v 1.144 1998/03/07 08:59:32 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -641,6 +641,7 @@ extern char *sstrncpy(char *dst, const char *src, int size); /* mouse.c */ extern int mousedTest(dialogMenuItem *self); +extern int mousedDisable(dialogMenuItem *self); /* msg.c */ extern Boolean isDebug(void);