X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fassignments.c;h=abacc0a3658990b0e752749e6ff8146afdf24039;hb=f7b6ae2836086ed72dde6c44b7ad5d8c918b165b;hp=6c563357d14c5adb6fabd100a0230d4f7bf565f4;hpb=30c3729a24b77d348cb1c09cb63af26847740ff5;p=i3%2Fi3 diff --git a/src/assignments.c b/src/assignments.c index 6c563357..abacc0a3 100644 --- a/src/assignments.c +++ b/src/assignments.c @@ -1,5 +1,3 @@ -#undef I3__FILE__ -#define I3__FILE__ "assignments.c" /* * vim:ts=4:sw=4:expandtab * @@ -24,7 +22,7 @@ void run_assignments(i3Window *window) { /* Check if any assignments match */ Assignment *current; TAILQ_FOREACH(current, &assignments, assignments) { - if (!match_matches_window(&(current->match), window)) + if (current->type != A_COMMAND || !match_matches_window(&(current->match), window)) continue; bool skip = false; @@ -47,19 +45,16 @@ void run_assignments(i3Window *window) { window->ran_assignments = srealloc(window->ran_assignments, sizeof(Assignment *) * window->nr_assignments); window->ran_assignments[window->nr_assignments - 1] = current; - DLOG("matching assignment, would do:\n"); - if (current->type == A_COMMAND) { - DLOG("execute command %s\n", current->dest.command); - char *full_command; - sasprintf(&full_command, "[id=\"%d\"] %s", window->id, current->dest.command); - CommandResult *result = parse_command(full_command, NULL); - free(full_command); + DLOG("matching assignment, execute command %s\n", current->dest.command); + char *full_command; + sasprintf(&full_command, "[id=\"%d\"] %s", window->id, current->dest.command); + CommandResult *result = parse_command(full_command, NULL); + free(full_command); - if (result->needs_tree_render) - needs_tree_render = true; + if (result->needs_tree_render) + needs_tree_render = true; - command_result_free(result); - } + command_result_free(result); } /* If any of the commands required re-rendering, we will do that now. */