-#undef I3__FILE__
-#define I3__FILE__ "assignments.c"
/*
* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
- * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
*
* assignments.c: Assignments for specific windows (for_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;
if (skip)
continue;
- 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);
- struct CommandResultIR *command_output = parse_command(full_command);
- free(full_command);
+ /* Store that we ran this assignment to not execute it again. We have
+ * to do this before running the actual command to prevent infinite
+ * loops. */
+ window->nr_assignments++;
+ window->ran_assignments = srealloc(window->ran_assignments, sizeof(Assignment *) * window->nr_assignments);
+ window->ran_assignments[window->nr_assignments - 1] = current;
- if (command_output->needs_tree_render)
- needs_tree_render = true;
+ 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);
- yajl_gen_free(command_output->json_gen);
- }
+ if (result->needs_tree_render)
+ needs_tree_render = true;
- /* Store that we ran this assignment to not execute it again */
- window->nr_assignments++;
- window->ran_assignments = srealloc(window->ran_assignments, sizeof(Assignment*) * window->nr_assignments);
- window->ran_assignments[window->nr_assignments-1] = current;
+ command_result_free(result);
}
/* If any of the commands required re-rendering, we will do that now. */
if ((type != A_ANY && (assignment->type & type) == 0) ||
!match_matches_window(&(assignment->match), window))
continue;
- DLOG("got a matching assignment (to %s)\n", assignment->dest.workspace);
+ DLOG("got a matching assignment\n");
return assignment;
}