OSDN > Find Software > System > Hardware > gsynaptics > SCM > SVN > Commit

gsynaptics

gsynaptics: Commit

2009-03-01 Hiroyuki Ikezoe <poincare@ikezoe.net>

def list not implemented yet.

Enable default 1-3-2 button mapping when tapping is enabled.
patch by Peter Hutterer <peter.hutterer@who-t.net>.

2009-03-01 Hiroyuki Ikezoe <poincare@ikezoe.net>

* src/main.c:
Don't reset the tap time when disabling tapping
patch by Peter Hutterer <peter.hutterer@who-t.net>.

2009-03-01 Hiroyuki Ikezoe <poincare@ikezoe.net>

* src/gsynaptics.c:
Tapping is enabled if MaxTapTime is > 0 and at least TapButton1 is > 0.
patch by Peter Hutterer <peter.hutterer@who-t.net>.

--- gsynaptics/trunk/ChangeLog (revision 129)

+++ gsynaptics/trunk/ChangeLog (revision 130)

		@@ -1,3 +1,21 @@
	1	+2009-03-01 Hiroyuki Ikezoe <poincare@ikezoe.net>
	2	+
	3	+ * src/main.c, src/gsynaptics.c::
	4	+ Enable default 1-3-2 button mapping when tapping is enabled.
	5	+ patch by Peter Hutterer <peter.hutterer@who-t.net>.
	6	+
	7	+2009-03-01 Hiroyuki Ikezoe <poincare@ikezoe.net>
	8	+
	9	+ * src/main.c:
	10	+ Don't reset the tap time when disabling tapping
	11	+ patch by Peter Hutterer <peter.hutterer@who-t.net>.
	12	+
	13	+2009-03-01 Hiroyuki Ikezoe <poincare@ikezoe.net>
	14	+
	15	+ * src/gsynaptics.c:
	16	+ Tapping is enabled if MaxTapTime is > 0 and at least TapButton1 is > 0.
	17	+ patch by Peter Hutterer <peter.hutterer@who-t.net>.
	18	+
1	19	2009-01-29 Hiroyuki Ikezoe <poincare@ikezoe.net>
2	20
3	21	* configure.ac: version 0.9.15.

--- gsynaptics/trunk/src/gsynaptics.c (revision 129)

+++ gsynaptics/trunk/src/gsynaptics.c (revision 130)

		@@ -227,11 +227,13 @@
227	227
228	228	if (priv->synclient)
229	229	{
230		- return g_synaptics_get_value_from_synclient ("MaxTapTime") > 0;
	230	+ return (g_synaptics_get_value_from_synclient ("MaxTapTime") > 0 &&
	231	+ g_synaptics_get_value_from_synclient ("TapButton1") > 0);
231	232	}
232	233	else
233	234	{
234		- return SYNSHM(synaptics)->tap_time > 0;
	235	+ return SYNSHM(synaptics)->tap_time > 0 &&
	236	+ SYNSHM(synaptics)->tap_action[OneFinger] > 0; /* F1_TAP */
235	237	}
236	238	}
237	239

		@@ -881,6 +883,37 @@
881	883	GSynapticsPrivate *priv = G_SYNAPTICS_GET_PRIVATE (synaptics);
882	884	if (!g_synaptics_is_valid(synaptics))
883	885	return;
	886	+
	887	+ if (priv->synclient)
	888	+ {
	889	+ gchar *command;
	890	+
	891	+ if (tap >= OneFinger)
	892	+ {
	893	+ command = g_strdup_printf ("synclient TapButton%d=%d",
	894	+ tap - OneFinger + 1, button);
	895	+ } else
	896	+ {
	897	+ char *corner;
	898	+ switch (tap)
	899	+ {
	900	+ case RightTop: corner ="RT"; break;
	901	+ case LeftTop: corner ="LT"; break;
	902	+ case RightBottom: corner ="RB"; break;
	903	+ case LeftBottom: corner ="LB"; break;
	904	+ default:
	905	+ return;
	906	+ }
	907	+ command = g_strdup_printf ("synclient %sCornerButton=%d",
	908	+ corner, button);
	909	+ }
	910	+ g_spawn_command_line_async (command, NULL);
	911	+ g_free (command);
	912	+ }
	913	+ else
	914	+ {
	915	+ SYNSHM(synaptics)->tap_action[tap] = button;
	916	+ }
884	917	}
885	918
886	919	void

--- gsynaptics/trunk/src/main.c (revision 129)

+++ gsynaptics/trunk/src/main.c (revision 130)

		@@ -221,10 +221,11 @@
221	221
222	222	synaptics = g_object_get_qdata (G_OBJECT(dialog), synaptics_quark);
223	223
224		- if (!check)
225		- time = 0;
226		-
227	224	g_synaptics_set_tap_time (synaptics, time);
	225	+ /* Default 1/2/3 finger tap settings */
	226	+ g_synaptics_set_button_for_tap(synaptics, OneFinger, check ? 1 : 0);
	227	+ g_synaptics_set_button_for_tap(synaptics, TwoFingers, check ? 3 : 0);
	228	+ g_synaptics_set_button_for_tap(synaptics, ThreeFingers, check ? 2 : 0);
228	229	gconf_client_set_int (gconf, MAXTAPTIME_KEY, time, NULL);
229	230	}
230	231

--- gsynaptics/trunk/src/Makefile.am (revision 129)

+++ gsynaptics/trunk/src/Makefile.am (revision 130)