Recognise the synaptics with sw buttons mouse type and set the
clickpad and has_secondary_buttons properties. Initial diff from myself with additional changes from matthieu@
This commit is contained in:
parent
f6c766466e
commit
56b31a08cf
@ -24,7 +24,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
|
||||
--with-sdkdir='$${includedir}/xorg' \
|
||||
--with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
|
||||
|
||||
SUBDIRS = include src man tools
|
||||
SUBDIRS = include src man tools conf
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
|
@ -347,7 +347,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
|
||||
--with-sdkdir='$${includedir}/xorg' \
|
||||
--with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
|
||||
|
||||
SUBDIRS = include src man tools
|
||||
SUBDIRS = include src man tools conf
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = xorg-synaptics.pc
|
||||
|
@ -60,6 +60,7 @@ 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)
|
||||
rc = TRUE;
|
||||
@ -250,6 +251,7 @@ static void
|
||||
WSConsReadDevDimensions(InputInfoPtr pInfo)
|
||||
{
|
||||
SynapticsPrivate *priv = (SynapticsPrivate *)pInfo->private;
|
||||
SynapticsParameters *para = &priv->synpara;
|
||||
struct wsmouse_calibcoords wsmc;
|
||||
int wsmouse_type;
|
||||
|
||||
@ -287,6 +289,10 @@ WSConsReadDevDimensions(InputInfoPtr pInfo)
|
||||
|
||||
switch (wsmouse_type) {
|
||||
default:
|
||||
case WSMOUSE_TYPE_SYNAP_SBTN:
|
||||
para->clickpad = TRUE;
|
||||
para->has_secondary_buttons = TRUE;
|
||||
/* FALLTHROUGH */
|
||||
case WSMOUSE_TYPE_SYNAPTICS:
|
||||
priv->model = MODEL_SYNAPTICS;
|
||||
priv->has_width = TRUE;
|
||||
|
@ -237,6 +237,7 @@ wscons_add_pointers(void)
|
||||
case WSMOUSE_TYPE_SYNAPTICS:
|
||||
case WSMOUSE_TYPE_ALPS:
|
||||
case WSMOUSE_TYPE_ELANTECH:
|
||||
case WSMOUSE_TYPE_SYNAP_SBTN:
|
||||
wscons_add_pointer(devname, "synaptics",
|
||||
ATTR_TOUCHPAD);
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user