diff options
| author | Peter Hutterer <peter.hutterer@redhat.com> | 2008-10-14 16:09:20 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@redhat.com> | 2008-10-14 17:18:07 +1030 |
| commit | b4fcb825fc989131c399e3473576f539a81f3aac (patch) | |
| tree | 44d191728e9e295f442114f14220128823dfad79 /src/emuWheel.c | |
| parent | Janitor: clean up xf86Msg use, might as well use X_CONFIG directly. (diff) | |
| download | xf86-input-evdev-b4fcb825fc989131c399e3473576f539a81f3aac.tar.gz xf86-input-evdev-b4fcb825fc989131c399e3473576f539a81f3aac.tar.bz2 xf86-input-evdev-b4fcb825fc989131c399e3473576f539a81f3aac.zip | |
Clean up program flow - don't call PreInit for "modules" on DEVICE_INIT.
Call the PreInit functions for MB Emulation, wheel emu, and draglock during
PreInit, not on DEVICE_INIT. This way, we only parse the options once and
don't overwrite with defaults when coming back from a VT switch.
(cherry picked from commit b0737bdbd1f6e601eb4984b6f4cb49279190984c)
Diffstat (limited to 'src/emuWheel.c')
| -rw-r--r-- | src/emuWheel.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/emuWheel.c b/src/emuWheel.c index 246ab47..e73ddf3 100644 --- a/src/emuWheel.c +++ b/src/emuWheel.c @@ -308,25 +308,6 @@ EvdevWheelEmuPreInit(InputInfoPtr pInfo) "EmulateWheelInertia: %d, " "EmulateWheelTimeout: %d\n", pInfo->name, pEvdev->emulateWheel.button, inertia, timeout); - -#ifdef HAVE_PROPERTIES - XIChangeDeviceProperty(pInfo->dev, prop_wheel_emu, XA_INTEGER, 8, - PropModeReplace, 1, &pEvdev->emulateWheel.enabled, TRUE); - XIChangeDeviceProperty(pInfo->dev, prop_wheel_button, XA_INTEGER, 8, - PropModeReplace, 1, &pEvdev->emulateWheel.button, TRUE); - XIChangeDeviceProperty(pInfo->dev, prop_wheel_inertia, XA_INTEGER, 8, - PropModeReplace, 1, &pEvdev->emulateWheel.inertia, TRUE); - XIChangeDeviceProperty(pInfo->dev, prop_wheel_timeout, XA_INTEGER, 16, - PropModeReplace, 1, &pEvdev->emulateWheel.timeout, TRUE); - - val[0] = pEvdev->emulateWheel.X.up_button; - val[1] = pEvdev->emulateWheel.X.down_button; - val[2] = pEvdev->emulateWheel.Y.up_button; - val[3] = pEvdev->emulateWheel.Y.down_button; - XIChangeDeviceProperty(pInfo->dev, prop_wheel_axismap, XA_INTEGER, 8, - PropModeReplace, 4, val, TRUE); - -#endif } #ifdef HAVE_PROPERTIES |