X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fapplication.h;h=019dee1f3793f1ff0c10203e760b3cd02a17d9b2;hb=9b38e20254913629a0db40e8eb8e1c42e1728e41;hp=e1d3a8b5e2be95d0c2fd0ffce151a1347264f080;hpb=f042fd992170ee8a50a7f596f1c9cdd9600b8583;p=libs%2Fcore.git

diff --git a/source/core/application.h b/source/core/application.h
index e1d3a8b..019dee1 100644
--- a/source/core/application.h
+++ b/source/core/application.h
@@ -2,13 +2,15 @@
 #define MSP_CORE_APPLICATION_H_
 
 #include <stdexcept>
+#include <string>
+#include "noncopyable.h"
 
 namespace Msp {
 
 /**
 Base class for applications.  See also RegisteredApplication.
 */
-class Application
+class Application: private NonCopyable
 {
 protected:
 	class Starter
@@ -16,25 +18,25 @@ protected:
 	protected:
 		Starter();
 	public:
-		virtual ~Starter() { }
+		virtual ~Starter() = default;
 
 		virtual Application *create_app(int, char **) = 0;
 	};
 
-	bool done;
-	int exit_code;
+	bool done = false;
+	int exit_code = 0;
 
 private:
 	static Starter *starter_;
 	static Application *app_;
+	static const char *argv0_;
+	static std::string name_;
 	static void *data_;
 
-	Application(const Application &);
-	Application &operator=(const Application &);
 protected:
-	Application();
+	Application(const std::string & = std::string());
 public:
-	virtual ~Application() { }
+	virtual ~Application() = default;
 
 	/** Constructs an instance of the registered application class and runs it.
 	If the application throws a usage_error, a help message is printed.  The
@@ -42,9 +44,18 @@ public:
 
 	This function can only be called once.  The global main() function provided
 	by the library normally does it automatically at program startup. */
-	static int run(int, char **, void * =0);
+	static int run(int, char **, void * = 0, void (*)(void *) = 0);
+
+	/** Sets application startup info, including argv[0] value and platform-
+	specific data.
+
+	This function can only be called once, and is normally called by
+	Application::run(). */
+	static void set_startup_info(const char *, void *);
 
 	static void *get_data() { return data_; }
+	static const char *get_argv0() { return argv0_; }
+	static const std::string &get_name() { return name_; }
 
 protected:
 	/** Default main loop.  Calls tick() repeatedly until exit() is called.  A
@@ -86,8 +97,9 @@ private:
 	static Starter starter_;
 
 protected:
-	// Force the starter into existence
-	RegisteredApplication() { (void)starter_; }
+	RegisteredApplication(const std::string &n = std::string()):
+		Application(n)
+	{ (void)starter_; }  // Force the starter into existence
 };
 
 template<typename T>