changeset 4910:af118cc1bef7

7154072: [macosx] swallowing key events Reviewed-by: anthony
author ant
date Thu, 22 Mar 2012 02:44:01 +0300
parents 25285b7883d4
children 214f68c9b1a9
files src/macosx/native/sun/awt/AWTView.m test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java
diffstat 2 files changed, 105 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/macosx/native/sun/awt/AWTView.m	Thu Mar 22 01:03:42 2012 +0400
+++ b/src/macosx/native/sun/awt/AWTView.m	Thu Mar 22 02:44:01 2012 +0300
@@ -372,13 +372,14 @@
 }
 
 -(void) deliverJavaKeyEventHelper: (NSEvent *) event {
-    static id sUnretainedLastKeyEvent = nil;    
-    if (event == sUnretainedLastKeyEvent) {
+    static NSEvent* sLastKeyEvent = nil;
+    if (event == sLastKeyEvent) {
         // The event is repeatedly delivered by keyDown: after performKeyEquivalent:
         return;
     }
-    sUnretainedLastKeyEvent = event;	
-	
+    [sLastKeyEvent release];
+    sLastKeyEvent = [event retain];
+
     [AWTToolkit eventCountPlusPlus];
     JNIEnv *env = [ThreadUtilities getJNIEnv];
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java	Thu Mar 22 02:44:01 2012 +0300
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2012, 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       7154072
+  @summary   Tests that key events with modifiers are not swallowed.
+  @author    anton.tarasov: area=awt.focus
+  @library   ../../../regtesthelpers
+  @build     Util
+  @run       main SwallowKeyEvents
+*/
+
+import java.awt.AWTException;
+import java.awt.Frame;
+import java.awt.Robot;
+import java.awt.TextField;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import test.java.awt.regtesthelpers.Util;
+
+public class SwallowKeyEvents {
+    static final int PRESS_COUNT = 10;
+
+    static int keyPressedCount = 0;
+
+    static Frame f = new Frame("Frame");
+    static TextField t = new TextField("text");
+    static Robot r;
+
+    public static void main(String[] args) {
+        f.add(t);
+        f.pack();
+        f.setVisible(true);
+
+        t.requestFocus();
+
+        try {
+            r = new Robot();
+        } catch (AWTException ex) {
+            throw new RuntimeException(ex);
+        }
+
+        Util.waitForIdle(r);
+
+        t.addKeyListener(new KeyAdapter() {
+            public void keyPressed(KeyEvent ke) {
+                System.out.println(ke);
+                if (ke.getKeyCode() == KeyEvent.VK_M) {
+                    keyPressedCount++;
+                }
+            }
+        });
+
+        test();
+
+        System.out.println("key_pressed count: " + keyPressedCount);
+
+        if (keyPressedCount != PRESS_COUNT) {
+            throw new RuntimeException("Test failed!");
+        } else {
+            System.out.println("Test passed.");
+        }
+    }
+
+    public static void test() {
+        r.keyPress(KeyEvent.VK_SHIFT);
+        r.keyPress(KeyEvent.VK_META);
+
+        for (int i=0; i<PRESS_COUNT; i++) {
+            r.delay(100);
+            r.keyPress(KeyEvent.VK_M);
+            r.delay(100);
+            r.keyRelease(KeyEvent.VK_M);
+        }
+
+        r.keyRelease(KeyEvent.VK_META);
+        r.keyRelease(KeyEvent.VK_SHIFT);
+    }
+}