Skip to content

Commit 33d19c4

Browse files
author
Steven Loomis
committed
8195675: Call to insertText with single character from custom Input Method ignored
Backport-of: b8f2ec9091f9f7e5f4611991d04dd8aa113b94fd
1 parent 6a9eb07 commit 33d19c4

File tree

1 file changed

+5
-2
lines changed
  • src/java.desktop/macosx/native/libawt_lwawt/awt

1 file changed

+5
-2
lines changed

src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@
3939
// keyboard layout
4040
static NSString *kbdLayout;
4141

42+
// Constant for keyman layouts
43+
#define KEYMAN_LAYOUT "keyman"
44+
4245
@interface AWTView()
4346
@property (retain) CDropTarget *_dropTarget;
4447
@property (retain) CDragSource *_dragSource;
@@ -281,7 +284,7 @@ - (void) scrollWheel: (NSEvent*) event {
281284

282285
- (void) keyDown: (NSEvent *)event {
283286
fProcessingKeystroke = YES;
284-
fKeyEventsNeeded = YES;
287+
fKeyEventsNeeded = ![(NSString *)kbdLayout containsString:@KEYMAN_LAYOUT];
285288

286289
// Allow TSM to look at the event and potentially send back NSTextInputClient messages.
287290
[self interpretKeyEvents:[NSArray arrayWithObject:event]];
@@ -989,7 +992,7 @@ - (void) insertText:(id)aString replacementRange:(NSRange)replacementRange
989992

990993
if ((utf16Length > 2) ||
991994
((utf8Length > 1) && [self isCodePointInUnicodeBlockNeedingIMEvent:codePoint]) ||
992-
((codePoint == 0x5c) && ([(NSString *)kbdLayout containsString:@"Kotoeri"]))) {
995+
[(NSString *)kbdLayout containsString:@KEYMAN_LAYOUT]) {
993996
aStringIsComplex = YES;
994997
}
995998

0 commit comments

Comments
 (0)