Copy stable/10@r272459 to releng/10.1 as part of
the 10.1-RELEASE process.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Add preliminary support for IBM/Lenovo TrackPoint.

PR: kern/147237 (based on the initial patch for 8.x)
Tested by: glebius (device detection and suspend/resume)
MFC after: 1 month

A number of places in the source tree still reference cuad.* after
sio(4) was deprecated by uart(4).

s/cuad/cuau/g/

PR: docs/171533
Reviewed by: imp
Approved by: cperciva (implicit)
MFC after: 3 weeks

Make sure moused is exiting as quick as possible after that the
umsX character device returns a read error. Update devd.conf rules
to use "DEVFS" events which are generated after that the umsX
character device node has been created/destroyed, and then there
should be no need for moused to wait up to 10 seconds for umsX to
be ready. Opening umsX should not fail except if the kernel is low
on memory. In that case the user can replug the USB mouse or use
"usbconfig" to reset the device. In case of USB mouse devices,
moused should neither retry to open its character device,
once the first read error has happened. This is an indication
of device detach.

MFC after: 1 week

The UMS module is now loaded by rules in /etc/devd/usb.conf which
are executed by devd. Remove duplicate kldload.

Reported by: joel @
MFC after: 1 week

Fix warning when compiling with gcc46:
error: variable 'now' set but not used

Approved by: dim, cperciva (mentor, blanket for pre-mentorship already-approved commits)
MFC after: 3 days

Spelling fixes for usr.sbin/

Mark global functions and/or variables in moused(8) static where possible.

This allows compilers and static analyzers to do more thorough analysis.

Formatting fix.

Submitted by: arundel (via doc@)
MFC after: 3 days

Fix typos - remove duplicate "the".

PR: bin/154928
Submitted by: Eitan Adler <lists at eitanadler.com>
MFC after: 3 days

When Emulate3Button is active, do not set select() timeout in states when
it is not needed. No need to kick CPU every 20ms without a purpose.

Reviewed by: philip@

mdoc: move CAVEATS, BUGS and SECURITY CONSIDERATIONS sections to the
bottom of the manpages and order them consistently.

GNU groff doesn't care about the ordering, and doesn't even mention
CAVEATS and SECURITY CONSIDERATIONS as common sections and where to put
them.

Found by: mdocml lint run
Reviewed by: ru

The last big commit: let usr.sbin/ use WARNS=6 by default.

Improve the virtual scrolling mechanism to make middle clicking less
difficult. Add a -L option (yet another option, indeed!) which changes the
speed of scrolling and change -U to only affect the scroll threshold.

This should make middle-clicking a much more pleasant experience.

PR: bin/120186
Submitted by: Aragon Gouveia <aragon -at- phat.za.net>
MFC after: 3 days

Use intmax_t instead of long when casting time_t.

Suggested by: mlaier
Tested with: make universe

The breakage from increased warns has been fixed, back out my back out

Cast time_t to long to mute tinderbox build failure.

This breaks the arm build, back it out until that's fixed

Mark moused(8) WARNS=6 clean.

Fix compiler warnings and style(9) bugs.

Prefer clock_gettime(2) over gettimeofday(2) and use CLOCK_MONOTONIC_FAST.
It is only used to track elapsed time and it does not have to be precise.

Fix a (very) longstanding bug in moused(8) affecting high-resolution rodents
when linear acceleration (-a) was enabled with a <1 value to slow them down.

Previously, rounding errors would eat small movements so the mouse had to be
moved a certain distance to get any movement at all. We now calculate the
rounding errors and take them into account when reporting movement.

PR: bin/113749
Submitted by: Oliver Fromme <olli -at- secnetix.de>
MFC after: 3 days

Add dynamic acceleration to moused(8). This introduces a '-A' flag to control
the acceleration algorithm. It can be used together with the '-a' flag for
regular acceleration.

PR: bin/110003
Submitted by: Oliver Fromme <olli -at- lurza.secnetix.de>
MFC after: 1 week

Markup fixes.

Convert macros to use C99's syntax for macros with a variable number of
arguments.

Send the pcvt(4) driver off to retirement.

Replace the guts of usbmodule() with calls to the new kld(3) functions.

Add "yet another" moused(8) hack: suspend handling mouse events when SIGUSR1
is caught. Can be assigned to a window manager shortcut to prevent accidents
with touchpads.

PR: bin/89357
Submitted by: Nick Hibma <nick -at- van-laarhoven.org>
MFC after: 1 week

-mdoc sweep.

Fix a small typo.

Spotted by: ceri

