X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMainLayer.cc;h=3429f52c5663f932b677407ab6c904a33d875c62;hp=4975e17f1b28db30e9df1d95a73469a9f6a85456;hb=8a1acac01b444dccf8b57cedf08392ada2e473c1;hpb=64bd443538f57ad1bdff6c6b35953e72141129b2

diff --git a/src/MainLayer.cc b/src/MainLayer.cc
index 4975e17..3429f52 100644
--- a/src/MainLayer.cc
+++ b/src/MainLayer.cc
@@ -29,10 +29,12 @@
 #include <cstdlib>		// atexit, getenv
 #include <iostream>
 #include <string>
+#include <unistd.h>		// access
 
 #include <Moof/Dispatcher.hh>
 #include <Moof/Exception.hh>
 #include <Moof/Log.hh>
+#include <Moof/ModalDialog.hh>
 #include <Moof/OpenGL.hh>
 #include <Moof/Resource.hh>
 #include <Moof/Transition.hh>
@@ -61,9 +63,9 @@ MainLayer::~MainLayer()
 }
 
 
-void MainLayer::pushed(Mf::Engine& e)
+void MainLayer::pushed(Mf::Engine& engine)
 {
-	engine = &e;
+	mEngine = &engine;
 
 	//Mf::Scalar coeff[] = {0.0, 1.0};
 	//Mf::Lerp interp(coeff, 0.25);
@@ -73,7 +75,7 @@ void MainLayer::pushed(Mf::Engine& e)
 		//Mf::Transition<Mf::Lerp>::alloc(gameLayer, Mf::LayerP(), interp);
 	//engine->push(transition);
 	//engine->push(GameLayer::alloc());
-	engine->push(TitleLayer::alloc());
+	mEngine->push(TitleLayer::alloc());
 }
 
 
@@ -99,17 +101,17 @@ bool MainLayer::handleEvent(const Mf::Event& event)
 			}
 			else if (event.key.keysym.sym == SDLK_f)
 			{
-				engine->getVideo().toggleFull();
+				mEngine->getVideo().toggleFull();
 			}
 			else if (event.key.keysym.sym == SDLK_l)
 			{
-				Mf::Video& video = engine->getVideo();
+				Mf::Video& video = mEngine->getVideo();
 				video.toggleCursorGrab();
 				video.toggleCursorVisible();
 			}
 			else if (event.key.keysym.sym == SDLK_y)
 			{
-				engine->push(GameLayer::alloc());
+				mEngine->push(GameLayer::alloc());
 			}
 			break;
 
@@ -132,7 +134,7 @@ void MainLayer::quit()
 	// the operating system will take care of cleaning up
 	exit(0);
 #else
-	engine->clear();
+	mEngine->clear();
 #endif
 }
 
@@ -171,7 +173,8 @@ void MainLayer::contextRecreated(const Mf::Notification* note)
 
 void printUsage()
 {
-	std::cout << "Usage: "PACKAGE" [-h|--help] [-i|--info] [OPTION=VALUE]..." << std::endl
+	std::cout << "Usage: "PACKAGE" [-h|--help] [-i|--info] [OPTION=VALUE]..."
+			  << std::endl
 			  << "The alien-smashing action game." << std::endl
 			  << std::endl
 			  << "Options:" << std::endl
@@ -189,14 +192,39 @@ void printUsage()
 			  << "See documentation for more options." << std::endl;
 }
 
-void printInfo()
+void printInfo(int argc, char* argv[])
 {
-	std::cout << PACKAGE_STRING << std::endl
-#ifdef __DATE__
-			  << "When compiled: "__DATE__" "__TIME__ << std::endl
+	std::string assets;
+	std::string datadir;
+	std::string config;
+
+	assets.assign(YOINK_DATADIR);
+	int accessible = access(assets.c_str(), R_OK);
+	if (accessible != 0) assets += " (no access)";
+
+	char* temp = getenv("YOINK_DATADIR");
+	if (temp)
+	{
+		datadir = temp;
+		accessible = access(temp, R_OK);
+		if (accessible != 0) datadir += " (no access)";
+	}
+
+	temp = getenv("YOINKRC");
+	if (temp)
+	{
+		config = temp;
+		accessible = access(temp, R_OK);
+		if (accessible != 0) config += " (no access)";
+	}
+
+	std::cout << "   Executable: " << argv[0] << std::endl
+			  << "      Version: "VERSION << std::endl
+#if defined(__DATE__) && defined(__TIME__)
+			  << "        Built: "__DATE__" "__TIME__ << std::endl
 #endif
-			  << "Compiler: "COMPILER_STRING << std::endl
-			  << "Asset directory: "YOINK_DATADIR << std::endl
+			  << "     Compiler: "COMPILER_STRING << std::endl
+			  << "       Assets: " << assets << std::endl
 			  << "Build options: "
 #ifdef NDEBUG
 			  << "-"
@@ -205,15 +233,25 @@ void printInfo()
 #ifndef USE_DOUBLE_PRECISION
 			  << "-"
 #endif
-			  << "double "
+			  << "double-precision "
+#ifndef USE_GTK
+			  << "-"
+#endif
+			  << "gtk "
 #ifndef PROFILING_ENABLED
 			  << "-"
 #endif
 			  << "profile "
-			  << std::endl;
-#if !defined (_WIN32) && !defined(__WIN32__)
-	system("uname -a");
+#ifndef USE_QT4
+			  << "-"
+#endif
+			  << "qt4 "
+#ifndef USE_THREADS
+			  << "-"
 #endif
+			  << "threads" << std::endl
+			  << "      YOINKRC: " << config << std::endl
+			  << "YOINK_DATADIR: " << datadir << std::endl;
 }
 
 void goodbye()
@@ -222,7 +260,6 @@ void goodbye()
 }
 
 
-
 int main(int argc, char* argv[])
 {
 	if (argc > 1)
@@ -235,7 +272,7 @@ int main(int argc, char* argv[])
 		}
 		else if (arg == "-i" || arg == "--info")
 		{
-			printInfo();
+			printInfo(argc, argv);
 			return 0;
 		}
 	}
@@ -273,7 +310,7 @@ int main(int argc, char* argv[])
 
 	Mf::Resource::addSearchPath(YOINK_DATADIR);
 
-	std::string iconFile = Mf::Resource::getPath("yoink.png");
+	std::string iconFile = Mf::Resource::getPath(PACKAGE".png");
 
 
 	// Build the list of config files to search for, in this order:
@@ -294,7 +331,6 @@ int main(int argc, char* argv[])
 		configFiles += configFile;
 	}
 
-
 	try
 	{
 		Mf::Engine app(argc, argv, PACKAGE_STRING, iconFile, configFiles);
@@ -302,11 +338,19 @@ int main(int argc, char* argv[])
 
 		app.run();
 	}
-	catch (Mf::Exception e)
+	catch (const Mf::Exception& e)
 	{
-		Mf::logError("unhandled exception: <<%s>>", e.what());
-		Mf::logInfo("it's time to crash now :-(");
-		throw e;
+		Mf::logError("unhandled exception (code %d): \"%s\"",
+				e.code(), e.what());
+
+		Mf::ModalDialog dialog;
+		dialog.title = PACKAGE_STRING;
+		dialog.text1 = "Unhandled Exception";
+		dialog.text2 = e.what();
+		dialog.type = Mf::ModalDialog::CRITICAL;
+		dialog.run();
+
+		return 1;
 	}
 
 	return 0;