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.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.c')
| -rw-r--r-- | src/evdev.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/evdev.c b/src/evdev.c index 881f079..868bbff 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -367,9 +367,7 @@ EvdevSwitchMode (ClientPtr client, DeviceIntPtr device, int mode) case Absolute: case Relative: xf86Msg(X_INFO, "%s: Switching mode to %d.\n", pInfo->name, mode); - if (state->abs) - state->mode = mode; - else + if (!state->abs) return !Success; break; default: @@ -379,11 +377,6 @@ EvdevSwitchMode (ClientPtr client, DeviceIntPtr device, int mode) return Success; } -/* -static Bool -EvdevNew(evdevDriverPtr driver, evdevDevicePtr device) -*/ - InputInfoPtr EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags) { @@ -407,9 +400,6 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags) pInfo->device_control = EvdevProc; pInfo->read_input = EvdevReadInput; pInfo->switch_mode = EvdevSwitchMode; -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 - pInfo->motion_history_proc = xf86GetMotionEvents; -#endif pInfo->conf_idev = dev; pInfo->private = pEvdev; |