diff options
| -rw-r--r-- | src/evdev.h | 1 | ||||
| -rw-r--r-- | src/evdev_axes.c | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/evdev.h b/src/evdev.h index f682312..c6e9188 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -172,7 +172,6 @@ typedef struct { int min[ABS_MAX]; int max[ABS_MAX]; int map[ABS_MAX]; - int scale[2]; int screen; /* Screen number for this device. */ Bool use_touch; Bool touch; diff --git a/src/evdev_axes.c b/src/evdev_axes.c index 9d2ef20..cab9784 100644 --- a/src/evdev_axes.c +++ b/src/evdev_axes.c @@ -276,11 +276,14 @@ EvdevAxesAbsSynRep (InputInfoPtr pInfo) skip_xy = 1; } else if (state->mode == Absolute && state->abs->screen != -1 && state->abs->axes >= 2) { int conv_x, conv_y; + int scale[2]; + + scale[0] = screenInfo.screens[state->abs->screen]->width; + scale[1] = screenInfo.screens[state->abs->screen]->height; for (i = 0; i < 2; i++) state->axes->v[i] = xf86ScaleAxis (state->abs->v[i], - 0, state->abs->scale[i], - state->abs->min[i], state->abs->max[i]); + 0, scale[i], state->abs->min[i], state->abs->max[i]); EvdevConvert (pInfo, 0, 2, state->abs->v[0], state->abs->v[1], @@ -504,9 +507,6 @@ EvdevAxisAbsNew1(InputInfoPtr pInfo) if (k < screenInfo.numScreens && k >= 0) { state->abs->screen = k; xf86Msg(X_CONFIG, "%s: AbsoluteScreen: %d.\n", pInfo->name, k); - - state->abs->scale[0] = screenInfo.screens[state->abs->screen]->width; - state->abs->scale[1] = screenInfo.screens[state->abs->screen]->height; } else { if (k != -1) xf86Msg(X_CONFIG, "%s: AbsoluteScreen: %d is not a valid screen.\n", pInfo->name, k); |