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

Patch from Martin Otte <otte@duke.edu>
(cherry picked from commit b5ec3be6b5)
This commit is contained in:
Jeremy Huddleston 2009-04-11 13:53:38 -07:00
parent 1b5758bef0
commit bd1d917909

View File

@ -154,7 +154,7 @@ int darwin_modifier_mask_list[] = {
#else
NX_CONTROLMASK, NX_SHIFTMASK, NX_COMMANDMASK, NX_ALTERNATEMASK,
#endif
NX_ALPHASHIFTMASK,
NX_ALPHASHIFTMASK, NX_SECONDARYFNMASK
0
};
@ -174,7 +174,10 @@ static void DarwinUpdateModifiers(
}
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);
if(key == -1)
ErrorF("DarwinUpdateModifiers: Unsupported NXMask: 0x%x\n", *f);