The field is still there (for ABI reasons) but the server hasn't called either of these two since about 1.4 or so.
Signed-off-by: Peter Hutterer <[email protected]> --- src/wcmConfig.c | 2 - src/xf86Wacom.c | 99 ------------------------------------------------------- src/xf86Wacom.h | 4 -- 3 files changed, 0 insertions(+), 105 deletions(-) diff --git a/src/wcmConfig.c b/src/wcmConfig.c index bb952e1..f5e1d83 100644 --- a/src/wcmConfig.c +++ b/src/wcmConfig.c @@ -61,8 +61,6 @@ static int wcmAllocate(LocalDevicePtr local, char* type_name, int flag) local->control_proc = gWacomModule.DevChangeControl; local->close_proc = gWacomModule.DevClose; local->switch_mode = gWacomModule.DevSwitchMode; - local->conversion_proc = gWacomModule.DevConvert; - local->reverse_conversion_proc = gWacomModule.DevReverseConvert; local->fd = -1; local->atom = 0; local->dev = NULL; diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c index c70c7da..0547614 100644 --- a/src/xf86Wacom.c +++ b/src/xf86Wacom.c @@ -61,10 +61,6 @@ static void wcmDevControlProc(DeviceIntPtr device, PtrCtrl* ctrl); int wcmDevChangeControl(LocalDevicePtr local, xDeviceCtl * control); static void wcmDevClose(LocalDevicePtr local); static int wcmDevProc(DeviceIntPtr pWcm, int what); -static Bool wcmDevConvert(LocalDevicePtr local, int first, int num, - int v0, int v1, int v2, int v3, int v4, int v5, int* x, int* y); -static Bool wcmDevReverseConvert(LocalDevicePtr local, int x, int y, - int* valuators); WacomModule gWacomModule = { @@ -78,8 +74,6 @@ WacomModule gWacomModule = wcmDevClose, wcmDevProc, wcmDevSwitchMode, - wcmDevConvert, - wcmDevReverseConvert, }; static void wcmKbdLedCallback(DeviceIntPtr di, LedCtrl * lcp) @@ -1309,97 +1303,4 @@ static int wcmDevProc(DeviceIntPtr pWcm, int what) return Success; } -/***************************************************************************** - * wcmDevConvert -- - * Convert X & Y valuators so core events can be generated with - * coordinates that are scaled and suitable for screen resolution. - ****************************************************************************/ - -static Bool wcmDevConvert(LocalDevicePtr local, int first, int num, - int v0, int v1, int v2, int v3, int v4, int v5, int* x, int* y) -{ - WacomDevicePtr priv = (WacomDevicePtr) local->private; - - DBG(6, priv, "v0=%d v1=%d on screen %d \n", - v0, v1, priv->currentScreen); - - if (first != 0 || num == 1) - return FALSE; - - if (priv->flags & ABSOLUTE_FLAG) - { - v0 -= priv->topX; - v1 -= priv->topY; - if (priv->currentScreen == 1 && priv->twinview != TV_NONE) - { - v0 -= priv->tvoffsetX; - v1 -= priv->tvoffsetY; - } - } - - *x = (double)v0 * priv->factorX + 0.5; - *y = (double)v1 * priv->factorY + 0.5; - - if ((priv->flags & ABSOLUTE_FLAG) && (priv->twinview == TV_NONE)) - { - *x -= priv->screenTopX[priv->currentScreen]; - *y -= priv->screenTopY[priv->currentScreen]; - } - - if (priv->screen_no != -1) - { - if (*x > priv->screenBottomX[priv->currentScreen] - priv->screenTopX[priv->currentScreen]) - *x = priv->screenBottomX[priv->currentScreen]; - if (*x < 0) *x = 0; - if (*y > priv->screenBottomY[priv->currentScreen] - priv->screenTopY[priv->currentScreen]) - *y = priv->screenBottomY[priv->currentScreen]; - if (*y < 0) *y = 0; - - } - DBG(6, priv, "v0=%d v1=%d to x=%d y=%d\n", v0, v1, *x, *y); - return TRUE; -} - -/***************************************************************************** - * wcmDevReverseConvert -- - * Convert X and Y to valuators in relative mode where the position of - * the core pointer must be translated into device cootdinates before - * the extension and core events are generated in Xserver. - ****************************************************************************/ - -static Bool wcmDevReverseConvert(LocalDevicePtr local, int x, int y, - int* valuators) -{ - WacomDevicePtr priv = (WacomDevicePtr) local->private; - int i = 0; - - DBG(6, priv, "x=%d y=%d \n", x, y); - priv->currentSX = x; - priv->currentSY = y; - - if (!(priv->flags & ABSOLUTE_FLAG)) - { - if (!priv->devReverseCount) - { - valuators[0] = (((double)x / priv->factorX) + 0.5); - valuators[1] = (((double)y / priv->factorY) + 0.5); - - /* reset valuators to report raw values */ - for (i=2; i<priv->naxes; i++) - valuators[i] = 0; - - priv->devReverseCount = 1; - } - else - priv->devReverseCount = 0; - } - - DBG(6, priv, "Wacom converted x=%d y=%d" - " to v0=%d v1=%d v2=%d v3=%d v4=%d v5=%d\n", x, y, - valuators[0], valuators[1], valuators[2], - valuators[3], valuators[4], valuators[5]); - - return TRUE; -} - /* vim: set noexpandtab shiftwidth=8: */ diff --git a/src/xf86Wacom.h b/src/xf86Wacom.h index 81bace1..cc85e57 100644 --- a/src/xf86Wacom.h +++ b/src/xf86Wacom.h @@ -104,10 +104,6 @@ struct _WacomModule void (*DevClose)(LocalDevicePtr local); int (*DevProc)(DeviceIntPtr pWcm, int what); int (*DevSwitchMode)(ClientPtr client, DeviceIntPtr dev, int mode); - Bool (*DevConvert)(LocalDevicePtr local, int first, int num, - int v0, int v1, int v2, int v3, int v4, int v5, int* x, int* y); - Bool (*DevReverseConvert)(LocalDevicePtr local, int x, int y, - int* valuators); }; extern WacomModule gWacomModule; -- 1.6.6.1 ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
