Merge pull request #275 from christophgysin/cmd_output

refactor cmd_output

2 files changed, 30 insertions, 22 deletions

diff --git a/sway/commands.c b/sway/commands.c
index 42845f65..e00cc94d 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -716,20 +716,23 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
         if ((error = checkarg(argc, "output", EXPECTED_AT_LEAST, 1))) {
                 return error;
         }
+        const char *name = argv[0];
+
         struct output_config *output = calloc(1, sizeof(struct output_config));
         output->x = output->y = output->width = output->height = -1;
-        output->name = strdup(argv[0]);
+        output->name = strdup(name);
         output->enabled = true;
 
         // TODO: atoi doesn't handle invalid numbers
-        if (strcasecmp(argv[1], "disable") == 0) {
-                output->enabled = false;
-        }
         // TODO: Check missing params after each sub-command
 
         int 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 *x = strchr(res, 'x');
                         int width = -1, height = -1;
@@ -747,7 +750,7 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
                         }
                         output->width = width;
                         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 *c = strchr(res, ',');
                         int x = -1, y = -1;
@@ -765,7 +768,7 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
                         }
                         output->x = x;
                         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;
                         if (++i >= argc) {
                                 return cmd_results_new(CMD_INVALID, "output", "Missing background file.");
@@ -801,20 +804,19 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
                 }
         }
 
-        for (i = 0; i < config->output_configs->length; ++i) {
+        i = list_seq_find(config->output_configs, output_name_cmp, name);
+        if (i >= 0) {
+                // replace existing config
                 struct output_config *oc = config->output_configs->items[i];
-                if (strcmp(oc->name, output->name) == 0) {
-                        // replace existing config
-                        list_del(config->output_configs, i);
-                        free_output_config(oc);
-                        break;
-                }
+                list_del(config->output_configs, i);
+                free_output_config(oc);
         }
         list_add(config->output_configs, output);
 
-        sway_log(L_DEBUG, "Config stored for output %s (%d x %d @ %d, %d) (bg %s %s)",
-                        output->name, output->width, output->height, output->x, output->y,
-                        output->background, output->background_option);
+        sway_log(L_DEBUG, "Config stored for output %s (%s) (%d x %d @ %d, %d) (bg %s %s)",
+                        output->name, output->enabled ? "enable" : "disable", output->width,
+                        output->height, output->x, output->y, output->background,
+                        output->background_option);
 
         if (output->name) {
                 // Try to find the output container and apply configuration now. If
diff --git a/sway/config.c b/sway/config.c
index e9785aba..dd466e5b 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -261,6 +261,14 @@ bool read_config(FILE *file, bool is_active) {
         return success;
 }
 
+int output_name_cmp(const void *item, const void *data)
+{
+        const struct output_config *output = item;
+        const char *name = data;
+
+        return strcmp(output->name, name);
+}
+
 void apply_output_config(struct output_config *oc, swayc_t *output) {
         if (oc && oc->width > 0 && oc->height > 0) {
                 output->width = oc->width;
@@ -291,12 +299,10 @@ void apply_output_config(struct output_config *oc, swayc_t *output) {
 
         if (!oc || !oc->background) {
                 // Look for a * config for background
-                int i;
-                for (i = 0; i < config->output_configs->length; ++i) {
+                int i = list_seq_find(config->output_configs, output_name_cmp, "*");
+                if (i >= 0) {
                         oc = config->output_configs->items[i];
-                        if (strcasecmp("*", oc->name) == 0) {
-                                break;
-                        }
+                } else {
                         oc = NULL;
                 }
         }