diff options
| author | Zephaniah E. Hull <warp@agamemnon.b5> | 2007-06-11 09:08:24 -0400 |
|---|---|---|
| committer | Zephaniah E. Hull <warp@agamemnon.b5> | 2007-06-11 09:08:24 -0400 |
| commit | 2d2c4804f925505e737c2c812687f47840218c93 (patch) | |
| tree | e22e30328fa242c6a0745ae7a1b96932871c3730 /src/evdev_axes.c | |
| parent | Handle default remapping around existing button targets better. (diff) | |
| download | xf86-input-evdev-2d2c4804f925505e737c2c812687f47840218c93.tar.gz xf86-input-evdev-2d2c4804f925505e737c2c812687f47840218c93.tar.bz2 xf86-input-evdev-2d2c4804f925505e737c2c812687f47840218c93.zip | |
evdev.c:
Set and use the X mode control, letting XInput see it properly.
Kill some cruft.
evdev.h:
Set and use the X mode control, letting XInput see it properly.
evdev_axes.c:
Set and use the X mode control, letting XInput see it properly.
evdev_key.c:
Remove some cruft, the bell func can be NULL now, so do so.
Don't bother looking for keys above 0xF7 until we can actually do
something with them.
Diffstat (limited to 'src/evdev_axes.c')
| -rw-r--r-- | src/evdev_axes.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/evdev_axes.c b/src/evdev_axes.c index 4abab46..60bfde7 100644 --- a/src/evdev_axes.c +++ b/src/evdev_axes.c @@ -581,7 +581,7 @@ EvdevAxesAbsProcess (InputInfoPtr pInfo, struct input_event *ev) if (v_flags & EV_ABS_V_M_REL) is_rel = 1; - else if ((v_flags & EV_ABS_V_M_AUTO) && state->mode == Relative) + else if ((v_flags & EV_ABS_V_M_AUTO) && pInfo->dev->valuator->mode == Relative) is_rel = 1; else is_rel = 0; @@ -728,13 +728,13 @@ EvdevAxisAbsNew1(InputInfoPtr pInfo) s = xf86SetStrOption(pInfo->options, "Mode", "Absolute"); if (!strcasecmp(s, "Absolute")) { - state->mode = Absolute; + pInfo->dev->valuator->mode = Absolute; xf86Msg(X_CONFIG, "%s: Configuring in %s mode.\n", pInfo->name, s); } else if (!strcasecmp(s, "Relative")) { - state->mode = Relative; + pInfo->dev->valuator->mode = Relative; xf86Msg(X_CONFIG, "%s: Configuring in %s mode.\n", pInfo->name, s); } else { - state->mode = Absolute; + pInfo->dev->valuator->mode = Absolute; xf86Msg(X_CONFIG, "%s: Unknown Mode: %s.\n", pInfo->name, s); } |