diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-09-03 11:04:03 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-03 11:04:03 -0400 |
commit | 0b61bae8fb2923d044e743d5816a72f05adc94e3 (patch) | |
tree | 2fe371a78aac1e517b59da2ac99abe93f0ac1c26 /include | |
parent | Merge pull request #2542 from sghctoma/fix-freebsd-build (diff) | |
parent | move criteria "instance", "class" and "window_role" inside HAVE_XWAYLAND ifdefs" (diff) | |
download | sway-0b61bae8fb2923d044e743d5816a72f05adc94e3.tar.gz sway-0b61bae8fb2923d044e743d5816a72f05adc94e3.tar.zst sway-0b61bae8fb2923d044e743d5816a72f05adc94e3.zip |
Merge pull request #2564 from ppascher/master
Fix window_type with disabled xwayland support
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/criteria.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sway/criteria.h b/include/sway/criteria.h index af12ffd7..323ba01d 100644 --- a/include/sway/criteria.h +++ b/include/sway/criteria.h | |||
@@ -23,15 +23,15 @@ struct criteria { | |||
23 | pcre *title; | 23 | pcre *title; |
24 | pcre *shell; | 24 | pcre *shell; |
25 | pcre *app_id; | 25 | pcre *app_id; |
26 | pcre *class; | ||
27 | pcre *instance; | ||
28 | pcre *con_mark; | 26 | pcre *con_mark; |
29 | uint32_t con_id; // internal ID | 27 | uint32_t con_id; // internal ID |
30 | #ifdef HAVE_XWAYLAND | 28 | #ifdef HAVE_XWAYLAND |
29 | pcre *class; | ||
31 | uint32_t id; // X11 window ID | 30 | uint32_t id; // X11 window ID |
32 | #endif | 31 | pcre *instance; |
33 | pcre *window_role; | 32 | pcre *window_role; |
34 | enum atom_name window_type; | 33 | enum atom_name window_type; |
34 | #endif | ||
35 | bool floating; | 35 | bool floating; |
36 | bool tiling; | 36 | bool tiling; |
37 | char urgent; // 'l' for latest or 'o' for oldest | 37 | char urgent; // 'l' for latest or 'o' for oldest |