1 From cb11e9ca60e8ca2590c77f844bfd19e5278f518f Mon Sep 17 00:00:00 2001 |
|
2 From: Alan Coopersmith <[email protected]> |
|
3 Date: Wed, 11 Aug 2010 21:30:40 -0700 |
|
4 Subject: [PATCH:xf86-input-mouse] MouseCtrl doesn't need to save values we never use |
|
5 |
|
6 Makes it into a no-op, like evdev's PtrCtrl function, now that |
|
7 mouse acceleration is completely handled in dix. |
|
8 |
|
9 Signed-off-by: Alan Coopersmith <[email protected]> |
|
10 Reviewed-by: Peter Hutterer <[email protected]> |
|
11 Reviewed-by: Patrick E. Kane <pekane52 at gmail.com> |
|
12 Reviewed-by: Simon Thum <[email protected]> |
|
13 --- |
|
14 src/mouse.c | 18 +++--------------- |
|
15 src/xf86OSmouse.h | 3 --- |
|
16 2 files changed, 3 insertions(+), 18 deletions(-) |
|
17 |
|
18 diff --git a/src/mouse.c b/src/mouse.c |
|
19 index 99d1f2b..a296021 100644 |
|
20 --- a/src/mouse.c |
|
21 +++ b/src/mouse.c |
|
22 @@ -1546,26 +1546,14 @@ post_event: |
|
23 |
|
24 /* |
|
25 * MouseCtrl -- |
|
26 - * Alter the control parameters for the mouse. Note that all special |
|
27 - * protocol values are handled by dix. |
|
28 + * Alter the control parameters for the mouse. Note that all |
|
29 + * settings are now handled by dix. |
|
30 */ |
|
31 |
|
32 static void |
|
33 MouseCtrl(DeviceIntPtr device, PtrCtrl *ctrl) |
|
34 { |
|
35 - InputInfoPtr pInfo; |
|
36 - MouseDevPtr pMse; |
|
37 - |
|
38 - pInfo = device->public.devicePrivate; |
|
39 - pMse = pInfo->private; |
|
40 - |
|
41 -#ifdef EXTMOUSEDEBUG |
|
42 - ErrorF("MouseCtrl pMse=%p\n", pMse); |
|
43 -#endif |
|
44 - |
|
45 - pMse->num = ctrl->num; |
|
46 - pMse->den = ctrl->den; |
|
47 - pMse->threshold = ctrl->threshold; |
|
48 + /* This function intentionally left blank */ |
|
49 } |
|
50 |
|
51 /* |
|
52 diff --git a/src/xf86OSmouse.h b/src/xf86OSmouse.h |
|
53 index 09b8525..33b2232 100644 |
|
54 --- a/src/xf86OSmouse.h |
|
55 +++ b/src/xf86OSmouse.h |
|
56 @@ -214,9 +214,6 @@ typedef struct _MouseDevRec { |
|
57 int oldBaudRate; |
|
58 int sampleRate; |
|
59 int lastButtons; |
|
60 - int threshold; /* acceleration */ |
|
61 - int num; |
|
62 - int den; |
|
63 int buttons; /* # of buttons */ |
|
64 int emulateState; /* automata state for 2 button mode */ |
|
65 Bool emulate3Buttons; |
|
66 -- |
|
67 1.5.6.5 |
|
68 |
|