Merge pull request #7 from Luminarys/master

Added in reload and exec_always handling.
This commit is contained in:
Drew DeVault 2015-08-10 15:26:49 -04:00
commit c9bce5dd22
9 changed files with 122 additions and 70 deletions

View file

@ -78,6 +78,28 @@ int cmd_exec(struct sway_config *config, int argc, char **argv) {
sway_log(L_ERROR, "Invalid exec command (expected at least 1 argument, got %d)", argc);
return 1;
}
if (config->reloading) {
sway_log(L_DEBUG, "Ignoring exec %s due to reload", join_args(argv, argc));
return 0;
}
if (fork() == 0) {
char *args = join_args(argv, argc);
sway_log(L_DEBUG, "Executing %s", args);
execl("/bin/sh", "sh", "-c", args, (char *)NULL);
free(args);
exit(0);
}
return 0;
}
int cmd_exec_always(struct sway_config *config, int argc, char **argv) {
if (argc < 1) {
sway_log(L_ERROR, "Invalid exec_always command (expected at least 1 argument, got %d)", argc);
return 1;
}
if (fork() == 0) {
char *args = join_args(argv, argc);
sway_log(L_DEBUG, "Executing %s", args);
@ -152,6 +174,18 @@ int cmd_layout(struct sway_config *config, int argc, char **argv) {
return 0;
}
int cmd_reload(struct sway_config *config, int argc, char **argv) {
if (argc != 0) {
sway_log(L_ERROR, "Invalid reload command (expected 0 arguments, got %d)", argc);
return 1;
}
if (!load_config()) {
return 1;
}
return 0;
}
int cmd_set(struct sway_config *config, int argc, char **argv) {
if (argc != 2) {
sway_log(L_ERROR, "Invalid set command (expected 2 arguments, got %d)", argc);
@ -232,12 +266,14 @@ int cmd_fullscreen(struct sway_config *config, int argc, char **argv) {
struct cmd_handler handlers[] = {
{ "bindsym", cmd_bindsym },
{ "exec", cmd_exec },
{ "exec_always", cmd_exec_always },
{ "exit", cmd_exit },
{ "focus", cmd_focus },
{ "focus_follows_mouse", cmd_focus_follows_mouse },
{ "fullscreen", cmd_fullscreen },
{ "layout", cmd_layout },
{ "log_colors", cmd_log_colors },
{ "reload", cmd_reload },
{ "set", cmd_set },
{ "splith", cmd_splith },
{ "splitv", cmd_splitv }

View file

@ -8,6 +8,25 @@
#include "commands.h"
#include "config.h"
bool load_config() {
// TODO: Allow use of more config file locations
const char *name = "/.sway/config";
const char *home = getenv("HOME");
char *temp = malloc(strlen(home) + strlen(name) + 1);
strcpy(temp, home);
strcat(temp, name);
FILE *f = fopen(temp, "r");
if (!f) {
fprintf(stderr, "Unable to open %s for reading", temp);
free(temp);
return false;
}
free(temp);
config = read_config(f, false);
fclose(f);
return true;
}
void config_defaults(struct sway_config *config) {
config->symbols = create_list();
config->modes = create_list();
@ -18,12 +37,17 @@ void config_defaults(struct sway_config *config) {
// Flags
config->focus_follows_mouse = true;
config->mouse_warping = true;
config->reloading = false;
}
struct sway_config *read_config(FILE *file) {
struct sway_config *read_config(FILE *file, bool is_active) {
struct sway_config *config = malloc(sizeof(struct sway_config));
config_defaults(config);
if (is_active) {
config->reloading = true;
}
bool success = true;
int temp_depth = 0; // Temporary: skip all config sections with depth
@ -56,6 +80,10 @@ _continue:
exit(1);
}
if (is_active) {
config->reloading = true;
}
return config;
}

View file

@ -29,9 +29,12 @@ struct sway_config {
// Flags
bool focus_follows_mouse;
bool mouse_warping;
bool reloading;
};
struct sway_config *read_config(FILE *file);
bool load_config();
struct sway_config *read_config(FILE *file, bool is_active);
char *do_var_replacement(struct sway_config *config, char *str);
extern struct sway_config *config;

View file

@ -9,24 +9,6 @@
struct sway_config *config;
void load_config() {
// TODO: Allow use of more config file locations
const char *name = "/.sway/config";
const char *home = getenv("HOME");
char *temp = malloc(strlen(home) + strlen(name) + 1);
strcpy(temp, home);
strcat(temp, name);
FILE *f = fopen(temp, "r");
if (!f) {
fprintf(stderr, "Unable to open %s for reading", temp);
free(temp);
exit(1);
}
free(temp);
config = read_config(f);
fclose(f);
}
int main(int argc, char **argv) {
init_log(L_DEBUG); // TODO: Control this with command line arg
init_layout();
@ -52,6 +34,7 @@ int main(int argc, char **argv) {
.motion = handle_pointer_motion,
.button = handle_pointer_button
}
};
setenv("WLC_DIM", "0", 0);
@ -60,7 +43,9 @@ int main(int argc, char **argv) {
}
setenv("DISPLAY", ":1", 1);
load_config();
if (load_config()) {
exit(1);
}
wlc_run();
return 0;