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

6755110: Solaris build has corrupted with extra mouse buttons RFE

Browse Source 
Reviewed-by: yan
This commit is contained in:
Andrei Dmitriev 2008-10-03 10:33:11 +04:00
parent 3588eee6c0
commit bfec071cbf
1 changed files with 14 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
jdk/src/solaris/native/sun/awt/awt_Robot.c
View File

@ -246,7 +246,7 @@ Java_sun_awt_X11_XRobotPeer_setup (JNIEnv * env, jclass cls) {
AWT_UNLOCK();
}
JNIEXPORT void JNICALL
JNIEXPORT jint JNICALL
Java_sun_awt_X11_XRobotPeer_getNumberOfButtonsImpl(JNIEnv *env,
jclass cls) {
// At the moment this routine being called we already should have an initialized num_buttons variable.
@ -376,60 +376,6 @@ Java_sun_awt_X11_XRobotPeer_mouseMoveImpl (JNIEnv *env,
AWT_UNLOCK();
}
JNIEXPORT void JNICALL
Java_sun_awt_X11_XRobotPeer_mousePressImpl (JNIEnv *env,
jclass cls,
jint buttonMask) {
mouseAction(env, cls, buttonMask, True);
/*
AWT_LOCK();
DTRACE_PRINTLN1("RobotPeer: mousePressImpl(%i)", buttonMask);
if (buttonMask & java_awt_event_InputEvent_BUTTON1_MASK) {
XTestFakeButtonEvent(awt_display, 1, True, CurrentTime);
}
if ((buttonMask & java_awt_event_InputEvent_BUTTON2_MASK) &&
(num_buttons >= 2)) {
XTestFakeButtonEvent(awt_display, 2, True, CurrentTime);
}
if ((buttonMask & java_awt_event_InputEvent_BUTTON3_MASK) &&
(num_buttons >= 3)) {
XTestFakeButtonEvent(awt_display, 3, True, CurrentTime);
}
XSync(awt_display, False);
AWT_UNLOCK();
*/
}
JNIEXPORT void JNICALL
Java_sun_awt_X11_XRobotPeer_mouseReleaseImpl (JNIEnv *env,
jclass cls,
jint buttonMask) {
mouseAction(env, cls, buttonMask, False);
/*
AWT_LOCK();
DTRACE_PRINTLN1("RobotPeer: mouseReleaseImpl(%i)", buttonMask);
if (buttonMask & java_awt_event_InputEvent_BUTTON1_MASK) {
XTestFakeButtonEvent(awt_display, 1, False, CurrentTime);
}
if ((buttonMask & java_awt_event_InputEvent_BUTTON2_MASK) &&
(num_buttons >= 2)) {
XTestFakeButtonEvent(awt_display, 2, False, CurrentTime);
}
if ((buttonMask & java_awt_event_InputEvent_BUTTON3_MASK) &&
(num_buttons >= 3)) {
XTestFakeButtonEvent(awt_display, 3, False, CurrentTime);
}
XSync(awt_display, False);
AWT_UNLOCK();
*/
}
/*
* Function joining the code of mousePressImpl and mouseReleaseImpl
*/
@ -477,6 +423,19 @@ void mouseAction(JNIEnv *env,
AWT_UNLOCK();
}
JNIEXPORT void JNICALL
Java_sun_awt_X11_XRobotPeer_mousePressImpl (JNIEnv *env,
jclass cls,
jint buttonMask) {
mouseAction(env, cls, buttonMask, True);
}
JNIEXPORT void JNICALL
Java_sun_awt_X11_XRobotPeer_mouseReleaseImpl (JNIEnv *env,
jclass cls,
jint buttonMask) {
mouseAction(env, cls, buttonMask, False);
}
JNIEXPORT void JNICALL
Java_sun_awt_X11_XRobotPeer_mouseWheelImpl (JNIEnv *env,