infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-16 05:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

8130471: [Regression] Test java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Extra.java fails

Browse Source 
Reviewed-by: alexsch, serb
This commit is contained in:
Semyon Sadetsky 2015-09-16 10:16:16 +03:00
parent 31f16f421e
commit 265ab8bd4c
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -572,6 +572,14 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
}
static int getModifiers(int state, int button, int keyCode) {
return getModifiers(state, button, keyCode, false);
}
static int getWheelModifiers(int state, int button) {
return getModifiers(state, button, 0, true);
}
private static int getModifiers(int state, int button, int keyCode, boolean isWheelMouse) {
int modifiers = 0;
if (((state & XConstants.ShiftMask) != 0) ^ (keyCode == KeyEvent.VK_SHIFT)) {
@ -602,7 +610,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 (!isWheel(XConstants.buttons[i])) {
if (!isWheelMouse || !isWheel(XConstants.buttons[i])) {
modifiers |= InputEvent.getMaskForButton(i+1);
}
}
@ -715,9 +723,9 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
if (button > XConstants.buttons[4]){
button -= 2;
}
modifiers = getModifiers(xbe.get_state(),button,0);
if (!isWheel(lbutton)) {
modifiers = getModifiers(xbe.get_state(), button, 0);
MouseEvent me = new MouseEvent(getEventSource(),
type == XConstants.ButtonPress ? MouseEvent.MOUSE_PRESSED : MouseEvent.MOUSE_RELEASED,
jWhen,modifiers, x, y,
@ -743,6 +751,7 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
}
else {
modifiers = getWheelModifiers(xbe.get_state(), button);
if (xev.get_type() == XConstants.ButtonPress) {
MouseWheelEvent mwe = new MouseWheelEvent(getEventSource(),MouseEvent.MOUSE_WHEEL, jWhen,
modifiers,