rpms/synaptics/devel synaptics-0.14.6-alps.patch, NONE, 1.1 synaptics.spec, 1.33, 1.34

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/synaptics/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31978

Modified Files:
	synaptics.spec 
Added Files:
	synaptics-0.14.6-alps.patch 
Log Message:
* Wed Mar 26 2008 Adam Jackson <ajax at redhat.com> 0.14.6-6
- synaptics-0.14.6-alps.patch: Fix the defaults on ALPS touchpads.  Values
  stolen from rhpxl.


synaptics-0.14.6-alps.patch:

--- NEW FILE synaptics-0.14.6-alps.patch ---
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 11:54:29.000000000 -0400
+++ synaptics-0.14.6/eventcomm.c	2008-03-26 18:34:57.000000000 -0400
@@ -17,6 +17,7 @@
  *
  */
 
+#define SYNAPTICS_PRIVATE
 #include "eventcomm.h"
 #include <errno.h>
 #include <sys/types.h>
@@ -93,12 +94,32 @@ 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_default;
+	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);
+	if (!xf86CheckStrOption(opts, "MinSpeed", "0.3"))
+	    pars->min_speed = 0.3;
+	if (!xf86CheckStrOption(opts, "MaxSpeed", "0.75"))
+	    pars->min_speed = 0.75;
     }
 
-    return FALSE;
+    return TRUE;
 }
 
 static Bool


Index: synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synaptics/devel/synaptics.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- synaptics.spec	18 Mar 2008 15:29:07 -0000	1.33
+++ synaptics.spec	26 Mar 2008 22:37:05 -0000	1.34
@@ -2,7 +2,7 @@
 
 Name:           synaptics
 Version:        0.14.6
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:        Synaptics Touchpad Driver
 
 Group:          User Interface/X Hardware Support
@@ -15,6 +15,7 @@
 Patch2: synaptics-0.14.6-tap-to-click.patch
 Patch3: synaptics-0.14.6-poll-delay.patch
 Patch4: synaptics-0.14.6-poll-200ms.patch
+Patch5: synaptics-0.14.6-alps.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	pkgconfig
 BuildRequires:	xorg-x11-server-sdk >= 1.0.99.901
@@ -55,6 +56,7 @@
 %patch2 -p1 -b .tap
 %patch3 -p1 -b .polldelay
 %patch4 -p1 -b .poll200ms
+%patch5 -p1 -b .alps-settings
 # remove included XFree86 headers
 rm -rf Xincludes
 
@@ -85,6 +87,10 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Mar 26 2008 Adam Jackson <ajax at redhat.com> 0.14.6-6
+- synaptics-0.14.6-alps.patch: Fix the defaults on ALPS touchpads.  Values
+  stolen from rhpxl.
+
 * Tue Mar 18 2008 Matt Domsch <Matt_Domsch at dell.com> 0.14.6-5
 - synaptics-0.14.6-poll-delay.patch: make poll interval user configurable
   http://www.bughost.org/pipermail/power/2008-January/001234.html