itycodes
/
convince
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor config file loading

Browse Source
master
Drew DeVault 9 years ago
parent 8fb2e7e34e
commit 79f9d93ef3
1 changed files with 96 additions and 115 deletions
Show Stats Download Patch File Download Diff File

209
sway/config.c
Unescape View File

@ -16,121 +16,121 @@ static bool exists(const char *path) {
return access(path, R_OK) != -1; return access(path, R_OK) != -1;
} }
static char *get_config_path() { void config_defaults(struct sway_config *config) {
char *name = "/.sway/config"; config->symbols = create_list();
const char *home = getenv("HOME"); config->modes = create_list();
config->cmd_queue = create_list();
// Check home dir config->workspace_outputs = create_list();
sway_log(L_DEBUG, "Trying to find config in ~/.sway/config"); config->current_mode = malloc(sizeof(struct sway_mode));
char *temp = malloc(strlen(home) + strlen(name) + 1); config->current_mode->name = NULL;
strcpy(temp, home); config->current_mode->bindings = create_list();
strcat(temp, name); list_add(config->modes, config->current_mode);
if (exists(temp)) { // Flags
return temp; config->focus_follows_mouse = true;
} config->mouse_warping = true;
free(temp); config->reloading = false;
config->active = false;
// Check XDG_CONFIG_HOME with fallback to ~/.config/ config->failed = false;
sway_log(L_DEBUG, "Trying to find config in XDG_CONFIG_HOME/sway/config"); config->gaps_inner = 0;
char *xdg_config_home = getenv("XDG_CONFIG_HOME"); config->gaps_outer = 0;
if (xdg_config_home == NULL) { }
sway_log(L_DEBUG, "Falling back to ~/.config/sway/config");
name = "/.config/sway/config";
temp = malloc(strlen(home) + strlen(name) + 1);
strcpy(temp, home);
strcat(temp, name);
} else {
name = "/sway/config";
temp = malloc(strlen(xdg_config_home) + strlen(name) + 1);
strcpy(temp, xdg_config_home);
strcat(temp, name);
}
if (exists(temp)) {
return temp;
}
// Check /etc/ void free_mode(struct sway_mode *mode) {
sway_log(L_DEBUG, "Trying to find config in /etc/sway/config"); free(mode->name);
strcpy(temp, "/etc/sway/config"); free_flat_list(mode->bindings);
if (exists(temp)) { }
return temp;
}
free(temp);
// Check XDG_CONFIG_DIRS void free_config(struct sway_config *config) {
sway_log(L_DEBUG, "Trying to find config in XDG_CONFIG_DIRS");
char *xdg_config_dirs = getenv("XDG_CONFIG_DIRS");
if (xdg_config_dirs != NULL) {
list_t *paths = split_string(xdg_config_dirs, ":");
name = "/sway/config";
int i; int i;
for (i = 0; i < paths->length; i++ ) { for (i = 0; i < config->modes->length; ++i) {
temp = malloc(strlen(paths->items[i]) + strlen(name) + 1); free_mode((struct sway_mode *)config->modes->items[i]);
strcpy(temp, paths->items[i]); }
strcat(temp, name); free_flat_list(config->modes);
if (exists(temp)) { for (i = 0; i < config->workspace_outputs->length; ++i) {
free_flat_list(paths); struct workspace_output *wso = config->workspace_outputs->items[i];
return temp; free(wso->output);
} free(wso->workspace);
free(temp); }
} free_flat_list(config->workspace_outputs);
free_flat_list(paths); free_flat_list(config->cmd_queue);
} for (i = 0; i < config->symbols->length; ++i) {
struct sway_variable *sym = config->symbols->items[i];
free(sym->name);
free(sym->value);
}
free_flat_list(config->symbols);
}
//Now fall back to i3 paths and try the same thing static const char *search_paths[] = {
name = "/.i3/config"; "$home/.sway/config",
sway_log(L_DEBUG, "Trying to find config in ~/.i3/config"); "$config/.sway/config",
temp = malloc(strlen(home) + strlen(name) + 1); "/etc/sway/config",
strcpy(temp, home); "$home/.i3/config",
strcat(temp, name); "$config/.i3/config",
if (exists(temp)) { "/etc/i3/config"
return temp; };
}
free(temp);
sway_log(L_DEBUG, "Trying to find config in XDG_CONFIG_HOME/i3/config"); static char *get_config_path() {
if (xdg_config_home == NULL) { char *home = getenv("HOME");
sway_log(L_DEBUG, "Falling back to ~/.config/i3/config"); char *config = getenv("XDG_CONFIG_HOME");
name = "/.config/i3/config"; if (!config) {
temp = malloc(strlen(home) + strlen(name) + 1); const char *def = "/.config/sway";
strcpy(temp, home); config = malloc(strlen(home) + strlen(def) + 1);
strcat(temp, name); strcpy(config, home);
} else { strcat(config, def);
name = "/i3/config";
temp = malloc(strlen(xdg_config_home) + strlen(name) + 1);
strcpy(temp, xdg_config_home);
strcat(temp, name);
}
if (exists(temp)) {
return temp;
} }
sway_log(L_DEBUG, "Trying to find config in /etc/i3/config"); // Set up a temporary config for holding set variables
strcpy(temp, "/etc/i3/config"); struct sway_config *temp_config = malloc(sizeof(struct sway_config));
if (exists(temp)) { config_defaults(temp_config);
return temp; const char *set_home = "set $home ";
char *_home = malloc(strlen(home) + strlen(set_home) + 1);
strcpy(_home, set_home);
strcat(_home, home);
handle_command(temp_config, _home);
free(_home);
const char *set_config = "set $config ";
char *_config = malloc(strlen(config) + strlen(set_config) + 1);
strcpy(_config, set_config);
strcat(_config, config);
handle_command(temp_config, _config);
free(_config);
char *test = NULL;
int i;
for (i = 0; i < sizeof(search_paths) / sizeof(char *); ++i) {
test = strdup(search_paths[i]);
test = do_var_replacement(temp_config, test);
sway_log(L_DEBUG, "Checking for config at %s", test);
if (exists(test)) {
goto _continue;
}
free(test);
test = NULL;
} }
free(temp);
sway_log(L_DEBUG, "Trying to find config in XDG_CONFIG_DIRS"); sway_log(L_DEBUG, "Trying to find config in XDG_CONFIG_DIRS");
char *xdg_config_dirs = getenv("XDG_CONFIG_DIRS");
if (xdg_config_dirs != NULL) { if (xdg_config_dirs != NULL) {
list_t *paths = split_string(xdg_config_dirs, ":"); list_t *paths = split_string(xdg_config_dirs, ":");
name = "/i3/config"; char *name = "/sway/config";
int i; int i;
for (i = 0; i < paths->length; i++ ) { for (i = 0; i < paths->length; i++ ) {
temp = malloc(strlen(paths->items[i]) + strlen(name) + 1); test = malloc(strlen(paths->items[i]) + strlen(name) + 1);
strcpy(temp, paths->items[i]); strcpy(test, paths->items[i]);
strcat(temp, name); strcat(test, name);
if (exists(temp)) { if (exists(test)) {
free_flat_list(paths); free_flat_list(paths);
return temp; return test;
} }
free(temp); free(test);
} }
free_flat_list(paths); free_flat_list(paths);
} }
return NULL; _continue:
free_config(temp_config);
return test;
} }
bool load_config(void) { bool load_config(void) {
@ -162,25 +162,6 @@ bool load_config(void) {
return config_load_success; return config_load_success;
} }
void config_defaults(struct sway_config *config) {
config->symbols = create_list();
config->modes = create_list();
config->cmd_queue = create_list();
config->workspace_outputs = create_list();
config->current_mode = malloc(sizeof(struct sway_mode));
config->current_mode->name = NULL;
config->current_mode->bindings = create_list();
list_add(config->modes, config->current_mode);
// Flags
config->focus_follows_mouse = true;
config->mouse_warping = true;
config->reloading = false;
config->active = false;
config->failed = false;
config->gaps_inner = 0;
config->gaps_outer = 0;
}
bool read_config(FILE *file, bool is_active) { bool read_config(FILE *file, bool is_active) {
struct sway_config *temp_config = malloc(sizeof(struct sway_config)); struct sway_config *temp_config = malloc(sizeof(struct sway_config));
config_defaults(temp_config); config_defaults(temp_config);

Write Preview
Loading…
Cancel
Save