From 9b926e0cdb76614f2f43c291bb87d169d8b7bc9f Mon Sep 17 00:00:00 2001 From: Pera Pisar <1405223@gmail.com> Date: Thu, 25 Apr 2019 02:50:24 +0200 Subject: [PATCH] Grab a localized documents directory variant on Linux --- mkxp.pro | 7 ++ src/oneshot.cpp | 13 ++- src/xdg-user-dir-lookup.c | 234 ++++++++++++++++++++++++++++++++++++++ src/xdg-user-dir-lookup.h | 15 +++ 4 files changed, 266 insertions(+), 3 deletions(-) create mode 100644 src/xdg-user-dir-lookup.c create mode 100644 src/xdg-user-dir-lookup.h diff --git a/mkxp.pro b/mkxp.pro index 1b3ce20..3e6434f 100644 --- a/mkxp.pro +++ b/mkxp.pro @@ -202,6 +202,13 @@ CONFIG(release, debug|release): { SOURCES += src/steam.cpp steamshim/steamshim_child.c } +unix { + !macx { + HEADERS += src/xdg-user-dir-lookup.h + SOURCES += src/xdg-user-dir-lookup.c + } +} + EMBED = \ shader/common.h \ shader/transSimple.frag \ diff --git a/src/oneshot.cpp b/src/oneshot.cpp index 7be7ef0..bc9e275 100644 --- a/src/oneshot.cpp +++ b/src/oneshot.cpp @@ -36,6 +36,7 @@ #define OS_LINUX #include #include + #include "xdg-user-dir-lookup.h" #endif #else #error "Operating system not detected." @@ -270,16 +271,22 @@ Oneshot::Oneshot(RGSSThreadData &threadData) : } // Get documents path - std::string path = std::string(getenv("HOME")) + "/Documents"; - p->docsPath = path.c_str(); - p->gamePath = path.c_str(); #ifdef OS_OSX + std::string path = std::string(getenv("HOME")) + "/Documents"; + p->docsPath = path.c_str(); + p->gamePath = path.c_str(); p->journal = "_______.app"; #elif defined OS_LINUX + char * path = xdg_user_dir_lookup("DOCUMENTS"); + p->docsPath = path; + p->gamePath = path; p->journal = "_______"; #endif #endif + Debug() << "Game path :" << p->gamePath; + Debug() << "Docs path :" << p->docsPath; + #ifdef OS_LINUX char const* xdg_current_desktop = getenv("XDG_CURRENT_DESKTOP"); gtk_init(0, 0); diff --git a/src/xdg-user-dir-lookup.c b/src/xdg-user-dir-lookup.c new file mode 100644 index 0000000..2cf3465 --- /dev/null +++ b/src/xdg-user-dir-lookup.c @@ -0,0 +1,234 @@ +/* + This file is not licenced under the GPL like the rest of the code. + Its is under the MIT license, to encourage reuse by cut-and-paste. + + Copyright (c) 2007 Red Hat, Inc. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +#include "xdg-user-dir-lookup.h" + +#include +#include +#include + +/** + * xdg_user_dir_lookup_with_fallback: + * @type: a string specifying the type of directory + * @fallback: value to use if the directory isn't specified by the user + * @returns: a newly allocated absolute pathname + * + * Looks up a XDG user directory of the specified type. + * Example of types are "DESKTOP" and "DOWNLOAD". + * + * In case the user hasn't specified any directory for the specified + * type the value returned is @fallback. + * + * The return value is newly allocated and must be freed with + * free(). The return value is never NULL if @fallback != NULL, unless + * out of memory. + **/ +char * +xdg_user_dir_lookup_with_fallback (const char *type, const char *fallback) +{ + FILE *file; + char *home_dir, *config_home, *config_file; + char buffer[512]; + char *user_dir; + char *p, *d; + int len; + int relative; + + home_dir = getenv ("HOME"); + + if (home_dir == NULL) + goto error; + + config_home = getenv ("XDG_CONFIG_HOME"); + if (config_home == NULL || config_home[0] == 0) + { + config_file = (char*) malloc (strlen (home_dir) + strlen ("/.config/user-dirs.dirs") + 1); + if (config_file == NULL) + goto error; + + strcpy (config_file, home_dir); + strcat (config_file, "/.config/user-dirs.dirs"); + } + else + { + config_file = (char*) malloc (strlen (config_home) + strlen ("/user-dirs.dirs") + 1); + if (config_file == NULL) + goto error; + + strcpy (config_file, config_home); + strcat (config_file, "/user-dirs.dirs"); + } + + file = fopen (config_file, "r"); + free (config_file); + if (file == NULL) + goto error; + + user_dir = NULL; + while (fgets (buffer, sizeof (buffer), file)) + { + /* Remove newline at end */ + len = strlen (buffer); + if (len > 0 && buffer[len-1] == '\n') + buffer[len-1] = 0; + + p = buffer; + while (*p == ' ' || *p == '\t') + p++; + + if (strncmp (p, "XDG_", 4) != 0) + continue; + p += 4; + if (strncmp (p, type, strlen (type)) != 0) + continue; + p += strlen (type); + if (strncmp (p, "_DIR", 4) != 0) + continue; + p += 4; + + while (*p == ' ' || *p == '\t') + p++; + + if (*p != '=') + continue; + p++; + + while (*p == ' ' || *p == '\t') + p++; + + if (*p != '"') + continue; + p++; + + relative = 0; + if (strncmp (p, "$HOME/", 6) == 0) + { + p += 6; + relative = 1; + } + else if (*p != '/') + continue; + + if (relative) + { + user_dir = (char*) malloc (strlen (home_dir) + 1 + strlen (p) + 1); + if (user_dir == NULL) + goto error2; + + strcpy (user_dir, home_dir); + strcat (user_dir, "/"); + } + else + { + user_dir = (char*) malloc (strlen (p) + 1); + if (user_dir == NULL) + goto error2; + + *user_dir = 0; + } + + d = user_dir + strlen (user_dir); + while (*p && *p != '"') + { + if ((*p == '\\') && (*(p+1) != 0)) + p++; + *d++ = *p++; + } + *d = 0; + } +error2: + fclose (file); + + if (user_dir) + return user_dir; + + error: + if (fallback) + return strdup (fallback); + return NULL; +} + +/** + * xdg_user_dir_lookup: + * @type: a string specifying the type of directory + * @returns: a newly allocated absolute pathname + * + * Looks up a XDG user directory of the specified type. + * Example of types are "DESKTOP" and "DOWNLOAD". + * + * The return value is always != NULL (unless out of memory), + * and if a directory + * for the type is not specified by the user the default + * is the home directory. Except for DESKTOP which defaults + * to ~/Desktop. + * + * The return value is newly allocated and must be freed with + * free(). + **/ +char * +xdg_user_dir_lookup (const char *type) +{ + char *dir, *home_dir, *user_dir; + + dir = xdg_user_dir_lookup_with_fallback (type, NULL); + if (dir != NULL) + return dir; + + home_dir = getenv ("HOME"); + + if (home_dir == NULL) + return strdup ("/tmp"); + + /* Special case desktop for historical compatibility */ + if (strcmp (type, "DESKTOP") == 0) + { + user_dir = (char*) malloc (strlen (home_dir) + strlen ("/Desktop") + 1); + if (user_dir == NULL) + return NULL; + + strcpy (user_dir, home_dir); + strcat (user_dir, "/Desktop"); + return user_dir; + } + + return strdup (home_dir); +} + +#ifdef STANDALONE_XDG_USER_DIR_LOOKUP +int +main (int argc, char *argv[]) +{ + if (argc != 2) + { + fprintf (stderr, "Usage %s \n", argv[0]); + exit (1); + } + + printf ("%s\n", xdg_user_dir_lookup (argv[1])); + return 0; +} +#endif diff --git a/src/xdg-user-dir-lookup.h b/src/xdg-user-dir-lookup.h new file mode 100644 index 0000000..956b59d --- /dev/null +++ b/src/xdg-user-dir-lookup.h @@ -0,0 +1,15 @@ +#ifndef XDG_USER_DIR_LOOKUP_H +#define XDG_USER_DIR_LOOKUP_H + +#ifdef __cplusplus +extern "C" { +#endif + char * + xdg_user_dir_lookup_with_fallback (const char *type, const char *fallback); + char * + xdg_user_dir_lookup (const char *type); +#ifdef __cplusplus +} +#endif + +#endif // XDG_USER_DIR_LOOKUP_H