X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fapplication.cpp;h=290f20b05239702c40746f9048aba993aa877b21;hp=43bb023143679e7fdf5e64d893208f859222d973;hb=9c8bb278a26c0c4356d6ee5e66d3f34c70521fb8;hpb=f042fd992170ee8a50a7f596f1c9cdd9600b8583

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 43bb023..290f20b 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -1,8 +1,13 @@
+#include <cstring>
 #include <typeinfo>
 #include <signal.h>
 #include <msp/debug/demangle.h>
 #include <msp/debug/errorreporter.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/path.h>
+#include <msp/fs/utils.h>
 #include <msp/io/print.h>
+#include <msp/strings/utils.h>
 #include "application.h"
 #include "getopt.h"
 
@@ -12,29 +17,31 @@ namespace Msp {
 
 Application *Application::app_ = 0;
 Application::Starter *Application::starter_ = 0;
+const char *Application::argv0_ = 0;
+string Application::name_;
 void *Application::data_ = 0;
 
-Application::Application():
+Application::Application(const string &n):
 	exit_code(0)
-{ }
-
-int Application::run(int argc, char **argv, void *data)
 {
-	static bool called = false;
-	if(called)
-	{
-		IO::cerr.write("Trying to call Application::run_app twice!\n");
-		return 125;
-	}
-	called = true;
+	if(app_)
+		throw logic_error("instance already exists");
+
+	if(!n.empty())
+		name_ = n;
+	else
+		name_ = FS::basename(argv0_);
+}
 
+int Application::run(int argc, char **argv, void *data, void (*created_callback)(void *))
+{
 	if(!starter_)
 	{
-		IO::cerr.write("Trying to run with no RegisteredApplication class!\n");
+		IO::cerr.write("Application::run called with no RegisteredApplication class!\n");
 		return 126;
 	}
 
-	data_ = data;
+	set_startup_info(argv[0], data);
 
 	try
 	{
@@ -48,6 +55,9 @@ int Application::run(int argc, char **argv, void *data)
 			return 1;
 		}
 
+		if(created_callback)
+			created_callback(data);
+
 		int result = app_->main();
 		Application *a = app_;
 		app_ = 0;
@@ -64,15 +74,50 @@ int Application::run(int argc, char **argv, void *data)
 		{
 			IO::print(IO::cerr, "An uncaught exception occurred.\n");
 			IO::print(IO::cerr, "  type:   %s\n", Debug::demangle(typeid(e).name()));
-			IO::print(IO::cerr, "  what(): %s\n", e.what());
+			vector<string> lines = split(e.what(), '\n');
+			if(lines.size()<2)
+				IO::print(IO::cerr, "  what(): %s\n", e.what());
+			else
+			{
+				IO::print(IO::cerr, "  what(): %s\n", lines.front());
+				for(vector<string>::const_iterator i=lines.begin(); ++i!=lines.end(); )
+					IO::print(IO::cerr, "          %s\n", *i);
+			}
 		}
 
 		delete app_;
+		app_ = 0;
 
 		return 124;
 	}
 }
 
+void Application::set_startup_info(const char *argv0, void *data)
+{
+	if(argv0_)
+		throw logic_error("startup info already set");
+
+	static FS::Path exe;
+
+	if(!argv0 || !*argv0)
+	{
+#ifdef _WIN32
+		argv0 = "application.exe";
+#else
+		argv0 = "./application";
+#endif
+	}
+
+	bool has_slash = strchr(argv0, FS::DIRSEP);
+	if(!has_slash)
+		exe = FS::path_lookup(argv0);
+	if(exe.empty())
+		exe = FS::realpath(argv0);
+
+	argv0_ = exe.c_str();
+	data_ = data;
+}
+
 int Application::main()
 {
 	done = false;