Replaced the oneFinger, twoFingers and threeFingers

variables in SynapticsHwState with a single variable numFingers. This
is more logical, the old variables only existed because of
implementation details in the 2.6 kernel interface.

1 files changed, 5 insertions, 3 deletions

diff --git a/synaptics.h b/synaptics.h
index 87a3c11..6538807 100644
--- a/synaptics.h
+++ b/synaptics.h
@@ -57,9 +57,7 @@ struct SynapticsHwState {
     int x;			/* X position of finger */
     int y;			/* Y position of finger */
     int z;			/* Finger pressure */
-    Bool oneFinger;
-    Bool twoFingers;
-    Bool threeFingers;
+    int numFingers;
     int fingerWidth;
 
     Bool left;
@@ -147,6 +145,10 @@ typedef struct _SynapticsPrivateRec
 					   palm/finger contact disappears */
     int prev_z;				/* previous z value, for palm detection */
     int avg_width;			/* weighted average of previous fingerWidth values */
+
+    Bool oneFinger;			/* Used by SynapticsParseEventData to */
+    Bool twoFingers;			/* keep track of the number of fingers */
+    Bool threeFingers;			/* on the touchpad. */
 } SynapticsPrivate;