XLibre/xf86-input-evdev
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-evdev.git synced 2026-04-14 11:44:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add is_blacklisted_axis() helper

Browse Source 
The kernel exports a bunch of information as axis that shouldn't be an axis
and we don't treat it as axis in the server. Add this helper instead of
checking for the axis codes manually.

No function change.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2011-12-20 14:14:16 +10:00
parent a1c3f8efbb
commit 191660189a
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/evdev.c
View File

@@ -1131,6 +1131,23 @@ EvdevAddKeyClass(DeviceIntPtr device)
return Success;
}
/**
* return TRUE if the axis is not one we should count as true axis
*/
static int
is_blacklisted_axis(int axis)
{
switch(axis)
{
case ABS_MT_SLOT:
case ABS_MT_TRACKING_ID:
return TRUE;
default:
return FALSE;
}
}
static int
EvdevAddAbsValuatorClass(DeviceIntPtr device)
{
@@ -1155,7 +1172,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
{
if (EvdevBitIsSet(pEvdev->abs_bitmask, axis))
{
if(axis != ABS_MT_SLOT && axis != ABS_MT_TRACKING_ID)
if (!is_blacklisted_axis(axis))
num_mt_axes++;
num_axes--;
}
@@ -1215,7 +1232,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
for (axis = ABS_X; i < MAX_VALUATORS && axis <= ABS_MAX; axis++) {
pEvdev->axis_map[axis] = -1;
if (!EvdevBitIsSet(pEvdev->abs_bitmask, axis) ||
axis == ABS_MT_SLOT || axis == ABS_MT_TRACKING_ID)
is_blacklisted_axis(axis))
continue;
pEvdev->axis_map[axis] = i;
i++;