rpms/gsynaptics/devel gsynaptics-0.9.14-dont-reset-taptime.patch, NONE, 1.1 gsynaptics-0.9.14-enable-tapping.patch, NONE, 1.1 gsynaptics-0.9.14-fix-tap-statecheck.patch, NONE, 1.1 gsynaptics.spec, 1.19, 1.20

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/gsynaptics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31057

Modified Files:
	gsynaptics.spec 
Added Files:
	gsynaptics-0.9.14-dont-reset-taptime.patch 
	gsynaptics-0.9.14-enable-tapping.patch 
	gsynaptics-0.9.14-fix-tap-statecheck.patch 
Log Message:
* Sun Mar 01 2009 Peter Hutterer <peter.hutterer at redhat.com> - 0.9.14-4
- gsynaptics-0.9.14-fix-tap-statecheck.patch: fix check for tapping enabled or
  disabled, should take TapButton1 into account.
- gsynaptics-0.9.14-enable-tapping.patch: set default 1-3-2 button mapping
  when tapping is enabled.
- gsynaptics-0.9.14-dont-reset-taptime.patch: don't reset tap time when
  disabling tapping.



gsynaptics-0.9.14-dont-reset-taptime.patch:

--- NEW FILE gsynaptics-0.9.14-dont-reset-taptime.patch ---
>From 19e27193f5e3bf521f74b656fa83dc27636d0fa1 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Sun, 1 Mar 2009 09:36:38 +1000
Subject: [PATCH] Don't reset the tap time when disabling tapping

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/main.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/main.c b/src/main.c
index 5a532f5..71c1570 100644
--- a/src/main.c
+++ b/src/main.c
@@ -221,9 +221,6 @@ cb_tapping_toggled (GtkToggleButton *button, GladeXML *dialog)
 	
 	synaptics = g_object_get_qdata (G_OBJECT(dialog), synaptics_quark);
 
-	if (!check)
-		time = 0;
-
 	g_synaptics_set_tap_time (synaptics, time);
         /* Default 1/2/3 finger tap settings */
 	g_synaptics_set_button_for_tap(synaptics, OneFinger, check ? 1 : 0);
-- 
1.6.0.6


gsynaptics-0.9.14-enable-tapping.patch:

--- NEW FILE gsynaptics-0.9.14-enable-tapping.patch ---
>From 74f1fae3b226ecc458c9cbcac75ac45f8a76aa55 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Sun, 1 Mar 2009 09:14:46 +1000
Subject: [PATCH] Enable default 1-3-2 button mapping when tapping is enabled.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 gsynaptics.c |   31 +++++++++++++++++++++++++++++++
 main.c       |    4 ++++
 2 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/src/gsynaptics.c b/src/gsynaptics.c
index 2232112..2a891ef 100644
--- a/src/gsynaptics.c
+++ b/src/gsynaptics.c
@@ -889,6 +889,37 @@ g_synaptics_set_button_for_tap (GSynaptics *synaptics, TapType tap, Button butto
 	GSynapticsPrivate *priv = G_SYNAPTICS_GET_PRIVATE (synaptics);
 	if (!g_synaptics_is_valid(synaptics))
 		return;
+
+	if (priv->synclient)
+	{
+	    gchar *command;
+
+	    if (tap >= OneFinger)
+	    {
+		command = g_strdup_printf ("synclient TapButton%d=%d",
+			tap - OneFinger + 1, button);
+	    } else
+	    {
+		char *corner;
+		switch (tap)
+		{
+		    case RightTop: corner ="RT"; break;
+		    case LeftTop: corner ="LT"; break;
+		    case RightBottom: corner ="RB"; break;
+		    case LeftBottom: corner ="LB"; break;
+		    default:
+				     return;
+		}
+		command = g_strdup_printf ("synclient %sCornerButton=%d",
+			corner, button);
+	    }
+	    g_spawn_command_line_async (command, NULL);
+	    g_free (command);
+	}
+	else
+	{
+	    SYNSHM(synaptics)->tap_action[tap] = button;
+	}
 }
 
 void
diff --git a/src/main.c b/src/main.c
index d187c1c..5a532f5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -225,6 +225,10 @@ cb_tapping_toggled (GtkToggleButton *button, GladeXML *dialog)
 		time = 0;
 
 	g_synaptics_set_tap_time (synaptics, time);
+        /* Default 1/2/3 finger tap settings */
+	g_synaptics_set_button_for_tap(synaptics, OneFinger, check ? 1 : 0);
+	g_synaptics_set_button_for_tap(synaptics, TwoFingers, check ? 3 : 0);
+	g_synaptics_set_button_for_tap(synaptics, ThreeFingers, check ? 2 : 0);
 	gconf_client_set_int (gconf, MAXTAPTIME_KEY, time, NULL);
 }
 
-- 
1.6.0.6


gsynaptics-0.9.14-fix-tap-statecheck.patch:

--- NEW FILE gsynaptics-0.9.14-fix-tap-statecheck.patch ---
>From f8d1084994e44b1da629b9c3ac6d285033521d1b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Sun, 1 Mar 2009 08:45:49 +1000
Subject: [PATCH] Tapping is enabled if MaxTapTime is > 0 and at least TapButton1 is > 0.

---
 src/gsynaptics.c      |    6 ++++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gsynaptics.c b/src/gsynaptics.c
index 3420402..2b03e52 100644
--- a/src/gsynaptics.c
+++ b/src/gsynaptics.c
@@ -227,11 +227,13 @@ g_synaptics_is_tapping_enabled (GSynaptics *synaptics)
 
 	if (priv->synclient)
 	{
-		return g_synaptics_get_value_from_synclient ("MaxTapTime") > 0;
+		return (g_synaptics_get_value_from_synclient ("MaxTapTime") > 0 &&
+			g_synaptics_get_value_from_synclient ("TapButton1") > 0);
 	}
 	else
 	{
-		return SYNSHM(synaptics)->tap_time > 0;
+		return SYNSHM(synaptics)->tap_time > 0 &&
+			SYNSHM(synaptics)->tap_action[OneFinger] > 0; /* F1_TAP */
 	}
 }
 
-- 
1.6.0.6



Index: gsynaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsynaptics/devel/gsynaptics.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gsynaptics.spec	25 Feb 2009 01:39:03 -0000	1.19
+++ gsynaptics.spec	28 Feb 2009 23:51:50 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           gsynaptics
 Version:        0.9.14
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Settings tool for Synaptics touchpad driver
 
 Group:          Applications/System
@@ -12,6 +12,10 @@
 Patch0:         gsynaptics-0.9.14-dot-fixes.patch
 Patch1:         gsynaptics-0.9.14-do-not-set-zero.patch
 Patch2:         gsynaptics-0.9.14-pixmap.patch
+Patch3:         gsynaptics-0.9.14-fix-tap-statecheck.patch
+Patch4:         gsynaptics-0.9.14-enable-tapping.patch
+Patch5:         gsynaptics-0.9.14-dont-reset-taptime.patch
+
 Source1:        %{name}-touchpad.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,6 +46,9 @@
 %patch0 -p1 -b .dot-fixes
 %patch1 -p1 -b .zero
 %patch2 -p1 -b .pixmap
+%patch3 -p1 -b .tap-checkbox
+%patch4 -p1 -b .tapping
+%patch5 -p1 -b .taptime
 
 %build
 %configure
@@ -84,6 +91,14 @@
 
 
 %changelog
+* Sun Mar 01 2009 Peter Hutterer <peter.hutterer at redhat.com> - 0.9.14-4
+- gsynaptics-0.9.14-fix-tap-statecheck.patch: fix check for tapping enabled or
+  disabled, should take TapButton1 into account.
+- gsynaptics-0.9.14-enable-tapping.patch: set default 1-3-2 button mapping
+  when tapping is enabled.
+- gsynaptics-0.9.14-dont-reset-taptime.patch: don't reset tap time when
+  disabling tapping.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.14-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild