stuff

Author: igagis

src/ruisapp/glue/android/application.cxx

@@ -7,6 +7,21 @@ application_glue::application_glue(utki::version_duplet gl_version) :
 	gl_version(std::move(gl_version))
 {}
 
+app_window& application_glue::make_window(ruisapp::window_parameters window_params){
+	utki::assert(!this->window.has_value(), SL);
+
+	// TODO:
+
+	utki::assert(this->window.has_value(), SL);
+	return this->window.value();
+}
+
+void application_glue::render(){
+	if(this->window.has_value()){
+		this->window.value().render();
+	}
+}
+
 std::unique_ptr<papki::file> ruisapp::application::get_res_file(std::string_view path) const
 {
 	utki::assert(globals_wrapper::native_activity, SL);
@@ -17,3 +32,8 @@ std::unique_ptr<papki::file> ruisapp::application::get_res_file(std::string_view
 		path
 	);
 }
+
+ruisapp::window& ruisapp::application::make_window(ruisapp::window_parameters window_params){
+	auto& glue = get_glue(*this);
+	return glue.make_window(std::move(window_params));
+}

src/ruisapp/glue/android/application.hxx

@@ -25,6 +25,22 @@ public:
 	utki::shared_ref<ruis::updater> updater = utki::make_shared<ruis::updater>();
 
 	application_glue(utki::version_duplet gl_version);
+
+	app_window& make_window(ruisapp::window_parameters window_params);
+
+	void render();
+
+	void create_window_surface(ANativeWindow& android_window){
+		if(this->window.has_value()){
+			this->window.create_surface(android_window);
+		}
+	}
+
+	void destroy_window_surface(){
+		if(this->window.has_value()){
+			this->window.value().destroy_surface();
+		}
+	}
 };
 } // namespace
 

src/ruisapp/glue/android/globals.cxx

@@ -79,7 +79,11 @@ int on_update_timer_expired(
 }
 } // namespace
 
-globals_wrapper()
+globals_wrapper() :
+	app(std::move(ruisapp::application_factory::make_application(
+								   0, // argc
+								   nullptr // argv
+			)))
 {
 	// add timer descriptor to looper, this is needed for updatable to work
 	if (ALooper_addFd(
@@ -106,6 +110,11 @@ globals_wrapper()
 	{
 		throw std::runtime_error("failed to add UI message queue descriptor to looper");
 	}
+
+	// Set the fd_flag to call the update() for the first time if there
+	// were any updateables started during creating application
+	// object.
+	this->fd_flag.set();
 }
 
 ~globals_wrapper()

src/ruisapp/glue/android/globals.hxx

@@ -4,6 +4,7 @@
 #include <android/window.h>
 #include <nitki/queue.hpp>
 #include <utki/debug.hpp>
+#include <utki/unique_ref.hpp>
 
 #include "../../application.hpp"
 
@@ -56,11 +57,10 @@ struct globals_wrapper final {
 		utki::make_unique<android_configuration_wrapper>(*android_configuration_wrapper::native_activity->assetManager);
 
 	AInputQueue* input_queue = nullptr;
-	ANativeWindow* android_window = nullptr;
 
 	ruis::vector2 cur_window_dims(0, 0);
 
-	std::unique_ptr<ruisapp::application> app;
+	utki::unique_ref<ruisapp::application> app;
 };
 } // namespace
 

src/ruisapp/glue/android/glue.cxx

@@ -481,11 +481,13 @@ void handle_input_events()
 	auto& glob = get_glob();
 	utki::assert(glob.input_queue, SL);
 
+	auto& glue = get_glue();
+
+	// TODO: remove
 	auto& app = ruisapp::inst();
 
 	// read and handle input events
-	AInputEvent* event;
-	while (AInputQueue_getEvent(glob.input_queue, &event) >= 0) {
+	while (AInputEvent* event; AInputQueue_getEvent(glob.input_queue, &event) >= 0) {
 		utki::assert(event, SL);
 
 		// utki::log_debug([&](auto&o){o << "New input event: type = " <<
@@ -675,9 +677,9 @@ void handle_input_events()
 		);
 	}
 
-	get_impl(app).render(app);
+	glue.render();
 
-	fd_flag.set();
+	glob.fd_flag.set();
 }
 } // namespace
 
@@ -735,17 +737,14 @@ void on_configuration_changed(ANativeActivity* activity)
 
 	auto& glob = get_glob();
 
