diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-12-02 15:42:11 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-12-02 15:42:11 +1000 |
commit | 9c887eceeb7f6bb1f9005bc2aeedeaa0a5d77ec4 (patch) | |
tree | 18df88e75f9cf25564a7032e1778bcefe9e42fb4 | |
parent | 69ea6552035603f1813c80caa14cd8fba2778102 (diff) |
Drop close_proc, conversion_proc, reverse_conversion_proc
All three are not called by the server anymore.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
-rw-r--r-- | src/xf86MuTouch.c | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/src/xf86MuTouch.c b/src/xf86MuTouch.c index d733e4a..445b3e2 100644 --- a/src/xf86MuTouch.c +++ b/src/xf86MuTouch.c @@ -220,62 +220,6 @@ typedef struct _MuTPrivateRec { } MuTPrivateRec, *MuTPrivatePtr; - - -/* - *************************************************************************** - * - * xf86MuTConvert -- - * Convert extended valuators to x and y suitable for core motion - * events. Return True if ok and False if the requested conversion - * can't be done for the specified valuators. - * - *************************************************************************** - */ -static Bool -xf86MuTConvert(InputInfoPtr pInfo, - int first, - int num, - int v0, - int v1, - int v2, - int v3, - int v4, - int v5, - int *x, - int *y) -{ - MuTPrivatePtr priv = (MuTPrivatePtr) pInfo->private; - int width = priv->max_x - priv->min_x; - int height = priv->max_y - priv->min_y; - int input_x, input_y; - - if (first != 0 || num != 2) - return FALSE; - - if (priv->swap_axes) { - input_x = v1; - input_y = v0; - } - else { - input_x = v0; - input_y = v1; - } - *x = (priv->screen_width * (input_x - priv->min_x)) / width; - *y = (priv->screen_height - - (priv->screen_height * (input_y - priv->min_y)) / height); - - /* - * Need to check if still on the correct screen. - * This call is here so that this work can be done after - * calib and before posting the event. - */ - xf86XInputSetScreen(pInfo, priv->screen_no, *x, *y); - - return TRUE; -} - - /* *************************************************************************** * @@ -1051,10 +995,7 @@ xf86MuTAllocate(InputDriverPtr drv, pInfo->device_control = xf86MuTControl; pInfo->read_input = xf86MuTReadInput; pInfo->control_proc = NULL; - pInfo->close_proc = NULL; pInfo->switch_mode = NULL; - pInfo->conversion_proc = xf86MuTConvert; - pInfo->reverse_conversion_proc = NULL; pInfo->fd = -1; pInfo->atom = 0; pInfo->dev = NULL; |