Change unmark implemention to match i3's

This commit is contained in:
Ryan Dwyer 2018-05-15 11:24:16 +10:00
parent 22d38600d0
commit 4d1edfcba9
4 changed files with 44 additions and 16 deletions

View file

@ -302,7 +302,7 @@ struct cmd_results *execute_command(char *_exec, struct sway_seat *seat) {
head = exec;
do {
// Extract criteria (valid for this command list only).
bool has_criteria = false;
config->handler_context.using_criteria = false;
if (*head == '[') {
char *error = NULL;
struct criteria *criteria = criteria_parse(head, &error);
@ -315,7 +315,7 @@ struct cmd_results *execute_command(char *_exec, struct sway_seat *seat) {
views = criteria_get_views(criteria);
head += strlen(criteria->raw);
criteria_destroy(criteria);
has_criteria = true;
config->handler_context.using_criteria = true;
// Skip leading whitespace
head += strspn(head, whitespace);
}
@ -352,7 +352,7 @@ struct cmd_results *execute_command(char *_exec, struct sway_seat *seat) {
goto cleanup;
}
if (!has_criteria) {
if (!config->handler_context.using_criteria) {
// without criteria, the command acts upon the focused
// container
config->handler_context.current_container =