# HG changeset patch
# User pchelko
# Date 1365589690 -14400
# Node ID 1d48c0d0a0a2d955b234f128404d6472abc2cf37
# Parent dad642e0105e4474557508b0681150970e5c2923
8010009: [macosx] Unable type into online word games on MacOSX
Reviewed-by: anthony, dcherepanov, yan
diff -r dad642e0105e -r 1d48c0d0a0a2 src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java
--- a/src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java Wed Jun 26 22:27:10 2013 -0500
+++ b/src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java Wed Apr 10 14:28:10 2013 +0400
@@ -91,13 +91,7 @@
public void handleKeyEvent(int eventType, int modifierFlags, String characters,
String charsIgnoringMods, boolean isRepeat, short keyCode,
boolean needsKeyTyped) {
- responder.handleKeyEvent(eventType, modifierFlags, charsIgnoringMods, keyCode, needsKeyTyped);
- }
-
- // REMIND: delete this method once 'deploy' changes for 7156194 is pushed
- public void handleKeyEvent(int eventType, int modifierFlags, String characters,
- String charsIgnoringMods, boolean isRepeat, short keyCode) {
- handleKeyEvent(eventType, modifierFlags, characters, charsIgnoringMods, isRepeat, keyCode, true);
+ responder.handleKeyEvent(eventType, modifierFlags, charsIgnoringMods, keyCode, needsKeyTyped, isRepeat);
}
public void handleInputEvent(String text) {
diff -r dad642e0105e -r 1d48c0d0a0a2 src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java
--- a/src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java Wed Jun 26 22:27:10 2013 -0500
+++ b/src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java Wed Apr 10 14:28:10 2013 +0400
@@ -43,6 +43,7 @@
private final PlatformEventNotifier eventNotifier;
private final boolean isNpapiCallback;
+ private int lastKeyPressCode = KeyEvent.VK_UNDEFINED;
CPlatformResponder(final PlatformEventNotifier eventNotifier,
final boolean isNpapiCallback) {
@@ -126,7 +127,7 @@
* Handles key events.
*/
void handleKeyEvent(int eventType, int modifierFlags, String chars,
- short keyCode, boolean needsKeyTyped) {
+ short keyCode, boolean needsKeyTyped, boolean needsKeyReleased) {
boolean isFlagsChangedEvent =
isNpapiCallback ? (eventType == CocoaConstants.NPCocoaEventFlagsChanged) :
(eventType == CocoaConstants.NSFlagsChanged);
@@ -178,7 +179,9 @@
int jmodifiers = NSEvent.nsToJavaKeyModifiers(modifierFlags);
long when = System.currentTimeMillis();
-
+ if (jeventType == KeyEvent.KEY_PRESSED) {
+ lastKeyPressCode = jkeyCode;
+ }
eventNotifier.notifyKeyEvent(jeventType, when, jmodifiers,
jkeyCode, javaChar, jkeyLocation);
@@ -191,18 +194,29 @@
// Modifier keys (shift, etc) don't want to send TYPED events.
// On the other hand we don't want to generate keyTyped events
// for clipboard related shortcuts like Meta + [CVX]
- boolean isMetaDown = (jmodifiers & KeyEvent.META_DOWN_MASK) != 0;
- if (jeventType == KeyEvent.KEY_PRESSED && postsTyped && !isMetaDown) {
+ if (jeventType == KeyEvent.KEY_PRESSED && postsTyped &&
+ (jmodifiers & KeyEvent.META_DOWN_MASK) == 0) {
+ // Enter and Space keys finish the input method processing,
+ // KEY_TYPED and KEY_RELEASED events for them are synthesized in handleInputEvent
+ if (needsKeyReleased && (jkeyCode == KeyEvent.VK_ENTER || jkeyCode == KeyEvent.VK_SPACE)) {
+ return;
+ }
eventNotifier.notifyKeyEvent(KeyEvent.KEY_TYPED, when, jmodifiers,
KeyEvent.VK_UNDEFINED, javaChar,
KeyEvent.KEY_LOCATION_UNKNOWN);
+ //If events come from Firefox, released events should also be generated.
+ if (needsKeyReleased) {
+ eventNotifier.notifyKeyEvent(KeyEvent.KEY_RELEASED, when, jmodifiers,
+ jkeyCode, javaChar,
+ KeyEvent.KEY_LOCATION_UNKNOWN);
+ }
}
}
void handleInputEvent(String text) {
if (text != null) {
int index = 0, length = text.length();
- char c;
+ char c = 0;
while (index < length) {
c = text.charAt(index);
eventNotifier.notifyKeyEvent(KeyEvent.KEY_TYPED,
@@ -211,6 +225,10 @@
KeyEvent.KEY_LOCATION_UNKNOWN);
index++;
}
+ eventNotifier.notifyKeyEvent(KeyEvent.KEY_RELEASED,
+ System.currentTimeMillis(),
+ 0, lastKeyPressCode, c,
+ KeyEvent.KEY_LOCATION_UNKNOWN);
}
}
diff -r dad642e0105e -r 1d48c0d0a0a2 src/macosx/classes/sun/lwawt/macosx/CPlatformView.java
--- a/src/macosx/classes/sun/lwawt/macosx/CPlatformView.java Wed Jun 26 22:27:10 2013 -0500
+++ b/src/macosx/classes/sun/lwawt/macosx/CPlatformView.java Wed Apr 10 14:28:10 2013 +0400
@@ -212,7 +212,7 @@
private void deliverKeyEvent(NSEvent event) {
responder.handleKeyEvent(event.getType(), event.getModifierFlags(),
- event.getCharactersIgnoringModifiers(), event.getKeyCode(), true);
+ event.getCharactersIgnoringModifiers(), event.getKeyCode(), true, false);
}
private void deliverWindowDidExposeEvent() {
diff -r dad642e0105e -r 1d48c0d0a0a2 test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.html Wed Apr 10 14:28:10 2013 +0400
@@ -0,0 +1,22 @@
+
+
+
+KeyReleasedInAppletTest
+
+
+
+KeyReleasedInAppletTest
Bug ID:8010009
+
+ See the dialog box (usually in upper left corner) for instructions
+
+
+
+
diff -r dad642e0105e -r 1d48c0d0a0a2 test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.java Wed Apr 10 14:28:10 2013 +0400
@@ -0,0 +1,235 @@
+/*
+ * Copyright (c) 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.
+ */
+
+import javax.swing.*;
+import javax.swing.JLabel;
+import javax.swing.JTextArea;
+import java.awt.*;
+import java.awt.FileDialog;
+import java.awt.Label;
+import java.awt.event.*;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.io.FileWriter;
+import java.lang.*;
+import java.lang.Override;
+import java.lang.String;
+import java.lang.System;
+import java.lang.Throwable;
+import java.util.Hashtable;
+
+/*
+@test
+@bug 8010009
+@summary [macosx] Unable type into online word games on MacOSX
+@author petr.pchelko : area=awt.keyboard
+@run clean *
+@run build TestApplet
+@run applet/manual=yesno KeyReleasedInAppletTest.html
+*/
+
+public class KeyReleasedInAppletTest extends JApplet {
+ private static final String TEST_HTML_NAME = "TestApplet.html";
+
+ public void init() {
+ //Create instructions for the user here, as well as set up
+ // the environment -- set the layout manager, add buttons,
+ // etc.
+ this.setLayout(new BorderLayout());
+
+ try {
+ String testFilePath = System.getProperty("test.classes");
+ FileWriter testHTML = null;
+ try {
+ testHTML = new FileWriter(testFilePath + "/" + TEST_HTML_NAME);
+ testHTML.write("\n" +
+ "\n" +
+ "KeyReleasedInAppletTest \n" +
+ "\n" +
+ "\n" +
+ "KeyReleasedInAppletTest
Bug ID:8010009
\n" +
+ "Make sure the applet is focuced and type any character on the keyboard.
"+
+ "The applet should show keyPressed, keyTyped and keyReleased messages.
\n" +
+ "\n" +
+ "");
+ } finally {
+ if (testHTML != null) {
+ testHTML.close();
+ }
+ }
+
+ String[] instructions =
+ {
+ "(1) Install the tested JDK to be used by the Java Plugin.\n",
+ "(2) Open Java Preferences and set security level to minimal.\n",
+ "(3) Open the " + TEST_HTML_NAME + " in Firefox in firefox web browser\n" +
+ " It is located at: " + testFilePath,
+ "(5) Continue the test according to the instructions in the applet.\n",
+ };
+ Sysout.createDialogWithInstructions(instructions);
+ } catch (Throwable e) {
+ //Fail the test.
+ throw new RuntimeException(e.getMessage());
+ }
+
+ }//End init()
+
+ public void start() {
+ }// start()
+}
+
+/* Place other classes related to the test after this line */
+
+/****************************************************
+ Standard Test Machinery
+ DO NOT modify anything below -- it's a standard
+ chunk of code whose purpose is to make user
+ interaction uniform, and thereby make it simpler
+ to read and understand someone else's test.
+ ****************************************************/
+
+/**
+ * This is part of the standard test machinery.
+ * It creates a dialog (with the instructions), and is the interface
+ * for sending text messages to the user.
+ * To print the instructions, send an array of strings to Sysout.createDialog
+ * WithInstructions method. Put one line of instructions per array entry.
+ * To display a message for the tester to see, simply call Sysout.println
+ * with the string to be displayed.
+ * This mimics System.out.println but works within the test harness as well
+ * as standalone.
+ */
+
+class Sysout {
+ private static TestDialog dialog;
+ private static boolean numbering = false;
+ private static int messageNumber = 0;
+
+ public static void createDialogWithInstructions(String[] instructions) {
+ dialog = new TestDialog(new Frame(), "Instructions");
+ dialog.printInstructions(instructions);
+ dialog.setVisible(true);
+ println("Any messages for the tester will display here.");
+ }
+
+ public static void createDialog() {
+ dialog = new TestDialog(new Frame(), "Instructions");
+ String[] defInstr = {"Instructions will appear here. ", ""};
+ dialog.printInstructions(defInstr);
+ dialog.setVisible(true);
+ println("Any messages for the tester will display here.");
+ }
+
+ /* Enables message counting for the tester. */
+ public static void enableNumbering(boolean enable) {
+ numbering = enable;
+ }
+
+ public static void printInstructions(String[] instructions) {
+ dialog.printInstructions(instructions);
+ }
+
+
+ public static void println(String messageIn) {
+ if (numbering) {
+ messageIn = "" + messageNumber + " " + messageIn;
+ messageNumber++;
+ }
+ dialog.displayMessage(messageIn);
+ }
+
+}// Sysout class
+
+/**
+ * This is part of the standard test machinery. It provides a place for the
+ * test instructions to be displayed, and a place for interactive messages
+ * to the user to be displayed.
+ * To have the test instructions displayed, see Sysout.
+ * To have a message to the user be displayed, see Sysout.
+ * Do not call anything in this dialog directly.
+ */
+class TestDialog extends Dialog {
+
+ TextArea instructionsText;
+ TextArea messageText;
+ int maxStringLength = 80;
+
+ //DO NOT call this directly, go through Sysout
+ public TestDialog(Frame frame, String name) {
+ super(frame, name);
+ int scrollBoth = TextArea.SCROLLBARS_BOTH;
+ instructionsText = new TextArea("", 15, maxStringLength, scrollBoth);
+ add("North", instructionsText);
+
+ messageText = new TextArea("", 5, maxStringLength, scrollBoth);
+ add("Center", messageText);
+
+ pack();
+
+ setVisible(true);
+ }// TestDialog()
+
+ //DO NOT call this directly, go through Sysout
+ public void printInstructions(String[] instructions) {
+ //Clear out any current instructions
+ instructionsText.setText("");
+
+ //Go down array of instruction strings
+
+ String printStr, remainingStr;
+ for (int i = 0; i < instructions.length; i++) {
+ //chop up each into pieces maxSringLength long
+ remainingStr = instructions[i];
+ while (remainingStr.length() > 0) {
+ //if longer than max then chop off first max chars to print
+ if (remainingStr.length() >= maxStringLength) {
+ //Try to chop on a word boundary
+ int posOfSpace = remainingStr.
+ lastIndexOf(' ', maxStringLength - 1);
+
+ if (posOfSpace <= 0) posOfSpace = maxStringLength - 1;
+
+ printStr = remainingStr.substring(0, posOfSpace + 1);
+ remainingStr = remainingStr.substring(posOfSpace + 1);
+ }
+ //else just print
+ else {
+ printStr = remainingStr;
+ remainingStr = "";
+ }
+
+ instructionsText.append(printStr + "\n");
+
+ }// while
+
+ }// for
+
+ }//printInstructions()
+
+ //DO NOT call this directly, go through Sysout
+ public void displayMessage(String messageIn) {
+ messageText.append(messageIn + "\n");
+ System.out.println(messageIn);
+ }
+
+}// TestDialog class
diff -r dad642e0105e -r 1d48c0d0a0a2 test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/TestApplet.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/TestApplet.java Wed Apr 10 14:28:10 2013 +0400
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 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.
+ */
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.Color;
+import java.awt.Label;
+import java.awt.TextArea;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.lang.String;
+import java.lang.System;
+
+
+public class TestApplet extends JApplet {
+
+ public void init() {
+ final TextArea log = new TextArea("Events:\n");
+ log.setEditable(false);
+ log.setSize(400, 200);
+ this.add(log);
+ log.addKeyListener(
+ new KeyAdapter() {
+ @Override public void keyTyped(KeyEvent e) {
+ log.append("Key typed: char = " + e.getKeyChar() + "\n");
+ }
+
+ @Override public void keyPressed(KeyEvent e) {
+ log.append("Key pressed: char = " + e.getKeyChar() + " code = " + e.getKeyCode() + "\n");
+ }
+
+ @Override public void keyReleased(KeyEvent e) {
+ log.append("Key released: char = " + e.getKeyChar() + " code = " + e.getKeyCode() + "\n");
+ }
+ });
+ }
+
+ public void start() {
+ }
+
+ public void stop() {
+ }
+
+ public void destroy() {
+ }
+
+}