update

Author: igagis

src/ruisapp/application.cpp

@@ -149,15 +149,25 @@ const application_factory::factory_type& application_factory::get_factory()
 	return f;
 }
 
-std::unique_ptr<application> application_factory::create_application(int argc, const char** argv)
+std::unique_ptr<application> application_factory::make_application(
+	int argc, //
+	const char** argv
+)
 {
-	auto args = utki::make_span(argv, argc);
+	auto cli_args = utki::make_span(argv, argc);
 
-	if (args.empty()) {
+	if (cli_args.empty()) {
 		return get_factory()(std::string_view(), {});
 	}
 
-	return get_factory()(args.front(), args.subspan(1));
+	std::string_view executable = cli_args.front();
+
+	std::vector<std::string_view> args;
+	for (const auto& a : cli_args.subspan(1)) {
+		args.emplace_back(a);
+	}
+
+	return get_factory()(executable, args);
 }
 
 application_factory::application_factory(factory_type factory)

src/ruisapp/application.hpp

@@ -85,8 +85,8 @@ struct window_params {
 /**
  * @brief Base singleton class of application.
  * An application should subclass this class and return an instance from the
- * application factory function create_application(), see application.hpp for
- * details. When instance of this class is created it also creates a window and
+ * application_factory, see application_factory for details.
+ * When instance of this class is created it also creates a window and
  * initializes rendering API (e.g. OpenGL or OpenGL ES).
  */
 class application : public utki::intrusive_singleton<application>
@@ -307,8 +307,10 @@ inline application& inst()
 class application_factory
 {
 public:
-	using factory_type =
-		std::function<std::unique_ptr<application>(std::string_view executable, utki::span<const char*> args)>;
+	using factory_type = std::function<std::unique_ptr<application>(
+		std::string_view executable, //
+		utki::span<std::string_view> args
+	)>;
 
 	/**
 	 * @brief Constructor.
@@ -319,6 +321,11 @@ class application_factory
 	 */
 	application_factory(factory_type factory);
 
+	/**
+	 * @brief Get registered factory function.
+	 * @return Registered factory function.
+	 * @throw std::logic_error if no factory function was registered, i.e. application_factory instance is not created.
+	 */
 	static const factory_type& get_factory();
 
 	/**
@@ -327,7 +334,10 @@ class application_factory
 	 * @param argv - array of command line arguments. First argument is the
 	 *               executable filename.
 	 */
-	static std::unique_ptr<application> create_application(int argc, const char** argv);
+	static std::unique_ptr<application> make_application(
+		int argc, //
+		const char** argv
+	);
 
 private:
 	static factory_type& get_factory_internal();

src/ruisapp/glue/android/glue.cxx

@@ -1587,7 +1587,7 @@ void on_native_window_created(ANativeActivity* activity, ANativeWindow* window)
 			// retrieve current configuration
 			AConfiguration_fromAssetManager(cfg->android_configuration, native_activity->assetManager);
 
-			application* app = ruisapp::application_factory::create_application(0, nullptr).release();
+			application* app = ruisapp::application_factory::make_application(0, nullptr).release();
 
 			// TODO: check if app == nullptr
 

src/ruisapp/glue/sdl/glue.cxx

@@ -754,7 +754,7 @@ void main_loop_iteration(void* user_data)
 
 int main(int argc, const char** argv)
 {
-	std::unique_ptr<ruisapp::application> app = ruisapp::application_factory::create_application(argc, argv);
+	std::unique_ptr<ruisapp::application> app = ruisapp::application_factory::make_application(argc, argv);
 	if (!app) {
 		// Not an error. The application just did not show any GUI to the user.
 		return 0;

src/ruisapp/glue/unix_common.cxx

@@ -27,7 +27,7 @@ namespace {
 
 std::unique_ptr<ruisapp::application> create_app_unix(int argc, const char** argv)
 {
-	return ruisapp::application_factory::create_application(argc, argv);
+	return ruisapp::application_factory::make_application(argc, argv);
 }
 
 std::string get_xdg_dir_home(

src/ruisapp/glue/windows/glue.cxx

@@ -745,11 +745,14 @@ void application::quit() noexcept
 }
 
 namespace ruisapp {
-void winmain(int argc, const char** argv)
+void winmain(
+	int argc, //
+	const char** argv
+)
 {
-	auto app = ruisapp::application_factory::create_application(argc, argv);
+	auto app = ruisapp::application_factory::make_application(argc, argv);
 	if (!app) {
-		// Not an error. The application just did not show any GUI to the user.
+		// Not an error. The application just did not show any GUI to the user and exited normally.
 		return;
 	}