Add an option to stop 'mouse drift' in some defective/cheap mice. This stops
the pointer slowly wandering away on its own in an annoying way when the mouse
isn't physically moved.

PR: bin/83970
Submitted by: Lena -at- lena.kiev.ua
X-MFC after: 6.0-RELEASE

Pidfiles should be created with permission preventing users from opening
them for reading. When user can open file for reading, he can also
flock(2) it, which can lead to confusions.

Pointed out by: green

Use pidfile(3) in moused(8).

Add a -H option to enable horizontal virtual scrolling, much like -V for
vertical virtual scrolling. This also respects -U for the distance.

PR: bin/82762
Submitted by: Eric Kjeldergaard <kjelderg -at- gmail.com>
MFC after: 1 month

Support for the GTCO Digipad.

Sort sections.

Document the -U option a bit more clearly.

Submitted by: keramida

Scheduled mdoc(7) sweep.

- mdoc(7) cleanup.
- Bump document date for last content change.

Extended mdoc clue: ru

Document the -V and -U options in usage().

Submitted by: Jordan Sissel <psionic@csh.rit.edu>

Update moused(8) and mouse(4) to reflect the cuaa->cuad name change.

Submitted by: Steve Kargl <sgk@troutmask.apl.washington.edu>

Introduce the PRECIOUSPROG knob in bsd.prog.mk, similar
to PRECIOUSLIB from bsd.lib.mk. The side effect of this
is making installing the world under jail(8) possible by
using another knob, NOFSCHG.

Reviewed by: oliver

Add 'virtual scrolling' support to moused(8). When holding down the middle
mouse button, motions are interpreted as scrolling.

Submitted by: Jordan Sissel <psionic-AT-csh.rit.edu>
Approved by: njl

Teach moused about Synaptics touchpads.

While I'm here, document the existence of the '-l' option, which allows
one to use moused to use psm in some more interesting ways.

Approved by: njl (mentor)

Use C99 conforming designated initialisers rather than the obsolete GCC syntax.

Mechanically kill hard sentence breaks.

Language tweak in explaining the mouse wheel's functionality.

Fix serious ugliness introduced in 1.61, which leads to long delay in boot
sequence when machine is started without attached USB mouse. Only do
repeated attempts to re-open device if the usb module has been actually
loaded. Also fix broken logic in doing delays between open attempts - do
delays between attempts, not after each attempt.

Due to previous behaviour being very annoying for notebook owners this
is a good 5.2 MFC candidate.

MFC after: 2 days

__FBSDID; remove duplicate <ctype.h>; try to reduce style inconsistencies.

Sort includes, and remove superfluous <sys/types.h>

Instead of blindly loading the ums module and bailing out if that fails,
check if it's already loaded or compiled into the kernel, and only try to
load it if it isn't.

PR: bin/59368
Submitted by: Jens Rehsack <rehsack@liwing.de>

If the name of the mouse device starts with "/dev/ums", try to load the
ums module, and allow for up to five attempts to open the device, with
two-second pauses in between, to allow time for USB controllers and
devices to probe and attach. My Gigabyte P4 Titan 848P motherboard has
a total of 15 ports on four hubs hanging off four controllers, and needs
at least half of that ten-second allowance to get ready.

MFC after: 7 days

Whitespace cleanup.

Add section number to .Xr

Grammar and punctuation fixes

PR: 40910 (most of them)
Submitted by: Chris Pepper <pepper@rockefeller.edu>
MFC after: 3 days

Correct typos, mostly s/ a / an / where appropriate. Some whitespace cleanup,
especially in troff files.

Fix typos, mostly s/ an / a / where appropriate and a few s/an/and/
Add FreeBSD Id tag where missing.

english(4) police.

Replace various spelling with FALLTHROUGH which is lint()able

The .Nm utility

Work around a code generation bug of GCC 3.1 by replacing
`/2' with `>>1'. In the context `>>1' is more appropriate
because it looks like the division is used to restore a
shifted value.

GCC GNATS PR: c/6677

This fixes a problem where wheel-up movement is taken as wheel-down
in the sysmouse protocol.

Do not assume the plain char's are signed; use `signed char' where
char's need to be signed.

Discussed on: audit
Pointed out by: bde

Fix a number of warnings. A gcc preprocessor bug relating to macros
with variable numbers of arguments made this slightly harder than
it should be. Avoid the bug by not doing string concatenation within
the macros, and instead add a new function to syslog or print the
error messages.

Minor changes:
[1] Support the Sony VAIO Jogdial in moused(8).
[2] Modify spic(4) to support additional Sony VAIO models.

