8195675: Call to insertText with single character from custom Input M…

…ethod ignored Backport-of: b8f2ec9
SAP · Jan 30, 2025 · 33d19c4 · 33d19c4
1 parent 6a9eb07
commit 33d19c4
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m
@@ -39,6 +39,9 @@
 // keyboard layout
 static NSString *kbdLayout;
 
+// Constant for keyman layouts
+#define KEYMAN_LAYOUT "keyman"
+
 @interface AWTView()
 @property (retain) CDropTarget *_dropTarget;
 @property (retain) CDragSource *_dragSource;
@@ -281,7 +284,7 @@ - (void) scrollWheel: (NSEvent*) event {
 
 - (void) keyDown: (NSEvent *)event {
     fProcessingKeystroke = YES;
-    fKeyEventsNeeded = YES;
+    fKeyEventsNeeded = ![(NSString *)kbdLayout containsString:@KEYMAN_LAYOUT];
 
     // Allow TSM to look at the event and potentially send back NSTextInputClient messages.
     [self interpretKeyEvents:[NSArray arrayWithObject:event]];
@@ -989,7 +992,7 @@ - (void) insertText:(id)aString replacementRange:(NSRange)replacementRange
 
     if ((utf16Length > 2) ||
         ((utf8Length > 1) && [self isCodePointInUnicodeBlockNeedingIMEvent:codePoint]) ||
-        ((codePoint == 0x5c) && ([(NSString *)kbdLayout containsString:@"Kotoeri"]))) {
+        [(NSString *)kbdLayout containsString:@KEYMAN_LAYOUT]) {
         aStringIsComplex = YES;
     }