diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-17 19:22:12 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-17 19:22:12 +0000 |
| commit | 9f0c33c22888f1a46c3c0e8b793f1f21b3dc15c7 (patch) | |
| tree | cb6ace8a062402f9f4ec3228579888b6190e1b77 | |
| parent | 94a7d538637f10c9fceaf48319785ca6c58c094f (diff) | |
| download | xorg-driver-xf86-input-mouse-9f0c33c22888f1a46c3c0e8b793f1f21b3dc15c7.tar.gz | |
45. Readding Monitor information obtained by DDC to the config file inXPRINT_BASEXORG-RELEASE-1-TM-MERGE
commented out form (Egbert Eich).
44. Making a log message by the mouse driver more meaningful (Egbert Eich).
| -rw-r--r-- | src/mouse.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/mouse.c b/src/mouse.c index ef1e4d7..d9ee363 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -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); } /* |