stuff

Author: igagis

src/ruisapp/glue/android/application.cxx

@@ -3,13 +3,17 @@
 #include "android_globals.hxx"
 #include "asset_file.hxx"
 
+application_glue::application_glue(utki::version_duplet gl_version) :
+	gl_version(std::move(gl_version))
+{}
+
 std::unique_ptr<papki::file> ruisapp::application::get_res_file(std::string_view path) const
 {
-	utki::assert(android_globals_wrapper::native_activity, SL);
-	utki::assert(android_globals_wrapper::native_activity->assetManager, SL);
+	utki::assert(globals_wrapper::native_activity, SL);
+	utki::assert(globals_wrapper::native_activity->assetManager, SL);
 
 	return std::make_unique<asset_file>(
-		android_globals_wrapper::native_activity->assetManager, //
+		globals_wrapper::native_activity->assetManager, //
 		path
 	);
 }

src/ruisapp/glue/android/application.hxx

@@ -9,14 +9,22 @@ namespace {
 class app_window : public ruisapp::window
 {
 public:
+	utki::shared_ref<native_window> ruis_native_Window;
+
 };
 } // namespace
 
 namespace {
 class application_glue : public utki::destructable
 {
+	const utki::version_duplet gl_version;
+
+	// Only one window on android.
+	std::optional<app_window> window;
 public:
 	utki::shared_ref<ruis::updater> updater = utki::make_shared<ruis::updater>();
+
+	application_glue(utki::version_duplet gl_version);
 };
 } // namespace
 

…ruisapp/glue/android/android_globals.cxx src/ruisapp/glue/android/globals.cxxsrc/ruisapp/glue/android/android_globals.cxx renamed to src/ruisapp/glue/android/globals.cxx src/ruisapp/glue/android/android_globals.cxx renamed to src/ruisapp/glue/android/globals.cxx

@@ -1,32 +1,32 @@
 #include "android_globals.hxx"
 
-void android_globals_wrapper::create(ANativeActivity* native_activity)
+void globals_wrapper::create(ANativeActivity* activity)
 {
-	utki::assert(native_activity, SL);
-	utki::assert(!native_activity->instance, SL);
+	utki::assert(activity, SL);
+	utki::assert(!activity->instance, SL);
 
-	utki::assert(!android_globals_wrapper::native_activity, SL);
+	utki::assert(!globals_wrapper::native_activity, SL);
 
 	try {
-		android_globals_wrapper::native_activity = native_activity;
+		globals_wrapper::native_activity = activity;
 
-		native_activity->instance = new android_globals_wrapper();
+		activity->instance = new globals_wrapper();
 	} catch (...) {
-		android_globals_wrapper::native_activity = nullptr;
+		globals_wrapper::native_activity = nullptr;
 		throw;
 	}
 }
 
-void android_globals_wrapper::destroy()
+void globals_wrapper::destroy()
 {
-	utki::assert(android_globals_wrapper::native_activity, SL);
-	utki::assert(android_globals_wrapper::native_activity->instance, SL);
+	utki::assert(globals_wrapper::native_activity, SL);
+	utki::assert(globals_wrapper::native_activity->instance, SL);
 
-	auto wrapper = static_cast<android_globals_wrapper*>(android_globals_wrapper::native_activity->instance);
+	auto wrapper = static_cast<globals_wrapper*>(globals_wrapper::native_activity->instance);
 	delete wrapper;
 
-	android_globals_wrapper::native_activity->instance = nullptr;
-	android_globals_wrapper::native_activity = nullptr;
+	globals_wrapper::native_activity->instance = nullptr;
+	globals_wrapper::native_activity = nullptr;
 }
 
 namespace {
@@ -79,7 +79,7 @@ int on_update_timer_expired(
 }
 } // namespace
 
