Proper IM window cleanup when focus moves from one node to another

Author: beldenfox

modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacView.java

@@ -78,6 +78,7 @@ static int getMultiClickMaxY_impl() {
     @Override native protected boolean _enterFullscreen(long ptr, boolean animate, boolean keepRatio, boolean hideCursor);
     @Override native protected void _exitFullscreen(long ptr, boolean animate);
     @Override native protected void _enableInputMethodEvents(long ptr, boolean enable);
+    @Override native protected void _finishInputMethodComposition(long ptr);
 
     @Override protected void _uploadPixels(long ptr, Pixels pixels) {
         Buffer data = pixels.getPixels();

modules/javafx.graphics/src/main/native-glass/mac/GlassView.h

@@ -47,6 +47,7 @@
 
 - (GlassViewDelegate*)delegate;
 - (void)setInputMethodEnabled:(BOOL)enabled;
+- (void)finishInputMethodComposition;
 
 - (void)notifyScaleFactorChanged:(CGFloat)scale;
 

modules/javafx.graphics/src/main/native-glass/mac/GlassView.m

@@ -712,3 +712,24 @@
     GLASS_POOL_EXIT;
     GLASS_CHECK_EXCEPTION(env);
 }
+
+/*
+ * Class:     com_sun_glass_ui_mac_MacView
+ * Method:    _finishInputMethodComposition
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_sun_glass_ui_mac_MacView__1finishInputMethodComposition
+(JNIEnv *env, jobject jView, jlong ptr)
+{
+    LOG("Java_com_sun_glass_ui_mac_MacView__1finishInputMethodComposition");
+    if (!ptr) return;
+
+    GLASS_ASSERT_MAIN_JAVA_THREAD(env);
+    GLASS_POOL_ENTER;
+    {
+        NSView<GlassView> *view = getGlassView(env, ptr);
+        [view finishInputMethodComposition];
+    }
+    GLASS_POOL_EXIT;
+    GLASS_CHECK_EXCEPTION(env);
+}

modules/javafx.graphics/src/main/native-glass/mac/GlassView3D.m

@@ -717,10 +717,23 @@ - (void)setInputMethodEnabled:(BOOL)enabled
     self->imEnabled = enabled;
 }
 
+- (void)finishInputMethodComposition
+{
+    IMLOG("finishInputMethodComposition called");
+    [self unmarkText];
+    [self.inputContext discardMarkedText];
+}
+
 /*
  NSTextInputClient protocol implementation follows here.
  */
 
+// Utility function, not part of protocol
+- (void)commitString:(NSString*)aString
+{
+    [self->_delegate notifyInputMethod:aString attr:4 length:(int)[aString length] cursor:(int)[aString length] selectedRange: NSMakeRange(NSNotFound, 0)];
+}
+
 - (void)doCommandBySelector:(SEL)aSelector
 {
     IMLOG("doCommandBySelector called ");
@@ -733,7 +746,7 @@ - (void) insertText:(id)aString replacementRange:(NSRange)replacementRange
 {
     IMLOG("insertText called with string: %s", [aString UTF8String]);
     if ([self->nsAttrBuffer length] > 0 || [aString length] > 1) {
-        [self->_delegate notifyInputMethod:aString attr:4 length:(int)[aString length] cursor:(int)[aString length] selectedRange: NSMakeRange(NSNotFound, 0)];
+        [self commitString: aString];
         self->shouldProcessKeyEvent = NO;
     } else {
         self->shouldProcessKeyEvent = YES;
@@ -760,9 +773,9 @@ - (void) setMarkedText:(id)aString selectedRange:(NSRange)selectionRange replace
 - (void) unmarkText
 {
     IMLOG("unmarkText called\n");
-    if (self->nsAttrBuffer != nil && self->nsAttrBuffer.length != 0) {
-        self->nsAttrBuffer = [self->nsAttrBuffer initWithString:@""];
-        [self->_delegate notifyInputMethod:@"" attr:4 length:0 cursor:0 selectedRange: NSMakeRange(NSNotFound, 0)];
+    if (nsAttrBuffer.length != 0) {
+        [self commitString: nsAttrBuffer.string];
+        nsAttrBuffer = [nsAttrBuffer initWithString:@""];
     }
     self->shouldProcessKeyEvent = YES;
 }