diff --git a/.hgtags b/.hgtags index a2ca417ae5af40d4b7959ee85dada43f7aa2c5df..d64cd282b9228d23e8c617871231e86d04faa500 100644 --- a/.hgtags +++ b/.hgtags @@ -406,6 +406,8 @@ c669323bd55ac59ad26c7ee4f47a6daefc82af8e jdk8u45-b11 7087623dfa7033f8738d537864e4bac6b8528172 jdk8u45-b15 c7fbbf6133c339fb56f03241de28666774023d5d jdk8u45-b31 ea547c5a1217fe7916f366950d0e3156e4225aa5 jdk8u45-b32 +27836976c3157a90a9504eb2ec0de54b769b68b4 jdk8u45-b33 +98c0901da96579e1819e591c95d19066e0dad9b6 jdk8u45-b34 ac97b69b88e37c18c1b077be8b1f100b6803fea5 jdk8u51-b00 2e0732282470f7a02d57af5fc8542efa9db7b3e4 jdk8u51-b01 cc75137936f9a8e97017e7e18b1064b76238116f jdk8u51-b02 diff --git a/src/macosx/native/sun/awt/AWTView.m b/src/macosx/native/sun/awt/AWTView.m index d98d0d3442b1e34421c52be76c02918e0a011b82..0cba2ededfc94b48c8901b3c25674a7b93c8e903 100644 --- a/src/macosx/native/sun/awt/AWTView.m +++ b/src/macosx/native/sun/awt/AWTView.m @@ -310,7 +310,10 @@ AWT_ASSERT_APPKIT_THREAD; } - (BOOL) performKeyEquivalent: (NSEvent *) event { - [self deliverJavaKeyEventHelper: event]; + // if IM is active key events should be ignored + if (![self hasMarkedText] && !fInPressAndHold) { + [self deliverJavaKeyEventHelper: event]; + } // Workaround for 8020209: special case for "Cmd =" and "Cmd ." // because Cocoa calls performKeyEquivalent twice for these keystrokes