-	// find out what exactly has changed in the configuration
-	int32_t diff;
-	{
-		utki::assert(activity->assetManager, SL);
-		auto config = utki::make_unique<android_configuration_wrapper>(*activity->assetManager);
+	// find out what exactly has changed in the configuration	
+	utki::assert(activity->assetManager, SL);
+	auto config = utki::make_unique<android_configuration_wrapper>(*activity->assetManager);
 
-		diff = glob.cur_android_configuration.diff(config);
+	int32_t diff = glob.cur_android_configuration.diff(config);
 
-		// store new configuration
-		glob.cur_android_configuration = std::move(config);
-	}
+	// store new configuration
+	glob.cur_android_configuration = std::move(config);
 
 	// if orientation has changed
 	if (diff & ACONFIGURATION_ORIENTATION) {
@@ -792,53 +791,22 @@ void on_native_window_created(
 	utki::assert(globals_wrapper::native_activity, SL);
 	utki::assert(activity == globals_wrapper::native_activity, SL);
 
+	utki::assert(window, SL);
+
 	utki::log_debug([](auto& o) {
 		o << "on_native_window_created(): invoked" << std::endl;
 	});
 
 	auto& glob = get_glob();
 
-	// save window in a static var, so it is accessible for creating window surface
-	glob.android_window = window;
-
 	glob.cur_window_dims.x() = float(ANativeWindow_getWidth(window));
 	glob.cur_window_dims.y() = float(ANativeWindow_getHeight(window));
 
-	// If we have no application instance yet, create it now.
-	// Otherwise the window was re-created after moving the app from background to foreground
-	// and we just need to create EGL surface for the new window.
-	if (!glob.app) {
-		try {
-			// TODO: create application in globals_wrapper, do not create surface there, create surface here
-			application* app = ruisapp::application_factory::make_application(
-								   0, // argc
-								   nullptr // argv
-			)
-								   .release();
-
-			// android application should always have GUI
-			utki::assert_always(app, SL);
-
-			activity->instance = app;
-
-			// Set the fd_flag to call the update() for the first time if there
-			// were any updateables started during creating application
-			// object.
-			glob.fd_flag.set();
-		} catch (std::exception& e) {
-			utki::log_debug([&](auto& o) {
-				o << "std::exception uncaught while creating application instance: " << e.what() << std::endl;
-			});
-			throw;
-		} catch (...) {
-			utki::log_debug([](auto& o) {
-				o << "unknown exception uncaught while creating application instance!" << std::endl;
-			});
-			throw;
-		}
-	} else {
-		get_impl(get_app(activity)).create_surface();
-	}
+	auto& glue = get_glue();
+
+	// The android window was just initially created or was re-created after moving the app
+	// from background to foreground. In any case we just need to create EGL surface for the new android window.
+	glue.create_window_surface(*window);
 }
 
 void on_native_window_resized(ANativeActivity* activity,//
@@ -848,6 +816,10 @@ void on_native_window_resized(ANativeActivity* activity,//
 		o << "on_native_window_resized(): invoked" << std::endl;
 	});
 
+	utki::assert(window, SL);
+
+	auto& glob = get_glob();
+
 	// save window dimensions
 	glob.cur_window_dims.x() = float(ANativeWindow_getWidth(window));
 	glob.cur_window_dims.y() = float(ANativeWindow_getHeight(window));
@@ -864,9 +836,8 @@ void on_native_window_redraw_needed(ANativeActivity* activity, //
 		o << "on_native_window_redraw_needed(): invoked" << std::endl;
 	});
 
-	auto& app = get_app(activity);
-
-	get_impl(app).render(app);
+	auto& glue = get_glue();
+	glue.render();
 }
 
 // This function is called right before destroying Window object, according to
@@ -879,12 +850,12 @@ void on_native_window_destroyed(ANativeActivity* activity, //
 		o << "on_native_window_destroyed(): invoked" << std::endl;
 	});
 
+	auto& glue = get_glue();
+
 	// destroy EGL drawing surface associated with the window.
 	// the EGL context remains existing and should preserve all resources like
 	// textures, vertex buffers, etc.
-	get_impl(get_app(activity)).destroy_surface();
-
-	android_window = nullptr;
+	glue.destroy_window_surface();
 }
 
 int on_input_events_ready_for_reading_from_queue(
@@ -999,6 +970,7 @@ void on_content_rect_changed(
 		o << "on_content_rect_changed(): cur_window_dims = " << glob.cur_window_dims << std::endl;
 	});
 
+	// TODO: this check is not needed anymore, since app object outlives window now
 	// Sometimes Android calls on_content_rect_changed() even after native window
 	// was destroyed, i.e. on_native_window_destroyed() was called and, thus,
 	// application object was destroyed. So need to check if our application is
@@ -1017,15 +989,15 @@ void on_content_rect_changed(
 	update_window_rect(
 		app,
 		ruis::rect(
-			float(rect->left),
+			float(rect->left), //
 			glob.cur_window_dims.y() - float(rect->bottom),
 			float(rect->right - rect->left),
 			float(rect->bottom - rect->top)
 		)
 	);
 
 	// redraw, since WindowRedrawNeeded not always comes
-	get_impl(app).render(app);
+	glob.render();
 }
 
 void on_destroy(ANativeActivity* activity)

src/ruisapp/glue/android/window.cxx

@@ -23,7 +23,7 @@ void native_window::swap_frame_buffers(){
     }
 }
 
-void native_window::create_surface(){
+void native_window::create_surface(ANativeWindow& android_window){
     utki::assert(!this->egl_surface.has_value(), SL);
 
     EGLint format;
@@ -42,21 +42,18 @@ void native_window::create_surface(){
         throw std::runtime_error("eglGetConfigAttrib() failed");
     }
 
-    utki::assert(android_window, SL);
-
-    // TODO: get android_window from somewhere
-    utki::assert(android_window, SL);
+    // if both buffer width and height are 0 then it will be sized to the window dimensions
     ANativeWindow_setBuffersGeometry(
-        android_window, //
-        0,
-        0,
+        &android_window, //
+        0, // buffer width in pixels
+        0, // buffer height in pixels
         format
     );
 
     this->egl_surface.emplace(
         this->egl_display,//
         this->egl_config,
-        EGLNativeWindowType(android_window)
+        EGLNativeWindowType(&android_window)
     );
 }
 

src/ruisapp/glue/android/window.hxx

@@ -23,7 +23,7 @@ public:
 
     void swap_frame_buffers()override;
 
-    void create_surface();
+    void create_surface(ANativeWindow& android_window);
     void destroy_surface();
 
     r4::vector2<unsigned> get_dims();