Skip to content

allow placing calfrc under $XDG_CONFIG_HOME #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohannesLorenz merged 6 commits into from
Oct 26, 2023
Merged

allow placing calfrc under $XDG_CONFIG_HOME #334

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d7abf2b
allow placing calfrc under $XDG_CONFIG_HOME
Jun 19, 2023
47945c4
Merge branch 'calf-studio-gear:master' into xdg-compliance
circled-square Oct 18, 2023
d0754f9
checking if XDG_CONFIG_HOME/calf already exists before calling mkdir
Oct 18, 2023
55e7466
replaced mkdir for g_mkdir_with_parents to spare including sys/stat.h
Oct 18, 2023
12692dc
changed mode to 0755 for the config directory
Oct 24, 2023
cfc7c05
Merge branch 'calf-studio-gear:master' into xdg-compliance
circled-square Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions src/gui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,10 +502,32 @@ bool window_update_controller::check_redraw(GtkWidget *toplevel)
gui_environment::gui_environment()
{
keyfile = g_key_file_new();

string filename;

gchar *fn = g_build_filename(getenv("HOME"), ".calfrc", NULL);
string filename = fn;
g_free(fn);
gchar *fn_under_home = g_build_filename(getenv("HOME"), ".calfrc", NULL);
char *xdg_conf = getenv("XDG_CONFIG_HOME");
gchar *calf_conf_dir = g_build_filename(xdg_conf, "calf", NULL);
gchar *fn_under_conf = g_build_filename(calf_conf_dir, "calfrc", NULL);

//if $HOME/.calfrc exists or XDG_CONFIG_HOME is not set use $HOME/.calfrc
if(g_file_test(fn_under_home, G_FILE_TEST_IS_REGULAR) || xdg_conf == NULL) {
filename = fn_under_home;
} else {
//if $XDG_CONFIG_HOME/calf does not exist, create it
if(!g_file_test(calf_conf_dir, G_FILE_TEST_EXISTS))
g_mkdir_with_parents(calf_conf_dir, 0755);

if(g_file_test(calf_conf_dir, G_FILE_TEST_IS_DIR))
filename = fn_under_conf;
else
filename = fn_under_home; //failed creating directory: fall back to $HOME/.calfrc
}

g_free(calf_conf_dir);
g_free(fn_under_conf);
g_free(fn_under_home);

g_key_file_load_from_file(keyfile, filename.c_str(), (GKeyFileFlags)(G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS), NULL);

config_db = new calf_utils::gkeyfile_config_db(keyfile, filename.c_str(), "gui");
Expand Down