diff options
35 files changed, 1324 insertions, 689 deletions
@@ -1,3 +1,16 @@ +2013-09-19 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * include/config.h.in~, + * scripts/check_jni_methods.sh, + * tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.java, + * tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap, + * tools/generated/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java, + * tools/generated/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap, + * tools/generated/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java, + * tools/generated/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt, + * tools/gjdoc: + Remove generated files. + 2013-09-04 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/lang/model/SourceVersion.java: diff --git a/configure.ac b/configure.ac index b20a4bb1b..9506ead81 100644 --- a/configure.ac +++ b/configure.ac @@ -558,7 +558,8 @@ if test "x${COMPILE_JNI}" = xyes; then [${X_LIBS}]) - PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8 gthread-2.0 >= 2.2 gdk-pixbuf-2.0) + + PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 gthread-2.0 >= 2.2 gdk-pixbuf-2.0) PKG_CHECK_MODULES(FREETYPE2, freetype2) PKG_CHECK_MODULES(PANGOFT2, pangoft2) PKG_CHECK_MODULES(CAIRO, cairo >= 1.1.8) diff --git a/native/jni/gtk-peer/GtkDragSourceContextPeer.c b/native/jni/gtk-peer/GtkDragSourceContextPeer.c index b8f1ba5b2..98c75a2ea 100644 --- a/native/jni/gtk-peer/GtkDragSourceContextPeer.c +++ b/native/jni/gtk-peer/GtkDragSourceContextPeer.c @@ -154,15 +154,14 @@ Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeSetCursor gdk_cursor_type = GDK_LEFT_PTR; } - win = widget->window; - if ((widget->window) == NULL) - win = widget->window; + win = gtk_widget_get_window(widget); + if ((gtk_widget_get_window(widget)) == NULL) + win = gtk_widget_get_window(widget); 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(); gdk_threads_leave (); diff --git a/native/jni/gtk-peer/Makefile.am b/native/jni/gtk-peer/Makefile.am index 6ab32636b..57a0b4d6f 100644 --- a/native/jni/gtk-peer/Makefile.am +++ b/native/jni/gtk-peer/Makefile.am @@ -58,4 +58,12 @@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@ # headers contain broken prototypes (by design, see gtkitemfactory.h). AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ \ @GTK_CFLAGS@ @FREETYPE2_CFLAGS@ @PANGOFT2_CFLAGS@ \ - @X_CFLAGS@ @EXTRA_CFLAGS@ + @X_CFLAGS@ @EXTRA_CFLAGS@ \ + "-DGTK_DISABLE_SINGLE_INCLUDES" \ + "-DGDK_DISABLE_DEPRECATED" \ + "-DGSEAL_ENABLE" \ + "-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4" + + + + diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c index 58f003e86..f54fb49bd 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c @@ -39,8 +39,11 @@ exception statement from your version. */ #include "gdkfont.h" #include "cairographics2d.h" #include "gnu_java_awt_peer_gtk_CairoGraphics2D.h" -#include <gdk/gdktypes.h> -#include <gdk/gdkprivate.h> +#include <gdk/gdk.h> +#include <gdk/gdkx.h> + +//#include <gdk/gdktypes.h> +//#include <gdk/gdkprivate.h> #include <cairo-ft.h> 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 31bab77d4..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 @@ -37,8 +37,12 @@ exception statement from your version. */ #include "jcl.h" #include "gtkpeer.h" -#include <gdk/gdktypes.h> -#include <gdk/gdkprivate.h> + + +#include <gdk/gdk.h> + + +#include <gdk/gdkx.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixdata.h> @@ -59,14 +63,16 @@ exception statement from your version. */ static short flush_scheduled = 0; + + static gboolean flush (gpointer data __attribute__((unused))) { - gdk_threads_enter (); + gdk_threads_enter(); gdk_display_flush (gdk_display_get_default ()); flush_scheduled = 0; - gdk_threads_leave (); + gdk_threads_leave(); return FALSE; } @@ -85,7 +91,7 @@ schedule_flush () flush_scheduled = 1; } } - +#if GTK_MAJOR_VERSION == 2 void cp_gtk_grab_current_drawable(GtkWidget *widget, GdkDrawable **draw, GdkWindow **win) { @@ -93,11 +99,26 @@ 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); *draw = *win; gdk_window_get_internal_paint_info (*win, draw, 0, 0); } +#elif GTK_MAJOR_VERSION == 3 +void cp_gtk_grab_current_drawable(GtkWidget *widget, GdkWindow **win) +{ + + + g_assert (widget != NULL); + + g_assert (win != NULL); + + + *win = gtk_widget_get_window(widget); + +} +#endif + /** * Returns whether the XRender extension is supported @@ -106,15 +127,17 @@ JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_hasXRender (JNIEnv *env __attribute__ ((unused)), jclass cls __attribute__ ((unused))) { + #if HAVE_XRENDER int ev = 0, err = 0; - if( XRenderQueryExtension (GDK_DISPLAY(), &ev, &err) ) + if( XRenderQueryExtension (gdk_x11_get_default_xdisplay (), &ev, &err) ) + return JNI_TRUE; #endif return JNI_FALSE; } - +#if GTK_MAJOR_VERSION == 2 JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState (JNIEnv *env, jobject obj __attribute__ ((unused)), jobject peer) @@ -125,16 +148,48 @@ 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); + + cr = gdk_cairo_create(drawable); + + g_assert(cr != NULL); + + gdk_threads_leave(); + 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) +{ + + GdkWindow *drawable; + GtkWidget *widget; + cairo_t *cr; + void *ptr; + + gdk_threads_enter(); + + ptr = gtkpeer_get_widget (env, peer); + g_assert (ptr != NULL); + + widget = GTK_WIDGET (ptr); + g_assert (widget != NULL); + + + drawable = gtk_widget_get_window(widget); + g_assert (drawable != NULL); + cr = gdk_cairo_create(drawable); g_assert(cr != NULL); @@ -144,19 +199,23 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState return PTR_TO_JLONG(cr); } + +#endif + JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initFromVolatile (JNIEnv *env __attribute__ ((unused)), jobject obj __attribute__ ((unused)), jlong ptr) { - GdkDrawable *drawable; - cairo_t *cr; + + GdkWindow *drawable; + gdk_threads_enter(); - drawable = JLONG_TO_PTR(GdkDrawable, ptr); + drawable = JLONG_TO_PTR(GdkWindow, ptr); g_assert (drawable != NULL); - + cairo_t *cr; cr = gdk_cairo_create (drawable); g_assert(cr != NULL); @@ -180,17 +239,19 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphics_end_1gdk_1drawing gdk_threads_leave(); } +#if GTK_MAJOR_VERSION == 2 JNIEXPORT void JNICALL 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) { + GdkPixbuf *pixbuf; GdkDrawable *drawable; GdkWindow *win; GtkWidget *widget = NULL; void *ptr = NULL; - + gdk_threads_enter(); ptr = gtkpeer_get_widget (env, peer); @@ -204,24 +265,102 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphics_copyAreaNative pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, TRUE, 8, w, h ); gdk_pixbuf_get_from_drawable( pixbuf, drawable, NULL, x, y, 0, 0, w, h ); - gdk_draw_pixbuf (drawable, NULL, pixbuf, - 0, 0, x + dx, y + dy, - w, h, - GDK_RGB_DITHER_NORMAL, 0, 0); + + + cairo_t *cr = gdk_cairo_create(drawable); + gdk_cairo_set_source_pixbuf (cr, pixbuf, x + dx, y + dy); + cairo_paint (cr); + cairo_destroy (cr); + + gdk_threads_leave(); +} +#elif GTK_MAJOR_VERSION == 3 + +JNIEXPORT void JNICALL +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) +{ + + GdkPixbuf *pixbuf; + GdkWindow *win; + GtkWidget *widget = NULL; + void *ptr = NULL; + gdk_threads_enter(); + + ptr = gtkpeer_get_widget (env, peer); + g_assert (ptr != NULL); + + widget = GTK_WIDGET (ptr); + g_assert (widget != NULL); + + cp_gtk_grab_current_drawable (widget,&win); + + + pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, TRUE, 8, w, h ); + pixbuf = gdk_pixbuf_get_from_window( win,x, y, w, h ); + + + cairo_t *cr = gdk_cairo_create(win); + gdk_cairo_set_source_pixbuf (cr, pixbuf, x + dx, y + dy); + cairo_paint (cr); + cairo_destroy (cr); + gdk_threads_leave(); } +#endif +#if GTK_MAJOR_VERSION == 3 JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_nativeGrab (JNIEnv *env, jclass cls __attribute__((unused)), jobject peer ) { + GdkPixbuf *pixbuf; - GdkDrawable *drawable; GdkWindow *win; gint w,h; GtkWidget *widget = NULL; void *ptr = NULL; + gdk_threads_enter(); + ptr = gtkpeer_get_widget (env, peer); + g_assert (ptr != NULL); + + widget = GTK_WIDGET (ptr); + g_assert (widget != NULL); + + cp_gtk_grab_current_drawable (widget, &win); + + + w = gdk_window_get_width(win); + h = gdk_window_get_height(win); + + pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, TRUE, 8, w, h ); + pixbuf = gdk_pixbuf_get_from_window( win, 0, 0, w, h ); + g_object_ref( pixbuf ); + + + cairo_t *cr = gdk_cairo_create (win); + gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0); + cairo_paint (cr); + cairo_destroy (cr); + + gdk_threads_leave(); + + return JCL_NewRawDataObject (env, pixbuf); +} +#elif GTK_MAJOR_VERSION == 2 + +JNIEXPORT jobject JNICALL +Java_gnu_java_awt_peer_gtk_ComponentGraphics_nativeGrab +(JNIEnv *env, jclass cls __attribute__((unused)), jobject peer ) +{ + GdkPixbuf *pixbuf; + GdkDrawable *drawable; + GdkWindow *win; + gint w,h; + GtkWidget *widget = NULL; + void *ptr = NULL; gdk_threads_enter(); ptr = gtkpeer_get_widget (env, peer); @@ -233,20 +372,28 @@ 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); pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, TRUE, 8, w, h ); 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); + cairo_paint (cr); + cairo_destroy (cr); + gdk_threads_leave(); return JCL_NewRawDataObject (env, pixbuf); -} +} +#endif +#if GTK_MAJOR_VERSION == 2 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile (JNIEnv *env, jobject obj __attribute__ ((unused)), jobject peer, @@ -254,12 +401,10 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile { GdkPixmap *pixmap; GtkWidget *widget = NULL; - GdkGC *gc; GdkRectangle clip; void *ptr; gdk_threads_enter(); - ptr = gtkpeer_get_widget (env, peer); g_assert (ptr != NULL); @@ -268,24 +413,85 @@ 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; + + w = w; + h = h; + + + cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(widget)); + gdk_cairo_rectangle (cr,&clip); + cairo_clip (cr); + + cairo_push_group (cr); + gdk_cairo_set_source_pixmap (cr, pixmap, x, y); + cairo_paint (cr); + + cairo_pop_group_to_source (cr); + cairo_paint (cr); + cairo_destroy (cr); + + + + + schedule_flush (); + + gdk_threads_leave(); +} +#elif GTK_MAJOR_VERSION == 3 +JNIEXPORT void JNICALL +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) +{ + + GdkPixbuf *pixbuf; + GtkWidget *widget = NULL; + + GdkRectangle clip; + void *ptr; + + gdk_threads_enter(); + + ptr = gtkpeer_get_widget (env, peer); + g_assert (ptr != NULL); + + widget = GTK_WIDGET (ptr); + g_assert (widget != NULL); + pixbuf = JLONG_TO_PTR(GdkPixbuf, img); + 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 (gtk_widget_get_window(widget)); + gdk_cairo_rectangle (cr,&clip); + cairo_clip (cr); + cairo_push_group (cr); + gdk_cairo_set_source_pixbuf (cr, pixbuf, x, y); + cairo_paint (cr); + cairo_pop_group_to_source (cr); + cairo_paint (cr); + cairo_destroy (cr); - g_object_unref( gc ); + + schedule_flush (); gdk_threads_leave(); } +#endif 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 df700f559..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 @@ -37,8 +37,12 @@ exception statement from your version. */ #include "jcl.h" #include "gtkpeer.h" -#include <gdk/gdktypes.h> -#include <gdk/gdkprivate.h> + + +#include <gdk/gdk.h> + + +#include <gdk/gdkx.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixdata.h> @@ -50,6 +54,7 @@ exception statement from your version. */ #include "gnu_java_awt_peer_gtk_ComponentGraphicsCopy.h" +#if GTK_MAJOR_VERSION == 2 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphicsCopy_getPixbuf (JNIEnv *env, jobject obj __attribute__((unused)), @@ -79,15 +84,51 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphicsCopy_getPixbuf width = gdk_pixbuf_get_width( pixbuf ); height = gdk_pixbuf_get_height( pixbuf ); - gdk_pixbuf_get_from_drawable( pixbuf, /* destination pixbuf */ + gdk_pixbuf_get_from_drawable( pixbuf, drawable, - NULL, /* colormap */ + NULL, 0, 0, 0, 0, width, height ); gdk_threads_leave(); } +#elif GTK_MAJOR_VERSION == 3 +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_ComponentGraphicsCopy_getPixbuf + (JNIEnv *env, jobject obj __attribute__((unused)), + jobject peer, jobject image) +{ + + gint width, height; + GdkPixbuf *pixbuf; + GdkWindow *win; + GtkWidget *widget = NULL; + void *ptr = NULL; + + gdk_threads_enter(); + ptr = gtkpeer_get_widget (env, peer); + g_assert (ptr != NULL); + + widget = GTK_WIDGET (ptr); + g_assert (widget != NULL); + + + win = gtk_widget_get_window(widget); + + pixbuf = cp_gtk_image_get_pixbuf( env, image ); + g_assert( pixbuf != NULL); + + width = gdk_pixbuf_get_width( pixbuf ); + height = gdk_pixbuf_get_height( pixbuf ); + + pixbuf = gdk_pixbuf_get_from_window( win, + 0, 0, + width, height ); + gdk_threads_leave(); +} +#endif +#if GTK_MAJOR_VERSION == 2 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphicsCopy_copyPixbuf (JNIEnv *env, jobject obj __attribute__((unused)), @@ -95,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; @@ -116,14 +157,49 @@ 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); + cairo_destroy (cr); gdk_threads_leave(); } +#elif GTK_MAJOR_VERSION == 3 + +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_ComponentGraphicsCopy_copyPixbuf + (JNIEnv *env, jobject obj __attribute__((unused)), + jobject peer, jobject image, + jint x __attribute__((unused)), jint y __attribute__((unused)), + jint width __attribute__((unused)), jint height __attribute__((unused))) +{ + + GdkPixbuf *pixbuf; + + GdkWindow *win; + GtkWidget *widget = NULL; + void *ptr = NULL; + gdk_threads_enter(); + + ptr = gtkpeer_get_widget (env, peer); + g_assert (ptr != NULL); + + widget = GTK_WIDGET (ptr); + g_assert (widget != NULL); + + + win = gtk_widget_get_window(widget); + + pixbuf = cp_gtk_image_get_pixbuf( env, image ); + g_assert( pixbuf != NULL); + + + cairo_t *cr = gdk_cairo_create (win); + gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0); + cairo_paint (cr); + cairo_destroy (cr); + + gdk_threads_leave(); +} +#endif diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c index 771b23e37..ce7d41752 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c @@ -75,14 +75,14 @@ Java_gnu_java_awt_peer_gtk_GdkFontPeer_initState { struct peerfont *pfont = NULL; - gdk_threads_enter (); + gdk_threads_enter(); g_assert (self != NULL); pfont = (struct peerfont *) g_malloc0 (sizeof (struct peerfont)); g_assert (pfont != NULL); gtkpeer_set_font (env, self, pfont); - gdk_threads_leave (); + gdk_threads_leave(); } @@ -92,7 +92,7 @@ Java_gnu_java_awt_peer_gtk_GdkFontPeer_dispose { struct peerfont *pfont = NULL; - gdk_threads_enter (); + gdk_threads_enter(); pfont = (struct peerfont *) gtkpeer_get_font (env, self); g_assert (pfont != NULL); @@ -108,7 +108,7 @@ Java_gnu_java_awt_peer_gtk_GdkFontPeer_dispose pango_font_description_free (pfont->desc); g_free (pfont); - gdk_threads_leave (); + gdk_threads_leave(); } @@ -251,7 +251,7 @@ Java_gnu_java_awt_peer_gtk_GdkFontPeer_setFont char const *family_name = NULL; enum java_awt_font_style style; - gdk_threads_enter (); + gdk_threads_enter(); style = (enum java_awt_font_style) style_int; @@ -303,7 +303,7 @@ Java_gnu_java_awt_peer_gtk_GdkFontPeer_setFont pfont->layout = pango_layout_new (pfont->ctx); g_assert (pfont->layout != NULL); - gdk_threads_leave (); + gdk_threads_leave(); } @@ -324,7 +324,7 @@ Java_gnu_java_awt_peer_gtk_GdkFontPeer_getTrueTypeTable if(pfont == NULL) return NULL; - gdk_threads_enter (); + gdk_threads_enter(); face = pango_fc_font_lock_face ((PangoFcFont *)pfont->font); tag = FT_MAKE_TAG( n, a, m, e ); @@ -333,7 +333,7 @@ Java_gnu_java_awt_peer_gtk_GdkFontPeer_getTrueTypeTable if ( error ) { pango_fc_font_unlock_face ((PangoFcFont *)pfont->font); - gdk_threads_leave (); + gdk_threads_leave(); return NULL; } @@ -341,7 +341,7 @@ Java_gnu_java_awt_peer_gtk_GdkFontPeer_getTrueTypeTable if ( buffer == NULL ) { pango_fc_font_unlock_face ((PangoFcFont *)pfont->font); - gdk_threads_leave (); + gdk_threads_leave(); return NULL; } /* get the table data */ @@ -350,7 +350,7 @@ Java_gnu_java_awt_peer_gtk_GdkFontPeer_getTrueTypeTable { pango_fc_font_unlock_face ((PangoFcFont *)pfont->font); g_free(buffer); - gdk_threads_leave (); + gdk_threads_leave(); return NULL; } @@ -363,7 +363,7 @@ Java_gnu_java_awt_peer_gtk_GdkFontPeer_getTrueTypeTable g_free(buffer); pango_fc_font_unlock_face ((PangoFcFont *)pfont->font); - gdk_threads_leave (); + gdk_threads_leave(); /* done */ return result_array; 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 6066a6bb2..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 @@ -241,13 +241,25 @@ Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_getMouseCoordinates GdkDisplay *display; gint x, y, screenIndex; GdkScreen *screen; + #if GTK_MAJOR_VERSION == 3 + GdkDeviceManager *device_manager; + GdkDevice *device; + #endif + display = (GdkDisplay *) gtkpeer_get_display(env, obj); g_assert (display != NULL); gdk_threads_enter (); + #if GTK_MAJOR_VERSION == 2 gdk_display_get_pointer (display, &screen, &x, &y, NULL); + #elif GTK_MAJOR_VERSION == 3 + device_manager = gdk_display_get_device_manager (display); + device = gdk_device_manager_get_client_pointer (device_manager); + gdk_device_get_position (device, &screen, &x, &y); + #endif + screenIndex = gdk_screen_get_number( screen ); gdk_threads_leave (); @@ -274,7 +286,10 @@ Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_isWindowUnderMouse GtkWidget *windowToTest = NULL; GdkWindow *windowAtPointer = NULL; jboolean retVal = JNI_FALSE; - + #if GTK_MAJOR_VERSION == 3 + GdkDeviceManager *device_manager; + GdkDevice *device; + #endif display = (GdkDisplay *) gtkpeer_get_display (env, obj); g_assert (display != NULL); @@ -282,11 +297,17 @@ Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_isWindowUnderMouse gdk_threads_enter (); + #if GTK_MAJOR_VERSION == 3 + device_manager = gdk_display_get_device_manager (display); + device = gdk_device_manager_get_client_pointer (device_manager); + windowAtPointer = gdk_device_get_window_at_position(device, &x, &y); + #elif GTK_MAJOR_VERSION == 2 windowAtPointer = gdk_display_get_window_at_pointer (display, &x, &y); + #endif while (windowAtPointer - && windowAtPointer != windowToTest->window) - windowAtPointer = gdk_window_get_parent (windowAtPointer); + && windowAtPointer != gtk_widget_get_window(windowToTest)) + 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 ea9c1d6e8..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,10 +388,7 @@ 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); g_assert (gdk_pixbuf_get_has_alpha (pixbuf)); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c index 14ba2a123..7d0c3daaf 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c @@ -337,9 +337,11 @@ Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetBounds gdk_threads_enter(); window = gdk_screen_get_root_window(screen); - - gdk_window_get_geometry(window, &x, &y, &w, &h, NULL); - + #if GTK_MAJOR_VERSION == 2 + gdk_window_get_geometry(window, &x, &y, &w, &h, NULL); + #elif GTK_MAJOR_VERSION ==3 + gdk_window_get_geometry(window, &x, &y, &w, &h); + #endif gdk_threads_leave(); instance = (*env)->NewObject(env, 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 3e39b0ee2..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 @@ -102,18 +102,43 @@ Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkWidgetGetPreferredDimensions dims = (*env)->GetIntArrayElements (env, jdims, 0); dims[0] = dims[1] = 0; - + #if GTK_MAJOR_VERSION == 3 /* Save the button's current size request. */ + gtk_widget_get_preferred_size(GTK_WIDGET(button), ¤t_req, NULL); + + /* Save the label's current size request. */ + 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_get_preferred_size(GTK_WIDGET(button), NULL, &natural_req); + + /* Reset the button's size request. */ + gtk_widget_set_size_request (GTK_WIDGET (button), + current_req.width, current_req.height); + + /* Reset the label's size request. */ + gtk_widget_set_size_request (GTK_WIDGET (label), + current_label_req.width, current_label_req.height); + #endif + + #if GTK_MAJOR_VERSION == 2 + /* Save the button's current size request. */ gtk_widget_size_request (GTK_WIDGET (button), ¤t_req); + /* Save the label's current size request. */ gtk_widget_size_request (GTK_WIDGET (label), ¤t_label_req); + /* 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); + /* Reset the button's size request. */ gtk_widget_set_size_request (GTK_WIDGET (button), @@ -122,7 +147,7 @@ Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkWidgetGetPreferredDimensions /* Reset the label's size request. */ gtk_widget_set_size_request (GTK_WIDGET (label), current_label_req.width, current_label_req.height); - + #endif dims[0] = natural_req.width; dims[1] = natural_req.height; @@ -311,6 +336,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkWidgetRequestFocus (JNIEnv *env, jobject obj) { + void *ptr; GtkWidget *button; @@ -352,8 +378,9 @@ 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))) + gtk_fixed_move (GTK_FIXED (gtk_widget_get_parent(widget)), widget, x, y); + } gdk_threads_leave (); 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 96230aadf..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 @@ -222,10 +222,11 @@ Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_createRadioButton if (native_group == NULL) native_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)); + + 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; } gtk_container_add (GTK_CONTAINER (eventbox), button); @@ -282,7 +283,7 @@ 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); } gtk_container_remove (GTK_CONTAINER (container), check_button); @@ -331,7 +332,7 @@ 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); gtk_container_add (GTK_CONTAINER (container), check_button); @@ -362,7 +363,7 @@ 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) { @@ -375,7 +376,7 @@ 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); } (*cp_gtk_gdk_env())->CallVoidMethod (cp_gtk_gdk_env(), obj, @@ -391,7 +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)); } static GtkWidget * diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c index 6f3d9c0e1..884ed0ee0 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c @@ -69,7 +69,13 @@ Java_gnu_java_awt_peer_gtk_GtkChoicePeer_create gtkpeer_set_global_ref (env, obj); eventbox = gtk_event_box_new (); + + #if GTK_MAJOR_VERSION == 2 combobox = gtk_combo_box_new_text (); + #elif GTK_MAJOR_VERSION == 3 + combobox = gtk_combo_box_text_new(); + #endif + gtk_container_add (GTK_CONTAINER (eventbox), combobox); gtk_widget_show (combobox); @@ -118,8 +124,12 @@ Java_gnu_java_awt_peer_gtk_GtkChoicePeer_add label = (*env)->GetStringUTFChars (env, item, 0); + #if GTK_MAJOR_VERSION == 2 gtk_combo_box_insert_text (GTK_COMBO_BOX (bin), index, label); - + #elif GTK_MAJOR_VERSION == 3 + gtk_combo_box_text_insert_text(GTK_COMBO_BOX_TEXT (bin), index, label); + #endif + (*env)->ReleaseStringUTFChars (env, item, label); gdk_threads_leave (); @@ -139,8 +149,12 @@ Java_gnu_java_awt_peer_gtk_GtkChoicePeer_nativeRemove /* First, unselect everything, to avoid problems when removing items. */ gtk_combo_box_set_active (GTK_COMBO_BOX (bin), -1); + + #if GTK_MAJOR_VERSION == 2 gtk_combo_box_remove_text (GTK_COMBO_BOX (bin), index); - + #elif GTK_MAJOR_VERSION == 3 + gtk_combo_box_text_remove(GTK_COMBO_BOX_TEXT(bin), index); + #endif gdk_threads_leave (); } @@ -165,7 +179,13 @@ Java_gnu_java_awt_peer_gtk_GtkChoicePeer_nativeRemoveAll gtk_combo_box_set_active (GTK_COMBO_BOX (bin), -1); for (i = count - 1; i >= 0; i--) { + + #if GTK_MAJOR_VERSION == 2 gtk_combo_box_remove_text (GTK_COMBO_BOX (bin), i); + #elif GTK_MAJOR_VERSION == 3 + gtk_combo_box_text_remove(GTK_COMBO_BOX_TEXT(bin), i); + #endif + } gdk_threads_leave (); 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 0b076f864..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,9 +136,11 @@ 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; + display = gtk_clipboard_get_display (cp_gtk_clipboard); if (gdk_display_supports_selection_notification (display)) { g_signal_connect (cp_gtk_clipboard, "owner-change", @@ -183,7 +184,7 @@ 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; target_string = (*env)->NewStringUTF (env, target_name); @@ -202,7 +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, (guchar *) barray, len); (*env)->ReleaseByteArrayElements(env, bytes, barray, 0); @@ -324,9 +325,12 @@ Java_gnu_java_awt_peer_gtk_GtkClipboard_advertiseContent #endif { GtkTargetList *target_list; + #if GTK_MAJOR_VERSION == 2 GList *list; + #endif GtkTargetEntry *targets; gint n, i; + gdk_threads_enter (); target_list = gtk_target_list_new (NULL, 0); @@ -371,9 +375,15 @@ Java_gnu_java_awt_peer_gtk_GtkClipboard_advertiseContent /* Turn list into a target table. */ + + #if GTK_MAJOR_VERSION == 3 + n = 0; + #elif GTK_MAJOR_VERSION == 2 n = g_list_length (target_list->list); + #endif if (n > 0) { + #if GTK_MAJOR_VERSION == 2 targets = g_new (GtkTargetEntry, n); for (list = target_list->list, i = 0; list != NULL; @@ -384,7 +394,9 @@ Java_gnu_java_awt_peer_gtk_GtkClipboard_advertiseContent targets[i].flags = pair->flags; targets[i].info = pair->info; } - + #endif + targets = gtk_target_table_new_from_list (target_list, &n); + /* Set the targets plus callback functions and ask for the clipboard to be stored when the application exists if supported. */ if ((*env)->IsSameObject(env, instance, cp_gtk_clipboard_instance)) 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 5de5d82a6..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 @@ -39,7 +39,8 @@ exception statement from your version. */ #include "gtkpeer.h" #include "gnu_java_awt_peer_gtk_GtkComponentPeer.h" -#include <gtk/gtkprivate.h> +#include <gtk/gtk.h> + #define AWT_DEFAULT_CURSOR 0 #define AWT_CROSSHAIR_CURSOR 1 @@ -207,7 +208,7 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetCursorUnlocked GdkWindow *win; GdkCursorType gdk_cursor_type; GdkCursor *gdk_cursor; - + ptr = gtkpeer_get_widget (env, obj); switch (type) @@ -257,20 +258,27 @@ 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)); + if (image == NULL) gdk_cursor = gdk_cursor_new (gdk_cursor_type); else + gdk_cursor - = gdk_cursor_new_from_pixbuf (gdk_drawable_get_display (win), + = gdk_cursor_new_from_pixbuf (gdk_window_get_display (win), cp_gtk_image_get_pixbuf (env, image), x, y); - + gdk_window_set_cursor (win, gdk_cursor); + + #if GTK_MAJOR_VERSION == 2 gdk_cursor_unref (gdk_cursor); + #elif GTK_MAJOR_VERSION == 3 + g_object_unref(gdk_cursor); + #endif /* Make sure the cursor is replaced on screen. */ gdk_flush(); @@ -293,7 +301,8 @@ 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)) { @@ -310,13 +319,15 @@ 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); } } @@ -350,7 +361,8 @@ 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 (); @@ -368,7 +380,8 @@ 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 (); @@ -421,11 +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)))); 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)))); else - event->key.window = get_widget(GTK_WIDGET (ptr))->window; + event->key.window = gtk_widget_get_window(get_widget(GTK_WIDGET (ptr))); event->key.send_event = 0; event->key.time = (guint32) when; @@ -502,7 +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); else gtk_widget_event (get_widget(GTK_WIDGET (ptr)), event); } @@ -535,7 +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); (*env)->ReleaseIntArrayElements(env, jpoint, point, 0); } @@ -569,10 +582,12 @@ 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; + *(point+1) += alloc.y; (*env)->ReleaseIntArrayElements(env, jpoint, point, 0); } @@ -594,9 +609,11 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetDimensions dims = (*env)->GetIntArrayElements (env, jdims, 0); dims[0] = dims[1] = 0; - + #if GTK_MAJOR_VERSION == 2 gtk_widget_size_request (get_widget(GTK_WIDGET (ptr)), &requisition); - + #elif GTK_MAJOR_VERSION == 3 + gtk_widget_get_preferred_size(get_widget(GTK_WIDGET(ptr)), &requisition, NULL); + #endif dims[0] = requisition.width; dims[1] = requisition.height; @@ -637,17 +654,33 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetPreferredDimensions } else { + #if GTK_MAJOR_VERSION == 3 + /* Save the widget's current size request. */ + 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_get_preferred_size(get_widget(GTK_WIDGET (ptr)),NULL, &natural_req); + + /* Reset the widget's size request. */ + gtk_widget_set_size_request (get_widget(GTK_WIDGET (ptr)), + current_req.width, current_req.height); + + #elif GTK_MAJOR_VERSION == 2 /* Save the widget's current size request. */ gtk_widget_size_request (get_widget(GTK_WIDGET (ptr)), ¤t_req); + /* 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); + /* Reset the widget's size request. */ gtk_widget_set_size_request (get_widget(GTK_WIDGET (ptr)), current_req.width, current_req.height); + #endif dims[0] = natural_req.width; dims[1] = natural_req.height; } @@ -683,8 +716,8 @@ 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))) + gtk_fixed_move (GTK_FIXED (gtk_widget_get_parent(widget)), widget, x, y); } gdk_threads_leave (); @@ -703,7 +736,8 @@ 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]; + array = (*env)->NewIntArray (env, 3); @@ -732,7 +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]; array = (*env)->NewIntArray (env, 3); @@ -856,7 +890,7 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_isEnabled ptr = gtkpeer_get_widget (env, obj); - ret_val = GTK_WIDGET_IS_SENSITIVE (get_widget(GTK_WIDGET (ptr))); + ret_val = gtk_widget_is_sensitive (get_widget(GTK_WIDGET (ptr))); gdk_threads_leave (); @@ -873,7 +907,7 @@ 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 (); @@ -966,8 +1000,12 @@ find_bg_color_widget (GtkWidget *widget) void cp_gtk_component_connect_expose_signals (GObject *ptr, jobject gref) { - g_signal_connect (G_OBJECT (ptr), "expose-event", + #if GTK_MAJOR_VERSION == 2 + g_signal_connect (G_OBJECT (ptr), "expose-event", G_CALLBACK (component_expose_cb), gref); + #elif GTK_MAJOR_VERSION == 3 + g_signal_connect (G_OBJECT (ptr), "draw", G_CALLBACK (component_expose_cb), gref); + #endif } void @@ -1078,7 +1116,8 @@ 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 && event->x >= 0 && event->y >= 0 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 fabadc8ca..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 @@ -39,20 +39,21 @@ 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) { GtkWidget *window; GtkWidget *fixed; - + gdk_threads_enter (); - + 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); fixed = gtk_fixed_new (); @@ -75,10 +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))) 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); gdk_threads_leave (); } diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c index ef7df0f03..46066b1db 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c @@ -109,7 +109,11 @@ Java_gnu_java_awt_peer_gtk_GtkFramePeer_getMenuBarHeight ptr = gtkpeer_get_widget (env, menubar); + #if GTK_MAJOR_VERSION == 2 gtk_widget_size_request (ptr, &requisition); + #elif GTK_MAJOR_VERSION == 3 + gtk_widget_get_preferred_size(ptr, &requisition, NULL); + #endif gdk_threads_leave (); @@ -141,7 +145,12 @@ Java_gnu_java_awt_peer_gtk_GtkFramePeer_setMenuBarWidthUnlocked /* Get the menubar's natural size request. */ gtk_widget_set_size_request (GTK_WIDGET (ptr), -1, -1); + + #if GTK_MAJOR_VERSION == 2 gtk_widget_size_request (GTK_WIDGET (ptr), &natural_req); + #elif GTK_MAJOR_VERSION == 3 + gtk_widget_get_preferred_size(GTK_WIDGET (ptr), NULL, &natural_req); + #endif /* Set the menubar's size request to width by natural_req.height. */ gtk_widget_set_size_request (GTK_WIDGET (ptr), 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 3703858fe..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 @@ -85,16 +85,29 @@ Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkWidgetGetPreferredDimensions dims = (*env)->GetIntArrayElements (env, jdims, 0); dims[0] = dims[1] = 0; + #if GTK_MAJOR_VERSION == 3 /* Save the widget's current size request. */ + + gtk_widget_get_preferred_size(GTK_WIDGET (label), ¤t_req, NULL); + /* Get the widget's "natural" size request. */ + gtk_widget_set_size_request (GTK_WIDGET (label), -1, -1); + gtk_widget_get_preferred_size(GTK_WIDGET (label), NULL, &natural_req); + + /* Reset the widget's size request. */ + gtk_widget_set_size_request (GTK_WIDGET (label), + current_req.width, current_req.height); + #elif GTK_MAJOR_VERSION == 2 + /* Save the widget's current size request. */ gtk_widget_size_request (GTK_WIDGET (label), ¤t_req); - + /* Get the widget's "natural" size request. */ gtk_widget_set_size_request (GTK_WIDGET (label), -1, -1); gtk_widget_size_request (GTK_WIDGET (label), &natural_req); - + /* Reset the widget's size request. */ gtk_widget_set_size_request (GTK_WIDGET (label), current_req.width, current_req.height); + #endif dims[0] = natural_req.width; dims[1] = natural_req.height; @@ -212,9 +225,9 @@ 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); } gdk_threads_leave (); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c index 4b7b63e6d..f2de65c52 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c @@ -115,8 +115,12 @@ Java_gnu_java_awt_peer_gtk_GtkListPeer_create gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (list), FALSE); + #if GTK_MAJOR_VERSION == 2 gtk_widget_size_request (GTK_WIDGET (list), &req); - + #elif GTK_MAJOR_VERSION == 3 + gtk_widget_get_preferred_size(GTK_WIDGET (list), &req, NULL); + #endif + gtk_widget_set_size_request (GTK_WIDGET (list), req.width, req.height); gtk_container_add (GTK_CONTAINER (sw), list); @@ -375,17 +379,30 @@ Java_gnu_java_awt_peer_gtk_GtkListPeer_getSize ptr = gtkpeer_get_widget (env, obj); bin = list_get_widget (GTK_WIDGET (ptr)); + #if GTK_MAJOR_VERSION == 3 + /* Save the widget's current size request. */ + + gtk_widget_get_preferred_size(bin, ¤t_req, NULL); + /* Get the widget's "natural" size request. */ + gtk_widget_set_size_request (GTK_WIDGET (ptr), -1, -1); + + gtk_widget_get_preferred_size(bin, NULL, &natural_req); + /* Reset the widget's size request. */ + gtk_widget_set_size_request (bin, + current_req.width, current_req.height); + #elif GTK_MAJOR_VERSION == 2 /* Save the widget's current size request. */ gtk_widget_size_request (bin, ¤t_req); /* Get the widget's "natural" size request. */ gtk_widget_set_size_request (GTK_WIDGET (ptr), -1, -1); gtk_widget_size_request (bin, &natural_req); - + /* Reset the widget's size request. */ gtk_widget_set_size_request (bin, current_req.width, current_req.height); + #endif dims[0] = natural_req.width; /* Calculate the final height, by comparing the number of rows 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 965435545..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,7 +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))); 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 1081de253..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,7 +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_accel_group_new ()); } else @@ -59,9 +59,9 @@ 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)))); - 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))), parent_accel); } @@ -93,8 +93,10 @@ Java_gnu_java_awt_peer_gtk_GtkMenuPeer_create /* Allow this menu to grab the pointer. */ toplevel = gtk_widget_get_toplevel (menu); + if (GTK_IS_WINDOW (toplevel)) { + gtk_window_group_add_window (cp_gtk_global_window_group, GTK_WINDOW(toplevel)); } @@ -114,16 +116,19 @@ Java_gnu_java_awt_peer_gtk_GtkMenuPeer_addTearOff { void *ptr1; GtkWidget *menu, *item; - + gdk_threads_enter (); ptr1 = gtkpeer_get_widget (env, obj); menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (ptr1)); + #if GTK_MAJOR_VERSION == 2 item = gtk_tearoff_menu_item_new (); + #elif GTK_MAJOR_VERSION == 3 + item = gtk_menu_item_new(); + #endif gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show (item); - 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 e52e6de51..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,9 @@ Java_gnu_java_awt_peer_gtk_GtkPanelPeer_create widget = gtk_fixed_new (); - gtk_fixed_set_has_window (GTK_FIXED (widget), TRUE); - - GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS); + gtk_widget_set_has_window (widget, TRUE); + gtk_widget_set_can_focus(widget, TRUE); gtkpeer_set_widget (env, obj, widget); gdk_threads_leave (); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c index 0511c051a..51da43623 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c @@ -73,7 +73,7 @@ Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_show p->x = x; p->y = y; - gtk_menu_popup (GTK_MENU (GTK_MENU_ITEM (ptr)->submenu), + gtk_menu_popup (GTK_MENU (gtk_menu_item_get_submenu(GTK_MENU_ITEM (ptr))), NULL, NULL, menu_pos, p, 0, time); g_free (p); @@ -95,7 +95,7 @@ Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_setupAccelGroup ptr1 = gtkpeer_get_widget (env, obj); - menu = GTK_MENU (GTK_MENU_ITEM (ptr1)->submenu); + menu = GTK_MENU (gtk_menu_item_get_submenu(GTK_MENU_ITEM (ptr1))); gtk_menu_set_accel_group (menu, gtk_accel_group_new ()); /* FIXME: update this to use GTK-2.4 GtkActions. */ // FIXME: _gtk_accel_group_attach is a GTK-private function, so 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 0d67b0b78..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,7 @@ 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 (); } @@ -126,7 +126,7 @@ 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 (); } @@ -146,9 +146,16 @@ Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_getHScrollbarHeight ptr = gtkpeer_get_widget (env, obj); sw = GTK_SCROLLED_WINDOW (scrollpane_get_widget (GTK_WIDGET (ptr))); - - gtk_widget_size_request (sw->hscrollbar, &requisition); + + #if GTK_MAJOR_VERSION == 2 + gtk_widget_size_request (gtk_scrolled_window_get_hscrollbar(sw), &requisition); + #elif GTK_MAJOR_VERSION == 3 + gtk_widget_get_preferred_size(gtk_scrolled_window_get_hscrollbar(sw), &requisition, NULL); + #endif + gtk_widget_style_get (GTK_WIDGET (sw), "scrollbar_spacing", &spacing, NULL); + + height = requisition.height + spacing; gdk_threads_leave (); @@ -171,9 +178,16 @@ Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_getVScrollbarWidth ptr = gtkpeer_get_widget (env, obj); sw = GTK_SCROLLED_WINDOW (scrollpane_get_widget (GTK_WIDGET (ptr))); - - gtk_widget_size_request (sw->vscrollbar, &requisition); + + #if GTK_MAJOR_VERSION == 2 + gtk_widget_size_request (gtk_scrolled_window_get_vscrollbar(sw), &requisition); + #elif GTK_MAJOR_VERSION == 3 + gtk_widget_get_preferred_size(gtk_scrolled_window_get_vscrollbar(sw), &requisition, NULL); + #endif + gtk_widget_style_get (GTK_WIDGET (sw), "scrollbar_spacing", &spacing, NULL); + + width = requisition.width + spacing; 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 64d91d2b2..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 @@ -81,8 +81,13 @@ Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_create { GtkWidget *scrollbar; GtkWidget *eventbox; + + #if GTK_MAJOR_VERSION == 2 GtkObject *adj; - + #elif GTK_MAJOR_VERSION == 3 + GtkAdjustment *adj; + #endif + /* Create global reference and save it for future use */ gtkpeer_set_global_ref (env, obj); @@ -104,13 +109,20 @@ Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_create (gdouble) visible_amount); scrollbar = orientation + + #if GTK_MAJOR_VERSION == 2 ? gtk_vscrollbar_new (GTK_ADJUSTMENT (adj)) : gtk_hscrollbar_new (GTK_ADJUSTMENT (adj)); + #elif GTK_MAJOR_VERSION == 3 + ? gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, adj) + : gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, adj); + #endif + eventbox = gtk_event_box_new (); gtk_container_add (GTK_CONTAINER (eventbox), scrollbar); gtk_widget_show (scrollbar); - GTK_RANGE (scrollbar)->round_digits = 0; + gtk_range_set_round_digits(GTK_RANGE (scrollbar), 0); /* These calls seem redundant but they are not. They clamp values so that the slider's entirety is always between the two steppers. */ @@ -162,7 +174,7 @@ Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setLineIncrement gdk_threads_enter (); adj = gtk_range_get_adjustment (GTK_RANGE (wid)); - adj->step_increment = (gdouble) amount; + gtk_adjustment_set_step_increment(adj, (gdouble)amount); gtk_adjustment_changed (adj); gdk_threads_leave (); @@ -182,7 +194,7 @@ Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setPageIncrement gdk_threads_enter (); adj = gtk_range_get_adjustment (GTK_RANGE (wid)); - adj->page_increment = (gdouble) amount; + gtk_adjustment_set_page_increment(adj, (gdouble)amount); gtk_adjustment_changed (adj); gdk_threads_leave (); @@ -210,8 +222,8 @@ Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setBarValues } adj = gtk_range_get_adjustment (GTK_RANGE (wid)); - adj->page_size = (gdouble) visible; - + gtk_adjustment_set_page_size(adj, (gdouble)visible); + gtk_range_set_range (GTK_RANGE (wid), (gdouble) min, (gdouble) max); gtk_range_set_value (GTK_RANGE (wid), (gdouble) value); @@ -227,15 +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) { gdouble power; gint i; - i = range->round_digits; + 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 e5ba4c7b1..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,7 @@ 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); @@ -425,12 +425,12 @@ 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), + (jbyte *) gtk_selection_data_get_data(selection_data)); } (*env)->CallVoidMethod (env, selection_obj, diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c index 4d768fa33..660b75885 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c @@ -252,7 +252,12 @@ Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getHScrollbarHeight if (sw) { - gtk_widget_size_request (sw->hscrollbar, &requisition); + #if GTK_MAJOR_VERSION == 2 + gtk_widget_size_request (gtk_scrolled_window_get_hscrollbar(sw), &requisition); + #elif GTK_MAJOR_VERSION == 3 + gtk_widget_get_preferred_size (gtk_scrolled_window_get_hscrollbar(sw), &requisition, NULL); + #endif + gtk_widget_style_get (GTK_WIDGET (sw), "scrollbar_spacing", &spacing, NULL); height = requisition.height + spacing; } @@ -282,7 +287,12 @@ Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getVScrollbarWidth if (sw) { - gtk_widget_size_request (sw->vscrollbar, &requisition); + #if GTK_MAJOR_VERSION == 2 + gtk_widget_size_request (gtk_scrolled_window_get_vscrollbar(sw), &requisition); + #elif GTK_MAJOR_VERSION == 3 + gtk_widget_get_preferred_size(gtk_scrolled_window_get_vscrollbar(sw), &requisition, NULL); + #endif + gtk_widget_style_get (GTK_WIDGET (sw), "scrollbar_spacing", &spacing, NULL); width = requisition.width + spacing; } diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c index df82ff091..2a21c4c98 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c @@ -187,8 +187,8 @@ get_border_width (GtkWidget *entry) "focus-line-width", &focus_width, NULL); - if (GTK_ENTRY (entry)->has_frame) - x_border_width += entry->style->xthickness; + if (gtk_entry_get_has_frame(GTK_ENTRY (entry))) + x_border_width += gtk_widget_get_style(entry)->xthickness; if (!interior_focus) x_border_width += focus_width; 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 758399c64..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 @@ -1,4 +1,3 @@ - /* gtktoolkit.c -- Native portion of GtkToolkit Copyright (C) 1998, 1999, 2005, 2007, 2010 Free Software Foundation, Inc. @@ -42,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,8 +152,8 @@ Java_gnu_java_awt_peer_gtk_GtkToolkit_gtkInit (JNIEnv *env, { int argc = 1; char **argv; - char *homedir, *rcpath = NULL; - + char *homedir ,*rcpath = NULL; + gtkgenericpeer = (*env)->FindClass(env, "gnu/java/awt/peer/gtk/GtkGenericPeer"); gtkgenericpeer = (*env)->NewGlobalRef(env, gtkgenericpeer); @@ -181,16 +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 ()); - + 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); - + #endif g_free (rcpath); g_free (argv[0]); g_free (argv); @@ -238,6 +240,7 @@ static void jni_lock_cb() * A callback function that implements gdk_threads_leave(). This is * implemented to wrap the JNI MonitorExit() function. */ + static void jni_unlock_cb() { @@ -273,9 +276,13 @@ init_glib_threads(JNIEnv *env, jint portableNativeSync, jobject lock) global_lock = (*env)->NewGlobalRef(env, lock); gdk_threads_set_lock_functions(&jni_lock_cb, &jni_unlock_cb); } -#if GLIB_MINOR_VERSION < 32 + +#if GLIB_MINOR_VERSION < 32 && GTK_MAJOR_VERSION == 2 g_thread_init(NULL); #endif + + + } else { @@ -372,12 +379,15 @@ Java_gnu_java_awt_peer_gtk_GtkToolkit_gtkMain (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused))) { gdk_threads_enter(); - + #if GTK_MAJOR_VERSION == 2 gtk_init_add (post_set_running_flag, NULL); gtk_quit_add (gtk_main_level (), clear_running_flag, NULL); - + #elif GTK_MAJOR_VERSION == 3 + post_set_running_flag(NULL); + #endif + gtk_main (); - + gdk_threads_leave(); } @@ -386,9 +396,14 @@ Java_gnu_java_awt_peer_gtk_GtkToolkit_gtkQuit (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused))) { gdk_threads_enter (); + + #if GTK_MAJOR_VERSION == 3 + gtk_main_level(); + clear_running_flag(NULL); + #endif gtk_main_quit (); - + gdk_threads_leave (); } @@ -459,23 +474,33 @@ JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_getMouseNumberOfButtons (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused))) { - jint res = -1; - GList *devices; + #if GTK_MAJOR_VERSION == 3 + GdkDeviceManager *gdk_device_manager; + #endif GdkDevice *d; + jint res = -1; + GList *devices; + + gdk_threads_enter (); /* FIXME: Why doesn't this return the correct number? */ + #if GTK_MAJOR_VERSION == 2 devices = gdk_devices_list(); - + #elif GTK_MAJOR_VERSION == 3 + gdk_device_manager = gdk_display_get_device_manager(gdk_display_get_default()); + devices = gdk_device_manager_list_devices(gdk_device_manager, GDK_DEVICE_TYPE_MASTER); + #endif + while( res == -1 && devices != NULL ) { d = GDK_DEVICE( devices->data ); - if( d->source == GDK_SOURCE_MOUSE ) - res = d->num_keys; + if( gdk_device_get_source(d) == GDK_SOURCE_MOUSE ) + res = gdk_device_get_n_keys(d); devices = devices->next; } - + g_list_free(devices); gdk_threads_leave (); return res; @@ -563,11 +588,25 @@ Java_gnu_java_awt_peer_gtk_GtkToolkit_getLockState gint coord; GdkModifierType state, mask; GdkWindow *root_window; + + #if GTK_MAJOR_VERSION == 3 + GdkDeviceManager *dev_manager; + GdkDevice *pointer; + #endif + + gdk_threads_enter (); root_window = gdk_get_default_root_window (); + + #if GTK_MAJOR_VERSION == 2 gdk_window_get_pointer (root_window, &coord, &coord, &state); + #elif GTK_MAJOR_VERSION == 3 + dev_manager = gdk_display_get_device_manager(gdk_window_get_display(root_window)); + pointer = gdk_device_manager_get_client_pointer(dev_manager); + gdk_window_get_device_position (root_window, pointer, &coord, &coord, &state); + #endif switch (key) { 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 af0868cc2..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 @@ -37,8 +37,11 @@ exception statement from your version. */ #include "jcl.h" #include "gtkpeer.h" -#include <gdk/gdktypes.h> -#include <gdk/gdkprivate.h> + +#include <gdk/gdk.h> + +#include <gdk/gdkx.h> + #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixdata.h> @@ -55,11 +58,17 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init (JNIEnv *env, jobject peer, jint width, jint height) { + GtkWidget *widget = NULL; + #if GTK_MAJOR_VERSION == 2 GdkPixmap* pixmap; + #elif GTK_MAJOR_VERSION == 3 + cairo_surface_t *surface; + #endif void *ptr = NULL; - + gdk_threads_enter(); + if( peer != NULL ) { @@ -68,35 +77,71 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init (JNIEnv *env, widget = GTK_WIDGET (ptr); g_assert (widget != NULL); - pixmap = gdk_pixmap_new( widget->window, width, height, -1 ); - } - else - pixmap = gdk_pixmap_new( NULL, width, height, - gdk_rgb_get_visual()->depth ); - + + #if GTK_MAJOR_VERSION == 2 + pixmap = gdk_pixmap_new( gtk_widget_get_window(widget), width, height, -1 ); + #elif GTK_MAJOR_VERSION == 3 + surface = gdk_window_create_similar_surface(gtk_widget_get_window(widget), CAIRO_CONTENT_COLOR_ALPHA, width, height); + #endif + } + else{ + #if GTK_MAJOR_VERSION == 2 + pixmap = gdk_pixmap_new( NULL, width, height, + 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 + } gdk_threads_leave(); + #if GTK_MAJOR_VERSION == 2 g_assert( pixmap != NULL ); - - return PTR_TO_JLONG( pixmap ); + return PTR_TO_JLONG(pixmap); + #elif GTK_MAJOR_VERSION == 3 + g_assert( surface != NULL); + return PTR_TO_JLONG( surface ); + #endif } /** * Destroy the surface */ +#if GTK_MAJOR_VERSION == 3 +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer) +{ + gdk_threads_enter(); + cairo_surface_t *surface = JLONG_TO_PTR(cairo_surface_t, pointer); + if( surface != NULL ) + { + + g_object_unref( surface ); + + } + gdk_threads_leave(); +} +#endif +#if GTK_MAJOR_VERSION == 2 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), jlong pointer) { GdkPixmap* pixmap = JLONG_TO_PTR(GdkPixmap, pointer); + + if( pixmap != NULL ) { - gdk_threads_enter(); - g_object_unref( pixmap ); - gdk_threads_leave(); + gdk_threads_enter(); + g_object_unref( pixmap); + gdk_threads_leave(); + } + } +#endif /** * Gets all pixels in an array @@ -105,9 +150,12 @@ JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels (JNIEnv *env, jobject obj, jlong pointer) { - /* jint *pixeldata, *jpixdata; */ - jint *jpixdata; + jint *jpixdata; + #if GTK_MAJOR_VERSION == 2 GdkPixmap *pixmap; + + #endif + GdkPixbuf *pixbuf; jintArray jpixels; int width, height, size; @@ -124,18 +172,30 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels g_assert (field != 0); height = (*env)->GetIntField (env, obj, field); + #if GTK_MAJOR_VERSION == 2 pixmap = JLONG_TO_PTR(GdkPixmap, pointer); g_assert(pixmap != NULL); + #endif + + gdk_threads_enter(); - + #if GTK_MAJOR_VERSION == 3 + cairo_surface_t *surface; + surface = JLONG_TO_PTR(cairo_surface_t, pointer); + g_assert(surface != NULL); + #endif size = width * height; jpixels = (*env)->NewIntArray ( env, size ); jpixdata = (*env)->GetIntArrayElements (env, jpixels, NULL); + #if GTK_MAJOR_VERSION == 2 pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, TRUE, 8, width, height ); gdk_pixbuf_get_from_drawable( pixbuf, pixmap, NULL, 0, 0, 0, 0, width, height ); - + #elif GTK_MAJOR_VERSION == 3 + pixbuf = gdk_pixbuf_get_from_surface (surface, 0,0,width,height); + #endif + if (pixbuf != NULL) { pixels = gdk_pixbuf_get_pixels(pixbuf); @@ -156,20 +216,37 @@ JNIEXPORT void JNICALL 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) -{ +{ + GdkPixbuf *pixbuf; + + #if GTK_MAJOR_VERSION == 2 GdkPixmap* pixmap = JLONG_TO_PTR(GdkPixmap, pointer); - g_assert (pixmap != NULL); + #elif GTK_MAJOR_VERSION == 3 + cairo_surface_t *surface = JLONG_TO_PTR(cairo_surface_t, pointer); + g_assert (surface != NULL); + #endif gdk_threads_enter(); + #if GTK_MAJOR_VERSION == 2 pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, TRUE, 8, w, h ); gdk_pixbuf_get_from_drawable( pixbuf, pixmap, NULL, x, y, 0, 0, w, h ); - gdk_draw_pixbuf (pixmap, NULL, pixbuf, - 0, 0, x + dx, y + dy, - w, h, - GDK_RGB_DITHER_NORMAL, 0, 0); + #elif GTK_MAJOR_VERSION == 3 + pixbuf = gdk_pixbuf_get_from_surface (surface, x,y,w,h); + #endif + + #if GTK_MAJOR_VERSION == 2 + cairo_t *cr = gdk_cairo_create(pixmap); + #elif GTK_MAJOR_VERSION == 3 + cairo_t *cr = cairo_create (surface); + #endif + + gdk_cairo_set_source_pixbuf (cr, pixbuf, x + dx, y + dy); + cairo_paint (cr); + cairo_destroy (cr); + gdk_threads_leave(); } @@ -178,25 +255,35 @@ 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) { - GdkPixmap *dst, *src; - GdkGC *gc; + + GdkRectangle clip; + - src = JLONG_TO_PTR(GdkPixmap, srcptr); - dst = JLONG_TO_PTR(GdkPixmap, pointer); + gdk_threads_enter(); + cairo_surface_t *dst, *src; + src = JLONG_TO_PTR(cairo_surface_t, srcptr); + dst = JLONG_TO_PTR(cairo_surface_t, pointer); g_assert (src != NULL); g_assert (dst != NULL); - - gdk_threads_enter(); + + clip.x = 0; + clip.y = 0; + clip.width = w; + clip.height = h; - gc = gdk_gc_new( dst ); - gdk_draw_drawable(dst, - gc, - src, - 0, 0, - x, y, - w, h); - g_object_unref( gc ); + cairo_t *cr = cairo_create (dst); + /* clipping restricts the intermediate surface's size, so it's a good idea + * to use it. */ + gdk_cairo_rectangle (cr, &clip); + cairo_clip (cr); + /* Now push a group to change the target */ + cairo_push_group (cr); + cairo_set_source_surface (cr, src, x, y); + cairo_paint (cr); + /* Now copy the intermediate target back */ + cairo_pop_group_to_source (cr); + cairo_paint (cr); + cairo_destroy (cr); 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 6ba8d4767..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 @@ -346,93 +346,93 @@ keysym_to_awt_keycode (GdkEventKey *event) state = event->state; /* VK_A through VK_Z */ - if (ukeyval >= GDK_A && ukeyval <= GDK_Z) + if (ukeyval >= GDK_KEY_A && ukeyval <= GDK_KEY_Z) return ukeyval; /* VK_0 through VK_9 */ - if (ukeyval >= GDK_0 && ukeyval <= GDK_9) + if (ukeyval >= GDK_KEY_0 && ukeyval <= GDK_KEY_9) return ukeyval; switch (ukeyval) { - case GDK_Return: - case GDK_KP_Enter: + case GDK_KEY_Return: + case GDK_KEY_KP_Enter: return VK_ENTER; - case GDK_BackSpace: + case GDK_KEY_BackSpace: return VK_BACK_SPACE; - case GDK_Tab: + case GDK_KEY_Tab: return VK_TAB; - case GDK_Cancel: + case GDK_KEY_Cancel: return VK_CANCEL; - case GDK_Clear: + case GDK_KEY_Clear: return VK_CLEAR; - case GDK_Shift_L: - case GDK_Shift_R: + case GDK_KEY_Shift_L: + case GDK_KEY_Shift_R: return VK_SHIFT; - case GDK_Control_L: - case GDK_Control_R: + case GDK_KEY_Control_L: + case GDK_KEY_Control_R: return VK_CONTROL; - case GDK_Alt_L: - case GDK_Alt_R: + case GDK_KEY_Alt_L: + case GDK_KEY_Alt_R: return VK_ALT; - case GDK_Pause: + case GDK_KEY_Pause: return VK_PAUSE; - case GDK_Caps_Lock: + case GDK_KEY_Caps_Lock: return VK_CAPS_LOCK; - case GDK_Escape: + case GDK_KEY_Escape: return VK_ESCAPE; - case GDK_space: + case GDK_KEY_space: return VK_SPACE; - case GDK_KP_Page_Up: + case GDK_KEY_KP_Page_Up: /* For keys on the numeric keypad, the JVM produces one of two virtual keys, depending on the num lock state. */ if (state & GDK_MOD2_MASK) return VK_NUMPAD9; else return VK_PAGE_UP; - case GDK_Page_Up: + case GDK_KEY_Page_Up: return VK_PAGE_UP; - case GDK_KP_Page_Down: + case GDK_KEY_KP_Page_Down: if (state & GDK_MOD2_MASK) return VK_NUMPAD3; else return VK_PAGE_DOWN; - case GDK_Page_Down: + case GDK_KEY_Page_Down: return VK_PAGE_DOWN; - case GDK_KP_End: + case GDK_KEY_KP_End: if (state & GDK_MOD2_MASK) return VK_NUMPAD1; else return VK_END; - case GDK_End: + case GDK_KEY_End: return VK_END; - case GDK_KP_Home: + case GDK_KEY_KP_Home: if (state & GDK_MOD2_MASK) return VK_NUMPAD7; else return VK_HOME; - case GDK_Home: + case GDK_KEY_Home: return VK_HOME; - case GDK_KP_Begin: + case GDK_KEY_KP_Begin: if (state & GDK_MOD2_MASK) return VK_NUMPAD5; else return VK_UNDEFINED; - case GDK_Left: + case GDK_KEY_Left: return VK_LEFT; - case GDK_Up: + case GDK_KEY_Up: return VK_UP; - case GDK_Right: + case GDK_KEY_Right: return VK_RIGHT; - case GDK_Down: + case GDK_KEY_Down: return VK_DOWN; - case GDK_comma: + case GDK_KEY_comma: return VK_COMMA; - case GDK_minus: + case GDK_KEY_minus: return VK_MINUS; - case GDK_period: + case GDK_KEY_period: return VK_PERIOD; - case GDK_slash: + case GDK_KEY_slash: return VK_SLASH; /* return VK_0; @@ -446,9 +446,9 @@ keysym_to_awt_keycode (GdkEventKey *event) return VK_8; return VK_9; */ - case GDK_semicolon: + case GDK_KEY_semicolon: return VK_SEMICOLON; - case GDK_equal: + case GDK_KEY_equal: return VK_EQUALS; /* return VK_A; @@ -478,213 +478,213 @@ keysym_to_awt_keycode (GdkEventKey *event) return VK_Y; return VK_Z; */ - case GDK_bracketleft: + case GDK_KEY_bracketleft: return VK_OPEN_BRACKET; - case GDK_backslash: + case GDK_KEY_backslash: return VK_BACK_SLASH; - case GDK_bracketright: + case GDK_KEY_bracketright: return VK_CLOSE_BRACKET; - case GDK_KP_0: + case GDK_KEY_KP_0: return VK_NUMPAD0; - case GDK_KP_1: + case GDK_KEY_KP_1: return VK_NUMPAD1; - case GDK_KP_2: + case GDK_KEY_KP_2: return VK_NUMPAD2; - case GDK_KP_3: + case GDK_KEY_KP_3: return VK_NUMPAD3; - case GDK_KP_4: + case GDK_KEY_KP_4: return VK_NUMPAD4; - case GDK_KP_5: + case GDK_KEY_KP_5: return VK_NUMPAD5; - case GDK_KP_6: + case GDK_KEY_KP_6: return VK_NUMPAD6; - case GDK_KP_7: + case GDK_KEY_KP_7: return VK_NUMPAD7; - case GDK_KP_8: + case GDK_KEY_KP_8: return VK_NUMPAD8; - case GDK_KP_9: + case GDK_KEY_KP_9: return VK_NUMPAD9; - case GDK_KP_Multiply: + case GDK_KEY_KP_Multiply: return VK_MULTIPLY; - case GDK_KP_Add: + case GDK_KEY_KP_Add: return VK_ADD; /* return VK_SEPARATER; */ - case GDK_KP_Separator: + case GDK_KEY_KP_Separator: return VK_SEPARATOR; - case GDK_KP_Subtract: + case GDK_KEY_KP_Subtract: return VK_SUBTRACT; - case GDK_KP_Decimal: + case GDK_KEY_KP_Decimal: return VK_DECIMAL; - case GDK_KP_Divide: + case GDK_KEY_KP_Divide: return VK_DIVIDE; - case GDK_KP_Delete: + case GDK_KEY_KP_Delete: if (state & GDK_MOD2_MASK) return VK_DECIMAL; else return VK_DELETE; - case GDK_Delete: + case GDK_KEY_Delete: return VK_DELETE; - case GDK_Num_Lock: + case GDK_KEY_Num_Lock: return VK_NUM_LOCK; - case GDK_Scroll_Lock: + case GDK_KEY_Scroll_Lock: return VK_SCROLL_LOCK; - case GDK_F1: + case GDK_KEY_F1: return VK_F1; - case GDK_F2: + case GDK_KEY_F2: return VK_F2; - case GDK_F3: + case GDK_KEY_F3: return VK_F3; - case GDK_F4: + case GDK_KEY_F4: return VK_F4; - case GDK_F5: + case GDK_KEY_F5: return VK_F5; - case GDK_F6: + case GDK_KEY_F6: return VK_F6; - case GDK_F7: + case GDK_KEY_F7: return VK_F7; - case GDK_F8: + case GDK_KEY_F8: return VK_F8; - case GDK_F9: + case GDK_KEY_F9: return VK_F9; - case GDK_F10: + case GDK_KEY_F10: return VK_F10; - case GDK_F11: + case GDK_KEY_F11: return VK_F11; - case GDK_F12: + case GDK_KEY_F12: return VK_F12; - case GDK_F13: + case GDK_KEY_F13: return VK_F13; - case GDK_F14: + case GDK_KEY_F14: return VK_F14; - case GDK_F15: + case GDK_KEY_F15: return VK_F15; - case GDK_F16: + case GDK_KEY_F16: return VK_F16; - case GDK_F17: + case GDK_KEY_F17: return VK_F17; - case GDK_F18: + case GDK_KEY_F18: return VK_F18; - case GDK_F19: + case GDK_KEY_F19: return VK_F19; - case GDK_F20: + case GDK_KEY_F20: return VK_F20; - case GDK_F21: + case GDK_KEY_F21: return VK_F21; - case GDK_F22: + case GDK_KEY_F22: return VK_F22; - case GDK_F23: + case GDK_KEY_F23: return VK_F23; - case GDK_F24: + case GDK_KEY_F24: return VK_F24; - case GDK_Print: + case GDK_KEY_Print: return VK_PRINTSCREEN; - case GDK_KP_Insert: + case GDK_KEY_KP_Insert: if (state & GDK_MOD2_MASK) return VK_NUMPAD0; else return VK_INSERT; - case GDK_Insert: + case GDK_KEY_Insert: return VK_INSERT; - case GDK_Help: + case GDK_KEY_Help: return VK_HELP; - case GDK_Meta_L: - case GDK_Meta_R: + case GDK_KEY_Meta_L: + case GDK_KEY_Meta_R: return VK_META; - case GDK_grave: + case GDK_KEY_grave: return VK_BACK_QUOTE; - case GDK_apostrophe: + case GDK_KEY_apostrophe: return VK_QUOTE; - case GDK_KP_Up: + case GDK_KEY_KP_Up: if (state & GDK_MOD2_MASK) return VK_NUMPAD8; else return VK_KP_UP; - case GDK_KP_Down: + case GDK_KEY_KP_Down: if (state & GDK_MOD2_MASK) return VK_NUMPAD2; else return VK_KP_DOWN; - case GDK_KP_Left: + case GDK_KEY_KP_Left: if (state & GDK_MOD2_MASK) return VK_NUMPAD4; else return VK_KP_LEFT; - case GDK_KP_Right: + case GDK_KEY_KP_Right: if (state & GDK_MOD2_MASK) return VK_NUMPAD6; else return VK_KP_RIGHT; - case GDK_dead_grave: + case GDK_KEY_dead_grave: return VK_DEAD_GRAVE; - case GDK_dead_acute: + case GDK_KEY_dead_acute: return VK_DEAD_ACUTE; - case GDK_dead_circumflex: + case GDK_KEY_dead_circumflex: return VK_DEAD_CIRCUMFLEX; - case GDK_dead_tilde: + case GDK_KEY_dead_tilde: return VK_DEAD_TILDE; - case GDK_dead_macron: + case GDK_KEY_dead_macron: return VK_DEAD_MACRON; - case GDK_dead_breve: + case GDK_KEY_dead_breve: return VK_DEAD_BREVE; - case GDK_dead_abovedot: + case GDK_KEY_dead_abovedot: return VK_DEAD_ABOVEDOT; - case GDK_dead_diaeresis: + case GDK_KEY_dead_diaeresis: return VK_DEAD_DIAERESIS; - case GDK_dead_abovering: + case GDK_KEY_dead_abovering: return VK_DEAD_ABOVERING; - case GDK_dead_doubleacute: + case GDK_KEY_dead_doubleacute: return VK_DEAD_DOUBLEACUTE; - case GDK_dead_caron: + case GDK_KEY_dead_caron: return VK_DEAD_CARON; - case GDK_dead_cedilla: + case GDK_KEY_dead_cedilla: return VK_DEAD_CEDILLA; - case GDK_dead_ogonek: + case GDK_KEY_dead_ogonek: return VK_DEAD_OGONEK; - case GDK_dead_iota: + case GDK_KEY_dead_iota: return VK_DEAD_IOTA; - case GDK_dead_voiced_sound: + case GDK_KEY_dead_voiced_sound: return VK_DEAD_VOICED_SOUND; - case GDK_dead_semivoiced_sound: + case GDK_KEY_dead_semivoiced_sound: return VK_DEAD_SEMIVOICED_SOUND; - case GDK_ampersand: + case GDK_KEY_ampersand: return VK_AMPERSAND; - case GDK_asterisk: + case GDK_KEY_asterisk: return VK_ASTERISK; - case GDK_quotedbl: + case GDK_KEY_quotedbl: return VK_QUOTEDBL; - case GDK_less: + case GDK_KEY_less: return VK_LESS; - case GDK_greater: + case GDK_KEY_greater: return VK_GREATER; - case GDK_braceleft: + case GDK_KEY_braceleft: return VK_BRACELEFT; - case GDK_braceright: + case GDK_KEY_braceright: return VK_BRACERIGHT; - case GDK_at: + case GDK_KEY_at: return VK_AT; - case GDK_colon: + case GDK_KEY_colon: return VK_COLON; - case GDK_asciicircum: + case GDK_KEY_asciicircum: return VK_CIRCUMFLEX; - case GDK_dollar: + case GDK_KEY_dollar: return VK_DOLLAR; - case GDK_EuroSign: + case GDK_KEY_EuroSign: return VK_EURO_SIGN; - case GDK_exclam: + case GDK_KEY_exclam: return VK_EXCLAMATION_MARK; - case GDK_exclamdown: + case GDK_KEY_exclamdown: return VK_INVERTED_EXCLAMATION_MARK; - case GDK_parenleft: + case GDK_KEY_parenleft: return VK_LEFT_PARENTHESIS; - case GDK_numbersign: + case GDK_KEY_numbersign: return VK_NUMBER_SIGN; - case GDK_plus: + case GDK_KEY_plus: return VK_PLUS; - case GDK_parenright: + case GDK_KEY_parenright: return VK_RIGHT_PARENTHESIS; - case GDK_underscore: + case GDK_KEY_underscore: return VK_UNDERSCORE; /* return VK_FINAL; @@ -692,19 +692,19 @@ keysym_to_awt_keycode (GdkEventKey *event) return VK_NONCONVERT; return VK_ACCEPT; */ - case GDK_Mode_switch: + case GDK_KEY_Mode_switch: return VK_MODECHANGE; /* return VK_KANA; */ - case GDK_Kanji: + case GDK_KEY_Kanji: return VK_KANJI; /* return VK_ALPHANUMERIC; */ - case GDK_Katakana: + case GDK_KEY_Katakana: return VK_KATAKANA; - case GDK_Hiragana: + case GDK_KEY_Hiragana: return VK_HIRAGANA; /* return VK_FULL_WIDTH; @@ -712,16 +712,16 @@ keysym_to_awt_keycode (GdkEventKey *event) return VK_ROMAN_CHARACTERS; return VK_ALL_CANDIDATES; */ - case GDK_PreviousCandidate: + case GDK_KEY_PreviousCandidate: return VK_PREVIOUS_CANDIDATE; - case GDK_Codeinput: + case GDK_KEY_Codeinput: return VK_CODE_INPUT; /* return VK_JAPANESE_KATAKANA; return VK_JAPANESE_HIRAGANA; return VK_JAPANESE_ROMAN; */ - case GDK_Kana_Lock: + case GDK_KEY_Kana_Lock: return VK_KANA_LOCK; /* return VK_INPUT_METHOD_ON_OFF; @@ -729,9 +729,9 @@ keysym_to_awt_keycode (GdkEventKey *event) return VK_COPY; return VK_PASTE; */ - case GDK_Undo: + case GDK_KEY_Undo: return VK_UNDO; - case GDK_Redo: + case GDK_KEY_Redo: return VK_AGAIN; /* return VK_FIND; @@ -739,15 +739,15 @@ keysym_to_awt_keycode (GdkEventKey *event) return VK_STOP; return VK_COMPOSE; */ - case GDK_ISO_Level3_Shift: + case GDK_KEY_ISO_Level3_Shift: return VK_ALT_GRAPH; /* case VK_BEGIN: */ - case GDK_Menu: + case GDK_KEY_Menu: return VK_CONTEXT_MENU; - case GDK_Super_L: - case GDK_Super_R: + case GDK_KEY_Super_L: + case GDK_KEY_Super_R: return VK_WINDOWS; default: @@ -768,157 +768,157 @@ keysym_to_awt_keylocation (GdkEventKey *event) return -1; /* VK_A through VK_Z */ - if (ukeyval >= GDK_A && ukeyval <= GDK_Z) + if (ukeyval >= GDK_KEY_A && ukeyval <= GDK_KEY_Z) return AWT_KEY_LOCATION_STANDARD; /* VK_0 through VK_9 */ - if (ukeyval >= GDK_0 && ukeyval <= GDK_9) + if (ukeyval >= GDK_KEY_0 && ukeyval <= GDK_KEY_9) return AWT_KEY_LOCATION_STANDARD; switch (ukeyval) { - case GDK_Shift_L: - case GDK_Control_L: - case GDK_Alt_L: - case GDK_Meta_L: + case GDK_KEY_Shift_L: + case GDK_KEY_Control_L: + case GDK_KEY_Alt_L: + case GDK_KEY_Meta_L: return AWT_KEY_LOCATION_LEFT; - case GDK_Shift_R: - case GDK_Control_R: - case GDK_Alt_R: - case GDK_Meta_R: + case GDK_KEY_Shift_R: + case GDK_KEY_Control_R: + case GDK_KEY_Alt_R: + case GDK_KEY_Meta_R: return AWT_KEY_LOCATION_RIGHT; - case GDK_Return: - case GDK_BackSpace: - case GDK_Tab: - case GDK_Cancel: - case GDK_Clear: - case GDK_Pause: - case GDK_Caps_Lock: - case GDK_Escape: - case GDK_space: - case GDK_Page_Up: - case GDK_Page_Down: - case GDK_End: - case GDK_Home: - case GDK_Left: - case GDK_Up: - case GDK_Right: - case GDK_Down: - case GDK_comma: - case GDK_minus: - case GDK_period: - case GDK_slash: - case GDK_semicolon: - case GDK_equal: - case GDK_bracketleft: - case GDK_backslash: - case GDK_bracketright: - case GDK_Delete: - case GDK_Scroll_Lock: - case GDK_F1: - case GDK_F2: - case GDK_F3: - case GDK_F4: - case GDK_F5: - case GDK_F6: - case GDK_F7: - case GDK_F8: - case GDK_F9: - case GDK_F10: - case GDK_F11: - case GDK_F12: - case GDK_F13: - case GDK_F14: - case GDK_F15: - case GDK_F16: - case GDK_F17: - case GDK_F18: - case GDK_F19: - case GDK_F20: - case GDK_F21: - case GDK_F22: - case GDK_F23: - case GDK_F24: - case GDK_Print: - case GDK_Insert: - case GDK_Help: - case GDK_grave: - case GDK_apostrophe: - case GDK_dead_grave: - case GDK_dead_acute: - case GDK_dead_circumflex: - case GDK_dead_tilde: - case GDK_dead_macron: - case GDK_dead_breve: - case GDK_dead_abovedot: - case GDK_dead_diaeresis: - case GDK_dead_abovering: - case GDK_dead_doubleacute: - case GDK_dead_caron: - case GDK_dead_cedilla: - case GDK_dead_ogonek: - case GDK_dead_iota: - case GDK_dead_voiced_sound: - case GDK_dead_semivoiced_sound: - case GDK_ampersand: - case GDK_asterisk: - case GDK_quotedbl: - case GDK_less: - case GDK_greater: - case GDK_braceleft: - case GDK_braceright: - case GDK_at: - case GDK_colon: - case GDK_asciicircum: - case GDK_dollar: - case GDK_EuroSign: - case GDK_exclam: - case GDK_exclamdown: - case GDK_parenleft: - case GDK_numbersign: - case GDK_plus: - case GDK_parenright: - case GDK_underscore: - case GDK_Mode_switch: - case GDK_Kanji: - case GDK_Katakana: - case GDK_Hiragana: - case GDK_PreviousCandidate: - case GDK_Codeinput: - case GDK_Kana_Lock: + case GDK_KEY_Return: + case GDK_KEY_BackSpace: + case GDK_KEY_Tab: + case GDK_KEY_Cancel: + case GDK_KEY_Clear: + case GDK_KEY_Pause: + case GDK_KEY_Caps_Lock: + case GDK_KEY_Escape: + case GDK_KEY_space: + case GDK_KEY_Page_Up: + case GDK_KEY_Page_Down: + case GDK_KEY_End: + case GDK_KEY_Home: + case GDK_KEY_Left: + case GDK_KEY_Up: + case GDK_KEY_Right: + case GDK_KEY_Down: + case GDK_KEY_comma: + case GDK_KEY_minus: + case GDK_KEY_period: + case GDK_KEY_slash: + case GDK_KEY_semicolon: + case GDK_KEY_equal: + case GDK_KEY_bracketleft: + case GDK_KEY_backslash: + case GDK_KEY_bracketright: + case GDK_KEY_Delete: + case GDK_KEY_Scroll_Lock: + case GDK_KEY_F1: + case GDK_KEY_F2: + case GDK_KEY_F3: + case GDK_KEY_F4: + case GDK_KEY_F5: + case GDK_KEY_F6: + case GDK_KEY_F7: + case GDK_KEY_F8: + case GDK_KEY_F9: + case GDK_KEY_F10: + case GDK_KEY_F11: + case GDK_KEY_F12: + case GDK_KEY_F13: + case GDK_KEY_F14: + case GDK_KEY_F15: + case GDK_KEY_F16: + case GDK_KEY_F17: + case GDK_KEY_F18: + case GDK_KEY_F19: + case GDK_KEY_F20: + case GDK_KEY_F21: + case GDK_KEY_F22: + case GDK_KEY_F23: + case GDK_KEY_F24: + case GDK_KEY_Print: + case GDK_KEY_Insert: + case GDK_KEY_Help: + case GDK_KEY_grave: + case GDK_KEY_apostrophe: + case GDK_KEY_dead_grave: + case GDK_KEY_dead_acute: + case GDK_KEY_dead_circumflex: + case GDK_KEY_dead_tilde: + case GDK_KEY_dead_macron: + case GDK_KEY_dead_breve: + case GDK_KEY_dead_abovedot: + case GDK_KEY_dead_diaeresis: + case GDK_KEY_dead_abovering: + case GDK_KEY_dead_doubleacute: + case GDK_KEY_dead_caron: + case GDK_KEY_dead_cedilla: + case GDK_KEY_dead_ogonek: + case GDK_KEY_dead_iota: + case GDK_KEY_dead_voiced_sound: + case GDK_KEY_dead_semivoiced_sound: + case GDK_KEY_ampersand: + case GDK_KEY_asterisk: + case GDK_KEY_quotedbl: + case GDK_KEY_less: + case GDK_KEY_greater: + case GDK_KEY_braceleft: + case GDK_KEY_braceright: + case GDK_KEY_at: + case GDK_KEY_colon: + case GDK_KEY_asciicircum: + case GDK_KEY_dollar: + case GDK_KEY_EuroSign: + case GDK_KEY_exclam: + case GDK_KEY_exclamdown: + case GDK_KEY_parenleft: + case GDK_KEY_numbersign: + case GDK_KEY_plus: + case GDK_KEY_parenright: + case GDK_KEY_underscore: + case GDK_KEY_Mode_switch: + case GDK_KEY_Kanji: + case GDK_KEY_Katakana: + case GDK_KEY_Hiragana: + case GDK_KEY_PreviousCandidate: + case GDK_KEY_Codeinput: + case GDK_KEY_Kana_Lock: return AWT_KEY_LOCATION_STANDARD; - case GDK_KP_Enter: - case GDK_KP_Page_Up: - case GDK_KP_Page_Down: - case GDK_KP_End: - case GDK_KP_Home: - case GDK_KP_Begin: - case GDK_KP_0: - case GDK_KP_1: - case GDK_KP_2: - case GDK_KP_3: - case GDK_KP_4: - case GDK_KP_5: - case GDK_KP_6: - case GDK_KP_7: - case GDK_KP_8: - case GDK_KP_9: - case GDK_KP_Multiply: - case GDK_KP_Add: - case GDK_KP_Separator: - case GDK_KP_Subtract: - case GDK_KP_Decimal: - case GDK_KP_Divide: - case GDK_KP_Delete: - case GDK_Num_Lock: - case GDK_KP_Insert: - case GDK_KP_Up: - case GDK_KP_Down: - case GDK_KP_Left: - case GDK_KP_Right: + case GDK_KEY_KP_Enter: + case GDK_KEY_KP_Page_Up: + case GDK_KEY_KP_Page_Down: + case GDK_KEY_KP_End: + case GDK_KEY_KP_Home: + case GDK_KEY_KP_Begin: + case GDK_KEY_KP_0: + case GDK_KEY_KP_1: + case GDK_KEY_KP_2: + case GDK_KEY_KP_3: + case GDK_KEY_KP_4: + case GDK_KEY_KP_5: + case GDK_KEY_KP_6: + case GDK_KEY_KP_7: + case GDK_KEY_KP_8: + case GDK_KEY_KP_9: + case GDK_KEY_KP_Multiply: + case GDK_KEY_KP_Add: + case GDK_KEY_KP_Separator: + case GDK_KEY_KP_Subtract: + case GDK_KEY_KP_Decimal: + case GDK_KEY_KP_Divide: + case GDK_KEY_KP_Delete: + case GDK_KEY_Num_Lock: + case GDK_KEY_KP_Insert: + case GDK_KEY_KP_Up: + case GDK_KEY_KP_Down: + case GDK_KEY_KP_Left: + case GDK_KEY_KP_Right: return AWT_KEY_LOCATION_NUMPAD; default: @@ -941,12 +941,12 @@ keyevent_to_awt_keychar (GdkEventKey *event) { switch (event->keyval) { - case GDK_BackSpace: + case GDK_KEY_BackSpace: return VK_BACK_SPACE; - case GDK_Tab: + case GDK_KEY_Tab: return VK_TAB; - case GDK_Delete: - case GDK_KP_Delete: + case GDK_KEY_Delete: + case GDK_KEY_KP_Delete: return VK_DELETE; default: return AWT_KEY_CHAR_UNDEFINED; @@ -972,8 +972,8 @@ keyevent_state_to_awt_mods (GdkEventKey *event) { state = event->state; - if (event->keyval == GDK_Shift_L - || event->keyval == GDK_Shift_R) + if (event->keyval == GDK_KEY_Shift_L + || event->keyval == GDK_KEY_Shift_R) result |= AWT_SHIFT_DOWN_MASK | AWT_SHIFT_MASK; else { @@ -981,8 +981,8 @@ keyevent_state_to_awt_mods (GdkEventKey *event) result |= AWT_SHIFT_DOWN_MASK | AWT_SHIFT_MASK; } - if (event->keyval == GDK_Control_L - || event->keyval == GDK_Control_R) + if (event->keyval == GDK_KEY_Control_L + || event->keyval == GDK_KEY_Control_R) result |= AWT_CTRL_DOWN_MASK | AWT_CTRL_MASK; else { @@ -990,8 +990,8 @@ keyevent_state_to_awt_mods (GdkEventKey *event) result |= AWT_CTRL_DOWN_MASK | AWT_CTRL_MASK; } - if (event->keyval == GDK_Alt_L - || event->keyval == GDK_Alt_R) + if (event->keyval == GDK_KEY_Alt_L + || event->keyval == GDK_KEY_Alt_R) result |= AWT_ALT_DOWN_MASK | AWT_ALT_MASK; else { @@ -1003,21 +1003,21 @@ keyevent_state_to_awt_mods (GdkEventKey *event) { state = event->state; - if (event->keyval != GDK_Shift_L - && event->keyval != GDK_Shift_R) + if (event->keyval != GDK_KEY_Shift_L + && event->keyval != GDK_KEY_Shift_R) { if (state & GDK_SHIFT_MASK) result |= AWT_SHIFT_DOWN_MASK | AWT_SHIFT_MASK; } - if (event->keyval != GDK_Control_L - && event->keyval != GDK_Control_R) + if (event->keyval != GDK_KEY_Control_L + && event->keyval != GDK_KEY_Control_R) { if (state & GDK_CONTROL_MASK) result |= AWT_CTRL_DOWN_MASK | AWT_CTRL_MASK; } - if (event->keyval != GDK_Alt_L - && event->keyval != GDK_Alt_R) + if (event->keyval != GDK_KEY_Alt_L + && event->keyval != GDK_KEY_Alt_R) { if (state & GDK_MOD1_MASK) result |= AWT_ALT_DOWN_MASK | AWT_ALT_MASK; @@ -1226,8 +1226,7 @@ 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 (); } @@ -1389,7 +1388,7 @@ Java_gnu_java_awt_peer_gtk_GtkWindowPeer_toBack (JNIEnv *env, ptr = gtkpeer_get_widget (env, obj); - gdk_window_lower (GTK_WIDGET (ptr)->window); + gdk_window_lower (gtk_widget_get_window(GTK_WIDGET (ptr))); gdk_flush (); gdk_threads_leave (); @@ -1405,7 +1404,7 @@ Java_gnu_java_awt_peer_gtk_GtkWindowPeer_toFront (JNIEnv *env, ptr = gtkpeer_get_widget (env, obj); - gdk_window_raise (GTK_WIDGET (ptr)->window); + gdk_window_raise (gtk_widget_get_window(GTK_WIDGET (ptr))); gdk_flush (); gdk_threads_leave (); @@ -1452,8 +1451,8 @@ Java_gnu_java_awt_peer_gtk_GtkWindowPeer_nativeSetLocationUnlocked gtk_window_move (GTK_WINDOW(ptr), x, y); - if (GTK_WIDGET (ptr)->window != NULL) - gdk_window_move (GTK_WIDGET (ptr)->window, x, y); + if (gtk_widget_get_window(GTK_WIDGET (ptr)) != NULL) + gdk_window_move (gtk_widget_get_window(GTK_WIDGET (ptr)), x, y); } JNIEXPORT void JNICALL @@ -1483,8 +1482,8 @@ Java_gnu_java_awt_peer_gtk_GtkWindowPeer_nativeSetBoundsUnlocked height = (height < 1) ? 1 : height; gtk_window_move (GTK_WINDOW(ptr), x, y); - /* The call to gdk_window_move is needed in addition to the call to - gtk_window_move. If gdk_window_move isn't called, then the + /* The call to GDK_KEY_window_move is needed in addition to the call to + gtk_window_move. If GDK_KEY_window_move isn't called, then the following set of operations doesn't give the expected results: 1. show a window @@ -1495,8 +1494,8 @@ Java_gnu_java_awt_peer_gtk_GtkWindowPeer_nativeSetBoundsUnlocked Instead of being at the position set by setLocation, the window is reshown at the position to which it was moved manually. */ - if (GTK_WIDGET (ptr)->window != NULL) - gdk_window_move (GTK_WIDGET (ptr)->window, x, y); + if (gtk_widget_get_window(GTK_WIDGET (ptr)) != NULL) + gdk_window_move (gtk_widget_get_window(GTK_WIDGET (ptr)), x, y); /* Only request resizing if the actual width or height change, otherwise * we get unnecessary flickers because resizing causes GTK to clear the @@ -1543,7 +1542,7 @@ window_get_frame_extents (GtkWidget *window, /* Attempt to retrieve window's frame extents. */ gu_ex.extents = &extents; - if (gdk_property_get (window->window, + if (gdk_property_get (gtk_widget_get_window(window), gdk_atom_intern ("_NET_FRAME_EXTENTS", FALSE), gdk_atom_intern ("CARDINAL", FALSE), 0, @@ -1573,7 +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)) { GdkDisplay *display = gtk_widget_get_display (window); Display *xdisplay = GDK_DISPLAY_XDISPLAY (display); @@ -1587,8 +1586,7 @@ request_frame_extents (GtkWidget *window) XEvent xevent; XEvent notify_xevent; - unsigned long window_id = GDK_WINDOW_XID (GDK_DRAWABLE(window->window)); - + unsigned long window_id = GDK_WINDOW_XID (gtk_widget_get_window(window)); if (!extents_atom) { const char *extents_str = "_NET_FRAME_EXTENTS"; @@ -1664,7 +1662,7 @@ window_focus_state_change_cb (GtkWidget *widget, GParamSpec *pspec __attribute__((unused)), jobject peer) { - if (GTK_WINDOW (widget)->has_toplevel_focus) + if (gtk_window_has_toplevel_focus(GTK_WINDOW (widget))) (*cp_gtk_gdk_env())->CallVoidMethod (cp_gtk_gdk_env(), peer, postWindowEventID, (jint) AWT_WINDOW_ACTIVATED, @@ -1808,64 +1806,64 @@ __inline guint cp_gtk_awt_keycode_to_keysym (jint keyCode, jint keyLocation) { - /* GDK_A through GDK_Z */ + /* GDK_KEY_A through GDK_KEY_Z */ if (keyCode >= VK_A && keyCode <= VK_Z) return gdk_keyval_to_lower (keyCode); - /* GDK_0 through GDK_9 */ + /* GDK_KEY_0 through GDK_KEY_9 */ if (keyCode >= VK_0 && keyCode <= VK_9) return keyCode; switch (keyCode) { case VK_ENTER: - return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KP_Enter : GDK_Return; + return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KEY_KP_Enter : GDK_KEY_Return; case VK_BACK_SPACE: - return GDK_BackSpace; + return GDK_KEY_BackSpace; case VK_TAB: - return GDK_Tab; + return GDK_KEY_Tab; case VK_CANCEL: - return GDK_Cancel; + return GDK_KEY_Cancel; case VK_CLEAR: - return GDK_Clear; + return GDK_KEY_Clear; case VK_SHIFT: - return keyLocation == AWT_KEY_LOCATION_LEFT ? GDK_Shift_L : GDK_Shift_R; + return keyLocation == AWT_KEY_LOCATION_LEFT ? GDK_KEY_Shift_L : GDK_KEY_Shift_R; case VK_CONTROL: - return keyLocation == AWT_KEY_LOCATION_LEFT ? GDK_Control_L : GDK_Control_R; + return keyLocation == AWT_KEY_LOCATION_LEFT ? GDK_KEY_Control_L : GDK_KEY_Control_R; case VK_ALT: - return keyLocation == AWT_KEY_LOCATION_LEFT ? GDK_Alt_L : GDK_Alt_R; + return keyLocation == AWT_KEY_LOCATION_LEFT ? GDK_KEY_Alt_L : GDK_KEY_Alt_R; case VK_PAUSE: - return GDK_Pause; + return GDK_KEY_Pause; case VK_CAPS_LOCK: - return GDK_Caps_Lock; + return GDK_KEY_Caps_Lock; case VK_ESCAPE: - return GDK_Escape; + return GDK_KEY_Escape; case VK_SPACE: - return GDK_space; + return GDK_KEY_space; case VK_PAGE_UP: - return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KP_Page_Up : GDK_Page_Up; + return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KEY_KP_Page_Up : GDK_KEY_Page_Up; case VK_PAGE_DOWN: - return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KP_Page_Down : GDK_Page_Down; + return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KEY_KP_Page_Down : GDK_KEY_Page_Down; case VK_END: - return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KP_End : GDK_End; + return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KEY_KP_End : GDK_KEY_End; case VK_HOME: - return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KP_Home : GDK_Home; + return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KEY_KP_Home : GDK_KEY_Home; case VK_LEFT: - return GDK_Left; + return GDK_KEY_Left; case VK_UP: - return GDK_Up; + return GDK_KEY_Up; case VK_RIGHT: - return GDK_Right; + return GDK_KEY_Right; case VK_DOWN: - return GDK_Down; + return GDK_KEY_Down; case VK_COMMA: - return GDK_comma; + return GDK_KEY_comma; case VK_MINUS: - return GDK_minus; + return GDK_KEY_minus; case VK_PERIOD: - return GDK_period; + return GDK_KEY_period; case VK_SLASH: - return GDK_slash; + return GDK_KEY_slash; /* case VK_0: case VK_1: @@ -1879,9 +1877,9 @@ cp_gtk_awt_keycode_to_keysym (jint keyCode, jint keyLocation) case VK_9: */ case VK_SEMICOLON: - return GDK_semicolon; + return GDK_KEY_semicolon; case VK_EQUALS: - return GDK_equal; + return GDK_KEY_equal; /* case VK_A: case VK_B: @@ -1911,190 +1909,190 @@ cp_gtk_awt_keycode_to_keysym (jint keyCode, jint keyLocation) case VK_Z: */ case VK_OPEN_BRACKET: - return GDK_bracketleft; + return GDK_KEY_bracketleft; case VK_BACK_SLASH: - return GDK_backslash; + return GDK_KEY_backslash; case VK_CLOSE_BRACKET: - return GDK_bracketright; + return GDK_KEY_bracketright; case VK_NUMPAD0: - return GDK_KP_0; + return GDK_KEY_KP_0; case VK_NUMPAD1: - return GDK_KP_1; + return GDK_KEY_KP_1; case VK_NUMPAD2: - return GDK_KP_2; + return GDK_KEY_KP_2; case VK_NUMPAD3: - return GDK_KP_3; + return GDK_KEY_KP_3; case VK_NUMPAD4: - return GDK_KP_4; + return GDK_KEY_KP_4; case VK_NUMPAD5: - return GDK_KP_5; + return GDK_KEY_KP_5; case VK_NUMPAD6: - return GDK_KP_6; + return GDK_KEY_KP_6; case VK_NUMPAD7: - return GDK_KP_7; + return GDK_KEY_KP_7; case VK_NUMPAD8: - return GDK_KP_8; + return GDK_KEY_KP_8; case VK_NUMPAD9: - return GDK_KP_9; + return GDK_KEY_KP_9; case VK_MULTIPLY: - return GDK_KP_Multiply; + return GDK_KEY_KP_Multiply; case VK_ADD: - return GDK_KP_Add; + return GDK_KEY_KP_Add; /* case VK_SEPARATER: */ case VK_SEPARATOR: - return GDK_KP_Separator; + return GDK_KEY_KP_Separator; case VK_SUBTRACT: - return GDK_KP_Subtract; + return GDK_KEY_KP_Subtract; case VK_DECIMAL: - return GDK_KP_Decimal; + return GDK_KEY_KP_Decimal; case VK_DIVIDE: - return GDK_KP_Divide; + return GDK_KEY_KP_Divide; case VK_DELETE: - return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KP_Delete : GDK_Delete; + return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KEY_KP_Delete : GDK_KEY_Delete; case VK_NUM_LOCK: - return GDK_Num_Lock; + return GDK_KEY_Num_Lock; case VK_SCROLL_LOCK: - return GDK_Scroll_Lock; + return GDK_KEY_Scroll_Lock; case VK_F1: - return GDK_F1; + return GDK_KEY_F1; case VK_F2: - return GDK_F2; + return GDK_KEY_F2; case VK_F3: - return GDK_F3; + return GDK_KEY_F3; case VK_F4: - return GDK_F4; + return GDK_KEY_F4; case VK_F5: - return GDK_F5; + return GDK_KEY_F5; case VK_F6: - return GDK_F6; + return GDK_KEY_F6; case VK_F7: - return GDK_F7; + return GDK_KEY_F7; case VK_F8: - return GDK_F8; + return GDK_KEY_F8; case VK_F9: - return GDK_F9; + return GDK_KEY_F9; case VK_F10: - return GDK_F10; + return GDK_KEY_F10; case VK_F11: - return GDK_F11; + return GDK_KEY_F11; case VK_F12: - return GDK_F12; + return GDK_KEY_F12; case VK_F13: - return GDK_F13; + return GDK_KEY_F13; case VK_F14: - return GDK_F14; + return GDK_KEY_F14; case VK_F15: - return GDK_F15; + return GDK_KEY_F15; case VK_F16: - return GDK_F16; + return GDK_KEY_F16; case VK_F17: - return GDK_F17; + return GDK_KEY_F17; case VK_F18: - return GDK_F18; + return GDK_KEY_F18; case VK_F19: - return GDK_F19; + return GDK_KEY_F19; case VK_F20: - return GDK_F20; + return GDK_KEY_F20; case VK_F21: - return GDK_F21; + return GDK_KEY_F21; case VK_F22: - return GDK_F22; + return GDK_KEY_F22; case VK_F23: - return GDK_F23; + return GDK_KEY_F23; case VK_F24: - return GDK_F24; + return GDK_KEY_F24; case VK_PRINTSCREEN: - return GDK_Print; + return GDK_KEY_Print; case VK_INSERT: - return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KP_Insert : GDK_Insert; + return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KEY_KP_Insert : GDK_KEY_Insert; case VK_HELP: - return GDK_Help; + return GDK_KEY_Help; case VK_META: - return keyLocation == AWT_KEY_LOCATION_LEFT ? GDK_Meta_L : GDK_Meta_R; + return keyLocation == AWT_KEY_LOCATION_LEFT ? GDK_KEY_Meta_L : GDK_KEY_Meta_R; case VK_BACK_QUOTE: - return GDK_grave; + return GDK_KEY_grave; case VK_QUOTE: - return GDK_apostrophe; + return GDK_KEY_apostrophe; case VK_KP_UP: - return GDK_KP_Up; + return GDK_KEY_KP_Up; case VK_KP_DOWN: - return GDK_KP_Down; + return GDK_KEY_KP_Down; case VK_KP_LEFT: - return GDK_KP_Left; + return GDK_KEY_KP_Left; case VK_KP_RIGHT: - return GDK_KP_Right; + return GDK_KEY_KP_Right; case VK_DEAD_GRAVE: - return GDK_dead_grave; + return GDK_KEY_dead_grave; case VK_DEAD_ACUTE: - return GDK_dead_acute; + return GDK_KEY_dead_acute; case VK_DEAD_CIRCUMFLEX: - return GDK_dead_circumflex; + return GDK_KEY_dead_circumflex; case VK_DEAD_TILDE: - return GDK_dead_tilde; + return GDK_KEY_dead_tilde; case VK_DEAD_MACRON: - return GDK_dead_macron; + return GDK_KEY_dead_macron; case VK_DEAD_BREVE: - return GDK_dead_breve; + return GDK_KEY_dead_breve; case VK_DEAD_ABOVEDOT: - return GDK_dead_abovedot; + return GDK_KEY_dead_abovedot; case VK_DEAD_DIAERESIS: - return GDK_dead_diaeresis; + return GDK_KEY_dead_diaeresis; case VK_DEAD_ABOVERING: - return GDK_dead_abovering; + return GDK_KEY_dead_abovering; case VK_DEAD_DOUBLEACUTE: - return GDK_dead_doubleacute; + return GDK_KEY_dead_doubleacute; case VK_DEAD_CARON: - return GDK_dead_caron; + return GDK_KEY_dead_caron; case VK_DEAD_CEDILLA: - return GDK_dead_cedilla; + return GDK_KEY_dead_cedilla; case VK_DEAD_OGONEK: - return GDK_dead_ogonek; + return GDK_KEY_dead_ogonek; case VK_DEAD_IOTA: - return GDK_dead_iota; + return GDK_KEY_dead_iota; case VK_DEAD_VOICED_SOUND: - return GDK_dead_voiced_sound; + return GDK_KEY_dead_voiced_sound; case VK_DEAD_SEMIVOICED_SOUND: - return GDK_dead_semivoiced_sound; + return GDK_KEY_dead_semivoiced_sound; case VK_AMPERSAND: - return GDK_ampersand; + return GDK_KEY_ampersand; case VK_ASTERISK: - return GDK_asterisk; + return GDK_KEY_asterisk; case VK_QUOTEDBL: - return GDK_quotedbl; + return GDK_KEY_quotedbl; case VK_LESS: - return GDK_less; + return GDK_KEY_less; case VK_GREATER: - return GDK_greater; + return GDK_KEY_greater; case VK_BRACELEFT: - return GDK_braceleft; + return GDK_KEY_braceleft; case VK_BRACERIGHT: - return GDK_braceright; + return GDK_KEY_braceright; case VK_AT: - return GDK_at; + return GDK_KEY_at; case VK_COLON: - return GDK_colon; + return GDK_KEY_colon; case VK_CIRCUMFLEX: - return GDK_asciicircum; + return GDK_KEY_asciicircum; case VK_DOLLAR: - return GDK_dollar; + return GDK_KEY_dollar; case VK_EURO_SIGN: - return GDK_EuroSign; + return GDK_KEY_EuroSign; case VK_EXCLAMATION_MARK: - return GDK_exclam; + return GDK_KEY_exclam; case VK_INVERTED_EXCLAMATION_MARK: - return GDK_exclamdown; + return GDK_KEY_exclamdown; case VK_LEFT_PARENTHESIS: - return GDK_parenleft; + return GDK_KEY_parenleft; case VK_NUMBER_SIGN: - return GDK_numbersign; + return GDK_KEY_numbersign; case VK_PLUS: - return GDK_plus; + return GDK_KEY_plus; case VK_RIGHT_PARENTHESIS: - return GDK_parenright; + return GDK_KEY_parenright; case VK_UNDERSCORE: - return GDK_underscore; + return GDK_KEY_underscore; /* case VK_FINAL: case VK_CONVERT: @@ -2102,19 +2100,19 @@ cp_gtk_awt_keycode_to_keysym (jint keyCode, jint keyLocation) case VK_ACCEPT: */ case VK_MODECHANGE: - return GDK_Mode_switch; + return GDK_KEY_Mode_switch; /* case VK_KANA: */ case VK_KANJI: - return GDK_Kanji; + return GDK_KEY_Kanji; /* case VK_ALPHANUMERIC: */ case VK_KATAKANA: - return GDK_Katakana; + return GDK_KEY_Katakana; case VK_HIRAGANA: - return GDK_Hiragana; + return GDK_KEY_Hiragana; /* case VK_FULL_WIDTH: case VK_HALF_WIDTH: @@ -2122,16 +2120,16 @@ cp_gtk_awt_keycode_to_keysym (jint keyCode, jint keyLocation) case VK_ALL_CANDIDATES: */ case VK_PREVIOUS_CANDIDATE: - return GDK_PreviousCandidate; + return GDK_KEY_PreviousCandidate; case VK_CODE_INPUT: - return GDK_Codeinput; + return GDK_KEY_Codeinput; /* case VK_JAPANESE_KATAKANA: case VK_JAPANESE_HIRAGANA: case VK_JAPANESE_ROMAN: */ case VK_KANA_LOCK: - return GDK_Kana_Lock; + return GDK_KEY_Kana_Lock; /* case VK_INPUT_METHOD_ON_OFF: case VK_CUT: @@ -2139,9 +2137,9 @@ cp_gtk_awt_keycode_to_keysym (jint keyCode, jint keyLocation) case VK_PASTE: */ case VK_UNDO: - return GDK_Undo; + return GDK_KEY_Undo; case VK_AGAIN: - return GDK_Redo; + return GDK_KEY_Redo; /* case VK_FIND: case VK_PROPS: @@ -2149,16 +2147,16 @@ cp_gtk_awt_keycode_to_keysym (jint keyCode, jint keyLocation) case VK_COMPOSE: */ case VK_ALT_GRAPH: - return GDK_ISO_Level3_Shift; + return GDK_KEY_ISO_Level3_Shift; /* case VK_BEGIN: */ case VK_CONTEXT_MENU: - return GDK_Menu; + return GDK_KEY_Menu; case VK_WINDOWS: - return GDK_Super_R; + return GDK_KEY_Super_R; default: - return GDK_VoidSymbol; + return GDK_KEY_VoidSymbol; } } diff --git a/native/jni/gtk-peer/gtk_jawt.c b/native/jni/gtk-peer/gtk_jawt.c index 72130376f..6676f4c0d 100644 --- a/native/jni/gtk-peer/gtk_jawt.c +++ b/native/jni/gtk-peer/gtk_jawt.c @@ -73,7 +73,7 @@ classpath_jawt_get_default_display (JNIEnv* env, jobject canvas) widget = GTK_WIDGET (ptr); - if (GTK_WIDGET_REALIZED (widget)) + if (gtk_widget_get_realized(widget)) { display = gtk_widget_get_display (widget); @@ -109,7 +109,7 @@ classpath_jawt_get_visualID (JNIEnv* env, jobject canvas) widget = GTK_WIDGET (ptr); - if (GTK_WIDGET_REALIZED (widget)) + if (gtk_widget_get_realized(widget)) { visual = gdk_x11_visual_get_xvisual (gtk_widget_get_visual (widget)); g_assert (visual != NULL); @@ -144,12 +144,12 @@ classpath_jawt_get_depth (JNIEnv* env, jobject canvas) widget = GTK_WIDGET (ptr); - if (GTK_WIDGET_REALIZED (widget)) + if (gtk_widget_get_realized(widget)) { visual = gtk_widget_get_visual (widget); g_assert (visual != NULL); - return visual->depth; + return gdk_visual_get_depth(visual); } else return (VisualID) NULL; @@ -179,9 +179,9 @@ classpath_jawt_get_drawable (JNIEnv* env, jobject canvas) widget = GTK_WIDGET (ptr); - if (GTK_WIDGET_REALIZED (widget)) + if (gtk_widget_get_realized(widget)) { - drawable = GDK_DRAWABLE_XID (widget->window); + 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 8b677aff7..b68db733e 100644 --- a/native/jni/gtk-peer/gtkpeer.h +++ b/native/jni/gtk-peer/gtkpeer.h @@ -307,8 +307,13 @@ jint cp_gtk_state_to_awt_mods (guint state); GdkPixbuf *cp_gtk_image_get_pixbuf (JNIEnv *env, jobject obj); /* Component Graphics helpers */ +#if GTK_MAJOR_VERSION == 2 void cp_gtk_grab_current_drawable(GtkWidget *widget, GdkDrawable **draw, GdkWindow **win); +#elif GTK_MAJOR_VERSION == 3 +void cp_gtk_grab_current_drawable(GtkWidget *widget, + GdkWindow **win); +#endif /* JNI initialization functions */ void cp_gtk_button_init_jni (JNIEnv*); @@ -332,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 |