Submitted by: [1] Juriy Goloveshkin <j@gu.ru>,
[2] Akira Funahashi <funa@funa.org>
Tested by: cjh, jim, Jerry A! <jerry@thehutt.org>
Approved by: nsayer
MFC after: 2 weeks

mdoc(7) police: protect trailing full stops of abbreviations
with a trailing zero-width space: `e.g.\&'.

Expand the usage info to include the possible options for -i,
and fix the printf so that the line actually gets printed.

mdoc(7) police:

Avoid using parenthesis enclosure macros (.Pq and .Po/.Pc) with plain text.
Not only this slows down the mdoc(7) processing significantly, but it also
has an undesired (in this case) effect of disabling hyphenation within the
entire enclosed block.

Remove whitespace at EOL.

mdoc(7) police: removed HISTORY info from the .Os call.

mdoc(7) police: remove extraneous .Pp before and/or after .Sh.

Oops, remove a `mouse_move_delayed++' that shouldn't have been
added in the previous commit; this variable is already incremented
in the previous `if' condition.

The state machine for 3-button emulation defers some button events
until a 20ms select(2) timeout occurs, but if there is a continuous
stream of movement events, button events can be delayed indefinitely
because the select never has to wait long enough for a timeout.
The delay and mouse event reordering that result are very noticable
and sometimes quite frustrating when dragging windows etc. in X.

Add a simple mechanism that avoids this re-ordering. While a button
event is deferred, we discard up to 3 movement events to allow for
mouse jitter. If more movement events occur, then we immediately
timeout the deferred button event and let the movement proceed.
This change only affects the 3-button emulation case.

Add an acceleration option to moused

PR: 28369
Submitted by: Daniel O'Connor <darius@dons.net.au>
manpage reviewed by: ru
MFC after: 10 days

Nuke unused variables.

- Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.

Set the default manual section for usr.sbin/ to 8.

Preceed/preceeding are not english words. Use precede and preceding.

mdoc(7) police: split punctuation characters + misc fixes.

mdoc(7) police: do not split author names in the AUTHORS section.

mdoc(7) police: use certified section headers wherever possible.

Initiate deorbit burn sequence for <machine/mouse.h>.

Replace all in-tree uses with <sys/mouse.h> which repo-copied a few
moments ago from src/sys/i386/include/mouse.h by peter.
This is also the appropriate fix for exo-tree sources.

Put warnings in <machine/mouse.h> to discourage use.
November 15th 2000 the warnings will be converted to errors.
January 15th 2001 the <machine/mouse.h> files will be removed.

Initiate deorbit burn sequence for <machine/console.h>.

Replace all in-tree uses with necessary subset of <sys/{fb,kb,cons}io.h>.
This is also the appropriate fix for exo-tree sources.

Put warnings in <machine/console.h> to discourage use.
November 15th 2000 the warnings will be converted to errors.
January 15th 2001 the <machine/console.h> files will be removed.

Reduce the default timeout for the three button emulation
from 200 msec to 100 msec.

Set the right default timeout to 200ms as per the manpage.

PR: bin/17879
Submitted by: Samuel Tardieu <sam@ada.eu.org>

Follow up to the 3 button emulation update in rev 1.41:
- Fix the -z option which I broke in rev 1.41. It didn't work
correctly when used in conjunction with the -m option.
- Tweak the 3 button state machine so that 'Up' events of the buttons
1 and 3 are reported immediately as soon as the buttons are up.

Brush up the last commit.

- Expand contractions.
- Change some expressions.
- Reword the sections that describe the reporting of down events.

Submitted by: sheldonh

Reflect the recent update in moused.c.

Remove unwanted debug output.

PR: bin/17617
Submitted by: Allan Saddi <asaddi@philosophysw.com>

- This is the second attempt to fix the `-3' option for moused :-)
It also adds a new option, `-E', to set the timeout value for
the three button emulation.

Add Mitsumi Wireless Scroll Mouse PnP ID.

- Add support for IntelliMouse Explorer, NetScroll Optical, SmartScroll,
Scroll Point, and 4D/4D+ mice.
- Add a couple of serial mouse PnP IDs.
- Extend the `-z' option so that the second wheel (or the horizontal
movement of the `scroll' device) can be mapped to buttons.

Add Tremon Wheel PNP mouse

Remove single-space hard sentence breaks. These degrade the quality
of the typeset output, tend to make diffs harder to read and provide
bad examples for new-comers to mdoc.

Added the PnP ID for MouseSystems SmartScroll Mouse (serial mouse).
This mouse may be a OEM version of Genius EasyScroll Mouse.

(The mouse has three buttons on top, one side button and a wheel which
also acts as a button. However, I know no way to activate the wheel,
and it can only be used as an ordinary 3-buttons mouse :-)

Add the PnP ID for the Logitech Cordless MouseMan Wheel (serial
version).

Back out previous commit, which broke mouse wheel support in moused.

Requested by: yokota

- Improve the three button emulation by introdusing a small state
machine. The three-button emulation of moused has been somewhat
difficult to use for many people. I hope this update fixes it.
- Add a new option, -E, to set timeout value to detect two buttons
are pressed down simulteneously. The default value for this timeout
is 200msec.

Mention USB mouse support.

Remove a stray ';' which made moused fail on read()s in all cases.

Prodded-By: Andrey A. Chernov <ache@FreeBSD.org>
Prodded-By: Soren Schmidt <sos@freebsd.dk>
Prodded-By: Louis A. Mamakos <louie@TransSys.COM>

Bail out on failing the read(). This happens when a USB mouse is
disconnected. We retry the open in the parent subroutine.

Remove an ifdef _i386_ . MOUSE_IF_USB is now defined for alpha as well.

Reviewed-By: yokota

"Plag and play" -> "Plug and Play"

Fix warning: return type of `main' is not `int'

