It's still possible to use synaptics as alternative to ws. The
new type would break such a configuration for ubcmtp, iatp, and
hidmt. I think as long as it doesn't take too much efforts, we
should keep synaptics up to date and add the diff below to this
one. However, I don't insist on that, so
ok bru@ (either way)
On 07/27/2018 10:00 PM, joshua stein wrote:
> And here is the xenocara part.
>
> Index: xserver/config/wscons.c
> ===================================================================
> RCS file: /cvs/xenocara/xserver/config/wscons.c,v
> retrieving revision 1.21
> diff -u -p -u -p -r1.21 wscons.c
> --- xserver/config/wscons.c 8 Dec 2017 15:02:00 -0000 1.21
> +++ xserver/config/wscons.c 27 Jul 2018 19:54:17 -0000
> @@ -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;
>
>
Index: driver/xf86-input-synaptics/src/wsconscomm.c
===================================================================
RCS file: /cvs/xenocara/driver/xf86-input-synaptics/src/wsconscomm.c,v
retrieving revision 1.17
diff -u -p -r1.17 wsconscomm.c
--- driver/xf86-input-synaptics/src/wsconscomm.c 7 Mar 2017 19:07:56
-0000 1.17
+++ driver/xf86-input-synaptics/src/wsconscomm.c 29 Jul 2018 12:25:48
-0000
@@ -71,7 +71,8 @@ WSConsIsTouchpad(InputInfoPtr pInfo, con
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,8 @@ WSConsReadDevDimensions(InputInfoPtr pIn
priv->has_double = FALSE;
priv->has_triple = FALSE;
break;
+ case WSMOUSE_TYPE_TOUCHPAD:
+ /* Use Elantech settings for the generic type. */
case WSMOUSE_TYPE_ELANTECH:
priv->model = MODEL_ELANTECH;
priv->has_width = TRUE;
