X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fapplication.h;h=59d5bf110e9706425f113dd43d1d7d0ef2ca1019;hp=7dfea8a0ad13abaa05d3102ace97a0962e957fd4;hb=292aed8e23ea543b089d5f2a73000de4640befe7;hpb=609c9a508cfdc7b42c46c4f21d17639204165a00

diff --git a/source/core/application.h b/source/core/application.h
index 7dfea8a..59d5bf1 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
@@ -27,28 +29,56 @@ protected:
 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() { }
 
-	static int run(int, char **, void * =0);
+	/** 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 * =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
+	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 wrapper function to call a member function of the Application
+	instance. */
 	static void sighandler_(int);
-
-	static void display_exception(const std::exception &);
 };
 
 
@@ -69,8 +99,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>