Merge branch 'master' into cmd-swap

This commit is contained in:
Ryan Dwyer 2018-05-28 00:14:22 +10:00 committed by GitHub
commit 8fda41dab5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 185 additions and 76 deletions

View file

@ -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;

View file

@ -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);