atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

onTouchEvent: pass return value to GTK

Browse Source 
This allows to propagate unhandled events to the next handler
This commit is contained in:
Julian Winkler
2023-10-28 16:52:58 +02:00
parent 469d47091c
commit 3e7f07ec71
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/api-impl-jni/views/android_view_View.c
View File

@@ -11,8 +11,9 @@
struct touch_callback_data { JavaVM *jvm; jobject this; jobject on_touch_listener; jclass on_touch_listener_class; unsigned int num_clicks;}; struct touch_callback_data { JavaVM *jvm; jobject this; jobject on_touch_listener; jclass on_touch_listener_class; unsigned int num_clicks;};
static void call_ontouch_callback(int action, double x, double y, struct touch_callback_data *d) static bool call_ontouch_callback(int action, double x, double y, struct touch_callback_data *d)
{ {
bool ret;
JNIEnv *env; JNIEnv *env;
(*d->jvm)->GetEnv(d->jvm, (void**)&env, JNI_VERSION_1_6); (*d->jvm)->GetEnv(d->jvm, (void**)&env, JNI_VERSION_1_6);
@@ -20,14 +21,15 @@ static void call_ontouch_callback(int action, double x, double y, struct touch_c
/* NULL listener means the callback was registered for onTouchEvent */ /* NULL listener means the callback was registered for onTouchEvent */
if(d->on_touch_listener) if(d->on_touch_listener)
(*env)->CallBooleanMethod(env, d->on_touch_listener, _METHOD(d->on_touch_listener_class, "onTouch", "(Landroid/view/View;Landroid/view/MotionEvent;)Z"), d->this, motion_event); ret = (*env)->CallBooleanMethod(env, d->on_touch_listener, _METHOD(d->on_touch_listener_class, "onTouch", "(Landroid/view/View;Landroid/view/MotionEvent;)Z"), d->this, motion_event);
else else
(*env)->CallBooleanMethod(env, d->this, _METHOD(d->on_touch_listener_class, "onTouchEvent", "(Landroid/view/MotionEvent;)Z"), motion_event); ret = (*env)->CallBooleanMethod(env, d->this, _METHOD(d->on_touch_listener_class, "onTouchEvent", "(Landroid/view/MotionEvent;)Z"), motion_event);
if((*env)->ExceptionCheck(env)) if((*env)->ExceptionCheck(env))
(*env)->ExceptionDescribe(env); (*env)->ExceptionDescribe(env);
(*env)->DeleteLocalRef(env, motion_event); (*env)->DeleteLocalRef(env, motion_event);
return ret;
} }
static void gdk_event_get_widget_relative_position(GdkEvent *event, GtkWidget *widget, double *x, double *y) static void gdk_event_get_widget_relative_position(GdkEvent *event, GtkWidget *widget, double *x, double *y)
{ {
@@ -53,26 +55,26 @@ static gboolean on_event(GtkEventControllerLegacy *event_controller, GdkEvent *e
d->num_clicks = 1; d->num_clicks = 1;
case GDK_TOUCH_BEGIN: case GDK_TOUCH_BEGIN:
gdk_event_get_widget_relative_position(event, widget, &x, &y); gdk_event_get_widget_relative_position(event, widget, &x, &y);
call_ontouch_callback(MOTION_EVENT_ACTION_DOWN, x, y, d); return call_ontouch_callback(MOTION_EVENT_ACTION_DOWN, x, y, d);
break; break;
case GDK_BUTTON_RELEASE: case GDK_BUTTON_RELEASE:
d->num_clicks = 0; d->num_clicks = 0;
case GDK_TOUCH_END: case GDK_TOUCH_END:
gdk_event_get_widget_relative_position(event, widget, &x, &y); gdk_event_get_widget_relative_position(event, widget, &x, &y);
call_ontouch_callback(MOTION_EVENT_ACTION_UP, x, y, d); return call_ontouch_callback(MOTION_EVENT_ACTION_UP, x, y, d);
break; break;
case GDK_MOTION_NOTIFY: case GDK_MOTION_NOTIFY:
if(d->num_clicks == 0) if(d->num_clicks == 0)
break; break;
case GDK_TOUCH_UPDATE: case GDK_TOUCH_UPDATE:
gdk_event_get_widget_relative_position(event, widget, &x, &y); gdk_event_get_widget_relative_position(event, widget, &x, &y);
call_ontouch_callback(MOTION_EVENT_ACTION_MOVE, x, y, d); return call_ontouch_callback(MOTION_EVENT_ACTION_MOVE, x, y, d);
break; break;
default: default:
break; break;
} }
return true; return false;
} }
static void on_click(GtkGestureClick *gesture, int n_press, double x, double y, struct touch_callback_data *d) static void on_click(GtkGestureClick *gesture, int n_press, double x, double y, struct touch_callback_data *d)

2
src/api-impl/android/view/View.java
View File

@@ -875,7 +875,7 @@ public class View extends Object {
} }
public boolean onTouchEvent(MotionEvent event) { public boolean onTouchEvent(MotionEvent event) {
return true; return false;
} }
public native void setOnTouchListener(OnTouchListener l); public native void setOnTouchListener(OnTouchListener l);