Makefile.am|8
README |6
conf/11-x11-synaptics.fdi | 10
conf/50-synaptics.conf | 21
configure.ac | 48 -
include/Makefile.am|1
include/synaptics-properties.h | 15
man/Makefile.am|3
man/synaptics.man | 128 ++-
man/syndaemon.man | 41
src/Makefile.am| 12
src/alpscomm.c | 19
src/alpscomm.h | 33
src/eventcomm.c| 766 +++---
src/eventcomm.h| 11
src/properties.c | 143 +++
src/ps2comm.c | 101 +-
src/ps2comm.h | 15
src/psmcomm.c | 39
src/synaptics.c| 1703 +
src/synapticsstr.h | 96 +-
src/synproto.c | 158 +++
src/synproto.h | 59 -
test/.gitignore|6
test/Makefile.am | 18
test/eventcomm-test.c | 331 +++
test/fake-symbols.c| 497 +++
test/fake-symbols.h| 186
test/test-pad.c| 121 --
test/testprotocol.c| 82 -
tools/Makefile.am |3
tools/synclient.c | 25
tools/syndaemon.c | 49 -
33 files changed, 3660 insertions(+), 1094 deletions(-)
New commits:
commit dd650a064b98b1c325a38e1370cc11059c257b07
Author: Peter Hutterer
Date: Wed Mar 14 08:56:45 2012 +1000
synaptics 1.5.99.901
Signed-off-by: Peter Hutterer
diff --git a/configure.ac b/configure.ac
index 29f6e68..af1bc2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-synaptics],
-[1.5.99],
+[1.5.99.901],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-synaptics])
AC_CONFIG_SRCDIR([Makefile.am])
commit fee18d8567efd2e5abf6b29eb1ae9ee0e3858013
Author: Peter Hutterer
Date: Tue Mar 13 16:08:12 2012 +1000
Soft buttons are only available on clickpad devices, disable them otherwise.
If the clickpad support is runtime enabled/disabled, the property
appears/disappears accordingly.
Signed-off-by: Peter Hutterer
Reviewed-by: Chase Douglas
diff --git a/man/synaptics.man b/man/synaptics.man
index aaec35f..23862e3 100644
--- a/man/synaptics.man
+++ b/man/synaptics.man
@@ -520,6 +520,7 @@ the total height of the touchpad. Property: "Synaptics Area"
.
.TP
.BI "Option \*qSoftButtonAreas\*q \*q" "RBL RBR RBT RBB MBL MBR MBT MBB" \*q
+This option is only available on ClickPad devices.
Enable soft button click area support on ClickPad devices. The first four
parameters define the area of the right button, and the second four parameters
define the area of the middle button. The areas are defined by the left, right,
@@ -942,6 +943,7 @@ default.
.TP 7
.BI "Synaptics Soft Button Areas"
+This property is only available on ClickPad devices.
The Right and middle soft button areas are used to support right and middle
click actions on a ClickPad device. Providing 0 for all values of a given
button
disables the button area.
diff --git a/src/properties.c b/src/properties.c
index 5cd3088..783b516 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -151,6 +151,24 @@ InitFloatAtom(DeviceIntPtr dev, char *name, int nvalues,
float *values)
return atom;
}
+static void
+InitSoftButtonProperty(InputInfoPtr pInfo)
+{
+SynapticsPrivate *priv = (SynapticsPrivate *) pInfo->private;
+SynapticsParameters *para = &priv->synpara;
+int values[8];
+
+values[0] = para->softbutton_areas[0][0];
+values[1] = para->softbutton_areas[0][1];
+values[2] = para->softbutton_areas[0][2];
+values[3] = para->softbutton_areas[0][3];
+values[4] = para->softbutton_areas[1][0];
+values[5] = para->softbutton_areas[1][1];
+values[6] = para->softbutton_areas[1][2];
+values[7] = para->softbutton_areas[1][3];
+prop_softbutton_areas = InitAtom(pInfo->dev,
SYNAPTICS_PROP_SOFTBUTTON_AREAS, 32, 8, values);
+}
+
void
InitDeviceProperties(InputInfoPtr pInfo)
{
@@ -301,15 +319,8 @@ InitDeviceProperties(InputInfoPtr pInfo)
values[3] = para->area_bottom_edge;
prop_area = InitAtom(pInfo->dev, SYNAPTICS_PROP_AREA, 32, 4, values);
-values[0] = para->softbutton_areas[0][0];
-values[1] = para->softbutton_areas[0][1];
-values[2] = para->softbutton_areas[0][2];
-values[3] = para->softbutton_areas[0][3];
-values[4] = para->softbutton_areas[1][0];
-values[5] = para->softbutton_areas[1][1];
-values[6] = para->softbutton_areas[1][2];
-values[7] = para->softbutton_areas[1][3];
-prop_softbutton_areas = InitAtom(pInfo->dev,
SYNAPTICS_PROP_SOFTBUTTON_AREAS, 32, 8, values);
+if (para->clickpad)
+InitSoftButton
