d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Added support for a new MouseMan model (4 buttons, no wheel).

Browse Source 
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.
This commit is contained in:
Kazutaka YOKOTA 1997-12-23 08:04:38 +00:00
parent 3e176bdf69
commit 30ee7535d4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=31949
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
usr.sbin/moused/moused.8
View File

@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.\" $Id: moused.8,v 1.7 1997/12/07 08:11:15 yokota Exp $
.\" $Id: moused.8,v 1.8 1997/12/08 11:54:42 yokota Exp $
.\"
.Dd December 3, 1997
.Dt MOUSED 8
@ -198,12 +198,26 @@ Select a baudrate of 9600 for the serial line.
Not all serial mice support this option.
.It Fl t Ar type
Specify the protocol type of the mouse attached to the port.
You need to use this option only if the
You may explicitly specify a type listed below, or use
.Ar auto
to let the
.Nm
command is not able to detect the appropriate protocol automatically for
the given mouse
command to automatically select an appropriate protocol for the given
mouse.
If you entirely ommit this options in the command line,
.Fl t Ar auto
is assumed.
Under normal circumstances,
you need to use this option only if the
.Nm
command is not able to detect the protocol automatically
.Pq see the Sx Configuring Mouse Daemon .
.Pp
Also note that if a protocol type is specified with this option, the
.Fl P
option above is implied and Plug and Play COM device enumeration
procedure will be disabled.
.Pp
Valid types for this option are
listed below.
.Pp

14
usr.sbin/moused/moused.c
View File

@ -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])