infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-17 13:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

8012026: [macosx] Component.getMousePosition() does not work in an applet on MacOS

Browse Source 
Reviewed-by: anthony, serb
This commit is contained in:
Petr Pchelko 2013-09-13 18:02:18 +04:00
parent 6578d6acad
commit a7d4eaed9a
6 changed files with 220 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jdk/make/sun/lwawt/FILES_export_macosx.gmk
View File

@ -141,7 +141,6 @@ FILES_export = \
sun/lwawt/macosx/CMenuBar.java \
sun/lwawt/macosx/CMenuComponent.java \
sun/lwawt/macosx/CMenuItem.java \
sun/lwawt/macosx/CMouseInfoPeer.java \
sun/lwawt/macosx/CPlatformView.java \
sun/lwawt/macosx/CPlatformWindow.java \
sun/lwawt/macosx/CWarningWindow.java \

45
jdk/src/macosx/classes/sun/lwawt/macosx/CMouseInfoPeer.java
View File

@ -1,45 +0,0 @@
/*
* Copyright (c) 2011, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package sun.lwawt.macosx;
import java.awt.Window;
import sun.lwawt.LWMouseInfoPeer;
import sun.lwawt.LWWindowPeer;
public class CMouseInfoPeer extends LWMouseInfoPeer
{
//If a new window is to appear under the cursor,
//we get wrong window.
//This is a workaround for macosx.
@Override
public boolean isWindowUnderMouse(Window w) {
if (w == null) {
return false;
}
return ((LWWindowPeer)w.getPeer()).getPlatformWindow().isUnderMouse();
}
}

5
jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
View File

@ -302,11 +302,6 @@ public final class LWCToolkit extends LWToolkit {
return new OSXPlatformFont(name, style);
}
@Override
protected MouseInfoPeer createMouseInfoPeerImpl() {
return new CMouseInfoPeer();
}
@Override
protected int getScreenHeight() {
return GraphicsEnvironment.getLocalGraphicsEnvironment()

2
jdk/src/macosx/native/sun/awt/AWTView.m
View File

@ -387,7 +387,7 @@ AWT_ASSERT_APPKIT_THREAD;
[rolloverTrackingArea release];
}
int options = (NSTrackingActiveInActiveApp | NSTrackingMouseEnteredAndExited |
int options = (NSTrackingActiveAlways | NSTrackingMouseEnteredAndExited |
NSTrackingMouseMoved | NSTrackingEnabledDuringMouseDrag);
rolloverTrackingArea = [[NSTrackingArea alloc] initWithRect:[self visibleRect]

108
jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java Normal file
View File

@ -0,0 +1,108 @@
/*
* 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 test.java.awt.regtesthelpers.Util;
import javax.swing.*;
import java.awt.*;
import java.util.concurrent.atomic.AtomicReference;
/**
* @test
* @bug 8012026
* @summary Component.getMousePosition() does not work in an applet on MacOS
* @author Petr Pchelko
* @library ../../regtesthelpers
* @build Util
* @compile GetMousePositionWithOverlay.java
* @run main/othervm GetMousePositionWithOverlay
*/
public class GetMousePositionWithOverlay {
static Frame backFrame;
static Frame frontFrame;
public static void main(String[] args) throws Throwable {
try {
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
constructTestUI();
}
});
Util.waitForIdle(null);
Robot r = new Robot();
Util.pointOnComp(frontFrame, r);
Util.waitForIdle(null);
Point pos = getMousePosition(backFrame);
if (pos != null) {
throw new RuntimeException("Test failed. Mouse position should be null but was" + pos);
}
pos = getMousePosition(frontFrame);
if (pos == null) {
throw new RuntimeException("Test failed. Mouse position should not be null");
}
r.mouseMove(189, 189);
Util.waitForIdle(null);
pos = getMousePosition(backFrame);
if (pos == null) {
throw new RuntimeException("Test failed. Mouse position should not be null");
}
} finally {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
backFrame.dispose();
frontFrame.dispose();
}
});
}
}
private static Point getMousePosition(final Component component) throws Exception {
final AtomicReference<Point> pos = new AtomicReference<Point>();
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
pos.set(component.getMousePosition());
}
});
return pos.get();
}
private static void constructTestUI() {
backFrame = new Frame();
backFrame.setBounds(100, 100, 100, 100);
backFrame.setVisible(true);
frontFrame = new Frame();
frontFrame.setBounds(120, 120, 60, 60);
frontFrame.setVisible(true);
}
}

111
jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java Normal file
View File

@ -0,0 +1,111 @@
/*
* 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 test.java.awt.regtesthelpers.Util;
import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionAdapter;
/**
* @test
* @bug 8012026
* @summary Component.getMousePosition() does not work in an applet on MacOS
* @author Petr Pchelko
* @library ../../regtesthelpers
* @build Util
* @compile GetMousePositionWithPopup.java
* @run main/othervm GetMousePositionWithPopup
*/
public class GetMousePositionWithPopup {
private static Frame frame1;
private static Frame frame2;
public static void main(String[] args) throws Exception {
try {
Robot r = Util.createRobot();
r.mouseMove(0, 0);
Util.waitForIdle(null);
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
constructTestUI();
}
});
Util.waitForIdle(null);
r.mouseMove(149, 149);
Util.waitForIdle(null);
r.mouseMove(150, 150);
Util.waitForIdle(null);
} finally {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
frame1.dispose();
frame2.dispose();
}
});
}
}
private static void constructTestUI() {
frame1 = new Frame();
frame1.setBounds(100, 100, 100, 100);
frame1.addMouseMotionListener(new MouseMotionAdapter() {
private boolean shown = false;
@Override
public void mouseMoved(MouseEvent e) {
if (shown) {
return;
}
shown = true;
frame2 = new Frame();
frame2.setBounds(120, 120, 120, 120);
frame2.setVisible(true);
Point positionInFrame2 = frame2.getMousePosition();
if (positionInFrame2.x != 30 || positionInFrame2.y != 30) {
throw new RuntimeException("Wrong position reported. Should be [30, 30] but was [" +
positionInFrame2.x + ", " + positionInFrame2.y + "]");
}
Point positionInFrame1 = frame1.getMousePosition();
if (positionInFrame1 != null) {
throw new RuntimeException("Wrong position reported. Should be null");
}
}
});
frame1.setVisible(true);
}
}