Attachment 299437 Details for Bug 437039 – Updated synaptics-0.14.6-alps.patch

[patch] Updated synaptics-0.14.6-alps.patch

synaptics-0.14.6-alps.patch (text/plain), 1.64 KB, created by Chris Wright on 2008-03-28 06:45:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wright

Created: 2008-03-28 06:45:53 UTC

Size: 1.64 KB

patch

obsolete

>diff -up synaptics-0.14.6/eventcomm.c.alps-settings synaptics-0.14.6/eventcomm.c
>--- synaptics-0.14.6/eventcomm.c.alps-settings	2006-07-15 08:54:29.000000000 -0700
>+++ synaptics-0.14.6/eventcomm.c	2008-03-27 23:25:56.000000000 -0700
>@@ -17,6 +17,7 @@
>  *
>  */
> 
>+#define SYNAPTICS_PRIVATE
> #include "eventcomm.h"
> #include <errno.h>
> #include <sys/types.h>
>@@ -93,12 +94,30 @@ event_query_is_touchpad(int fd)
> static Bool
> EventQueryHardware(LocalDevicePtr local, struct SynapticsHwInfo *synhw)
> {
>-    if (event_query_is_touchpad(local->fd)) {
>-	xf86Msg(X_PROBED, "%s touchpad found\n", local->name);
>-	return TRUE;
>+    if (!event_query_is_touchpad(local->fd))
>+	return FALSE;
>+
>+    xf86Msg(X_PROBED, "%s touchpad found\n", local->name);
>+
>+    /* awful */
>+    if (strstr(local->name, "ALPS")) {
>+	SynapticsSHM *pars = ((SynapticsPrivate *)local->private)->synpara;
>+	void *opts = local->options;
>+
>+	pars->left_edge = xf86SetIntOption(opts, "LeftEdge", 120);
>+	pars->right_edge = xf86SetIntOption(opts, "RightEdge", 830);
>+	pars->top_edge = xf86SetIntOption(opts, "TopEdge", 120);
>+	pars->bottom_edge = xf86SetIntOption(opts, "BottomEdge", 650);
>+	pars->finger_low = xf86SetIntOption(opts, "FingerLow", 14);
>+	pars->finger_high = xf86SetIntOption(opts, "FingerHigh", 15);
>+	pars->tap_move = xf86SetIntOption(opts, "MaxTapMove", 110);
>+	pars->scroll_dist_vert = xf86SetIntOption(opts, "VertScrollDelta", 20);
>+	pars->scroll_dist_horiz = xf86SetIntOption(opts, "HorizScrollDelta", 20);
>+	pars->min_speed = xf86SetRealOption(opts, "MinSpeed", 0.3);
>+	pars->max_speed = xf86SetRealOption(opts, "MaxSpeed", 0.75);
>     }
> 
>-    return FALSE;
>+    return TRUE;
> }
> 
> static Bool

Actions: View | Diff

Attachments on bug 437039: 299437