diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-11-25 19:36:58 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-11-25 19:36:58 +0000 |
| commit | 2dff6638d48155a8d2c5e1c38b6d703aa48d581d (patch) | |
| tree | 9c1a95af1e081813e3a18699b2039e0890c5c647 | |
| parent | 1f351155cd299ceb87e3f107abd667cce490271e (diff) | |
Only default to raw mode for touchpanels. The raw mode doesn't make
sense for mices.
| -rw-r--r-- | driver/xf86-input-ws/src/ws.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/driver/xf86-input-ws/src/ws.c b/driver/xf86-input-ws/src/ws.c index 11a080472..b4c000375 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.22 2009/11/25 19:31:35 matthieu Exp $ */ +/* $OpenBSD: ws.c,v 1.23 2009/11/25 19:36:57 matthieu Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -285,7 +285,6 @@ wsPreInit(InputDriverPtr drv, IDevPtr dev, int flags) " or \"UD\"\n"); } } - priv->raw = xf86SetBoolOption(pInfo->options, "Raw", 1); if (wsOpen(pInfo) != Success) { goto fail; } @@ -293,10 +292,12 @@ wsPreInit(InputDriverPtr drv, IDevPtr dev, int flags) wsClose(pInfo); goto fail; } - if (priv->type == WSMOUSE_TYPE_TPANEL) + if (priv->type == WSMOUSE_TYPE_TPANEL) { pInfo->type_name = XI_TOUCHSCREEN; - else { + priv->raw = xf86SetBoolOption(pInfo->options, "Raw", 1); + } else { pInfo->type_name = XI_MOUSE; + priv->raw = xf86SetBoolOption(pInfo->options, "Raw", 0); if (priv->raw) { xf86Msg(X_WARNING, "Device is not a touch panel," "ignoring 'Option \"Raw\"'\n"); |