xserver-xorg-input-synaptics: Changes to 'ubuntu'
.gitignore | 76
COPYING | 3
ChangeLog | 1208 +++++++++
Makefile.am | 11
README | 27
TODO | 7
conf/Makefile.am | 8
configure.ac | 188 -
debian/changelog | 59
debian/control | 7
debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch | 18
debian/patches/114_jumpy_cursor_first_part.patch | 113
debian/xserver-xorg-input-synaptics.docs | 1
debian/xsfbs/xsfbs.mk | 4
include/Makefile.am | 1
include/synaptics-properties.h | 2
include/synaptics.h | 14
man/Makefile.am | 64
man/synaptics.man | 178 -
man/synclient.man | 18
src/Makefile.am | 5
src/alpscomm.c | 36
src/eventcomm.c | 162 -
src/properties.c | 135 -
src/ps2comm.c | 206 -
src/psmcomm.c | 39
src/psmcomm.h | 29
src/synaptics.c | 1251 +++++-----
src/synapticsstr.h | 20
src/synproto.h | 18
tools/.gitignore | 3
tools/Makefile.am | 18
tools/synclient.c | 30
tools/syndaemon.c | 89
34 files changed, 2687 insertions(+), 1361 deletions(-)
New commits:
commit 4a6056074060d01329fabab33a39b7b84ffe4c4b
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Thu Jan 27 14:19:52 2011 +1100
Release to Natty
diff --git a/debian/changelog b/debian/changelog
index c813cfa..b9a7c30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu1) natty; urgency=low
[ Cyril Brulebois ]
* Switch to Architecture: any, adding armhf support (Closes: #604672).
commit b52ed9a96d6e53cea9b8d7c9b4f82cc86de4a388
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Thu Jan 27 13:33:42 2011 +1100
Update upstream version to match configure.ac
diff --git a/debian/changelog b/debian/changelog
index d4729e1..c813cfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-synaptics (1.3.0+git20110116.0e27ce3a-1ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Switch to Architecture: any, adding armhf support (Closes: #604672).
commit 1e431755c646231a9d4051b7f8a4744d444e582c
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Thu Jan 27 13:05:48 2011 +1100
Refresh patches, update changelog
diff --git a/debian/changelog b/debian/changelog
index eaaf3b3..d4729e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-synaptics (1.3.0-1ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-input-synaptics (1.3.0+git20110116.0e27ce3a-1ubuntu1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Switch to Architecture: any, adding armhf support (Closes: #604672).
@@ -20,6 +20,12 @@ xserver-xorg-input-synaptics (1.3.0-1ubuntu1) UNRELEASED; urgency=low
- Specify ‘ubuntu’ branch in gbp.conf
- 115_evdev_only.patch: Only bind to /dev/input/event* evdev devices
(LP 624985)
+ * Update to git snapshot to fix build against Xserver 1.10 input API
+ * debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch:
+ - Refresh for new upstream.
+ * debian/patches/114_jumpy_cursor_first_part.patch:
+ - Refresh for new upstream. Drop the multi-touch chunk of the quirk,
+ as that is handled by upstream commit a6ca4d25.
-- Christopher James Halse Rogers <raof@ubuntu.com> Tue, 25 Jan 2011 20:01:58 +1100
diff --git a/debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch b/debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch
index 750cc25..612a8b7 100644
--- a/debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch
+++ b/debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch
@@ -4,15 +4,15 @@ instance of Xorg.
Index: xserver-xorg-input-synaptics/src/synaptics.c
===================================================================
---- xserver-xorg-input-synaptics.orig/src/synaptics.c 2009-11-19 21:14:09.183725703 +0900
-+++ xserver-xorg-input-synaptics/src/synaptics.c 2009-11-19 22:00:51.296245013 +0900
-@@ -747,6 +747,9 @@
-
- DBG(3, ErrorF("Synaptics DeviceOn called\n"));
+--- xserver-xorg-input-synaptics.orig/src/synaptics.c 2011-01-25 21:55:50.000000000 +1100
++++ xserver-xorg-input-synaptics/src/synaptics.c 2011-01-25 22:06:10.496826002 +1100
+@@ -703,6 +703,9 @@
+ return BadAlloc;
+ }
+ if (xf86Screens[0]->vtSema == FALSE)
-+ return !Success;
++ return !Success;
+
- SetDeviceAndProtocol(local);
- local->fd = xf86OpenSerial(local->options);
- if (local->fd == -1) {
+ /* may change pInfo->options */
+ SetDeviceAndProtocol(pInfo);
+
diff --git a/debian/patches/114_jumpy_cursor_first_part.patch b/debian/patches/114_jumpy_cursor_first_part.patch
index d7fb898..fbae848 100644
--- a/debian/patches/114_jumpy_cursor_first_part.patch
+++ b/debian/patches/114_jumpy_cursor_first_part.patch
@@ -1,6 +1,7 @@
-diff -Nurp xserver-xorg-input-synaptics.orig/include/synaptics-properties.h xserver-xorg-input-synaptics/include/synaptics-properties.h
---- xserver-xorg-input-synaptics.orig/include/synaptics-properties.h 2009-12-08 11:16:01.123175000 +0100
-+++ xserver-xorg-input-synaptics/include/synaptics-properties.h 2009-12-08 11:20:59.551925185 +0100
+Index: xserver-xorg-input-synaptics/include/synaptics-properties.h
+===================================================================
+--- xserver-xorg-input-synaptics.orig/include/synaptics-properties.h 2011-01-25 22:30:40.936826002 +1100
++++ xserver-xorg-input-synaptics/include/synaptics-properties.h 2011-01-25 22:30:48.686826002 +1100
@@ -155,4 +155,7 @@
/* 32 bit, 4 values, left, right, top, bottom */
#define SYNAPTICS_PROP_AREA "Synaptics Area"
@@ -9,12 +10,13 @@ diff -Nurp xserver-xorg-input-synaptics.orig/include/synaptics-properties.h xser
+#define SYNAPTICS_PROP_JUMPYCURSOR_THRESHOLD "Synaptics Jumpy Cursor Threshold"
+
#endif /* _SYNAPTICS_PROPERTIES_H_ */
-diff -Nurp xserver-xorg-input-synaptics.orig/man/synaptics.man xserver-xorg-input-synaptics/man/synaptics.man
---- xserver-xorg-input-synaptics.orig/man/synaptics.man 2009-12-08 11:16:01.127175000 +0100
-+++ xserver-xorg-input-synaptics/man/synaptics.man 2009-12-08 11:20:59.551925185 +0100
-@@ -509,6 +509,14 @@ Ignore movements, scrolling and tapping
- The option is disabled by default and can be enabled by setting the
- AreaBottomEdge option to any integer value other than zero. Property: "Synaptics Area"
+Index: xserver-xorg-input-synaptics/man/synaptics.man
+===================================================================
+--- xserver-xorg-input-synaptics.orig/man/synaptics.man 2011-01-25 22:30:48.636826002 +1100
++++ xserver-xorg-input-synaptics/man/synaptics.man 2011-01-25 22:30:48.696826002 +1100
+@@ -553,6 +553,14 @@
+ A "touch" event happens when the Z value goes above FingerHigh, and an
+ "untouch" event happens when the Z value goes below FingerLow.
.
+.TP
+.BI "Option \*qJumpyCursorThreshold\*q \*q" integer \*q
@@ -25,9 +27,9 @@ diff -Nurp xserver-xorg-input-synaptics.orig/man/synaptics.man xserver-xorg-inpu
+Jumpy Cursor Threshold"
+.
.LP
- A tap event happens when the finger is touched and released in a time
- interval shorter than MaxTapTime, and the touch and release
-@@ -870,6 +878,14 @@ right button, two-finger detection, thre
+ The MaxDoubleTapTime parameter has the same function as the MaxTapTime
+ parameter, but for the second, third, etc tap in a tap sequence.
+@@ -900,6 +908,14 @@
.BI "Synaptics Pad Resolution"
32 bit unsigned, 2 values (read-only), vertical, horizontal in units/millimeter.
@@ -40,12 +42,13 @@ diff -Nurp xserver-xorg-input-synaptics.orig/man/synaptics.man xserver-xorg-inpu
+32 bit, 1 value. 0 disables the property.
+
.SH "NOTES"
- There is an example hal policy file in
- .I ${sourcecode}/fdi/11-x11-synaptics.fdi
-diff -Nurp xserver-xorg-input-synaptics.orig/src/properties.c xserver-xorg-input-synaptics/src/properties.c
---- xserver-xorg-input-synaptics.orig/src/properties.c 2009-12-08 11:16:01.127175000 +0100
-+++ xserver-xorg-input-synaptics/src/properties.c 2009-12-08 11:32:28.907425148 +0100
-@@ -84,6 +84,7 @@ Atom prop_gestures = 0;
+ If either of
+ .BI "Protocol \*q" auto-dev \*q
+Index: xserver-xorg-input-synaptics/src/properties.c
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/properties.c 2011-01-25 22:30:40.926826002 +1100
++++ xserver-xorg-input-synaptics/src/properties.c 2011-01-25 22:31:42.536826002 +1100
+@@ -82,6 +82,7 @@
Atom prop_capabilities = 0;
Atom prop_resolution = 0;
Atom prop_area = 0;
@@ -53,16 +56,16 @@ diff -Nurp xserver-xorg-input-synaptics.orig/src/properties.c xserver-xorg-input
static Atom
InitAtom(DeviceIntPtr dev, char *name, int format, int nvalues, int *values)
-@@ -274,6 +275,8 @@ InitDeviceProperties(LocalDevicePtr loca
+@@ -278,6 +279,8 @@
values[2] = para->area_top_edge;
values[3] = para->area_bottom_edge;
- prop_area = InitAtom(local->dev, SYNAPTICS_PROP_AREA, 32, 4, values);
+ prop_area = InitAtom(pInfo->dev, SYNAPTICS_PROP_AREA, 32, 4, values);
+
-+ prop_jumpycursor_threshold = InitAtom(local->dev, SYNAPTICS_PROP_JUMPYCURSOR_THRESHOLD, 32, 1, ¶->jumpycursor_threshold);
++ prop_jumpycursor_threshold = InitAtom(pInfo->dev, SYNAPTICS_PROP_JUMPYCURSOR_THRESHOLD, 32, 1, ¶->jumpycursor_threshold);
}
int
-@@ -642,6 +645,12 @@ SetProperty(DeviceIntPtr dev, Atom prope
+@@ -649,6 +652,12 @@
para->area_right_edge = area[1];
para->area_top_edge = area[2];
para->area_bottom_edge = area[3];
@@ -75,20 +78,21 @@ diff -Nurp xserver-xorg-input-synaptics.orig/src/properties.c xserver-xorg-input
}
return Success;
-diff -Nurp xserver-xorg-input-synaptics.orig/src/synaptics.c xserver-xorg-input-synaptics/src/synaptics.c
---- xserver-xorg-input-synaptics.orig/src/synaptics.c 2009-12-08 11:20:15.851926000 +0100
-+++ xserver-xorg-input-synaptics/src/synaptics.c 2009-12-08 11:38:38.156675531 +0100
-@@ -132,6 +132,9 @@ static void ReadDevDimensions(LocalDevic
+Index: xserver-xorg-input-synaptics/src/synaptics.c
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/synaptics.c 2011-01-25 22:30:48.676826002 +1100
++++ xserver-xorg-input-synaptics/src/synaptics.c 2011-01-25 22:30:48.696826002 +1100
+@@ -131,6 +131,9 @@
static void ScaleCoordinates(SynapticsPrivate *priv, struct SynapticsHwState *hw);
static void CalculateScalingCoeffs(SynapticsPrivate *priv);
+int old_time_millis = 0;
+Bool was_time_skipped = FALSE;
+
- #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
- void InitDeviceProperties(LocalDevicePtr local);
+ void InitDeviceProperties(InputInfoPtr pInfo);
int SetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
-@@ -534,6 +537,7 @@ static void set_default_parameters(Local
+ BOOL checkonly);
+@@ -584,6 +587,7 @@
pars->tap_and_drag_gesture = xf86SetBoolOption(opts, "TapAndDragGesture", TRUE);
pars->resolution_horiz = xf86SetIntOption(opts, "HorizResolution", horizResolution);
pars->resolution_vert = xf86SetIntOption(opts, "VertResolution", vertResolution);
@@ -96,7 +100,7 @@ diff -Nurp xserver-xorg-input-synaptics.orig/src/synaptics.c xserver-xorg-input-
/* Warn about (and fix) incorrectly configured TopEdge/BottomEdge parameters */
if (pars->top_edge > pars->bottom_edge) {
-@@ -1573,11 +1577,12 @@ HandleTapProcessing(SynapticsPrivate *pr
+@@ -1696,11 +1700,12 @@
#define HIST(a) (priv->move_hist[((priv->hist_index - (a) + SYNAPTICS_MOVE_HISTORY) % SYNAPTICS_MOVE_HISTORY)])
static void
@@ -110,27 +114,17 @@ diff -Nurp xserver-xorg-input-synaptics.orig/src/synaptics.c xserver-xorg-input-
priv->move_hist[idx].millis = millis;
priv->hist_index = idx;
}
-@@ -1726,11 +1731,70 @@ ComputeDeltas(SynapticsPrivate *priv, st
- dy += hw->guest_dy;
+@@ -1818,6 +1823,55 @@
+ } else { /* reset packet counter */
+ priv->count_packet_finger = 0;
}
-
++
+ /* Handle quirks here */
+ if (dx || dy) {
-+ /* Work around issues caused by two fingers on multi-touch
-+ * models
-+ */
-+ if (priv->has_double) {
-+ if ((hw->numFingers < 2) &&
-+ ((HIST(0).num_fingers >= 2) || (HIST(1).num_fingers >= 2) ||
-+ (HIST(2).num_fingers >= 2) || (HIST(3).num_fingers >= 2) )) {
-+ dx = dy = 0;
-+ }
-+ old_time_millis = hw->millis;
-+ }
+ /* Work around issues caused by two fingers on single-touch
+ * models
+ */
-+ else {
++ if (!priv->has_double) {
+ /* If para->jumpycursor_threshold <= 0, quirks are not
+ * available
+ */
@@ -173,19 +167,23 @@ diff -Nurp xserver-xorg-input-synaptics.orig/src/synaptics.c xserver-xorg-input-
+ }
+post_quirks:
+
+ priv->prevFingers = hw->numFingers;
+
*dxP = dx;
- *dyP = dy;
+@@ -2496,7 +2550,7 @@
/* generate a history of the absolute positions */
-- store_history(priv, hw->x, hw->y, hw->millis);
-+ store_history(priv, hw->x, hw->y, hw->numFingers, hw->millis);
+ if (inside_active_area)
+- store_history(priv, hw->x, hw->y, hw->millis);
++ store_history(priv, hw->x, hw->y, hw->numFingers, hw->millis);
return delay;
}
-diff -Nurp xserver-xorg-input-synaptics.orig/src/synapticsstr.h xserver-xorg-input-synaptics/src/synapticsstr.h
---- xserver-xorg-input-synaptics.orig/src/synapticsstr.h 2009-12-08 11:16:01.127175000 +0100
-+++ xserver-xorg-input-synaptics/src/synapticsstr.h 2009-12-08 11:29:47.238925256 +0100
-@@ -33,6 +33,7 @@
+Index: xserver-xorg-input-synaptics/src/synapticsstr.h
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/synapticsstr.h 2011-01-25 22:30:40.906826002 +1100
++++ xserver-xorg-input-synaptics/src/synapticsstr.h 2011-01-25 22:30:48.696826002 +1100
+@@ -44,6 +44,7 @@
typedef struct _SynapticsMoveHist
{
int x, y;
@@ -193,7 +191,7 @@ diff -Nurp xserver-xorg-input-synaptics.orig/src/synapticsstr.h xserver-xorg-inp
int millis;
} SynapticsMoveHistRec;
-@@ -149,6 +150,7 @@ typedef struct _SynapticsParameters
+@@ -160,6 +161,7 @@
unsigned int resolution_horiz; /* horizontal resolution of touchpad in units/mm */
unsigned int resolution_vert; /* vertical resolution of touchpad in units/mm */
int area_left_edge, area_right_edge, area_top_edge, area_bottom_edge; /* area coordinates absolute */
@@ -201,10 +199,11 @@ diff -Nurp xserver-xorg-input-synaptics.orig/src/synapticsstr.h xserver-xorg-inp
} SynapticsParameters;
-diff -Nurp xserver-xorg-input-synaptics.orig/tools/synclient.c xserver-xorg-input-synaptics/tools/synclient.c
---- xserver-xorg-input-synaptics.orig/tools/synclient.c 2009-12-08 11:16:01.127175000 +0100
-+++ xserver-xorg-input-synaptics/tools/synclient.c 2009-12-08 11:40:34.679925145 +0100
-@@ -143,6 +143,7 @@ static struct Parameter params[] = {
+Index: xserver-xorg-input-synaptics/tools/synclient.c
+===================================================================
+--- xserver-xorg-input-synaptics.orig/tools/synclient.c 2011-01-25 22:30:40.956826002 +1100
++++ xserver-xorg-input-synaptics/tools/synclient.c 2011-01-25 22:30:48.696826002 +1100
+@@ -143,6 +143,7 @@
{"AreaRightEdge", PT_INT, 0, 10000, SYNAPTICS_PROP_AREA, 32, 1},
{"AreaTopEdge", PT_INT, 0, 10000, SYNAPTICS_PROP_AREA, 32, 2},
{"AreaBottomEdge", PT_INT, 0, 10000, SYNAPTICS_PROP_AREA, 32, 3},
commit d88444667fbf39767c503cde017f6f1c85f24d65
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jan 18 03:51:10 2011 +0100
Switch to Architecture: any, adding armhf support (Closes: #604672).
diff --git a/debian/changelog b/debian/changelog
index fd03982..7553329 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-synaptics (1.3.0-2) UNRELEASED; urgency=low
+
+ * Switch to Architecture: any, adding armhf support (Closes: #604672).
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 18 Jan 2011 03:48:22 +0100
+
xserver-xorg-input-synaptics (1.3.0-1) experimental; urgency=low
[ Robert Hooker ]
diff --git a/debian/control b/debian/control
index f263813..6e06f2a 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git
Package: xserver-xorg-input-synaptics
-Architecture: alpha amd64 arm armeb armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel powerpc sh4 sparc
+Architecture: any
Depends:
${shlibs:Depends},
${xinpdriver:Depends},
commit 0e27ce3ad7493ec28bde421a61c8a6e8d147efb6
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jan 16 12:57:15 2011 -0800
syndaemon.c: Add #include <string.h>
Solaris FD_ZERO is defined using memset, but <sys/select.h> doesn't include
<string.h> itself, leading to compiler warning:
"syndaemon.c", line 404: warning: implicit function declaration: memset
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/tools/syndaemon.c b/tools/syndaemon.c
index 0309fb5..944c34e 100644
--- a/tools/syndaemon.c
+++ b/tools/syndaemon.c
@@ -38,6 +38,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <sys/types.h>
#include <unistd.h>
#include <signal.h>
commit 5c98205e025adaf2aa4d99b71cb4581963076a04
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jan 16 12:57:14 2011 -0800
synclient.c: Replace old index() function with C89-standard strchr()
Fixes Solaris compiler warnings of:
"synclient.c", line 152: warning: implicit function declaration: index
"synclient.c", line 152: warning: improper pointer/integer combination: op "="
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/tools/synclient.c b/tools/synclient.c
index e7be499..9776d23 100644
--- a/tools/synclient.c
+++ b/tools/synclient.c
@@ -149,7 +149,7 @@ static struct Parameter params[] = {
static double
parse_cmd(char* cmd, struct Parameter** par)
{
- char *eqp = index(cmd, '=');
+ char *eqp = strchr(cmd, '=');
*par = NULL;
if (eqp) {
commit ca0f87eb2a7491048d49e6449b688c4fea245310
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 8 11:15:09 2010 +1000
Rename SHM functions from alloc/free_param_data to alloc/free_shm_data
This naming is historical, we used to export the parameters through SHM.
These days it's just confusing.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
diff --git a/src/synaptics.c b/src/synaptics.c
index ab24b79..88bd024 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -297,7 +297,7 @@ SetDeviceAndProtocol(InputInfoPtr pInfo)
* The function will allocate shared memory if priv->shm_config is TRUE.
*/
static Bool
-alloc_param_data(InputInfoPtr pInfo)
+alloc_shm_data(InputInfoPtr pInfo)
{
int shmid;
SynapticsPrivate *priv = pInfo->private;
@@ -327,10 +327,10 @@ alloc_param_data(InputInfoPtr pInfo)
}
/*
- * Free SynapticsParameters data previously allocated by alloc_param_data().
+ * Free SynapticsParameters data previously allocated by alloc_shm_data().
*/
static void
-free_param_data(SynapticsPrivate *priv)
+free_shm_data(SynapticsPrivate *priv)
{
int shmid;
@@ -733,7 +733,7 @@ SynapticsPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
CalculateScalingCoeffs(priv);
- if (!alloc_param_data(pInfo))
+ if (!alloc_shm_data(pInfo))
goto SetupProc_fail;
priv->comm.buffer = XisbNew(pInfo->fd, INPUT_BUFFER_SIZE);
@@ -764,7 +764,7 @@ SynapticsPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
if (priv->comm.buffer)
XisbFree(priv->comm.buffer);
- free_param_data(priv);
+ free_shm_data(priv);
free(priv->proto_data);
free(priv->timer);
free(priv);
@@ -902,7 +902,7 @@ DeviceClose(DeviceIntPtr dev)
RetValue = DeviceOff(dev);
TimerFree(priv->timer);
priv->timer = NULL;
- free_param_data(priv);
+ free_shm_data(priv);
return RetValue;
}
@@ -1071,7 +1071,7 @@ DeviceInit(DeviceIntPtr dev)
);
xf86InitValuatorDefaults(dev, 1);
- if (!alloc_param_data(pInfo))
+ if (!alloc_shm_data(pInfo))
return !Success;
InitDeviceProperties(pInfo);
commit 07dbd6b85d806aa7ebb340f7f555d1992940f319
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 8 11:08:55 2010 +1000
Don't report all options unconditionally.
While this is useful to see all options provided, it also lists options that
are not actually interpreted by the driver. Skip it, use xf86Set*Option()
instead to just report the options handled by the driver.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
diff --git a/src/synaptics.c b/src/synaptics.c
index d336457..ab24b79 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -696,8 +696,6 @@ SynapticsPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
pInfo->switch_mode = SwitchMode;
pInfo->private = priv;
- xf86OptionListReport(pInfo->options);
-
/* allocate now so we don't allocate in the signal handler */
priv->timer = TimerSet(NULL, 0, 0, NULL, NULL);
if (!priv->timer) {
commit 9b62f5c29152d59a894a463711737c52c97b5cbe
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 8 11:08:03 2010 +1000
Dont report the version explicitly, it's reported in the module blob anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
diff --git a/src/synaptics.c b/src/synaptics.c
index 151d2a4..d336457 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -684,8 +684,6 @@ SynapticsPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
{
SynapticsPrivate *priv;
- xf86Msg(X_INFO, "Synaptics touchpad driver version %s\n", PACKAGE_VERSION);
-
/* allocate memory for SynapticsPrivateRec */
priv = calloc(1, sizeof(SynapticsPrivate));
if (!priv)
commit 2da93d9735b6951861043de8ea59c8ca1cea4f96
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 8 11:05:51 2010 +1000
Use xf86SetStrOption instead of xf86FindOption for the Device
xf86SetStrOption reports to the log if found.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
diff --git a/src/synaptics.c b/src/synaptics.c
index 872930c..151d2a4 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -238,9 +238,9 @@ SetDeviceAndProtocol(InputInfoPtr pInfo)
SynapticsPrivate *priv = pInfo->private;
enum SynapticsProtocol proto = SYN_PROTO_PSAUX;
- device = xf86FindOptionValue(pInfo->options, "Device");
+ device = xf86SetStrOption(pInfo->options, "Device", NULL);
if (!device) {
- device = xf86FindOptionValue(pInfo->options, "Path");
+ device = xf86SetStrOption(pInfo->options, "Path", NULL);
if (device) {
pInfo->options =
xf86ReplaceStrOption(pInfo->options, "Device", device);
commit b2cc4f5c4aa35fb13d96fafdbd907b6dba4b4796
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 8 11:01:56 2010 +1000
Remove the need for XI86_CONFIGURED on input-ABI 12
Just move the assignment into an already if GET_ABI_MAJOR() block.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
diff --git a/src/synaptics.c b/src/synaptics.c
index f64a081..872930c 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -80,12 +80,6 @@
#include <ptrveloc.h>
#endif
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
-/* removed from server, purge when dropping support for server 1.10 */
-#define XI86_CONFIGURED 0x02
-#define XI86_SEND_DRAG_EVENTS 0x08
-#endif
-
typedef enum {
NO_EDGE = 0,
BOTTOM_EDGE = 1,
@@ -676,6 +670,8 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
if (NewSynapticsPreInit(drv, pInfo, flags) != Success)
return NULL;
+ pInfo->flags |= XI86_CONFIGURED;
+
return pInfo;
}
@@ -752,7 +748,6 @@ SynapticsPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
}
xf86ProcessCommonOptions(pInfo, pInfo->options);
- pInfo->flags |= XI86_CONFIGURED;
if (pInfo->fd != -1) {
if (priv->comm.buffer) {
commit 6f61aa776332b99e0d3cc035bff11d87d2735a47
Author: Alessandro Guido <ag@alessandroguido.name>
Date: Fri Dec 3 11:55:00 2010 +0100
syndaemon: decouple background mode from quietness
syndaemon currently outputs lots of stuff when not running in background mode.
However, current init daemons and session managers can manage to launch the
daemon in background without "-b" just fine (if not better), by doing the
fork() themselves. Indeed, if one uses that setup, ie. by having syndaemon
launched by GNOME at login, it gets the ~/.xsession-errors file spammed by
Enable/Disabled messages.
This patch fixes this by introducing a new verbose (-v) flag that enables those
messages and makes syndaemon quiet by default.
Signed-off-by: Alessandro Guido <ag@alessandroguido.name>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/tools/syndaemon.c b/tools/syndaemon.c
index d06fe5f..0309fb5 100644
--- a/tools/syndaemon.c
+++ b/tools/syndaemon.c
@@ -64,6 +64,7 @@ static XDevice *dev;
static Atom touchpad_off_prop;
static TouchpadState previous_state;
static TouchpadState disable_state = TouchpadOff;
+static int verbose;
#define KEYMAP_SIZE 32
static unsigned char keyboard_mask[KEYMAP_SIZE];
@@ -82,6 +83,7 @@ usage(void)
fprintf(stderr, " -k Ignore modifier keys when monitoring keyboard activity.\n");
fprintf(stderr, " -K Like -k but also ignore Modifier+Key combos.\n");
fprintf(stderr, " -R Use the XRecord extension.\n");
+ fprintf(stderr, " -v Print diagnostic messages.\n");
exit(1);
}
@@ -110,7 +112,7 @@ toggle_touchpad(Bool enable)
if (pad_disabled && enable) {
data = previous_state;
pad_disabled = False;
- if (!background)
+ if (verbose)
printf("Enable\n");
} else if (!pad_disabled && !enable &&
previous_state != disable_state &&
@@ -118,7 +120,7 @@ toggle_touchpad(Bool enable)
store_current_touchpad_state();
pad_disabled = True;
data = disable_state;
- if (!background)
+ if (verbose)
printf("Disable\n");
} else
return;
@@ -290,7 +292,7 @@ Bool check_xrecord(Display *display) {
&first_error);
status = XRecordQueryVersion(display, version, version+1);
- if (!background && status) {
+ if (verbose && status) {
printf("X RECORD extension version %d.%d\n", version[0], version[1]);
}
return found;
@@ -433,7 +435,7 @@ void record_main_loop(Display* display, double idle_time) {
if (ret == 0 && pad_disabled) { /* timeout => enable event */
toggle_touchpad(True);
- if (!background) printf("enable touchpad\n");
+ if (verbose) printf("enable touchpad\n");
}
} /* end while(1) */
@@ -516,7 +518,7 @@ main(int argc, char *argv[])
int use_xrecord = 0;
/* Parse command line parameters */
- while ((c = getopt(argc, argv, "i:m:dtp:kKR?")) != EOF) {
+ while ((c = getopt(argc, argv, "i:m:dtp:kKR?v")) != EOF) {
switch(c) {
case 'i':
idle_time = atof(optarg);
@@ -543,6 +545,9 @@ main(int argc, char *argv[])
case 'R':
use_xrecord = 1;
break;
+ case 'v':
+ verbose = 1;
+ break;
default:
usage();
break;
commit 4d22aa06fd2b53e11233ebd3a25045cd96bf67ab
Author: Takashi Iwai <tiwai@suse.de>
Date: Fri Oct 8 19:22:29 2010 +0200
Fix 64bit arch issue in synaptics eventcomm.c
In C, "1" is an integer, not an unsigned long. Thus (1 << 33) doesn't give
you the 33th bit shift, but it's undefined.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/eventcomm.c b/src/eventcomm.c
index 85dfd09..4593bba 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -49,7 +49,7 @@
#define NBITS(x) (((x) + LONG_BITS - 1) / LONG_BITS)
#define OFF(x) ((x) % LONG_BITS)
#define LONG(x) ((x) / LONG_BITS)
-#define TEST_BIT(bit, array) (array[LONG(bit)] & (1 << OFF(bit)))
+#define TEST_BIT(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1)
/*****************************************************************************
* Function Definitions
commit 4d3a1e174d5f67ca47b7c8a89990528d303b2807
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 23:49:21 2010 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 78d89c9..fd03982 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-synaptics (1.3.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-synaptics (1.3.0-1) experimental; urgency=low
[ Robert Hooker ]
* New upstream release.
@@ -7,7 +7,7 @@ xserver-xorg-input-synaptics (1.3.0-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Remove TODO from xserver-xorg-input-synaptics.docs, dropped upstream.
- -- Robert Hooker <sarvatt@ubuntu.com> Mon, 18 Oct 2010 17:37:32 -0400
+ -- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 23:49:14 +0100
xserver-xorg-input-synaptics (1.2.2-4) experimental; urgency=low
commit a345c89f0368e72820aa2bcc10a3f2e8fa505fc6
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 23:47:25 2010 +0100
Remove TODO from xserver-xorg-input-synaptics.docs, dropped upstream.
diff --git a/debian/changelog b/debian/changelog
index e2b67d7..78d89c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
xserver-xorg-input-synaptics (1.3.0-1) UNRELEASED; urgency=low
+ [ Robert Hooker ]
* New upstream release.
* Bump xutils-dev requirement for new util-macros.
+ [ Cyril Brulebois ]
+ * Remove TODO from xserver-xorg-input-synaptics.docs, dropped upstream.
+
-- Robert Hooker <sarvatt@ubuntu.com> Mon, 18 Oct 2010 17:37:32 -0400
xserver-xorg-input-synaptics (1.2.2-4) experimental; urgency=low
diff --git a/debian/xserver-xorg-input-synaptics.docs b/debian/xserver-xorg-input-synaptics.docs
index ed60b60..8c63f57 100644
--- a/debian/xserver-xorg-input-synaptics.docs
+++ b/debian/xserver-xorg-input-synaptics.docs
@@ -1,4 +1,3 @@
README
docs/README.alps
-TODO
docs/trouble-shooting.txt
commit 57193777374dd10a920171670a06b7e79d389703
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 25 10:39:38 2010 +1000
Input API 12 requires a valuator mode for each axis.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
diff --git a/src/synaptics.c b/src/synaptics.c
index e6ee943..f64a081 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -1051,7 +1051,11 @@ DeviceInit(DeviceIntPtr dev)
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
axes_labels[0],
#endif
- min, max, priv->resx * 1000, 0, priv->resx * 1000);
+ min, max, priv->resx * 1000, 0, priv->resx * 1000
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
+ , Relative
+#endif
+ );
xf86InitValuatorDefaults(dev, 0);
/* Y valuator */
@@ -1069,7 +1073,11 @@ DeviceInit(DeviceIntPtr dev)
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
axes_labels[1],
#endif
- min, max, priv->resy * 1000, 0, priv->resy * 1000);
+ min, max, priv->resy * 1000, 0, priv->resy * 1000
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
+ , Relative
+#endif
+ );
xf86InitValuatorDefaults(dev, 1);
if (!alloc_param_data(pInfo))
commit 9c0e9ec2e8fca9d43cdc628d4209d6c9f5076fff
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Mon Oct 18 17:38:56 2010 -0400
Bump xutils-dev requirement for new util-macros.
diff --git a/debian/changelog b/debian/changelog
index 4831b0a..e2b67d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-input-synaptics (1.3.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump xutils-dev requirement for new util-macros.
-- Robert Hooker <sarvatt@ubuntu.com> Mon, 18 Oct 2010 17:37:32 -0400
diff --git a/debian/control b/debian/control
index dde2710..f263813 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
quilt,
automake,
libtool,
- xutils-dev,
+ xutils-dev (>= 1:7.5+4)
Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git
commit 610a8329218cf58c647589970108bb6180b09a9d
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Mon Oct 18 17:38:16 2010 -0400
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index e65ab8b..754167f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,1020 @@
-commit a0d6e90b26044258473d8dae8a53c5adbe2681f1
+commit 1a9495a74c41d956751177807602383ce4549c37
Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Fri Mar 26 15:13:40 2010 +1000
+Date: Wed Sep 1 09:04:11 2010 +1000
- synaptics 1.2.2
+ synaptics 1.3.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-commit ba0d227a6da35dd21ba48ded65cabff16ef423ce
+commit 33632e447b311950729350e5802b5b1ee9616677
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Aug 23 15:12:05 2010 +1000
+
+ man: use seconds² instead of seconds per second
+
+ Makes it hopefully slightly less confusing. Should have been amended before
+ the push but ENOTENOUGHCOFFEE.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 7a741ddedab477baea21f3d8ce6390b7bf72399f
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Aug 23 11:55:45 2010 +1000
+
+ synaptics 1.2.99.901
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 59151a548dcbac6f68e4f921b5c47aea4e5bc2a3
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Aug 20 11:09:04 2010 +1000
+
+ Enable coasting by default with a value of 20.
+
+ The default value for friction coasting makes coasting much more useful now
+ since it stops coasting after a while. Enable it by default, the man page
+ already claims a default of 20 anyway.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 56655fd15f676fea143f3963e23b464b275b2e77
+Author: Patrick Curran <pjcurran@wisc.edu>
+Date: Fri Jul 23 17:28:01 2010 -0500
+
+ Added "friction physics" so coasting can stop on its own.
+
+ When you are coasting (but not corner coasting) you might want the
+ scrolling to slow down and stop on its own. This also lets you
+ start coasting while using a two finger scroll.
+
+ Signed-off-by: Patrick Curran <pjcurran@wisc.edu>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit a6ca4d2523904b7ce49edc29ba408979bdf0d45e
+Author: Chris Bagwell <chris@cnpbagwell.com>
+Date: Wed Aug 18 22:09:45 2010 -0500
+
+ Reset X/Y hist on multi finger transition to fix jumps
+
+ Most modern touchpads track 1st finger during multi-touch. If first finger
+ is lifted then a jump will occur as X/Y transition to next finger location.
+ Resetting X/Y history as each finger is lifted will hide this transition.
+
+ Synaptics hw specs claim older hardware report X/Y values that are average
+ point between multi-fingers which can cause unwanted jump. Reset X/Y
+ history during transition to new fingers to hide this as well.
+
+ Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
+ Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit b774a1dba2f1f45c94fe898fe8b5ce258cbcddfc
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Aug 19 14:25:29 2010 +1000
+
+ Increase the default acceleration factor.
+
+ With 4e0e53fcba6fd99d458df1905d055d63360155c0 the driver got it's own
+ acceleration mechanism. This slowed down the pointer movement a lot,
+ especially on ALPS touchpads. Increase the default acceleration factor to
+ accommodate for this.
+
+ The number itself is chosen through guesswork and informal tests.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Tested-by: Magnus Kessler <Magnus.Kessler@gmx.net>
+ Reviewed-by: Magnus Kessler <Magnus.Kessler@gmx.net>
+
+commit 4b0003c3d4cee1f5c6675bde5701e2169959932a
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Aug 19 14:22:03 2010 +1000
+
+ Up the precision of MaxSpeed and AccelFactor log output.
+
+ MaxSpeed usually has two decimals that matter, AccelFactor doesn't get
+ intersting until the second decimal, so print 3.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
Reply to: