Made double clicks faster, so that they work in xmms and the

gtk file selector.
Reported by Jean DIRAISON <diraison.jean@wanadoo.fr>.)

3 files changed, 110 insertions, 105 deletions

diff --git a/docs/tapndrag.dia b/docs/tapndrag.dia
index 52b2544..ec92719 100644
--- a/docs/tapndrag.dia
+++ b/docs/tapndrag.dia
@@ -4,6 +4,9 @@
     <dia:attribute name="background">
       <dia:color val="#ffffff"/>
     </dia:attribute>
+    <dia:attribute name="pagebreak">
+      <dia:color val="#000099"/>
+    </dia:attribute>
     <dia:attribute name="paper">
       <dia:composite type="paper">
         <dia:attribute name="name">
@@ -46,8 +49,12 @@
         <dia:attribute name="visible_y">
           <dia:int val="1"/>
         </dia:attribute>
+        <dia:composite type="color"/>
       </dia:composite>
     </dia:attribute>
+    <dia:attribute name="color">
+      <dia:color val="#d8e5e5"/>
+    </dia:attribute>
     <dia:attribute name="guides">
       <dia:composite type="guides">
         <dia:attribute name="hguides"/>
@@ -58,16 +65,16 @@
   <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:point val="10.2912,6.24119"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.1412,5.79119;13.7316,7.79119"/>
+        <dia:rectangle val="10.2912,6.24119;13.5412,8.24119"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="10.1412,5.79119"/>
+        <dia:point val="10.2912,6.24119"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="3.5904"/>
+        <dia:real val="3.25"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="2"/>
@@ -84,13 +91,13 @@
             <dia:string>#Start#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Helvetica"/>
+            <dia:font family="arial" style="0" 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:point val="11.9162,7.49119"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -129,13 +136,13 @@
             <dia:string>#1#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Helvetica"/>
+            <dia:font family="arial" style="0" 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:point val="11.9364,14.3447"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -174,13 +181,13 @@
             <dia:string>#2#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Helvetica"/>
+            <dia:font family="arial" style="0" 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:point val="11.9364,20.9412"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -219,13 +226,13 @@
             <dia:string>#3#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Helvetica"/>
+            <dia:font family="arial" style="0" 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:point val="11.9364,27.843"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -241,13 +248,13 @@
         <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:rectangle val="19.5912,13.0947;22.8412,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:real val="3.25"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="2"/>
@@ -264,13 +271,13 @@
             <dia:string>#Move#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Helvetica"/>
+            <dia:font family="arial" style="0" 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:point val="21.2162,14.3447"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -283,16 +290,16 @@
     </dia:object>
     <dia:object type="UML - Usecase" version="0" id="O5">
       <dia:attribute name="obj_pos">
-        <dia:point val="19.8288,26.593"/>
+        <dia:point val="19.9288,26.693"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.8288,26.593;23.3136,28.593"/>
+        <dia:rectangle val="19.9288,26.693;23.1788,28.693"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="19.8288,26.593"/>
+        <dia:point val="19.9288,26.693"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="3.4848"/>
+        <dia:real val="3.25"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="2"/>
@@ -309,13 +316,13 @@
             <dia:string>#Drag#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Helvetica"/>
+            <dia:font family="arial" style="0" 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:point val="21.5538,27.943"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -328,13 +335,13 @@
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O6">
       <dia:attribute name="obj_pos">
-        <dia:point val="11.9364,7.79119"/>
+        <dia:point val="11.9162,8.24119"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.1364,7.74119;12.7364,13.1447"/>
+        <dia:rectangle val="11.1362,8.19098;12.7366,13.148"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="11.9364,7.79119"/>
+        <dia:point val="11.9162,8.24119"/>
         <dia:point val="11.9364,13.0947"/>
       </dia:attribute>
       <dia:attribute name="numcp">
@@ -443,11 +450,11 @@
         <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:rectangle val="12.6083,7.23794;21.6399,13.1634"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="21.5712,13.0947"/>
-        <dia:point val="13.2058,7.49829"/>
+        <dia:point val="13.0652,7.9483"/>
       </dia:attribute>
       <dia:attribute name="curve_distance">
         <dia:real val="0.341908"/>
@@ -468,16 +475,16 @@
     </dia:object>
     <dia:object type="Standard - BezierLine" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="22.8032,26.8859"/>
+        <dia:point val="22.7028,26.9859"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.5274,5.99668;26.5695,26.9559"/>
+        <dia:rectangle val="13.337,6.44668;26.4503,27.0559"/>
       </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:point val="22.7028,26.9859"/>
+        <dia:point val="31.5604,15.2412"/>
+        <dia:point val="22.9008,9.0912"/>
+        <dia:point val="13.5412,7.24119"/>
       </dia:attribute>
       <dia:attribute name="corner_types">
         <dia:enum val="0"/>
@@ -502,13 +509,13 @@
         <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:rectangle val="5.65199,6.51784;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:point val="4.54118,10.4412"/>
+        <dia:point val="10.2912,7.24119"/>
       </dia:attribute>
       <dia:attribute name="corner_types">
         <dia:enum val="0"/>
@@ -533,7 +540,7 @@
         <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:rectangle val="7.19737,19.9459;10.6969,27.657"/>
       </dia:attribute>
       <dia:attribute name="bez_points">
         <dia:point val="10.3114,27.593"/>
@@ -564,13 +571,13 @@
         <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:rectangle val="8.09118,40.9912;19.9412,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:real val="11.75"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="6.5"/>
@@ -587,13 +594,13 @@ M  : Finger movement
 L  : Locked drags enabled#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Courier"/>
+            <dia:font family="courier new" style="0" 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:point val="8.49118,42.3412"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -609,7 +616,7 @@ L  : Locked drags enabled#</dia:string>
         <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:rectangle val="11.0162,9.8412;11.3662,10.8412"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -617,7 +624,7 @@ L  : Locked drags enabled#</dia:string>
             <dia:string>#T#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Courier"/>
+            <dia:font family="courier new" style="0" name="Courier"/>
           </dia:attribute>
           <dia:attribute name="height">
             <dia:real val="0.8"/>
@@ -636,24 +643,25 @@ L  : Locked drags enabled#</dia:string>
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="11.1912,24.4412"/>
+        <dia:point val="11.1412,23.5912"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.958,23.8447;11.4244,24.6447"/>
+        <dia:rectangle val="10.5949,22.92;11.6662,24.7837"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#T#</dia:string>
+            <dia:string>#T
+[D]#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Courier"/>
+            <dia:font family="courier new" style="0" 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:point val="11.1412,23.5912"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -669,7 +677,7 @@ L  : Locked drags enabled#</dia:string>
         <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:rectangle val="17.2662,10.0412;17.6162,11.0412"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -677,7 +685,7 @@ L  : Locked drags enabled#</dia:string>
             <dia:string>#R#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Courier"/>
+            <dia:font family="courier new" style="0" name="Courier"/>
           </dia:attribute>
           <dia:attribute name="height">
             <dia:real val="0.8"/>
@@ -699,11 +707,11 @@ L  : Locked drags enabled#</dia:string>
         <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:rectangle val="13.5106,26.8923;19.9914,28.4937"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="13.5614,27.593"/>
-        <dia:point val="19.8288,27.593"/>
+        <dia:point val="19.9288,27.693"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -724,25 +732,24 @@ L  : Locked drags enabled#</dia:string>
     </dia:object>
     <dia:object type="Standard - Text" version="0" id="O19">
       <dia:attribute name="obj_pos">
-        <dia:point val="11.1412,16.6912"/>
+        <dia:point val="11.2412,17.1912"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.6132,16.0947;11.6692,17.6947"/>
+        <dia:rectangle val="11.045,16.52;11.4162,17.5837"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#R
-[D]#</dia:string>
+            <dia:string>#R#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Courier"/>
+            <dia:font family="courier new" style="0" 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:point val="11.2412,17.1912"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -758,16 +765,16 @@ L  : Locked drags enabled#</dia:string>
         <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:rectangle val="5.36618,23.42;6.43743,25.2837"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
             <dia:string>#R
-[U,D]#</dia:string>
+[U]#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Courier"/>
+            <dia:font family="courier new" style="0" name="Courier"/>
           </dia:attribute>
           <dia:attribute name="height">
             <dia:real val="0.8"/>
@@ -789,7 +796,7 @@ L  : Locked drags enabled#</dia:string>
         <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:rectangle val="15.1662,13.0412;17.6162,14.0412"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -797,7 +804,7 @@ L  : Locked drags enabled#</dia:string>
             <dia:string>#TO or M#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Courier"/>
+            <dia:font family="courier new" style="0" name="Courier"/>
           </dia:attribute>
           <dia:attribute name="height">
             <dia:real val="0.8"/>
@@ -819,7 +826,7 @@ L  : Locked drags enabled#</dia:string>
         <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:rectangle val="15.292,26.5077;17.742,27.5077"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -827,7 +834,7 @@ L  : Locked drags enabled#</dia:string>
             <dia:string>#TO or M#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Courier"/>
+            <dia:font family="courier new" style="0" name="Courier"/>
           </dia:attribute>
           <dia:attribute name="height">
             <dia:real val="0.8"/>
@@ -849,16 +856,16 @@ L  : Locked drags enabled#</dia:string>
         <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:rectangle val="3.71618,12.1199;5.48743,13.9837"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
             <dia:string>#TO
-[U]#</dia:string>
+[D,U]#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Courier"/>
+            <dia:font family="courier new" style="0" name="Courier"/>
           </dia:attribute>
           <dia:attribute name="height">
             <dia:real val="0.8"/>
@@ -880,7 +887,7 @@ L  : Locked drags enabled#</dia:string>
         <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:rectangle val="23.4412,17.1912;25.5412,18.9912"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -889,7 +896,7 @@ L  : Locked drags enabled#</dia:string>
 [U]#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Courier"/>
+            <dia:font family="courier new" style="0" name="Courier"/>
           </dia:attribute>
           <dia:attribute name="height">
             <dia:real val="0.8"/>
@@ -934,13 +941,13 @@ L  : Locked drags enabled#</dia:string>
             <dia:string>#4#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Helvetica"/>
+            <dia:font family="arial" style="0" 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:point val="21.5712,33.7412"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -979,13 +986,13 @@ L  : Locked drags enabled#</dia:string>
             <dia:string>#5#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Helvetica"/>
+            <dia:font family="arial" style="0" 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:point val="21.5712,39.2912"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -998,13 +1005,13 @@ L  : Locked drags enabled#</dia:string>
     </dia:object>
     <dia:object type="Standard - Line" version="0" id="O27">
       <dia:attribute name="obj_pos">
-        <dia:point val="21.5712,28.593"/>
+        <dia:point val="21.5538,28.693"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.7712,28.543;22.3712,32.5412"/>
+        <dia:rectangle val="20.771,28.6428;22.3714,32.5449"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="21.5712,28.593"/>
+        <dia:point val="21.5538,28.693"/>
         <dia:point val="21.5712,32.4912"/>
       </dia:attribute>
       <dia:attribute name="numcp">
@@ -1057,7 +1064,7 @@ L  : Locked drags enabled#</dia:string>
         <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:rectangle val="18.9358,29.9412;20.6858,30.9412"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1065,7 +1072,7 @@ L  : Locked drags enabled#</dia:string>
             <dia:string>#R &amp; L#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Courier"/>
+            <dia:font family="courier new" style="0" name="Courier"/>
           </dia:attribute>
           <dia:attribute name="height">
             <dia:real val="0.8"/>
@@ -1087,7 +1094,7 @@ L  : Locked drags enabled#</dia:string>
         <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:rectangle val="20.5358,35.6912;20.8858,36.6912"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1095,7 +1102,7 @@ L  : Locked drags enabled#</dia:string>
             <dia:string>#T#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Courier"/>
