xserver-xorg-input-synaptics: Changes to 'ubuntu'
ChangeLog | 694 +++++++++++++
README | 6
conf/11-x11-synaptics.fdi | 10
conf/50-synaptics.conf | 13
configure.ac | 2
debian/README.source | 24
debian/changelog | 97 +
debian/compat | 2
debian/control | 29
debian/patches/02-do-not-use-synaptics-for-keyboards.patch | 8
debian/patches/03-man-no-hal.patch | 20
debian/patches/114_jumpy_cursor_first_part.patch | 213 ---
debian/patches/115_evdev_only.patch | 8
debian/patches/series | 5
debian/rules | 131 --
debian/watch | 1
debian/xserver-xorg-input-synaptics.README.Debian | 2
debian/xsfbs/repack.sh | 32
debian/xsfbs/xsfbs.mk | 285 -----
debian/xsfbs/xsfbs.sh | 622 -----------
include/synaptics-properties.h | 7
man/synaptics.man | 90 +
src/eventcomm.c | 9
src/properties.c | 17
src/psmcomm.c | 4
src/synaptics.c | 250 +++-
src/synapticsstr.h | 5
tools/syndaemon.c | 42
28 files changed, 1138 insertions(+), 1490 deletions(-)
New commits:
commit 1bc838d611e6781ecee47dfdbaa47de9ca71b37c
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue Jul 5 11:02:03 2011 +0300
Update 115_evdev_only.patch to apply.
diff --git a/debian/changelog b/debian/changelog
index eac58be..8e1d2fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,7 @@ xserver-xorg-input-synaptics (1.4.1-1ubuntu1) UNRELEASED; urgency=low
- debian/xserver-xorg-input-synaptics.postinst.in:
+ Trigger udev to pick up new udev rules
* Drop 114_jumpy_cursor_first_part.patch, fixed upstream.
+ * Update 115_evdev_only.patch to apply.
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 05 Jul 2011 09:43:02 +0300
diff --git a/debian/patches/115_evdev_only.patch b/debian/patches/115_evdev_only.patch
index 9e61306..8e6fc29 100644
--- a/debian/patches/115_evdev_only.patch
+++ b/debian/patches/115_evdev_only.patch
@@ -2,9 +2,13 @@ Prevent non-evdev devices from firing the eventcomm AutoDevProbe callback.
--- a/conf/50-synaptics.conf
+++ b/conf/50-synaptics.conf
-@@ -2,4 +2,5 @@ Section "InputClass"
+@@ -2,8 +2,8 @@ Section "InputClass"
Identifier "touchpad catchall"
Driver "synaptics"
MatchIsTouchpad "on"
-+ MatchDevicePath "/dev/input/event*"
+ # This option is recommend on all Linux systems using evdev, but cannot be
+ # enabled by default. See the following link for details:
+ # http://who-t.blogspot.com/2010/11/how-to-ignore-configuration-errors.html
+-# MatchDevicePath "/dev/input/event*"
++ MatchDevicePath "/dev/input/event*"
EndSection
commit 2f431b974a5f8d12287825f5601913d978954303
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue Jul 5 11:00:48 2011 +0300
Drop 114_jumpy_cursor_first_part.patch, fixed upstream
and update the changelog.
diff --git a/debian/changelog b/debian/changelog
index 6d27270..eac58be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,56 @@
+xserver-xorg-input-synaptics (1.4.1-1ubuntu1) UNRELEASED; urgency=low
+
+ * Merge from Debian unstable, remaining changes:
+ - 101_resolution_detect_option.patch:
+ + Provide an option to prevent synaptics from communicating the
+ touchpad size to the xserver. (LP: 327428)
+ - 103_enable_cornertapping.patch:
+ + Enable right/middle clicks by tapping in the bottom- and top-right
+ corners.
+ - 104_always_enable_tapping.patch:
+ + Enable tapping regardless of the presence of physical buttons.
+ - 106_always_enable_vert_edge_scroll.patch:
+ + Enable vertical edge tapping by default even if we enable two-finger
+ scrolling as well.
+ - 115_evdev_only.patch:
+ + Only bind to /dev/input/event* evdev devices (LP 624985)
+ - 116_xi2_1.patch:
+ - 117_gestures.patch:
+ + multitouch and uTouch gesture support
+ - 118_quell_error_msg.patch:
+ + Don't print error "Unable to find a synaptics device" when used
+ on system that doesn't have a touchpad anyway. (LP: 716712)
+ - 119_active_area_touches.patch:
+ - 120_active_touches_num_fingers.patch:
+ - 121_semi-mt_num_fingers.patch:
+ + Fix handling for SemiMultitouch trackpads with integrated buttons
+ (LP: 736523)
+ - 122_revert_pressure_finger_default.patch:
+ + Fix spurious right click events on some trackpads (LP: 742213)
+ - 123_order_ProcessTouch_for_numFingers.patch:
+ + Fix jumpy cursor on multitouch trackpads (LP: 751525)
+ - 124_syndaemon_events.patch:
+ + Drain spurious events from XRecord connection as a work around
+ for a buggy X server. (LP: 754470)
+ - debian/control:
+ + Add depends on libmtdev and libutouch-grail
+ + Build-depend on multitouch-enabled inputproto.
+ + Depend on multitouch-enabled xserver.
+ + Depend on udev.
+ + Drop libxtst-dev build dependency so syndaemon does not use XRecord,
+ preventing a wide range of crashes in _CallCallbacks. (LP: 774978)
+ - debian/gbp.conf:
+ + Specify ‘ubuntu’ branch.
+ - debian/local/51-synaptics-quirks.conf:
+ + Split out our synaptics quirks into 51-synaptics-quirks.conf
+ - debian/local/66-xorg-synaptics.rules:
+ + Add the udev rule back for tagging specific machines to be quirked.
+ - debian/xserver-xorg-input-synaptics.postinst.in:
+ + Trigger udev to pick up new udev rules
+ * Drop 114_jumpy_cursor_first_part.patch, fixed upstream.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 05 Jul 2011 09:43:02 +0300
+
xserver-xorg-input-synaptics (1.4.1-1) unstable; urgency=low
* New upstream release:
diff --git a/debian/patches/114_jumpy_cursor_first_part.patch b/debian/patches/114_jumpy_cursor_first_part.patch
deleted file mode 100644
index fbae848..0000000
--- a/debian/patches/114_jumpy_cursor_first_part.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-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"
-
-+/* 32 bit */
-+#define SYNAPTICS_PROP_JUMPYCURSOR_THRESHOLD "Synaptics Jumpy Cursor Threshold"
-+
- #endif /* _SYNAPTICS_PROPERTIES_H_ */
-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
-+Set the threshold above which movement events are ignored on single-touch touchpads.
-+.
-+The option is disabled by default and can be enabled by setting the
-+JumpyCursorThreshold option to any integer value other than zero. Property: "Synaptics
-+Jumpy Cursor Threshold"
-+.
- .LP
- 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.
-
-+.TP 7
-+.BI "Synaptics Jumpy Cursor Threshold"
-+The Synaptics Jumpy Cursor Threshold parameter is used to suppress movements (which
-+take place in 20 milliseconds or less) whose covered distance is greater than or
-+equal to the threshold on single-touch touchpads. This property is disabled by default.
-+
-+32 bit, 1 value. 0 disables the property.
-+
- .SH "NOTES"
- 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;
-+Atom prop_jumpycursor_threshold = 0;
-
- static Atom
- InitAtom(DeviceIntPtr dev, char *name, int format, int nvalues, int *values)
-@@ -278,6 +279,8 @@
- values[2] = para->area_top_edge;
- values[3] = para->area_bottom_edge;
- prop_area = InitAtom(pInfo->dev, SYNAPTICS_PROP_AREA, 32, 4, values);
-+
-+ prop_jumpycursor_threshold = InitAtom(pInfo->dev, SYNAPTICS_PROP_JUMPYCURSOR_THRESHOLD, 32, 1, ¶->jumpycursor_threshold);
- }
-
- int
-@@ -649,6 +652,12 @@
- para->area_right_edge = area[1];
- para->area_top_edge = area[2];
- para->area_bottom_edge = area[3];
-+ } else if (property == prop_jumpycursor_threshold)
-+ {
-+ if (prop->size != 1 || prop->format != 32 || prop->type != XA_INTEGER)
-+ return BadMatch;
-+
-+ para->jumpycursor_threshold = *(INT32*)prop->data;
- }
-
- return Success;
-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;
-+
- void InitDeviceProperties(InputInfoPtr pInfo);
- int SetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
- 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);
-+ pars->jumpycursor_threshold = xf86SetIntOption(opts, "JumpyCursorThreshold", 0);
-
- /* Warn about (and fix) incorrectly configured TopEdge/BottomEdge parameters */
- if (pars->top_edge > pars->bottom_edge) {
-@@ -1696,11 +1700,12 @@
- #define HIST(a) (priv->move_hist[((priv->hist_index - (a) + SYNAPTICS_MOVE_HISTORY) % SYNAPTICS_MOVE_HISTORY)])
-
- static void
--store_history(SynapticsPrivate *priv, int x, int y, unsigned int millis)
-+store_history(SynapticsPrivate *priv, int x, int y, int num_fingers, unsigned int millis)
- {
- int idx = (priv->hist_index + 1) % SYNAPTICS_MOVE_HISTORY;
- priv->move_hist[idx].x = x;
- priv->move_hist[idx].y = y;
-+ priv->move_hist[idx].num_fingers = num_fingers;
- priv->move_hist[idx].millis = millis;
- priv->hist_index = idx;
- }
-@@ -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 single-touch
-+ * models
-+ */
-+ if (!priv->has_double) {
-+ /* If para->jumpycursor_threshold <= 0, quirks are not
-+ * available
-+ */
-+ if (para->jumpycursor_threshold <= 0)
-+ goto post_quirks;
-+
-+ int elapsed_time = hw->millis - HIST(0).millis;
-+
-+ /* Ignore deltas as they couldn't possibly happen in so little time */
-+ if (elapsed_time <= 20 && (abs(dx) >= para->jumpycursor_threshold || abs(dy) >= para->jumpycursor_threshold)) {
-+ dx = dy = 0.0;
-+ was_time_skipped = FALSE;
-+ }
-+ /* A comparison between the timestamp in priv->move_hist and hw->millis shows
-+ * that something went wrong and that an event was skipped, hence the deltas
-+ * are wrong.
-+ * Let's ignore the deltas and append the skipped event to priv->move_hist
-+ * otherwise the next deltas will be wrong too.
-+ */
-+ else if (old_time_millis > 0 && (HIST(0).millis != old_time_millis)) {
-+ dx = dy = 0.0;
-+ was_time_skipped = TRUE;
-+ }
-+ /* Something went wrong and an event was previously skipped, hence these deltas
-+ * are wrong.
-+ * Let's ignore the deltas and set was_time_skipped to FALSE as the next deltas
-+ * should be good.
-+ */
-+ else {
-+ if (was_time_skipped) {
-+ dx = 0.0;
-+ dy = 0.0;
-+ }
-+ was_time_skipped = FALSE;
-+ }
-+
-+ old_time_millis = hw->millis;
-+ }
-+
-+ }
-+post_quirks:
-+
- priv->prevFingers = hw->numFingers;
-
- *dxP = dx;
-@@ -2496,7 +2550,7 @@
-
- /* generate a history of the absolute positions */
- 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;
- }
-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;
-+ int num_fingers;
- int millis;
- } SynapticsMoveHistRec;
-
-@@ -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 */
-+ int jumpycursor_threshold; /* jumpy cursor threshold */
- } SynapticsParameters;
-
-
-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},
-+ {"JumpyCursorThreshold", PT_INT, 0, 1000, SYNAPTICS_PROP_JUMPYCURSOR_THRESHOLD, 32, 0},
- { NULL, 0, 0, 0, 0 }
- };
-
diff --git a/debian/patches/series b/debian/patches/series
index 6907ac6..b867409 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@
104_always_enable_tapping.patch
#105_correct_multifinger_click.patch
106_always_enable_vert_edge_scroll.patch
-114_jumpy_cursor_first_part.patch
115_evdev_only.patch
116_xi2_1.patch
117_gestures.patch
commit 2a7c235150a9cc4ac799f485fcd1de1bba0ee5a6
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jun 28 15:38:17 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 140e14a..4ca7896 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-synaptics (1.4.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-synaptics (1.4.1-1) unstable; urgency=low
* New upstream release:
- Fix some typos in documentation (Closes: #622663).
@@ -10,7 +10,7 @@ xserver-xorg-input-synaptics (1.4.1-1) UNRELEASED; urgency=low
* Drop patch:
- 03-man-no-hal.patch, superseded by upstream commit e49d5d07c7.
- -- Cyril Brulebois <kibi@debian.org> Tue, 28 Jun 2011 15:04:24 +0200
+ -- Cyril Brulebois <kibi@debian.org> Tue, 28 Jun 2011 15:38:13 +0200
xserver-xorg-input-synaptics (1.4.0-1) unstable; urgency=low
commit 87716e253322309a2bfcbd62288cc3b666f82de9
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jun 28 15:29:39 2011 +0200
Drop 03-man-no-hal.patch due to e49d5d07c7.
diff --git a/debian/changelog b/debian/changelog
index d7e90a2..140e14a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xserver-xorg-input-synaptics (1.4.1-1) UNRELEASED; urgency=low
* Refresh patch:
- 02-do-not-use-synaptics-for-keyboards.patch to cope with the lines
removed in d25ba5e11d.
+ * Drop patch:
+ - 03-man-no-hal.patch, superseded by upstream commit e49d5d07c7.
-- Cyril Brulebois <kibi@debian.org> Tue, 28 Jun 2011 15:04:24 +0200
diff --git a/debian/patches/03-man-no-hal.patch b/debian/patches/03-man-no-hal.patch
deleted file mode 100644
index 0650598..0000000
--- a/debian/patches/03-man-no-hal.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: xserver-xorg-input-synaptics/man/synaptics.man
-===================================================================
---- xserver-xorg-input-synaptics.orig/man/synaptics.man
-+++ xserver-xorg-input-synaptics/man/synaptics.man
-@@ -871,15 +871,6 @@
- 32 bit unsigned, 2 values (read-only), vertical, horizontal in units/millimeter.
-
- .SH "NOTES"
--There is an example hal policy file in
--.I ${sourcecode}/fdi/11-x11-synaptics.fdi
--which will enable the driver based on the information if the hardware
--is available. Feel free to copy it to
--.I /etc/hal/fdi/policy
--and customize it to your needs. You can pass custom options to the driver
--using x11_options properties. Note that this requires xorg-server-1.5 or
--higher.
--.LP
- If either of
- .BI "Protocol \*q" auto-dev \*q
- (default) or
diff --git a/debian/patches/series b/debian/patches/series
index c8a3753..d694f00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
#01-synaptics-dont-grab-if-not-on-current-VT.patch
02-do-not-use-synaptics-for-keyboards.patch
-03-man-no-hal.patch
commit 45d52fe1b75abdde8b5f4d492b98ce364b93422f
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jun 28 15:29:25 2011 +0200
Refresh 02-do-not-use-synaptics-for-keyboards.patch after d25ba5e11d.
diff --git a/debian/changelog b/debian/changelog
index bd6c239..d7e90a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ xserver-xorg-input-synaptics (1.4.1-1) UNRELEASED; urgency=low
- Fix some typos in documentation (Closes: #622663).
- Fix “syndaemon consumes 100% CPU” (LP: #754470).
* Bump Standards-Version to 3.9.2 (no changes).
+ * Refresh patch:
+ - 02-do-not-use-synaptics-for-keyboards.patch to cope with the lines
+ removed in d25ba5e11d.
-- Cyril Brulebois <kibi@debian.org> Tue, 28 Jun 2011 15:04:24 +0200
diff --git a/debian/patches/02-do-not-use-synaptics-for-keyboards.patch b/debian/patches/02-do-not-use-synaptics-for-keyboards.patch
index a756a5d..a7c70bf 100644
--- a/debian/patches/02-do-not-use-synaptics-for-keyboards.patch
+++ b/debian/patches/02-do-not-use-synaptics-for-keyboards.patch
@@ -5,7 +5,7 @@ Index: xserver-xorg-input-synaptics/conf/11-x11-synaptics.fdi
===================================================================
--- xserver-xorg-input-synaptics.orig/conf/11-x11-synaptics.fdi 2009-11-21 13:15:39.064182104 +0900
+++ xserver-xorg-input-synaptics/conf/11-x11-synaptics.fdi 2009-11-21 13:16:23.404256090 +0900
-@@ -2,30 +2,34 @@
+@@ -2,27 +2,31 @@
<deviceinfo version="0.2">
<device>
<match key="info.capabilities" contains="input.touchpad">
@@ -13,9 +13,6 @@ Index: xserver-xorg-input-synaptics/conf/11-x11-synaptics.fdi
- <!-- Arbitrary options can be passed to the driver using
- the input.x11_options property since xorg-server-1.5. -->
- <!-- EXAMPLES:
-- Switch on shared memory, enables the driver to be configured at runtime
-- <merge key="input.x11_options.SHMConfig" type="string">true</merge>
--
- Maximum movement of the finger for detecting a tap
- <merge key="input.x11_options.MaxTapMove" type="string">2000</merge>
-
@@ -40,9 +37,6 @@ Index: xserver-xorg-input-synaptics/conf/11-x11-synaptics.fdi
+ <!-- Arbitrary options can be passed to the driver using
+ the input.x11_options property since xorg-server-1.5. -->
+ <!-- EXAMPLES:
-+ Switch on shared memory, enables the driver to be configured at runtime
-+ <merge key="input.x11_options.SHMConfig" type="string">true</merge>
-+
+ Maximum movement of the finger for detecting a tap
+ <merge key="input.x11_options.MaxTapMove" type="string">2000</merge>
+
commit 51ba8d9f3196e7dc2858d6e4f1d1928010b5edbf
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jun 28 15:08:34 2011 +0200
Bump Standards-Version to 3.9.2 (no changes).
diff --git a/debian/changelog b/debian/changelog
index b349674..bd6c239 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-synaptics (1.4.1-1) UNRELEASED; urgency=low
* New upstream release:
- Fix some typos in documentation (Closes: #622663).
- Fix “syndaemon consumes 100% CPU” (LP: #754470).
+ * Bump Standards-Version to 3.9.2 (no changes).
-- Cyril Brulebois <kibi@debian.org> Tue, 28 Jun 2011 15:04:24 +0200
diff --git a/debian/control b/debian/control
index e43293f..87ddf23 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
pkg-config,
quilt,
xutils-dev (>= 1:7.5+4)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
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 1f05b7bae49a50a76ddcb98f5c1880307a61ec4d
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jun 28 15:08:12 2011 +0200
Close bugs in changelog.
diff --git a/debian/changelog b/debian/changelog
index f745e3c..b349674 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xserver-xorg-input-synaptics (1.4.1-1) UNRELEASED; urgency=low
- * New upstream release.
+ * New upstream release:
+ - Fix some typos in documentation (Closes: #622663).
+ - Fix “syndaemon consumes 100% CPU” (LP: #754470).
-- Cyril Brulebois <kibi@debian.org> Tue, 28 Jun 2011 15:04:24 +0200
commit 890e5cad84eb421b2d4eb2796b65c5962104144b
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jun 28 15:04:52 2011 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 8ae4090..7111e0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,192 @@
+commit a1c77348563d882a5da870d6884ee91434458689
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Jun 28 14:47:04 2011 +1000
+
+ synaptics 1.4.1
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 65c8d5c703b2f9a65e3bf86b1ad35a0d439b46aa
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon May 23 10:18:22 2011 +1000
+
+ syndaemon: don't compare against a null-property. (#37459)
+
+ synaptics_property is not set, touchpad_off_prop is the property we need to
+ check against.
+
+ False check for (nprops != 0) instead of (nprops < 0) would result in
+ syndaemon always reporting a touchpad device, even if none are present.
+
+ X.Org Bug 37459 <http://bugs.freedesktop.org/show_bug.cgi?id=37459>
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit be83094bd98c353b0ee7894eefcb1ae91e0cae30)
+
+commit 11b70094aa66a85bc06e5c160cdc15139df94cb7
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon May 23 10:12:42 2011 +1000
+
+ syndaemon: fix abysimal indentation in dp_get_device.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit e4958186fae78770bc739be701b849f28c87cf11)
+
+commit ee216923ddaf4492c7e1eb026fa0b4f5e8ed5ec9
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu May 19 09:45:10 2011 +1000
+
+ include: update documentation for capabilities property
+
+ pressure and width were added recently
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 0c8971c80c21d7541d9614ac67a8d4954d4859ec)
+
+commit 77ad03caf8070a25d21e37ae3b7602be6cffe3b1
+Author: Christoph Brill <egore911@egore911.de>
+Date: Tue May 17 08:08:08 2011 +0200
+
+ Update maintainer information
+
+ There is no distinct maintainer for synaptics but everything should go
+ to the list.
+ (cherry picked from commit 8ad40444596259b8b5b60ae4069e94875253c21a)
+
+commit f23b388478cf60ee53aa4ca435693fcc9f3324ec
+Author: Diego Elio Pettenò <flameeyes@gmail.com>
+Date: Sat May 14 03:34:26 2011 +0200
+
+ README: fix typos.
+
+ Signed-off-by: Christoph Brill <egore911@egore911.de>
+ (cherry picked from commit 0c0e3e3df6af54777e47550e555e76c787f6f0a4)
+
+commit ccdf11061a08d664f092493968f182ac8241052b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun May 8 11:56:25 2011 -0700
+
+ Fix "nose canellation" typo in man page
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ (cherry picked from commit ec791423531a12129358a2e10b4f9b4721fcd761)
+
+commit de59d0368e427e5d1ed299b8769cbf15706801d7
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Apr 18 14:18:22 2011 +1000
+
+ synaptics 1.4.0.901
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 27d04237d60ba0bcd0dafa30f9fd076e80e4d2f6
+Author: Chase Douglas <chase.douglas@canonical.com>
+Date: Fri Apr 15 15:29:57 2011 -0400
+
+ Drain XRecord connection of any events after handling replies
+
+ If the X server sends an event to the XRecord connection the event
+ will never be handled. This will cause the event queue to fill up in
+ Xlib and lead to syndaemon running away at 100% cpu usage.
+
+ This change drains any events from the connection. It's not a fix for
+ the underlying bug in the server or Xlib, but it does paper over the
+ issue for now.
+
+ https://bugs.launchpad.net/bugs/754470
+ http://bugs.freedesktop.org/show_bug.cgi?id=31921
+
+ Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit bdc9c7cf9767bda77c690cb4211f6f6cb4567748)
+
+commit ae226ae5c90b9c6724e1f1cd44e6d223641e59fa
+Author: Cyril Brulebois <kibi@debian.org>
+Date: Thu Apr 14 05:38:25 2011 +0200
+
+ Fix egde/edge typo in manpage and comments.
+
+ Debian bug #622663 <http://bugs.debian.org/622663>
+
+ Signed-off-by: Cyril Brulebois <kibi@debian.org>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit fe05c60fee1f8fc24cc6cc2af7027d897607af2a)
+
+commit e783c187757b0412f53c8ec555d7f5bf7b10195b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Mar 18 20:56:51 2011 +1000
+
+ eventcomm: add a missing break statement
+
+ If the EV_SYN wasn't SYN_REPORT, we'd fall through to key event processing,
+ which almost certainly won't do what we want and/or need.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Cyril Brulebois <kibi@debian.org>
+ (cherry picked from commit ecf42db47629cadc7a332398a1784bb0acbd6511)
+
+commit 92ff5f4318ca602a2cdf3deb1d859a7235163416
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Mar 18 10:34:03 2011 +1000
+
+ conf: add a descriptive header with warning to example config file
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit b7acee2346494846e80d2fe25f699081a51c49a2)
+
+commit d25ba5e11d5b86978a576adaab539ca62311a881
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Mar 18 10:40:50 2011 +1000
+
+ conf: remove SHM example from fdi
+
+ SHM is dead for configuration.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit bc01d6a88ae84a0b1e52b8feb93c168d5120cd58)
+
+commit 847131077636bc935e3b4d7c9f1c94e537c3f79b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Mar 18 10:29:37 2011 +1000
+
+ man: add short blurb about InputClass configuration in servers 1.8
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 5f546777173dc78146025499d186fe97d31eaeac)
+
+commit e49d5d07c718df59802ac79511dcfcbd200dd9c7
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Mar 18 10:26:37 2011 +1000
+
+ man: update source path for fdi file and shorten description.
+
+ Don't describe what the example config file does in the man page, let the
+ file speak for itself. Point out that fdi files are for servers 1.5 - 1.7
+ only.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 86cab92b41443a5c9391b3bb20c93d902cf67961)
+
+commit a62aad0f94498ad7e80ee2408cb3e56860b8ccaf
+Author: Christoph Brill <egore911@egore911.de>
+Date: Wed Mar 9 23:25:05 2011 +0100
+
+ Add note about MatchDevicePath
+
+ This question seems to pop up very often. Add a note pointing to Peter's
+ blog entry describing the details of this misconfiguration.
+ (cherry picked from commit 0662e1c18122768549e51baf9ce3649c57ff0528)
+
+commit f963bc06f42b33e6f4452eab7dc10a4158cb0dd5
+Author: Alexandr Shadchin <alexandr.shadchin@gmail.com>
+Date: Mon Feb 28 16:38:19 2011 +0500
+
+ Fix typo (resx -> resy)
+
+ Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 3c598daec845ff6ef4ba0769ad78a0d562effe29)
+
commit de0dfb76444ad4160468d00515876c91a9fa20bf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 4 12:36:24 2011 +1000
diff --git a/debian/changelog b/debian/changelog
index 027a711..f745e3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-synaptics (1.4.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 28 Jun 2011 15:04:24 +0200
+
xserver-xorg-input-synaptics (1.4.0-1) unstable; urgency=low
* New upstream release:
commit a1c77348563d882a5da870d6884ee91434458689
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 28 14:47:04 2011 +1000
synaptics 1.4.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 8558e5b..01ca49b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-synaptics],
- [1.4.0.901],
+ [1.4.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-synaptics])
AC_CONFIG_SRCDIR([Makefile.am])
commit 65c8d5c703b2f9a65e3bf86b1ad35a0d439b46aa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 23 10:18:22 2011 +1000
syndaemon: don't compare against a null-property. (#37459)
synaptics_property is not set, touchpad_off_prop is the property we need to
check against.
False check for (nprops != 0) instead of (nprops < 0) would result in
syndaemon always reporting a touchpad device, even if none are present.
X.Org Bug 37459 <http://bugs.freedesktop.org/show_bug.cgi?id=37459>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit be83094bd98c353b0ee7894eefcb1ae91e0cae30)
diff --git a/tools/syndaemon.c b/tools/syndaemon.c
index 327f479..6e62dc5 100644
--- a/tools/syndaemon.c
+++ b/tools/syndaemon.c
@@ -465,7 +465,6 @@ dp_get_device(Display *dpy)
XDeviceInfo *info = NULL;
int ndevices = 0;
Atom touchpad_type = 0;
- Atom synaptics_property = 0;
Atom *properties = NULL;
int nprops = 0;
int error = 0;
@@ -495,10 +494,10 @@ dp_get_device(Display *dpy)
while(nprops--)
{
- if (properties[nprops] == synaptics_property)
+ if (properties[nprops] == touchpad_off_prop)
break;
}
- if (!nprops)
+ if (nprops < 0)
{
fprintf(stderr, "No synaptics properties on device '%s'.\n",
info[ndevices].name);
commit 11b70094aa66a85bc06e5c160cdc15139df94cb7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 23 10:12:42 2011 +1000
syndaemon: fix abysimal indentation in dp_get_device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit e4958186fae78770bc739be701b849f28c87cf11)
diff --git a/tools/syndaemon.c b/tools/syndaemon.c
index 47e0e6a..327f479 100644
--- a/tools/syndaemon.c
+++ b/tools/syndaemon.c
@@ -487,24 +487,24 @@ dp_get_device(Display *dpy)
properties = XListDeviceProperties(dpy, dev, &nprops);
if (!properties || !nprops)
{
- fprintf(stderr, "No properties on device '%s'.\n",
- info[ndevices].name);
- error = 1;
- goto unwind;
- }
+ fprintf(stderr, "No properties on device '%s'.\n",
+ info[ndevices].name);
+ error = 1;
+ goto unwind;
+ }
while(nprops--)
{
- if (properties[nprops] == synaptics_property)
- break;
- }
+ if (properties[nprops] == synaptics_property)
+ break;
+ }
if (!nprops)
{
- fprintf(stderr, "No synaptics properties on device '%s'.\n",
- info[ndevices].name);
- error = 1;
- goto unwind;
- }
+ fprintf(stderr, "No synaptics properties on device '%s'.\n",
+ info[ndevices].name);
+ error = 1;
+ goto unwind;
+ }
break; /* Yay, device is suitable */
}
commit ee216923ddaf4492c7e1eb026fa0b4f5e8ed5ec9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 19 09:45:10 2011 +1000
include: update documentation for capabilities property
pressure and width were added recently
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 0c8971c80c21d7541d9614ac67a8d4954d4859ec)
diff --git a/include/synaptics-properties.h b/include/synaptics-properties.h
index bdb2112..77a1806 100644
--- a/include/synaptics-properties.h
+++ b/include/synaptics-properties.h
@@ -145,8 +145,8 @@
/* 8 bit (BOOL), 1 value, tap-and-drag */
#define SYNAPTICS_PROP_GESTURES "Synaptics Gestures"
-/* 8 bit (BOOL), 5 values (read-only), has_left, has_middle, has_right,
- * has_double, has_triple */
+/* 8 bit (BOOL), 7 values (read-only), has_left, has_middle, has_right,
+ * has_double, has_triple, has_pressure, has_width */
#define SYNAPTICS_PROP_CAPABILITIES "Synaptics Capabilities"
/* 32 bit unsigned, 2 values, vertical, horizontal in units/millimeter */
commit 77ad03caf8070a25d21e37ae3b7602be6cffe3b1
Author: Christoph Brill <egore911@egore911.de>
Date: Tue May 17 08:08:08 2011 +0200
Update maintainer information
There is no distinct maintainer for synaptics but everything should go
to the list.
(cherry picked from commit 8ad40444596259b8b5b60ae4069e94875253c21a)
diff --git a/README b/README
index dbc4d13..65f1999 100644
--- a/README
+++ b/README
@@ -122,7 +122,7 @@ Authors
Many people have contributed to this driver. Look at the top of
synaptics.c and ps2comm.c for details.
-The current maintainer is Christoph Brill <egore911@egore911.de>.
+The current maintainer is X.org development team <xorg-devel@lists.x.org>.
Contacts
commit f23b388478cf60ee53aa4ca435693fcc9f3324ec
Author: Diego Elio Pettenò <flameeyes@gmail.com>
Date: Sat May 14 03:34:26 2011 +0200
README: fix typos.
Signed-off-by: Christoph Brill <egore911@egore911.de>
(cherry picked from commit 0c0e3e3df6af54777e47550e555e76c787f6f0a4)
diff --git a/README b/README
index e2bc57a..dbc4d13 100644
--- a/README
+++ b/README
@@ -138,9 +138,9 @@ Please submit bug reports to the Xorg bugzilla:
The master development code repository can be found at:
- git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptcis
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptics
- http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptcis
+ http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics
For patch submission instructions, see:
commit ccdf11061a08d664f092493968f182ac8241052b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun May 8 11:56:25 2011 -0700
Fix "nose canellation" typo in man page
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
(cherry picked from commit ec791423531a12129358a2e10b4f9b4721fcd761)
diff --git a/man/synaptics.man b/man/synaptics.man
index cd80641..cb5f4c6 100644
--- a/man/synaptics.man
+++ b/man/synaptics.man
@@ -728,7 +728,7 @@ active, scrolling will stop, and circular scrolling will not start,
when the finger leaves the corner.
.SS Noise cancellation
-The synaptics has a built-in nose canellation based on hysteresis. This means
+The synaptics has a built-in noise cancellation based on hysteresis. This means
that incoming coordinates actually shift a box of predefined dimensions such
that it covers the incoming coordinate, and only the boxes own center is used
as input. Obviously, the smaller the box the better, but the likelyhood of
commit de59d0368e427e5d1ed299b8769cbf15706801d7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Apr 18 14:18:22 2011 +1000
synaptics 1.4.0.901
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reply to: