X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fapplication.h;h=972f3b73b1f8d9767e1f72bcd4ccdf6529415a47;hp=08393b724b486077452e9ffb940bd9822fc6578c;hb=41363aed34382386f915f17c1a961750b4fdcb14;hpb=c7afef88380ebebc8c2b04e48664d73281ec8848

diff --git a/source/core/application.h b/source/core/application.h
index 08393b7..972f3b7 100644
--- a/source/core/application.h
+++ b/source/core/application.h
@@ -1,12 +1,16 @@
 #ifndef MSP_CORE_APPLICATION_H_
 #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
@@ -14,37 +18,65 @@ 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 void *data_;
+	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
+	GetOpt class will throw such exceptions automatically in error conditions.
+
+	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 * = nullptr, void (*)(void *) = nullptr);
+
+	/** 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 int run(int, char **, void * =0);
-	static void *get_data() { return data_; }
+	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
+	custom main loop should monitor the done member variable and return
+	exit_code. */
 	virtual int main();
+
+	/** Sets the specified signal to be delivered to the sighandler member
+	function. */
 	void catch_signal(int);
+
+	/** Causes the application to exit gracefully with the given exit code. */
 	void exit(int);
+
 	virtual void tick() { }
 	virtual void sighandler(int) { }
+
 private:
-	static void sighandler_(int);
+	/** Static wrapper function to call a member function of the Application
+	instance. */
+	static void _sighandler(int);
 };
 
 
@@ -62,15 +94,16 @@ private:
 		Application *create_app(int argc, char **argv) { return new T(argc, argv); }
 	};
 
-	static Starter starter_;
+	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>
-typename RegisteredApplication<T>::Starter RegisteredApplication<T>::starter_;
+typename RegisteredApplication<T>::Starter RegisteredApplication<T>::_starter;
 
 } // namespace Msp