mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-27 06:46:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

criteria: fullscreen mode criteria, fix #4222

Browse source
This commit is contained in:
Versus Void 2019-08-29 11:08:14 +03:00
parent 1a8b9fda8a
commit e0b224066e
3 changed files with 35 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/sway/criteria.h
View file

@ -14,6 +14,13 @@ enum criteria_type {
CT_NO_FOCUS = 1 << 4, CT_NO_FOCUS = 1 << 4,
}; };
enum criteria_tribool_value {
TRIBOOL_UNDEFINED = 0,
TRIBOOL_TRUE = 1,
TRIBOOL_FALSE = 2,
};
struct criteria { struct criteria {
enum criteria_type type; enum criteria_type type;
char *raw; // entire criteria string (for logging) char *raw; // entire criteria string (for logging)
@ -37,6 +44,7 @@ struct criteria {
bool tiling; bool tiling;
char urgent; // 'l' for latest or 'o' for oldest char urgent; // 'l' for latest or 'o' for oldest
pcre *workspace; pcre *workspace;
enum criteria_tribool_value fullscreen;
}; };
bool criteria_is_empty(struct criteria *criteria); bool criteria_is_empty(struct criteria *criteria);

25
sway/criteria.c
View file

@ -32,7 +32,8 @@ bool criteria_is_empty(struct criteria *criteria) {
&& !criteria->floating && !criteria->floating
&& !criteria->tiling && !criteria->tiling
&& !criteria->urgent && !criteria->urgent
&& !criteria->workspace; && !criteria->workspace
&& criteria->fullscreen == TRIBOOL_UNDEFINED;
} }
void criteria_destroy(struct criteria *criteria) { void criteria_destroy(struct criteria *criteria) {
@ -218,6 +219,14 @@ static bool criteria_matches_view(struct criteria *criteria,
} }
} }
if (criteria->fullscreen != TRIBOOL_UNDEFINED) {
const bool want_fullscreen = criteria->fullscreen == TRIBOOL_TRUE;
const bool is_fullscreen = view->container->fullscreen_mode != FULLSCREEN_NONE;
if (want_fullscreen != is_fullscreen) {
return false;
}
}
return true; return true;
} }
@ -324,6 +333,7 @@ enum criteria_token {
T_TITLE, T_TITLE,
T_URGENT, T_URGENT,
T_WORKSPACE, T_WORKSPACE,
T_FULLSCREEN,
T_INVALID, T_INVALID,
}; };
@ -359,6 +369,8 @@ static enum criteria_token token_from_name(char *name) {
return T_TILING; return T_TILING;
} else if (strcmp(name, "floating") == 0) { } else if (strcmp(name, "floating") == 0) {
return T_FLOATING; return T_FLOATING;
} else if (strcmp(name, "fullscreen") == 0) {
return T_FULLSCREEN;
} }
return T_INVALID; return T_INVALID;
} }
@ -439,6 +451,7 @@ static char *get_focused_prop(enum criteria_token token, bool *autofail) {
case T_FLOATING: case T_FLOATING:
case T_TILING: case T_TILING:
case T_URGENT: case T_URGENT:
case T_FULLSCREEN:
case T_INVALID: case T_INVALID:
*autofail = false; *autofail = false;
break; break;
@ -544,6 +557,16 @@ static bool parse_token(struct criteria *criteria, char *name, char *value) {
case T_WORKSPACE: case T_WORKSPACE:
generate_regex(&criteria->workspace, effective_value); generate_regex(&criteria->workspace, effective_value);
break; break;
case T_FULLSCREEN:
if (strcmp(effective_value, "true") == 0) {
criteria->fullscreen = TRIBOOL_TRUE;
} else if (strcmp(effective_value, "false") == 0) {
criteria->fullscreen = TRIBOOL_FALSE;
} else {
error =
strdup("The value for 'fullscreen' must be 'true' or 'false'");
}
break;
case T_INVALID: case T_INVALID:
break; break;
} }

3
sway/sway.5.scd
View file

@ -870,6 +870,9 @@ The following attributes may be matched with:
expression. If the value is \_\_focused\_\_, then all the views on the expression. If the value is \_\_focused\_\_, then all the views on the
currently focused workspace matches. currently focused workspace matches.
*fullscreen*
Compares the fullscreen mode of the window. Can be "true" or "false".
# SEE ALSO # SEE ALSO
*sway*(1) *sway-input*(5) *sway-output*(5) *sway-bar*(5) *sway-ipc*(7) *sway*(1) *sway-input*(5) *sway-output*(5) *sway-bar*(5) *sway-ipc*(7)