New kind of tool speed and wear calculation thingy

[minetest.git] / src / porting.cpp

diff --git a/src/porting.cpp b/src/porting.cpp
index 7c7ce48eae3a62265bab4856e867334daeff3f95..0adc955a94f77b28861a5bd8b4c00e118feeab09 100644 (file)
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -26,6 +26,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "porting.h"
 #include "config.h"
 #include "debug.h"
+#include "filesys.h"
+
+#ifdef __APPLE__
+       #include "CoreFoundation/CoreFoundation.h"
+#endif
 
 namespace porting
 {
@@ -51,9 +56,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,10 +76,46 @@ void signal_handler_init(void)
 }
 
 #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
+       dstream<<"signal_handler_init()"<<std::endl;
+       SetConsoleCtrlHandler( (PHANDLER_ROUTINE)event_handler,TRUE);
 }
 
 #endif
@@ -82,8 +124,13 @@ void signal_handler_init(void)
        Path mangler
 */
 
-std::string path_data = "../data";
-std::string path_userdata = "../";
+std::string path_data = ".." DIR_DELIM "data";
+std::string path_userdata = "..";
+
+std::string getDataPath(const char *subpath)
+{
+       return path_data + DIR_DELIM + subpath;
+}
 
 void pathRemoveFile(char *path, char delim)
 {
@@ -122,10 +169,10 @@ void initializePaths()
        pathRemoveFile(buf, '\\');
 
        // Use "./bin/../data"
-       path_data = std::string(buf) + "/../data";
+       path_data = std::string(buf) + DIR_DELIM ".." DIR_DELIM "data";
                
-       // Use "./bin/../"
-       path_userdata = std::string(buf) + "/../";
+       // Use "./bin/.."
+       path_userdata = std::string(buf) + DIR_DELIM "..";
 
        /*
                Linux
@@ -144,18 +191,18 @@ void initializePaths()
        path_data = std::string(buf) + "/../data";
                
        // Use "./bin/../"
-       path_userdata = std::string(buf) + "/../";
+       path_userdata = std::string(buf) + "/..";
        
        /*
                OS X
        */
-       #elif defined(__APPLE__)
+       #elif defined(__APPLE__) || defined(__FreeBSD__)
        
        //TODO: Get path of executable. This assumes working directory is bin/
-       dstream<<"WARNING: Relative path not properly supported on OS X"
+       dstream<<"WARNING: Relative path not properly supported on OS X and FreeBSD"
                        <<std::endl;
        path_data = std::string("../data");
-       path_userdata = std::string("../");
+       path_userdata = std::string("..");
 
        #endif
 
@@ -183,13 +230,13 @@ void initializePaths()
        pathRemoveFile(buf, '\\');
        
        // Use "./bin/../data"
-       path_data = std::string(buf) + "/../data";
-       //path_data = std::string(buf) + "/../share/" + APPNAME;
+       path_data = std::string(buf) + DIR_DELIM ".." DIR_DELIM "data";
+       //path_data = std::string(buf) + "/../share/" + PROJECT_NAME;
                
-       // Use "C:\Documents and Settings\user\Application Data\<APPNAME>"
+       // Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME>"
        len = GetEnvironmentVariable("APPDATA", buf, buflen);
        assert(len < buflen);
-       path_userdata = std::string(buf) + "/" + APPNAME;
+       path_userdata = std::string(buf) + DIR_DELIM + PROJECT_NAME;
 
        /*
                Linux
@@ -204,10 +251,15 @@ void initializePaths()
        
        pathRemoveFile(buf, '/');
 
-       path_data = std::string(buf) + "/../share/" + APPNAME;
-       //path_data = std::string(INSTALL_PREFIX) + "/share/" + APPNAME;
+       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_userdata = std::string(getenv("HOME")) + "/." + APPNAME;
+       path_userdata = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
 
        /*
                OS X
@@ -215,9 +267,31 @@ void initializePaths()
        #elif defined(__APPLE__)
                #include <unistd.h>
 
-       path_userdata = std::string(getenv("HOME")) + "/Library/Application Support/" + APPNAME;
-       path_data = std::string("minetest-mac.app/Contents/Resources/data/");
+    // Code based on
+    // http://stackoverflow.com/questions/516200/relative-paths-not-working-in-xcode-c
+    CFBundleRef main_bundle = CFBundleGetMainBundle();
+    CFURLRef resources_url = CFBundleCopyResourcesDirectoryURL(main_bundle);
+    char path[PATH_MAX];
+    if(CFURLGetFileSystemRepresentation(resources_url, TRUE, (UInt8 *)path, PATH_MAX))
+       {
+               dstream<<"Bundle resource path: "<<path<<std::endl;
+               //chdir(path);
+               path_data = std::string(path) + "/data";
+       }
+       else
+    {
+        // error!
+               dstream<<"WARNING: Could not determine bundle resource path"<<std::endl;
+    }
+    CFRelease(resources_url);
+       
+       path_userdata = 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;
+    
        #endif
 
 #endif // RUN_IN_PLACE