aboutsummaryrefslogtreecommitdiff
path: root/src/emuMB.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@redhat.com>2008-10-14 16:09:20 +1030
committerPeter Hutterer <peter.hutterer@redhat.com>2008-10-14 16:09:20 +1030
commitb0737bdbd1f6e601eb4984b6f4cb49279190984c (patch)
treef7a3987aacd7214ecea3c2f558d119e446c9b7ac /src/emuMB.c
parentJanitor: clean up xf86Msg use, might as well use X_CONFIG directly. (diff)
downloadxf86-input-evdev-b0737bdbd1f6e601eb4984b6f4cb49279190984c.tar.gz
xf86-input-evdev-b0737bdbd1f6e601eb4984b6f4cb49279190984c.tar.bz2
xf86-input-evdev-b0737bdbd1f6e601eb4984b6f4cb49279190984c.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.
Diffstat (limited to 'src/emuMB.c')
-rw-r--r--src/emuMB.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/emuMB.c b/src/emuMB.c
index 472e74f..363de7e 100644
--- a/src/emuMB.c
+++ b/src/emuMB.c
@@ -320,15 +320,6 @@ EvdevMBEmuPreInit(InputInfoPtr pInfo)
RegisterBlockAndWakeupHandlers (EvdevMBEmuBlockHandler,
EvdevMBEmuWakeupHandler,
(pointer)pInfo);
-
-#ifdef HAVE_PROPERTIES
- XIChangeDeviceProperty(pInfo->dev, prop_mbemu, XA_INTEGER, 8,
- PropModeReplace, 1, &pEvdev->emulateMB.enabled,
- TRUE);
- XIChangeDeviceProperty(pInfo->dev, prop_mbtimeout, XA_INTEGER, 16,
- PropModeReplace, 1, &pEvdev->emulateMB.timeout,
- TRUE);
-#endif
}
void