frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: Re-enable Fn as an option for 3button mouse simulation. 

Patch from Martin Otte <otte@duke.edu>
(cherry picked from commit b5ec3be6b5449b5d575bc1472fdd1c9cb15cb8be)
This commit is contained in:
Jeremy Huddleston 2009-04-11 13:53:38 -07:00
parent 1b5758bef0
commit bd1d917909
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xquartz/darwinEvents.c
View File

@ -154,7 +154,7 @@ int darwin_modifier_mask_list[] = {
#else #else
NX_CONTROLMASK, NX_SHIFTMASK, NX_COMMANDMASK, NX_ALTERNATEMASK, NX_CONTROLMASK, NX_SHIFTMASK, NX_COMMANDMASK, NX_ALTERNATEMASK,
#endif #endif
NX_ALPHASHIFTMASK, NX_ALPHASHIFTMASK, NX_SECONDARYFNMASK
0 0
}; };
@ -174,7 +174,10 @@ static void DarwinUpdateModifiers(
} }
for(f=darwin_modifier_mask_list; *f; f++) for(f=darwin_modifier_mask_list; *f; f++)
if(*f & flags && *f != NX_ALPHASHIFTMASK) { /* NX_ALPHASHIFTMASK is handled above and NX_SECONDARYFNMASK is not
* mapped to a key (it is just useful for 3button mouse simulation
*/
if(*f & flags && *f != NX_ALPHASHIFTMASK && *f != NX_SECONDARYFNMASK) {
key = DarwinModifierNXMaskToNXKey(*f); key = DarwinModifierNXMaskToNXKey(*f);
if(key == -1) if(key == -1)
ErrorF("DarwinUpdateModifiers: Unsupported NXMask: 0x%x\n", *f); ErrorF("DarwinUpdateModifiers: Unsupported NXMask: 0x%x\n", *f);