+            <dia:font family="courier new" style="0" name="Courier"/>
           </dia:attribute>
           <dia:attribute name="height">
             <dia:real val="0.8"/>
@@ -1117,7 +1124,7 @@ L  : Locked drags enabled#</dia:string>
         <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:rectangle val="25.7608,31.5412;26.4608,34.1412"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1127,7 +1134,7 @@ or
 M#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Courier"/>
+            <dia:font family="courier new" style="0" name="Courier"/>
           </dia:attribute>
           <dia:attribute name="height">
             <dia:real val="0.8"/>
@@ -1149,13 +1156,13 @@ M#</dia:string>
         <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:rectangle val="22.1879,27.7265;25.2134,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:point val="25.8104,30.6912"/>
+        <dia:point val="22.7028,28.4001"/>
       </dia:attribute>
       <dia:attribute name="corner_types">
         <dia:enum val="0"/>
@@ -1180,21 +1187,18 @@ M#</dia:string>
         <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:rectangle val="12.8949,5.73572;30.5643,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:point val="35.9006,3.04119"/>
+        <dia:point val="13.0652,6.53408"/>
       </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>
@@ -1214,7 +1218,7 @@ M#</dia:string>
         <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:rectangle val="28.9162,22.1912;29.9662,23.9912"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1223,7 +1227,7 @@ M#</dia:string>
 [U]#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font name="Courier"/>
+            <dia:font family="courier new" style="0" name="Courier"/>
           </dia:attribute>
           <dia:attribute name="height">
             <dia:real val="0.8"/>
diff --git a/synaptics.c b/synaptics.c
index 4651572..f785f3f 100644
--- a/synaptics.c
+++ b/synaptics.c
@@ -909,7 +909,6 @@ HandleTapProcessing(SynapticsPrivate *priv, struct SynapticsHwState *hw,
 	    goto restart;
 	} else if (release) {
 	    SelectTapButton(priv, edge);
-	    priv->tap_button_state = TBS_BUTTON_DOWN;
 	    SetTapState(priv, TS_2, hw->millis);
 	}
 	break;
@@ -918,17 +917,20 @@ HandleTapProcessing(SynapticsPrivate *priv, struct SynapticsHwState *hw,
 	    SetTapState(priv, TS_START, hw->millis);
 	break;
     case TS_2:
-	if (touch)
+	if (touch) {
+	    priv->tap_button_state = TBS_BUTTON_DOWN;
 	    SetTapState(priv, TS_3, hw->millis);
-	else if (timeout)
+	} else if (timeout) {
 	    SetTapState(priv, TS_START, hw->millis);
+	    priv->tap_button_state = TBS_BUTTON_DOWN_UP;
+	}
 	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;
+	    priv->tap_button_state = TBS_BUTTON_UP;
 	    SetTapState(priv, TS_2, hw->millis);
 	}
 	break;
@@ -1274,13 +1276,12 @@ HandleState(LocalDevicePtr local, struct SynapticsHwState *hw)
 
     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;
+	if (priv->tap_button_state == TBS_BUTTON_DOWN_UP) {
+	    if (tap_mask != (priv->lastButtons & tap_mask)) {
+		xf86PostButtonEvent(local->dev, FALSE, priv->tap_button, TRUE, 0, 0);
+		priv->lastButtons |= tap_mask;
 	    }
-	    priv->tap_button_state = TBS_BUTTON_DOWN;
+	    priv->tap_button_state = TBS_BUTTON_UP;
 	}
 	if (priv->tap_button_state == TBS_BUTTON_DOWN)
 	    buttons |= tap_mask;
diff --git a/synaptics.h b/synaptics.h
index 6dbab2a..67c74ca 100644
--- a/synaptics.h
+++ b/synaptics.h
@@ -128,7 +128,7 @@ enum TapState {
 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 */
+    TBS_BUTTON_DOWN_UP		/* Send button down event + set up state */
 };
 
 typedef struct _SynapticsPrivateRec