alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #172 from taiyu-len/master

Browse source 
config_path cleanup
This commit is contained in:
Drew DeVault 2015-09-07 10:22:52 -04:00
parent 85ec928d58 3fb8397724
commit afe9cf0be0
2 changed files with 107 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

191
sway/config.c
View file

@ -11,22 +11,58 @@
#include "layout.h" #include "layout.h"
#include "input_state.h" #include "input_state.h"
struct sway_config *config; struct sway_config *config = NULL;
static bool exists(const char *path) { static void free_variable(struct sway_variable *var) {
free(var->name);
free(var->value);
free(var);
}
static void free_binding(struct sway_binding *bind) {
free_flat_list(bind->keys);
free(bind->command);
free(bind);
}
static void free_mode(struct sway_mode *mode) {
free(mode->name);
int i;
for (i = 0; i < mode->bindings->length; ++i) {
free_binding(mode->bindings->items[i]);
}
list_free(mode->bindings);
free(mode);
}
static void free_outut_config(struct output_config *oc) {
free(oc->name);
free(oc);
}
static void free_workspace_output(struct workspace_output *wo) {
free(wo->output);
free(wo->workspace);
free(wo);
}
static bool file_exists(const char *path) {
return access(path, R_OK) != -1; return access(path, R_OK) != -1;
} }
void config_defaults(struct sway_config *config) { static void config_defaults(struct sway_config *config) {
config->symbols = create_list(); config->symbols = create_list();
config->modes = create_list(); config->modes = create_list();
config->cmd_queue = create_list();
config->workspace_outputs = create_list(); config->workspace_outputs = create_list();
config->output_configs = create_list(); config->output_configs = create_list();
config->cmd_queue = create_list();
config->current_mode = malloc(sizeof(struct sway_mode)); config->current_mode = malloc(sizeof(struct sway_mode));
config->current_mode->name = NULL; config->current_mode->name = NULL;
config->current_mode->bindings = create_list(); config->current_mode->bindings = create_list();
list_add(config->modes, config->current_mode); list_add(config->modes, config->current_mode);
config->floating_mod = 0; config->floating_mod = 0;
config->default_layout = L_NONE; config->default_layout = L_NONE;
config->default_orientation = L_NONE; config->default_orientation = L_NONE;
@ -42,115 +78,99 @@ void config_defaults(struct sway_config *config) {
config->gaps_outer = 0; config->gaps_outer = 0;
} }
void free_mode(struct sway_mode *mode) {
free(mode->name);
free_flat_list(mode->bindings);
}
void free_config(struct sway_config *config) { void free_config(struct sway_config *config) {
int i; int i;
for (i = 0; i < config->modes->length; ++i) {
free_mode((struct sway_mode *)config->modes->items[i]);
}
free_flat_list(config->modes);
for (i = 0; i < config->workspace_outputs->length; ++i) {
struct workspace_output *wso = config->workspace_outputs->items[i];
free(wso->output);
free(wso->workspace);
}
free_flat_list(config->workspace_outputs);
free_flat_list(config->cmd_queue);
for (i = 0; i < config->symbols->length; ++i) { for (i = 0; i < config->symbols->length; ++i) {
struct sway_variable *sym = config->symbols->items[i]; free_variable(config->symbols->items[i]);
free(sym->name);
free(sym->value);
} }
free_flat_list(config->symbols); list_free(config->symbols);
free_flat_list(config->output_configs);
for (i = 0; i < config->modes->length; ++i) {
free_mode(config->modes->items[i]);
}
list_free(config->modes);
free_flat_list(config->cmd_queue);
for (i = 0; i < config->workspace_outputs->length; ++i) {
free_workspace_output(config->workspace_outputs->items[i]);
}
list_free(config->workspace_outputs);
for (i = 0; i < config->output_configs->length; ++i) {
free_outut_config(config->output_configs->items[i]);
}
list_free(config->output_configs);
free(config);
} }
static const char *search_paths[] = { static char *get_config_path(void) {
"$home/.sway/config", char *config_path = NULL;
"$config/sway/config", char *paths[3] = {getenv("HOME"), getenv("XDG_CONFIG_HOME"), ""};
"/etc/sway/config", int pathlen[3] = {0, 0, 0};
"$home/.i3/config", int i;
"$config/.i3/config", #define home paths[0]
"/etc/i3/config" #define conf paths[1]
}; // Get home and config directories
home = home ? strdup(home) : NULL;
static char *get_config_path() { if (conf) {
char *home = getenv("HOME"); conf = strdup(conf);
if (home) {
home = strdup(getenv("HOME"));
}
char *config = getenv("XDG_CONFIG_HOME");
if (config) {
config = strdup(getenv("XDG_CONFIG_HOME"));
} else if (home) { } else if (home) {
const char *def = "/.config"; const char *def = "/.config";
config = malloc(strlen(home) + strlen(def) + 1); conf = malloc(strlen(home) + strlen(def) + 1);
strcpy(config, home); strcpy(conf, home);
strcat(config, def); strcat(conf, def);
} else { } else {
home = strdup(""); home = strdup("");
config = strdup(""); conf = strdup("");
} }
pathlen[0] = strlen(home);
// Set up a temporary config for holding set variables pathlen[1] = strlen(conf);
struct sway_config *temp_config = malloc(sizeof(struct sway_config)); #undef home
config_defaults(temp_config); #undef conf
const char *set_home = "set $home "; // Search for config file from search paths
char *_home = malloc(strlen(home) + strlen(set_home) + 1); static const char *search_paths[] = {
strcpy(_home, set_home); "/.sway/config", // Prepend with $home
strcat(_home, home); "/sway/config", // Prepend with $config
handle_command(temp_config, _home); "/etc/sway/config",
free(_home); "/.i3/config", // $home
const char *set_config = "set $config "; "/.i3/config", // $config
char *_config = malloc(strlen(config) + strlen(set_config) + 1); "/etc/i3/config"
strcpy(_config, set_config); };
strcat(_config, config);
handle_command(temp_config, _config);
free(_config);
char *test = NULL;
int i;
for (i = 0; i < (int)(sizeof(search_paths) / sizeof(char *)); ++i) { for (i = 0; i < (int)(sizeof(search_paths) / sizeof(char *)); ++i) {
test = strdup(search_paths[i]); char *test = malloc(pathlen[i%3] + strlen(search_paths[i]) + 1);
test = do_var_replacement(temp_config, test); strcpy(test, paths[i%3]);
strcat(test, search_paths[i]);
sway_log(L_DEBUG, "Checking for config at %s", test); sway_log(L_DEBUG, "Checking for config at %s", test);
if (exists(test)) { if (file_exists(test)) {
goto _continue; config_path = test;
goto cleanup;
} }
free(test); free(test);
test = NULL;
} }
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"); char *xdg_config_dirs = getenv("XDG_CONFIG_DIRS");
if (xdg_config_dirs != NULL) { if (xdg_config_dirs) {
list_t *paths = split_string(xdg_config_dirs, ":"); list_t *paths = split_string(xdg_config_dirs, ":");
char *name = "/sway/config"; const char *name = "/sway/config";
int i;
for (i = 0; i < paths->length; i++ ) { for (i = 0; i < paths->length; i++ ) {
test = malloc(strlen(paths->items[i]) + strlen(name) + 1); char *test = malloc(strlen(paths->items[i]) + strlen(name) + 1);
strcpy(test, paths->items[i]); strcpy(test, paths->items[i]);
strcat(test, name); strcat(test, name);
if (exists(test)) { if (file_exists(test)) {
free_config(temp_config); config_path = test;
free_flat_list(paths); break;
return test;
} }
free(test); free(test);
test = NULL;
} }
free_flat_list(paths); free_flat_list(paths);
} }
_continue: cleanup:
free_config(temp_config); free(paths[0]);
free(home); free(paths[1]);
free(config); return config_path;
return test;
} }
bool load_config(const char *file) { bool load_config(const char *file) {
@ -248,6 +268,9 @@ _continue:
temp_config->reloading = false; temp_config->reloading = false;
arrange_windows(&root_container, -1, -1); arrange_windows(&root_container, -1, -1);
} }
if (config) {
free_config(config);
}
config = temp_config; config = temp_config;
return success; return success;

1
sway/handlers.c
View file

@ -334,7 +334,6 @@ static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifier
release_key(sym, key); release_key(sym, key);
} }
// TODO: reminder to check conflicts with mod+q+a versus mod+q
for (i = 0; i < mode->bindings->length; ++i) { for (i = 0; i < mode->bindings->length; ++i) {
struct sway_binding *binding = mode->bindings->items[i]; struct sway_binding *binding = mode->bindings->items[i];