diff options
Diffstat (limited to 'native/jni')
24 files changed, 92 insertions, 222 deletions
diff --git a/native/jni/gtk-peer/GtkDragSourceContextPeer.c b/native/jni/gtk-peer/GtkDragSourceContextPeer.c index c1c4bfda8..98c75a2ea 100644 --- a/native/jni/gtk-peer/GtkDragSourceContextPeer.c +++ b/native/jni/gtk-peer/GtkDragSourceContextPeer.c @@ -161,7 +161,6 @@ Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeSetCursor gdk_cursor = gdk_cursor_new (gdk_cursor_type); gdk_window_set_cursor (win, gdk_cursor); - //gdk_cursor_unref (gdk_cursor); g_object_unref(gdk_cursor); gdk_flush(); diff --git a/native/jni/gtk-peer/Makefile.am b/native/jni/gtk-peer/Makefile.am index 0042f1dc5..57a0b4d6f 100644 --- a/native/jni/gtk-peer/Makefile.am +++ b/native/jni/gtk-peer/Makefile.am @@ -61,7 +61,8 @@ AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ \ @X_CFLAGS@ @EXTRA_CFLAGS@ \ "-DGTK_DISABLE_SINGLE_INCLUDES" \ "-DGDK_DISABLE_DEPRECATED" \ - "-DGSEAL_ENABLE" + "-DGSEAL_ENABLE" \ + "-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4" diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c index 23340fb5b..fea17e7ac 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c @@ -121,6 +121,7 @@ Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface jlong surfacePointer, jlong context, jdoubleArray java_matrix, double alpha, jint interpolation) { + struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, context); cairo_t *cr = gr->cr; jdouble *native_matrix = NULL; @@ -181,8 +182,7 @@ JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_getFlippedBuffer (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), jlong surfacePointer) -{ - cairo_surface_t* surface; +{ cairo_surface_t* surface; jint *src; jint *dst; int i, t, width, height; diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c index 6ee8e9053..8f16b45db 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c @@ -38,10 +38,10 @@ exception statement from your version. */ #include "jcl.h" #include "gtkpeer.h" -//#include <gdk/gdktypes.h> + #include <gdk/gdk.h> -//#include <gdk/gdkprivate.h> + #include <gdk/gdkx.h> #include <gdk-pixbuf/gdk-pixbuf.h> @@ -63,6 +63,8 @@ exception statement from your version. */ static short flush_scheduled = 0; + + static gboolean flush (gpointer data __attribute__((unused))) { gdk_threads_enter(); @@ -97,8 +99,7 @@ void cp_gtk_grab_current_drawable(GtkWidget *widget, GdkDrawable **draw, g_assert (draw != NULL); g_assert (win != NULL); - //*win = widget->window; - *win = gtk_widget_get_window(widget); + *win = gtk_widget_get_window(widget); *draw = *win; gdk_window_get_internal_paint_info (*win, draw, 0, 0); @@ -107,7 +108,7 @@ void cp_gtk_grab_current_drawable(GtkWidget *widget, GdkDrawable **draw, void cp_gtk_grab_current_drawable(GtkWidget *widget, GdkWindow **win) { - //printf("\ncp_gtk_current_drawable\n"); + g_assert (widget != NULL); g_assert (win != NULL); @@ -126,11 +127,10 @@ JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_hasXRender (JNIEnv *env __attribute__ ((unused)), jclass cls __attribute__ ((unused))) { - //printf(" \n hasXRenderCall \n"); + #if HAVE_XRENDER int ev = 0, err = 0; - //if( XRenderQueryExtension (GDK_DISPLAY(), &ev, &err) ) - if( XRenderQueryExtension (gdk_x11_get_default_xdisplay (), &ev, &err) ) + if( XRenderQueryExtension (gdk_x11_get_default_xdisplay (), &ev, &err) ) return JNI_TRUE; #endif @@ -148,14 +148,13 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState void *ptr; gdk_threads_enter(); - + ptr = gtkpeer_get_widget (env, peer); g_assert (ptr != NULL); widget = GTK_WIDGET (ptr); g_assert (widget != NULL); - //drawable = widget->window; drawable = gtk_widget_get_window(widget); g_assert (drawable != NULL); @@ -168,18 +167,19 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState return PTR_TO_JLONG(cr); } #elif GTK_MAJOR_VERSION == 3 + JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState (JNIEnv *env, jobject obj __attribute__ ((unused)), jobject peer) { - //printf("\nComponent Graphics Init State\n"); + GdkWindow *drawable; GtkWidget *widget; cairo_t *cr; void *ptr; gdk_threads_enter(); - + ptr = gtkpeer_get_widget (env, peer); g_assert (ptr != NULL); @@ -192,12 +192,14 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState cr = gdk_cairo_create(drawable); - //g_assert(cr != NULL); + g_assert(cr != NULL); gdk_threads_leave(); return PTR_TO_JLONG(cr); } + + #endif JNIEXPORT jlong JNICALL @@ -205,7 +207,7 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphics_initFromVolatile (JNIEnv *env __attribute__ ((unused)), jobject obj __attribute__ ((unused)), jlong ptr) { - //printf("\n initFromVolatile \n"); + GdkWindow *drawable; @@ -279,7 +281,7 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphics_copyAreaNative (JNIEnv *env, jobject obj __attribute__((unused)), jobject peer, jint x, jint y, jint w, jint h, jint dx, jint dy) { - //printf("\ncopyAreaNative\n"); + GdkPixbuf *pixbuf; GdkWindow *win; GtkWidget *widget = NULL; @@ -313,7 +315,7 @@ JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_nativeGrab (JNIEnv *env, jclass cls __attribute__((unused)), jobject peer ) { - //printf("\nnativeGrab\n"); + GdkPixbuf *pixbuf; GdkWindow *win; gint w,h; @@ -370,7 +372,7 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphics_nativeGrab cp_gtk_grab_current_drawable (widget, &drawable, &win); g_assert (drawable != NULL); - //gdk_drawable_get_size ( drawable, &w, &h ); + w = gdk_window_get_width(drawable); h = gdk_window_get_height(drawable); @@ -379,10 +381,6 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphics_nativeGrab gdk_pixbuf_get_from_drawable( pixbuf, drawable, NULL, 0, 0, 0, 0, w, h ); g_object_ref( pixbuf ); - //gdk_draw_pixbuf (drawable, NULL, pixbuf, - // 0, 0, 0, 0, - // w, h, - // GDK_RGB_DITHER_NORMAL, 0, 0); cairo_t *cr = gdk_cairo_create (drawable); gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0); @@ -403,7 +401,6 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile { GdkPixmap *pixmap; GtkWidget *widget = NULL; - //GdkGC *gc; GdkRectangle clip; void *ptr; @@ -416,24 +413,17 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile pixmap = JLONG_TO_PTR(GdkPixmap, img); - //gc = gdk_gc_new(widget->window); + clip.x = cx; clip.y = cy; clip.width = cw; clip.height = ch; - //gdk_gc_set_clip_rectangle(gc, &clip); - - /*gdk_draw_drawable(widget->window, - gc, - pixmap, - 0, 0, - x, y, - w, h);*/ + w = w; h = h; - //cairo_t *cr = gdk_cairo_create (widget->window); + cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(widget)); gdk_cairo_rectangle (cr,&clip); cairo_clip (cr); @@ -447,7 +437,7 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile cairo_destroy (cr); - //g_object_unref( gc ); + schedule_flush (); @@ -459,10 +449,10 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile (JNIEnv *env, jobject obj __attribute__ ((unused)), jobject peer, jlong img, jint x, jint y, jint w, jint h, jint cx, jint cy, jint cw, jint ch) { - //printf("\ndrawVolatile\n"); + GdkPixbuf *pixbuf; GtkWidget *widget = NULL; - //GdkGC *gc; + GdkRectangle clip; void *ptr; diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c index f78662e2f..2c9013892 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c @@ -38,10 +38,10 @@ exception statement from your version. */ #include "jcl.h" #include "gtkpeer.h" -//#include <gdk/gdktypes.h> + #include <gdk/gdk.h> -//#include <gdk/gdkprivate.h> + #include <gdk/gdkx.h> #include <gdk-pixbuf/gdk-pixbuf.h> @@ -97,7 +97,7 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphicsCopy_getPixbuf (JNIEnv *env, jobject obj __attribute__((unused)), jobject peer, jobject image) { - //printf("\ngetPixbuf\n"); + gint width, height; GdkPixbuf *pixbuf; GdkWindow *win; @@ -112,8 +112,8 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphicsCopy_getPixbuf widget = GTK_WIDGET (ptr); g_assert (widget != NULL); - cp_gtk_grab_current_drawable (widget, &win); - + + win = gtk_widget_get_window(widget); pixbuf = cp_gtk_image_get_pixbuf( env, image ); g_assert( pixbuf != NULL); @@ -136,7 +136,7 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphicsCopy_copyPixbuf jint x __attribute__((unused)), jint y __attribute__((unused)), jint width __attribute__((unused)), jint height __attribute__((unused))) { - //gint pwidth, pheight; + GdkPixbuf *pixbuf; GdkDrawable *drawable; GdkWindow *win; @@ -157,14 +157,6 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphicsCopy_copyPixbuf pixbuf = cp_gtk_image_get_pixbuf( env, image ); g_assert( pixbuf != NULL); - //pwidth = gdk_pixbuf_get_width( pixbuf ); - //pheight = gdk_pixbuf_get_height( pixbuf ); - - //gdk_draw_pixbuf (drawable, NULL, pixbuf, - //0, 0, 0, 0, - //pwidth, pheight, - //GDK_RGB_DITHER_NORMAL, 0, 0); - cairo_t *cr = gdk_cairo_create (drawable); gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0); cairo_paint (cr); @@ -181,7 +173,7 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphicsCopy_copyPixbuf jint x __attribute__((unused)), jint y __attribute__((unused)), jint width __attribute__((unused)), jint height __attribute__((unused))) { - //printf("\ncopyPixbuf\n"); + GdkPixbuf *pixbuf; GdkWindow *win; @@ -196,8 +188,8 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphicsCopy_copyPixbuf widget = GTK_WIDGET (ptr); g_assert (widget != NULL); - cp_gtk_grab_current_drawable (widget, &win); + win = gtk_widget_get_window(widget); pixbuf = cp_gtk_image_get_pixbuf( env, image ); g_assert( pixbuf != NULL); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c index ee289f2ed..6b51e8a9b 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c @@ -306,9 +306,8 @@ Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_isWindowUnderMouse #endif while (windowAtPointer - //&& windowAtPointer != windowToTest->window) && windowAtPointer != gtk_widget_get_window(windowToTest)) - windowAtPointer = gdk_window_get_parent (windowAtPointer); + windowAtPointer = gdk_window_get_parent (windowAtPointer); gdk_threads_leave (); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c index 39eb9e1f1..22644b865 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c @@ -388,11 +388,6 @@ Java_gnu_java_awt_peer_gtk_GdkRobotPeer_nativeGetRGBPixels gdk_threads_enter (); - /*pixbuf_no_alpha = gdk_pixbuf_get_from_drawable (NULL, - gdk_get_default_root_window (), - NULL, x, y, 0, 0, - width, height);*/ - pixbuf_no_alpha = gdk_pixbuf_get_from_window(gdk_get_default_root_window(), x, y, width, height); pixbuf = gdk_pixbuf_add_alpha(pixbuf_no_alpha, FALSE, 0, 0, 0); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c index 3f9a2c66f..e49ee1779 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c @@ -104,19 +104,16 @@ Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkWidgetGetPreferredDimensions dims[0] = dims[1] = 0; #if GTK_MAJOR_VERSION == 3 /* Save the button's current size request. */ - //gtk_widget_size_request (GTK_WIDGET (button), ¤t_req); - gtk_widget_get_preferred_size(GTK_WIDGET(button), ¤t_req, NULL); + gtk_widget_get_preferred_size(GTK_WIDGET(button), ¤t_req, NULL); /* Save the label's current size request. */ - //gtk_widget_size_request (GTK_WIDGET (label), ¤t_label_req); gtk_widget_get_preferred_size(GTK_WIDGET(label), ¤t_label_req, NULL); /* Get the widget's "natural" size request. */ gtk_widget_set_size_request (GTK_WIDGET (button), -1, -1); gtk_widget_set_size_request (GTK_WIDGET (label), -1, -1); - //gtk_widget_size_request (GTK_WIDGET (button), &natural_req); - gtk_widget_get_preferred_size(GTK_WIDGET(button), NULL, &natural_req); + gtk_widget_get_preferred_size(GTK_WIDGET(button), NULL, &natural_req); /* Reset the button's size request. */ gtk_widget_set_size_request (GTK_WIDGET (button), @@ -126,7 +123,7 @@ Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkWidgetGetPreferredDimensions gtk_widget_set_size_request (GTK_WIDGET (label), current_label_req.width, current_label_req.height); #endif - //HERE + #if GTK_MAJOR_VERSION == 2 /* Save the button's current size request. */ gtk_widget_size_request (GTK_WIDGET (button), ¤t_req); @@ -339,7 +336,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkWidgetRequestFocus (JNIEnv *env, jobject obj) { -printf("THIS IS WHERE ITS FAILING"); + void *ptr; GtkWidget *button; @@ -381,9 +378,7 @@ Java_gnu_java_awt_peer_gtk_GtkButtonPeer_setNativeBounds /* ...and the label's size request. */ gtk_widget_set_size_request (gtk_bin_get_child (GTK_BIN (child)), width, height); - /*if (widget->parent != NULL && GTK_IS_FIXED (widget->parent)) - gtk_fixed_move (GTK_FIXED (widget->parent), widget, x, y);*/ - if (gtk_widget_get_parent(widget) != NULL && GTK_IS_FIXED (gtk_widget_get_parent(widget))) + if (gtk_widget_get_parent(widget) != NULL && GTK_IS_FIXED (gtk_widget_get_parent(widget))) gtk_fixed_move (GTK_FIXED (gtk_widget_get_parent(widget)), widget, x, y); } diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c index 96b015434..91bfcf06f 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c @@ -227,11 +227,6 @@ Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_createRadioButton if (g_slist_index (native_group, GTK_RADIO_BUTTON (button)) == -1) { native_group = g_slist_prepend (native_group, GTK_RADIO_BUTTON (button)); - //GTK_RADIO_BUTTON(button)->group = native_group; - - #if GTK_MAJOR_VERSION == 2 - gtk_radio_button_set_group(GTK_RADIO_BUTTON(button), native_group); - #endif } gtk_container_add (GTK_CONTAINER (eventbox), button); @@ -288,7 +283,6 @@ Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_addToGroup if (g_slist_index (native_group, GTK_RADIO_BUTTON (radio_button)) == -1) { native_group = g_slist_prepend (native_group, GTK_RADIO_BUTTON (radio_button)); - //GTK_RADIO_BUTTON(radio_button)->group = native_group; gtk_radio_button_set_group(GTK_RADIO_BUTTON(radio_button), native_group); } @@ -338,7 +332,6 @@ Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_removeFromGroup if (native_group && ! GTK_IS_RADIO_BUTTON (native_group->data)) native_group = NULL; - //GTK_RADIO_BUTTON(radio_button)->group = NULL; gtk_radio_button_set_group(GTK_RADIO_BUTTON(radio_button), NULL); gtk_container_remove (GTK_CONTAINER (container), radio_button); @@ -370,7 +363,6 @@ Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_switchToGroup native_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_button)); native_group = g_slist_remove (native_group, GTK_RADIO_BUTTON (radio_button)); - //GTK_RADIO_BUTTON(radio_button)->group = NULL; gtk_radio_button_set_group(GTK_RADIO_BUTTON(radio_button), NULL); if (groupPointer != 0) @@ -384,7 +376,6 @@ Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_switchToGroup if (g_slist_index (native_group, GTK_RADIO_BUTTON (radio_button)) == -1) { native_group = g_slist_prepend (native_group, GTK_RADIO_BUTTON (radio_button)); - //GTK_RADIO_BUTTON(radio_button)->group = native_group; gtk_radio_button_set_group(GTK_RADIO_BUTTON(radio_button), native_group); } @@ -401,8 +392,7 @@ item_toggled_cb (GtkToggleButton *item, jobject peer) (*cp_gtk_gdk_env())->CallVoidMethod (cp_gtk_gdk_env(), peer, postItemEventID, peer, - //item->active); - gtk_toggle_button_get_active(item)); + gtk_toggle_button_get_active(item)); } static GtkWidget * diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c index 0c09aa5dc..3b54e839d 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c @@ -92,7 +92,6 @@ Java_gnu_java_awt_peer_gtk_GtkClipboard_initNativeState (JNIEnv *env, jstring image, jstring files) { - //GdkDisplay* display; jboolean can_cache; gtk_clipboard_class = clz; @@ -137,7 +136,7 @@ Java_gnu_java_awt_peer_gtk_GtkClipboard_initNativeState (JNIEnv *env, cp_gtk_clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); cp_gtk_selection = gtk_clipboard_get (GDK_SELECTION_PRIMARY); - //display = gtk_clipboard_get_display (cp_gtk_clipboard); + /* Check for support for clipboard owner changes. */ #if GTK_MINOR_VERSION > 4 GdkDisplay* display; @@ -185,7 +184,6 @@ clipboard_get_func (GtkClipboard *clipboard, jint len; jbyte *barray; - //target_name = gdk_atom_name (selection->target); target_name = gdk_atom_name (gtk_selection_data_get_target(selection)); if (target_name == NULL) return; @@ -205,8 +203,7 @@ clipboard_get_func (GtkClipboard *clipboard, barray = (*env)->GetByteArrayElements(env, bytes, NULL); if (barray == NULL) return; - //gtk_selection_data_set (selection, selection->target, 8, - gtk_selection_data_set (selection, gtk_selection_data_get_target(selection), 8, + gtk_selection_data_set (selection, gtk_selection_data_get_target(selection), 8, (guchar *) barray, len); (*env)->ReleaseByteArrayElements(env, bytes, barray, 0); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c index 28a929165..813529e25 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c @@ -40,7 +40,7 @@ exception statement from your version. */ #include "gnu_java_awt_peer_gtk_GtkComponentPeer.h" #include <gtk/gtk.h> -//#include <gtk/gtkprivate.h> + #define AWT_DEFAULT_CURSOR 0 #define AWT_CROSSHAIR_CURSOR 1 @@ -208,7 +208,7 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetCursorUnlocked GdkWindow *win; GdkCursorType gdk_cursor_type; GdkCursor *gdk_cursor; - printf("THIS IS YOUR CURSOOOOOORRRRR!!!"); + ptr = gtkpeer_get_widget (env, obj); switch (type) @@ -258,10 +258,7 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetCursorUnlocked widget = get_widget(GTK_WIDGET(ptr)); - //win = widget->window; - //if ((widget->window) == NULL) - //win = GTK_WIDGET(ptr)->window; - + win = gtk_widget_get_window(widget); if ((gtk_widget_get_window(widget)) == NULL) win = gtk_widget_get_window(GTK_WIDGET(ptr)); @@ -304,7 +301,7 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetParent widget = GTK_WIDGET (ptr); parent_widget = get_widget(GTK_WIDGET (parent_ptr)); - //if (widget->parent == NULL) + if (gtk_widget_get_parent(widget) == NULL) { if (GTK_IS_WINDOW (parent_widget)) @@ -322,14 +319,14 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetParent { gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (parent_widget), widget); - // gtk_viewport_set_shadow_type (GTK_VIEWPORT (widget->parent), + gtk_viewport_set_shadow_type (GTK_VIEWPORT (gtk_widget_get_parent(widget)), GTK_SHADOW_NONE); } else { - //if (widget->parent == NULL) + if (gtk_widget_get_parent(widget) == NULL) gtk_fixed_put (GTK_FIXED (parent_widget), widget, 0, 0); } @@ -364,7 +361,7 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetHasFocus ptr = gtkpeer_get_widget (env, obj); - //retval = GTK_WIDGET_HAS_FOCUS((GTK_WIDGET (ptr))); + retval = gtk_widget_has_focus((GTK_WIDGET (ptr))); gdk_threads_leave (); @@ -383,7 +380,7 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetCanFocus ptr = gtkpeer_get_widget (env, obj); - //retval = GTK_WIDGET_CAN_FOCUS((GTK_WIDGET (ptr))); + retval = gtk_widget_get_can_focus((GTK_WIDGET (ptr))); gdk_threads_leave (); @@ -437,14 +434,11 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetDispatchKeyEvent } if (GTK_IS_BUTTON (ptr)) - //event->key.window = GTK_BUTTON (get_widget(GTK_WIDGET (ptr)))->event_window; - event->key.window = gtk_button_get_event_window (GTK_BUTTON (get_widget(GTK_WIDGET (ptr)))); + event->key.window = gtk_button_get_event_window (GTK_BUTTON (get_widget(GTK_WIDGET (ptr)))); else if (GTK_IS_SCROLLED_WINDOW (get_widget(GTK_WIDGET (ptr)))) - //event->key.window = GTK_WIDGET (GTK_SCROLLED_WINDOW (get_widget(GTK_WIDGET (ptr)))->container.child)->window; - event->key.window = gtk_widget_get_window(GTK_WIDGET (gtk_bin_get_child(&(GTK_SCROLLED_WINDOW (get_widget(GTK_WIDGET (ptr)))->container)))); + event->key.window = gtk_widget_get_window(GTK_WIDGET (gtk_bin_get_child(&(GTK_SCROLLED_WINDOW (get_widget(GTK_WIDGET (ptr)))->container)))); else - //event->key.window = get_widget(GTK_WIDGET (ptr))->window; - event->key.window = gtk_widget_get_window(get_widget(GTK_WIDGET (ptr))); + event->key.window = gtk_widget_get_window(get_widget(GTK_WIDGET (ptr))); event->key.send_event = 0; event->key.time = (guint32) when; @@ -521,8 +515,7 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetDispatchKeyEvent if (!GTK_IS_WINDOW (ptr)) { if (GTK_IS_SCROLLED_WINDOW (get_widget(GTK_WIDGET (ptr)))) - //gtk_widget_event (GTK_WIDGET (GTK_SCROLLED_WINDOW (get_widget(GTK_WIDGET (ptr)))->container.child), event); - gtk_widget_event (GTK_WIDGET (gtk_bin_get_child(&(GTK_SCROLLED_WINDOW (get_widget(GTK_WIDGET (ptr)))->container))), event); + gtk_widget_event (GTK_WIDGET (gtk_bin_get_child(&(GTK_SCROLLED_WINDOW (get_widget(GTK_WIDGET (ptr)))->container))), event); else gtk_widget_event (get_widget(GTK_WIDGET (ptr)), event); } @@ -555,8 +548,7 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWindowGetLocationOnScreenUnlocked ptr = gtkpeer_get_widget (env, obj); point = (*env)->GetIntArrayElements (env, jpoint, 0); - //gdk_window_get_root_origin (get_widget(GTK_WIDGET (ptr))->window, point, point+1); - gdk_window_get_root_origin (gtk_widget_get_window(get_widget(GTK_WIDGET (ptr))), point, point+1); + gdk_window_get_root_origin (gtk_widget_get_window(get_widget(GTK_WIDGET (ptr))), point, point+1); (*env)->ReleaseIntArrayElements(env, jpoint, point, 0); } @@ -590,12 +582,8 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetLocationOnScreenUnlocked widget = get_widget(GTK_WIDGET (ptr)); while(gtk_widget_get_parent(widget) != NULL) widget = gtk_widget_get_parent(widget); - //gdk_window_get_position (GTK_WIDGET(widget)->window, point, point+1); gdk_window_get_position (gtk_widget_get_window(GTK_WIDGET(widget)), point, point+1); - //*point += GTK_WIDGET(ptr)->allocation.x; - //*(point+1) += GTK_WIDGET(ptr)->allocation.y; - GtkAllocation alloc; gtk_widget_get_allocation(GTK_WIDGET(ptr), &alloc); *point += alloc.x; @@ -668,12 +656,10 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetPreferredDimensions { #if GTK_MAJOR_VERSION == 3 /* Save the widget's current size request. */ - //gtk_widget_size_request (get_widget(GTK_WIDGET (ptr)), ¤t_req); gtk_widget_get_preferred_size(get_widget(GTK_WIDGET(ptr)), ¤t_req, NULL); /* Get the widget's "natural" size request. */ gtk_widget_set_size_request (get_widget(GTK_WIDGET (ptr)), -1, -1); - //gtk_widget_size_request (get_widget(GTK_WIDGET (ptr)), &natural_req); gtk_widget_get_preferred_size(get_widget(GTK_WIDGET (ptr)),NULL, &natural_req); /* Reset the widget's size request. */ @@ -730,9 +716,7 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds case though, moving the child widget is invalid since a ScrollPane only has one child and that child is always located at (0, 0) in viewport coordinates. */ - /* if (widget->parent != NULL && GTK_IS_FIXED (widget->parent)) - gtk_fixed_move (GTK_FIXED (widget->parent), widget, x, y);*/ - if (gtk_widget_get_parent(widget) != NULL && GTK_IS_FIXED (gtk_widget_get_parent(widget))) + if (gtk_widget_get_parent(widget) != NULL && GTK_IS_FIXED (gtk_widget_get_parent(widget))) gtk_fixed_move (GTK_FIXED (gtk_widget_get_parent(widget)), widget, x, y); } @@ -752,7 +736,6 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetBackground ptr = gtkpeer_get_widget (env, obj); - //bg = GTK_WIDGET (ptr)->style->bg[GTK_STATE_NORMAL]; bg = gtk_widget_get_style(GTK_WIDGET (ptr))->bg[GTK_STATE_NORMAL]; @@ -783,8 +766,7 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetForeground ptr = gtkpeer_get_widget (env, obj); - //fg = get_widget(GTK_WIDGET (ptr))->style->fg[GTK_STATE_NORMAL]; - fg = gtk_widget_get_style(get_widget(GTK_WIDGET (ptr)))->fg[GTK_STATE_NORMAL]; + fg = gtk_widget_get_style(get_widget(GTK_WIDGET (ptr)))->fg[GTK_STATE_NORMAL]; array = (*env)->NewIntArray (env, 3); @@ -925,7 +907,6 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_modalHasGrab gdk_threads_enter (); widget = gtk_grab_get_current (); - //retval = (widget && GTK_IS_WINDOW (widget) && GTK_WINDOW (widget)->modal); retval = (widget && GTK_IS_WINDOW (widget) && gtk_window_get_modal(GTK_WINDOW (widget))); gdk_threads_leave (); @@ -1135,7 +1116,6 @@ component_button_release_cb (GtkWidget *widget __attribute__((unused)), /* Generate an AWT click event only if the release occured in the window it was pressed in, and the mouse has not been dragged since the last time it was pressed. */ - //gdk_drawable_get_size (event->window, &width, &height); width = gdk_window_get_width(event->window); height = gdk_window_get_height(event->window); if (! hasBeenDragged diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c index b7b57108c..fff8b04c5 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c @@ -40,6 +40,7 @@ exception statement from your version. */ #include "gtkpeer.h" #include "gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h" #include <gtk/gtk.h> +#include <gtk/gtkx.h> JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_create (JNIEnv *env, jobject obj, jlong socket_id) @@ -51,7 +52,6 @@ Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_create gtkpeer_set_global_ref (env, obj); - //window = gtk_plug_new ((GdkNativeWindow) socket_id); window = gtk_plug_new (socket_id); gtk_window_set_decorated (GTK_WINDOW (window), FALSE); @@ -76,12 +76,10 @@ Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_construct ptr = gtkpeer_get_widget (env, obj); - //if (GTK_WIDGET_REALIZED (GTK_WIDGET (ptr))) - if (gtk_widget_get_realized (GTK_WIDGET (ptr))) + if (gtk_widget_get_realized (GTK_WIDGET (ptr))) g_printerr ("ERROR: GtkPlug is already realized\n"); - //gtk_plug_construct (GTK_PLUG (ptr), (GdkNativeWindow) socket_id); - gtk_plug_construct (GTK_PLUG (ptr), socket_id); + gtk_plug_construct (GTK_PLUG (ptr), socket_id); gdk_threads_leave (); } diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c index 24dbabc20..c8448324c 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c @@ -225,10 +225,7 @@ Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setNativeBounds /* ...and the label's size request. */ gtk_widget_set_size_request (gtk_bin_get_child (GTK_BIN (widget)), width, height); - - /* if (widget->parent != NULL && GTK_IS_FIXED (widget->parent)) - gtk_fixed_move (GTK_FIXED (widget->parent), widget, x, y);*/ - + if (gtk_widget_get_parent(widget) != NULL && GTK_IS_FIXED (gtk_widget_get_parent(widget))) gtk_fixed_move (GTK_FIXED (gtk_widget_get_parent(widget)), widget, x, y); } diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c index 7a47ce9cb..bd7d92b19 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c @@ -173,8 +173,7 @@ Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_setLabel str = (*env)->GetStringUTFChars (env, label, NULL); - //accel_label = GTK_ACCEL_LABEL (GTK_BIN (ptr)->child); - accel_label = GTK_ACCEL_LABEL (gtk_bin_get_child(GTK_BIN (ptr))); + accel_label = GTK_ACCEL_LABEL (gtk_bin_get_child(GTK_BIN (ptr))); gtk_label_set_text (GTK_LABEL (accel_label), str); gtk_accel_label_refetch (accel_label); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c index 2270aeb0a..217777c89 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c @@ -51,8 +51,7 @@ Java_gnu_java_awt_peer_gtk_GtkMenuPeer_setupAccelGroup if (!parent) { - // gtk_menu_set_accel_group (GTK_MENU (GTK_MENU_ITEM (ptr1)->submenu), - gtk_menu_set_accel_group (GTK_MENU (gtk_menu_item_get_submenu(GTK_MENU_ITEM (ptr1))), + gtk_menu_set_accel_group (GTK_MENU (gtk_menu_item_get_submenu(GTK_MENU_ITEM (ptr1))), gtk_accel_group_new ()); } else @@ -60,8 +59,7 @@ Java_gnu_java_awt_peer_gtk_GtkMenuPeer_setupAccelGroup GtkAccelGroup *parent_accel; ptr2 = gtkpeer_get_widget (env, parent); - //parent_accel = gtk_menu_get_accel_group (GTK_MENU (GTK_MENU_ITEM (ptr2)->submenu)); - parent_accel = gtk_menu_get_accel_group (GTK_MENU (gtk_menu_item_get_submenu(GTK_MENU_ITEM (ptr2)))); + parent_accel = gtk_menu_get_accel_group (GTK_MENU (gtk_menu_item_get_submenu(GTK_MENU_ITEM (ptr2)))); gtk_menu_set_accel_group (GTK_MENU (gtk_menu_item_get_submenu(GTK_MENU_ITEM (ptr1))), parent_accel); @@ -116,7 +114,6 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_addTearOff (JNIEnv *env, jobject obj) { - printf("\nENTERING GTKMENUPEER ADDTEAROFF\n"); void *ptr1; GtkWidget *menu, *item; @@ -127,16 +124,11 @@ Java_gnu_java_awt_peer_gtk_GtkMenuPeer_addTearOff menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (ptr1)); #if GTK_MAJOR_VERSION == 2 item = gtk_tearoff_menu_item_new (); - printf("\nCREATING ITEM\n"); #elif GTK_MAJOR_VERSION == 3 item = gtk_menu_item_new(); #endif - printf("\nITEM CREATED SETTING TEAROFF STATE\n"); - - printf("\nAPPENDING SHELL TO GTK MENU\n"); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show (item); - printf("\nLEAVING THREAD\n"); gdk_threads_leave (); } diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c index 1fc7e4c21..add8e333e 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c @@ -59,10 +59,8 @@ Java_gnu_java_awt_peer_gtk_GtkPanelPeer_create widget = gtk_fixed_new (); - //gtk_fixed_set_has_window (GTK_FIXED (widget), TRUE); gtk_widget_set_has_window (widget, TRUE); - //gtk_widget_set_can_focus (widget, GTK_CAN_FOCUS); gtk_widget_set_can_focus(widget, TRUE); gtkpeer_set_widget (env, obj, widget); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c index a775a7431..f4ad803b8 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c @@ -106,7 +106,6 @@ Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetHScrollIncremen sw = GTK_SCROLLED_WINDOW (scrollpane_get_widget (GTK_WIDGET (ptr))); hadj = gtk_scrolled_window_get_hadjustment (sw); - //hadj->step_increment = u; gtk_adjustment_set_step_increment(hadj, u); gdk_threads_leave (); @@ -127,7 +126,6 @@ Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetVScrollIncremen sw = GTK_SCROLLED_WINDOW (scrollpane_get_widget (GTK_WIDGET (ptr))); vadj = gtk_scrolled_window_get_hadjustment (sw); - //vadj->step_increment = u; gtk_adjustment_set_step_increment(vadj, u); gdk_threads_leave (); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollbarPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollbarPeer.c index 422aa8590..19deb4f43 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollbarPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollbarPeer.c @@ -175,7 +175,6 @@ Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setLineIncrement adj = gtk_range_get_adjustment (GTK_RANGE (wid)); gtk_adjustment_set_step_increment(adj, (gdouble)amount); - //adj->step_increment = (gdouble) amount; gtk_adjustment_changed (adj); gdk_threads_leave (); @@ -196,7 +195,6 @@ Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setPageIncrement adj = gtk_range_get_adjustment (GTK_RANGE (wid)); gtk_adjustment_set_page_increment(adj, (gdouble)amount); - //adj->page_increment = (gdouble) amount; gtk_adjustment_changed (adj); gdk_threads_leave (); @@ -225,8 +223,7 @@ Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setBarValues adj = gtk_range_get_adjustment (GTK_RANGE (wid)); gtk_adjustment_set_page_size(adj, (gdouble)visible); - //adj->page_size = (gdouble) visible; - + gtk_range_set_range (GTK_RANGE (wid), (gdouble) min, (gdouble) max); gtk_range_set_value (GTK_RANGE (wid), (gdouble) value); @@ -242,19 +239,16 @@ slider_moved_cb (GtkRange *range, { GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (range)); - /*value = CLAMP (value, adj->lower, - (adj->upper - adj->page_size));*/ + value = CLAMP (value, gtk_adjustment_get_lower(adj), (gtk_adjustment_get_upper(adj) - gtk_adjustment_get_page_size(adj))); - //if (range->round_digits >= 0) - if (gtk_range_get_round_digits(range) >= 0) + if (gtk_range_get_round_digits(range) >= 0) { gdouble power; gint i; - //i = range->round_digits; - i = gtk_range_get_round_digits(range); + i = gtk_range_get_round_digits(range); power = 1; while (i--) power *= 10; diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkSelection.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkSelection.c index b845aebdc..f244ac28f 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkSelection.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkSelection.c @@ -61,7 +61,6 @@ clipboard_targets_received (GtkClipboard *clipboard jobject selection_obj = (jobject) selection; JNIEnv *env = cp_gtk_gdk_env (); - //if (target_data != NULL && target_data->length > 0) if (target_data != NULL && gtk_selection_data_get_length(target_data) > 0) { include_text = gtk_selection_data_targets_include_text (target_data); @@ -426,15 +425,11 @@ clipboard_bytes_received (GtkClipboard *clipboard jobject selection_obj = (jobject) selection; JNIEnv *env = cp_gtk_gdk_env (); - //if (selection_data != NULL && selection_data->length > 0) if (selection_data != NULL && gtk_selection_data_get_length(selection_data) > 0) { - //bytes = (*env)->NewByteArray (env, selection_data->length); bytes = (*env)->NewByteArray (env, gtk_selection_data_get_length(selection_data)); if (bytes != NULL) - /*(*env)->SetByteArrayRegion(env, bytes, 0, selection_data->length, - (jbyte *) selection_data->data);*/ - (*env)->SetByteArrayRegion(env, bytes, 0, gtk_selection_data_get_length(selection_data), + (*env)->SetByteArrayRegion(env, bytes, 0, gtk_selection_data_get_length(selection_data), (jbyte *) gtk_selection_data_get_data(selection_data)); } diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c index c1cca66c8..d5c9cb553 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c @@ -41,6 +41,7 @@ exception statement from your version. */ #include "jcl.h" #define RC_FILE ".classpath-gtkrc" +#define CSS_FILE ".classpath-gtk-keys.css" /* From java.awt.SystemColor */ #define AWT_DESKTOP 0 @@ -152,9 +153,7 @@ Java_gnu_java_awt_peer_gtk_GtkToolkit_gtkInit (JNIEnv *env, int argc = 1; char **argv; char *homedir ,*rcpath = NULL; - - //GtkCssProvider *css_provider; - + gtkgenericpeer = (*env)->FindClass(env, "gnu/java/awt/peer/gtk/GtkGenericPeer"); gtkgenericpeer = (*env)->NewGlobalRef(env, gtkgenericpeer); @@ -182,25 +181,18 @@ Java_gnu_java_awt_peer_gtk_GtkToolkit_gtkInit (JNIEnv *env, XSynchronize (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), True); #endif - //gtk_widget_set_default_colormap (gdk_rgb_get_colormap ()); - // gtk_widget_set_visual(gdk_screen_get_system_visual (gdk_screen_get_default())); - + if ((homedir = getenv ("HOME"))) { + rcpath = (char *) g_malloc (strlen (homedir) + strlen (RC_FILE) + 2); sprintf (rcpath, "%s/%s", homedir, RC_FILE); + } - + + #if GTK_MAJOR_VERSION == 2 gtk_rc_parse ((rcpath) ? rcpath : RC_FILE); - /*css_provider = gtk_css_provider_new(); - if((rcpath)){ - printf("\n%s : PATH IS REACHED\n", rcpath); - gtk_css_provider_load_from_path (css_provider, g_filename_to_utf8(rcpath, strlen(rcpath), &bytes_read, &bytes_written, &error) , NULL); - } - else{ - printf("\nREACHED RC_FILE\n"); - gtk_css_provider_load_from_file (css_provider, RC_FILE, NULL); - }*/ + #endif g_free (rcpath); g_free (argv[0]); g_free (argv); @@ -394,10 +386,6 @@ Java_gnu_java_awt_peer_gtk_GtkToolkit_gtkMain post_set_running_flag(NULL); #endif - //#if GTK_MAJOR_VERSION == 3 - //g_idle_add(post_set_running_flag, NULL); - //#endif - gtk_main (); gdk_threads_leave(); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c index d3c18787c..a0701a57e 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c @@ -38,11 +38,8 @@ exception statement from your version. */ #include "jcl.h" #include "gtkpeer.h" - -//#include <gdk/gdktypes.h> #include <gdk/gdk.h> -//#include <gdk/gdkprivate.h> #include <gdk/gdkx.h> #include <gdk-pixbuf/gdk-pixbuf.h> @@ -61,7 +58,7 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init (JNIEnv *env, jobject peer, jint width, jint height) { - printf("\n volatileimage_init \n"); + GtkWidget *widget = NULL; #if GTK_MAJOR_VERSION == 2 GdkPixmap* pixmap; @@ -90,8 +87,7 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init (JNIEnv *env, else{ #if GTK_MAJOR_VERSION == 2 pixmap = gdk_pixmap_new( NULL, width, height, - //gdk_rgb_get_visual()->depth ); - gdk_visual_get_depth(gdk_visual_get_system())); + gdk_visual_get_depth(gdk_visual_get_system())); #elif GTK_MAJOR_VERSION == 3 surface = gdk_window_create_similar_surface(gtk_widget_get_window(widget), CAIRO_CONTENT_COLOR_ALPHA, width, height); #endif @@ -115,8 +111,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), jlong pointer) -{ printf("\n volatileimage_destroy \n"); - //GdkPixmap* pixmap = JLONG_TO_PTR(GdkPixmap, pointer); +{ gdk_threads_enter(); cairo_surface_t *surface = JLONG_TO_PTR(cairo_surface_t, pointer); if( surface != NULL ) @@ -155,9 +150,7 @@ JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels (JNIEnv *env, jobject obj, jlong pointer) { - printf("\n nativeGetPixels \n"); - /*jint *pixeldata, *jpixdata;*/ - jint *jpixdata; + jint *jpixdata; #if GTK_MAJOR_VERSION == 2 GdkPixmap *pixmap; @@ -224,7 +217,7 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeCopyArea (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), jlong pointer, jint x, jint y, jint w, jint h, jint dx, jint dy) { - printf("\n nativeCopyArea \n"); + GdkPixbuf *pixbuf; #if GTK_MAJOR_VERSION == 2 @@ -244,10 +237,6 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeCopyArea pixbuf = gdk_pixbuf_get_from_surface (surface, x,y,w,h); #endif - /*gdk_draw_pixbuf (pixmap, NULL, pixbuf, - 0, 0, x + dx, y + dy, - w, h, - GDK_RGB_DITHER_NORMAL, 0, 0);*/ #if GTK_MAJOR_VERSION == 2 cairo_t *cr = gdk_cairo_create(pixmap); #elif GTK_MAJOR_VERSION == 3 @@ -266,10 +255,7 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeDrawVolatile (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), jlong pointer, jlong srcptr, jint x, jint y, jint w, jint h) { - printf("\n nativeDrawVolatile \n"); - //GdkPixmap *dst, *src; - - //GdkGC *gc; + GdkRectangle clip; @@ -279,15 +265,7 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeDrawVolatile dst = JLONG_TO_PTR(cairo_surface_t, pointer); g_assert (src != NULL); g_assert (dst != NULL); - /*gc = gdk_gc_new( dst ); - gdk_draw_drawable(dst, - gc, - src, - 0, 0, - x, y, - w, h); - g_object_unref( gc );*/ - + clip.x = 0; clip.y = 0; clip.width = w; @@ -309,4 +287,3 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeDrawVolatile gdk_threads_leave(); } - diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c index 09ebe8526..80111d9c1 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c @@ -1226,7 +1226,6 @@ Java_gnu_java_awt_peer_gtk_GtkWindowPeer_gtkWindowSetResizable ptr = gtkpeer_get_widget (env, obj); gtk_window_set_resizable (GTK_WINDOW (ptr), resizable); - //g_object_set (G_OBJECT (ptr), "allow-shrink", resizable, NULL); g_object_set (G_OBJECT (ptr), "resizable", resizable, NULL); gdk_threads_leave (); } @@ -1573,8 +1572,7 @@ request_frame_extents (GtkWidget *window) /* Check if the current window manager supports _NET_REQUEST_FRAME_EXTENTS. */ - //if (gdk_net_wm_supports (request_extents)) - if (gdk_x11_screen_supports_net_wm_hint (gdk_screen_get_default(), request_extents)) + if (gdk_x11_screen_supports_net_wm_hint (gdk_screen_get_default(), request_extents)) { GdkDisplay *display = gtk_widget_get_display (window); Display *xdisplay = GDK_DISPLAY_XDISPLAY (display); @@ -1588,8 +1586,7 @@ request_frame_extents (GtkWidget *window) XEvent xevent; XEvent notify_xevent; - //unsigned long window_id = GDK_WINDOW_XID (GDK_DRAWABLE(gtk_widget_get_window(window))); - unsigned long window_id = GDK_WINDOW_XID (gtk_widget_get_window(window)); + unsigned long window_id = GDK_WINDOW_XID (gtk_widget_get_window(window)); if (!extents_atom) { const char *extents_str = "_NET_FRAME_EXTENTS"; diff --git a/native/jni/gtk-peer/gtk_jawt.c b/native/jni/gtk-peer/gtk_jawt.c index bab927fe4..6676f4c0d 100644 --- a/native/jni/gtk-peer/gtk_jawt.c +++ b/native/jni/gtk-peer/gtk_jawt.c @@ -181,8 +181,7 @@ classpath_jawt_get_drawable (JNIEnv* env, jobject canvas) if (gtk_widget_get_realized(widget)) { - //drawable = GDK_DRAWABLE_XID (gtk_widget_get_window(widget)); - drawable = GDK_WINDOW_XID (gtk_widget_get_window(widget)); + drawable = GDK_WINDOW_XID (gtk_widget_get_window(widget)); return drawable; } diff --git a/native/jni/gtk-peer/gtkpeer.h b/native/jni/gtk-peer/gtkpeer.h index 1c49ab1c1..b68db733e 100644 --- a/native/jni/gtk-peer/gtkpeer.h +++ b/native/jni/gtk-peer/gtkpeer.h @@ -337,7 +337,7 @@ void cp_gtk_textcomponent_connect_signals (GObject *ptr, jobject gref); /* Debugging */ void cp_gtk_print_current_thread (void); -//GdkPixmap *cp_gtk_get_pixmap( JNIEnv *env, jobject obj); + #define SYNCHRONIZE_GDK 0 |