ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-13 00:24:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

issue #687 - putting the game install folders under XDG_DATA_HOME

Browse source
This commit is contained in:
Timothee 'TTimo' Besset 2023-02-19 21:23:57 -06:00
parent 2b6ee83552
commit db3c56505e
4 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
radiant/main.cpp
View file

@ -466,6 +466,8 @@ int mainRadiant( int argc, char* argv[] ) {
QE_ConvertDOSToUnixName( pBuffer, pBuffer ); QE_ConvertDOSToUnixName( pBuffer, pBuffer );
g_strAppPath.ReleaseBuffer(); g_strAppPath.ReleaseBuffer();
g_strGamePath = g_strAppPath;
g_strBitmapsPath = g_strAppPath; g_strBitmapsPath = g_strAppPath;
g_strBitmapsPath += "bitmaps/"; g_strBitmapsPath += "bitmaps/";
@ -513,6 +515,16 @@ int mainRadiant( int argc, char* argv[] ) {
loki_init_datapath( argv[0] ); loki_init_datapath( argv[0] );
g_strAppPath = loki_get_datapath(); g_strAppPath = loki_get_datapath();
const char *xdg_data_home = getenv( "XDG_DATA_HOME" );
if ( xdg_data_home != nullptr ) {
g_strGamesPath = xdg_data_home;
g_strGamesPath += "/";
} else {
g_strGamesPath = g_strAppPath;
}
g_strGamesPath += "games/";
Q_mkdir( g_strGamesPath.GetBuffer(), 0775 );
// radiant is installed in the parent dir of "tools/" // radiant is installed in the parent dir of "tools/"
// NOTE: this is not very easy for debugging // NOTE: this is not very easy for debugging
// maybe add options to lookup in several places? // maybe add options to lookup in several places?

3
radiant/mainframe.cpp
View file

@ -45,7 +45,8 @@
#endif #endif
// globals // globals
CString g_strAppPath; ///< holds the full path of the executable - readonly! (in flatpak at least) CString g_strAppPath; ///< holds the full path of the executable - readonly in flatpak
CString g_strGamesPath; ///< installed/configured games 'work area'
CString g_strDTDPath; ///< path to the DTD files CString g_strDTDPath; ///< path to the DTD files
CString g_pidFile; ///< the global .pid file (only for global part of the startup) CString g_pidFile; ///< the global .pid file (only for global part of the startup)
CString g_pidGameFile; ///< the game-specific .pid file CString g_pidGameFile; ///< the game-specific .pid file

7
radiant/preferences.cpp
View file

@ -1193,9 +1193,7 @@ void CGameDialog::ScanForGames(){
CString strPath; CString strPath;
char *dirlist; char *dirlist;
GDir *dir; GDir *dir;
CString strGamesPath = g_strAppPath.GetBuffer(); const char *path = g_strGamesPath.GetBuffer();
strGamesPath += "games";
const char *path = strGamesPath.GetBuffer();
if ( !mGames.empty() ) { if ( !mGames.empty() ) {
Sys_Printf( "Clearing game list\n" ); Sys_Printf( "Clearing game list\n" );
@ -3582,8 +3580,7 @@ void CGameInstall::Run() {
Sys_Printf( "combo: %d name: %s engine: %s mod: %s\n", m_nComboSelect, m_strName.GetBuffer(), m_strEngine.GetBuffer(), m_strMod.GetBuffer() ); Sys_Printf( "combo: %d name: %s engine: %s mod: %s\n", m_nComboSelect, m_strName.GetBuffer(), m_strEngine.GetBuffer(), m_strMod.GetBuffer() );
// Resolve the game pack and .game file // Resolve the game pack and .game file
Str gamePack, gameFilePath = g_strAppPath.GetBuffer(); Str gamePack, gameFilePath = g_strGamesPath.GetBuffer();
gameFilePath += "games/";
if ( CheckFile( gameFilePath ) != PATH_DIRECTORY ) { if ( CheckFile( gameFilePath ) != PATH_DIRECTORY ) {
radCreateDirectory( gameFilePath ); radCreateDirectory( gameFilePath );
} }

1
radiant/qe3.h
View file

@ -761,6 +761,7 @@ class ClipPoint;
extern MainFrame* g_pParentWnd; extern MainFrame* g_pParentWnd;
extern CString g_strAppPath; extern CString g_strAppPath;
extern CString g_strGamesPath;
extern CString g_strDTDPath; extern CString g_strDTDPath;
extern CString g_pidFile; extern CString g_pidFile;
extern CString g_pidGameFile; extern CString g_pidGameFile;