From 587e320cd85b3c635b653b6e16b21ce5fb7bade0 Mon Sep 17 00:00:00 2001 From: Pascal Pascher Date: Mon, 3 Sep 2018 11:13:50 +0200 Subject: Fixed window_type with disabled xwayland support. --- include/sway/criteria.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/sway/criteria.h b/include/sway/criteria.h index af12ffd7..89fe369c 100644 --- a/include/sway/criteria.h +++ b/include/sway/criteria.h @@ -29,9 +29,9 @@ struct criteria { uint32_t con_id; // internal ID #ifdef HAVE_XWAYLAND uint32_t id; // X11 window ID + enum atom_name window_type; #endif pcre *window_role; - enum atom_name window_type; bool floating; bool tiling; char urgent; // 'l' for latest or 'o' for oldest -- cgit v1.2.3 From 93673095f093a286a506415764f736d2dd62ebe9 Mon Sep 17 00:00:00 2001 From: Pascal Pascher Date: Mon, 3 Sep 2018 14:25:48 +0200 Subject: move criteria "instance", "class" and "window_role" inside HAVE_XWAYLAND ifdefs" --- include/sway/criteria.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/sway/criteria.h b/include/sway/criteria.h index 89fe369c..323ba01d 100644 --- a/include/sway/criteria.h +++ b/include/sway/criteria.h @@ -23,15 +23,15 @@ struct criteria { pcre *title; pcre *shell; pcre *app_id; - pcre *class; - pcre *instance; pcre *con_mark; uint32_t con_id; // internal ID #ifdef HAVE_XWAYLAND + pcre *class; uint32_t id; // X11 window ID + pcre *instance; + pcre *window_role; enum atom_name window_type; #endif - pcre *window_role; bool floating; bool tiling; char urgent; // 'l' for latest or 'o' for oldest -- cgit v1.2.3