diff options
| author | Zephaniah E. Hull <warp@agamemnon.b5> | 2006-07-25 16:00:44 -0400 |
|---|---|---|
| committer | Zephaniah E. Hull <warp@agamemnon.b5> | 2006-07-25 16:00:44 -0400 |
| commit | 63f7edf7862032221e25de3c59fee1158d616597 (patch) | |
| tree | 579399ce79be93d511a35621c280588f804e1db1 /src/evdev.c | |
| parent | pass maxval correctly to xf86InitValuatorAxisDeviceStruct (diff) | |
| parent | Replace the old two buffer approach to handling rel emulation of abs axes, (diff) | |
| download | xf86-input-evdev-63f7edf7862032221e25de3c59fee1158d616597.tar.gz xf86-input-evdev-63f7edf7862032221e25de3c59fee1158d616597.tar.bz2 xf86-input-evdev-63f7edf7862032221e25de3c59fee1158d616597.zip | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-input-evdev into input-hotplug
Diffstat (limited to 'src/evdev.c')
| -rw-r--r-- | src/evdev.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/evdev.c b/src/evdev.c index 329a874..ba8f862 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -200,6 +200,7 @@ EvdevProc(DeviceIntPtr device, int what) RemoveEnabledDevice (pInfo->fd); xf86RemoveSIGIOHandler (pInfo->fd); close (pInfo->fd); + pInfo->fd = -1; if (pEvdev->state.axes) EvdevAxesOff (device); @@ -230,6 +231,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 @@ -302,9 +304,13 @@ EvdevNew(evdevDriverPtr driver, evdevDevicePtr device) } - /* XXX: Note, the order of these is important. */ - EvdevAxesNew (pInfo); - EvdevBtnNew (pInfo); + /* XXX: Note, the order of these is (maybe) still important. */ + EvdevAxesNew0 (pInfo); + EvdevBtnNew0 (pInfo); + + EvdevAxesNew1 (pInfo); + EvdevBtnNew1 (pInfo); + if (device->state.can_grab) EvdevKeyNew (pInfo); |