diff options
| -rw-r--r-- | include/sway/server.h | 1 | ||||
| -rw-r--r-- | include/sway/xwayland.h | 2 | ||||
| -rw-r--r-- | sway/commands/swap.c | 1 | ||||
| -rw-r--r-- | sway/criteria.c | 21 | ||||
| -rw-r--r-- | sway/input/cursor.c | 1 | ||||
| -rw-r--r-- | sway/input/seat.c | 1 | ||||
| -rw-r--r-- | sway/tree/layout.c | 1 | ||||
| -rw-r--r-- | sway/tree/view.c | 1 |
8 files changed, 17 insertions, 12 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index b6a6bde3..a3782f91 100644 --- a/include/sway/server.h +++ b/include/sway/server.h @@ -12,6 +12,7 @@ #include <wlr/render/wlr_renderer.h> // TODO WLR: make Xwayland optional #include "list.h" +#include "config.h" #ifdef HAVE_XWAYLAND #include "sway/xwayland.h" #endif diff --git a/include/sway/xwayland.h b/include/sway/xwayland.h index e6572ae9..78d1053b 100644 --- a/include/sway/xwayland.h +++ b/include/sway/xwayland.h @@ -1,4 +1,3 @@ -#ifdef HAVE_XWAYLAND #ifndef SWAY_XWAYLAND_H #define SWAY_XWAYLAND_H @@ -24,4 +23,3 @@ struct sway_xwayland { void handle_xwayland_ready(struct wl_listener *listener, void *data); #endif -#endif diff --git a/sway/commands/swap.c b/sway/commands/swap.c index 325adc38..8b8e9d79 100644 --- a/sway/commands/swap.c +++ b/sway/commands/swap.c @@ -1,5 +1,6 @@ #include <strings.h> #include <wlr/util/log.h> +#include "sway/config.h" #include "sway/commands.h" #include "sway/tree/arrange.h" #include "sway/tree/layout.h" diff --git a/sway/criteria.c b/sway/criteria.c index b2c6edf9..48899125 100644 --- a/sway/criteria.c +++ b/sway/criteria.c @@ -10,6 +10,7 @@ #include "stringop.h" #include "list.h" #include "log.h" +#include "config.h" bool criteria_is_empty(struct criteria *criteria) { return !criteria->title @@ -19,9 +20,9 @@ bool criteria_is_empty(struct criteria *criteria) { && !criteria->instance && !criteria->con_mark && !criteria->con_id - #ifdef HAVE_XWAYLAND +#ifdef HAVE_XWAYLAND && !criteria->id - #endif +#endif && !criteria->window_role && !criteria->window_type && !criteria->floating @@ -129,14 +130,14 @@ static bool criteria_matches_view(struct criteria *criteria, } } - #ifdef HAVE_XWAYLAND +#ifdef HAVE_XWAYLAND if (criteria->id) { // X11 window ID uint32_t x11_window_id = view_get_x11_window_id(view); if (!x11_window_id || x11_window_id != criteria->id) { return false; } } - #endif +#endif if (criteria->window_role) { // TODO @@ -293,10 +294,10 @@ static enum criteria_token token_from_name(char *name) { return T_CON_ID; } else if (strcmp(name, "con_mark") == 0) { return T_CON_MARK; - #ifdef HAVE_XWAYLAND +#ifdef HAVE_XWAYLAND } else if (strcmp(name, "id") == 0) { return T_ID; - #endif +#endif } else if (strcmp(name, "instance") == 0) { return T_INSTANCE; } else if (strcmp(name, "shell") == 0) { @@ -363,9 +364,9 @@ static char *get_focused_prop(enum criteria_token token) { case T_CON_ID: // These do not support __focused__ case T_CON_MARK: case T_FLOATING: - #ifdef HAVE_XWAYLAND +#ifdef HAVE_XWAYLAND case T_ID: - #endif +#endif case T_TILING: case T_URGENT: case T_WINDOW_TYPE: @@ -436,14 +437,14 @@ static bool parse_token(struct criteria *criteria, char *name, char *value) { case T_WINDOW_TYPE: // TODO: This is a string but will be stored as an enum or integer break; - #ifdef HAVE_XWAYLAND +#ifdef HAVE_XWAYLAND case T_ID: criteria->id = strtoul(effective_value, &endptr, 10); if (*endptr != 0) { error = strdup("The value for 'id' should be numeric"); } break; - #endif +#endif case T_FLOATING: criteria->floating = true; break; diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 33eebf97..3de36e1c 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -11,6 +11,7 @@ #include <wlr/types/wlr_idle.h> #include "list.h" #include "log.h" +#include "sway/config.h" #include "sway/desktop.h" #include "sway/desktop/transaction.h" #include "sway/input/cursor.h" diff --git a/sway/input/seat.c b/sway/input/seat.c index 6b4e5f2e..2d62b101 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -12,6 +12,7 @@ #include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_xcursor_manager.h> #include "log.h" +#include "sway/config.h" #include "sway/debug.h" #include "sway/desktop.h" #include "sway/input/cursor.h" diff --git a/sway/tree/layout.c b/sway/tree/layout.c index 3d361ea5..91f6accd 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c @@ -6,6 +6,7 @@ #include <string.h> #include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output_layout.h> +#include "sway/config.h" #include "sway/debug.h" #include "sway/tree/arrange.h" #include "sway/tree/container.h" diff --git a/sway/tree/view.c b/sway/tree/view.c index 2eff80a8..7cc15ae3 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -3,6 +3,7 @@ #include <wayland-server.h> #include <wlr/render/wlr_renderer.h> #include <wlr/types/wlr_output_layout.h> +#include "sway/config.h" #ifdef HAVE_XWAYLAND #include <wlr/xwayland.h> #endif |