From 4cd5153b323ad93e5e7f8501c2c5efaf14f8160f Mon Sep 17 00:00:00 2001
From: Larpon <Larpon@users.noreply.github.com>
Date: Wed, 30 Sep 2020 07:40:05 +0200
Subject: [PATCH] android: enable autofree (#6503)

---
 vlib/v/gen/cmain.v | 52 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/vlib/v/gen/cmain.v b/vlib/v/gen/cmain.v
index 640ed3eb75..e7dd4e478b 100644
--- a/vlib/v/gen/cmain.v
+++ b/vlib/v/gen/cmain.v
@@ -90,20 +90,48 @@ pub fn (mut g Gen) gen_c_main_footer() {
 }
 
 pub fn (mut g Gen) gen_c_android_sokol_main() {
-	// TODO get autofree weaved into android lifecycle somehow
-	/*
+	// Weave autofree into sokol lifecycle callback(s)
 	if g.autofree {
-		g.writeln('\t_vcleanup();')
+		g.writeln('// Wrapping cleanup/free callbacks for sokol to include _vcleanup()
+void (*_vsokol_user_cleanup_ptr)(void);
+void (*_vsokol_user_cleanup_cb_ptr)(void *);
+
+void (_vsokol_cleanup_cb)(void) {
+	if (_vsokol_user_cleanup_ptr) {
+		_vsokol_user_cleanup_ptr();
 	}
-	*/
-	// TODO do proper check for the global g_desc field we need
-	g.writeln('sapp_desc sokol_main(int argc, char* argv[]) {')
-	g.writeln('\t(void)argc; (void)argv;')
-	g.writeln('')
-	g.writeln('\t_vinit();')
-	g.writeln('\tmain__main();')
-	g.writeln('')
-	g.writeln('\treturn g_desc;')
+	_vcleanup();
+}
+
+void (_vsokol_cleanup_userdata_cb)(void* user_data) {
+	if (_vsokol_user_cleanup_cb_ptr) {
+		_vsokol_user_cleanup_cb_ptr(g_desc.user_data);
+	}
+	_vcleanup();
+}
+')
+	}
+
+	g.writeln('// The sokol_main entry point on Android
+sapp_desc sokol_main(int argc, char* argv[]) {
+	(void)argc; (void)argv;
+
+	_vinit();
+	main__main();
+')
+	if g.autofree {
+		g.writeln('	// Wrap user provided cleanup/free functions for sokol to be able to call _vcleanup()
+	if (g_desc.cleanup_cb) {
+		_vsokol_user_cleanup_ptr = g_desc.cleanup_cb;
+		g_desc.cleanup_cb = _vsokol_cleanup_cb;
+	}
+	else if (g_desc.cleanup_userdata_cb) {
+		_vsokol_user_cleanup_cb_ptr = g_desc.cleanup_userdata_cb;
+		g_desc.cleanup_userdata_cb = _vsokol_cleanup_userdata_cb;
+	}
+')
+	}
+	g.writeln('	return g_desc;')
 	g.writeln('}')
 }