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

6624085: Fourth mouse button (wheel) is treated like second button - isPopupTrigger returns true

Browse Source 
Reviewed-by: anthony, azvegint
This commit is contained in:
Alex Henrie 2014-08-29 15:27:29 +04:00 committed by Alexander Zvegintsev
parent 11492e4215
commit e4ff32f580
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,6 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
*/
private final static int AWT_MULTICLICK_SMUDGE = 4;
// ButtonXXX events stuff
static int rbutton = 0;
static int lastX = 0, lastY = 0;
static long lastTime = 0;
static long lastButton = 0;
@ -632,23 +631,6 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
return res;
}
/**
* Returns true if this event is disabled and shouldn't be passed to Java.
* Default implementation returns false for all events.
*/
static int getRightButtonNumber() {
if (rbutton == 0) { // not initialized yet
XToolkit.awtLock();
try {
rbutton = XlibWrapper.XGetPointerMapping(XToolkit.getDisplay(), XlibWrapper.ibuffer, 3);
}
finally {
XToolkit.awtUnlock();
}
}
return rbutton;
}
static int getMouseMovementSmudge() {
//TODO: It's possible to read corresponding settings
return AWT_MULTICLICK_SMUDGE;
@ -716,11 +698,7 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
/*
Check for popup trigger !!
*/
if (lbutton == getRightButtonNumber() || lbutton > 2) {
popupTrigger = true;
} else {
popupTrigger = false;
}
popupTrigger = (lbutton == 3);
}
button = XConstants.buttons[lbutton - 1];