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

Merge pull request #3189 from orestisf1993/run_assignments 

run_assignments: check for A_COMMAND early
next
Ingo Bürk 2018-03-19 14:32:54 +01:00 committed by GitHub
parent b4e24a6d5f 6306acdb65
commit 670dfa0bba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/assignments.c
View File

@ -22,7 +22,7 @@ void run_assignments(i3Window *window) {
/* Check if any assignments match */ /* Check if any assignments match */
Assignment *current; Assignment *current;
TAILQ_FOREACH(current, &assignments, assignments) { TAILQ_FOREACH(current, &assignments, assignments) {
if (!match_matches_window(&(current->match), window)) if (current->type != A_COMMAND || !match_matches_window(&(current->match), window))
continue; continue;
bool skip = false; bool skip = false;
@ -45,19 +45,16 @@ void run_assignments(i3Window *window) {
window->ran_assignments = srealloc(window->ran_assignments, sizeof(Assignment *) * window->nr_assignments); window->ran_assignments = srealloc(window->ran_assignments, sizeof(Assignment *) * window->nr_assignments);
window->ran_assignments[window->nr_assignments - 1] = current; window->ran_assignments[window->nr_assignments - 1] = current;
DLOG("matching assignment, would do:\n"); DLOG("matching assignment, execute command %s\n", current->dest.command);
if (current->type == A_COMMAND) { char *full_command;
DLOG("execute command %s\n", current->dest.command); sasprintf(&full_command, "[id=\"%d\"] %s", window->id, current->dest.command);
char *full_command; CommandResult *result = parse_command(full_command, NULL);
sasprintf(&full_command, "[id=\"%d\"] %s", window->id, current->dest.command); free(full_command);
CommandResult *result = parse_command(full_command, NULL);
free(full_command);
if (result->needs_tree_render) if (result->needs_tree_render)
needs_tree_render = true; 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. */ /* If any of the commands required re-rendering, we will do that now. */