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

diff --git a/source/core/application.h b/source/core/application.h
index 5f3968a..7dfea8a 100644
--- a/source/core/application.h
+++ b/source/core/application.h
@@ -1,82 +1,81 @@
-/*
-This file is part of libmspframework
-Copyright © 2006 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-#ifndef MSP_FRAMEWORK_APPLICATION_H_
-#define MSP_FRAMEWORK_APPLICATION_H_
+#ifndef MSP_CORE_APPLICATION_H_
+#define MSP_CORE_APPLICATION_H_
 
-#include "event.h"
-#include "poller.h"
-#include "types.h"
+#include <stdexcept>
 
 namespace Msp {
 
 /**
-Base class for applications.  Inherit the main class from this and add a static
-member of type RegApp<MainClass>.
+Base class for applications.  See also RegisteredApplication.
 */
 class Application
 {
-public:
-	Poller::Slot &add_pollable(Pollable *, short);
-	EventManager::Event &create_event();
-	virtual ~Application();
-
-	static int run(int, char **);
-	static void usage(const char *, bool);
 protected:
-	enum TickMode
-	{
-		NONE,       /// No ticks
-		AFTER_POLL, /// One tick after each poll
-		IDLE        /// Constant torrent of ticks
-	};
-	
-	class RegBase
+	class Starter
 	{
-	public:
-		virtual Application *create_app(int, char **)=0;
-		virtual void usage(const char *, bool)=0;
-		virtual ~RegBase() { }
 	protected:
-		RegBase();
-	};
-
-	template<typename T>
-	class RegApp: public RegBase
-	{
+		Starter();
 	public:
-		Application *create_app(int argc, char **argv) { return new T(argc, argv); }
-		void usage(const char *a, bool b) { T::usage(a,b); }
+		virtual ~Starter() { }
+
+		virtual Application *create_app(int, char **) = 0;
 	};
 
 	bool done;
-	int  exit_code;
+	int exit_code;
 
+private:
+	static Starter *starter_;
+	static Application *app_;
+	static void *data_;
+
+	Application(const Application &);
+	Application &operator=(const Application &);
+protected:
 	Application();
+public:
+	virtual ~Application() { }
+
+	static int run(int, char **, void * =0);
+	static void *get_data() { return data_; }
+
+protected:
 	virtual int main();
 	void catch_signal(int);
-	void set_tick_mode(TickMode);
 	void exit(int);
 	virtual void tick() { }
 	virtual void sighandler(int) { }
 private:
-	TickMode     tick_mode_;
-	Poller       *poller_;
-	EventManager *ev_mgr_;
-	ThreadHandle main_tid;
+	static void sighandler_(int);
 
-	Application(const Application &);
-	Application &operator=(const Application &);
+	static void display_exception(const std::exception &);
+};
 
-	static RegBase *reg_app_;
-	static Application *app_;
 
-	static void sighandler_(int);
-	static void sigalrm_(int) { }
+/**
+Registers the class to be used for program startup.  The main application class
+should be derived from this.
+*/
+template<typename T>
+class RegisteredApplication: public Application
+{
+private:
+	class Starter: public Application::Starter
+	{
+	public:
+		Application *create_app(int argc, char **argv) { return new T(argc, argv); }
+	};
+
+	static Starter starter_;
+
+protected:
+	// Force the starter into existence
+	RegisteredApplication() { (void)starter_; }
 };
 
+template<typename T>
+typename RegisteredApplication<T>::Starter RegisteredApplication<T>::starter_;
+
 } // namespace Msp
 
 #endif