JBR-1421 Cannot type opening square bracket or brace with a Spanish-ISO keyboard macOS

(cherry picked from commit ae087bad40)
2025-12-08 10:29:40 +01:00 · 2019-06-05 14:58:29 +03:00 · 2019-06-05 14:58:24 +03:00 · 2019-06-04 15:53:55 +07:00 · 2019-06-04 15:51:39 +07:00 · 2019-06-04 15:51:22 +07:00
6 changed files with 15 additions and 17 deletions
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java
@@ -361,7 +361,11 @@ final class CPlatformResponder {
                characterToSendWithTypedEvent = stringWithChar == null ? KeyEvent.CHAR_UNDEFINED :  stringWithChar.charAt(0);
            }

-            if (!nsEvent.isHasDeadKey()) {
+            boolean nonInputMethodsModifiersAreNotPressed = (jmodifiers &
+                    (InputEvent.META_DOWN_MASK | InputEvent.CTRL_DOWN_MASK)
+            ) == 0;
+
+            if (nonInputMethodsModifiersAreNotPressed) {
                eventNotifier.notifyKeyEvent(KeyEvent.KEY_TYPED, when, jmodifiers,
                        jkeyCode, characterToSendWithTypedEvent,
                        KeyEvent.KEY_LOCATION_UNKNOWN);
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m
@@ -326,10 +326,7 @@ static BOOL shouldUsePressAndHold() {
        }
    }

-    NSString *eventCharacters = [event characters];
-    BOOL isDeadKey = (eventCharacters != nil && [eventCharacters length] == 0);
-
-    if ((![self hasMarkedText] && fKeyEventsNeeded) || isDeadKey) {
+    if ((![self hasMarkedText] && fKeyEventsNeeded)) {
        [self deliverJavaKeyEventHelper: event];
    }

@@ -507,7 +504,8 @@ static BOOL shouldUsePressAndHold() {
    JNIEnv *env = [ThreadUtilities getJNIEnv];

    TISInputSourceRef sourceRef = TISCopyCurrentKeyboardLayoutInputSource();
-    CFDataRef keyLayoutPtr = (CFDataRef)TISGetInputSourceProperty(sourceRef, kTISPropertyUnicodeKeyLayoutData);
+    CFDataRef keyLayoutPtr = (CFDataRef)TISGetInputSourceProperty(
+    sourceRef, kTISPropertyUnicodeKeyLayoutData);
    CFRelease( sourceRef);

    const UCKeyboardLayout *keyboardLayout =  (UCKeyboardLayout*)CFDataGetBytePtr(keyLayoutPtr);
@@ -545,8 +543,6 @@ static BOOL shouldUsePressAndHold() {

    if (status == noErr && isDeadKeyPressed != 0) {

-        UInt32 isDeadKeyPressedIgnore = 0;
-
        status = UCKeyTranslate(
                    keyboardLayout,
                    kVK_Space,
@@ -554,7 +550,7 @@ static BOOL shouldUsePressAndHold() {
                    0,
                    LMGetKbdType(),
                    0,
-                    &isDeadKeyPressedIgnore,
+                    &isDeadKeyPressed,
                    lengthOfBuffer,
                    &actualLength,
                    stringWithChars);
--- a/src/java.desktop/share/classes/javax/swing/PopupFactory.java
+++ b/src/java.desktop/share/classes/javax/swing/PopupFactory.java
@@ -347,7 +347,7 @@ public class PopupFactory {
        private static final Object heavyWeightPopupCacheKey =
                 new StringBuffer("PopupFactory.heavyWeightPopupCache");

-        private volatile boolean isCacheEnabled = true;
+        private volatile boolean isCacheEnabled = false;

        /**
         * Returns either a new or recycled <code>Popup</code> containing
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDnDDropTargetProtocol.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDnDDropTargetProtocol.java
@@ -586,19 +586,16 @@ class XDnDDropTargetProtocol extends XDropTargetProtocol {
            return false;
        }

-        x = (int)(xclient.get_data(2) >> 16);
-        y = (int)(xclient.get_data(2) & 0xFFFF);
-
        XWindow xwindow = null;
        {
            XBaseWindow xbasewindow = XToolkit.windowToXWindow(xclient.get_window());
            if (xbasewindow instanceof XWindow) {
                xwindow = (XWindow)xbasewindow;
-                x = xbasewindow.scaleDown(x);
-                y = xbasewindow.scaleDown(y);
            }
        }

+        x = (int)(xclient.get_data(2) >> 16);
+        y = (int)(xclient.get_data(2) & 0xFFFF);

        if (xwindow == null) {
            long receiver =
--- a/test/jdk/jbProblemList.txt
+++ b/test/jdk/jbProblemList.txt
@@ -529,7 +529,7 @@ java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java
 java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java                                8196441 macosx-all,windows-all,linux-all
 java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java                                8196441 macosx-all,windows-all,linux-all
 java/awt/Mouse/EnterExitEvents/DragWindowOutOfFrameTest.java                        8177326 macosx-all,windows-all
-java/awt/Mouse/EnterExitEvents/DragWindowTest.java                                  8023562 macosx-all,windows-all
+java/awt/Mouse/EnterExitEvents/DragWindowTest.java                                  8023562 macosx-all,windows-all,linux-all
 java/awt/Mouse/EnterExitEvents/ModalDialogEnterExitEventsTest.java                  JRE-898 macosx-all,windows-all,linux-all
 java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java                               8005021 macosx-all,windows-all,linux-all
 java/awt/Mouse/EnterExitEvents/FullscreenEnterEventTest.java                        8051455 macosx-all
@@ -618,6 +618,7 @@ java/awt/dnd/MissingEventsOnModalDialog/MissingEventsOnModalDialogTest.java
 java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.html                             8214221 windows-all,linux-all,macosx-all
 java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.html                     8171510 macosx-all
 java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.html 8194947 generic-all
+java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.html 6511207 generic-all
 java/awt/event/HierarchyEvent/AncestorResized/AncestorResized.java                  6618538 generic-all
 java/awt/event/InputEvent/EventWhenTest/EventWhenTest.java                          8168646 generic-all
 java/awt/event/KeyEvent/CorrectTime/CorrectTime.java                                6626492 generic-all
--- a/test/jdk/jbcommitProblemList.txt
+++ b/test/jdk/jbcommitProblemList.txt
@@ -48,7 +48,7 @@ java/awt/Graphics/LineClipTest.java
 java/awt/Graphics2D/ScaledTransform/ScaledTransform.java                                    nobug macosx-all,linux-all,windows-all
 java/awt/JAWT/JAWT.sh                                                                       nobug linux-all,windows-all
 java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemonicKeyTypedTest.html nobug macosx-all,windows-all
-java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogTest/EnqueueWithDialogTest.java    nobug macosx-all,windows-all
+java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogTest/EnqueueWithDialogTest.java    nobug macosx-all,windows-all,linux-all
 java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html    nobug windows-all reproduced with Adopt
 java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java                              nobug windows-all
 java/awt/List/ActionAfterRemove/ActionAfterRemove.java                                      nobug windows-all
Author	SHA1	Message	Date
Denis Fokin	029f909a90	JBR-1421 Cannot type opening square bracket or brace with a Spanish-ISO keyboard macOS (cherry picked from commit `ae087bad40`)	2019-06-05 14:58:29 +03:00
Denis Fokin	e003de9d37	JBR-1421 Cannot type opening square bracket or brace with a Spanish-ISO keyboard macOS Forgotten change (cherry picked from commit `63f98e40a6`)	2019-06-05 14:58:24 +03:00
Vitaly Provodin	3f7ac0a900	Reverted becasuse of regression JBR-1558 Revert "JBR-1414 DnD on linux (XToolkit) does not honor HIDPI scale" This reverts commit `85dfaefe`	2019-06-04 15:53:55 +07:00
Vitaly Provodin	ccba24774b	Not yet approved for EAP 192 by IDEA QA team Revert "JBR-1421 Cannot type opening square bracket or brace with a Spanish-ISO keyboard macOS" This reverts commit `a1922b48`	2019-06-04 15:51:39 +07:00
Vitaly Provodin	4d7661af8b	Not yet approved for EAP 192 by IDEA QA team Revert "JBR-1421 Cannot type opening square bracket or brace with a Spanish-ISO keyboard macOS" This reverts commit `b4cf77f0`	2019-06-04 15:51:22 +07:00
Denis Fokin	b4cf77f0ce	JBR-1421 Cannot type opening square bracket or brace with a Spanish-ISO keyboard macOS (cherry picked from commit `ae087bad40`)	2019-06-03 11:13:36 +03:00
Denis Fokin	a1922b489e	JBR-1421 Cannot type opening square bracket or brace with a Spanish-ISO keyboard macOS Forgotten change (cherry picked from commit `63f98e40a6`)	2019-06-03 11:13:23 +03:00
Vitaly Provodin	6de4142142	updated JTreg exclude list	2019-05-31 15:10:32 +07:00
Denis Fokin	614bbc420c	JBR-1522 JDK11 does not reset reused heavy-weight popup window min-size (cherry picked from commit `1ca0a3f140`)	2019-05-30 12:44:49 +03:00