$Id$ -> $FreeBSD$

Add support for the serial version of Interlink VersaPad.

Bad reference vidcontrol(4) -> vidcontrol(1)

Improve Logitech MouseMan+ protocol support.

Make it clear that PS/2 type mice will work only with "auto" and
"ps/2" protocol types, and that serial mouse protocols shouldn't be
specified for these mice.

Fix PS/2 MouseMan+ protocol. We have been looking at a wrong place
for the sign bit for roller movement!

USB is only on PC's at the minute, don't try and use the MOUSE_IF_USB
define on the AXP, 'cos it breaks.

Print "usb" for MOUSE_IF_USB, rather than "unknown".

Cleanup usage string: -i takes an argument.

PR: 8315
Submitted by: Amakawa Shuhei <amakawa@sf.t.u-tokyo.ac.jp>

- Added support for Genius Kidspad tablet.

# `moused' is getting too over-loaded now. If we want something
# more than simple mouse emulation for tablets or remote devices,
# we should start writing a separate daemon...

Submitted by: luigi

- Added a new option: -w N. The option makes the button N as the `wheel
mode' button. Mouse movement will be treated as wheel movement while
this button is held down. Useful for mice with many buttons but
without a wheel.

PR: bin/8001
Submitted by: Hideyuki Suzuki

- Reorganized a `if-else' close a bit for clarity. Purely cosmetic
change. No functional difference.

Fix PnP mouse detection routine so that:
- it has longer timeout as per the PnP COM Device Specificaiton 1.0,
- and it tries to obtain the PnP ID string by strictly following the
specification and if it fails, by deploying slightly simplified
steps. (moused has used the simplified method because early PnP mice
do not exactly follow the specification. But now, recent mice
do not supply the ID string unless the strict procedure is used...)

Jointly developed by luigi and yokota.

Remove useless `BINOWN=root' now that it is the default.

Typo: hittab -> hitab

Reviewed by: Amancio
Submitted by: Randall Hopper <rhh@ct.picker.com>
The patch supports using the X10 Mouse Remote in both stand-alone and
pass-through configurations, so you can plug your mouse and remote into the
same serial port, use the mouse for X, and use the remote for other apps
like Fxtv. For instance, we can now control fxtv via the remote control
just like a TV : change channels, mute, increase volume, zoom video,
freeze frame 8)

The mouse events are channeled through the syscons/sysmouse I/F like
normal, and the remote buttons are "syphoned off" to a UNIX-domain stream
socket (defined as _PATH_MOUSEREMOTE in <machine/mouse.h>) for a
remote-aware app to grab and use.

For further info on the X10 Mouse Remote see:
http://www.x10.com/products/x10_mk19a.htm

Minor tweaks in the AUTHORS section.

PR: 6921
Submitted by: Josh Gilliam <josh@quick.net>

.Sh AUTHOR -> .Sh AUTHORS. Use .An/.Aq.

- Describe the -I option in the man page.
- Add the -I option in the usage line.

Add -I flag.
Submitted by: Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>

Add 4th button support for the "MouseMan" protocol. The latest
trackball model from Logitech has four buttons.

Add Genius PnP Mouse (simple one)

Fix typo.
PR: docs/5562

Add the PnP string for a Logitech serial mouse model.

Added some notes on cut&paste functions and button assignment.

- 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.

Oops, I forgot to set `cflag' in some cases when initializing the
mouse port.

