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.

1 files changed, 4 insertions, 7 deletions

diff --git a/src/evdev.c b/src/evdev.c
index f79cdfb..6d05b07 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1000,13 +1000,6 @@ EvdevOn(DeviceIntPtr device)
     } else
     {
         xf86AddEnabledDevice(pInfo);
-        if ((pEvdev->flags & EVDEV_BUTTON_EVENTS) &&
-            !(pEvdev->flags & EVDEV_INITIALIZED))
-        {
-            EvdevMBEmuPreInit(pInfo);
-            EvdevWheelEmuPreInit(pInfo);
-            EvdevDragLockInit(pInfo);
-        }
         pEvdev->flags |= EVDEV_INITIALIZED;
         device->public.on = TRUE;
     }
@@ -1367,6 +1360,10 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
 
     EvdevCacheCompare(pInfo, FALSE); /* cache device data */
 
+    EvdevMBEmuPreInit(pInfo);
+    EvdevWheelEmuPreInit(pInfo);
+    EvdevDragLockInit(pInfo);
+
     return pInfo;
 }