Utils: add helper functions to get standard directories

Author: oSoMoN

src/Script/Script.cpp

@@ -2,12 +2,11 @@
 #include "convar.h"
 #include "color_helpers.h"
 #include "../log.hpp"
+#include "Utils/DirHelpers.h"
 
 #include <filesystem>
 #include <algorithm>
 
-std::string_view GetHomeDir();
-
 namespace gamescope
 {
     using namespace std::literals;
@@ -18,20 +17,6 @@ namespace gamescope
     static ConVar<bool> cv_script_use_local_scripts{ "script_use_local_scripts", false, "Whether or not to use the local scripts (../config) as opposed to the ones in /etc/gamescope.d" };
     static ConVar<bool> cv_script_use_user_scripts{ "script_use_user_scripts", true, "Whether or not to use user config scripts ($XDG_CONFIG_DIR/gamescope) at all." };
 
-    static std::string_view GetConfigDir()
-    {
-        static std::string s_sConfigDir = []() -> std::string
-        {
-            const char *pszConfigHome = getenv( "XDG_CONFIG_HOME" );
-            if ( pszConfigHome && *pszConfigHome )
-                return pszConfigHome;
-
-            return std::string{ GetHomeDir() } + "/.config";
-        }();
-
-        return s_sConfigDir;
-    }
-
     static inline void PanicFunction( sol::optional<std::string> oMsg )
     {
         s_ScriptLog.errorf( "Lua is in a panic state and will now abort() the application" );

src/Utils/DirHelpers.cpp

@@ -0,0 +1,44 @@
+#include "DirHelpers.h"
+
+#include <sys/types.h>
+#include <pwd.h>
+#include <unistd.h>
+
+namespace gamescope {
+    std::string_view GetHomeDir()
+    {
+        static std::string s_sHomeDir = []() -> std::string
+        {
+            const char *pszHomeDir = getenv( "HOME" );
+            if ( pszHomeDir )
+                return pszHomeDir;
+    
+            return getpwuid( getuid() )->pw_dir;
+        }();
+        return s_sHomeDir;
+    }
+
+    std::string GetLocalUsrDir()
+    {
+        return std::string{ GetHomeDir() } + "/.local";
+    }
+
+    std::string GetUsrDir()
+    {
+        return "/usr";
+    }
+
+    std::string_view GetConfigDir()
+    {
+        static std::string s_sConfigDir = []() -> std::string
+        {
+            const char *pszConfigHome = getenv( "XDG_CONFIG_HOME" );
+            if ( pszConfigHome && *pszConfigHome )
+                return pszConfigHome;
+
+            return std::string{ GetHomeDir() } + "/.config";
+        }();
+
+        return s_sConfigDir;
+    }
+}

src/Utils/DirHelpers.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include <string>
+
+namespace gamescope
+{
+	std::string_view GetHomeDir();
+	std::string GetLocalUsrDir();
+	std::string GetUsrDir();
+	std::string_view GetConfigDir();
+}

src/meson.build

@@ -97,6 +97,7 @@ required_wlroots_features = ['xwayland']
 src = [
   'Backends/HeadlessBackend.cpp',
   'Backends/WaylandBackend.cpp',
+  'Utils/DirHelpers.cpp',
   'Utils/TempFiles.cpp',
   'Utils/Version.cpp',
   'Utils/Process.cpp',
@@ -206,6 +207,7 @@ gamescope_version = configure_file(
 gamescope_core_src = [
   'convar.cpp',
   'log.cpp',
+  'Utils/DirHelpers.cpp',
   'Utils/Process.cpp',
   'Utils/Version.cpp',
 ]

src/reshade_effect_manager.cpp

@@ -4,6 +4,7 @@
 
 #include "reshade_effect_manager.hpp"
 #include "log.hpp"
+#include "Utils/DirHelpers.h"
 
 #include "steamcompmgr.hpp"
 
@@ -13,17 +14,12 @@
 #include "gamescope-reshade-protocol.h"
 
 #include "reshade_api_format.hpp"
-#include "convar.h"
 
 #include <stb_image.h>
 #define STB_IMAGE_RESIZE_IMPLEMENTATION
 #include <stb_image_resize.h>
 
 #include <mutex>
-#include <unistd.h>
-#include <sys/types.h>
-#include <pwd.h>
-#include <iostream>
 
 // This is based on wl_array_for_each from `wayland-util.h` in the Wayland client library.
 #define uint8_array_for_each(pos, data, size) \
@@ -36,31 +32,6 @@ static std::mutex g_runtimeUniformsMutex;
 
 extern int g_nOutputRefresh;
 
-const char *homedir;
-
-std::string_view GetHomeDir()
-{
-    static std::string s_sHomeDir = []() -> std::string
-    {
-        const char *pszHomeDir = getenv( "HOME" );
-        if ( pszHomeDir )
-            return pszHomeDir;
-
-        return getpwuid( getuid() )->pw_dir;
-    }();
-    return s_sHomeDir;
-}
-
-static std::string GetLocalUsrDir()
-{
-    return std::string{ GetHomeDir() } + "/.local";
-}
-
-static std::string GetUsrDir()
-{
-    return "/usr";
-}
-
 static LogScope reshade_log("gamescope_reshade");
 
 ///////////////
@@ -967,8 +938,8 @@ bool ReshadeEffectPipeline::init(CVulkanDevice *device, const ReshadeEffectKey &
 
     std::string gamescope_reshade_share_path = "/share/gamescope/reshade";
 
-    std::string local_reshade_path = GetLocalUsrDir() + gamescope_reshade_share_path;
-    std::string global_reshade_path = GetUsrDir() + gamescope_reshade_share_path;
+    std::string local_reshade_path = gamescope::GetLocalUsrDir() + gamescope_reshade_share_path;
+    std::string global_reshade_path = gamescope::GetUsrDir() + gamescope_reshade_share_path;
 
     pp.add_include_path(local_reshade_path + "/Shaders");
 	pp.add_include_path(global_reshade_path + "/Shaders");
@@ -1993,4 +1964,4 @@ void reshade_effect_manager_enable_effect()
 void reshade_effect_manager_disable_effect() 
 {
     gamescope_clear_reshade_effect();
-}
+}