diff options
author | Pascal Pascher <aur@clouddrop.de> | 2018-07-24 22:16:06 +0200 |
---|---|---|
committer | Pascal Pascher <aur@clouddrop.de> | 2018-07-24 22:16:06 +0200 |
commit | 24ad1c3983192b47345566fd876e26b45160d68e (patch) | |
tree | b617f8d15cb20897b1c016fb67fab80d7245c66a /sway/commands/swap.c | |
parent | Merge pull request #2165 from swaywm/pid-workspaces (diff) | |
download | sway-24ad1c3983192b47345566fd876e26b45160d68e.tar.gz sway-24ad1c3983192b47345566fd876e26b45160d68e.tar.zst sway-24ad1c3983192b47345566fd876e26b45160d68e.zip |
Added meson option "enable_xwayland" (default: true) to enable/disable xwayland support
Diffstat (limited to 'sway/commands/swap.c')
-rw-r--r-- | sway/commands/swap.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sway/commands/swap.c b/sway/commands/swap.c index 2fc88308..3563cdd9 100644 --- a/sway/commands/swap.c +++ b/sway/commands/swap.c | |||
@@ -14,10 +14,14 @@ static bool test_con_id(struct sway_container *container, void *con_id) { | |||
14 | } | 14 | } |
15 | 15 | ||
16 | static bool test_id(struct sway_container *container, void *id) { | 16 | static bool test_id(struct sway_container *container, void *id) { |
17 | #ifdef HAVE_XWAYLAND | ||
17 | xcb_window_t *wid = id; | 18 | xcb_window_t *wid = id; |
18 | return (container->type == C_VIEW | 19 | return (container->type == C_VIEW |
19 | && container->sway_view->type == SWAY_VIEW_XWAYLAND | 20 | && container->sway_view->type == SWAY_VIEW_XWAYLAND |
20 | && container->sway_view->wlr_xwayland_surface->window_id == *wid); | 21 | && container->sway_view->wlr_xwayland_surface->window_id == *wid); |
22 | #else | ||
23 | return false; | ||
24 | #endif | ||
21 | } | 25 | } |
22 | 26 | ||
23 | static bool test_mark(struct sway_container *container, void *mark) { | 27 | static bool test_mark(struct sway_container *container, void *mark) { |
@@ -43,8 +47,10 @@ struct cmd_results *cmd_swap(int argc, char **argv) { | |||
43 | 47 | ||
44 | char *value = join_args(argv + 3, argc - 3); | 48 | char *value = join_args(argv + 3, argc - 3); |
45 | if (strcasecmp(argv[2], "id") == 0) { | 49 | if (strcasecmp(argv[2], "id") == 0) { |
50 | #ifdef HAVE_XWAYLAND | ||
46 | xcb_window_t id = strtol(value, NULL, 0); | 51 | xcb_window_t id = strtol(value, NULL, 0); |
47 | other = container_find(&root_container, test_id, (void *)&id); | 52 | other = container_find(&root_container, test_id, (void *)&id); |
53 | #endif | ||
48 | } else if (strcasecmp(argv[2], "con_id") == 0) { | 54 | } else if (strcasecmp(argv[2], "con_id") == 0) { |
49 | size_t con_id = atoi(value); | 55 | size_t con_id = atoi(value); |
50 | other = container_find(&root_container, test_con_id, (void *)con_id); | 56 | other = container_find(&root_container, test_con_id, (void *)con_id); |