Before call xf86CollectInputOptions(): pInfo->options - empty Need use pInfo->conf_idev->commonOptions instead pInfo->options
Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com> --- src/mouse.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mouse.c b/src/mouse.c index c3498ea..19251ad 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -928,7 +928,7 @@ MousePreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) pMse->CommonOptions = MouseCommonOptions; /* Find the protocol type. */ - protocol = xf86SetStrOption(pInfo->options, "Protocol", NULL); + protocol = xf86SetStrOption(pInfo->conf_idev->commonOptions, "Protocol", NULL); if (protocol) { protocolFrom = X_CONFIG; } else if (osInfo->DefaultProtocol) { @@ -941,7 +941,7 @@ MousePreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) goto out; } - device = xf86SetStrOption(pInfo->options, "Device", NULL); + device = xf86SetStrOption(pInfo->conf_idev->commonOptions, "Device", NULL); /* Default Mapping: 1 2 3 8 9 10 11 ... */ for (i = 0; i < MSE_MAXBUTTONS; i++) -- 1.7.5 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel