mirror of
https://github.com/gwenhael-le-moine/sway-patched-tray-menu.git
synced 2024-12-26 21:58:08 +01:00
criteria: change workspace to support regex
This changes the workspace criteria to support regex instead of basic strings. This matches i3's behavior.
This commit is contained in:
parent
3330faded5
commit
52a61671e9
2 changed files with 3 additions and 3 deletions
|
@ -35,7 +35,7 @@ struct criteria {
|
|||
bool floating;
|
||||
bool tiling;
|
||||
char urgent; // 'l' for latest or 'o' for oldest
|
||||
char *workspace;
|
||||
pcre *workspace;
|
||||
};
|
||||
|
||||
bool criteria_is_empty(struct criteria *criteria);
|
||||
|
|
|
@ -208,7 +208,7 @@ static bool criteria_matches_view(struct criteria *criteria,
|
|||
|
||||
if (criteria->workspace) {
|
||||
struct sway_workspace *ws = view->container->workspace;
|
||||
if (!ws || strcmp(ws->name, criteria->workspace) != 0) {
|
||||
if (!ws || regex_cmp(ws->name, criteria->workspace) != 0) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@ -515,7 +515,7 @@ static bool parse_token(struct criteria *criteria, char *name, char *value) {
|
|||
}
|
||||
break;
|
||||
case T_WORKSPACE:
|
||||
criteria->workspace = strdup(effective_value);
|
||||
generate_regex(&criteria->workspace, effective_value);
|
||||
break;
|
||||
case T_INVALID:
|
||||
break;
|
||||
|
|
Loading…
Reference in a new issue