X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fporting.cpp;h=92615d77a2b9a21a77313f8b412bbd0b821e9623;hb=81385682c8c1da90f2366452b10e20a93c0865fb;hp=39b2c570587d2f083c2c9752935931321b43640d;hpb=94b42a79d78115277392c7d4b50e520a4b0c98ac;p=minetest.git

diff --git a/src/porting.cpp b/src/porting.cpp
index 39b2c5705..92615d77a 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "config.h"
 #include "debug.h"
 #include "filesys.h"
+#include "log.h"
 
 #ifdef __APPLE__
 	#include "CoreFoundation/CoreFoundation.h"
@@ -56,9 +57,10 @@ void sigint_handler(int sig)
 		dstream<<DTIME<<"INFO: sigint_handler(): "
 				<<"Ctrl-C pressed, shutting down."<<std::endl;
 		
-		dstream<<DTIME<<"INFO: sigint_handler(): "
+		// Comment out for less clutter when testing scripts
+		/*dstream<<DTIME<<"INFO: sigint_handler(): "
 				<<"Printing debug stacks"<<std::endl;
-		debug_stacks_print();
+		debug_stacks_print();*/
 
 		g_killed = true;
 	}
@@ -70,15 +72,49 @@ void sigint_handler(int sig)
 
 void signal_handler_init(void)
 {
-	dstream<<"signal_handler_init()"<<std::endl;
 	(void)signal(SIGINT, sigint_handler);
 }
 
 #else // _WIN32
+	#include <signal.h>
+	#include <windows.h>
+	
+	BOOL WINAPI event_handler(DWORD sig)
+	{
+		switch(sig)
+		{
+		case CTRL_C_EVENT:
+		case CTRL_CLOSE_EVENT:
+		case CTRL_LOGOFF_EVENT:
+		case CTRL_SHUTDOWN_EVENT:
+
+			if(g_killed == false)
+			{
+				dstream<<DTIME<<"INFO: event_handler(): "
+						<<"Ctrl+C, Close Event, Logoff Event or Shutdown Event, shutting down."<<std::endl;
+				// Comment out for less clutter when testing scripts
+				/*dstream<<DTIME<<"INFO: event_handler(): "
+						<<"Printing debug stacks"<<std::endl;
+				debug_stacks_print();*/
+
+				g_killed = true;
+			}
+			else
+			{
+				(void)signal(SIGINT, SIG_DFL);
+			}
 
+			break;
+		case CTRL_BREAK_EVENT:
+			break;
+		}
+		
+		return TRUE;
+	}
+	
 void signal_handler_init(void)
 {
-	// No-op
+	SetConsoleCtrlHandler( (PHANDLER_ROUTINE)event_handler,TRUE);
 }
 
 #endif
@@ -87,8 +123,13 @@ void signal_handler_init(void)
 	Path mangler
 */
 
