mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-01-02 10:26:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2103 from RyanDwyer/focus-fixes

Browse source 
Focus fixes
This commit is contained in:
emersion 2018-06-05 08:44:53 +01:00 committed by GitHub
commit 6b9ffbad20
Failed to generate hash of commit
4 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sway/desktop/layer_shell.c
View file

@ -257,6 +257,11 @@ static void unmap(struct sway_layer_surface *sway_layer) {
} }
output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y, output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y,
sway_layer->layer_surface->surface, true); sway_layer->layer_surface->surface, true);
struct sway_seat *seat = input_manager_current_seat(input_manager);
if (seat->focused_layer == sway_layer->layer_surface) {
seat_set_focus_layer(seat, NULL);
}
} }
static void handle_destroy(struct wl_listener *listener, void *data) { static void handle_destroy(struct wl_listener *listener, void *data) {

15
sway/desktop/xwayland.c
View file

@ -77,6 +77,21 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
desktop_damage_surface(xsurface->surface, xsurface->x, xsurface->y, true); desktop_damage_surface(xsurface->surface, xsurface->x, xsurface->y, true);
wl_list_remove(&surface->link); wl_list_remove(&surface->link);
wl_list_remove(&surface->commit.link); wl_list_remove(&surface->commit.link);
if (!wlr_xwayland_surface_is_unmanaged(xsurface)) {
struct sway_seat *seat = input_manager_current_seat(input_manager);
if (seat->wlr_seat->keyboard_state.focused_surface ==
xsurface->surface) {
// Restore focus
struct sway_container *previous =
seat_get_focus_inactive(seat, &root_container);
if (previous) {
// Hack to get seat to re-focus the return value of get_focus
seat_set_focus(seat, previous->parent);
seat_set_focus(seat, previous);
}
}
}
} }
static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) { static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) {

2
sway/input/cursor.c
View file

@ -264,7 +264,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
if (new_ws != old_ws) { if (new_ws != old_ws) {
seat_set_focus(cursor->seat, cont); seat_set_focus(cursor->seat, cont);
} }
} else { } else if (cont) {
seat_set_focus(cursor->seat, cont); seat_set_focus(cursor->seat, cont);
} }

3
sway/input/seat.c
View file

@ -658,7 +658,8 @@ void seat_set_focus_layer(struct sway_seat *seat,
struct wlr_layer_surface *layer) { struct wlr_layer_surface *layer) {
if (!layer && seat->focused_layer) { if (!layer && seat->focused_layer) {
seat->focused_layer = NULL; seat->focused_layer = NULL;
struct sway_container *previous = seat_get_focus(seat); struct sway_container *previous =
seat_get_focus_inactive(seat, &root_container);
if (previous) { if (previous) {
wlr_log(L_DEBUG, "Returning focus to %p %s '%s'", previous, wlr_log(L_DEBUG, "Returning focus to %p %s '%s'", previous,
container_type_to_str(previous->type), previous->name); container_type_to_str(previous->type), previous->name);