# HG changeset patch # User kaddepalli # Date 1555932771 -19800 # Node ID 2ed7d59e725d7c76a4350ca135d1b40274ff1b8a # Parent 4b4c8c11358f510e53fbc9f6ff77620949e51996 8218917: KeyEvent.getModifiers() returns inconsistent values for ALT keys Reviewed-by: serb diff -r 4b4c8c11358f -r 2ed7d59e725d src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m --- a/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m Mon Apr 22 10:53:45 2019 +0530 +++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m Mon Apr 22 17:02:51 2019 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -319,7 +319,6 @@ }; static BOOL leftAltKeyPressed; -static BOOL altGRPressed = NO; /* * Almost all unicode characters just go from NS to Java with no translation. @@ -567,19 +566,13 @@ for (cur = nsKeyToJavaModifierTable; cur->nsMask != 0; ++cur) { if ((cur->nsMask & nsFlags) != 0) { - - if (cur->nsMask == NSAlternateKeyMask) { - if (leftAltKeyPressed == YES) { - javaModifiers |= isExtMods? cur->javaExtMask : cur->javaMask; - if (altGRPressed == NO) - break; - } else { - leftAltKeyPressed = YES; - altGRPressed = YES; - continue; - } - } + //This code will consider the mask value for left alt as well as + //right alt, but that should be ok, since right alt contains left alt + //mask value. javaModifiers |= isExtMods ? cur->javaExtMask : cur->javaMask; + if (cur->nsMask == NSAlternateKeyMask && leftAltKeyPressed) { + break; //since right alt key struct is defined last, break out of the loop } + } } } diff -r 4b4c8c11358f -r 2ed7d59e725d test/jdk/java/awt/event/MouseEvent/AltGraphModifierTest/AltGraphModifierTest.java --- a/test/jdk/java/awt/event/MouseEvent/AltGraphModifierTest/AltGraphModifierTest.java Mon Apr 22 10:53:45 2019 +0530 +++ b/test/jdk/java/awt/event/MouseEvent/AltGraphModifierTest/AltGraphModifierTest.java Mon Apr 22 17:02:51 2019 +0530 @@ -25,7 +25,6 @@ @test @bug 8041928 8158616 @summary Confirm that the Alt-Gr Modifier bit is set correctly. - @requires (os.family != "windows" & os.family != "mac") @run main/manual AltGraphModifierTest */ diff -r 4b4c8c11358f -r 2ed7d59e725d test/jdk/java/awt/keyboard/8218917/AltKeyBug.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/jdk/java/awt/keyboard/8218917/AltKeyBug.java Mon Apr 22 17:02:51 2019 +0530 @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @key headful + * @bug 8218917 + * @summary Tests whether sending an ALT_GRAPH key once, will result in the + * system reporting only ALT_GRAPH even if an ALT was sent and vice versa. + * @run main AltKeyBug + */ +import javax.swing.JTextField; +import javax.swing.JFrame; +import javax.swing.SwingUtilities; + +import java.awt.Robot; +import java.awt.event.KeyListener; +import java.awt.event.KeyEvent; + +public class AltKeyBug { + private static JFrame f; + private static boolean rightAltPressed = false; + private static boolean throwException = false; + private static String errorString; + public static void main(String[] args) throws Exception { + try { + Robot robot = new Robot(); + robot.setAutoDelay(50); + + SwingUtilities.invokeAndWait(() -> { + JTextField comp = new JTextField(); + comp.addKeyListener(new KeyListener() { + @Override public void keyTyped(KeyEvent e) {} + @Override public void keyPressed(KeyEvent e) { + System.out.println("ModEx : " +e.getModifiersEx()); + System.out.println("Mod : " +e.getModifiers()); + System.out.println("ALT_DOWN : " + e.isAltDown()); + System.out.println("ALT_GR_DOWN: " + e.isAltGraphDown()); + System.out.println("-----------"); + if (rightAltPressed && !e.isAltGraphDown()) { + throwException = true; + errorString = "Right Alt press was sent but not received back."; + } else if (!rightAltPressed && e.isAltGraphDown()) { + throwException = true; + errorString = "Left Alt press was sent, but received Right Alt"; + } + } + @Override public void keyReleased(KeyEvent e) {} + }); + f = new JFrame(); + f.add(comp); + f.setSize(100,100); + f.setVisible(true); + }); + + for(int i = 0; i < 20; i++) { + rightAltPressed = true; + robot.keyPress(KeyEvent.VK_ALT_GRAPH); + robot.keyRelease(KeyEvent.VK_ALT_GRAPH); + + robot.waitForIdle(); + + if (throwException) { + throw new RuntimeException(errorString); + } + rightAltPressed = false; + robot.keyPress(KeyEvent.VK_ALT); + robot.keyRelease(KeyEvent.VK_ALT); + + robot.waitForIdle(); + + if (throwException) { + throw new RuntimeException(errorString); + } + } + } finally { + SwingUtilities.invokeAndWait(()-> { + if (f != null) + f.dispose(); + }); + } + + System.out.println("Test passed."); + } +}