nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1521 from Airblader/feature-use-refactored-function 

Use the already existing function to get rid of some code duplication
This commit is contained in:
Michael Stapelberg 2015-03-13 00:54:52 -07:00
parent a5939f3edc c572176429
commit c263bb3d2a
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/commands.c
View File

@ -1155,28 +1155,13 @@ void cmd_move_con_to_output(I3_CMD, char *name) {
HANDLE_EMPTY_MATCH; HANDLE_EMPTY_MATCH;
/* get the output */
Output *current_output = NULL; Output *current_output = NULL;
Output *output;
// TODO: fix the handling of criteria // TODO: fix the handling of criteria
TAILQ_FOREACH(current, &owindows, owindows) TAILQ_FOREACH(current, &owindows, owindows)
current_output = get_output_of_con(current->con); current_output = get_output_of_con(current->con);
assert(current_output != NULL); assert(current_output != NULL);
// TODO: clean this up with commands.spec as soon as we switched away from the lex/yacc command parser Output *output = get_output_from_string(current_output, name);
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);
if (!output) { if (!output) {
LOG("No such output found.\n"); LOG("No such output found.\n");
ysuccess(false); ysuccess(false);