# HG changeset patch # User leonidr # Date 1382445908 -14400 # Node ID b3298f607368f6fd56f099fd6899c5280d2a650a # Parent fe3928f5591f99ee4e72967f61aaade23d11aac6 8020209: [macosx] Mac OS X key event confusion for "COMMAND PLUS" Reviewed-by: anthony, serb diff -r fe3928f5591f -r b3298f607368 jdk/src/macosx/native/sun/awt/AWTView.m --- a/jdk/src/macosx/native/sun/awt/AWTView.m Fri Oct 18 20:35:36 2013 +0400 +++ b/jdk/src/macosx/native/sun/awt/AWTView.m Tue Oct 22 16:45:08 2013 +0400 @@ -272,7 +272,6 @@ */ - (void) keyDown: (NSEvent *)event { - fProcessingKeystroke = YES; fKeyEventsNeeded = YES; @@ -308,6 +307,23 @@ - (BOOL) performKeyEquivalent: (NSEvent *) event { [self deliverJavaKeyEventHelper: event]; + + // Workaround for 8020209: special case for "Cmd =" and "Cmd ." + // because Cocoa calls performKeyEquivalent twice for these keystrokes + NSUInteger modFlags = [event modifierFlags] & + (NSCommandKeyMask | NSAlternateKeyMask | NSShiftKeyMask | NSControlKeyMask); + if (modFlags == NSCommandKeyMask) { + NSString *eventChars = [event charactersIgnoringModifiers]; + if ([eventChars length] == 1) { + unichar ch = [eventChars characterAtIndex:0]; + if (ch == '=' || ch == '.') { + [[NSApp mainMenu] performKeyEquivalent: event]; + return YES; + } + } + + } + return NO; } diff -r fe3928f5591f -r b3298f607368 jdk/src/macosx/native/sun/osxapp/NSApplicationAWT.m --- a/jdk/src/macosx/native/sun/osxapp/NSApplicationAWT.m Fri Oct 18 20:35:36 2013 +0400 +++ b/jdk/src/macosx/native/sun/osxapp/NSApplicationAWT.m Tue Oct 22 16:45:08 2013 +0400 @@ -341,6 +341,10 @@ if ([event type] == NSApplicationDefined && TS_EQUAL([event timestamp], dummyEventTimestamp)) { [seenDummyEventLock lockWhenCondition:NO]; [seenDummyEventLock unlockWithCondition:YES]; + } else if ([event type] == NSKeyUp && ([event modifierFlags] & NSCommandKeyMask)) { + // Cocoa won't send us key up event when releasing a key while Cmd is down, + // so we have to do it ourselves. + [[self keyWindow] sendEvent:event]; } else { [super sendEvent:event]; } diff -r fe3928f5591f -r b3298f607368 jdk/test/java/awt/event/KeyEvent/8020209/bug8020209.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/awt/event/KeyEvent/8020209/bug8020209.java Tue Oct 22 16:45:08 2013 +0400 @@ -0,0 +1,120 @@ +/* + * Copyright (c) 2012, 2013, 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 8020209 + * @summary [macosx] Mac OS X key event confusion for "COMMAND PLUS" + * @author leonid.romanov@oracle.com + * @run main bug8020209 + */ + +import sun.awt.*; +import java.awt.*; +import java.awt.event.*; + +public class bug8020209 { + static volatile int listenerCallCounter = 0; + + static AWTKeyStroke keyStrokes[] = { + AWTKeyStroke.getAWTKeyStroke(KeyEvent.VK_DECIMAL, InputEvent.META_MASK), + AWTKeyStroke.getAWTKeyStroke(KeyEvent.VK_EQUALS, InputEvent.META_MASK), + AWTKeyStroke.getAWTKeyStroke(KeyEvent.VK_ESCAPE, InputEvent.CTRL_MASK), + }; + + public static void main(String[] args) throws Exception { + if (sun.awt.OSInfo.getOSType() != sun.awt.OSInfo.OSType.MACOSX) { + System.out.println("This test is for MacOS only. Automatically passed on other platforms."); + return; + } + + System.setProperty("apple.laf.useScreenMenuBar", "true"); + + SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit(); + Robot robot = new Robot(); + robot.setAutoDelay(50); + + createAndShowGUI(); + toolkit.realSync(); + + for (int i = 0; i < keyStrokes.length; ++i) { + AWTKeyStroke ks = keyStrokes[i]; + + int modKeyCode = getModKeyCode(ks.getModifiers()); + robot.keyPress(modKeyCode); + + robot.keyPress(ks.getKeyCode()); + robot.keyRelease(ks.getKeyCode()); + + robot.keyRelease(modKeyCode); + + toolkit.realSync(); + + if (listenerCallCounter != 4) { + throw new Exception("Test failed: KeyListener for '" + ks.toString() + + "' called " + listenerCallCounter + " times instead of 4!"); + } + + listenerCallCounter = 0; + } + + } + + private static void createAndShowGUI() { + Frame frame = new Frame("Test"); + frame.addKeyListener(new KeyAdapter() { + @Override + public void keyPressed(KeyEvent e) { + listenerCallCounter++; + } + + @Override + public void keyReleased(KeyEvent e) { + listenerCallCounter++; + } + }); + + frame.pack(); + frame.setVisible(true); + } + + private static int getModKeyCode(int mod) { + if ((mod & (InputEvent.SHIFT_DOWN_MASK | InputEvent.SHIFT_MASK)) != 0) { + return KeyEvent.VK_SHIFT; + } + + if ((mod & (InputEvent.CTRL_DOWN_MASK | InputEvent.CTRL_MASK)) != 0) { + return KeyEvent.VK_CONTROL; + } + + if ((mod & (InputEvent.ALT_DOWN_MASK | InputEvent.ALT_MASK)) != 0) { + return KeyEvent.VK_ALT; + } + + if ((mod & (InputEvent.META_DOWN_MASK | InputEvent.META_MASK)) != 0) { + return KeyEvent.VK_META; + } + + return 0; + } +} diff -r fe3928f5591f -r b3298f607368 jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java --- a/jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java Fri Oct 18 20:35:36 2013 +0400 +++ b/jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java Tue Oct 22 16:45:08 2013 +0400 @@ -35,13 +35,14 @@ import javax.swing.*; public class ActionListenerCalledTwiceTest { - static String menuItems[] = { "Item1", "Item2", "Item3", "Item4", "Item5" }; + static String menuItems[] = { "Item1", "Item2", "Item3", "Item4", "Item5", "Item6" }; static KeyStroke keyStrokes[] = { KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.META_MASK), KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.SHIFT_MASK), KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.META_MASK), - KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_MASK) + KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_MASK), + KeyStroke.getKeyStroke(KeyEvent.VK_EQUALS, InputEvent.META_MASK) }; static volatile int listenerCallCounter = 0;