mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

layers: handle top layer unmap/destroy better

Browse source 
On losing top layer focus, set focus on topmost mapped view.
This commit is contained in:
Johan Malm 2020-10-31 15:09:13 +00:00
parent 5d6143449f
commit a26fd5a75b
4 changed files with 47 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/layers.c
View file

@ -220,9 +220,12 @@ arrange_layers(struct output *output)
break;
}
}
struct seat *seat = &output->server->seat;
if (topmost) {
seat_focus_surface(&output->server->seat,
topmost->layer_surface->surface);
seat_set_focus_layer(seat, topmost->layer_surface);
} else if (seat->focused_layer &&
!seat->focused_layer->current.keyboard_interactive) {
seat_set_focus_layer(seat, NULL);
}
}
@ -257,11 +260,23 @@ surface_commit_notify(struct wl_listener *listener, void *data)
arrange_layers(output_from_wlr_output(layer->server, wlr_output));
}
static void
unmap(struct lab_layer_surface *layer)
{
struct seat *seat = &layer->server->seat;
if (seat->focused_layer == layer->layer_surface) {
seat_set_focus_layer(seat, NULL);
}
}
static void
destroy_notify(struct wl_listener *listener, void *data)
{
struct lab_layer_surface *layer = wl_container_of(
listener, layer, destroy);
if (layer->layer_surface->mapped) {
unmap(layer);
}
wl_list_remove(&layer->link);
wl_list_remove(&layer->destroy.link);
wl_list_remove(&layer->map.link);
@ -275,6 +290,13 @@ destroy_notify(struct wl_listener *listener, void *data)
free(layer);
}
static void
unmap_notify(struct wl_listener *listener, void *data)
{
struct lab_layer_surface *l = wl_container_of(listener, l, unmap);
unmap(l);
}
static void
map_notify(struct wl_listener *listener, void *data)
{
@ -322,6 +344,9 @@ new_layer_surface_notify(struct wl_listener *listener, void *data)
surface->map.notify = map_notify;
wl_signal_add(&layer_surface->events.map, &surface->map);
surface->unmap.notify = unmap_notify;
wl_signal_add(&layer_surface->events.unmap, &surface->unmap);
wl_list_insert(&output->layers[layer_surface->client_pending.layer],
&surface->link);
/*