mirror of
https://github.com/X11Libre/xf86-input-evdev.git
synced 2026-04-14 11:44:16 +00:00
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>
This commit is contained in:
committed by
Peter Hutterer
parent
8c55e94a6a
commit
854df75f49
@@ -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++;
|
||||
|
||||
Reference in New Issue
Block a user