Abstracted out the code to determine the hardware state

from the ReadInput() function. This will make it possible to support
the event based absolute packet format generated by the 2.5 kernel.

1 files changed, 18 insertions, 0 deletions

diff --git a/synaptics.h b/synaptics.h
index 409185b..a278c3b 100644
--- a/synaptics.h
+++ b/synaptics.h
@@ -42,6 +42,22 @@ typedef struct _SynapticsSHM
  *****************************************************************************/
 #define SYNAPTICS_MOVE_HISTORY	5
 
+/*
+ * A structure to describe the state of the touchpad hardware (buttons and pad)
+ */
+struct SynapticsHwState {
+	int x;
+	int y;
+	int z;
+	int w;
+	Bool left;
+	Bool right;
+	Bool up;
+	Bool down;
+	Bool cbLeft;
+	Bool cbRight;
+};
+
 typedef struct _SynapticsTapRec 
 {
 	int x, y;
@@ -122,6 +138,8 @@ static Bool DeviceInit(DeviceIntPtr);
 static Bool DeviceOn(DeviceIntPtr);
 static Bool DeviceOff(DeviceIntPtr);
 static Bool DeviceInit(DeviceIntPtr);
+static Bool SynapticsGetHwState(LocalDevicePtr local, SynapticsPrivatePtr priv,
+								struct SynapticsHwState *hw);
 static Bool SynapticsGetPacket(LocalDevicePtr, SynapticsPrivatePtr);
 static void PrintIdent(SynapticsPrivatePtr);