mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd_output: Cleanup cmd_output argument handling

This commit is contained in:
Christoph Gysin 2015-11-29 10:28:52 +02:00
parent 01c5349e1a
commit 88f372a22a
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sway/commands.c
View File

@ -716,20 +716,23 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
if ((error = checkarg(argc, "output", EXPECTED_AT_LEAST, 1))) { if ((error = checkarg(argc, "output", EXPECTED_AT_LEAST, 1))) {
return error; return error;
} }
const char *name = argv[0];
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(argv[0]); output->name = strdup(name);
output->enabled = true; output->enabled = true;
// TODO: atoi doesn't handle invalid numbers // TODO: atoi doesn't handle invalid numbers
if (strcasecmp(argv[1], "disable") == 0) {
output->enabled = false;
}
// TODO: Check missing params after each sub-command // TODO: Check missing params after each sub-command
int i; int i;
for (i = 1; i < argc; ++i) { for (i = 1; i < argc; ++i) {
if (strcasecmp(argv[i], "resolution") == 0 || strcasecmp(argv[i], "res") == 0) { const char *command = argv[i];
if (strcasecmp(command, "disable") == 0) {
output->enabled = false;
} 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');
int width = -1, height = -1; int width = -1, height = -1;
@ -747,7 +750,7 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
} }
output->width = width; output->width = width;
output->height = height; output->height = height;
} else if (strcasecmp(argv[i], "position") == 0 || strcasecmp(argv[i], "pos") == 0) { } else if (strcasecmp(command, "position") == 0 || strcasecmp(command, "pos") == 0) {
char *res = argv[++i]; char *res = argv[++i];
char *c = strchr(res, ','); char *c = strchr(res, ',');
int x = -1, y = -1; int x = -1, y = -1;
@ -765,7 +768,7 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
} }
output->x = x; output->x = x;
output->y = y; output->y = y;
} else if (strcasecmp(argv[i], "bg") == 0 || strcasecmp(argv[i], "background") == 0) { } else if (strcasecmp(command, "background") == 0 || strcasecmp(command, "bg") == 0) {
wordexp_t p; wordexp_t p;
if (++i >= argc) { if (++i >= argc) {
return cmd_results_new(CMD_INVALID, "output", "Missing background file."); return cmd_results_new(CMD_INVALID, "output", "Missing background file.");