diff options
author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2005-08-18 01:21:59 +0000 |
---|---|---|
committer | Thomas Fitzsimmons <fitzsim@redhat.com> | 2005-08-18 01:21:59 +0000 |
commit | e9438334943449d2941b4da0f8a402ca73a27437 (patch) | |
tree | 2a53853f1908e5f444961fe865df2fbdc059702b /include | |
parent | a65d9284f44e5a09ff254a9b5af59d848a6b3b76 (diff) | |
download | classpath-e9438334943449d2941b4da0f8a402ca73a27437.tar.gz |
2005-08-17 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkFramePeer.java,
gnu_java_awt_peer_gtk_GtkFramePeer.c (postConfigureEvent): Prevent
callback calling back into peers.
(setBounds): Likewise.
(setMenuBarWidthUnlocked): New method.
* native/jni/gtk-peer/gtkpeer.h (cp_gtk_filedialog_init_jni):
Declare function.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
(gtkInit): Call cp_gtk_filedialog_init_jni.
(loadSystemColors): Work around deadlock.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c
(textcomponent_changed_cb): Don't release GDK lock.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c
(item_activate_cb): Don't release GDK lock.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c
(item_highlighted_cb): Don't release GDK lock.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(component_button_press_cb): Don't release GDK lock.
(component_button_release_cb): Likewise.
(component_motion_notify_cb): Likewise.
(component_enter_notify_cb): Likewise.
(component_leave_notify_cb): Likewise.
(component_expose_cb): Likewise.
(component_focus_in_cb): Likewise.
(component_focus_out_cb): Likewise.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
(block_expose_event_cb): Remove callback.
* gnu/java/awt/peer/gtk/GtkWindowPeer.java,
gnu_java_awt_peer_gtk_GtkWindowPeer.c (postConfigureEvent):
Prevent callback calling back into peers.
(setBounds): Likewise.
(nativeSetBoundsUnlocked): New method.
(setBoundsUnlocked): Likewise.
(nativeSetVisibleUnlocked): Likewise.
(setVisibleUnlocked): Likewise.
(window_delete_cb): Don't release GDK lock.
(window_destroy_cb): Likewise.
(window_show_cb): Likewise.
(window_active_state_change_cb): Likewise.
(window_focus_state_change_cb): Likewise.
(window_focus_in_cb): Likewise.
(window_focus_out_cb): Likewise.
(window_window_state_cb): Likewise.
(window_property_changed_cb): Likewise.
(realize_cb): Likewise.
* gnu/java/awt/peer/gtk/GtkToolkit.java (mainThread): New
variable.
* gnu/java/awt/peer/gtk/GtkFileDialogPeer.java,
gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (setVisible): Prevent
callback calling back into peers.
(filename_filter_cb): Don't release GDK lock.
(handle_response_cb): Likewise.
(cp_gtk_filedialog_init_jni): New function.
* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java (setState): Prevent
callback from calling back into peers.
(item_toggled_cb): Don't release GDK lock.
* gnu/java/awt/peer/gtk/GdkPixbufDecoder.java,
gnu_java_awt_peer_gtk_GdkPixbufDecoder.c (area_prepared_cb): Don't
release GDK lock.
(area_updated_cb): Likewise.
* gnu/java/awt/peer/gtk/GdkGraphics2D.java,
gnu_java_awt_peer_gtk_GdkGraphics2D.c (initStateUnlocked): New
method.
(cairoSurfaceSetFilterUnlocked): Likewise.
(initComponentGraphics2DUnlocked): Likewise.
(setTexturePixelsUnlocked): Likewise.
(setGradientUnlocked): Likewise.
(cairoSetMatrixUnlocked): Likewise.
(cairoSetRGBAColorUnlocked): Likewise.
(cairoSetLineWidthUnlocked): Likewise.
(cairoSetLineCapUnlocked): Likewise.
(cairoSetLineJoinUnlocked): Likewise.
(cairoSetDashUnlocked): Likewise.
(cairoSetMiterLimitUnlocked): Likewise.
(setPaintUnlocked): Likewise.
(setTransformUnlocked): Likewise.
(setStrokeUnlocked): Likewise.
(setColorUnlocked): Likewise.
(setBackgroundUnlocked): Likewise.
(setRenderingHintsUnlocked): Likewise.
(setFontUnlocked): Likewise.
(realize_cb): Don't release GDK lock. Call
initComponentGraphics2DUnlocked.
* gnu/java/awt/peer/gtk/GdkGraphics.java,
gnu_java_awt_peer_gtk_GdkGraphics.c (initStateUnlocked): New
method.
(initComponentGraphicsUnlocked): New method.
(realize_cb): Don't release GDK lock. Call
initComponentGraphicsUnlocked.
* include/gnu_java_awt_peer_gtk_GdkGraphics.h: Regenerate.
* include/gnu_java_awt_peer_gtk_GdkGraphics2D.h: Likewise.
* include/gnu_java_awt_peer_gtk_GtkFramePeer.h: Likewise.
* include/gnu_java_awt_peer_gtk_GtkWindowPeer.h: Likewise.
Diffstat (limited to 'include')
-rw-r--r-- | include/gnu_java_awt_peer_gtk_GdkGraphics.h | 1 | ||||
-rw-r--r-- | include/gnu_java_awt_peer_gtk_GdkGraphics2D.h | 11 | ||||
-rw-r--r-- | include/gnu_java_awt_peer_gtk_GtkFramePeer.h | 1 | ||||
-rw-r--r-- | include/gnu_java_awt_peer_gtk_GtkWindowPeer.h | 2 |
4 files changed, 15 insertions, 0 deletions
diff --git a/include/gnu_java_awt_peer_gtk_GdkGraphics.h b/include/gnu_java_awt_peer_gtk_GdkGraphics.h index 009fa3fc9..427f0916d 100644 --- a/include/gnu_java_awt_peer_gtk_GdkGraphics.h +++ b/include/gnu_java_awt_peer_gtk_GdkGraphics.h @@ -12,6 +12,7 @@ extern "C" JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initStaticState (JNIEnv *env, jclass); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initState__Lgnu_java_awt_peer_gtk_GtkComponentPeer_2 (JNIEnv *env, jobject, jobject); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initStateUnlocked (JNIEnv *env, jobject, jobject); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initState__II (JNIEnv *env, jobject, jint, jint); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initFromImage (JNIEnv *env, jobject, jobject); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_copyState (JNIEnv *env, jobject, jobject); diff --git a/include/gnu_java_awt_peer_gtk_GdkGraphics2D.h b/include/gnu_java_awt_peer_gtk_GdkGraphics2D.h index 0f9d04fb7..2d29cfc73 100644 --- a/include/gnu_java_awt_peer_gtk_GdkGraphics2D.h +++ b/include/gnu_java_awt_peer_gtk_GdkGraphics2D.h @@ -11,28 +11,39 @@ extern "C" #endif JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initStaticState (JNIEnv *env, jclass); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initStateUnlocked (JNIEnv *env, jobject, jobject); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initState__Lgnu_java_awt_peer_gtk_GtkComponentPeer_2 (JNIEnv *env, jobject, jobject); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initState__II (JNIEnv *env, jobject, jint, jint); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initState___3III (JNIEnv *env, jobject, jintArray, jint, jint); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_copyState (JNIEnv *env, jobject, jobject); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_dispose (JNIEnv *env, jobject); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSurfaceSetFilter (JNIEnv *env, jobject, jint); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSurfaceSetFilterUnlocked (JNIEnv *env, jobject, jint); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_connectSignals (JNIEnv *env, jobject, jobject); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_gdkDrawDrawable (JNIEnv *env, jobject, jobject, jint, jint); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_drawPixels (JNIEnv *env, jobject, jintArray, jint, jint, jint, jdoubleArray); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setTexturePixelsUnlocked (JNIEnv *env, jobject, jintArray, jint, jint, jint); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setTexturePixels (JNIEnv *env, jobject, jintArray, jint, jint, jint); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setGradient (JNIEnv *env, jobject, jdouble, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint, jint, jint, jboolean); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setGradientUnlocked (JNIEnv *env, jobject, jdouble, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint, jint, jint, jboolean); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSave (JNIEnv *env, jobject); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoRestore (JNIEnv *env, jobject); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMatrix (JNIEnv *env, jobject, jdoubleArray); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMatrixUnlocked (JNIEnv *env, jobject, jdoubleArray); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetOperator (JNIEnv *env, jobject, jint); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetRGBAColor (JNIEnv *env, jobject, jdouble, jdouble, jdouble, jdouble); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetRGBAColorUnlocked (JNIEnv *env, jobject, jdouble, jdouble, jdouble, jdouble); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetFillRule (JNIEnv *env, jobject, jint); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineWidth (JNIEnv *env, jobject, jdouble); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineWidthUnlocked (JNIEnv *env, jobject, jdouble); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineCap (JNIEnv *env, jobject, jint); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineCapUnlocked (JNIEnv *env, jobject, jint); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineJoin (JNIEnv *env, jobject, jint); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineJoinUnlocked (JNIEnv *env, jobject, jint); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetDash (JNIEnv *env, jobject, jdoubleArray, jint, jdouble); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetDashUnlocked (JNIEnv *env, jobject, jdoubleArray, jint, jdouble); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMiterLimit (JNIEnv *env, jobject, jdouble); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMiterLimitUnlocked (JNIEnv *env, jobject, jdouble); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoNewPath (JNIEnv *env, jobject); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoMoveTo (JNIEnv *env, jobject, jdouble, jdouble); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoLineTo (JNIEnv *env, jobject, jdouble, jdouble); diff --git a/include/gnu_java_awt_peer_gtk_GtkFramePeer.h b/include/gnu_java_awt_peer_gtk_GtkFramePeer.h index f3831312a..2095d421c 100644 --- a/include/gnu_java_awt_peer_gtk_GtkFramePeer.h +++ b/include/gnu_java_awt_peer_gtk_GtkFramePeer.h @@ -11,6 +11,7 @@ extern "C" #endif JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_getMenuBarHeight (JNIEnv *env, jobject, jobject); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_setMenuBarWidthUnlocked (JNIEnv *env, jobject, jobject, jint); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_setMenuBarWidth (JNIEnv *env, jobject, jobject, jint); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_setMenuBarPeer (JNIEnv *env, jobject, jobject); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_removeMenuBarPeer (JNIEnv *env, jobject); diff --git a/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h b/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h index 5d3f132ea..eb4ccaf0c 100644 --- a/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h +++ b/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h @@ -19,8 +19,10 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectSignals ( JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_toBack (JNIEnv *env, jobject); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_toFront (JNIEnv *env, jobject); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_nativeSetBounds (JNIEnv *env, jobject, jint, jint, jint, jint); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_nativeSetBoundsUnlocked (JNIEnv *env, jobject, jint, jint, jint, jint); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_setSize (JNIEnv *env, jobject, jint, jint); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_nativeSetVisible (JNIEnv *env, jobject, jboolean); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_nativeSetVisibleUnlocked (JNIEnv *env, jobject, jboolean); #undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_NORMAL #define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_NORMAL 0L #undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DIALOG |