rpms/synaptics/devel synaptics-0.14.6-poll-200ms.patch, NONE, 1.1 synaptics-0.14.6-poll-delay.patch, NONE, 1.1 synaptics.spec, 1.32, 1.33

Matt Domsch (mdomsch) fedora-extras-commits at redhat.com
Tue Mar 18 15:29:58 UTC 2008


Author: mdomsch

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

Modified Files:
	synaptics.spec 
Added Files:
	synaptics-0.14.6-poll-200ms.patch 
	synaptics-0.14.6-poll-delay.patch 
Log Message:
make poll delay configurable, change default from 20ms to 200ms

synaptics-0.14.6-poll-200ms.patch:

--- NEW FILE synaptics-0.14.6-poll-200ms.patch ---
--- synaptics-0.14.6/syndaemon.c.orig	2008-03-17 20:20:14.000000000 -0500
+++ synaptics-0.14.6/syndaemon.c	2008-03-17 20:30:35.000000000 -0500
@@ -47,7 +47,7 @@ usage()
     fprintf(stderr, "  -i How many seconds to wait after the last key press before\n");
     fprintf(stderr, "     enabling the touchpad. (default is 2.0s)\n");
     fprintf(stderr, "  -m How many milli-seconds to wait until next poll.\n");
-    fprintf(stderr, "     (default is 20ms)\n");
+    fprintf(stderr, "     (default is 200ms)\n");
     fprintf(stderr, "  -d Start as a daemon, ie in the background.\n");
     fprintf(stderr, "  -p Create a pid file with the specified name.\n");
     fprintf(stderr, "  -t Only disable tapping and scrolling, not mouse movements.\n");
@@ -229,7 +229,7 @@ int
 main(int argc, char *argv[])
 {
     double idle_time = 2.0;
-	int poll_delay = 20000;	    /* 20 ms */
+    int poll_delay = 200000;	    /* 200 ms */
     Display *display;
     int c;
     int shmid;

synaptics-0.14.6-poll-delay.patch:

--- NEW FILE synaptics-0.14.6-poll-delay.patch ---
--- ./syndaemon.c	2006-04-16 21:31:43.000000000 +0200
+++ ./syndaemon.c	2007-10-16 13:40:02.000000000 +0200
@@ -43,9 +43,11 @@
 static void
 usage()
 {
-    fprintf(stderr, "Usage: syndaemon [-i idle-time] [-d] [-t] [-k]\n");
+    fprintf(stderr, "Usage: syndaemon [-i idle-time] [-m poll-delay] [-d] [-t] [-k]\n");
     fprintf(stderr, "  -i How many seconds to wait after the last key press before\n");
     fprintf(stderr, "     enabling the touchpad. (default is 2.0s)\n");
+    fprintf(stderr, "  -m How many milli-seconds to wait until next poll.\n");
+    fprintf(stderr, "     (default is 20ms)\n");
     fprintf(stderr, "  -d Start as a daemon, ie in the background.\n");
     fprintf(stderr, "  -p Create a pid file with the specified name.\n");
     fprintf(stderr, "  -t Only disable tapping and scrolling, not mouse movements.\n");
@@ -159,9 +161,8 @@
 }
 
 static void
-main_loop(Display *display, double idle_time)
+main_loop(Display *display, double idle_time, int poll_delay)
 {
-    const int poll_delay = 20000;	    /* 20 ms */
     double last_activity = 0.0;
     double current_time;
 
@@ -228,17 +229,21 @@
 main(int argc, char *argv[])
 {
     double idle_time = 2.0;
+	int poll_delay = 20000;	    /* 20 ms */
     Display *display;
     int c;
     int shmid;
     int ignore_modifier_keys = 0;
 
     /* Parse command line parameters */
-    while ((c = getopt(argc, argv, "i:dtp:kK?")) != EOF) {
+    while ((c = getopt(argc, argv, "i:m:dtp:kK?")) != EOF) {
 	switch(c) {
 	case 'i':
 	    idle_time = atof(optarg);
 	    break;
+	case 'm':
+	    poll_delay = atoi(optarg) * 1000;
+	    break;
 	case 'd':
 	    background = 1;
 	    break;
@@ -314,7 +319,7 @@
     setup_keyboard_mask(display, ignore_modifier_keys);
 
     /* Run the main loop */
-    main_loop(display, idle_time);
+    main_loop(display, idle_time, poll_delay);
 
     return 0;
 }


Index: synaptics.spec
===================================================================
RCS file: /cvs/extras/rpms/synaptics/devel/synaptics.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- synaptics.spec	9 Mar 2008 18:13:29 -0000	1.32
+++ synaptics.spec	18 Mar 2008 15:29:07 -0000	1.33
@@ -2,7 +2,7 @@
 
 Name:           synaptics
 Version:        0.14.6
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:        Synaptics Touchpad Driver
 
 Group:          User Interface/X Hardware Support
@@ -13,6 +13,8 @@
 Patch0: synaptics-0.14.6-delibcwrap.patch
 Patch1: synaptics-0.14.6-newx.patch
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	pkgconfig
 BuildRequires:	xorg-x11-server-sdk >= 1.0.99.901
@@ -51,6 +53,8 @@
 %patch1 -p1 -b .newx
 %endif
 %patch2 -p1 -b .tap
+%patch3 -p1 -b .polldelay
+%patch4 -p1 -b .poll200ms
 # remove included XFree86 headers
 rm -rf Xincludes
 
@@ -81,6 +85,11 @@
 %{_mandir}/man?/*
 
 %changelog
+* 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
+- synaptics-0.14.6-poll-200ms.patch: reduce default poll from 20ms to 200ms
+
 * Sun Mar 09 2008 Adam Jackson <ajax at redhat.com> 0.14.6-4
 - 10-synaptics.fdi: Get hal to report the X driver as synaptics for
   touchpads we support.




More information about the fedora-extras-commits mailing list