summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile3
-rw-r--r--docs/tapndrag.dia1244
-rw-r--r--synaptics.c341
-rw-r--r--synaptics.h31
-rw-r--r--synclient.c14
5 files changed, 1471 insertions, 162 deletions
diff --git a/Makefile b/Makefile
index ce5fd6d..c6eaa25 100644
--- a/Makefile
+++ b/Makefile
@@ -126,11 +126,12 @@ DST=synaptics-$(VERSION)
synaptics-$(VERSION).tar.bz2 : $(ALLFILES)
rm -f $(DST).tar.bz2
rm -rf $(DST)
- mkdir $(DST) $(DST)/manpages $(DST)/script $(DST)/test
+ mkdir $(DST) $(DST)/manpages $(DST)/script $(DST)/test $(DST)/docs
cp -a $(ALLFILES) $(DST)
cp -a manpages/{synclient.1,syndaemon.1} $(DST)/manpages/
cp -a script/usbmouse $(DST)/script/
cp -a test/test-pad.c $(DST)/test/
+ cp -a docs/tapndrag.dia $(DST)/docs/
chmod u+w $(DST)/*
tar cf $(DST).tar $(DST)
rm -rf $(DST)
diff --git a/docs/tapndrag.dia b/docs/tapndrag.dia
new file mode 100644
index 0000000..52b2544
--- /dev/null
+++ b/docs/tapndrag.dia
@@ -0,0 +1,1244 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dia:diagram xmlns:dia="http://www.lysator.liu.se/~alla/dia/">
+ <dia:diagramdata>
+ <dia:attribute name="background">
+ <dia:color val="#ffffff"/>
+ </dia:attribute>
+ <dia:attribute name="paper">
+ <dia:composite type="paper">
+ <dia:attribute name="name">
+ <dia:string>#A4#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="tmargin">
+ <dia:real val="2.8222"/>
+ </dia:attribute>
+ <dia:attribute name="bmargin">
+ <dia:real val="2.8222"/>
+ </dia:attribute>
+ <dia:attribute name="lmargin">
+ <dia:real val="2.8222"/>
+ </dia:attribute>
+ <dia:attribute name="rmargin">
+ <dia:real val="2.8222"/>
+ </dia:attribute>
+ <dia:attribute name="is_portrait">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="scaling">
+ <dia:real val="0.459"/>
+ </dia:attribute>
+ <dia:attribute name="fitto">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ <dia:attribute name="grid">
+ <dia:composite type="grid">
+ <dia:attribute name="width_x">
+ <dia:real val="1"/>
+ </dia:attribute>
+ <dia:attribute name="width_y">
+ <dia:real val="1"/>
+ </dia:attribute>
+ <dia:attribute name="visible_x">
+ <dia:int val="1"/>
+ </dia:attribute>
+ <dia:attribute name="visible_y">
+ <dia:int val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ <dia:attribute name="guides">
+ <dia:composite type="guides">
+ <dia:attribute name="hguides"/>
+ <dia:attribute name="vguides"/>
+ </dia:composite>
+ </dia:attribute>
+ </dia:diagramdata>
+ <dia:layer name="Background" visible="true">
+ <dia:object type="UML - Usecase" version="0" id="O0">
+ <dia:attribute name="obj_pos">
+ <dia:point val="10.1412,5.79119"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="10.1412,5.79119;13.7316,7.79119"/>
+ </dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="10.1412,5.79119"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="3.5904"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="2"/>
+ </dia:attribute>
+ <dia:attribute name="text_outside">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="collaboration">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#Start#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="11.9364,7.03119"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="UML - Usecase" version="0" id="O1">
+ <dia:attribute name="obj_pos">
+ <dia:point val="10.3114,13.0947"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="10.3114,13.0947;13.5614,15.0947"/>
+ </dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="10.3114,13.0947"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="3.25"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="2"/>
+ </dia:attribute>
+ <dia:attribute name="text_outside">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="collaboration">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#1#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="11.9364,14.3347"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="UML - Usecase" version="0" id="O2">
+ <dia:attribute name="obj_pos">
+ <dia:point val="10.3114,19.6912"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="10.3114,19.6912;13.5614,21.6912"/>
+ </dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="10.3114,19.6912"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="3.25"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="2"/>
+ </dia:attribute>
+ <dia:attribute name="text_outside">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="collaboration">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#2#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="11.9364,20.9312"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="UML - Usecase" version="0" id="O3">
+ <dia:attribute name="obj_pos">
+ <dia:point val="10.3114,26.593"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="10.3114,26.593;13.5614,28.593"/>
+ </dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="10.3114,26.593"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="3.25"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="2"/>
+ </dia:attribute>
+ <dia:attribute name="text_outside">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="collaboration">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#3#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="11.9364,27.833"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="UML - Usecase" version="0" id="O4">
+ <dia:attribute name="obj_pos">
+ <dia:point val="19.5912,13.0947"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="19.5912,13.0947;23.5512,15.0947"/>
+ </dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="19.5912,13.0947"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="3.96"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="2"/>
+ </dia:attribute>
+ <dia:attribute name="text_outside">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="collaboration">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#Move#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="21.5712,14.3347"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="UML - Usecase" version="0" id="O5">
+ <dia:attribute name="obj_pos">
+ <dia:point val="19.8288,26.593"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="19.8288,26.593;23.3136,28.593"/>
+ </dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="19.8288,26.593"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="3.4848"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="2"/>
+ </dia:attribute>
+ <dia:attribute name="text_outside">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="collaboration">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#Drag#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="21.5712,27.833"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="Standard - Line" version="0" id="O6">
+ <dia:attribute name="obj_pos">
+ <dia:point val="11.9364,7.79119"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="11.1364,7.74119;12.7364,13.1447"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="11.9364,7.79119"/>
+ <dia:point val="11.9364,13.0947"/>
+ </dia:attribute>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_length">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_width">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O0" connection="6"/>
+ <dia:connection handle="1" to="O1" connection="1"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Line" version="0" id="O7">
+ <dia:attribute name="obj_pos">
+ <dia:point val="11.9364,15.0947"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="11.1364,15.0447;12.7364,19.7412"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="11.9364,15.0947"/>
+ <dia:point val="11.9364,19.6912"/>
+ </dia:attribute>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_length">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_width">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O1" connection="6"/>
+ <dia:connection handle="1" to="O2" connection="1"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Line" version="0" id="O8">
+ <dia:attribute name="obj_pos">
+ <dia:point val="11.9364,21.6912"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="11.1364,21.6412;12.7364,26.643"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="11.9364,21.6912"/>
+ <dia:point val="11.9364,26.593"/>
+ </dia:attribute>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_length">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_width">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O2" connection="6"/>
+ <dia:connection handle="1" to="O3" connection="1"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Line" version="0" id="O9">
+ <dia:attribute name="obj_pos">
+ <dia:point val="13.5614,14.0947"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="13.5114,13.2947;19.6412,14.8947"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="13.5614,14.0947"/>
+ <dia:point val="19.5912,14.0947"/>
+ </dia:attribute>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_length">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_width">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O1" connection="4"/>
+ <dia:connection handle="1" to="O4" connection="3"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Arc" version="0" id="O10">
+ <dia:attribute name="obj_pos">
+ <dia:point val="21.5712,13.0947"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="12.7194,6.80557;21.6405,13.164"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="21.5712,13.0947"/>
+ <dia:point val="13.2058,7.49829"/>
+ </dia:attribute>
+ <dia:attribute name="curve_distance">
+ <dia:real val="0.341908"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_length">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_width">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O4" connection="1"/>
+ <dia:connection handle="1" to="O0" connection="7"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - BezierLine" version="0" id="O11">
+ <dia:attribute name="obj_pos">
+ <dia:point val="22.8032,26.8859"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="13.5274,5.99668;26.5695,26.9559"/>
+ </dia:attribute>
+ <dia:attribute name="bez_points">
+ <dia:point val="22.8032,26.8859"/>
+ <dia:point val="31.6608,15.1412"/>
+ <dia:point val="23.0912,8.6412"/>
+ <dia:point val="13.7316,6.79119"/>
+ </dia:attribute>
+ <dia:attribute name="corner_types">
+ <dia:enum val="0"/>
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_length">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_width">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O5" connection="2"/>
+ <dia:connection handle="3" to="O0" connection="4"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - BezierLine" version="0" id="O12">
+ <dia:attribute name="obj_pos">
+ <dia:point val="10.7873,19.9841"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="5.5781,6.06783;10.8564,20.0532"/>
+ </dia:attribute>
+ <dia:attribute name="bez_points">
+ <dia:point val="10.7873,19.9841"/>
+ <dia:point val="3.64113,15.3912"/>
+ <dia:point val="4.39118,9.99119"/>
+ <dia:point val="10.1412,6.79119"/>
+ </dia:attribute>
+ <dia:attribute name="corner_types">
+ <dia:enum val="0"/>
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_length">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_width">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O2" connection="0"/>
+ <dia:connection handle="3" to="O0" connection="3"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - BezierLine" version="0" id="O13">
+ <dia:attribute name="obj_pos">
+ <dia:point val="10.3114,27.593"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="7.19736,19.9459;10.6968,27.657"/>
+ </dia:attribute>
+ <dia:attribute name="bez_points">
+ <dia:point val="10.3114,27.593"/>
+ <dia:point val="6.29118,26.143"/>
+ <dia:point val="6.16138,22.6412"/>
+ <dia:point val="10.3114,20.6912"/>
+ </dia:attribute>
+ <dia:attribute name="corner_types">
+ <dia:enum val="0"/>
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_length">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_width">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O3" connection="3"/>
+ <dia:connection handle="3" to="O2" connection="3"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="UML - Note" version="0" id="O14">
+ <dia:attribute name="obj_pos">
+ <dia:point val="8.14118,41.0412"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="8.09118,40.9912;25.3976,47.5912"/>
+ </dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="8.14118,41.0412"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="17.2064"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="6.5"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#T : Touch
+R : Release
+TO : Timeout
+M : Finger movement
+[U]: Generate button up event
+[D]: Generate button down event
+L : Locked drags enabled#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="8.49118,42.2877"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="Standard - Text" version="0" id="O15">
+ <dia:attribute name="obj_pos">
+ <dia:point val="11.1912,10.4912"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="10.958,9.89469;11.4244,10.6947"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#T#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="11.1912,10.4912"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="Standard - Text" version="0" id="O16">
+ <dia:attribute name="obj_pos">
+ <dia:point val="11.1912,24.4412"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="10.958,23.8447;11.4244,24.6447"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#T#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="11.1912,24.4412"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="Standard - Text" version="0" id="O17">
+ <dia:attribute name="obj_pos">
+ <dia:point val="17.4412,10.6912"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="17.2036,10.0947;17.6788,10.8947"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#R#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="17.4412,10.6912"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="Standard - Line" version="0" id="O18">
+ <dia:attribute name="obj_pos">
+ <dia:point val="13.5614,27.593"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="13.5114,26.793;19.8788,28.393"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="13.5614,27.593"/>
+ <dia:point val="19.8288,27.593"/>
+ </dia:attribute>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_length">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_width">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O3" connection="4"/>
+ <dia:connection handle="1" to="O5" connection="3"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Text" version="0" id="O19">
+ <dia:attribute name="obj_pos">
+ <dia:point val="11.1412,16.6912"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="10.6132,16.0947;11.6692,17.6947"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#R
+[D]#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="11.1412,16.6912"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="Standard - Text" version="0" id="O20">
+ <dia:attribute name="obj_pos">
+ <dia:point val="5.89118,24.0912"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="4.82638,23.4947;6.95598,25.0947"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#R
+[U,D]#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="5.89118,24.0912"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="Standard - Text" version="0" id="O21">
+ <dia:attribute name="obj_pos">
+ <dia:point val="16.3912,13.6912"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="14.53,13.0947;18.2524,13.8947"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#TO or M#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="16.3912,13.6912"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="Standard - Text" version="0" id="O22">
+ <dia:attribute name="obj_pos">
+ <dia:point val="16.517,27.1577"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="14.6558,26.5612;18.3782,27.3612"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#TO or M#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="16.517,27.1577"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="Standard - Text" version="0" id="O23">
+ <dia:attribute name="obj_pos">
+ <dia:point val="4.59118,12.7912"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="4.06318,12.1947;5.11918,13.7947"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#TO
+[U]#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="4.59118,12.7912"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="Standard - Text" version="0" id="O24">
+ <dia:attribute name="obj_pos">
+ <dia:point val="24.4912,17.8412"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="22.9204,17.2447;26.062,18.8447"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#R &amp; !L
+[U]#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="24.4912,17.8412"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="UML - Usecase" version="0" id="O25">
+ <dia:attribute name="obj_pos">
+ <dia:point val="19.9462,32.4912"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="19.9462,32.4912;23.1962,34.4912"/>
+ </dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="19.9462,32.4912"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="3.25"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="2"/>
+ </dia:attribute>
+ <dia:attribute name="text_outside">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="collaboration">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#4#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="21.5712,33.7312"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="UML - Usecase" version="0" id="O26">
+ <dia:attribute name="obj_pos">
+ <dia:point val="19.9462,38.0412"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="19.9462,38.0412;23.1962,40.0412"/>
+ </dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="19.9462,38.0412"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="3.25"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="2"/>
+ </dia:attribute>
+ <dia:attribute name="text_outside">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="collaboration">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#5#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="21.5712,39.2812"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="Standard - Line" version="0" id="O27">
+ <dia:attribute name="obj_pos">
+ <dia:point val="21.5712,28.593"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="20.7712,28.543;22.3712,32.5412"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="21.5712,28.593"/>
+ <dia:point val="21.5712,32.4912"/>
+ </dia:attribute>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_length">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_width">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O5" connection="6"/>
+ <dia:connection handle="1" to="O25" connection="1"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Line" version="0" id="O28">
+ <dia:attribute name="obj_pos">
+ <dia:point val="21.5712,34.4912"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="20.7712,34.4412;22.3712,38.0912"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="21.5712,34.4912"/>
+ <dia:point val="21.5712,38.0412"/>
+ </dia:attribute>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_length">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_width">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O25" connection="6"/>
+ <dia:connection handle="1" to="O26" connection="1"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Text" version="0" id="O29">
+ <dia:attribute name="obj_pos">
+ <dia:point val="19.8108,30.5912"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="18.5084,29.9947;21.1132,30.7947"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#R &amp; L#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="19.8108,30.5912"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="Standard - Text" version="0" id="O30">
+ <dia:attribute name="obj_pos">
+ <dia:point val="20.7108,36.3412"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="20.4776,35.7447;20.944,36.5447"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#T#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="20.7108,36.3412"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="Standard - Text" version="0" id="O31">
+ <dia:attribute name="obj_pos">
+ <dia:point val="26.1108,32.1912"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="25.6092,31.5947;26.6124,33.9947"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#TO
+or
+M#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="26.1108,32.1912"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ <dia:object type="Standard - BezierLine" version="0" id="O32">
+ <dia:attribute name="obj_pos">
+ <dia:point val="22.7202,38.3341"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="22.2883,27.6265;25.2621,38.4047"/>
+ </dia:attribute>
+ <dia:attribute name="bez_points">
+ <dia:point val="22.7202,38.3341"/>
+ <dia:point val="26.1462,35.2912"/>
+ <dia:point val="25.9108,30.5912"/>
+ <dia:point val="22.8032,28.3001"/>
+ </dia:attribute>
+ <dia:attribute name="corner_types">
+ <dia:enum val="0"/>
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_length">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_width">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O26" connection="2"/>
+ <dia:connection handle="3" to="O5" connection="7"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - BezierLine" version="0" id="O33">
+ <dia:attribute name="obj_pos">
+ <dia:point val="23.1962,39.0412"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="13.0354,5.28572;30.6228,39.1017"/>
+ </dia:attribute>
+ <dia:attribute name="bez_points">
+ <dia:point val="23.1962,39.0412"/>
+ <dia:point val="32.9766,36.6412"/>
+ <dia:point val="36.0412,2.59119"/>
+ <dia:point val="13.2058,6.08408"/>
+ </dia:attribute>
+ <dia:attribute name="corner_types">
+ <dia:enum val="0"/>
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_length">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_width">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O26" connection="4"/>
+ <dia:connection handle="3" to="O0" connection="2"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Text" version="0" id="O34">
+ <dia:attribute name="obj_pos">
+ <dia:point val="29.4412,22.8412"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="28.9132,22.2447;29.9692,23.8447"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#R
+[U]#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="29.4412,22.8412"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ </dia:object>
+ </dia:layer>
+</dia:diagram>
diff --git a/synaptics.c b/synaptics.c
index f93bc22..56e2659 100644
--- a/synaptics.c
+++ b/synaptics.c
@@ -294,8 +294,9 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
priv->nextRepeat = 0;
now = GetTimeInMillis();
priv->count_packet_finger = 0;
- priv->tapping_millis = now;
- priv->button_delay_millis = now;
+ priv->tap_state = TS_START;
+ priv->tap_button = 0;
+ priv->tap_button_state = TBS_BUTTON_UP;
priv->touch_on.millis = now;
priv->hasGuest = FALSE;
@@ -817,24 +818,165 @@ SynapticsDetectFinger(SynapticsPrivate *priv, struct SynapticsHwState *hw)
}
priv->prev_z = hw->z;
+ if (priv->palm)
+ finger = FALSE;
+
return finger;
}
static void
-ReportTap(SynapticsPrivate *priv, TapEvent tap)
+SelectTapButton(SynapticsPrivate *priv, edge_type edge)
{
- int button = priv->synpara->tap_action[tap];
- switch (button) {
+ TapEvent tap;
+
+ switch (priv->tap_max_fingers) {
case 1:
- priv->tap_left = TRUE;
+ default:
+ switch (edge) {
+ case RIGHT_TOP_EDGE:
+ DBG(7, ErrorF("right top edge\n"));
+ tap = RT_TAP;
+ break;
+ case RIGHT_BOTTOM_EDGE:
+ DBG(7, ErrorF("right bottom edge\n"));
+ tap = RB_TAP;
+ break;
+ case LEFT_TOP_EDGE:
+ DBG(7, ErrorF("left top edge\n"));
+ tap = LT_TAP;
+ break;
+ case LEFT_BOTTOM_EDGE:
+ DBG(7, ErrorF("left bottom edge\n"));
+ tap = LB_TAP;
+ break;
+ default:
+ DBG(7, ErrorF("no edge\n"));
+ tap = F1_TAP;
+ break;
+ }
break;
case 2:
- priv->tap_mid = TRUE;
+ DBG(7, ErrorF("two finger tap\n"));
+ tap = F2_TAP;
break;
case 3:
- priv->tap_right = TRUE;
+ DBG(7, ErrorF("three finger tap\n"));
+ tap = F3_TAP;
+ break;
+ }
+
+ priv->tap_button = priv->synpara->tap_action[tap];
+ priv->tap_button = clamp(priv->tap_button, 0, 7);
+}
+
+static void
+SetTapState(SynapticsPrivate *priv, enum TapState tap_state, int millis)
+{
+ DBG(7, ErrorF("SetTapState - %d -> %d (millis:%d)\n", priv->tap_state, tap_state, millis));
+ switch (tap_state) {
+ case TS_START:
+ priv->tap_max_fingers = 0;
+ break;
+ default:
+ break;
+ }
+ priv->tap_state = tap_state;
+}
+
+static int
+HandleTapProcessing(SynapticsPrivate *priv, struct SynapticsHwState *hw,
+ edge_type edge, Bool finger)
+{
+ SynapticsSHM *para = priv->synpara;
+ Bool touch, release, timeout, move;
+ long timeleft;
+ long delay = 1000000000;
+
+ if (priv->palm)
+ return delay;
+
+ touch = finger && !priv->finger_flag;
+ release = !finger && priv->finger_flag;
+ move = FALSE;
+ if (touch) {
+ priv->touch_on.x = hw->x;
+ priv->touch_on.y = hw->y;
+ priv->touch_on.millis = hw->millis;
+ } else if (release) {
+ priv->touch_on.millis = hw->millis;
+ move = ((priv->tap_max_fingers <= 1) &&
+ ((abs(hw->x - priv->touch_on.x) >= para->tap_move) ||
+ (abs(hw->y - priv->touch_on.y) >= para->tap_move)));
+ }
+ if (priv->tap_max_fingers < hw->numFingers)
+ priv->tap_max_fingers = hw->numFingers;
+ timeleft = TIME_DIFF(priv->touch_on.millis + para->tap_time, hw->millis);
+ if (timeleft > 0)
+ delay = MIN(delay, timeleft);
+ timeout = timeleft <= 0;
+
+ restart:
+ switch (priv->tap_state) {
+ case TS_START:
+ if (touch)
+ SetTapState(priv, TS_1, hw->millis);
+ break;
+ case TS_1:
+ if (timeout || move) {
+ SetTapState(priv, TS_MOVE, hw->millis);
+ goto restart;
+ } else if (release) {
+ SelectTapButton(priv, edge);
+ priv->tap_button_state = TBS_BUTTON_DOWN;
+ SetTapState(priv, TS_2, hw->millis);
+ }
+ break;
+ case TS_MOVE:
+ if (release)
+ SetTapState(priv, TS_START, hw->millis);
+ break;
+ case TS_2:
+ if (touch) {
+ SetTapState(priv, TS_3, hw->millis);
+ } else if (timeout) {
+ priv->tap_button_state = TBS_BUTTON_UP;
+ SetTapState(priv, TS_START, hw->millis);
+ }
+ break;
+ case TS_3:
+ if (timeout || move) {
+ SetTapState(priv, TS_DRAG, hw->millis);
+ goto restart;
+ } else if (release) {
+ priv->tap_button_state = TBS_BUTTON_UP_DOWN;
+ SetTapState(priv, TS_2, hw->millis);
+ }
+ break;
+ case TS_DRAG:
+ if (release) {
+ if (para->locked_drags) {
+ SetTapState(priv, TS_4, hw->millis);
+ } else {
+ priv->tap_button_state = TBS_BUTTON_UP;
+ SetTapState(priv, TS_START, hw->millis);
+ }
+ }
+ break;
+ case TS_4:
+ if (touch)
+ SetTapState(priv, TS_5, hw->millis);
+ break;
+ case TS_5:
+ if (timeout || move) {
+ SetTapState(priv, TS_DRAG, hw->millis);
+ goto restart;
+ } else if (release) {
+ priv->tap_button_state = TBS_BUTTON_UP;
+ SetTapState(priv, TS_START, hw->millis);
+ }
break;
}
+ return delay;
}
/*
@@ -844,11 +986,11 @@ ReportTap(SynapticsPrivate *priv, TapEvent tap)
* occurs.
*/
static int
-HandleState(LocalDevicePtr local, struct SynapticsHwState* hw)
+HandleState(LocalDevicePtr local, struct SynapticsHwState *hw)
{
SynapticsPrivate *priv = (SynapticsPrivate *) (local->private);
SynapticsSHM *para = priv->synpara;
- Bool finger;
+ Bool finger, moving_state;
int dist, dx, dy, buttons, id;
edge_type edge;
Bool mid;
@@ -927,128 +1069,9 @@ HandleState(LocalDevicePtr local, struct SynapticsHwState* hw)
finger = SynapticsDetectFinger(priv, hw);
/* tap and drag detection */
- if (priv->palm) {
- /* Palm detected, skip tap/drag processing */
- } else if (finger && !priv->finger_flag) { /* touched */
- DBG(7, ErrorF("touched - x:%d, y:%d millis:%lu\n", hw->x, hw->y, hw->millis));
- if (priv->tap) {
- DBG(7, ErrorF("drag detected - tap time:%lu\n", priv->tapping_millis));
- priv->drag = TRUE; /* drag gesture */
- }
- priv->touch_on.x = hw->x;
- priv->touch_on.y = hw->y;
- priv->touch_on.millis = hw->millis;
- } else if (!finger && priv->finger_flag) { /* untouched */
- DBG(7, ErrorF("untouched - x:%d, y:%d millis:%lu finger:%d\n",
- hw->x, hw->y, hw->millis, priv->finger_count));
- /* check if
- 1. the tap is in tap_time
- 2. the max movement is in tap_move or more than one finger are tapped */
- timeleft = TIME_DIFF(priv->touch_on.millis + para->tap_time, hw->millis);
- if (timeleft > 0 &&
- (((abs(hw->x - priv->touch_on.x) < para->tap_move) &&
- (abs(hw->y - priv->touch_on.y) < para->tap_move)) ||
- priv->finger_count)) {
- if (priv->drag) {
- DBG(7, ErrorF("double tapping detected\n"));
- priv->doubletap = TRUE;
- priv->tap = FALSE;
- } else {
- DBG(7, ErrorF("tapping detected @ "));
- priv->tapping_millis = hw->millis;
- priv->tap = TRUE;
- if (priv->finger_count == 0) {
- switch (edge) {
- case RIGHT_TOP_EDGE:
- DBG(7, ErrorF("right top edge\n"));
- ReportTap(priv, RT_TAP);
- break;
- case RIGHT_BOTTOM_EDGE:
- DBG(7, ErrorF("right bottom edge\n"));
- ReportTap(priv, RB_TAP);
- break;
- case LEFT_TOP_EDGE:
- DBG(7, ErrorF("left top edge\n"));
- ReportTap(priv, LT_TAP);
- break;
- case LEFT_BOTTOM_EDGE:
- DBG(7, ErrorF("left bottom edge\n"));
- ReportTap(priv, LB_TAP);
- break;
- default:
- DBG(7, ErrorF("no edge\n"));
- ReportTap(priv, F1_TAP);
- }
- } else {
- switch (priv->finger_count) {
- case 2:
- DBG(7, ErrorF("two finger tap\n"));
- ReportTap(priv, F2_TAP);
- break;
- case 3:
- DBG(7, ErrorF("three finger tap\n"));
- ReportTap(priv, F3_TAP);
- break;
- default:
- DBG(7, ErrorF("one finger\n"));
- ReportTap(priv, F1_TAP);
- }
- }
- }
- } /* tap detection */
- if ((timeleft <= 0) && priv->drag && para->locked_drags)
- priv->draglock = TRUE;
- priv->drag = FALSE;
- } /* finger lost */
-
- /* detecting 2 and 3 fingers */
- timeleft = TIME_DIFF(priv->touch_on.millis + para->tap_time, hw->millis);
+ timeleft = HandleTapProcessing(priv, hw, edge, finger);
if (timeleft > 0)
delay = MIN(delay, timeleft);
- if (finger && /* finger is on the surface */
- (timeleft > 0)) { /* tap time is not succeeded */
- /* count fingers when reported */
- if ((hw->numFingers == 2) && (priv->finger_count == 0))
- priv->finger_count = 2;
- if (hw->numFingers == 3)
- priv->finger_count = 3;
- } else { /* reset finger counts */
- priv->finger_count = 0;
- }
-
- /* reset tapping button flags */
- if (!priv->tap && !priv->drag && !priv->doubletap && !priv->draglock) {
- priv->tap_left = priv->tap_mid = priv->tap_right = FALSE;
- }
-
- /* tap processing */
- timeleft = TIME_DIFF(priv->tapping_millis + para->tap_time, hw->millis);
- if (timeleft > 0)
- delay = MIN(delay, timeleft);
- if (priv->tap && (timeleft > 0)) {
- hw->left |= priv->tap_left;
- mid |= priv->tap_mid;
- hw->right |= priv->tap_right;
- } else {
- if (priv->tap)
- priv->draglock = FALSE;
- priv->tap = FALSE;
- }
-
- /* drag processing */
- if (priv->drag || priv->draglock) {
- hw->left |= priv->tap_left;
- mid |= priv->tap_mid;
- hw->right |= priv->tap_right;
- }
-
- /* double tap processing */
- if (priv->doubletap && !priv->finger_flag) {
- hw->left |= priv->tap_left;
- mid |= priv->tap_mid;
- hw->right |= priv->tap_right;
- priv->doubletap = FALSE;
- }
/* scroll detection */
if (finger && !priv->finger_flag) {
@@ -1080,22 +1103,20 @@ HandleState(LocalDevicePtr local, struct SynapticsHwState* hw)
}
}
}
- if (priv->circ_scroll_on && (!finger || priv->palm)) {
+ if (priv->circ_scroll_on && !finger) {
/* circular scroll locks in until finger is raised */
DBG(7, ErrorF("cicular scroll off\n"));
priv->circ_scroll_on = FALSE;
}
- if (priv->vert_scroll_on && (!(edge & RIGHT_EDGE) || !finger || priv->palm)) {
+ if (priv->vert_scroll_on && (!(edge & RIGHT_EDGE) || !finger)) {
DBG(7, ErrorF("vert edge scroll off\n"));
priv->vert_scroll_on = FALSE;
}
- if (priv->horiz_scroll_on && (!(edge & BOTTOM_EDGE) || !finger || priv->palm)) {
+ if (priv->horiz_scroll_on && (!(edge & BOTTOM_EDGE) || !finger)) {
DBG(7, ErrorF("horiz edge scroll off\n"));
priv->horiz_scroll_on = FALSE;
}
- /* scroll processing */
-
/* if hitting a corner (top right or bottom right) while vertical scrolling is active,
switch over to circular scrolling smoothly */
if (priv->vert_scroll_on && !priv->horiz_scroll_on && para->circular_scrolling) {
@@ -1153,15 +1174,29 @@ HandleState(LocalDevicePtr local, struct SynapticsHwState* hw)
}
}
- /* movement */
- if (finger && !priv->vert_scroll_on && !priv->horiz_scroll_on && !priv->circ_scroll_on &&
- !priv->finger_count && !priv->palm) {
+ moving_state = FALSE;
+ switch (priv->tap_state) {
+ case TS_MOVE:
+ case TS_DRAG:
+ moving_state = TRUE;
+ break;
+ case TS_1:
+ case TS_3:
+ case TS_5:
+ if (hw->numFingers == 1)
+ moving_state = TRUE;
+ break;
+ default:
+ break;
+ }
+ if (moving_state && !priv->palm &&
+ !priv->vert_scroll_on && !priv->horiz_scroll_on && !priv->circ_scroll_on) {
delay = MIN(delay, 13);
if (priv->count_packet_finger > 3) { /* min. 3 packets */
dx = (hw->x - MOVE_HIST(2).x) / 2;
dy = (hw->y - MOVE_HIST(2).y) / 2;
- if (priv->drag || priv->draglock || para->edge_motion_use_always) {
+ if ((priv->tap_state == TS_DRAG) || para->edge_motion_use_always) {
int minZ = para->edge_motion_min_z;
int maxZ = para->edge_motion_max_z;
int minSpd = para->edge_motion_min_speed;
@@ -1188,7 +1223,7 @@ HandleState(LocalDevicePtr local, struct SynapticsHwState* hw)
}
/* speed depending on distance/packet */
- dist = move_distance( dx, dy );
+ dist = move_distance(dx, dy);
speed = dist * para->accl;
if (speed > para->max_speed) { /* set max speed factor */
speed = para->max_speed;
@@ -1208,7 +1243,6 @@ HandleState(LocalDevicePtr local, struct SynapticsHwState* hw)
priv->count_packet_finger = 0;
}
-
buttons = ((hw->left ? 0x01 : 0) |
(mid ? 0x02 : 0) |
(hw->right ? 0x04 : 0) |
@@ -1220,8 +1254,19 @@ HandleState(LocalDevicePtr local, struct SynapticsHwState* hw)
(hw->multi[2] ? 0x20 : 0) |
(hw->multi[3] ? 0x40 : 0));
- /* Flags */
- priv->finger_flag = finger;
+ if (priv->tap_button > 0) {
+ int tap_mask = 1 << (priv->tap_button - 1);
+ if (priv->tap_button_state == TBS_BUTTON_UP_DOWN) {
+ if ((buttons & tap_mask) != (priv->lastButtons & tap_mask)) {
+ xf86PostButtonEvent(local->dev, FALSE, priv->tap_button, buttons & tap_mask, 0, 0);
+ priv->lastButtons &= ~tap_mask;
+ priv->lastButtons |= buttons & tap_mask;
+ }
+ priv->tap_button_state = TBS_BUTTON_DOWN;
+ }
+ if (priv->tap_button_state == TBS_BUTTON_DOWN)
+ buttons |= tap_mask;
+ }
/* generate a history of the absolute positions */
MOVE_HIST(0).x = hw->x;
@@ -1241,7 +1286,6 @@ HandleState(LocalDevicePtr local, struct SynapticsHwState* hw)
change &= ~(1 << (id - 1));
xf86PostButtonEvent(local->dev, FALSE, id, (buttons & (1 << (id - 1))), 0, 0);
}
- priv->lastButtons = buttons;
while (scroll_up-- > 0) {
xf86PostButtonEvent(local->dev, FALSE, 4, !hw->up, 0, 0);
@@ -1267,10 +1311,7 @@ HandleState(LocalDevicePtr local, struct SynapticsHwState* hw)
}
}
-
- /*
- * Handle auto repeat buttons
- */
+ /* Handle auto repeat buttons */
if ((hw->up || hw->down || hw->multi[2] || hw->multi[3]) &&
para->updown_button_scrolling) {
priv->repeatButtons = buttons & 0x78;
@@ -1301,6 +1342,10 @@ HandleState(LocalDevicePtr local, struct SynapticsHwState* hw)
}
}
+ /* Save old values of some state variables */
+ priv->finger_flag = finger;
+ priv->lastButtons = buttons;
+
return delay;
}
diff --git a/synaptics.h b/synaptics.h
index ee619c6..7ef9a3c 100644
--- a/synaptics.h
+++ b/synaptics.h
@@ -124,6 +124,24 @@ enum MidButtonEmulation {
MBE_TIMEOUT /* Waiting for both buttons to be released. */
};
+/* See docs/tapndrag.dia for a state machine diagram */
+enum TapState {
+ TS_START, /* No tap/drag in progress */
+ TS_1, /* After first touch */
+ TS_MOVE, /* Pointer movement enabled */
+ TS_2, /* After first release */
+ TS_3, /* After second touch */
+ TS_DRAG, /* Pointer drag enabled */
+ TS_4, /* After release when "locked drags" enabled */
+ TS_5 /* After touch when "locked drags" enabled */
+};
+
+enum TapButtonState {
+ TBS_BUTTON_UP, /* "Virtual tap button" is up */
+ TBS_BUTTON_DOWN, /* "Virtual tap button" is down */
+ TBS_BUTTON_UP_DOWN /* Send button up event + set down state */
+};
+
enum SynapticsProtocol {
SYN_PROTO_PSAUX, /* Raw psaux device */
SYN_PROTO_EVENT /* Linux kernel event interface */
@@ -154,7 +172,6 @@ typedef struct _SynapticsPrivateRec
have received */
int protoBufTail;
int fifofd; /* fd for fifo */
- SynapticsTapRec touch_on; /* data when the touchpad is touched */
SynapticsMoveHistRec move_hist[SYNAPTICS_MOVE_HISTORY]; /* movement history */
int largest_valid_x; /* Largest valid X coordinate seen so far */
@@ -162,13 +179,16 @@ typedef struct _SynapticsPrivateRec
int scroll_x; /* last x-scroll position */
double scroll_a; /* last angle-scroll position */
unsigned long count_packet_finger; /* packet counter with finger on the touchpad */
- unsigned int tapping_millis; /* packet counter for tapping */
unsigned int button_delay_millis; /* button delay for 3rd button emulation */
unsigned int prev_up; /* Previous up button value, for double click emulation */
Bool finger_flag; /* previous finger */
- Bool tap, drag, doubletap; /* feature flags */
- Bool draglock; /* Locked drag active */
- Bool tap_left, tap_mid, tap_right; /* tapping buttons */
+
+ enum TapState tap_state; /* State of tap processing */
+ int tap_max_fingers; /* Max number of fingers seen since entering start state */
+ int tap_button; /* Which button started the tap processing */
+ enum TapButtonState tap_button_state; /* Current tap action */
+ SynapticsTapRec touch_on; /* data when the touchpad is touched/released */
+
Bool vert_scroll_on; /* scrolling flag */
Bool horiz_scroll_on; /* scrolling flag */
Bool circ_scroll_on; /* scrolling flag */
@@ -177,7 +197,6 @@ typedef struct _SynapticsPrivateRec
int repeatButtons; /* buttons for repeat */
unsigned long nextRepeat; /* Time when to trigger next auto repeat event */
int lastButtons; /* last State of the buttons */
- int finger_count; /* tap counter for fingers */
int palm; /* Set to true when palm detected, reset to false when
palm/finger contact disappears */
int prev_z; /* previous z value, for palm detection */
diff --git a/synclient.c b/synclient.c
index cf8aa8c..35f37f4 100644
--- a/synclient.c
+++ b/synclient.c
@@ -87,13 +87,13 @@ static struct Parameter params[] = {
DEFINE_PAR("UpDownScrolling", updown_button_scrolling, PT_BOOL, 0, 1),
DEFINE_PAR("TouchpadOff", touchpad_off, PT_BOOL, 0, 1),
DEFINE_PAR("LockedDrags", locked_drags, PT_BOOL, 0, 1),
- DEFINE_PAR("RTCornerButton", tap_action[RT_TAP], PT_INT, 0, 3),
- DEFINE_PAR("RBCornerButton", tap_action[RB_TAP], PT_INT, 0, 3),
- DEFINE_PAR("LTCornerButton", tap_action[LT_TAP], PT_INT, 0, 3),
- DEFINE_PAR("LBCornerButton", tap_action[LB_TAP], PT_INT, 0, 3),
- DEFINE_PAR("TapButton1", tap_action[F1_TAP], PT_INT, 0, 3),
- DEFINE_PAR("TapButton2", tap_action[F2_TAP], PT_INT, 0, 3),
- DEFINE_PAR("TapButton3", tap_action[F3_TAP], PT_INT, 0, 3),
+ DEFINE_PAR("RTCornerButton", tap_action[RT_TAP], PT_INT, 0, 7),
+ DEFINE_PAR("RBCornerButton", tap_action[RB_TAP], PT_INT, 0, 7),
+ DEFINE_PAR("LTCornerButton", tap_action[LT_TAP], PT_INT, 0, 7),
+ DEFINE_PAR("LBCornerButton", tap_action[LB_TAP], PT_INT, 0, 7),
+ DEFINE_PAR("TapButton1", tap_action[F1_TAP], PT_INT, 0, 7),
+ DEFINE_PAR("TapButton2", tap_action[F2_TAP], PT_INT, 0, 7),
+ DEFINE_PAR("TapButton3", tap_action[F3_TAP], PT_INT, 0, 7),
DEFINE_PAR("CircularScrolling", circular_scrolling, PT_BOOL, 0, 1),
DEFINE_PAR("CircScrollDelta", scroll_dist_circ, PT_DOUBLE, .01, 3),
DEFINE_PAR("CircScrollTrigger", circular_trigger, PT_INT, 0, 8),
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 21:15:24 +0000