Explicitly state that the -t option is required only when the
moused command is not able to detect the appropriate protocol for the
give mouse automatically.

Suggested by: sos

The `moused' daemon is made to support various serial mouse
protocols to recognized extra buttons and wheel/roller. It now has
PnP COM device support code, thus, some recent mouse products are
automatically detected and an appropriate protocol is selected.
The `-i' option will print the result of auto-detection.

- Added support for the following SERIAL mice:
ALPS GlidePoint, MS IntelliMouse, Kensington Thinking Mouse
(Genius NetMouse, NetMouse Pro, ASCII MieMouse, Logitech MouseMan+,
FirstMouse+ are compatible with MS IntelliMouse, when connected
to a serial port, thus requires no explicit support)
- Added PnP serial mouse identification capability as defined
by Microsoft and Hayes in "Plug and Play External COM Device
Specification, rev 1.00". This support will enable us to identify
the correct protocol to use, or choose a compatible protocol for the
given mouse.
- Utilize new ioctls defined in `mouse.h' to get hardware and protocol
information on PS/2 and bus mouse devices. Try to guess the correct
protocol and port combination based on the obtained info.
- Use MOUSE_SETLEVEL ioctl.
- Use constants defined in `mouse.h' rather than using own definitions.
- A New command line option. The -i option prints the information
collected though the PnP code and psm/mse ioctls mentioned above,
and just quits. This is to test `moused's ability, or inability, to
detect the correct protocol for the given mouse automatically.
- A new command line option. The -m option maps a physical button
to a logical button.
- A new command line option. The -z option maps the Z axis movement to
another axis or a pair of buttons.
- Add other options: -3, -C -F -P.
- Added a handler for SIGHUP. This has been suggested by somebody in the
past (I don't remember who). He wanted this because he wants to attach
or detach a mouse while his laptop is suspended. Now `moused' will
reopens and reinitialize the specified port whenever a SIGHUP is
received. I don't know how useful this can be...

Remove unused variables. Lowercase err() strings.

Add a simple example section.

Add ref to sysmouse(4).

Add ref to vidcontrol(1).

compare return value from getopt against -1 rather than EOF, per the final
posix standard on the topic.

Allow the samplerate (in DPI) to be set on the command line, the rest of
the code appears to support it.

Revert $FreeBSD$ to $Id$

Modified moused to use select rather than read. This fixes using
the PS/2 mouse (psm device).
Submitted by: Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Add man page for moused(8). It is basically a rehash of the
usage output from moused, but it is a start for anyone
else who wants to expand on it.

Closed PR# 1552.

Argh! there's no need for moused to be setuid-root! Now that it
works from startup, and works with XFree86 via /dev/sysmouse, it should
be started at boot and left running.

Pointed out by: Sujal Patel <smpatel@umiacs.umd.edu>

gut and overhaul moused, it was simply not working for me on any mouse
I could find. This change does the following:
- s/usage()/break;/ in handling the -s switch.
- use err/warn instead of fprintf(stderr, ... strerror()); exit(1);
- implement Hitachi PUMA HitTablet support from the XFree86 code,
whatever the hell that is. :-)
- correctly implement baud rate setting, too much was cut from the
XFree86 code, the critical parts were a sweep over all likely
mouse powerup baud rates to switch it to the reqested rate.
- logitech support was busted (at least on mine, which is autosensing
and runs in either mmseries or logitech mode depending on the handshake
code at startup. Among other things, you talk to it at 1200, then
switch to the target baud later.

Some remaining problems.. samplerate setting is missing, but I've not
found where this is meant to be set yet. I presume this is resolution
setting of some kind.

Fix for the problem that moused hangs if it is started from /etc/rc
Introduces the /dev/consolectl device for controlling various
console related things (given syscons is used).

Change the way moused talk to syscons, now its only delivering mouseevents
via an ioctl (MOUSE_ACTION).
Fixed a couple of bugs (destructive cursor, uncut, jitter).
Now applications can use the mouse via the MOUSE_MODE ioctl, its
possible to have a signal sent on mouseevents, makeing an event loop
in the application take over mouseevents.

Moused is the daemon that provides the connection between the cut&paste
functionality in syscons and the real mouse hardware. If moused is
run one can switch on/off the mousepointer with vidcontrol -m on/off.
There is no manpage yet, but a fairly descriptive usage message....

Reviewed by:sos
Submitted by: Michael Smith
Obtained from:Some of the mouselogic comes from XFree86