From 65b51547fb25818ee99b0e786a4243b5fa663904 Mon Sep 17 00:00:00 2001
From: jcs <jcs@openbsd.org>
Date: Mon, 30 Jul 2018 16:00:39 +0000
Subject: [PATCH] setup WSMOUSE_TYPE_TOUCHPAD devices to use ws driver by
 default, but allow them to work with xf86-input-synaptics

with and ok bru@
---
 driver/xf86-input-synaptics/src/wsconscomm.c | 6 +++++-
 xserver/config/wscons.c                      | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/driver/xf86-input-synaptics/src/wsconscomm.c b/driver/xf86-input-synaptics/src/wsconscomm.c
index cc60bb0a3..3edb7f055 100644
--- a/driver/xf86-input-synaptics/src/wsconscomm.c
+++ b/driver/xf86-input-synaptics/src/wsconscomm.c
@@ -71,7 +71,8 @@ WSConsIsTouchpad(InputInfoPtr pInfo, const char *device)
     if (wsmouse_type == WSMOUSE_TYPE_SYNAPTICS ||
         wsmouse_type == WSMOUSE_TYPE_SYNAP_SBTN ||
         wsmouse_type == WSMOUSE_TYPE_ALPS ||
-        wsmouse_type == WSMOUSE_TYPE_ELANTECH)
+        wsmouse_type == WSMOUSE_TYPE_ELANTECH ||
+        wsmouse_type == WSMOUSE_TYPE_TOUCHPAD)
         rc = TRUE;
 
 out:
@@ -357,6 +358,9 @@ WSConsReadDevDimensions(InputInfoPtr pInfo)
         priv->has_double = FALSE;
         priv->has_triple = FALSE;
         break;
+    case WSMOUSE_TYPE_TOUCHPAD:
+    	/* Use Elantech settings for the generic type. */
+	/* FALLTHROUGH */
     case WSMOUSE_TYPE_ELANTECH:
         priv->model = MODEL_ELANTECH;
         priv->has_width = TRUE;
diff --git a/xserver/config/wscons.c b/xserver/config/wscons.c
index ff5880a17..a0a18f37a 100644
--- a/xserver/config/wscons.c
+++ b/xserver/config/wscons.c
@@ -239,6 +239,7 @@ wscons_add_pointers(void)
           case WSMOUSE_TYPE_ALPS:
           case WSMOUSE_TYPE_ELANTECH:
           case WSMOUSE_TYPE_SYNAP_SBTN:
+          case WSMOUSE_TYPE_TOUCHPAD:
             wscons_add_pointer(devnam, "ws",
                                ATTR_TOUCHPAD);
             break;