]> git.sur5r.net Git - i3/i3/commitdiff
Use the already existing function to get rid of some code duplication 1521/head
authorIngo Bürk <ingo.buerk@tngtech.com>
Thu, 5 Mar 2015 13:00:24 +0000 (14:00 +0100)
committerIngo Bürk <ingo.buerk@tngtech.com>
Thu, 5 Mar 2015 13:00:24 +0000 (14:00 +0100)
src/commands.c

index 0a64b2b82b7f0310d8327dd4cc83d5f4f5383828..c41352bdf5acf8df6e61ec9859c17a46e89aa89d 100644 (file)
@@ -1177,28 +1177,13 @@ void cmd_move_con_to_output(I3_CMD, char *name) {
 
     HANDLE_EMPTY_MATCH;
 
-    /* get the output */
     Output *current_output = NULL;
-    Output *output;
-
     // TODO: fix the handling of criteria
     TAILQ_FOREACH(current, &owindows, owindows)
     current_output = get_output_of_con(current->con);
-
     assert(current_output != NULL);
 
-    // TODO: clean this up with commands.spec as soon as we switched away from the lex/yacc command parser
-    if (strcasecmp(name, "up") == 0)
-        output = get_output_next_wrap(D_UP, current_output);
-    else if (strcasecmp(name, "down") == 0)
-        output = get_output_next_wrap(D_DOWN, current_output);
-    else if (strcasecmp(name, "left") == 0)
-        output = get_output_next_wrap(D_LEFT, current_output);
-    else if (strcasecmp(name, "right") == 0)
-        output = get_output_next_wrap(D_RIGHT, current_output);
-    else
-        output = get_output_by_name(name);
-
+    Output *output = get_output_from_string(current_output, name);
     if (!output) {
         LOG("No such output found.\n");
         ysuccess(false);