mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-16 13:13:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Style fixes and slight reload command alteration

Browse source
This commit is contained in:
Luminarys 2015-08-10 14:00:10 -05:00
parent c0ee2a6406
commit 68beabda03
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sway/commands.c
View file

@ -80,7 +80,7 @@ int cmd_exec(struct sway_config *config, int argc, char **argv) {
} }
if (config->reloading) { if (config->reloading) {
sway_log(L_DEBUG, "Ignoring exec %s due to reload", join_args(argv, argc)); sway_log(L_DEBUG, "Ignoring exec %s due to reload", join_args(argv, argc));
return 0; return 0;
} }
@ -176,7 +176,7 @@ int cmd_layout(struct sway_config *config, int argc, char **argv) {
int cmd_reload(struct sway_config *config, int argc, char **argv) { int cmd_reload(struct sway_config *config, int argc, char **argv) {
if (argc != 0) { if (argc != 0) {
sway_log(L_ERROR, "Invalid reload command (expected 1 arguments, got %d)", argc); sway_log(L_ERROR, "Invalid reload command (expected 0 arguments, got %d)", argc);
return 1; return 1;
} }
@ -188,9 +188,9 @@ int cmd_reload(struct sway_config *config, int argc, char **argv) {
strcat(temp, name); strcat(temp, name);
FILE *f = fopen(temp, "r"); FILE *f = fopen(temp, "r");
if (!f) { if (!f) {
fprintf(stderr, "Unable to open %s for reading", temp); sway_log(L_ERROR, "Sway config file not found, aborting reload!");
free(temp); free(temp);
exit(1); return 1;
} }
free(temp); free(temp);
config = read_config(f, true); config = read_config(f, true);

10
sway/config.c
View file

@ -18,7 +18,7 @@ void config_defaults(struct sway_config *config) {
// Flags // Flags
config->focus_follows_mouse = true; config->focus_follows_mouse = true;
config->mouse_warping = true; config->mouse_warping = true;
config->reloading = false; config->reloading = false;
} }
struct sway_config *read_config(FILE *file, bool is_active) { struct sway_config *read_config(FILE *file, bool is_active) {
@ -26,7 +26,7 @@ struct sway_config *read_config(FILE *file, bool is_active) {
config_defaults(config); config_defaults(config);
if (is_active) { if (is_active) {
config->reloading = true; config->reloading = true;
} }
bool success = true; bool success = true;
@ -49,7 +49,7 @@ struct sway_config *read_config(FILE *file, bool is_active) {
if (!temp_depth && handle_command(config, line) != 0) { if (!temp_depth && handle_command(config, line) != 0) {
success = false; success = false;
} }
_continue: _continue:
if (line && line[strlen(line) - 1] == '{') { if (line && line[strlen(line) - 1] == '{') {
temp_depth++; temp_depth++;
@ -61,7 +61,9 @@ _continue:
exit(1); exit(1);
} }
config->reloading = false; if (is_active) {
config->reloading = true;
}
return config; return config;
} }