summaryrefslogtreecommitdiff
path: root/synaptics.h
diff options
context:
space:
mode:
authorPeter Osterlund <petero2@telia.com>2003-09-25 01:37:13 +0200
committerPeter Osterlund <petero2@telia.com>2006-04-09 04:01:12 +0200
commita37a1239a79d0147dbd76e7346108d4b7a836864 (patch)
tree507aa7a47fa006d5ec858eed039fe98497bdb6c8 /synaptics.h
parentfe3d1e6d2bae13264eb85d2466d1e8c78686d993 (diff)
Added support for the new 2.6 kernel events ABS_TOOL_WIDTH,
BTN_TOOL_FINGER, BTN_TOOL_DOUBLETAP and BTN_TOOL_TRIPLETAP. Note that this swaps the direction of the Y axis internally to match X and the linux input subsystem. Because of this, the TopEdge and BottomEdge parameters must be modified in the config file. There is some backwards compatibility code for old 2.5/2.6 kernels that will probably be deleted later.
Diffstat (limited to 'synaptics.h')
-rw-r--r--synaptics.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/synaptics.h b/synaptics.h
index 468f22b..dca94d9 100644
--- a/synaptics.h
+++ b/synaptics.h
@@ -13,7 +13,8 @@ typedef struct _SynapticsSHM
/* Current device state */
int x, y; /* actual x, y coordinates */
int z; /* pressure value */
- int w; /* finger width value */
+ int numFingers; /* number of fingers */
+ int fingerWidth; /* finger width value */
int left, right, up, down; /* left/right/up/down buttons */
/* Probed hardware properties */
@@ -54,7 +55,11 @@ struct SynapticsHwState {
int x; /* X position of finger */
int y; /* Y position of finger */
int z; /* Finger pressure */
- int w; /* Finger width/finger count */
+ Bool oneFinger;
+ Bool twoFingers;
+ Bool threeFingers;
+ int fingerWidth;
+
Bool left;
Bool right;
Bool up;
@@ -138,7 +143,10 @@ typedef struct _SynapticsPrivateRec
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 */
- int avg_w; /* weighted average of previous w values */
+ int avg_width; /* weighted average of previous fingerWidth values */
+
+ Bool swapY; /* Swap Y coordinate direction. For compatibility
+ with old 2.5/2.6 kernels. Will be removed. */
}
SynapticsPrivateRec, *SynapticsPrivatePtr;