qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

setup WSMOUSE_TYPE_TOUCHPAD devices to use ws driver by default, but

Browse Source 
allow them to work with xf86-input-synaptics

with and ok bru@
This commit is contained in:
jcs 2018-07-30 16:00:39 +00:00
parent 02339cbc79
commit 65b51547fb
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
driver/xf86-input-synaptics/src/wsconscomm.c
View File

@ -71,7 +71,8 @@ WSConsIsTouchpad(InputInfoPtr pInfo, const char *device)
if (wsmouse_type == WSMOUSE_TYPE_SYNAPTICS || if (wsmouse_type == WSMOUSE_TYPE_SYNAPTICS ||
wsmouse_type == WSMOUSE_TYPE_SYNAP_SBTN || wsmouse_type == WSMOUSE_TYPE_SYNAP_SBTN ||
wsmouse_type == WSMOUSE_TYPE_ALPS || wsmouse_type == WSMOUSE_TYPE_ALPS ||
wsmouse_type == WSMOUSE_TYPE_ELANTECH) wsmouse_type == WSMOUSE_TYPE_ELANTECH ||
wsmouse_type == WSMOUSE_TYPE_TOUCHPAD)
rc = TRUE; rc = TRUE;
out: out:
@ -357,6 +358,9 @@ WSConsReadDevDimensions(InputInfoPtr pInfo)
priv->has_double = FALSE; priv->has_double = FALSE;
priv->has_triple = FALSE; priv->has_triple = FALSE;
break; break;
case WSMOUSE_TYPE_TOUCHPAD:
/* Use Elantech settings for the generic type. */
/* FALLTHROUGH */
case WSMOUSE_TYPE_ELANTECH: case WSMOUSE_TYPE_ELANTECH:
priv->model = MODEL_ELANTECH; priv->model = MODEL_ELANTECH;
priv->has_width = TRUE; priv->has_width = TRUE;

1
xserver/config/wscons.c
View File

@ -239,6 +239,7 @@ wscons_add_pointers(void)
case WSMOUSE_TYPE_ALPS: case WSMOUSE_TYPE_ALPS:
case WSMOUSE_TYPE_ELANTECH: case WSMOUSE_TYPE_ELANTECH:
case WSMOUSE_TYPE_SYNAP_SBTN: case WSMOUSE_TYPE_SYNAP_SBTN:
case WSMOUSE_TYPE_TOUCHPAD:
wscons_add_pointer(devnam, "ws", wscons_add_pointer(devnam, "ws",
ATTR_TOUCHPAD); ATTR_TOUCHPAD);
break; break;