Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Fn as a modifier key #736

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
12 changes: 12 additions & 0 deletions SquirrelInputController.m
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,13 @@ - (BOOL)handleEvent:(NSEvent*)event client:(id)sender
release_mask = modifiers & OSX_ALT_MASK ? 0 : kReleaseMask;
[self processKey:rime_keycode modifiers:(rime_modifiers | release_mask)];
}
if (changes & OSX_FN_MASK) {
if (!keyCodeAvailable) {
rime_keycode = XK_Hyper_L;
}
release_mask = modifiers & OSX_FN_MASK ? 0 : kReleaseMask;
[self processKey:rime_keycode modifiers:(rime_modifiers | release_mask)];
}
if (changes & OSX_COMMAND_MASK) {
if (!keyCodeAvailable) {
rime_keycode = XK_Super_L;
Expand Down Expand Up @@ -150,6 +157,11 @@ - (BOOL)handleEvent:(NSEvent*)event client:(id)sender
modifiers & OSX_CAPITAL_MASK);
if (rime_keycode) {
int rime_modifiers = osx_modifiers_to_rime_modifiers(modifiers);
// revert non-modifier function keys' FunctionKeyMask (FwdDel, Navigations, F1..F19)
if ((keyCode <= 0xff && keyCode >= 0x60) || keyCode == 0x50 || keyCode == 0x4f ||
keyCode == 0x47 || keyCode == 0x40) {
rime_modifiers ^= kHyperMask;
}
handled = [self processKey:rime_keycode modifiers:rime_modifiers];
[self rimeUpdate];
}
Expand Down
1 change: 1 addition & 0 deletions macos_keycode.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#define OSX_CTRL_MASK 1 << 18
#define OSX_ALT_MASK 1 << 19
#define OSX_COMMAND_MASK 1 << 20
#define OSX_FN_MASK 1 << 23

// key codes
//
Expand Down
2 changes: 2 additions & 0 deletions macos_keycode.m
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ int osx_modifiers_to_rime_modifiers(unsigned long modifiers)
ret |= kAltMask;
if (modifiers & OSX_COMMAND_MASK)
ret |= kSuperMask;
if (modifiers & OSX_FN_MASK)
ret |= kHyperMask;

return ret;
}
Expand Down