stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8041470: JButtons stay pressed after they have lost focus if you use the mouse wheel

Browse Source 
Reviewed-by: azvegint, alexp
This commit is contained in:
Anton Nashatyrev 2015-05-28 21:17:49 +03:00
parent 44af11b7a3
commit 4dc4dd721e
2 changed files with 140 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
View File

@ -572,10 +572,6 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
}
static int getModifiers(int state, int button, int keyCode) {
return getModifiers(state, button, keyCode, 0, false);
}
static int getModifiers(int state, int button, int keyCode, int type, boolean wheel_mouse) {
int modifiers = 0;
if (((state & XConstants.ShiftMask) != 0) ^ (keyCode == KeyEvent.VK_SHIFT)) {
@ -606,7 +602,7 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
// ONLY one of these conditions should be TRUE to add that modifier.
if (((state & XlibUtil.getButtonMask(i + 1)) != 0) != (button == XConstants.buttons[i])){
//exclude wheel buttons from adding their numbers as modifiers
if (!wheel_mouse) {
if (!isWheel(XConstants.buttons[i])) {
modifiers |= InputEvent.getMaskForButton(i+1);
}
}
@ -614,6 +610,11 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
return modifiers;
}
static boolean isWheel(int button) {
// 4 and 5 buttons are usually considered assigned to a first wheel
return button == XConstants.buttons[3] || button == XConstants.buttons[4];
}
static int getXModifiers(AWTKeyStroke stroke) {
int mods = stroke.getModifiers();
int res = 0;
@ -653,7 +654,6 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
int modifiers;
boolean popupTrigger = false;
int button=0;
boolean wheel_mouse = false;
int lbutton = xbe.get_button();
/*
* Ignore the buttons above 20 due to the bit limit for
@ -706,11 +706,6 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
}
button = XConstants.buttons[lbutton - 1];
// 4 and 5 buttons are usually considered assigned to a first wheel
if (lbutton == XConstants.buttons[3] ||
lbutton == XConstants.buttons[4]) {
wheel_mouse = true;
}
// mapping extra buttons to numbers starting from 4.
if ((button > XConstants.buttons[4]) && (!Toolkit.getDefaultToolkit().areExtraMouseButtonsEnabled())){
@ -720,9 +715,9 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
if (button > XConstants.buttons[4]){
button -= 2;
}
modifiers = getModifiers(xbe.get_state(),button,0, type, wheel_mouse);
modifiers = getModifiers(xbe.get_state(),button,0);
if (!wheel_mouse) {
if (!isWheel(lbutton)) {
MouseEvent me = new MouseEvent(getEventSource(),
type == XConstants.ButtonPress ? MouseEvent.MOUSE_PRESSED : MouseEvent.MOUSE_RELEASED,
jWhen,modifiers, x, y,

132
jdk/test/java/awt/event/MouseWheelEvent/WheelModifier/WheelModifier.java Normal file
View File

@ -0,0 +1,132 @@
/*
* Copyright (c) 2015, 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 8041470
@summary JButtons stay pressed after they have lost focus if you use the mouse wheel
@author Anton Nashatyrev
*/
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.util.concurrent.CountDownLatch;
public class WheelModifier {
JFrame f;
JButton fb;
CountDownLatch pressSema = new CountDownLatch(1);
CountDownLatch exitSema = new CountDownLatch(1);
CountDownLatch releaseSema = new CountDownLatch(1);
volatile CountDownLatch wheelSema;
void createGui() {
f = new JFrame("frame");
fb = new JButton("frame_button");
fb.addMouseListener(new MouseAdapter() {
@Override
public void mouseReleased(MouseEvent e) {
System.out.println("WheelModifier.mouseReleased: " + e);
releaseSema.countDown();
}
@Override
public void mouseEntered(MouseEvent e) {
System.out.println("WheelModifier.mouseEntered: " + e);
}
@Override
public void mouseExited(MouseEvent e) {
System.out.println("WheelModifier.mouseExited: " + e);
exitSema.countDown();
}
@Override
public void mousePressed(MouseEvent e) {
System.out.println("WheelModifier.mousePressed: " + e);
pressSema.countDown();
}
@Override
public void mouseDragged(MouseEvent e) {
System.out.println("WheelModifier.mouseDragged: " + e);
}
});
Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener() {
@Override
public void eventDispatched(AWTEvent event) {
System.out.println("WheelModifier.mouseWheel: " + event);
wheelSema.countDown();
}
}, MouseEvent.MOUSE_WHEEL_EVENT_MASK);
f.setLayout(new FlowLayout());
f.add(fb);
f.setSize(200, 200);
f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
f.setVisible(true);
}
void run() throws Exception {
Robot r = new Robot();
r.waitForIdle();
System.out.println("# Started");
Point sLoc = fb.getLocationOnScreen();
Dimension bSize = fb.getSize();
r.mouseMove(sLoc.x + bSize.width / 2, sLoc.y + bSize.height / 2);
r.mousePress(MouseEvent.BUTTON1_MASK);
pressSema.await();
System.out.println("# Pressed");
r.mouseMove(sLoc.x + bSize.width / 2, sLoc.y + bSize.height * 2);
exitSema.await();
System.out.println("# Exited");
wheelSema = new CountDownLatch(1);
r.mouseWheel(1);
wheelSema.await();
System.out.println("# Wheeled 1");
wheelSema = new CountDownLatch(1);
r.mouseWheel(-1);
wheelSema.await();
System.out.println("# Wheeled 2");
r.mouseRelease(MouseEvent.BUTTON1_MASK);
releaseSema.await();
System.out.println("# Released!");
}
public static void main(String[] args) throws Exception {
WheelModifier test = new WheelModifier();
SwingUtilities.invokeAndWait(() -> test.createGui());
test.run();
System.out.println("Done.");
}
}