diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-05-27 08:58:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-27 08:58:10 -0400 |
| commit | a372852c4421d21fa4cdd70014b0174319f3c2db (patch) | |
| tree | 3ea7ea85566b02169d4643f6a8d634ef0ec504f7 /include | |
| parent | b350e8ec820bcea6096f733d1d0be4de15bbab09 (diff) | |
| parent | e4c54b04ce90d2d051ba7343ec5b9dce1bbb6755 (diff) | |
| download | sway-a372852c4421d21fa4cdd70014b0174319f3c2db.tar.xz | |
Merge branch 'master' into xdg-shell-tiled
Diffstat (limited to 'include')
| -rw-r--r-- | include/sway/criteria.h | 1 | ||||
| -rw-r--r-- | include/sway/tree/view.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/sway/criteria.h b/include/sway/criteria.h index 74da132c..bd3ca0ac 100644 --- a/include/sway/criteria.h +++ b/include/sway/criteria.h @@ -18,6 +18,7 @@ struct criteria { char *target; // workspace or output name for `assign` criteria pcre *title; + pcre *shell; pcre *app_id; pcre *class; pcre *instance; diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 0fb8f1b3..a8bf4955 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h @@ -201,7 +201,7 @@ const char *view_get_window_role(struct sway_view *view); uint32_t view_get_window_type(struct sway_view *view); -const char *view_get_type(struct sway_view *view); +const char *view_get_shell(struct sway_view *view); void view_configure(struct sway_view *view, double ox, double oy, int width, int height); |