mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-24 06:59:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid adding duplicate criteria for no_focus and command

Browse source
This commit is contained in:
Ashkan Kiani 2019-07-26 12:30:04 -07:00 • committed by Simon Ser
parent 17c9a0e84f
commit e4bba906b6
4 changed files with 53 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

33
sway/criteria.c
View file

@ -685,3 +685,36 @@ cleanup:
criteria_destroy(criteria);
return NULL;
}
bool criteria_is_equal(struct criteria *left, struct criteria *right) {
if (left->type != right->type) {
return false;
}
// XXX Only implemented for CT_NO_FOCUS for now.
if (left->type == CT_NO_FOCUS) {
return strcmp(left->raw, right->raw) == 0;
}
if (left->type == CT_COMMAND) {
return strcmp(left->raw, right->raw) == 0
&& strcmp(left->cmdlist, right->cmdlist) == 0;
}
return false;
}
bool criteria_already_exists(struct criteria *criteria) {
// XXX Only implemented for CT_NO_FOCUS and CT_COMMAND for now.
// While criteria_is_equal also obeys this limitation, this is a shortcut
// to avoid processing the list.
if (criteria->type != CT_NO_FOCUS && criteria->type != CT_COMMAND) {
return false;
}
list_t *criterias = config->criteria;
for (int i = 0; i < criterias->length; ++i) {
struct criteria *existing = criterias->items[i];
if (criteria_is_equal(criteria, existing)) {
return true;
}
}
return false;
}