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

config: Store 'enabled' as int

Browse source
This commit is contained in:
Christoph Gysin 2015-11-29 23:17:42 +02:00
parent 82d464bb90
commit ae7ed79573
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/config.h
View file

@ -40,7 +40,7 @@ struct sway_mode {
*/ */
struct output_config { struct output_config {
char *name; char *name;
bool enabled; int enabled;
int width, height; int width, height;
int x, y; int x, y;
char *background; char *background;

8
sway/commands.c
View file

@ -719,7 +719,7 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
struct output_config *output = calloc(1, sizeof(struct output_config)); struct output_config *output = calloc(1, sizeof(struct output_config));
output->x = output->y = output->width = output->height = -1; output->x = output->y = output->width = output->height = -1;
output->name = strdup(name); output->name = strdup(name);
output->enabled = true; output->enabled = -1;
// TODO: atoi doesn't handle invalid numbers // TODO: atoi doesn't handle invalid numbers
// TODO: Check missing params after each sub-command // TODO: Check missing params after each sub-command
@ -729,7 +729,7 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
const char *command = argv[i]; const char *command = argv[i];
if (strcasecmp(command, "disable") == 0) { if (strcasecmp(command, "disable") == 0) {
output->enabled = false; output->enabled = 0;
} else if (strcasecmp(command, "resolution") == 0 || strcasecmp(command, "res") == 0) { } else if (strcasecmp(command, "resolution") == 0 || strcasecmp(command, "res") == 0) {
char *res = argv[++i]; char *res = argv[++i];
char *x = strchr(res, 'x'); char *x = strchr(res, 'x');
@ -811,8 +811,8 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
} }
list_add(config->output_configs, output); list_add(config->output_configs, output);
sway_log(L_DEBUG, "Config stored for output %s (%s) (%d x %d @ %d, %d) (bg %s %s)", sway_log(L_DEBUG, "Config stored for output %s (enabled:%d) (%d x %d @ %d, %d) (bg %s %s)",
output->name, output->enabled ? "enable" : "disable", output->width, output->name, output->enabled, output->width,
output->height, output->x, output->y, output->background, output->height, output->x, output->y, output->background,
output->background_option); output->background_option);