ayo/kitty
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

macOS: When switching inpt method while a pending multi-key input is in progress, clear the pending input

Browse source 
Fixes #2358
This commit is contained in:
Kovid Goyal 2020-02-17 15:30:03 +05:30
parent ef569976cb
commit 56e5c8be32
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/changelog.rst
View file

@ -43,6 +43,9 @@ To update |kitty|, :doc:`follow the instructions <binary>`.
- Fix incorrect rendering of selection when using rectangular select and
scrolling (:iss:`2351`)
- macOS: When switching inpt method while a pending multi-key input is in
progress, clear the pending input (:iss:`2358`)
0.16.0 [2020-01-28]
--------------------

20
glfw/cocoa_window.m
View file

@ -659,6 +659,7 @@ @interface GLFWContentView : NSView <NSTextInputClient>
NSTrackingArea* trackingArea;
NSMutableAttributedString* markedText;
NSRect markedRect;
NSString *input_source_at_last_key_event;
}
- (void) removeGLFWWindow;
@ -677,6 +678,7 @@ - (instancetype)initWithGlfwWindow:(_GLFWwindow *)initWindow
trackingArea = nil;
markedText = [[NSMutableAttributedString alloc] init];
markedRect = NSMakeRect(0.0, 0.0, 0.0, 0.0);
input_source_at_last_key_event = nil;
[self updateTrackingAreas];
[self registerForDraggedTypes:@[NSPasteboardTypeFileURL, NSPasteboardTypeString]];
@ -689,6 +691,7 @@ - (void)dealloc
{
[trackingArea release];
[markedText release];
if (input_source_at_last_key_event) [input_source_at_last_key_event release];
[super dealloc];
}
@ -965,12 +968,19 @@ - (void)updateTrackingAreas
- (void)keyDown:(NSEvent *)event
{
const bool previous_has_marked_text = [self hasMarkedText];
bool input_source_changed = false;
NSTextInputContext *inpctx = [NSTextInputContext currentInputContext];
if (inpctx && (!input_source_at_last_key_event || ![input_source_at_last_key_event isEqualToString:inpctx.selectedKeyboardInputSource])) {
input_source_at_last_key_event = [inpctx.selectedKeyboardInputSource retain];
input_source_changed = true;
}
const unsigned int keycode = [event keyCode];
const NSUInteger flags = [event modifierFlags];
const int mods = translateFlags(flags);
const int key = translateKey(keycode, true);
const bool process_text = !window->ns.textInputFilterCallback || window->ns.textInputFilterCallback(key, mods, keycode, flags) != 1;
const bool previous_has_marked_text = [self hasMarkedText];
[self unmarkText];
_glfw.ns.text[0] = 0;
GLFWkeyevent glfw_keyevent;
@ -984,6 +994,14 @@ - (void)keyDown:(NSEvent *)event
[self interpretKeyEvents:[NSArray arrayWithObject:event]];
}
} else {
if (input_source_changed) {
debug_key(@"Input source changed, clearing pre-edit text and resetting deadkey state\n");
glfw_keyevent.text = NULL;
glfw_keyevent.ime_state = 1;
window->ns.deadKeyState = 0;
_glfwInputKeyboard(window, &glfw_keyevent); // clear pre-edit text
}
static UniChar text[256];
UniCharCount char_count = 0;
const bool in_compose_sequence = window->ns.deadKeyState != 0;