configure.ac | 2 +- man/synaptics.man | 4 ++-- man/synclient.man | 2 +- src/synaptics.c | 13 ++++++++----- 4 files changed, 12 insertions(+), 9 deletions(-)
New commits: commit a0d6e90b26044258473d8dae8a53c5adbe2681f1 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Fri Mar 26 15:13:40 2010 +1000 synaptics 1.2.2 Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/configure.ac b/configure.ac index 00181bc..dd2bef7 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-synaptics], - 1.2.1, + 1.2.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-synaptics) commit ba0d227a6da35dd21ba48ded65cabff16ef423ce Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Wed Mar 17 13:52:43 2010 +1000 After closing the fd, reset it to -1. A DeviceOff() followed by DeviceClose() (which calls DeviceOff()) would try to close the fd twice, in addition to calling various hooks. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Reviewed-by: Julien Cristau <jcris...@debian.org> (cherry picked from commit a07fe65031ffa7e8d88898d763bdbc88899fb1e4) Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/src/synaptics.c b/src/synaptics.c index 6cbdcb8..9997674 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -801,6 +801,7 @@ DeviceOff(DeviceIntPtr dev) priv->comm.buffer = NULL; } xf86CloseSerial(local->fd); + local->fd = -1; } dev->public.on = FALSE; return Success; commit 5c811a864e8927a8dfcf9bc25ffe0265b5ed8025 Author: Adam Jackson <a...@redhat.com> Date: Fri Mar 12 08:32:22 2010 +1000 Don't clobber the timer we just created. Signed-off-by: Peter Hutterer <peter.hutte...@redhat.com> (cherry picked from commit 0fb151b2388ca665b9454b7b284181b4fa180194) Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/src/synaptics.c b/src/synaptics.c index e9d1833..6cbdcb8 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -615,7 +615,6 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags) xf86ErrorFVerb(6, "port opened successfully\n"); /* initialize variables */ - priv->timer = NULL; priv->repeatButtons = 0; priv->nextRepeat = 0; priv->count_packet_finger = 0; commit faf250d013b1850d3dbe08b050c71dfeb20a6490 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Fri Dec 11 13:46:50 2009 +1000 synaptics 1.2.1 Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/configure.ac b/configure.ac index bdc7764..00181bc 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-synaptics], - 1.2.0, + 1.2.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-synaptics) commit 537e5206fd270420dd6b5de0bc7fdc5b45ef55f9 Author: Adam Jackson <a...@redhat.com> Date: Thu Dec 10 13:33:37 2009 -0500 Don't destroy the timer on DeviceOff. DeviceOff is VT switch, DeviceClose is unplug. We need the timer pre-allocated since we set it during the signal handler and so can't allocate it then, so merely cancel it at DeviceOff, and delete it in DeviceClose. Signed-off-by: Adam Jackson <a...@redhat.com> Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> Reviewed-by: Keith Packard <kei...@keithp.com> Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> (cherry picked from commit babe5288271f3c088d9aac3ffd9f036c87b0018e) diff --git a/src/synaptics.c b/src/synaptics.c index e0d3555..e9d1833 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -793,8 +793,7 @@ DeviceOff(DeviceIntPtr dev) DBG(3, ErrorF("Synaptics DeviceOff called\n")); if (local->fd != -1) { - TimerFree(priv->timer); - priv->timer = NULL; + TimerCancel(priv->timer); xf86RemoveEnabledDevice(local); if (priv->proto_ops->DeviceOffHook) priv->proto_ops->DeviceOffHook(local); @@ -816,6 +815,8 @@ DeviceClose(DeviceIntPtr dev) SynapticsPrivate *priv = (SynapticsPrivate *) local->private; RetValue = DeviceOff(dev); + TimerFree(priv->timer); + priv->timer = NULL; free_param_data(priv); return RetValue; } commit 8069245fd531b1302e8aa0de82b4c6f66028715f Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Mon Nov 2 09:48:38 2009 +1000 Always make the input buffer size 200 PreInit initalizes the input buffer with 200, DeviceOn only with 64. For consistency, use the same size in both. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Acked-by: Adam Jackson <a...@redhat.com> (cherry picked from commit 0198c02774a5063c5cf45b6eddef4a33d9f494d7) diff --git a/src/synaptics.c b/src/synaptics.c index 597aad2..e0d3555 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -111,6 +111,8 @@ typedef enum { #define DBG(a,b) #endif +#define INPUT_BUFFER_SIZE 200 + /***************************************************************************** * Forward declaration ****************************************************************************/ @@ -635,7 +637,7 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags) if (!alloc_param_data(local)) goto SetupProc_fail; - priv->comm.buffer = XisbNew(local->fd, 200); + priv->comm.buffer = XisbNew(local->fd, INPUT_BUFFER_SIZE); DBG(9, XisbTrace(priv->comm.buffer, 1)); if (!QueryHardware(local)) { @@ -757,7 +759,7 @@ DeviceOn(DeviceIntPtr dev) if (priv->proto_ops->DeviceOnHook) priv->proto_ops->DeviceOnHook(local, &priv->synpara); - priv->comm.buffer = XisbNew(local->fd, 64); + priv->comm.buffer = XisbNew(local->fd, INPUT_BUFFER_SIZE); if (!priv->comm.buffer) { xf86CloseSerial(local->fd); local->fd = -1; commit e52e4d58aea5248a8f763f82523a0bc36b4f84f2 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Thu Oct 22 08:19:35 2009 +1000 synclient: fix man page typo Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> (cherry picked from commit 6622911370197d69737be02dd9f83e4406a991ca) diff --git a/man/synclient.man b/man/synclient.man index 074a18a..610b101 100644 --- a/man/synclient.man +++ b/man/synclient.man @@ -3,7 +3,7 @@ .TH synclient __appmansuffix__ __vendorversion__ .SH NAME .LP -synclient \- commandline utitlity to query and modify Synaptics driver +synclient \- commandline utility to query and modify Synaptics driver options. .SH "SYNOPSIS" .LP commit 4754626b7901a4362efacf93ed926112315095d2 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Tue Oct 20 08:16:48 2009 +1000 man: update manpage for new tap ordering Tapping has changed from 1,2,3 to 1,3,2. Document this in the man page. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> (cherry picked from commit cf2ccaaeb7fdd1ffc4c9171134f7cbd44f141f28) diff --git a/man/synaptics.man b/man/synaptics.man index 7c98b6b..59fbaac 100644 --- a/man/synaptics.man +++ b/man/synaptics.man @@ -46,8 +46,8 @@ and button six/seven events for horizontal scrolling. .IP \(bu 4 Adjustable finger detection. .IP \(bu 4 -Multifinger taps: two finger for middle button and three finger for -right button events. +Multifinger taps: two finger for right button and three finger for +middle button events. . (Needs hardware support. . -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1nv3u7-0003bm...@alioth.debian.org