< prev index next >
src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c
Print this page
@@ -581,13 +581,13 @@
JNIEXPORT jlong JNICALL Java_sun_awt_X11_XlibWrapper_XkbGetMap
(JNIEnv *env, jclass clazz, jlong display, jlong which, jlong device_spec)
{
AWT_CHECK_HAVE_LOCK_RETURN(0);
- return (jlong) XkbGetMap( (Display *) jlong_to_ptr(display),
+ return ptr_to_jlong(XkbGetMap( (Display *) jlong_to_ptr(display),
(unsigned int) which,
- (unsigned int) device_spec);
+ (unsigned int) device_spec));
}
JNIEXPORT jlong JNICALL Java_sun_awt_X11_XlibWrapper_XkbGetUpdatedMap
(JNIEnv *env, jclass clazz, jlong display, jlong which, jlong xkb)
{
AWT_CHECK_HAVE_LOCK_RETURN(0);
@@ -604,11 +604,11 @@
JNIEXPORT jboolean JNICALL Java_sun_awt_X11_XlibWrapper_XkbTranslateKeyCode
(JNIEnv *env, jclass clazz, jlong xkb, jint keycode, jlong mods, jlong mods_rtrn, jlong keysym_rtrn)
{
AWT_CHECK_HAVE_LOCK_RETURN(JNI_FALSE);
Bool b;
- b = XkbTranslateKeyCode((XkbDescPtr)xkb, (unsigned int)keycode, (unsigned int)mods,
+ b = XkbTranslateKeyCode((XkbDescPtr)jlong_to_ptr(xkb), (unsigned int)keycode, (unsigned int)mods,
(unsigned int *)jlong_to_ptr(mods_rtrn),
(KeySym *)jlong_to_ptr(keysym_rtrn));
//printf("native, input: keycode:0x%0X; mods:0x%0X\n", keycode, mods);
//printf("native, output: keysym:0x%0X; mods:0x%0X\n",
// *(unsigned int *)jlong_to_ptr(keysym_rtrn),
@@ -2219,14 +2219,14 @@
if (isCopy) {
(*env)->ReleaseLongArrayElements(env, array, longs, JNI_ABORT);
}
}
-JNIEXPORT jint JNICALL
+JNIEXPORT jlong JNICALL
Java_sun_awt_X11_XlibWrapper_XSynchronize(JNIEnv *env, jclass clazz, jlong display, jboolean onoff)
{
- return (jint) XSynchronize((Display*)jlong_to_ptr(display), (onoff == JNI_TRUE ? True : False));
+ return ptr_to_jlong(XSynchronize((Display*)jlong_to_ptr(display), (onoff == JNI_TRUE ? True : False)));
}
JNIEXPORT jboolean JNICALL
Java_sun_awt_X11_XlibWrapper_XShapeQueryExtension
(JNIEnv *env, jclass clazz, jlong display, jlong event_base_return, jlong error_base_return)
< prev index next >