diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java index 8d8c00b6a19..67896a59521 100644 --- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java +++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2016, 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 @@ -34,6 +34,7 @@ import java.awt.event.MouseEvent; import java.awt.event.InputEvent; import java.awt.event.MouseWheelEvent; import java.awt.event.KeyEvent; +import java.util.Locale; /** * Translates NSEvents/NPCocoaEvents into AWT events. @@ -170,6 +171,16 @@ final class CPlatformResponder { } } + // If Pinyin Simplified input method is selected, CAPS_LOCK key is supposed to switch + // input to latin letters. + // It is necessary to use testCharIgnoringModifiers instead of testChar for event + // generation in such case to avoid uppercase letters in text components. + LWCToolkit lwcToolkit = (LWCToolkit)Toolkit.getDefaultToolkit(); + if (lwcToolkit.getLockingKeyState(KeyEvent.VK_CAPS_LOCK) && + Locale.SIMPLIFIED_CHINESE.equals(lwcToolkit.getDefaultKeyboardLocale())) { + testChar = testCharIgnoringModifiers; + } + jkeyCode = out[0]; jkeyLocation = out[1]; jeventType = isNpapiCallback ? NSEvent.npToJavaEventType(eventType) : diff --git a/jdk/test/java/awt/im/8154816/bug8154816.html b/jdk/test/java/awt/im/8154816/bug8154816.html new file mode 100644 index 00000000000..1fdb5fd10ae --- /dev/null +++ b/jdk/test/java/awt/im/8154816/bug8154816.html @@ -0,0 +1,39 @@ + + + + +Verify that Caps Lock key works properly with Pinyin input method, (i.e. if +Caps Lock is pressed, input should be swithced to lowercase latin letters). + +This test is for OS X only. For other platforms please simply press "Pass". + +1. Go to "System Preferences -> Keyboard -> Input Sources" and add "Pinyin – Traditional" or "Pinyin – Simplified" IM from Chinese language group. +2. Set current IM to "Pinyin". +3. Set focus to the text field of the test and press Caps Lock key on the keyboard. +4. Press "a" character on the keyboard +5. If "a" character is displayed in the text field, press "Pass", if "A" character is displayed, press "Fail". + + + + diff --git a/jdk/test/java/awt/im/8154816/bug8154816.java b/jdk/test/java/awt/im/8154816/bug8154816.java new file mode 100644 index 00000000000..b3bda4f4728 --- /dev/null +++ b/jdk/test/java/awt/im/8154816/bug8154816.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2016, 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 + * @bug 8154816 + * @summary Caps Lock doesn't work as expected when using Pinyin Simplified input method + * @author Dmitry Markov + * @run applet/manual=yesno bug8154816.html + */ + +import javax.swing.*; + +public class bug8154816 extends JApplet { + @Override + public void init() { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + JPanel panel = new JPanel(); + panel.add(new JLabel("Text field:")); + panel.add(new JTextField(20)); + add(panel); + } + }); + } +} +