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

Recognise the synaptics with sw buttons mouse type and set the

Browse Source 
clickpad and has_secondary_buttons properties.

Initial diff from myself with additional changes from matthieu@
This commit is contained in:
jsg 2015-01-15 01:30:40 +00:00
parent f6c766466e
commit 56b31a08cf
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
driver/xf86-input-synaptics/Makefile.am
View File

@ -24,7 +24,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
--with-sdkdir='$${includedir}/xorg' \ --with-sdkdir='$${includedir}/xorg' \
--with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d' --with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
SUBDIRS = include src man tools SUBDIRS = include src man tools conf
MAINTAINERCLEANFILES = ChangeLog INSTALL MAINTAINERCLEANFILES = ChangeLog INSTALL
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig

2
driver/xf86-input-synaptics/Makefile.in
View File

@ -347,7 +347,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
--with-sdkdir='$${includedir}/xorg' \ --with-sdkdir='$${includedir}/xorg' \
--with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d' --with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
SUBDIRS = include src man tools SUBDIRS = include src man tools conf
MAINTAINERCLEANFILES = ChangeLog INSTALL MAINTAINERCLEANFILES = ChangeLog INSTALL
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xorg-synaptics.pc pkgconfig_DATA = xorg-synaptics.pc

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

@ -60,6 +60,7 @@ 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_ALPS || wsmouse_type == WSMOUSE_TYPE_ALPS ||
wsmouse_type == WSMOUSE_TYPE_ELANTECH) wsmouse_type == WSMOUSE_TYPE_ELANTECH)
rc = TRUE; rc = TRUE;
@ -250,6 +251,7 @@ static void
WSConsReadDevDimensions(InputInfoPtr pInfo) WSConsReadDevDimensions(InputInfoPtr pInfo)
{ {
SynapticsPrivate *priv = (SynapticsPrivate *)pInfo->private; SynapticsPrivate *priv = (SynapticsPrivate *)pInfo->private;
SynapticsParameters *para = &priv->synpara;
struct wsmouse_calibcoords wsmc; struct wsmouse_calibcoords wsmc;
int wsmouse_type; int wsmouse_type;
@ -287,6 +289,10 @@ WSConsReadDevDimensions(InputInfoPtr pInfo)
switch (wsmouse_type) { switch (wsmouse_type) {
default: default:
case WSMOUSE_TYPE_SYNAP_SBTN:
para->clickpad = TRUE;
para->has_secondary_buttons = TRUE;
/* FALLTHROUGH */
case WSMOUSE_TYPE_SYNAPTICS: case WSMOUSE_TYPE_SYNAPTICS:
priv->model = MODEL_SYNAPTICS; priv->model = MODEL_SYNAPTICS;
priv->has_width = TRUE; priv->has_width = TRUE;

1
xserver/config/wscons.c
View File

@ -237,6 +237,7 @@ wscons_add_pointers(void)
case WSMOUSE_TYPE_SYNAPTICS: case WSMOUSE_TYPE_SYNAPTICS:
case WSMOUSE_TYPE_ALPS: case WSMOUSE_TYPE_ALPS:
case WSMOUSE_TYPE_ELANTECH: case WSMOUSE_TYPE_ELANTECH:
case WSMOUSE_TYPE_SYNAP_SBTN:
wscons_add_pointer(devname, "synaptics", wscons_add_pointer(devname, "synaptics",
ATTR_TOUCHPAD); ATTR_TOUCHPAD);
break; break;