-android_globals_wrapper()
+globals_wrapper()
 {
 	// add timer descriptor to looper, this is needed for updatable to work
 	if (ALooper_addFd(
@@ -108,7 +108,7 @@ android_globals_wrapper()
 	}
 }
 
-~android_globals_wrapper()
+~globals_wrapper()
 {
 	// remove UI message queue descriptor from looper
 	ALooper_removeFd(

…ruisapp/glue/android/android_globals.hxx src/ruisapp/glue/android/globals.hxxsrc/ruisapp/glue/android/android_globals.hxx renamed to src/ruisapp/glue/android/globals.hxx src/ruisapp/glue/android/android_globals.hxx renamed to src/ruisapp/glue/android/globals.hxx

@@ -13,28 +13,28 @@
 #include "linux_timer.hxx"
 
 namespace {
-struct android_globals_wrapper final {
+struct globals_wrapper final {
 	static ANativeActivity* native_activity = nullptr;
 
-	static void create(ANativeActivity* native_activity);
+	static void create(ANativeActivity* activity);
 	static void destroy();
 
-	static android_globals_wrapper& get()
+	static globals_wrapper& get()
 	{
 		utki::assert(native_activity, SL);
 		utki::assert(native_activity->instance, SL);
 		return
 	}
 
-	android_globals_wrapper();
+	globals_wrapper();
 
-	android_globals_wrapper(const android_globals_wrapper&) = delete;
-	android_globals_wrapper& operator=(const android_globals_wrapper&) = delete;
+	globals_wrapper(const globals_wrapper&) = delete;
+	globals_wrapper& operator=(const globals_wrapper&) = delete;
 
-	android_globals_wrapper(android_globals_wrapper&&) = delete;
-	android_globals_wrapper& operator=(android_globals_wrapper&&) = delete;
+	globals_wrapper(globals_wrapper&&) = delete;
+	globals_wrapper& operator=(globals_wrapper&&) = delete;
 
-	~android_globals_wrapper();
+	~globals_wrapper();
 
 	java_functions_wrapper java_functions;
 
@@ -58,16 +58,18 @@ struct android_globals_wrapper final {
 	AInputQueue* input_queue = nullptr;
 	ANativeWindow* android_window = nullptr;
 
+	ruis::vector2 cur_window_dims(0, 0);
+
 	std::unique_ptr<ruisapp::application> app;
 };
 } // namespace
 
 namespace {
-inline android_globals_wrapper& get_glob()
+inline globals_wrapper& get_glob()
 {
-	auto na = android_globals_wrapper::native_activity;
+	auto na = globals_wrapper::native_activity;
 	utki::assert(na, SL);
 	utki::assert(na->instance, SL);
-	return *static_cast<android_globals_wrapper*>(na->instance);
+	return *static_cast<globals_wrapper*>(na->instance);
 }
 } // namespace

src/ruisapp/glue/android/glue.cxx

@@ -19,12 +19,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 /* ================ LICENSE END ================ */
 
-#include "android_globals.hxx"
+#include "globals.hxx"
 
 // TODO: remove
 using namespace ruisapp;
 
-namesapce
+namespace
 {
 	// struct window_wrapper : public utki::destructable {
 	// 	// EGLDisplay display;
@@ -232,8 +232,6 @@ namesapce
 	// 	return get_impl(get_window_pimpl(app));
 	// }
 
-	ruis::vector2 cur_window_dims(0, 0);
-
 	// array of current pointer positions, needed to detect which pointers have
 	// actually moved.
 	std::array<ruis::vector2, 10> pointers;
@@ -243,7 +241,10 @@ namesapce
 		const ruis::vector2& p
 	)
 	{
-		ruis::vector2 ret(p.x(), p.y() - (cur_window_dims.y() - win_dim.y()));
+		auto& glob = get_glob();
+
+		ruis::vector2 ret(p.x(), //
+		p.y() - (glob.cur_window_dims.y() - win_dim.y()));
 		//	utki::log_debug([&](auto&o){o << "android_win_coords_to_ruis_win_rect_coords(): ret
 		//= " << ret << std::endl;});
 		using std::round;
@@ -725,8 +726,8 @@ void on_stop(ANativeActivity* activity)
 
 void on_configuration_changed(ANativeActivity* activity)
 {
-	utki::assert(android_globals_wrapper::native_activity, SL);
-	utki::assert(activity == android_globals_wrapper::native_activity, SL);
+	utki::assert(globals_wrapper::native_activity, SL);
+	utki::assert(activity == globals_wrapper::native_activity, SL);
 
 	utki::log_debug([](auto& o) {
 		o << "on_configuration_changed(): invoked" << std::endl;
@@ -752,7 +753,7 @@ void on_configuration_changed(ANativeActivity* activity)
 			case ACONFIGURATION_ORIENTATION_LAND:
 			case ACONFIGURATION_ORIENTATION_PORT:
 				using std::swap;
-				swap(cur_window_dims.x(), cur_window_dims.y());
+				swap(glob.cur_window_dims.x(), glob.cur_window_dims.y());
 				break;
 			case ACONFIGURATION_ORIENTATION_SQUARE:
 				// do nothing
@@ -788,8 +789,8 @@ void on_native_window_created(
 	ANativeWindow* window
 )
 {
-	utki::assert(android_globals_wrapper::native_activity, SL);
-	utki::assert(activity == android_globals_wrapper::native_activity, SL);
+	utki::assert(globals_wrapper::native_activity, SL);
+	utki::assert(activity == globals_wrapper::native_activity, SL);
 
 	utki::log_debug([](auto& o) {
 		o << "on_native_window_created(): invoked" << std::endl;
@@ -800,8 +801,8 @@ void on_native_window_created(
 	// save window in a static var, so it is accessible for creating window surface
 	glob.android_window = window;
 
-	cur_window_dims.x() = float(ANativeWindow_getWidth(window));
-	cur_window_dims.y() = float(ANativeWindow_getHeight(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
@@ -848,11 +849,11 @@ void on_native_window_resized(ANativeActivity* activity,//
 	});
 
 	// save window dimensions
-	cur_window_dims.x() = float(ANativeWindow_getWidth(window));
-	cur_window_dims.y() = float(ANativeWindow_getHeight(window));
+	glob.cur_window_dims.x() = float(ANativeWindow_getWidth(window));
+	glob.cur_window_dims.y() = float(ANativeWindow_getHeight(window));
 
 	utki::log_debug([&](auto& o) {
-		o << "on_native_window_resized(): cur_window_dims = " << cur_window_dims << std::endl;
+		o << "on_native_window_resized(): cur_window_dims = " << glob.cur_window_dims << std::endl;
 	});
 }
 
@@ -988,12 +989,14 @@ void on_content_rect_changed(
 	const ARect* rect
 )
 {
+	auto& glob = get_glob();
+
 	utki::log_debug([&](auto& o) {
 		o << "on_content_rect_changed(): invoked, left = " << rect->left << " right = " << rect->right
 		  << " top = " << rect->top << " bottom = " << rect->bottom << std::endl;
 	});
 	utki::log_debug([&](auto& o) {
-		o << "on_content_rect_changed(): cur_window_dims = " << cur_window_dims << std::endl;
+		o << "on_content_rect_changed(): cur_window_dims = " << glob.cur_window_dims << std::endl;
 	});
 
 	// Sometimes Android calls on_content_rect_changed() even after native window
@@ -1015,7 +1018,7 @@ void on_content_rect_changed(
 		app,
 		ruis::rect(
 			float(rect->left),
-			cur_window_dims.y() - float(rect->bottom),
+			glob.cur_window_dims.y() - float(rect->bottom),
 			float(rect->right - rect->left),
 			float(rect->bottom - rect->top)
 		)
@@ -1031,7 +1034,7 @@ void on_destroy(ANativeActivity* activity)
 		o << "on_destroy(): invoked" << std::endl;
 	});
 
-	android_globals_wrapper::destroy();
+	globals_wrapper::destroy();
 }
 } // namespace
 
@@ -1062,5 +1065,5 @@ void ANativeActivity_onCreate(
 	activity->callbacks->onInputQueueDestroyed = &on_input_queue_destroyed;
 	activity->callbacks->onContentRectChanged = &on_content_rect_changed;
 
-	android_globals_wrapper::create(activity);
+	globals_wrapper::create(activity);
 }

src/ruisapp/glue/android/java_functions.cxx

@@ -6,7 +6,7 @@
 
 java_functions_wrapper::java_functions_wrapper()
 {
-	auto a = android_globals_wrapper::native_activity;
+	auto a = globals_wrapper::native_activity;
 
 	this->env = a->env;
 	this->obj = a->clazz;

src/ruisapp/glue/android/window.cxx

@@ -1,5 +1,22 @@
 #include "window.hxx"
 
+native_window::native_window(
+    const utki::version_duplet& gl_version,//
+	const ruisapp::window_parameters& window_params
+) :
+    egl_config(
+        this->egl_display, //
+        gl_version,
+        window_params
+    ),
+    egl_context(
+        this->egl_display, //
+        gl_version,
+        this->egl_config,
+        EGL_NO_CONTEXT // no shared context
+    )
+{}
+
 void native_window::swap_frame_buffers(){
     if(this->egl_surface.has_value()){
         this->egl_surface.value().swap_frame_buffers();

src/ruisapp/glue/android/window.hxx

@@ -2,6 +2,8 @@
 
 #include <ruis/render/native_window.hpp>
 
+#include "../../window.hpp"
+
 #include "../egl_utils.hxx"
 
 namespace {
@@ -14,6 +16,11 @@ class native_window : public ruis::render::native_window
     std::optional<egl_surface_wrapper> egl_surface;
 
 public:
+    native_window(
+        const utki::version_duplet& gl_version,//
+		const ruisapp::window_parameters& window_params
+    );
+
     void swap_frame_buffers()override;
 
     void create_surface();