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 generic axis support for relative axes.

Browse Source 
Just query the kernel what axes we actually have, rather than hard-coding x/y.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2009-02-17 14:53:51 +10:00
parent a1714cac52
commit 9620fe7765
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/evdev.c
View File

@@ -954,23 +954,40 @@ static int
EvdevAddRelClass(DeviceIntPtr device) EvdevAddRelClass(DeviceIntPtr device)
{ {
InputInfoPtr pInfo; InputInfoPtr pInfo;
EvdevPtr pEvdev;
int num_axes, axis, i = 0;
pInfo = device->public.devicePrivate; pInfo = device->public.devicePrivate;
pEvdev = pInfo->private;
if (!InitValuatorClassDeviceStruct(device, 2, if (!TestBit(EV_REL, pEvdev->bitmask))
return !Success;
num_axes = CountBits(pEvdev->rel_bitmask, NLONGS(REL_MAX));
if (num_axes < 1)
return !Success;
pEvdev->num_vals = num_axes;
memset(pEvdev->vals, 0, num_axes * sizeof(int));
if (!InitValuatorClassDeviceStruct(device, num_axes,
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
GetMotionHistory, GetMotionHistory,
#endif #endif
GetMotionHistorySize(), Relative)) GetMotionHistorySize(), Relative))
return !Success; return !Success;
/* X valuator */ for (axis = REL_X; axis <= REL_MAX; axis++)
xf86InitValuatorAxisStruct(device, 0, -1, -1, 1, 0, 1); {
xf86InitValuatorDefaults(device, 0); pEvdev->axis_map[axis] = -1;
if (!TestBit(axis, pEvdev->rel_bitmask))
continue;
pEvdev->axis_map[axis] = i;
xf86InitValuatorAxisStruct(device, i, -1, -1, 1, 0, 1);
xf86InitValuatorDefaults(device, i);
i++;
}
/* Y valuator */
xf86InitValuatorAxisStruct(device, 1, -1, -1, 1, 0, 1);
xf86InitValuatorDefaults(device, 1);
xf86MotionHistoryAllocate(pInfo); xf86MotionHistoryAllocate(pInfo);
if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc)) if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc))