mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-28 16:06:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2436 from RyanDwyer/fix-floating-deco-focus

Browse source 
Fix focus when clicking floating decorations
This commit is contained in:
emersion 2018-08-08 13:49:00 +01:00 committed by GitHub
commit 89e176d3fb
Failed to generate hash of commit
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/input/cursor.c
View file

@ -429,6 +429,8 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
struct sway_container *cont) { struct sway_container *cont) {
struct sway_seat *seat = cursor->seat; struct sway_seat *seat = cursor->seat;
seat_set_focus(seat, cont);
// Deny moving or resizing a fullscreen container // Deny moving or resizing a fullscreen container
if (container_is_fullscreen_or_child(cont)) { if (container_is_fullscreen_or_child(cont)) {
seat_pointer_notify_button(seat, time_msec, button, state); seat_pointer_notify_button(seat, time_msec, button, state);
@ -469,8 +471,6 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
return; return;
} }
// Send event to surface
seat_set_focus(seat, cont);
seat_pointer_notify_button(seat, time_msec, button, state); seat_pointer_notify_button(seat, time_msec, button, state);
} }

12
sway/tree/container.c
View file

@ -533,11 +533,10 @@ struct sway_container *container_parent(struct sway_container *container,
return container; return container;
} }
static struct sway_container *container_at_view(struct sway_container *swayc, static void surface_at_view(struct sway_container *swayc, double lx, double ly,
double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy) { struct wlr_surface **surface, double *sx, double *sy) {
if (!sway_assert(swayc->type == C_VIEW, "Expected a view")) { if (!sway_assert(swayc->type == C_VIEW, "Expected a view")) {
return NULL; return;
} }
struct sway_view *sview = swayc->sway_view; struct sway_view *sview = swayc->sway_view;
double view_sx = lx - sview->x; double view_sx = lx - sview->x;
@ -567,9 +566,7 @@ static struct sway_container *container_at_view(struct sway_container *swayc,
*sx = _sx; *sx = _sx;
*sy = _sy; *sy = _sy;
*surface = _surface; *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 sway_container *con, double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy) { struct wlr_surface **surface, double *sx, double *sy) {
if (con->type == C_VIEW) { 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) { if (!con->children->length) {
return NULL; return NULL;
@ -745,7 +743,7 @@ struct sway_container *container_at(struct sway_container *workspace,
struct sway_container *focus = struct sway_container *focus =
seat_get_focus_inactive(seat, &root_container); seat_get_focus_inactive(seat, &root_container);
if (focus && focus->type == C_VIEW) { 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)) { if (*surface && surface_is_popup(*surface)) {
return focus; return focus;
} }