diff options
author | yokota <yokota@FreeBSD.org> | 1997-12-23 08:04:38 +0000 |
---|---|---|
committer | yokota <yokota@FreeBSD.org> | 1997-12-23 08:04:38 +0000 |
commit | 643a53fdee71927a5d220dec08f7d22d939efbd9 (patch) | |
tree | 98c0da2faafebc319f472f5ea10c832489f38b60 /usr.sbin/moused/moused.c | |
parent | 59aba0db018f99f2d16c49e8dc8478f77bcfc337 (diff) | |
download | FreeBSD-src-643a53fdee71927a5d220dec08f7d22d939efbd9.zip FreeBSD-src-643a53fdee71927a5d220dec08f7d22d939efbd9.tar.gz |
- Added support for a new MouseMan model (4 buttons, no wheel).
Based on the report from Dave Bodenstab.
- Turn off PnP COM device enumeration procedure if the user explicitly
specifies a protocol type with the "-t" option.
- Accept "-t auto". Now the user may entirely omit the "-t" option
in the command line, or specify "-t auto" in order to make moused
detect an appropriate protocol type automatically. In the
previous version, moused did so only if the "-t" option is absent
in the command line. ("-t auto" won't disable PnP COM device
enumeration.)
- Updated the man page.
Diffstat (limited to 'usr.sbin/moused/moused.c')
-rw-r--r-- | usr.sbin/moused/moused.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c index 1e82159..830cb55 100644 --- a/usr.sbin/moused/moused.c +++ b/usr.sbin/moused/moused.c @@ -46,7 +46,7 @@ #ifndef lint static const char rcsid[] = - "$Id: moused.c,v 1.11 1997/12/07 08:11:16 yokota Exp $"; + "$Id: moused.c,v 1.12 1997/12/15 02:57:45 yokota Exp $"; #endif /* not lint */ #include <err.h> @@ -214,6 +214,8 @@ static symtab_t pnpprod[] = { { "KYEEZ00", MOUSE_PROTO_MS, MOUSE_MODEL_EASYSCROLL }, /* Genius NetMouse */ { "KYE0003", MOUSE_PROTO_INTELLI, MOUSE_MODEL_NET }, + /* Logitech MouseMan (new 4 button model) */ + { "LGI800C", MOUSE_PROTO_INTELLI, MOUSE_MODEL_MOUSEMANPLUS }, /* Logitech MouseMan+ */ { "LGI8050", MOUSE_PROTO_INTELLI, MOUSE_MODEL_MOUSEMANPLUS }, /* Logitech FirstMouse+ */ @@ -524,9 +526,17 @@ main(int argc, char *argv[]) break; case 't': + if (strcmp(optarg, "auto") == 0) { + rodent.rtype = MOUSE_PROTO_UNKNOWN; + rodent.flags &= ~NoPnP; + rodent.level = -1; + break; + } for (i = 0; rnames[i]; i++) - if (!strcmp(optarg,rnames[i])) { + if (strcmp(optarg, rnames[i]) == 0) { rodent.rtype = i; + rodent.flags |= NoPnP; + rodent.level = (i == MOUSE_PROTO_SYSMOUSE) ? 1 : 0; break; } if (rnames[i]) |