[PATCH mouse v3] Fix wrong read Protocol and Device from xorg.conf
Alexandr Shadchin
alexandr.shadchin at gmail.com
Fri Aug 19 08:07:13 PDT 2011
Add call xf86CollectInputOptions() before using pInfo->options.
The bug is seeing by ABI < 12.
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin at gmail.com>
---
Sorry for the late answer, entirely lost sight of this bug.
Change:
* move COLLECT_INPUT_OPTIONS() in old PreInit (make sense only for ABI < 12)
* little expanded commit message
src/mouse.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/mouse.c b/src/mouse.c
index d981f6f..6304149 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -872,6 +872,8 @@ MousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
pInfo->private_flags = 0;
pInfo->always_core_feedback = NULL;
+ COLLECT_INPUT_OPTIONS(pInfo, NULL);
+
if (NewMousePreInit(drv, pInfo, flags) == Success)
{
/* Check if SendDragEvents has been disabled. */
--
1.7.6
More information about the xorg-devel
mailing list