diff options
Diffstat (limited to 'libjava/jni')
11 files changed, 82 insertions, 104 deletions
diff --git a/libjava/jni/classpath/jcl.c b/libjava/jni/classpath/jcl.c index 629d071..8cb132e 100644 --- a/libjava/jni/classpath/jcl.c +++ b/libjava/jni/classpath/jcl.c @@ -1,5 +1,5 @@ /* jcl.c - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,7 +37,7 @@ exception statement from your version. */ #include <stdio.h> #include <jcl.h> -#include <malloc.h> +#include <stdlib.h> #ifndef __GNUC__ #define __attribute__(x) /* nothing */ diff --git a/libjava/jni/classpath/jnilink.c b/libjava/jni/classpath/jnilink.c index 0c244f2..d926541 100644 --- a/libjava/jni/classpath/jnilink.c +++ b/libjava/jni/classpath/jnilink.c @@ -1,5 +1,5 @@ /* JNILINK 1.1: JNI version. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,7 +40,7 @@ exception statement from your version. */ #include <string.h> #include <jcl.h> -#include <malloc.h> +#include <stdlib.h> #define GETCLASS(c) *(jclass*)(c) diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c index f8ee342..a161ba4 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c @@ -145,7 +145,7 @@ grab_current_drawable (GtkWidget *widget, GdkDrawable **draw, GdkWindow **win) } *draw = *win; - gdk_window_get_internal_paint_info (*win, draw, 0, 0); + gdk_window_get_internal_paint_info (*win, draw, 0, 0); g_object_ref (*draw); } @@ -349,7 +349,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initState__II if (gr->debug) printf ("constructing offscreen drawable of size (%d,%d)\n", width, height); - + gr->drawable = (GdkDrawable *) gdk_pixmap_new (NULL, width, height, gdk_rgb_get_visual ()->depth); g_assert (gr->drawable != NULL); @@ -371,9 +371,12 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initState__II JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_gdkDrawDrawable (JNIEnv *env, jobject self, jobject other, jint x, jint y) { + GdkRectangle clipRect; struct graphics2d *src = NULL, *dst = NULL; gint s_height, s_width, d_height, d_width, height, width; + cairo_matrix_t *matrix; GdkGC *gc; + cairo_operator_t tmp_op; src = (struct graphics2d *)NSA_GET_G2D_PTR (env, other); dst = (struct graphics2d *)NSA_GET_G2D_PTR (env, self); @@ -386,19 +389,33 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_gdkDrawDrawable gdk_drawable_get_size (src->drawable, &s_width, &s_height); gdk_drawable_get_size (dst->drawable, &d_width, &d_height); width = min (s_width, d_width); - height = min (s_width, d_height); + height = min (s_height, d_height); + gdk_threads_leave (); - gc = gdk_gc_new (dst->drawable); - g_assert (gc != NULL); + begin_drawing_operation(dst); - gdk_draw_drawable(dst->drawable, gc, src->drawable, - 0, 0, x, y, width, height); - gdk_flush (); + matrix = cairo_matrix_create (); + cairo_surface_get_matrix (src->surface, matrix); + cairo_matrix_translate (matrix, (double)-x, (double)-y); + cairo_surface_set_matrix (src->surface, matrix); - g_object_unref (gc); + tmp_op = cairo_current_operator (dst->cr); + cairo_set_operator(dst->cr, CAIRO_OPERATOR_SRC); + cairo_show_surface (dst->cr, src->surface, width, height); + cairo_set_operator(dst->cr, tmp_op); - if (src->debug) printf ("copied %d x %d pixels from offscreen drawable\n", width, height); + cairo_matrix_translate (matrix, (double)x, (double)y); + cairo_surface_set_matrix (src->surface, matrix); + cairo_matrix_destroy (matrix); + + end_drawing_operation(dst); + + gdk_threads_enter (); + gdk_flush (); gdk_threads_leave (); + + if (src->debug) printf ("copied %d x %d pixels from offscreen drawable\n", width, height); + } static jintArray @@ -1215,7 +1232,8 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoClip gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); if (gr->debug) printf ("cairo_clip\n"); - cairo_clip (gr->cr); + cairo_init_clip (gr->cr); + cairo_clip (gr->cr); } JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSurfaceSetFilter diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c index cc586a0..9b262d3 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c @@ -249,9 +249,10 @@ static void item_activate (GtkItem *item __attribute__((unused)), struct item_event_hook_info *ie) { + jstring label; gdk_threads_leave (); - jstring label = (*gdk_env)->NewStringUTF (gdk_env, ie->label); + label = (*gdk_env)->NewStringUTF (gdk_env, ie->label); (*gdk_env)->CallVoidMethod (gdk_env, ie->peer_obj, choicePostItemEventID, label, diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c index 3bb957c..62866d5 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c @@ -136,7 +136,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_requestFocus ptr = NSA_GET_PTR (env, obj); gdk_threads_enter (); - gtk_widget_grab_focus (GTK_WIDGET (ptr)); + // gtk_widget_grab_focus (GTK_WIDGET (ptr)); gdk_threads_leave (); } @@ -386,7 +386,6 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkSetFont { const char *font_name; void *ptr; - GtkWidget *label; PangoFontDescription *font_desc; ptr = NSA_GET_PTR (env, obj); @@ -632,12 +631,13 @@ filter_expose_event_handler (GtkWidget *widget, GdkEvent *event, jobject peer) JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter (JNIEnv *env, jobject obj) { - void *ptr = NSA_GET_PTR (env, obj); - jobject *gref = NSA_GET_GLOBAL_REF (env, obj); - g_assert (gref); GtkObject *filterobj; GtkWidget *vbox, *layout; GList *children; + void *ptr = NSA_GET_PTR (env, obj); + jobject *gref = NSA_GET_GLOBAL_REF (env, obj); + + g_assert (gref); gdk_threads_enter (); @@ -675,12 +675,13 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilt JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter (JNIEnv *env, jobject obj) { - void *ptr = NSA_GET_PTR (env, obj); - jobject *gref = NSA_GET_GLOBAL_REF (env, obj); - g_assert (gref); GtkObject *filterobj; GtkWidget *vbox, *layout; GList *children; + void *ptr = NSA_GET_PTR (env, obj); + jobject *gref = NSA_GET_GLOBAL_REF (env, obj); + + g_assert (gref); gdk_threads_enter (); diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c index 9e84dde..9b9a3dd 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c @@ -186,6 +186,7 @@ ok_clicked (GtkButton *button __attribute__((unused)), static jmethodID hideID; void *ptr; G_CONST_RETURN gchar *fileName; + jstring str_fileName; ptr = NSA_GET_PTR (gdk_env, peer_obj); @@ -204,7 +205,7 @@ ok_clicked (GtkButton *button __attribute__((unused)), gdk_threads_leave (); /* Set the Java object field 'file' with this value. */ - jstring str_fileName = (*gdk_env)->NewStringUTF (gdk_env, fileName); + str_fileName = (*gdk_env)->NewStringUTF (gdk_env, fileName); (*gdk_env)->CallVoidMethod (gdk_env, peer_obj, gtkSetFilenameID, str_fileName); /* We can hide the dialog now (and unblock show) */ diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c index 48509a5..8034f64 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c @@ -66,7 +66,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_addMenu menu = NSA_GET_PTR (env, menupeer); gdk_threads_enter (); - gtk_menu_bar_append (GTK_MENU_BAR (mbar), GTK_WIDGET (menu)); + gtk_menu_shell_append (GTK_MENU_SHELL (mbar), GTK_WIDGET (menu)); gdk_threads_leave (); } diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c index 4984760..70fc809 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c @@ -41,18 +41,16 @@ exception statement from your version. */ #include "gnu_java_awt_peer_gtk_GtkComponentPeer.h" static void item_activate (GtkMenuItem *item __attribute__((unused)), - jobject *peer_obj); + jobject peer_obj); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_create (JNIEnv *env, jobject obj, jstring label) { GtkWidget *widget; const char *str; - jobject *gref; /* Create global reference and save it for future use */ NSA_SET_GLOBAL_REF (env, obj); - gref = NSA_GET_GLOBAL_REF (env, obj); str = (*env)->GetStringUTFChars (env, label, NULL); @@ -63,10 +61,6 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_create else widget = gtk_menu_item_new_with_label (str); - /* Connect activate hook */ - g_signal_connect (G_OBJECT (widget), "activate", - GTK_SIGNAL_FUNC (item_activate), *gref); - gtk_widget_show (widget); gdk_threads_leave (); @@ -76,6 +70,22 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_create NSA_SET_PTR (env, obj, widget); } +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_connectSignals + (JNIEnv *env, jobject obj) +{ + void *ptr = NSA_GET_PTR (env, obj); + jobject *gref = NSA_GET_GLOBAL_REF (env, obj); + g_assert (gref); + + gdk_threads_enter (); + + g_signal_connect (G_OBJECT (ptr), "activate", + G_CALLBACK (item_activate), *gref); + + gdk_threads_leave (); +} + JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_setLabel (JNIEnv *env, jobject obj, jstring label) { @@ -104,9 +114,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_setLabel } static void -item_activate (GtkMenuItem *item __attribute__((unused)), jobject *peer_obj) +item_activate (GtkMenuItem *item __attribute__((unused)), jobject peer_obj) { - (*gdk_env)->CallVoidMethod (gdk_env, *peer_obj, + (*gdk_env)->CallVoidMethod (gdk_env, peer_obj, postMenuActionEventID); } diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c index 63e6a74..94ebc7f 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c @@ -101,10 +101,21 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_create menu = gtk_menu_new (); - menu_title = gtk_menu_item_new_with_label (str); + if (str != NULL) + menu_title = gtk_menu_item_new_with_label (str); + else + menu_title = gtk_menu_item_new(); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_title), menu); - gtk_widget_show (menu); + // Allow this menu to grab the pointer. + GtkWidget *toplevel = gtk_widget_get_toplevel (menu); + if (GTK_IS_WINDOW (toplevel)) + { + gtk_window_group_add_window (global_gtk_window_group, + GTK_WINDOW(toplevel)); + } + gtk_widget_show (menu_title); NSA_SET_PTR (env, obj, menu_title); @@ -125,8 +136,8 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_addItem gdk_threads_enter (); - menu = GTK_MENU (GTK_MENU_ITEM (ptr1)->submenu); - gtk_menu_append (menu, GTK_WIDGET (ptr2)); + menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(ptr1)); + gtk_menu_shell_append (GTK_MENU_SHELL(menu), GTK_WIDGET (ptr2)); if (key) { diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c index 62fff4d..ca57643 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c @@ -58,14 +58,6 @@ Java_gnu_java_awt_peer_gtk_GtkPanelPeer_create NSA_SET_PTR (env, obj, widget); } -typedef struct _GtkLayoutChild GtkLayoutChild; - -struct _GtkLayoutChild { - GtkWidget *widget; - gint x; - gint y; -}; - JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPanelPeer_connectJObject (JNIEnv *env, jobject obj) @@ -80,59 +72,3 @@ Java_gnu_java_awt_peer_gtk_GtkPanelPeer_connectJObject gdk_threads_leave (); } - -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkPanelPeer_connectSignals - (JNIEnv *env, jobject obj) -{ - void *ptr = NSA_GET_PTR (env, obj); - jobject *gref = NSA_GET_GLOBAL_REF (env, obj); - g_assert (gref); - - gdk_threads_enter (); - gtk_widget_realize (GTK_WIDGET (ptr)); - - /* FIXME: If we don't need this then remove this method. */ -/* g_signal_connect (G_OBJECT (ptr), "size_request", GTK_SIGNAL_FUNC (sr), */ -/* NULL); */ - gdk_threads_leave (); - - /* Connect the superclass signals. */ - Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (env, obj); -} - -/* FIXME: The following doesn't seem to be used. - Is not declared as a native function in GtkPanelPeer.java */ -/* - * Make a new panel. - */ -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkPanelPeer_gtkPanelNew - (JNIEnv *env, jobject obj, jobject parent_obj) -{ - GtkWidget *layout; - void *parent; - - /* Create global reference and save it for future use */ - NSA_SET_GLOBAL_REF (env, obj); - - parent = NSA_GET_PTR (env, parent_obj); - - gdk_threads_enter (); - - layout = gtk_layout_new (NULL, NULL); - - set_parent (layout, GTK_CONTAINER (parent)); - - gtk_widget_realize (layout); - - connect_awt_hook (env, obj, 1, GTK_LAYOUT (layout)->bin_window); - - set_visible (layout, 1); - - gdk_threads_leave (); - - NSA_SET_PTR (env, obj, layout); -} - - diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c index c5a2230..4bc6973 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c @@ -72,7 +72,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_show gdk_threads_enter (); gtk_menu_popup (GTK_MENU (GTK_MENU_ITEM (ptr)->submenu), - NULL, NULL, menu_pos, p, 3, time); + NULL, NULL, menu_pos, p, 0, time); gdk_threads_leave (); g_free (p); |