Attachment 21907 Details for Bug 19525 – Patch for pointer glide in Synaptics touchpad driver, generated by git-diff.

[patch] Patch for pointer glide in Synaptics touchpad driver, generated by git-diff.

synaptics-pointer-glide.git.diff (text/plain), 8.41 KB, created by Dylan McCall on 2009-01-12 16:08:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dylan McCall

Created: 2009-01-12 16:08:59 UTC

Size: 8.41 KB

patch

obsolete

>diff --git a/include/synaptics-properties.h b/include/synaptics-properties.h
>index ae0bc29..9020f32 100644
>--- a/include/synaptics-properties.h
>+++ b/include/synaptics-properties.h
>@@ -122,6 +122,15 @@
> #define SYNAPTICS_PROP_CIRCULAR_PAD "Synaptics Circular Pad"
> 
> /* 8 bit (BOOL) */
>+#define SYNAPTICS_PROP_POINTER_GLIDE "Synaptics Pointer Glide"
>+
>+/* XXX: 32 bit */
>+#define SYNAPTICS_PROP_POINTER_GLIDE_FRICTION "Synaptics Pointer Glide Friction"
>+
>+/* XXX: 32 bit */
>+#define SYNAPTICS_PROP_POINTER_GLIDE_MAX_SPEED "Synaptics Pointer Glide Max Speed"
>+
>+/* 8 bit (BOOL) */
> #define SYNAPTICS_PROP_PALM_DETECT "Synaptics Palm Detection"
> 
> /* 32 bit, 2 values, width, z */
>diff --git a/include/synaptics.h b/include/synaptics.h
>index 7e55293..e714762 100644
>--- a/include/synaptics.h
>+++ b/include/synaptics.h
>@@ -124,6 +124,9 @@ typedef struct _SynapticsSHM
>     double scroll_dist_circ;		    /* Scrolling angle radians */
>     int circular_trigger;		    /* Trigger area for circular scrolling */
>     Bool circular_pad;			    /* Edge has an oval or circular shape */
>+    Bool pointer_glide;			    /* If true, pointer will continue moving for a moment after finger is lifted */
>+    double pointer_glide_friction;	    /* Friction coefficient used to slow down pointer glide. Defaults to 0.004 in synaptics.c */
>+    double pointer_glide_max_speed;	    /* Pointer glide is limited to move at this speed (in pixels / millisecond) */
>     Bool palm_detect;			    /* Enable Palm Detection */
>     int palm_min_width;			    /* Palm detection width */
>     int palm_min_z;			    /* Palm detection depth */
>diff --git a/src/properties.c b/src/properties.c
>index ea348cc..a659e94 100644
>--- a/src/properties.c
>+++ b/src/properties.c
>@@ -66,6 +66,9 @@ Atom prop_circscroll            = 0;
> Atom prop_circscroll_dist       = 0;
> Atom prop_circscroll_trigger    = 0;
> Atom prop_circpad               = 0;
>+Atom prop_pointer_glide         = 0;
>+Atom prop_pointer_glide_friction = 0;
>+Atom prop_pointer_glide_max_speed = 0;
> Atom prop_palm                  = 0;
> Atom prop_palm_dim              = 0;
> Atom prop_coastspeed            = 0;
>@@ -188,6 +191,9 @@ InitDeviceProperties(LocalDevicePtr local)
>     /* FIXME: missing: scroll_dist_circ is a float */
>     prop_circscroll_trigger = InitAtom(local->dev, SYNAPTICS_PROP_CIRCULAR_SCROLLING_TRIGGER, 8, 1, &para->circular_trigger);
>     prop_circpad = InitAtom(local->dev, SYNAPTICS_PROP_CIRCULAR_PAD, 8, 1, &para->circular_pad);
>+    prop_pointer_glide = InitAtom(local->dev, SYNAPTICS_PROP_POINTER_GLIDE, 8, 1, &para->pointer_glide);
>+    /* FIXME: missing: pointer_glide_friction is a float */
>+    /* FIXME: missing: prop_pointer_glide_max_speed is a float */
>     prop_palm = InitAtom(local->dev, SYNAPTICS_PROP_PALM_DETECT, 8, 1, &para->palm_detect);
> 
>     values[0] = para->palm_min_width;
>@@ -475,6 +481,18 @@ SetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
>             return BadMatch;
> 
>         para->circular_pad = *(BOOL*)prop->data;
>+    } else if (property == prop_pointer_glide)
>+    {
>+        if (prop->size != 1 || prop->format != 8 || prop->type != XA_INTEGER)
>+            return BadMatch;
>+        
>+        para->pointer_glide = *(BOOL*)prop->data;
>+    } else if (property == prop_pointer_glide_friction)
>+    {
>+        /* FIXME */
>+    } else if (property == prop_pointer_glide_max_speed)
>+    {
>+        /* FIXME */
>     } else if (property == prop_palm)
>     {
>         if (prop->size != 1 || prop->format != 8 || prop->type != XA_INTEGER)
>diff --git a/src/synaptics.c b/src/synaptics.c
>index 664d2fa..d2c4e83 100644
>--- a/src/synaptics.c
>+++ b/src/synaptics.c
>@@ -483,7 +483,10 @@ static void set_default_parameters(LocalDevicePtr local)
>     pars->single_tap_timeout = xf86SetIntOption(opts, "SingleTapTimeout", 180);
>     pars->press_motion_min_z = xf86SetIntOption(opts, "PressureMotionMinZ", pressureMotionMinZ);
>     pars->press_motion_max_z = xf86SetIntOption(opts, "PressureMotionMaxZ", pressureMotionMaxZ);
>+    pars->pointer_glide = xf86SetBoolOption(opts, "PointerGlide", FALSE);
> 
>+    pars->pointer_glide_friction = synSetFloatOption(opts, "PointerGlideFriction", 0.0012);
>+    pars->pointer_glide_max_speed = synSetFloatOption(opts, "PointerGlideMaxSpeed", 1.6); /* Totally arbitrary default. 1.6 pixels / millisecond, 1600 pixels / second */
>     pars->min_speed = synSetFloatOption(opts, "MinSpeed", 0.4);
>     pars->max_speed = synSetFloatOption(opts, "MaxSpeed", 0.7);
>     pars->accl = synSetFloatOption(opts, "AccelFactor", accelFactor);
>@@ -2110,10 +2113,58 @@ HandleState(LocalDevicePtr local, struct SynapticsHwState *hw)
> 	    delay = MIN(delay, repeat_delay);
> 	}
>     }
>+    
>+    if  ( para->pointer_glide == TRUE && finger == FS_UNTOUCHED ) //Pointer glide stuff. If there is not a finger on the touchpad...
>+    {	
>+	if ( priv->finger_state == FS_TOUCHED ) //...but there was previously
>+	{
>+		//Finger has just been lifted! Determine the velocity from before finger was lifted
>+		int dtime = HIST(1).millis - HIST(2).millis; // Time in milliseconds between two recent direct pointer moves...
>+		priv->glide_angle = atan2((double) priv->prev_dy,(double) priv->prev_dx);
>+		priv->glide_speed = move_distance(priv->prev_dx,priv->prev_dy) / (double) dtime; /* Glide speed is pixels / millisecond */
>+		priv->glide_timestamp_millis = HIST(1).millis;
>+	}
>+	if ( priv->glide_speed != 0) //...and if we have built momentum for gliding
>+	{
>+		/* FIXME: I wish we could base this on para->max_speed, but that is based on pixels / packets */
>+		if (para->pointer_glide_max_speed != 0 && priv->glide_speed > para->pointer_glide_max_speed)
>+			priv->glide_speed = para->pointer_glide_max_speed;
>+		
>+		int dtime = hw->millis - priv->glide_timestamp_millis; /* Time in milliseconds between last time glide function was performed and now */
>+		
>+		double velocity_change = (double) dtime * para->pointer_glide_friction;
>+		
>+		/* Slow down gliding at a consistent rate... */
>+		if ( priv->glide_speed - velocity_change >= 0 )
>+		{
>+			priv->glide_speed -= velocity_change;
>+		} else if ( priv->glide_speed + velocity_change <= 0 )
>+		{
>+			priv->glide_speed += velocity_change;
>+		} else {
>+			priv->glide_speed = 0;
>+		}
>+		
>+		double glide = priv->glide_speed * dtime;
>+		int glide_x = (int) (glide*cos(priv->glide_angle));
>+		int glide_y = (int) (glide*sin(priv->glide_angle));
>+		
>+		xf86PostMotionEvent(local->dev, 0, 0, 2, glide_x, glide_y);
>+		
>+		priv->glide_timestamp_millis = hw->millis;
>+	
>+		delay = MIN(delay,10);
>+	}
>+    } else if ( priv->glide_speed != 0 )
>+    {
>+	priv->glide_speed = 0;
>+    }
> 
>     /* Save old values of some state variables */
>     priv->finger_state = finger;
>     priv->lastButtons = buttons;
>+    priv->prev_dx = dx;
>+    priv->prev_dy = dy;
> 
>     return delay;
> }
>diff --git a/src/synapticsstr.h b/src/synapticsstr.h
>index 688167c..2c987b7 100644
>--- a/src/synapticsstr.h
>+++ b/src/synapticsstr.h
>@@ -137,6 +137,12 @@ typedef struct _SynapticsPrivateRec
> 					   palm/finger contact disappears */
>     int prev_z;				/* previous z value, for palm detection */
>     int avg_width;			/* weighted average of previous fingerWidth values */
>+    
>+    int prev_dx, prev_dy;		/* Previous X and Y deltas for pointer movement */
>+    
>+    int glide_timestamp_millis;		/* Last time pointer glide was processed */
>+    double glide_angle;			/* Angle of pointer glide */
>+    double glide_speed;			/* Speed of pointer glide in pixels / millisecond */
> 
>     int minx, maxx, miny, maxy;         /* min/max dimensions as detected */
>     int minp, maxp, minw, maxw;		/* min/max pressure and finger width as detected */
>diff --git a/tools/synclient.c b/tools/synclient.c
>index 2677d63..f4ea5a1 100644
>--- a/tools/synclient.c
>+++ b/tools/synclient.c
>@@ -114,6 +114,9 @@ static struct Parameter params[] = {
>     DEFINE_PAR("CircScrollDelta",      scroll_dist_circ,        PT_DOUBLE, .01, 3),
>     DEFINE_PAR("CircScrollTrigger",    circular_trigger,        PT_INT,    0, 8),
>     DEFINE_PAR("CircularPad",          circular_pad,            PT_BOOL,   0, 1),
>+    DEFINE_PAR("PointerGlide",         pointer_glide,           PT_BOOL,   0, 1),
>+    DEFINE_PAR("PointerGlideFriction", pointer_glide_friction,  PT_DOUBLE, 0, 1.0),
>+    DEFINE_PAR("PointerGlideMaxSpeed", pointer_glide_max_speed, PT_DOUBLE, 0, 200.0),
>     DEFINE_PAR("PalmDetect",           palm_detect,             PT_BOOL,   0, 1),
>     DEFINE_PAR("PalmMinWidth",         palm_min_width,          PT_INT,    0, 15),
>     DEFINE_PAR("PalmMinZ",             palm_min_z,              PT_INT,    0, 255),

Actions: View | Splinter Review

Attachments on bug 19525: 21907

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.