diff --git a/meson.build b/meson.build index dd2ed546..3d1cbaf1 100644 --- a/meson.build +++ b/meson.build @@ -69,6 +69,7 @@ libtranslationlayer_so = shared_library('translation_layer_main', [ 'src/api-impl-jni/audio/android_media_AudioTrack.c', 'src/api-impl-jni/audio/android_media_SoundPool.c', 'src/api-impl-jni/widgets/android_widget_Button.c', + 'src/api-impl-jni/widgets/android_widget_ImageButton.c', 'src/api-impl-jni/widgets/android_widget_RelativeLayout.c', 'src/api-impl-jni/widgets/android_widget_ScrollView.c', 'src/api-impl-jni/widgets/android_opengl_GLSurfaceView.c', diff --git a/src/api-impl-jni/generated_headers/android_widget_ImageButton.h b/src/api-impl-jni/generated_headers/android_widget_ImageButton.h new file mode 100644 index 00000000..2e3e7d5a --- /dev/null +++ b/src/api-impl-jni/generated_headers/android_widget_ImageButton.h @@ -0,0 +1,229 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class android_widget_ImageButton */ + +#ifndef _Included_android_widget_ImageButton +#define _Included_android_widget_ImageButton +#ifdef __cplusplus +extern "C" { +#endif +#undef android_widget_ImageButton_NO_ID +#define android_widget_ImageButton_NO_ID -1L +#undef android_widget_ImageButton_NOT_FOCUSABLE +#define android_widget_ImageButton_NOT_FOCUSABLE 0L +#undef android_widget_ImageButton_FOCUSABLE +#define android_widget_ImageButton_FOCUSABLE 1L +#undef android_widget_ImageButton_FOCUSABLE_MASK +#define android_widget_ImageButton_FOCUSABLE_MASK 1L +#undef android_widget_ImageButton_FITS_SYSTEM_WINDOWS +#define android_widget_ImageButton_FITS_SYSTEM_WINDOWS 2L +#undef android_widget_ImageButton_VISIBLE +#define android_widget_ImageButton_VISIBLE 0L +#undef android_widget_ImageButton_INVISIBLE +#define android_widget_ImageButton_INVISIBLE 4L +#undef android_widget_ImageButton_GONE +#define android_widget_ImageButton_GONE 8L +#undef android_widget_ImageButton_VISIBILITY_MASK +#define android_widget_ImageButton_VISIBILITY_MASK 12L +#undef android_widget_ImageButton_ENABLED +#define android_widget_ImageButton_ENABLED 0L +#undef android_widget_ImageButton_DISABLED +#define android_widget_ImageButton_DISABLED 32L +#undef android_widget_ImageButton_ENABLED_MASK +#define android_widget_ImageButton_ENABLED_MASK 32L +#undef android_widget_ImageButton_WILL_NOT_DRAW +#define android_widget_ImageButton_WILL_NOT_DRAW 128L +#undef android_widget_ImageButton_DRAW_MASK +#define android_widget_ImageButton_DRAW_MASK 128L +#undef android_widget_ImageButton_SCROLLBARS_NONE +#define android_widget_ImageButton_SCROLLBARS_NONE 0L +#undef android_widget_ImageButton_SCROLLBARS_HORIZONTAL +#define android_widget_ImageButton_SCROLLBARS_HORIZONTAL 256L +#undef android_widget_ImageButton_SCROLLBARS_VERTICAL +#define android_widget_ImageButton_SCROLLBARS_VERTICAL 512L +#undef android_widget_ImageButton_SCROLLBARS_MASK +#define android_widget_ImageButton_SCROLLBARS_MASK 768L +#undef android_widget_ImageButton_FILTER_TOUCHES_WHEN_OBSCURED +#define android_widget_ImageButton_FILTER_TOUCHES_WHEN_OBSCURED 1024L +#undef android_widget_ImageButton_OPTIONAL_FITS_SYSTEM_WINDOWS +#define android_widget_ImageButton_OPTIONAL_FITS_SYSTEM_WINDOWS 2048L +#undef android_widget_ImageButton_FADING_EDGE_NONE +#define android_widget_ImageButton_FADING_EDGE_NONE 0L +#undef android_widget_ImageButton_FADING_EDGE_HORIZONTAL +#define android_widget_ImageButton_FADING_EDGE_HORIZONTAL 4096L +#undef android_widget_ImageButton_FADING_EDGE_VERTICAL +#define android_widget_ImageButton_FADING_EDGE_VERTICAL 8192L +#undef android_widget_ImageButton_FADING_EDGE_MASK +#define android_widget_ImageButton_FADING_EDGE_MASK 12288L +#undef android_widget_ImageButton_CLICKABLE +#define android_widget_ImageButton_CLICKABLE 16384L +#undef android_widget_ImageButton_DRAWING_CACHE_ENABLED +#define android_widget_ImageButton_DRAWING_CACHE_ENABLED 32768L +#undef android_widget_ImageButton_SAVE_DISABLED +#define android_widget_ImageButton_SAVE_DISABLED 65536L +#undef android_widget_ImageButton_SAVE_DISABLED_MASK +#define android_widget_ImageButton_SAVE_DISABLED_MASK 65536L +#undef android_widget_ImageButton_WILL_NOT_CACHE_DRAWING +#define android_widget_ImageButton_WILL_NOT_CACHE_DRAWING 131072L +#undef android_widget_ImageButton_FOCUSABLE_IN_TOUCH_MODE +#define android_widget_ImageButton_FOCUSABLE_IN_TOUCH_MODE 262144L +#undef android_widget_ImageButton_DRAWING_CACHE_QUALITY_LOW +#define android_widget_ImageButton_DRAWING_CACHE_QUALITY_LOW 524288L +#undef android_widget_ImageButton_DRAWING_CACHE_QUALITY_HIGH +#define android_widget_ImageButton_DRAWING_CACHE_QUALITY_HIGH 1048576L +#undef android_widget_ImageButton_DRAWING_CACHE_QUALITY_AUTO +#define android_widget_ImageButton_DRAWING_CACHE_QUALITY_AUTO 0L +#undef android_widget_ImageButton_DRAWING_CACHE_QUALITY_MASK +#define android_widget_ImageButton_DRAWING_CACHE_QUALITY_MASK 1572864L +#undef android_widget_ImageButton_LONG_CLICKABLE +#define android_widget_ImageButton_LONG_CLICKABLE 2097152L +#undef android_widget_ImageButton_DUPLICATE_PARENT_STATE +#define android_widget_ImageButton_DUPLICATE_PARENT_STATE 4194304L +#undef android_widget_ImageButton_SCROLLBARS_INSIDE_OVERLAY +#define android_widget_ImageButton_SCROLLBARS_INSIDE_OVERLAY 0L +#undef android_widget_ImageButton_SCROLLBARS_INSIDE_INSET +#define android_widget_ImageButton_SCROLLBARS_INSIDE_INSET 16777216L +#undef android_widget_ImageButton_SCROLLBARS_OUTSIDE_OVERLAY +#define android_widget_ImageButton_SCROLLBARS_OUTSIDE_OVERLAY 33554432L +#undef android_widget_ImageButton_SCROLLBARS_OUTSIDE_INSET +#define android_widget_ImageButton_SCROLLBARS_OUTSIDE_INSET 50331648L +#undef android_widget_ImageButton_SCROLLBARS_INSET_MASK +#define android_widget_ImageButton_SCROLLBARS_INSET_MASK 16777216L +#undef android_widget_ImageButton_SCROLLBARS_OUTSIDE_MASK +#define android_widget_ImageButton_SCROLLBARS_OUTSIDE_MASK 33554432L +#undef android_widget_ImageButton_SCROLLBARS_STYLE_MASK +#define android_widget_ImageButton_SCROLLBARS_STYLE_MASK 50331648L +#undef android_widget_ImageButton_KEEP_SCREEN_ON +#define android_widget_ImageButton_KEEP_SCREEN_ON 67108864L +#undef android_widget_ImageButton_SOUND_EFFECTS_ENABLED +#define android_widget_ImageButton_SOUND_EFFECTS_ENABLED 134217728L +#undef android_widget_ImageButton_HAPTIC_FEEDBACK_ENABLED +#define android_widget_ImageButton_HAPTIC_FEEDBACK_ENABLED 268435456L +#undef android_widget_ImageButton_PARENT_SAVE_DISABLED +#define android_widget_ImageButton_PARENT_SAVE_DISABLED 536870912L +#undef android_widget_ImageButton_PARENT_SAVE_DISABLED_MASK +#define android_widget_ImageButton_PARENT_SAVE_DISABLED_MASK 536870912L +#undef android_widget_ImageButton_FOCUSABLES_ALL +#define android_widget_ImageButton_FOCUSABLES_ALL 0L +#undef android_widget_ImageButton_FOCUSABLES_TOUCH_MODE +#define android_widget_ImageButton_FOCUSABLES_TOUCH_MODE 1L +#undef android_widget_ImageButton_FOCUS_BACKWARD +#define android_widget_ImageButton_FOCUS_BACKWARD 1L +#undef android_widget_ImageButton_FOCUS_FORWARD +#define android_widget_ImageButton_FOCUS_FORWARD 2L +#undef android_widget_ImageButton_FOCUS_LEFT +#define android_widget_ImageButton_FOCUS_LEFT 17L +#undef android_widget_ImageButton_FOCUS_UP +#define android_widget_ImageButton_FOCUS_UP 33L +#undef android_widget_ImageButton_FOCUS_RIGHT +#define android_widget_ImageButton_FOCUS_RIGHT 66L +#undef android_widget_ImageButton_FOCUS_DOWN +#define android_widget_ImageButton_FOCUS_DOWN 130L +#undef android_widget_ImageButton_MEASURED_SIZE_MASK +#define android_widget_ImageButton_MEASURED_SIZE_MASK 16777215L +#undef android_widget_ImageButton_MEASURED_STATE_MASK +#define android_widget_ImageButton_MEASURED_STATE_MASK -16777216L +#undef android_widget_ImageButton_MEASURED_HEIGHT_STATE_SHIFT +#define android_widget_ImageButton_MEASURED_HEIGHT_STATE_SHIFT 16L +#undef android_widget_ImageButton_MEASURED_STATE_TOO_SMALL +#define android_widget_ImageButton_MEASURED_STATE_TOO_SMALL 16777216L +#undef android_widget_ImageButton_PFLAG2_DRAG_CAN_ACCEPT +#define android_widget_ImageButton_PFLAG2_DRAG_CAN_ACCEPT 1L +#undef android_widget_ImageButton_PFLAG2_DRAG_HOVERED +#define android_widget_ImageButton_PFLAG2_DRAG_HOVERED 2L +#undef android_widget_ImageButton_LAYOUT_DIRECTION_LTR +#define android_widget_ImageButton_LAYOUT_DIRECTION_LTR 0L +#undef android_widget_ImageButton_LAYOUT_DIRECTION_RTL +#define android_widget_ImageButton_LAYOUT_DIRECTION_RTL 1L +#undef android_widget_ImageButton_LAYOUT_DIRECTION_INHERIT +#define android_widget_ImageButton_LAYOUT_DIRECTION_INHERIT 2L +#undef android_widget_ImageButton_LAYOUT_DIRECTION_LOCALE +#define android_widget_ImageButton_LAYOUT_DIRECTION_LOCALE 3L +#undef android_widget_ImageButton_PFLAG2_LAYOUT_DIRECTION_MASK_SHIFT +#define android_widget_ImageButton_PFLAG2_LAYOUT_DIRECTION_MASK_SHIFT 2L +#undef android_widget_ImageButton_PFLAG2_LAYOUT_DIRECTION_MASK +#define android_widget_ImageButton_PFLAG2_LAYOUT_DIRECTION_MASK 12L +#undef android_widget_ImageButton_PFLAG2_LAYOUT_DIRECTION_RESOLVED_RTL +#define android_widget_ImageButton_PFLAG2_LAYOUT_DIRECTION_RESOLVED_RTL 16L +#undef android_widget_ImageButton_PFLAG2_LAYOUT_DIRECTION_RESOLVED +#define android_widget_ImageButton_PFLAG2_LAYOUT_DIRECTION_RESOLVED 32L +#undef android_widget_ImageButton_PFLAG2_LAYOUT_DIRECTION_RESOLVED_MASK +#define android_widget_ImageButton_PFLAG2_LAYOUT_DIRECTION_RESOLVED_MASK 48L +#undef android_widget_ImageButton_STATUS_BAR_HIDDEN +#define android_widget_ImageButton_STATUS_BAR_HIDDEN 1L +#undef android_widget_ImageButton_STATUS_BAR_VISIBLE +#define android_widget_ImageButton_STATUS_BAR_VISIBLE 0L +#undef android_widget_ImageButton_SYSTEM_UI_FLAG_FULLSCREEN +#define android_widget_ImageButton_SYSTEM_UI_FLAG_FULLSCREEN 4L +#undef android_widget_ImageButton_SYSTEM_UI_FLAG_HIDE_NAVIGATION +#define android_widget_ImageButton_SYSTEM_UI_FLAG_HIDE_NAVIGATION 2L +#undef android_widget_ImageButton_SYSTEM_UI_FLAG_IMMERSIVE +#define android_widget_ImageButton_SYSTEM_UI_FLAG_IMMERSIVE 2048L +#undef android_widget_ImageButton_SYSTEM_UI_FLAG_IMMERSIVE_STICKY +#define android_widget_ImageButton_SYSTEM_UI_FLAG_IMMERSIVE_STICKY 4096L +#undef android_widget_ImageButton_SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN +#define android_widget_ImageButton_SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN 1024L +#undef android_widget_ImageButton_SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION +#define android_widget_ImageButton_SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION 512L +#undef android_widget_ImageButton_SYSTEM_UI_FLAG_LAYOUT_STABLE +#define android_widget_ImageButton_SYSTEM_UI_FLAG_LAYOUT_STABLE 256L +#undef android_widget_ImageButton_SYSTEM_UI_FLAG_LOW_PROFILE +#define android_widget_ImageButton_SYSTEM_UI_FLAG_LOW_PROFILE 1L +#undef android_widget_ImageButton_SYSTEM_UI_FLAG_VISIBLE +#define android_widget_ImageButton_SYSTEM_UI_FLAG_VISIBLE 0L +#undef android_widget_ImageButton_SYSTEM_UI_LAYOUT_FLAGS +#define android_widget_ImageButton_SYSTEM_UI_LAYOUT_FLAGS 1536L +#undef android_widget_ImageButton_TEXT_ALIGNMENT_CENTER +#define android_widget_ImageButton_TEXT_ALIGNMENT_CENTER 4L +#undef android_widget_ImageButton_TEXT_ALIGNMENT_GRAVITY +#define android_widget_ImageButton_TEXT_ALIGNMENT_GRAVITY 1L +#undef android_widget_ImageButton_TEXT_ALIGNMENT_INHERIT +#define android_widget_ImageButton_TEXT_ALIGNMENT_INHERIT 0L +#undef android_widget_ImageButton_TEXT_ALIGNMENT_TEXT_END +#define android_widget_ImageButton_TEXT_ALIGNMENT_TEXT_END 3L +#undef android_widget_ImageButton_TEXT_ALIGNMENT_TEXT_START +#define android_widget_ImageButton_TEXT_ALIGNMENT_TEXT_START 2L +#undef android_widget_ImageButton_TEXT_ALIGNMENT_VIEW_END +#define android_widget_ImageButton_TEXT_ALIGNMENT_VIEW_END 6L +#undef android_widget_ImageButton_TEXT_ALIGNMENT_VIEW_START +#define android_widget_ImageButton_TEXT_ALIGNMENT_VIEW_START 5L +#undef android_widget_ImageButton_TEXT_DIRECTION_ANY_RTL +#define android_widget_ImageButton_TEXT_DIRECTION_ANY_RTL 2L +#undef android_widget_ImageButton_TEXT_DIRECTION_FIRST_STRONG +#define android_widget_ImageButton_TEXT_DIRECTION_FIRST_STRONG 1L +#undef android_widget_ImageButton_TEXT_DIRECTION_INHERIT +#define android_widget_ImageButton_TEXT_DIRECTION_INHERIT 0L +#undef android_widget_ImageButton_TEXT_DIRECTION_LOCALE +#define android_widget_ImageButton_TEXT_DIRECTION_LOCALE 5L +#undef android_widget_ImageButton_TEXT_DIRECTION_LTR +#define android_widget_ImageButton_TEXT_DIRECTION_LTR 3L +#undef android_widget_ImageButton_TEXT_DIRECTION_RTL +#define android_widget_ImageButton_TEXT_DIRECTION_RTL 4L +/* + * Class: android_widget_ImageButton + * Method: native_constructor + * Signature: (Landroid/content/Context;Landroid/util/AttributeSet;)J + */ +JNIEXPORT jlong JNICALL Java_android_widget_ImageButton_native_1constructor + (JNIEnv *, jobject, jobject, jobject); + +/* + * Class: android_widget_ImageButton + * Method: native_setPixbuf + * Signature: (J)V + */ +JNIEXPORT void JNICALL Java_android_widget_ImageButton_native_1setPixbuf + (JNIEnv *, jobject, jlong); + +/* + * Class: android_widget_ImageButton + * Method: native_setOnClickListener + * Signature: (JLandroid/view/View/OnClickListener;)V + */ +JNIEXPORT void JNICALL Java_android_widget_ImageButton_native_1setOnClickListener + (JNIEnv *, jobject, jlong, jobject); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/src/api-impl-jni/widgets/android_widget_ImageButton.c b/src/api-impl-jni/widgets/android_widget_ImageButton.c new file mode 100644 index 00000000..ccebe0f7 --- /dev/null +++ b/src/api-impl-jni/widgets/android_widget_ImageButton.c @@ -0,0 +1,64 @@ +#include + +#include "../defines.h" +#include "../util.h" + +#include "WrapperWidget.h" + +#include "../generated_headers/android_widget_ImageButton.h" + +JNIEXPORT jlong JNICALL Java_android_widget_ImageButton_native_1constructor(JNIEnv *env, jobject this, jobject context, jobject attrs) +{ + GtkWidget *wrapper = g_object_ref(wrapper_widget_new()); + GtkWidget *button = gtk_button_new(); + GtkWidget *image = gtk_picture_new_for_resource("/org/gtk/libgtk/icons/16x16/status/image-missing.png"); // show "broken image" icon + gtk_button_set_child(GTK_BUTTON(button), image); + wrapper_widget_set_child(WRAPPER_WIDGET(wrapper), button); + wrapper_widget_set_jobject(WRAPPER_WIDGET(wrapper), env, this); + + return _INTPTR(button); +} + +JNIEXPORT void JNICALL Java_android_widget_ImageButton_native_1setPixbuf(JNIEnv *env, jobject this, jlong pixbuf_ptr) +{ + GtkButton *button = _PTR(_GET_LONG_FIELD(this, "widget")); + GtkWidget *image = gtk_button_get_child(GTK_BUTTON(button)); + GdkPixbuf *pixbuf = _PTR(pixbuf_ptr); + gtk_picture_set_pixbuf(GTK_PICTURE(image), pixbuf); +} + +struct touch_callback_data { + JavaVM *jvm; + jobject this; + jobject listener; + jmethodID listener_method; +}; + +static void clicked_cb(GtkWidget *button, struct touch_callback_data *d) { + printf("clicked_cb\n"); + JNIEnv *env; + (*d->jvm)->GetEnv(d->jvm, (void**)&env, JNI_VERSION_1_6); + + (*env)->CallBooleanMethod(env, d->listener, d->listener_method, d->this); + + if((*env)->ExceptionCheck(env)) + (*env)->ExceptionDescribe(env); +} + +JNIEXPORT void JNICALL Java_android_widget_ImageButton_native_1setOnClickListener(JNIEnv *env, jobject this, jlong widget_ptr, jobject on_click_listener) +{ + GtkWidget *button = GTK_WIDGET(_PTR(widget_ptr)); + if (!on_click_listener) + return; + + JavaVM *jvm; + (*env)->GetJavaVM(env, &jvm); + + struct touch_callback_data *callback_data = malloc(sizeof(struct touch_callback_data)); + callback_data->jvm = jvm; + callback_data->this = _REF(this); + callback_data->listener = _REF(on_click_listener); + callback_data->listener_method = _METHOD(_CLASS(on_click_listener), "onClick", "(Landroid/view/View;)V"); + + g_signal_connect(button, "clicked", G_CALLBACK(clicked_cb), callback_data); +} diff --git a/src/api-impl/android/widget/ImageButton.java b/src/api-impl/android/widget/ImageButton.java index edd8d9cf..38829d54 100644 --- a/src/api-impl/android/widget/ImageButton.java +++ b/src/api-impl/android/widget/ImageButton.java @@ -17,4 +17,15 @@ public class ImageButton extends ImageView { super(context, attributeSet, defStyleAttr); } + @Override + protected native long native_constructor(Context context, AttributeSet attrs); + @Override + protected native void native_setPixbuf(long pixbuf); + protected native void native_setOnClickListener(long widget, OnClickListener l); + + @Override + public void setOnClickListener(final OnClickListener l) { + native_setOnClickListener(widget, l); + } + } diff --git a/src/api-impl/android/widget/ImageView.java b/src/api-impl/android/widget/ImageView.java index 105c51a8..959eb037 100644 --- a/src/api-impl/android/widget/ImageView.java +++ b/src/api-impl/android/widget/ImageView.java @@ -32,7 +32,7 @@ public class ImageView extends View { @Override protected native long native_constructor(Context context, AttributeSet attrs); - private native void native_setPixbuf(long pixbuf); + protected native void native_setPixbuf(long pixbuf); public /*native*/ void setImageResource(final int resid) { if (Context.this_application.getResources().getString(resid).endsWith(".xml"))