mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 01:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use keyboard_state.focused_surface directly

Browse source
This commit is contained in:
Ferdinand Schober 2022-10-08 19:11:45 +02:00 committed by Simon Ser
parent be7707874a
commit 99acdb4e62
3 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sway/input/seat.h
View file

@ -192,8 +192,6 @@ void seat_set_exclusive_client(struct sway_seat *seat,
struct sway_node *seat_get_focus(struct sway_seat *seat); struct sway_node *seat_get_focus(struct sway_seat *seat);
struct wlr_surface *seat_get_focused_surface(struct sway_seat *seat);
struct sway_workspace *seat_get_focused_workspace(struct sway_seat *seat); struct sway_workspace *seat_get_focused_workspace(struct sway_seat *seat);
// If a scratchpad container is fullscreen global, this can be used to try to // If a scratchpad container is fullscreen global, this can be used to try to

2
sway/input/cursor.c
View file

@ -1372,7 +1372,7 @@ void handle_pointer_constraint(struct wl_listener *listener, void *data) {
sway_constraint->destroy.notify = handle_constraint_destroy; sway_constraint->destroy.notify = handle_constraint_destroy;
wl_signal_add(&constraint->events.destroy, &sway_constraint->destroy); wl_signal_add(&constraint->events.destroy, &sway_constraint->destroy);
struct wlr_surface *surface = seat_get_focused_surface(seat); struct wlr_surface *surface = seat->wlr_seat->keyboard_state.focused_surface;
if (surface && surface == constraint->surface) { if (surface && surface == constraint->surface) {
sway_cursor_constrain(seat->cursor, constraint); sway_cursor_constrain(seat->cursor, constraint);
} }

11
sway/input/seat.c
View file

@ -1462,17 +1462,6 @@ struct sway_node *seat_get_focus(struct sway_seat *seat) {
return current->node; return current->node;
} }
struct wlr_surface *seat_get_focused_surface(struct sway_seat *seat) {
struct sway_node *focus = seat_get_focus(seat);
if (focus && node_is_view(focus)) {
return focus->sway_container->view->surface;
}
struct wlr_layer_surface_v1 *layer = seat->focused_layer;
if (layer && layer->surface)
return layer->surface;
return NULL;
}
struct sway_workspace *seat_get_focused_workspace(struct sway_seat *seat) { struct sway_workspace *seat_get_focused_workspace(struct sway_seat *seat) {
struct sway_node *focus = seat_get_focus_inactive(seat, &root->node); struct sway_node *focus = seat_get_focus_inactive(seat, &root->node);
if (!focus) { if (!focus) {