summaryrefslogtreecommitdiff
authorPete Beardmore <pete.beardmore@msn.com>2012-01-09 23:47:45 (GMT)
committer Peter Hutterer <peter.hutterer@who-t.net>2012-01-10 00:56:45 (GMT)
commit854df75f4908bee66e1057f6f04817a1c47124bc (patch) (side-by-side diff)
tree7761f56b907ae822f77c9ffe29f5de18e0d98b74
parent8c55e94a6ac91fa856d37206c8a7eda1adcc6b9d (diff)
downloadxf86-input-evdev-854df75f4908bee66e1057f6f04817a1c47124bc.zip
xf86-input-evdev-854df75f4908bee66e1057f6f04817a1c47124bc.tar.gz
missing multitouch related define tests
addition of two missing define tests required when no multitouch related symbols are available in user-space Fixes X.Org Bug 44578 <https://bugs.freedesktop.org/show_bug.cgi?id=44578> Signed-off-by: Pete Beardmore <pete.beardmore@msn.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/evdev.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/evdev.c b/src/evdev.c
index 82cdb00..989a255 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1143,6 +1143,7 @@ EvdevAddKeyClass(DeviceIntPtr device)
return Success;
}
+#ifdef MULTITOUCH
/* MT axes are counted twice - once as ABS_X (which the kernel keeps for
* backwards compatibility), once as ABS_MT_POSITION_X. So we need to keep a
* mapping of those axes to make sure we only count them once
@@ -1160,6 +1161,7 @@ static struct mt_axis_mappings mt_axis_mappings[] = {
{ABS_MT_PRESSURE, ABS_PRESSURE},
{ABS_MT_DISTANCE, ABS_DISTANCE},
};
+#endif
/**
* return TRUE if the axis is not one we should count as true axis
@@ -1280,6 +1282,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
mapping = i;
+#ifdef MULTITOUCH
for (j = 0; j < ArrayLength(mt_axis_mappings); j++)
{
if (mt_axis_mappings[j].code == axis)
@@ -1288,7 +1291,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
mt_axis_mappings[j].needs_mapping)
mapping = mt_axis_mappings[j].mapping;
}
-
+#endif
pEvdev->axis_map[axis] = mapping;
if (mapping == i)
i++;