diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-10-17 11:31:58 +0300 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-10-17 11:31:58 +0300 |
| commit | d7f686bfa3e773cfc7740c707da9fc64196e143c (patch) | |
| tree | d71dccb0a4a5a279b53ccf26a6bcffa1ea074c0c /src/evdev.c | |
| parent | brain: call xf86DeleteInput when removing device (diff) | |
| parent | Bump to 1.1.3 (diff) | |
| download | xf86-input-evdev-d7f686bfa3e773cfc7740c707da9fc64196e143c.tar.gz xf86-input-evdev-d7f686bfa3e773cfc7740c707da9fc64196e143c.tar.bz2 xf86-input-evdev-d7f686bfa3e773cfc7740c707da9fc64196e143c.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 | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/src/evdev.c b/src/evdev.c index 329a874..f2d61f6 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -117,9 +117,13 @@ EvdevReadInput(InputInfoPtr pInfo) case EV_SYN: if (ev.code == SYN_REPORT) { - EvdevAxesSyn (pInfo); - /* EvdevBtnSyn (pInfo); */ - /* EvdevKeySyn (pInfo); */ + EvdevAxesSynRep (pInfo); + /* EvdevBtnSynRep (pInfo); */ + /* EvdevKeySynRep (pInfo); */ + } else if (ev.code == SYN_CONFIG) { + EvdevAxesSynCfg (pInfo); + /* EvdevBtnSynCfg (pInfo); */ + /* EvdevKeySynCfg (pInfo); */ } break; } @@ -200,6 +204,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 +235,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 +308,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); @@ -475,7 +485,7 @@ static XF86ModuleVersionInfo EvdevVersionRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - 0, /* Missing from SDK: XORG_VERSION_CURRENT, */ + XORG_VERSION_CURRENT, 1, 1, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, |