Skip to content

Fix the working of Ctrl-6 #786

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.

Sign up for GitHub

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

Merged
ychin merged 2 commits into from
Nov 25, 2018
Merged

Fix the working of Ctrl-6 #786

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c6b2b0
Fix the working of Ctrl-6
ichizok Nov 21, 2018
d8606ce
Refactor Ctrl-6 fix to be clearer and only trigger under Japanese IME
ychin Nov 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions src/MacVim/MMTextViewHelper.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,21 +170,34 @@ - (void)keyDown:(NSEvent *)event
&& [unmod length] == 1
&& ([unmod characterAtIndex:0] == '6' ||
[unmod characterAtIndex:0] == '^')) {
// HACK! interpretKeyEvents: does not call doCommandBySelector:
// HACK! interpretKeyEvents: does not call doCommandBySelector:
// with Ctrl-6 or Ctrl-^ when IM is active.
[self doKeyDown:@"\x1e"];
string = nil;
} else {
// When using JapaneseIM with "Windows-like shortcuts" turned on,
// HACK! When using JapaneseIM with "Windows-like shortcuts" turned on,
// interpretKeyEvents: does not call doCommandBySelector: with Ctrl-O
// and Ctrl-U (why?), so we cannot handle them at all.
// As a workaround, we do not call interpretKeyEvents: when no marked
// text and with only control-modifier.
if ([self hasMarkedText] || (!modControl || modCommand || modOption)) {
// HACK! interpretKeyEvents: may call insertText: or
// doCommandBySelector:, or it may swallow the key (most likely the
// current input method used it). In the first two cases we have to
// manually set the below flag to NO if the key wasn't handled.
// As a workaround, we do not call interpretKeyEvents: with Ctrl-O or
// Ctrl-U when there is no marked text.
BOOL isJapaneseIME = [[[NSTextInputContext currentInputContext]
selectedKeyboardInputSource]
hasPrefix:@"com.apple.inputmethod.Kotoeri"];
BOOL isJapaneseIMCtrlUO = (isJapaneseIME
&& (modControl && !modCommand && !modOption)
&& ([unmod characterAtIndex:0] == 'o' ||
[unmod characterAtIndex:0] == 'u'));

if ([self hasMarkedText] || !isJapaneseIMCtrlUO) {
// interpretKeyEvents: may call insertText: or doCommandBySelector:,
// or it may swallow the key (most likely the current input method
// used it). In the first two cases we have to manually set the
// below flag to NO if the key wasn't handled, which allows us to
// manually send the key down event.
//
// doCommandBySelector: will also perform misc translations such as
// Ctrl-6 -> Ctrl-^, so this should not be skipped unless there are
// special cases like the Japanese IME Ctrl-U issue.
interpretKeyEventsSwallowedKey = YES;
[textView interpretKeyEvents:[NSArray arrayWithObject:event]];
if (interpretKeyEventsSwallowedKey)
Expand Down