Added new criteria 'tiling' / 'floating'. (#2481)

These criteria allow selecting only windows in a specific mode, i.e.,
tiling and floating, respectively.

fixes #2406
This commit is contained in:
Ingo Bürk
2016-09-28 04:04:00 +02:00
committed by Michael Stapelberg
parent 0e73a6e9e7
commit 6a8fb69eff
6 changed files with 68 additions and 4 deletions

View File

@ -28,6 +28,7 @@
void match_init(Match *match) {
memset(match, 0, sizeof(Match));
match->urgent = U_DONTCHECK;
match->window_mode = WM_ANY;
/* we use this as the placeholder value for "not set". */
match->window_type = UINT32_MAX;
}
@ -53,7 +54,7 @@ bool match_is_empty(Match *match) {
match->window_type == UINT32_MAX &&
match->con_id == NULL &&
match->dock == M_NODOCK &&
match->floating == M_ANY);
match->window_mode == WM_ANY);
}
/*
@ -243,6 +244,21 @@ bool match_matches_window(Match *match, i3Window *window) {
}
}
if (match->window_mode != WM_ANY) {
if ((con = con_by_window_id(window->id)) == NULL)
return false;
const bool floating = (con_inside_floating(con) != NULL);
if ((match->window_mode == WM_TILING && floating) ||
(match->window_mode == WM_FLOATING && !floating)) {
LOG("window_mode does not match\n");
return false;
}
LOG("window_mode matches\n");
}
return true;
}
@ -384,5 +400,15 @@ void match_parse_property(Match *match, const char *ctype, const char *cvalue) {
return;
}
if (strcmp(ctype, "tiling") == 0) {
match->window_mode = WM_TILING;
return;
}
if (strcmp(ctype, "floating") == 0) {
match->window_mode = WM_FLOATING;
return;
}
ELOG("Unknown criterion: %s\n", ctype);
}