diff options
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/input/cursor.c | 4 | ||||
| -rw-r--r-- | sway/tree/container.c | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 80b4f9dc..3f417e96 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -429,6 +429,8 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor, struct sway_container *cont) { struct sway_seat *seat = cursor->seat; + seat_set_focus(seat, cont); + // Deny moving or resizing a fullscreen container if (container_is_fullscreen_or_child(cont)) { seat_pointer_notify_button(seat, time_msec, button, state); @@ -469,8 +471,6 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor, return; } - // Send event to surface - seat_set_focus(seat, cont); seat_pointer_notify_button(seat, time_msec, button, state); } diff --git a/sway/tree/container.c b/sway/tree/container.c index 4507655e..aecb2ac6 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -533,11 +533,10 @@ struct sway_container *container_parent(struct sway_container *container, return container; } -static struct sway_container *container_at_view(struct sway_container *swayc, - double lx, double ly, +static void surface_at_view(struct sway_container *swayc, double lx, double ly, struct wlr_surface **surface, double *sx, double *sy) { if (!sway_assert(swayc->type == C_VIEW, "Expected a view")) { - return NULL; + return; } struct sway_view *sview = swayc->sway_view; double view_sx = lx - sview->x; @@ -567,9 +566,7 @@ static struct sway_container *container_at_view(struct sway_container *swayc, *sx = _sx; *sy = _sy; *surface = _surface; - return swayc; } - return NULL; } /** @@ -682,7 +679,8 @@ struct sway_container *tiling_container_at( struct sway_container *con, double lx, double ly, struct wlr_surface **surface, double *sx, double *sy) { if (con->type == C_VIEW) { - return container_at_view(con, lx, ly, surface, sx, sy); + surface_at_view(con, lx, ly, surface, sx, sy); + return con; } if (!con->children->length) { return NULL; @@ -745,7 +743,7 @@ struct sway_container *container_at(struct sway_container *workspace, struct sway_container *focus = seat_get_focus_inactive(seat, &root_container); if (focus && focus->type == C_VIEW) { - container_at_view(focus, lx, ly, surface, sx, sy); + surface_at_view(focus, lx, ly, surface, sx, sy); if (*surface && surface_is_popup(*surface)) { return focus; } |