aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input/cursor.c
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-07-25 08:27:40 -0400
committerLibravatar GitHub <noreply@github.com>2018-07-25 08:27:40 -0400
commitfc718f629af231f8a0ae795b2f7529e213cab183 (patch)
tree7917aadbfb09d02d3d60045f0ba8d5028f0c4bb4 /sway/input/cursor.c
parentMerge pull request #2354 from RyanDwyer/fix-crash-on-tab-reap (diff)
parentmore style fixes, reorder config.h include (diff)
downloadsway-fc718f629af231f8a0ae795b2f7529e213cab183.tar.gz
sway-fc718f629af231f8a0ae795b2f7529e213cab183.tar.zst
sway-fc718f629af231f8a0ae795b2f7529e213cab183.zip
Merge pull request #2350 from ppascher/xwayland-optional
Added meson option to allow building sway without xwayland support
Diffstat (limited to 'sway/input/cursor.c')
-rw-r--r--sway/input/cursor.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index d94a707c..02bd2239 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -11,6 +11,7 @@
11#include <wlr/types/wlr_idle.h> 11#include <wlr/types/wlr_idle.h>
12#include "list.h" 12#include "list.h"
13#include "log.h" 13#include "log.h"
14#include "config.h"
14#include "sway/desktop.h" 15#include "sway/desktop.h"
15#include "sway/desktop/transaction.h" 16#include "sway/desktop/transaction.h"
16#include "sway/input/cursor.h" 17#include "sway/input/cursor.h"
@@ -54,6 +55,7 @@ static struct sway_container *container_at_coords(
54 struct sway_seat *seat, double lx, double ly, 55 struct sway_seat *seat, double lx, double ly,
55 struct wlr_surface **surface, double *sx, double *sy) { 56 struct wlr_surface **surface, double *sx, double *sy) {
56 // check for unmanaged views first 57 // check for unmanaged views first
58#ifdef HAVE_XWAYLAND
57 struct wl_list *unmanaged = &root_container.sway_root->xwayland_unmanaged; 59 struct wl_list *unmanaged = &root_container.sway_root->xwayland_unmanaged;
58 struct sway_xwayland_unmanaged *unmanaged_surface; 60 struct sway_xwayland_unmanaged *unmanaged_surface;
59 wl_list_for_each_reverse(unmanaged_surface, unmanaged, link) { 61 wl_list_for_each_reverse(unmanaged_surface, unmanaged, link) {
@@ -69,7 +71,7 @@ static struct sway_container *container_at_coords(
69 return NULL; 71 return NULL;
70 } 72 }
71 } 73 }
72 74#endif
73 // find the output the cursor is on 75 // find the output the cursor is on
74 struct wlr_output_layout *output_layout = 76 struct wlr_output_layout *output_layout =
75 root_container.sway_root->output_layout; 77 root_container.sway_root->output_layout;