Attachment 29076 Details for Bug 21614 – Quirk - Fourth draft

[patch] Quirk - Fourth draft

threshold_patch.patch (text/plain), 9.39 KB, created by Alberto Milone on 2009-09-01 07:41:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alberto Milone

Created: 2009-09-01 07:41:22 UTC

Size: 9.39 KB

patch

obsolete

>diff --git a/fdi/11-x11-synaptics.fdi b/fdi/11-x11-synaptics.fdi
>index 46ad7b9..e26f174 100644
>--- a/fdi/11-x11-synaptics.fdi
>+++ b/fdi/11-x11-synaptics.fdi
>@@ -26,6 +26,12 @@
> 
> 	For other possible options, check CONFIGURATION DETAILS in synaptics man page
>         -->
>+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="Inspiron 1011">
>+            <merge key="input.x11_options.JumpyCursorThreshold" type="string">90</merge>
>+        </match>
>+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="HP MiniNote 1000">
>+            <merge key="input.x11_options.JumpyCursorThreshold" type="string">200</merge>
>+        </match>
>     </match>
>   </device>
> </deviceinfo>
>diff --git a/include/synaptics-properties.h b/include/synaptics-properties.h
>index cf330d8..9762058 100644
>--- a/include/synaptics-properties.h
>+++ b/include/synaptics-properties.h
>@@ -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_ */
>diff --git a/man/synaptics.man b/man/synaptics.man
>index 6febe7f..5f7dbd1 100644
>--- a/man/synaptics.man
>+++ b/man/synaptics.man
>@@ -509,6 +509,14 @@ Ignore movements, scrolling and tapping which take place below this edge.
> 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"
> .
>+.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
> 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, three-finger detection.
> .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"
> There is an example hal policy file in
> .I ${sourcecode}/fdi/11-x11-synaptics.fdi
>diff --git a/src/properties.c b/src/properties.c
>index 4366034..94099c9 100644
>--- a/src/properties.c
>+++ b/src/properties.c
>@@ -84,6 +84,7 @@ Atom prop_gestures              = 0;
> 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)
>@@ -274,6 +275,8 @@ InitDeviceProperties(LocalDevicePtr local)
>     values[2] = para->area_top_edge;
>     values[3] = para->area_bottom_edge;
>     prop_area = InitAtom(local->dev, SYNAPTICS_PROP_AREA, 32, 4, values);
>+
>+    prop_jumpycursor_threshold = InitAtom(local->dev, SYNAPTICS_PROP_JUMPYCURSOR_THRESHOLD, 32, 1, &para->jumpycursor_threshold);
> }
> 
> int
>@@ -642,6 +645,12 @@ SetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
>         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;
>diff --git a/src/synaptics.c b/src/synaptics.c
>index f84f684..1281cdc 100644
>--- a/src/synaptics.c
>+++ b/src/synaptics.c
>@@ -132,6 +132,9 @@ static void ReadDevDimensions(LocalDevicePtr);
> 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);
> int SetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
>@@ -534,6 +537,7 @@ static void set_default_parameters(LocalDevicePtr local)
>     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) {
>@@ -1566,11 +1570,12 @@ HandleTapProcessing(SynapticsPrivate *priv, struct SynapticsHwState *hw,
> #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;
> }
>@@ -1719,11 +1724,70 @@ ComputeDeltas(SynapticsPrivate *priv, struct SynapticsHwState *hw,
> 	dy += hw->guest_dy;
>     }
> 
>+    /* 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 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:
>+
>     *dxP = dx;
>     *dyP = dy;
> 
>     /* 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);
> 
>     return delay;
> }
>diff --git a/src/synapticsstr.h b/src/synapticsstr.h
>index 2986173..4f2df8e 100644
>--- a/src/synapticsstr.h
>+++ b/src/synapticsstr.h
>@@ -33,6 +33,7 @@
> typedef struct _SynapticsMoveHist
> {
>     int x, y;
>+    int num_fingers;
>     int millis;
> } SynapticsMoveHistRec;
> 
>@@ -149,6 +150,7 @@ typedef struct _SynapticsParameters
>     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;
> 
> 
>diff --git a/tools/synclient.c b/tools/synclient.c
>index 032b129..d058b01 100644
>--- a/tools/synclient.c
>+++ b/tools/synclient.c
>@@ -143,6 +143,7 @@ static struct Parameter params[] = {
>     {"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 }
> };
>

Actions: View | Splinter Review

Attachments on bug 21614: 25641 | 27760 | 27846 | 27915 | 29076 | 40902

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.