-std::string path_data = "../data";
-std::string path_userdata = "../";
+std::string path_share = ".." DIR_DELIM "share";
+std::string path_user = ".." DIR_DELIM "user";
+
+std::string getDataPath(const char *subpath)
+{
+	return path_share + DIR_DELIM + subpath;
+}
 
 void pathRemoveFile(char *path, char delim)
 {
@@ -109,7 +150,7 @@ void initializePaths()
 		Use relative paths if RUN_IN_PLACE
 	*/
 
-	dstream<<"Using relative paths (RUN_IN_PLACE)"<<std::endl;
+	infostream<<"Using relative paths (RUN_IN_PLACE)"<<std::endl;
 
 	/*
 		Windows
@@ -121,16 +162,13 @@ void initializePaths()
 	char buf[buflen];
 	DWORD len;
 	
-	// Find path of executable and set path_data relative to it
+	// Find path of executable and set path_share relative to it
 	len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen);
 	assert(len < buflen);
 	pathRemoveFile(buf, '\\');
 
-	// Use "./bin/../data"
-	path_data = std::string(buf) + "/../data";
-		
-	// Use "./bin/../"
-	path_userdata = std::string(buf) + "/../";
+	path_share = std::string(buf) + "\\..\\share";
+	path_user = std::string(buf) + "\\..\\user";
 
 	/*
 		Linux
@@ -145,11 +183,8 @@ void initializePaths()
 	
 	pathRemoveFile(buf, '/');
 
-	// Use "./bin/../data"
-	path_data = std::string(buf) + "/../data";
-		
-	// Use "./bin/../"
-	path_userdata = std::string(buf) + "/../";
+	path_share = std::string(buf) + "/../share";
+	path_user = std::string(buf) + "/../user";
 	
 	/*
 		OS X
@@ -159,8 +194,8 @@ void initializePaths()
 	//TODO: Get path of executable. This assumes working directory is bin/
 	dstream<<"WARNING: Relative path not properly supported on OS X and FreeBSD"
 			<<std::endl;
-	path_data = std::string("../data");
-	path_userdata = std::string("../");
+	path_share = std::string("../share");
+	path_user = std::string("../user");
 
 	#endif
 
@@ -170,7 +205,7 @@ void initializePaths()
 		Use platform-specific paths otherwise
 	*/
 
-	dstream<<"Using system-wide paths (NOT RUN_IN_PLACE)"<<std::endl;
+	infostream<<"Using system-wide paths (NOT RUN_IN_PLACE)"<<std::endl;
 
 	/*
 		Windows
@@ -182,19 +217,18 @@ void initializePaths()
 	char buf[buflen];
 	DWORD len;
 	
-	// Find path of executable and set path_data relative to it
+	// Find path of executable and set path_share relative to it
 	len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen);
 	assert(len < buflen);
 	pathRemoveFile(buf, '\\');
 	
-	// Use "./bin/../data"
-	path_data = std::string(buf) + "/../data";
-	//path_data = std::string(buf) + "/../share/" + PROJECT_NAME;
+	// Use ".\bin\..\share"
+	path_share = std::string(buf) + "\\..\\share";
 		
 	// Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME>"
 	len = GetEnvironmentVariable("APPDATA", buf, buflen);
 	assert(len < buflen);
-	path_userdata = std::string(buf) + "/" + PROJECT_NAME;
+	path_user = std::string(buf) + DIR_DELIM + PROJECT_NAME;
 
 	/*
 		Linux
@@ -209,15 +243,15 @@ void initializePaths()
 	
 	pathRemoveFile(buf, '/');
 
-	path_data = std::string(buf) + "/../share/" + PROJECT_NAME;
-	//path_data = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
-	if (!fs::PathExists(path_data)) {
-		dstream<<"WARNING: data path " << path_data << " not found!";
-		path_data = std::string(buf) + "/../data";
-		dstream<<" Trying " << path_data << std::endl;
+	path_share = std::string(buf) + "/../share/" + PROJECT_NAME;
+	//path_share = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
+	if (!fs::PathExists(path_share)) {
+		dstream<<"WARNING: system-wide share not found at \""<<path_share<<"\"";
+		path_share = std::string(buf) + "/../share";
+		dstream<<"WARNING: Using \""<<path_share<<"\" instead."<<std::endl;
 	}
 	
-	path_userdata = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
+	path_user = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
 
 	/*
 		OS X
@@ -234,7 +268,7 @@ void initializePaths()
 	{
 		dstream<<"Bundle resource path: "<<path<<std::endl;
 		//chdir(path);
-		path_data = std::string(path) + "/data";
+		path_share = std::string(path) + "/share";
 	}
 	else
     {
@@ -243,19 +277,16 @@ void initializePaths()
     }
     CFRelease(resources_url);
 	
-	path_userdata = std::string(getenv("HOME")) + "/Library/Application Support/" + PROJECT_NAME;
+	path_user = std::string(getenv("HOME")) + "/Library/Application Support/" + PROJECT_NAME;
 
 	#elif defined(__FreeBSD__)
 
-	path_data = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
-	path_userdata = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
+	path_share = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
+	path_user = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
     
 	#endif
 
 #endif // RUN_IN_PLACE
-
-	dstream<<"path_data = "<<path_data<<std::endl;
-	dstream<<"path_userdata = "<<path_userdata<<std::endl;
 }
 
 } //namespace porting