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

replace use of glfw for SurfaceView with use of wayland subsurface positioned over a Gtk widget

Browse Source
This commit is contained in:
Mis012
2022-11-02 14:37:34 +01:00
parent e88709cf9d
commit 6a1d2f4ed4
7 changed files with 175 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/api-impl-jni/widgets/android_view_SurfaceView.c
View File

@@ -4,25 +4,93 @@
#include "../util.h"
#include "WrapperWidget.h"
#include "marshal.h"
#include "../generated_headers/android_view_SurfaceView.h"
// TODO: currently this widget class doesn't do anything special, will we ever need it to?
G_DECLARE_FINAL_TYPE (SurfaceViewWidget, surface_view_widget, SURFACE_VIEW, WIDGET, GtkWidget)
struct _SurfaceViewWidget
{
GtkWidget parent_instance;
};
struct _SurfaceViewWidgetClass
{
GtkWidgetClass parent_class;
};
G_DEFINE_TYPE(SurfaceViewWidget, surface_view_widget, GTK_TYPE_WIDGET)
static void surface_view_widget_init (SurfaceViewWidget *wrapper_widget)
{
}
// resize signal copied from GtkDrawingArea
enum {
RESIZE,
LAST_SIGNAL
};
static guint signals[LAST_SIGNAL] = { 0, };
static void surface_view_widget_size_allocate(GtkWidget *widget, int width, int height, int baseline)
{
g_signal_emit(widget, signals[RESIZE], 0, width, height);
}
static void surface_view_widget_class_init(SurfaceViewWidgetClass *class)
{
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
// resize signal copied from GtkDrawingArea
widget_class->size_allocate = surface_view_widget_size_allocate;
signals[RESIZE] =
g_signal_new("resize",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkDrawingAreaClass, resize),
NULL, NULL,
g_cclosure_user_marshal_VOID__INT_INT,
G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
g_signal_set_va_marshaller(signals[RESIZE],
G_TYPE_FROM_CLASS (class),
g_cclosure_user_marshal_VOID__INT_INTv);
}
GtkWidget * surface_view_widget_new(void)
{
return g_object_new (surface_view_widget_get_type(), NULL);
}
// ---
struct jni_callback_data { JavaVM *jvm; jobject this; jclass this_class;};
static void on_mapped(GtkWidget* self, struct jni_callback_data *d)
static void on_resize(GtkWidget* self, gint width, gint height, struct jni_callback_data *d)
{
JNIEnv *env;
(*d->jvm)->GetEnv(d->jvm, (void**)&env, JNI_VERSION_1_6);
(*env)->CallVoidMethod(env, d->this, _METHOD(d->this_class, "surfaceChanged", "(Landroid/view/SurfaceHolder;III)V"), _GET_OBJ_FIELD(d->this, "mSurfaceHolder", "Landroid/view/SurfaceHolder;"), 1 /*RGBA_8888*/, /*FIXME*/700, /*FIXME*/700);
// TODO: are there cases where returning RGBA_8888 is a bad idea?
(*env)->CallVoidMethod(env, d->this, _METHOD(d->this_class, "surfaceChanged", "(Landroid/view/SurfaceHolder;III)V"),
_GET_OBJ_FIELD(d->this, "mSurfaceHolder", "Landroid/view/SurfaceHolder;"), 1 /*RGBA_8888*/,
width, height);
}
JNIEXPORT void JNICALL Java_android_view_SurfaceView_native_1constructor(JNIEnv *env, jobject this, jobject context)
{
GtkWidget *wrapper = wrapper_widget_new();
GtkWidget *dummy = gtk_fixed_new();
GtkWidget *dummy = surface_view_widget_new();
gtk_widget_set_name(dummy, "dummy widget for SurfaceView");
wrapper_widget_set_child(WRAPPER_WIDGET(wrapper), dummy);
// TODO: is this correct for all usecases? how do we know when it's not?
gtk_widget_set_hexpand(wrapper, true);
gtk_widget_set_vexpand(wrapper, true);
JavaVM *jvm;
(*env)->GetJavaVM(env, &jvm);
@@ -32,7 +100,7 @@ JNIEXPORT void JNICALL Java_android_view_SurfaceView_native_1constructor(JNIEnv
callback_data->this = _REF(this);
callback_data->this_class = _REF(_CLASS(this));
g_signal_connect(dummy, "map", G_CALLBACK(on_mapped), callback_data);
g_signal_connect(dummy, "resize", G_CALLBACK(on_resize), callback_data);
_SET_LONG_FIELD(this, "widget", _INTPTR(dummy));
}