From b5fc405451d8fa01b9e5fb6f2da74a6e03d50174 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 25 Oct 2010 11:31:23 +1000 Subject: Don't try to call conversion_proc anymore. This hasn't been called since at least server 1.5 or so (ABI 2), possibly longer. Signed-off-by: Peter Hutterer Reviewed-by: Alan Coopersmith Tested-by: Alan Coopersmith --- src/mouse.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mouse.c b/src/mouse.c index 79f742a..2fe5df2 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -122,9 +122,11 @@ typedef struct _DragLockRec { static InputInfoPtr MousePreInit(InputDriverPtr drv, IDevPtr dev, int flags); static int MouseProc(DeviceIntPtr device, int what); +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 2 static Bool MouseConvert(InputInfoPtr pInfo, int first, int num, int v0, int v1, int v2, int v3, int v4, int v5, int *x, int *y); +#endif static void MouseCtrl(DeviceIntPtr device, PtrCtrl *ctrl); static void MousePostEvent(InputInfoPtr pInfo, int buttons, @@ -877,8 +879,10 @@ MousePreInit(InputDriverPtr drv, IDevPtr dev, int flags) pInfo->control_proc = NULL; pInfo->close_proc = NULL; pInfo->switch_mode = NULL; +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 2 pInfo->conversion_proc = MouseConvert; pInfo->reverse_conversion_proc = NULL; +#endif pInfo->fd = -1; pInfo->dev = NULL; pInfo->private_flags = 0; @@ -1711,6 +1715,7 @@ MouseProc(DeviceIntPtr device, int what) return Success; } +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 2 /* *************************************************************************** * @@ -1731,6 +1736,7 @@ MouseConvert(InputInfoPtr pInfo, int first, int num, int v0, int v1, int v2, return TRUE; } +#endif /********************************************************************** * -- cgit v1.2.3