aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-03-07 19:43:07 -0500
committerAdam Jackson <ajax@redhat.com>2008-03-07 19:43:07 -0500
commitbb36ca65c64d1d863f8fa4e6f058a384fbc80eb0 (patch)
tree2beec8c03850babc37b02f899e62c795e6945bbe
parentremove XFree86LOADER usage (diff)
downloadxf86-input-evdev-bb36ca65c64d1d863f8fa4e6f058a384fbc80eb0.tar.gz
xf86-input-evdev-bb36ca65c64d1d863f8fa4e6f058a384fbc80eb0.tar.bz2
xf86-input-evdev-bb36ca65c64d1d863f8fa4e6f058a384fbc80eb0.zip
Support the new DIX motion history API
Spiritually cherry-picked from 036b457c1b3f7d2d174da890cb8598d907181f8e
-rw-r--r--src/evdev.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/evdev.c b/src/evdev.c
index 9b59421..e21cea3 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -439,9 +439,8 @@ EvdevAddRelClass(DeviceIntPtr device)
pInfo = device->public.devicePrivate;
- if (!InitValuatorClassDeviceStruct(device, 2,
- miPointerGetMotionEvents,
- miPointerGetMotionBufferSize(), 0))
+ if (!InitValuatorClassDeviceStruct(device, 2, GetMotionHistory,
+ GetMotionHistorySize(), 0))
return !Success;
/* X valuator */
@@ -456,6 +455,8 @@ EvdevAddRelClass(DeviceIntPtr device)
if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc))
return !Success;
+ xf86MotionHistoryAllocate(pInfo);
+
return Success;
}
@@ -654,7 +655,6 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
pInfo->type_name = "UNKNOWN";
pInfo->device_control = EvdevProc;
pInfo->read_input = EvdevReadInput;
- pInfo->motion_history_proc = xf86GetMotionEvents;
pInfo->history_size = 0;
pInfo->control_proc = NULL;
pInfo->close_proc = NULL;