XLibre/xf86-input-mouse
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-mouse.git synced 2026-03-24 01:24:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug #4915: Move buttonMapping initialization before calling OS specific

Browse Source 
PreInit.
This commit is contained in:
Matthias Hopf
2005-11-14 14:19:52 +00:00
parent f00e2a8c96
commit 5bca72458c
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mouse.c
View File

@@ -1013,6 +1013,14 @@ MousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
return pInfo;
}
/* XXX If the default for ZAxisMapping is decided to be "4 5 6 7" again,
* ButtonMapping should by default remap all button >= 4 to button+4 :
* for (i = 0; i < MSE_MAXBUTTONS; i++)
* pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i);
*/
for (i = 0; i < MSE_MAXBUTTONS; i++)
pMse->buttonMap[i] = 1 << i;
protocolID = ProtocolNameToID(protocol);
do {
detected = TRUE;
@@ -1090,14 +1098,6 @@ MousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
pMse->oldProtocolID = protocolID; /* hack */
pMse->autoProbe = FALSE;
/* XXX If the default for ZAxisMapping is decided to be "4 5 6 7" again,
* ButtonMapping should by default remap all button >= 4 to button+4 :
* for (i = 0; i < MSE_MAXBUTTONS; i++)
* pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i);
*/
for (i = 0; i < MSE_MAXBUTTONS; i++)
pMse->buttonMap[i] = 1 << i;
/* Collect the options, and process the common options. */
xf86CollectInputOptions(pInfo, pProto->defaults, NULL);
xf86ProcessCommonOptions(pInfo, pInfo->options);