diff options
| author | Alexandr Shadchin <shadchin@cvs.openbsd.org> | 2011-11-08 12:57:45 +0000 |
|---|---|---|
| committer | Alexandr Shadchin <shadchin@cvs.openbsd.org> | 2011-11-08 12:57:45 +0000 |
| commit | 52ade6cfc4dbf4160eeec998a043b25de284925b (patch) | |
| tree | 0fd31c2402ec7ed9b803810d82770d3c71789abf /driver | |
| parent | ce76299dfeeab497a7c842313475b1840793eaec (diff) | |
Mapping scroll events:
on 4 and 5 buttons (vertical scrolling)
on 6 and 7 buttons (horizontal scrolling)
This is do default xf86-input-mouse, xf86-input-evdev.
Also sync manual page.
ok matthieu@
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/xf86-input-ws/man/ws.man | 6 | ||||
| -rw-r--r-- | driver/xf86-input-ws/src/ws.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/driver/xf86-input-ws/man/ws.man b/driver/xf86-input-ws/man/ws.man index 6f0a0d97e..5a690c049 100644 --- a/driver/xf86-input-ws/man/ws.man +++ b/driver/xf86-input-ws/man/ws.man @@ -1,4 +1,4 @@ -.\" $OpenBSD: ws.man,v 1.9 2011/11/07 18:38:12 shadchin Exp $ +.\" $OpenBSD: ws.man,v 1.10 2011/11/08 12:57:44 shadchin Exp $ .\" .\" Copyright (c) 2005,2009,2011 Matthieu Herrb .\" @@ -114,7 +114,7 @@ number is mapped to the negative Z axis motion and button .I N2 is mapped to the positive Z axis motion. -Default: no mapping. +Default:\ "4\ 5". .TP 4 .BI "Option \*qWAxisMapping\*q \*q" "N1 N2" \*q Set the mapping for the W axis (horizontal wheel) motion to buttons. Button @@ -123,7 +123,7 @@ number is mapped to the negative W axis motion and button .I N2 is mapped to the positive W axis motion. -Default: no mapping. +Default:\ "6\ 7". .SH "SUPPORTED PROPERTIES" The following properties are provided by the .B ws diff --git a/driver/xf86-input-ws/src/ws.c b/driver/xf86-input-ws/src/ws.c index 4df44ee1e..368152549 100644 --- a/driver/xf86-input-ws/src/ws.c +++ b/driver/xf86-input-ws/src/ws.c @@ -13,7 +13,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $OpenBSD: ws.c,v 1.41 2011/11/08 12:55:26 shadchin Exp $ */ +/* $OpenBSD: ws.c,v 1.42 2011/11/08 12:57:44 shadchin Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -152,7 +152,7 @@ wsPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) buttons_from = X_DEFAULT; } priv->negativeZ = priv->positiveZ = WS_NOZMAP; - s = xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5 6 7"); + s = xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5"); if (s) { int b1, b2; @@ -175,7 +175,7 @@ wsPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) free(s); } priv->negativeW = priv->positiveW = WS_NOZMAP; - s = xf86SetStrOption(pInfo->options, "WAxisMapping", NULL); + s = xf86SetStrOption(pInfo->options, "WAxisMapping", "6 7"); if (s) { int b1, b2; |