diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-08-11 21:30:40 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-08-14 01:05:06 -0700 |
| commit | cb11e9ca60e8ca2590c77f844bfd19e5278f518f (patch) | |
| tree | fe65137f90ffc8fccc32790c8209889084f83f60 | |
| parent | 374725ef73ca929f8a951061528d11ee796cb069 (diff) | |
MouseCtrl doesn't need to save values we never use
Makes it into a no-op, like evdev's PtrCtrl function, now that
mouse acceleration is completely handled in dix.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Patrick E. Kane <pekane52 at gmail.com>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
| -rw-r--r-- | src/mouse.c | 18 | ||||
| -rw-r--r-- | src/xf86OSmouse.h | 3 |
2 files changed, 3 insertions, 18 deletions
diff --git a/src/mouse.c b/src/mouse.c index 99d1f2b..a296021 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -1546,26 +1546,14 @@ post_event: /* * MouseCtrl -- - * Alter the control parameters for the mouse. Note that all special - * protocol values are handled by dix. + * Alter the control parameters for the mouse. Note that all + * settings are now handled by dix. */ static void MouseCtrl(DeviceIntPtr device, PtrCtrl *ctrl) { - InputInfoPtr pInfo; - MouseDevPtr pMse; - - pInfo = device->public.devicePrivate; - pMse = pInfo->private; - -#ifdef EXTMOUSEDEBUG - ErrorF("MouseCtrl pMse=%p\n", pMse); -#endif - - pMse->num = ctrl->num; - pMse->den = ctrl->den; - pMse->threshold = ctrl->threshold; + /* This function intentionally left blank */ } /* diff --git a/src/xf86OSmouse.h b/src/xf86OSmouse.h index 09b8525..33b2232 100644 --- a/src/xf86OSmouse.h +++ b/src/xf86OSmouse.h @@ -214,9 +214,6 @@ typedef struct _MouseDevRec { int oldBaudRate; int sampleRate; int lastButtons; - int threshold; /* acceleration */ - int num; - int den; int buttons; /* # of buttons */ int emulateState; /* automata state for 2 button mode */ Bool emulate3Buttons; |