From: jcs <jcs@openbsd.org>
Date: Mon, 30 Jul 2018 15:57:04 +0000 (+0000)
Subject: recognize WSMOUSE_TYPE_TOUCHPAD devices
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c2ca70dab855f9fb54466f17538620dc9a9696fa;p=openbsd

recognize WSMOUSE_TYPE_TOUCHPAD devices

ok bru
---

diff --git a/sbin/wsconsctl/mousecfg.c b/sbin/wsconsctl/mousecfg.c
index a9e9d2434a8..3602ce40b01 100644
--- a/sbin/wsconsctl/mousecfg.c
+++ b/sbin/wsconsctl/mousecfg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mousecfg.c,v 1.4 2018/05/07 22:15:36 bru Exp $ */
+/* $OpenBSD: mousecfg.c,v 1.5 2018/07/30 15:57:04 jcs Exp $ */
 
 /*
  * Copyright (c) 2017 Ulf Brosziewski
@@ -61,6 +61,7 @@ static const int touchpad_types[] = {
 	WSMOUSE_TYPE_ALPS,		/* ALPS touchpad */
 	WSMOUSE_TYPE_ELANTECH,		/* Elantech touchpad */
 	WSMOUSE_TYPE_SYNAP_SBTN,	/* Synaptics soft buttons */
+	WSMOUSE_TYPE_TOUCHPAD,		/* Generic touchpad */
 };
 
 struct wsmouse_parameters cfg_tapping = {
diff --git a/sbin/wsconsctl/util.c b/sbin/wsconsctl/util.c
index 0aa4a4e04de..b0ac4b3e23f 100644
--- a/sbin/wsconsctl/util.c
+++ b/sbin/wsconsctl/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.66 2018/01/02 17:39:34 anton Exp $ */
+/*	$OpenBSD: util.c,v 1.67 2018/07/30 15:57:04 jcs Exp $ */
 /*	$NetBSD: util.c,v 1.8 2000/03/14 08:11:53 sato Exp $ */
 
 /*-
@@ -95,6 +95,7 @@ static const struct nameint mstype_tab[] = {
 	{ WSMOUSE_TYPE_SGI,	"sgi" },
 	{ WSMOUSE_TYPE_ELANTECH, "elantech" },
 	{ WSMOUSE_TYPE_SYNAP_SBTN, "synaptics" },
+	{ WSMOUSE_TYPE_TOUCHPAD, "touchpad" },
 };
 
 static const struct nameint dpytype_tab[] = {