diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-11-02 03:42:14 +0200 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-11-02 03:42:14 +0200 |
| commit | 3fc70342aaba5f95d01b6e51164ae207532fa8f4 (patch) | |
| tree | ebf1b6ac7725ecf7e2d2c616d53a92abda2660e5 /src/evdev.c | |
| parent | Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-i... (diff) | |
| parent | key: use os bell-ringing function (diff) | |
| download | xf86-input-evdev-3fc70342aaba5f95d01b6e51164ae207532fa8f4.tar.gz xf86-input-evdev-3fc70342aaba5f95d01b6e51164ae207532fa8f4.tar.bz2 xf86-input-evdev-3fc70342aaba5f95d01b6e51164ae207532fa8f4.zip | |
Merge branch 'input-hotplug'
Diffstat (limited to 'src/evdev.c')
| -rw-r--r-- | src/evdev.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/evdev.c b/src/evdev.c index 1ea74c0..1bcaef8 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -214,6 +214,9 @@ EvdevProc(DeviceIntPtr device, int what) EvdevKeyOff (device); } + if (what == DEVICE_CLOSE) + evdevRemoveDevice(pEvdev); + device->public.on = FALSE; break; } @@ -238,10 +241,12 @@ EvdevSwitchMode (ClientPtr client, DeviceIntPtr device, int mode) else return !Success; break; +#if 0 case SendCoreEvents: case DontSendCoreEvents: xf86XInputSetSendCoreEvents (pInfo, (mode == SendCoreEvents)); break; +#endif default: return !Success; } @@ -268,7 +273,9 @@ EvdevNew(evdevDriverPtr driver, evdevDevicePtr device) 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 = driver->dev; pInfo->private = device; |