diff options
author | Kazutaka YOKOTA <yokota@FreeBSD.org> | 1998-03-23 06:08:55 +0000 |
---|---|---|
committer | Kazutaka YOKOTA <yokota@FreeBSD.org> | 1998-03-23 06:08:55 +0000 |
commit | 6614c78914e2b2b23200bf8e22713991c4407609 (patch) | |
tree | c2858d09f15f21a2acfa5f436e1852c1d196ee5e /usr.sbin/sysinstall/mouse.c | |
parent | 3d4fcaba36a414b48cc19163793f7e1ba1f9228a (diff) | |
download | src-6614c78914e2b2b23200bf8e22713991c4407609.tar.gz src-6614c78914e2b2b23200bf8e22713991c4407609.zip |
- 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.
Notes
Notes:
svn path=/head/; revision=34793
Diffstat (limited to 'usr.sbin/sysinstall/mouse.c')
-rw-r--r-- | usr.sbin/sysinstall/mouse.c | 16 |
1 files changed, 14 insertions, 2 deletions
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; +} |