diff options
Diffstat (limited to 'src/mouse.c')
| -rw-r--r-- | src/mouse.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/mouse.c b/src/mouse.c index 437d6cc..3c504a4 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c,v 1.80 2003/12/08 23:49:42 dawes Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c,v 1.2 2004/04/23 19:54:04 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c,v 1.79 2003/11/03 05:11:48 tsi Exp $ */ /* * @@ -373,17 +373,16 @@ static void MouseCommonOptions(InputInfoPtr pInfo) { MouseDevPtr pMse; - MessageType from = X_DEFAULT; + MessageType buttons_from = X_CONFIG; char *s; int origButtons; pMse = pInfo->private; pMse->buttons = xf86SetIntOption(pInfo->options, "Buttons", 0); - from = X_CONFIG; if (!pMse->buttons) { pMse->buttons = MSE_DFLTBUTTONS; - from = X_DEFAULT; + buttons_from = X_DEFAULT; } origButtons = pMse->buttons; @@ -395,7 +394,10 @@ MouseCommonOptions(InputInfoPtr pInfo) pMse->emulate3Timeout = xf86SetIntOption(pInfo->options, "Emulate3Timeout", 50); if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) { - xf86Msg(X_CONFIG, "%s: Emulate3Buttons, Emulate3Timeout: %d\n", + MessageType from = X_CONFIG; + if (pMse->emulate3ButtonsSoft) + from = X_DEFAULT; + xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n", pInfo->name, pMse->emulate3Timeout); } @@ -660,8 +662,8 @@ MouseCommonOptions(InputInfoPtr pInfo) pInfo->name, wheelButton, pMse->wheelInertia); } if (origButtons != pMse->buttons) - from = X_CONFIG; - xf86Msg(from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons); + buttons_from = X_CONFIG; + xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons); } /* @@ -3566,7 +3568,7 @@ static XF86ModuleVersionInfo xf86MouseVersionRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, |