xserver-xorg-input-synaptics: Changes to 'ubuntu+1'
debian/changelog | 17 +++
debian/patches/122_revert_pressure_finger_default.patch | 38 --------
debian/patches/126_default_speed.patch | 11 ++
debian/patches/series | 2
src/synaptics.c | 72 ----------------
5 files changed, 31 insertions(+), 109 deletions(-)
New commits:
commit 700c18c043b50c1facf6507c74fb1421340e3caf
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Thu Jan 12 03:59:50 2012 -0800
releasing version 1.5.0+git20120101-1ubuntu1~nomt3
diff --git a/debian/changelog b/debian/changelog
index ed876a6..d792baf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-input-synaptics (1.5.0+git20120101-1ubuntu1~nomt3) UNRELEASED; urgency=low
+xserver-xorg-input-synaptics (1.5.0+git20120101-1ubuntu1~nomt3) precise; urgency=low
* Fix default speed due to change in motion estimation
- Add 126_default_speed.patch
- -- Chase Douglas <chase.douglas@ubuntu.com> Thu, 12 Jan 2012 03:48:25 -0800
+ -- Chase Douglas <chase.douglas@ubuntu.com> Thu, 12 Jan 2012 03:59:25 -0800
xserver-xorg-input-synaptics (1.5.0+git20120101-1ubuntu1~nomt2) precise; urgency=low
commit e0fb049881d049520bc5389dae3153924b45aa60
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Thu Jan 12 03:49:51 2012 -0800
Fix default speed due to change in motion estimation
* Fix default speed due to change in motion estimation
- Add 126_default_speed.patch
diff --git a/debian/changelog b/debian/changelog
index 16d8aac..ed876a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-synaptics (1.5.0+git20120101-1ubuntu1~nomt3) UNRELEASED; urgency=low
+
+ * Fix default speed due to change in motion estimation
+ - Add 126_default_speed.patch
+
+ -- Chase Douglas <chase.douglas@ubuntu.com> Thu, 12 Jan 2012 03:48:25 -0800
+
xserver-xorg-input-synaptics (1.5.0+git20120101-1ubuntu1~nomt2) precise; urgency=low
* Drop patch 122_revert_pressure_finger_default.patch, merged upstream
diff --git a/debian/patches/126_default_speed.patch b/debian/patches/126_default_speed.patch
new file mode 100644
index 0000000..62b37cb
--- /dev/null
+++ b/debian/patches/126_default_speed.patch
@@ -0,0 +1,11 @@
+--- a/src/synaptics.c
++++ b/src/synaptics.c
+@@ -581,7 +581,7 @@ static void set_default_parameters(Input
+ pars->press_motion_max_z = xf86SetIntOption(opts, "PressureMotionMaxZ", pressureMotionMaxZ);
+ pars->resolution_detect = xf86SetBoolOption(opts, "ResolutionDetect", TRUE);
+
+- pars->min_speed = xf86SetRealOption(opts, "MinSpeed", 0.4);
++ pars->min_speed = xf86SetRealOption(opts, "MinSpeed", 0.25);
+ pars->max_speed = xf86SetRealOption(opts, "MaxSpeed", 0.7);
+ pars->accl = xf86SetRealOption(opts, "AccelFactor", accelFactor);
+ pars->trackstick_speed = xf86SetRealOption(opts, "TrackstickSpeed", 40);
diff --git a/debian/patches/series b/debian/patches/series
index 12b44ec..87644a2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@
#123_order_ProcessTouch_for_numFingers.patch
124_syndaemon_events.patch
125_option_rec_revert.patch
+126_default_speed.patch
commit fd874522671fa5416774b85c4bd410f1defa003e
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Jan 11 08:32:14 2012 -0800
Revert "Replace the motion estimator"
This reverts commit b26125e412a130b7a8f8b6adf9ffc8e9cc8df42c.
Conflicts:
src/synaptics.c
diff --git a/src/synaptics.c b/src/synaptics.c
index 9490106..0732e89 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -1827,70 +1827,6 @@ get_edge_speed(SynapticsPrivate *priv, const struct SynapticsHwState *hw,
}
}
-/*
- * Fit a line through the three most recent points in the motion
- * history and return relative co-ordinates.
- */
-static void regress(SynapticsPrivate *priv, const struct SynapticsHwState *hw,
- double *dx, double *dy, CARD32 start_time)
-{
- int i;
- int packet_count = MIN(priv->count_packet_finger, 3);
- double ym = 0, xm = 0, tm = 0;
- double yb1n = 0, xb1n = 0, b1d = 0, xb1, yb1;
-
- /* If there's only one packet, we can't really fit a line. However, we
- * don't want to lose very short interactions with the pad, so we pass on
- * an unfiltered delta using the current hardware position. */
- if (packet_count == 1) {
- *dx = hw->x - HIST(0).x;
- *dy = hw->y - HIST(0).y;
- return;
- }
-
- /*
- * Using ordinary least squares, calculate best fit lines through the most
- * recent (up to) 3 entries in the motion history.
- *
- * Because millis is unsigned, we do our subtractions in reverse order to
- * ensure the result is always positive. The end result is that our slope
- * is the negative of the slope we actually want.
- *
- * Note: the X and Y axes are treated as independent data sets for
- * simplicity.
- */
- for (i = 0; i < packet_count; i++) {
- ym += HIST(i).y;
- xm += HIST(i).x;
- tm += HIST_DELTA(i, 0, millis);
- }
- ym /= packet_count;
- tm /= packet_count;
- xm /= packet_count;
-
- for (i = 0; i < packet_count; i++) {
- double t = HIST_DELTA(i, 0, millis);
- yb1n += (t - tm) * (HIST(i).y - ym);
- xb1n += (t - tm) * (HIST(i).x - xm);
- b1d += (t - tm) * (t - tm);
- }
- xb1 = xb1n/b1d;
- yb1 = yb1n/b1d;
-
- /*
- * Here we use the slope component (b1) of the regression line as a speed
- * estimate, and calculate how far the contact would have moved between
- * the current time (hw->millis) and the last time we output a delta
- * (start_time).
- *
- * The negative is because the slope is going the exact wrong direction
- * (see above).
- */
- *dx = -xb1 * (start_time - hw->millis);
- *dy = -yb1 * (start_time - hw->millis);
- return;
-}
-
static void
get_delta(SynapticsPrivate *priv, const struct SynapticsHwState *hw,
edge_type edge, double *dx, double *dy)
@@ -1902,9 +1838,9 @@ get_delta(SynapticsPrivate *priv, const struct SynapticsHwState *hw,
int x_edge_speed = 0;
int y_edge_speed = 0;
- /* regress() performs the actual motion prediction. */
- regress(priv, hw, dx, dy, priv->last_motion_millis);
- priv->last_motion_millis = hw->millis;
+ /* HIST is full enough: priv->count_packet_finger > 3 */
+ *dx = estimate_delta(hw->x, HIST(0).x, HIST(1).x, HIST(2).x);
+ *dy = estimate_delta(hw->y, HIST(0).y, HIST(1).y, HIST(2).y);
if ((priv->tap_state == TS_DRAG) || para->edge_motion_use_always)
get_edge_speed(priv, hw, edge, &x_edge_speed, &y_edge_speed);
@@ -1965,7 +1901,7 @@ ComputeDeltas(SynapticsPrivate *priv, const struct SynapticsHwState *hw,
* POLL_MS declaration. */
delay = MIN(delay, POLL_MS);
- if (priv->count_packet_finger < 1) /* min. 1 packet, see regress() */
+ if (priv->count_packet_finger <= 3) /* min. 3 packets, see get_delta() */
goto out; /* skip the lot */
if (priv->moving_state == MS_TRACKSTICK)
commit 02a8758bc57656620b4ceb484745dfc1ab74ddf7
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Mon Jan 9 07:04:09 2012 -0800
releasing version 1.5.0+git20120101-1ubuntu1~nomt2
diff --git a/debian/changelog b/debian/changelog
index ca3e194..16d8aac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-synaptics (1.5.0+git20120101-1ubuntu1~nomt2) UNRELEASED; urgency=low
+xserver-xorg-input-synaptics (1.5.0+git20120101-1ubuntu1~nomt2) precise; urgency=low
* Drop patch 122_revert_pressure_finger_default.patch, merged upstream
- -- Chase Douglas <chase.douglas@ubuntu.com> Mon, 09 Jan 2012 07:01:38 -0800
+ -- Chase Douglas <chase.douglas@ubuntu.com> Mon, 09 Jan 2012 07:03:52 -0800
xserver-xorg-input-synaptics (1.5.0+git20120101-1ubuntu1~nomt1) precise; urgency=low
commit 401ea7a408e164de4ac8ce2bdee8919f94b871f3
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Mon Jan 9 07:03:15 2012 -0800
Drop patch 122_revert_pressure_finger_default.patch, merged upstream
diff --git a/debian/changelog b/debian/changelog
index 3c60428..ca3e194 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-synaptics (1.5.0+git20120101-1ubuntu1~nomt2) UNRELEASED; urgency=low
+
+ * Drop patch 122_revert_pressure_finger_default.patch, merged upstream
+
+ -- Chase Douglas <chase.douglas@ubuntu.com> Mon, 09 Jan 2012 07:01:38 -0800
+
xserver-xorg-input-synaptics (1.5.0+git20120101-1ubuntu1~nomt1) precise; urgency=low
* Lower xserver-xorg-dev build dep for Precise's X server
diff --git a/debian/patches/series b/debian/patches/series
index 094f3ae..12b44ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,7 +13,6 @@
#119_active_area_touches.patch
#120_active_touches_num_fingers.patch
#121_semi-mt_num_fingers.patch
-122_revert_pressure_finger_default.patch
#123_order_ProcessTouch_for_numFingers.patch
124_syndaemon_events.patch
125_option_rec_revert.patch
commit 3563f9afb8d36022555bcbd4df1a95623f19be93
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Mon Jan 9 07:01:28 2012 -0800
releasing version 1.5.0+git20120101-1ubuntu1~nomt1
diff --git a/debian/changelog b/debian/changelog
index c8f282b..3c60428 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-input-synaptics (1.5.0+git20120101-1ubuntu1~nomt1) UNRELEASED; urgency=low
+xserver-xorg-input-synaptics (1.5.0+git20120101-1ubuntu1~nomt1) precise; urgency=low
* Lower xserver-xorg-dev build dep for Precise's X server
* Revert xf86OptionRec upstream changes
- This particular API change will not be in Precise's X server
- -- Chase Douglas <chase.douglas@ubuntu.com> Sat, 07 Jan 2012 09:13:02 -0800
+ -- Chase Douglas <chase.douglas@ubuntu.com> Mon, 09 Jan 2012 07:00:49 -0800
xserver-xorg-input-synaptics (1.5.0+git20120101-1) experimental; urgency=low
diff --git a/debian/patches/122_revert_pressure_finger_default.patch b/debian/patches/122_revert_pressure_finger_default.patch
deleted file mode 100644
index 66c7114..0000000
--- a/debian/patches/122_revert_pressure_finger_default.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From c31cbe1a856dd6a1093469091d90ac12619b6244 Mon Sep 17 00:00:00 2001
-From: Chase Douglas <chase.douglas@canonical.com>
-Date: Wed, 30 Mar 2011 10:47:13 -0400
-Subject: [PATCH] Revert "Default to 2-finger emulation when HW supports it"
-
-The default pressure threshold set by this patch is low enough to cause
-spurious behavior in some devices. One bug report also notes that the
-pressure values seem to vary with environment state (temperature,
-air pressure, etc.). Thus, this commit is being reverted to restore
-behavior to what it was before Natty.
-
-This reverts upstream commit ffa6dc2809734a6aaa690e9133d6761480603a68.
-
-Fixes LP: #742213
-
-Reported-by: steubens (https://launchpad.net/~d-launchpad-lez-ath-cx)
-Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
----
- src/synaptics.c | 7 +------
- 1 files changed, 1 insertions(+), 6 deletions(-)
-
-Index: xserver-xorg-input-synaptics/src/synaptics.c
-===================================================================
---- xserver-xorg-input-synaptics.orig/src/synaptics.c 2011-12-19 11:16:14.000000000 +1100
-+++ xserver-xorg-input-synaptics/src/synaptics.c 2011-12-19 11:24:53.746135268 +1100
-@@ -459,6 +459,12 @@
-
- range = priv->maxw - priv->minw + 1;
-
-+ /* Enable emulation when hw supports both pressure and width. */
-+ if (!priv->has_double && priv->has_width)
-+ emulateTwoFingerMinZ = fingerHigh;
-+ else
-+ emulateTwoFingerMinZ = priv->minp + range * (282.0/256);
-+
- /* scaling based on defaults below and a tool width of 16 */
- palmMinWidth = priv->minw + range * (10.0/16);
- emulateTwoFingerMinW = priv->minw + range * (7.0/16);
Reply to: