summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-05-21 11:33:22 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-05-31 14:56:47 +1000
commitbe202ce54fcb2e96fe3e296a64dd8e6e63d52488 (patch)
tree29da918fae1eeae5ebd549d0a8b9c1b69d601db2
parentca739bf305ee8872902bf433f5a16261471cf206 (diff)
eventcomm: replace label defines with label strings
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/eventcomm.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/eventcomm.c b/src/eventcomm.c
index 42389c2..f20462c 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -29,7 +29,6 @@
#include "config.h"
#endif
-#include <xserver-properties.h>
#include "eventcomm.h"
#include <errno.h>
#include <sys/types.h>
@@ -771,17 +770,17 @@ event_query_touch(SynapticsPrivate *priv, int fd)
int axnum;
static const char *labels[] = {
- AXIS_LABEL_PROP_ABS_MT_TOUCH_MAJOR,
- AXIS_LABEL_PROP_ABS_MT_TOUCH_MINOR,
- AXIS_LABEL_PROP_ABS_MT_WIDTH_MAJOR,
- AXIS_LABEL_PROP_ABS_MT_WIDTH_MINOR,
- AXIS_LABEL_PROP_ABS_MT_ORIENTATION,
- AXIS_LABEL_PROP_ABS_MT_POSITION_X,
- AXIS_LABEL_PROP_ABS_MT_POSITION_Y,
- AXIS_LABEL_PROP_ABS_MT_TOOL_TYPE,
- AXIS_LABEL_PROP_ABS_MT_BLOB_ID,
- AXIS_LABEL_PROP_ABS_MT_TRACKING_ID,
- AXIS_LABEL_PROP_ABS_MT_PRESSURE,
+ "Abs MT Width Major",
+ "Abs MT Touch Minor",
+ "Abs MT Width Major",
+ "Abs MT Width Minor",
+ "Abs MT Orientation",
+ "Abs MT Position X",
+ "Abs MT Position Y",
+ "Abs MT Tool Type",
+ "Abs MT Blob ID",
+ "Abs MT Tracking ID",
+ "Abs MT Pressure",
};
if (mtdev->caps.slot.maximum > 0)