Bump gio version. Add examples/fragment

examples/dex/main.go

@@ -55,21 +55,23 @@ func eventloop() {
 	for { select {
 		case x := <-labchan:
 			labels = append(labels, material.Body1(th, x))
+			w.Invalidate()
 		case e := <-w.Events():
-		switch e := e.(type) {
+			switch e := e.(type) {
-		case system.DestroyEvent:
+			case system.DestroyEvent:
-			return
+				return
-		case system.FrameEvent:
+			case system.FrameEvent:
-			gtx := layout.NewContext(&ops, e)
+				gtx := layout.NewContext(&ops, e)
-			resetSysinset(e.Insets)
+				resetSysinset(e.Insets)
-			sysinset.Layout(gtx, func(gtx C) D {
+				sysinset.Layout(gtx, func(gtx C) D {
-				return margin.Layout(gtx, func(gtx C) D {
+					return margin.Layout(gtx, func(gtx C) D {
-					return list.Layout(gtx, len(labels), func(gtx C, i int) D {
+						return list.Layout(gtx, len(labels), func(gtx C, i int) D {
-						return labels[i].Layout(gtx)
+							return labels[i].Layout(gtx)
+						})
 					})
 				})
-			})
+				e.Frame(gtx.Ops)
-			e.Frame(gtx.Ops)
+			}
 		}
-	}}
+	}
 }

examples/fragment/AFrag.java

@@ -0,0 +1,27 @@
+package st.wow.git.fragment;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.FragmentTransaction;
+import android.content.Context;
+import android.util.Log;
+import android.view.View;
+
+public class AFrag extends Fragment {
+	@Override public void onAttach(Context ctx) {
+		Log.d("AFrag", "onAttach()");
+		super.onAttach(ctx);
+	}
+
+	public void register(View view) {
+		Log.d("AFrag", "register(): view = " + view.getClass().getCanonicalName());
+		Log.d("AFrag", "register(): Adding fragment");
+		Activity act = (Activity)view.getContext();
+		Log.d("AFrag", "register(): starting transaction");
+		FragmentTransaction ft = act.getFragmentManager().beginTransaction();
+		Log.d("AFrag", "register(): add this");
+		ft.add(this, "AFrag");
+		Log.d("AFrag", "register(): commit");
+		ft.commitNow();
+	}
+}

examples/fragment/jni_android.go

@@ -0,0 +1,138 @@
+package main
+
+/*
+#cgo LDFLAGS: -landroid
+
+#include <stdlib.h>
+#include <jni.h>
+#include <android/log.h>
+
+static jobject gClassLoader;
+static jmethodID gFindClassMethod;
+
+void
+SetLoader(JNIEnv* env, jobject context) {
+	jclass cclass = (*env)->GetObjectClass(env, context);
+	jmethodID gcl_id = (*env)->GetMethodID(env, cclass, "getClassLoader", "()Ljava/lang/ClassLoader;");
+	jobject loader = (*env)->CallObjectMethod(env, context, gcl_id);
+	gClassLoader = (*env)->NewGlobalRef(env, loader);
+	jclass lclass = (*env)->GetObjectClass(env, loader);
+	gFindClassMethod = (*env)->GetMethodID(env, lclass, "findClass", "(Ljava/lang/String;)Ljava/lang/Class;");
+}
+
+jclass
+FindClass(JNIEnv* env, char* name) {
+	jstring strClassName = (*env)->NewStringUTF(env, name);
+	return (*env)->CallObjectMethod(env, gClassLoader, gFindClassMethod, strClassName);
+}
+
+JNIEXPORT jobject
+CreateObject(JNIEnv* env, jclass cls) {
+	jmethodID init = (*env)->GetMethodID(env, cls, "<init>", "()V");
+	return (*env)->NewObject(env, cls, init);
+}
+
+void CallVoidMethod(JNIEnv *env, jobject obj, jmethodID methodID) {
+	(*env)->CallVoidMethod(env, obj, methodID);
+}
+
+void CallVoidMethod1(JNIEnv *env, jobject obj, jmethodID methodID, jobject param) {
+	(*env)->CallVoidMethod(env, obj, methodID, param);
+}
+
+jint CallIntMethod(JNIEnv *env, jobject obj, jmethodID methodID) {
+	return (*env)->CallIntMethod(env, obj, methodID);
+}
+
+jmethodID GetMethodID(JNIEnv *env, jclass clazz, const char *name, const char *sig) {
+	return (*env)->GetMethodID(env, clazz, name, sig);
+}
+
+jint GetEnv(JavaVM *vm, JNIEnv **env, jint version) {
+	return (*vm)->GetEnv(vm, (void **)env, version);
+}
+
+jint AttachCurrentThread(JavaVM *vm, JNIEnv **p_env, void *thr_args) {
+	return (*vm)->AttachCurrentThread(vm, p_env, thr_args);
+}
+
+jint DetachCurrentThread(JavaVM *vm) {
+	return (*vm)->DetachCurrentThread(vm);
+}
+
+*/
+import "C"
+
+import (
+	"errors"
+	"fmt"
+	"log"
+	"runtime"
+	"unsafe"
+)
+
+var theJVM *C.JavaVM
+type JNIEnv = C.JNIEnv
+
+func SetJVM(jvm, context uintptr) {
+	log.Print("set theJVM")
+	theJVM = (*C.JavaVM)(unsafe.Pointer(jvm))
+	log.Printf("theJVM = %d", uintptr(unsafe.Pointer(theJVM)))
+	RunInJVM(func(env *C.JNIEnv) {
+		C.SetLoader(env, (C.jobject)(context))
+	})
+}
+
+func FindClass(env *C.JNIEnv, name string) C.jclass {
+	cname := C.CString(name)
+	defer C.free(unsafe.Pointer(cname))
+	return C.FindClass((*C.JNIEnv)(env), cname)
+}
+
+func JniCallVoidMethod(env *C.JNIEnv, obj C.jobject, methodID C.jmethodID) {
+	C.CallVoidMethod(env, obj, methodID)
+}
+
+func JniCallVoidMethod1(env *C.JNIEnv, obj C.jobject, methodID C.jmethodID, param uintptr) {
+	C.CallVoidMethod1(env, obj, methodID, (C.jobject)(unsafe.Pointer(param)))
+}
+
+func JniCallIntMethod(env *C.JNIEnv, obj C.jobject, methodID C.jmethodID) int {
+	return (int)(C.CallIntMethod(env, obj, methodID))
+}
+
+func JniGetMethodID(env *C.JNIEnv, cls C.jclass, name, sig string) C.jmethodID {
+	cname := C.CString(name)
+	defer C.free(unsafe.Pointer(cname))
+	csig := C.CString(sig)
+	defer C.free(unsafe.Pointer(csig))
+	return C.GetMethodID(env, cls, cname, csig)
+}
+
+func CreateObject(env *C.JNIEnv, cls C.jclass) C.jobject {
+	return C.CreateObject(env, (C.jclass)(cls))
+}
+
+func RunInJVM(f func(env *C.JNIEnv)) {
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+	var env *C.JNIEnv
+	var detach bool
+	log.Printf("RunInJVM(): theJVM = %d", uintptr(unsafe.Pointer(theJVM)))
+	if res := C.GetEnv(theJVM, &env, C.JNI_VERSION_1_6); res != C.JNI_OK {
+		if res != C.JNI_EDETACHED {
+			panic(fmt.Errorf("JNI GetEnv failed with error %d", res))
+		}
+		if C.AttachCurrentThread(theJVM, &env, nil) != C.JNI_OK {
+			panic(errors.New("runInJVM: AttachCurrentThread failed"))
+		}
+		detach = true
+	}
+
+	if detach {
+		defer func() {
+			C.DetachCurrentThread(theJVM)
+		}()
+	}
+	f(env)
+}

examples/fragment/main.go

@@ -0,0 +1,79 @@
+// +build darwin linux
+
+package main
+
+import (
+	"log"
+
+	"gioui.org/app"
+	"gioui.org/io/system"
+	"gioui.org/layout"
+	"gioui.org/op"
+	"gioui.org/unit"
+	"gioui.org/widget/material"
+
+	"gioui.org/font/gofont"
+)
+
+var (
+	labchan chan string
+)
+
+type (
+	D = layout.Dimensions
+	C = layout.Context
+)
+
+func main() {
+	labchan = make(chan string)
+	log.Print("Staring event loop")
+	go eventloop()
+	app.Main()
+	log.Print("app.Main() returned")
+}
+
+func eventloop() {
+	w := app.NewWindow(
+		app.Size(unit.Dp(400), unit.Dp(400)),
+		app.Title("Hello"))
+	th := material.NewTheme(gofont.Collection())
+	var ops op.Ops
+
+	sysinset := &layout.Inset{}
+	margin := layout.UniformInset(unit.Dp(10))
+	labels := []material.LabelStyle{}
+	list := &layout.List{Axis: layout.Vertical}
+
+	resetSysinset := func(x system.Insets) {
+		sysinset.Top = x.Top
+		sysinset.Bottom = x.Bottom
+		sysinset.Left = x.Left
+		sysinset.Right = x.Right
+	}
+	go func() {
+		labchan <- "Starting"
+		registerFragment(w)
+	}()
+	for {
+		select {
+		case x := <-labchan:
+			labels = append(labels, material.Body1(th, x))
+		case e := <-w.Events():
+			switch e := e.(type) {
+			case system.DestroyEvent:
+				return
+			case system.FrameEvent:
+				gtx := layout.NewContext(&ops, e)
+				resetSysinset(e.Insets)
+				sysinset.Layout(gtx, func(gtx C) D {
+					return margin.Layout(gtx, func(gtx C) D {
+						return list.Layout(gtx, len(labels), func(gtx C, i int) D {
+							return labels[i].Layout(gtx)
+						})
+					})
+				})
+				e.Frame(gtx.Ops)
+			}
+		}
+	}
+}

examples/fragment/os_android.go

@@ -0,0 +1,35 @@
+//go:generate javac -bootclasspath $ANDROID_HOME/platforms/android-29/android.jar AFrag.java
+//go:generate jar cf AFrag.jar AFrag.class
+//go:generate rm AFrag.class
+
+package main
+
+import (
+	"log"
+
+	"gioui.org/app"
+)
+
+func registerFragment(w *app.Window) {
+	labchan <- "registerFragment()"
+	SetJVM(app.JavaVM(), app.AppContext())
+
+	w.Do(func(view uintptr) {
+		RunInJVM(func(env *JNIEnv) {
+			log.Print("finding class")
+			cls := FindClass(env, "st/wow/git/fragment/AFrag")
+			log.Print("getting methodID")
+			mth := JniGetMethodID(env, cls, "register", "(Landroid/view/View;)V");
+			if mth == nil {
+				labchan <- "nil method"
+				return
+			}
+			log.Print("creating object")
+			inst := CreateObject(env, cls)
+			log.Print("calling method")
+			JniCallVoidMethod1(env, inst, mth, view)
+			log.Print("got result")
+		})
+	})
+}
+

examples/fragment/os_other.go

@@ -0,0 +1,8 @@
+// +build !android
+
+package main
+
+func registerFragment() {
+	labchan <- "nothing to do"
+}
+

examples/jni/main.go

@@ -58,6 +58,7 @@ func eventloop() {
 		select {
 		case x := <-labchan:
 			labels = append(labels, material.Body1(th, x))
+			w.Invalidate()
 		case e := <-w.Events():
 			switch e := e.(type) {
 			case system.DestroyEvent:

go.mod

@@ -2,4 +2,4 @@ module git.wow.st/gmp/android-go
 
 go 1.14
 
-require gioui.org v0.0.0-20200611133933-6d5fbcba3f21
+require gioui.org v0.0.0-20200619121558-88ced59dad93

go.sum

@@ -5,6 +5,8 @@ gioui.org v0.0.0-20191112235626-1bf2c7ef293c h1:jhUehzf6xTCgEewbJyjd+WE2Kq5pvPIx
 gioui.org v0.0.0-20191112235626-1bf2c7ef293c/go.mod h1:KqFFi2Dq5gYA3FJ0sDOt8OBXoMsuxMtE8v2f0JExXAY=
 gioui.org v0.0.0-20200611133933-6d5fbcba3f21 h1:VFB+0QxUPABMgEarfyJeHQvUNc++9TASnDVXcFgxLcA=
 gioui.org v0.0.0-20200611133933-6d5fbcba3f21/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04=
+gioui.org v0.0.0-20200619121558-88ced59dad93 h1:Llh4Tigdbu++FrRXL/KzqDHnH2Q5LPmAEk0djh6NLwk=
+gioui.org v0.0.0-20200619121558-88ced59dad93/go.mod h1:jiUwifN9cRl/zmco43aAqh0aV+s9GbhG13KcD+gEpkU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -15,6 +17,8 @@ golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3/go.mod h1:NOZ3BPKG0ec/BKJQgn
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20200618115811-c13761719519 h1:1e2ufUJNM3lCHEY5jIgac/7UTjd6cgJNdatjPdFWf34=
+golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=