aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input
diff options
context:
space:
mode:
authorLibravatar Pascal Pascher <aur@clouddrop.de>2018-07-24 23:37:41 +0200
committerLibravatar Pascal Pascher <aur@clouddrop.de>2018-07-24 23:37:41 +0200
commit2bf893248a94c7f70a9557aad4a8228731041eeb (patch)
treeec86137e1b5881151b20917f311ecce3d24fba8f /sway/input
parentAdded meson option "enable_xwayland" (default: true) to enable/disable xwayla... (diff)
downloadsway-2bf893248a94c7f70a9557aad4a8228731041eeb.tar.gz
sway-2bf893248a94c7f70a9557aad4a8228731041eeb.tar.zst
sway-2bf893248a94c7f70a9557aad4a8228731041eeb.zip
style fixes, exclude sway/desctop/xwayland.c when enable_xwayland: false
Diffstat (limited to 'sway/input')
-rw-r--r--sway/input/cursor.c4
-rw-r--r--sway/input/seat.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index c873a20e..33eebf97 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -54,7 +54,7 @@ static struct sway_container *container_at_coords(
54 struct sway_seat *seat, double lx, double ly, 54 struct sway_seat *seat, double lx, double ly,
55 struct wlr_surface **surface, double *sx, double *sy) { 55 struct wlr_surface **surface, double *sx, double *sy) {
56 // check for unmanaged views first 56 // check for unmanaged views first
57 #ifdef HAVE_XWAYLAND 57#ifdef HAVE_XWAYLAND
58 struct wl_list *unmanaged = &root_container.sway_root->xwayland_unmanaged; 58 struct wl_list *unmanaged = &root_container.sway_root->xwayland_unmanaged;
59 struct sway_xwayland_unmanaged *unmanaged_surface; 59 struct sway_xwayland_unmanaged *unmanaged_surface;
60 wl_list_for_each_reverse(unmanaged_surface, unmanaged, link) { 60 wl_list_for_each_reverse(unmanaged_surface, unmanaged, link) {
@@ -70,7 +70,7 @@ static struct sway_container *container_at_coords(
70 return NULL; 70 return NULL;
71 } 71 }
72 } 72 }
73 #endif 73#endif
74 // find the output the cursor is on 74 // find the output the cursor is on
75 struct wlr_output_layout *output_layout = 75 struct wlr_output_layout *output_layout =
76 root_container.sway_root->output_layout; 76 root_container.sway_root->output_layout;
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 66d11eea..6b4e5f2e 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -103,13 +103,13 @@ static void seat_send_focus(struct sway_container *con,
103 103
104 if (con->type == C_VIEW 104 if (con->type == C_VIEW
105 && seat_is_input_allowed(seat, con->sway_view->surface)) { 105 && seat_is_input_allowed(seat, con->sway_view->surface)) {
106 #ifdef HAVE_XWAYLAND 106#ifdef HAVE_XWAYLAND
107 if (con->sway_view->type == SWAY_VIEW_XWAYLAND) { 107 if (con->sway_view->type == SWAY_VIEW_XWAYLAND) {
108 struct wlr_xwayland *xwayland = 108 struct wlr_xwayland *xwayland =
109 seat->input->server->xwayland.wlr_xwayland; 109 seat->input->server->xwayland.wlr_xwayland;
110 wlr_xwayland_set_seat(xwayland, seat->wlr_seat); 110 wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
111 } 111 }
112 #endif 112#endif
113 struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat->wlr_seat); 113 struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat->wlr_seat);
114 if (keyboard) { 114 if (keyboard) {
115 wlr_seat_keyboard_notify_enter(seat->wlr_seat, 115 wlr_seat_keyboard_notify_enter(seat->wlr_seat,