X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=lib%2Fapp%2Fsetup.cpp;h=c7972c470323bc8b2a025df720cb5fa51b9d9d49;hb=8e0bad9f82ccbc811a18edd7ce6c6f69c5bca082;hp=de2e2a9cac9c540806422175cba035530e8f4b4a;hpb=b2d8d1eac9fd6328d3a8c61cf09d4b2882145042;p=supertux.git diff --git a/lib/app/setup.cpp b/lib/app/setup.cpp index de2e2a9ca..c7972c470 100644 --- a/lib/app/setup.cpp +++ b/lib/app/setup.cpp @@ -17,6 +17,8 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +#include + #include #include #include @@ -41,15 +43,14 @@ #include -#include "../app/globals.h" -#include "../app/defines.h" -#include "../app/setup.h" -#include "../video/screen.h" -#include "../video/surface.h" -#include "../gui/menu.h" -#include "../utils/configfile.h" -#include "../audio/sound_manager.h" -#include "../app/gettext.h" +#include "globals.h" +#include "setup.h" +#include "video/screen.h" +#include "video/surface.h" +#include "gui/menu.h" +#include "utils/configfile.h" +#include "audio/sound_manager.h" +#include "gettext.h" using namespace SuperTux; @@ -66,10 +67,10 @@ void seticon(void); void usage(char * prog, int ret); /* Does the given file exist and is it accessible? */ -int FileSystem::faccessible(const char *filename) +bool FileSystem::faccessible(const std::string& filename) { struct stat filestat; - if (stat(filename, &filestat) == -1) + if (stat(filename.c_str(), &filestat) == -1) { return false; } @@ -83,26 +84,26 @@ int FileSystem::faccessible(const char *filename) } /* Can we write to this location? */ -int FileSystem::fwriteable(const char *filename) +bool FileSystem::fwriteable(const std::string& filename) { FILE* fi; - fi = fopen(filename, "wa"); + fi = fopen(filename.c_str(), "wa"); if (fi == NULL) { return false; } + fclose(fi); return true; } /* Makes sure a directory is created in either the SuperTux home directory or the SuperTux base directory.*/ -int FileSystem::fcreatedir(const char* relative_dir) +bool FileSystem::fcreatedir(const std::string& relative_dir) { - char path[1024]; - snprintf(path, 1024, "%s/%s/", st_dir, relative_dir); - if(mkdir(path,0755) != 0) + std::string path = st_dir + "/" + relative_dir + "/"; + if(mkdir(path.c_str(),0755) != 0) { - snprintf(path, 1024, "%s/%s/", datadir.c_str(), relative_dir); - if(mkdir(path,0755) != 0) + path = datadir + "/" + relative_dir + "/"; + if(mkdir(path.c_str(),0755) != 0) { return false; } @@ -120,68 +121,66 @@ int FileSystem::fcreatedir(const char* relative_dir) /* Get all names of sub-directories in a certain directory. */ /* Returns the number of sub-directories found. */ /* Note: The user has to free the allocated space. */ -string_list_type FileSystem::dsubdirs(const char *rel_path,const char* expected_file) +std::set FileSystem::dsubdirs(const std::string &rel_path,const std::string& expected_file) { DIR *dirStructP; struct dirent *direntp; - string_list_type sdirs; - char filename[1024]; - char path[1024]; + std::set sdirs; + std::string filename; + std::string path = st_dir + "/" + rel_path; - string_list_init(&sdirs); - sprintf(path,"%s/%s",st_dir,rel_path); - if((dirStructP = opendir(path)) != NULL) + if((dirStructP = opendir(path.c_str())) != NULL) { while((direntp = readdir(dirStructP)) != NULL) { - char absolute_filename[1024]; + std::string absolute_filename; struct stat buf; - sprintf(absolute_filename, "%s/%s", path, direntp->d_name); + absolute_filename = path + "/" + direntp->d_name; - if (stat(absolute_filename, &buf) == 0 && S_ISDIR(buf.st_mode)) + if (stat(absolute_filename.c_str(), &buf) == 0 && S_ISDIR(buf.st_mode)) { - if(expected_file != NULL) + if(!expected_file.empty()) { - sprintf(filename,"%s/%s/%s",path,direntp->d_name,expected_file); + filename = path + "/" + direntp->d_name + "/" + expected_file; if(!faccessible(filename)) continue; } - string_list_add_item(&sdirs,direntp->d_name); + sdirs.insert(direntp->d_name); } } closedir(dirStructP); } - sprintf(path,"%s/%s",datadir.c_str(),rel_path); - if((dirStructP = opendir(path)) != NULL) + path = datadir + "/" + rel_path; + if((dirStructP = opendir(path.c_str())) != NULL) { while((direntp = readdir(dirStructP)) != NULL) { - char absolute_filename[1024]; + std::string absolute_filename; struct stat buf; - sprintf(absolute_filename, "%s/%s", path, direntp->d_name); + absolute_filename = path + "/" + direntp->d_name; - if (stat(absolute_filename, &buf) == 0 && S_ISDIR(buf.st_mode)) + if (stat(absolute_filename.c_str(), &buf) == 0 && S_ISDIR(buf.st_mode)) { - if(expected_file != NULL) + if(!expected_file.empty()) { - sprintf(filename,"%s/%s/%s",path,direntp->d_name,expected_file); - if(!faccessible(filename)) + filename = path + "/" + direntp->d_name + "/" + expected_file; + if(!faccessible(filename.c_str())) { continue; } else { - sprintf(filename,"%s/%s/%s/%s",st_dir,rel_path,direntp->d_name,expected_file); - if(faccessible(filename)) + filename = st_dir + "/" + rel_path + "/" + direntp->d_name + "/" + expected_file; + if(faccessible(filename.c_str())) continue; } } - string_list_add_item(&sdirs,direntp->d_name); + sdirs.insert(direntp->d_name); } } closedir(dirStructP); @@ -190,63 +189,61 @@ string_list_type FileSystem::dsubdirs(const char *rel_path,const char* expected return sdirs; } -string_list_type FileSystem::dfiles(const char *rel_path, const char* glob, const char* exception_str) +std::set FileSystem::dfiles(const std::string& rel_path, const std::string& glob, const std::string& exception_str) { DIR *dirStructP; struct dirent *direntp; - string_list_type sdirs; - char path[1024]; + std::set sdirs; + std::string path = st_dir + "/" + rel_path; - string_list_init(&sdirs); - sprintf(path,"%s/%s",st_dir,rel_path); - if((dirStructP = opendir(path)) != NULL) + if((dirStructP = opendir(path.c_str())) != NULL) { while((direntp = readdir(dirStructP)) != NULL) { - char absolute_filename[1024]; + std::string absolute_filename; struct stat buf; - sprintf(absolute_filename, "%s/%s", path, direntp->d_name); + absolute_filename = path + "/" + direntp->d_name; - if (stat(absolute_filename, &buf) == 0 && S_ISREG(buf.st_mode)) + if (stat(absolute_filename.c_str(), &buf) == 0 && S_ISREG(buf.st_mode)) { - if(exception_str != NULL) + if(!exception_str.empty()) { - if(strstr(direntp->d_name,exception_str) != NULL) + if(strstr(direntp->d_name,exception_str.c_str()) != NULL) continue; } - if(glob != NULL) - if(strstr(direntp->d_name,glob) == NULL) + if(!glob.empty()) + if(strstr(direntp->d_name,glob.c_str()) == NULL) continue; - string_list_add_item(&sdirs,direntp->d_name); + sdirs.insert(direntp->d_name); } } closedir(dirStructP); } - sprintf(path,"%s/%s",datadir.c_str(),rel_path); - if((dirStructP = opendir(path)) != NULL) + path = datadir + "/" + rel_path; + if((dirStructP = opendir(path.c_str())) != NULL) { while((direntp = readdir(dirStructP)) != NULL) { - char absolute_filename[1024]; + std::string absolute_filename; struct stat buf; - sprintf(absolute_filename, "%s/%s", path, direntp->d_name); + absolute_filename = path + "/" + direntp->d_name; - if (stat(absolute_filename, &buf) == 0 && S_ISREG(buf.st_mode)) + if (stat(absolute_filename.c_str(), &buf) == 0 && S_ISREG(buf.st_mode)) { - if(exception_str != NULL) + if(!exception_str.empty()) { - if(strstr(direntp->d_name,exception_str) != NULL) + if(strstr(direntp->d_name,exception_str.c_str()) != NULL) continue; } - if(glob != NULL) - if(strstr(direntp->d_name,glob) == NULL) + if(!glob.empty()) + if(strstr(direntp->d_name,glob.c_str()) == NULL) continue; - string_list_add_item(&sdirs,direntp->d_name); + sdirs.insert(direntp->d_name); } } closedir(dirStructP); @@ -255,19 +252,33 @@ string_list_type FileSystem::dfiles(const char *rel_path, const char* glob, con return sdirs; } -void Setup::info(const std::string& _package_name, const std::string& _package_symbol_name, const std::string& _package_version) +std::string FileSystem::dirname(const std::string& filename) { -package_name = _package_name; -package_symbol_name = _package_symbol_name; -package_version = _package_version; + std::string::size_type p = filename.find_last_of('/'); + if(p == std::string::npos) + return ""; + + return filename.substr(0, p+1); +} + +void Setup::init(const std::string& _package_name, + const std::string& _package_symbol_name, + const std::string& _package_version) +{ + package_name = _package_name; + package_symbol_name = _package_symbol_name; + package_version = _package_version; + + directories(); + dictionary_manager.add_directory(datadir + "/locale"); + dictionary_manager.set_charset("iso8859-1"); } /* --- SETUP --- */ /* Set SuperTux configuration and save directories */ -void Setup::directories(void) +void Setup::directories() { - char *home; - char str[1024]; + std::string home; /* Get home directory (from $HOME variable)... if we can't determine it, use the current directory ("."): */ if (getenv("HOME") != NULL) @@ -275,30 +286,26 @@ void Setup::directories(void) else home = "."; - std::string st_dir_tmp = "/." + package_symbol_name; - st_dir = (char *) malloc(sizeof(char) * (strlen(home) + - strlen(st_dir_tmp.c_str()) + 1)); - strcpy(st_dir, home); - strcat(st_dir,st_dir_tmp.c_str()); + st_dir = home + "/." + package_symbol_name; /* Remove .supertux config-file from old SuperTux versions */ - if(FileSystem::faccessible(st_dir)) - { - remove - (st_dir); - } - - st_save_dir = (char *) malloc(sizeof(char) * (strlen(st_dir) + strlen("/save") + 1)); + if(FileSystem::faccessible(st_dir)) { + remove(st_dir.c_str()); + } - strcpy(st_save_dir,st_dir); - strcat(st_save_dir,"/save"); + st_save_dir = st_dir + "/save"; /* Create them. In the case they exist they won't destroy anything. */ - mkdir(st_dir, 0755); - mkdir(st_save_dir, 0755); + mkdir(st_dir.c_str(), 0755); + mkdir(st_save_dir.c_str(), 0755); - sprintf(str, "%s/levels", st_dir); - mkdir(str, 0755); + mkdir((st_dir + "/levels").c_str(), 0755); + + // try current directory as datadir + if(datadir.empty()) { + if(FileSystem::faccessible("./data/credits.txt")) + datadir = "./data/"; + } // User has not that a datadir, so we try some magic if (datadir.empty()) @@ -313,20 +320,27 @@ void Setup::directories(void) } else { - std::string exedir = std::string(dirname(exe_file)) + "/"; - - datadir = exedir + "../data"; // SuperTux run from source dir + std::string exedir = std::string(dirname(exe_file)) + "/"; + + datadir = exedir + "./data/"; // SuperTux run from source dir if (access(datadir.c_str(), F_OK) != 0) { - datadir = exedir + "../share/" + package_symbol_name; // SuperTux run from PATH + datadir = exedir + "../../../../data/"; //SuperTux run from source dir (with libtool script) + + if (access(datadir.c_str(), F_OK) != 0) + { + datadir = exedir + "../share/" + package_symbol_name + "/"; // SuperTux run from PATH if (access(datadir.c_str(), F_OK) != 0) { // If all fails, fall back to compiled path - datadir = DATA_PREFIX; + datadir = DATA_PREFIX; + datadir += "/"; } + } } } #else - datadir = DATA_PREFIX; + datadir = DATA_PREFIX; + datadir += "/"; #endif } printf("Datadir: %s\n", datadir.c_str()); @@ -605,9 +619,9 @@ void Setup::audio(void) void Termination::shutdown(void) { + config->save(); SoundManager::get()->close_audio(); SDL_Quit(); - config->save(); } /* --- ABORT! --- */ @@ -718,6 +732,10 @@ void Setup::parseargs(int argc, char * argv[]) { launch_worldmap_mode = true; } + else if (strcmp(argv[i], "--flip-levels") == 0) + { + flip_levels_mode = true; + } else if (strcmp(argv[i], "--datadir") == 0 || strcmp(argv[i], "-d") == 0 ) { @@ -752,7 +770,7 @@ void Setup::parseargs(int argc, char * argv[]) else if (strcmp(argv[i], "--version") == 0) { /* Show version: */ - printf((package_name + package_version + "\n").c_str() ); + printf((package_name + " " + package_version + "\n").c_str() ); exit(0); } else if (strcmp(argv[i], "--disable-sound") == 0) @@ -775,8 +793,8 @@ void Setup::parseargs(int argc, char * argv[]) } else if (strcmp(argv[i], "--help") == 0) { /* Show help: */ - puts(_(" SuperTux " VERSION "\n" - " Please see the file \"README.txt\" for more details.\n")); + puts(_((" SuperTux " + package_version + "\n" + " Please see the file \"README.txt\" for more details.\n").c_str())); printf(_("Usage: %s [OPTIONS] FILENAME\n\n"), argv[0]); puts(_("Display Options:\n" " -f, --fullscreen Run in fullscreen mode.\n" @@ -796,6 +814,7 @@ void Setup::parseargs(int argc, char * argv[]) " Define how joystick buttons and axis should be mapped\n" " --leveleditor Opens the leveleditor in a file.\n" " --worldmap Opens the specified worldmap file.\n" + " --flip-levels Flip levels upside-down.\n" " -d, --datadir DIR Load Game data from DIR (default: automatic)\n" " --debug Enables the debug mode, which is useful for developers.\n" " --help Display a help message summarizing command-line\n" @@ -836,7 +855,7 @@ void usage(char * prog, int ret) /* Display the usage message: */ - fprintf(fi, _("Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--debug] | [--usage | --help | --version] [--leveleditor] [--worldmap] FILENAME\n"), + fprintf(fi, _("Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--debug] | [--usage | --help | --version] [--leveleditor] [--worldmap] [--flip-levels] FILENAME\n"), prog); @@ -845,9 +864,9 @@ void usage(char * prog, int ret) exit(ret); } -std::vector FileSystem::read_directory(const std::string& pathname) +std::set FileSystem::read_directory(const std::string& pathname) { - std::vector dirnames; + std::set dirnames; DIR* dir = opendir(pathname.c_str()); if (dir) @@ -856,7 +875,7 @@ std::vector FileSystem::read_directory(const std::string& pathname) while((direntp = readdir(dir))) { - dirnames.push_back(direntp->d_name); + dirnames.insert(direntp->d_name); } closedir(dir);