aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar siikamiika <siikamiika@users.noreply.github.com>2021-10-09 16:40:24 +0300
committerLibravatar Simon Ser <contact@emersion.fr>2021-10-10 09:35:15 +0200
commitf4db502d4470f2ed87b63ee4b73d1b98506a715c (patch)
treeb661320192bfbced60f9204b18d9d342e5ec401c
parentImprove built-in touchscreen detection (diff)
downloadsway-f4db502d4470f2ed87b63ee4b73d1b98506a715c.tar.gz
sway-f4db502d4470f2ed87b63ee4b73d1b98506a715c.tar.zst
sway-f4db502d4470f2ed87b63ee4b73d1b98506a715c.zip
use node_is_view
-rw-r--r--sway/input/cursor.c2
-rw-r--r--sway/input/seat.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 2fe5b202..1e3e16d6 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -1346,7 +1346,7 @@ void handle_pointer_constraint(struct wl_listener *listener, void *data) {
1346 wl_signal_add(&constraint->events.destroy, &sway_constraint->destroy); 1346 wl_signal_add(&constraint->events.destroy, &sway_constraint->destroy);
1347 1347
1348 struct sway_node *focus = seat_get_focus(seat); 1348 struct sway_node *focus = seat_get_focus(seat);
1349 if (focus && focus->type == N_CONTAINER && focus->sway_container->view) { 1349 if (focus && node_is_view(focus)) {
1350 struct wlr_surface *surface = focus->sway_container->view->surface; 1350 struct wlr_surface *surface = focus->sway_container->view->surface;
1351 if (surface == constraint->surface) { 1351 if (surface == constraint->surface) {
1352 sway_cursor_constrain(seat->cursor, constraint); 1352 sway_cursor_constrain(seat->cursor, constraint);
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 2d714acd..c5c8459e 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -210,14 +210,13 @@ void seat_for_each_node(struct sway_seat *seat,
210 210
211struct sway_container *seat_get_focus_inactive_view(struct sway_seat *seat, 211struct sway_container *seat_get_focus_inactive_view(struct sway_seat *seat,
212 struct sway_node *ancestor) { 212 struct sway_node *ancestor) {
213 if (ancestor->type == N_CONTAINER && ancestor->sway_container->view) { 213 if (node_is_view(ancestor)) {
214 return ancestor->sway_container; 214 return ancestor->sway_container;
215 } 215 }
216 struct sway_seat_node *current; 216 struct sway_seat_node *current;
217 wl_list_for_each(current, &seat->focus_stack, link) { 217 wl_list_for_each(current, &seat->focus_stack, link) {
218 struct sway_node *node = current->node; 218 struct sway_node *node = current->node;
219 if (node->type == N_CONTAINER && node->sway_container->view && 219 if (node_is_view(node) && node_has_ancestor(node, ancestor)) {
220 node_has_ancestor(node, ancestor)) {
221 return node->sway_container; 220 return node->sway_container;
222 } 221 }
223 } 222 }