mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-25 01:40:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

wayland: monitor unplug: call surface_leave() to handle terminal unmapping

Browse source
This commit is contained in:
Daniel Eklöf 2020-04-28 19:05:10 +02:00
parent 9cfe720000
commit 2fd5a9ee8d
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
wayland.c
View file

@ -676,33 +676,26 @@ monitor_destroy(struct monitor *mon)
static void static void
handle_global_remove(void *data, struct wl_registry *registry, uint32_t name) handle_global_remove(void *data, struct wl_registry *registry, uint32_t name)
{ {
LOG_DBG("global removed: %u", name); LOG_DBG("global removed: 0x%08x", name);
struct wayland *wayl = data; struct wayland *wayl = data;
/* For now, we only support removal of outputs */ /* For now, we only support removal of outputs */
tll_foreach(wayl->monitors, it) { tll_foreach(wayl->monitors, it) {
if (it->item.wl_name != name) struct monitor *mon = &it->item;
if (mon->wl_name != name)
continue; continue;
LOG_INFO("monitor unplugged: %s", it->item.name); LOG_INFO("monitor unplugged: %s", mon->name);
/* /*
* Update all terminals that are mapped here. On Sway 1.4, * Update all terminals that are mapped here. On Sway 1.4,
* surfaces are *not* unmapped before the output is removed * surfaces are *not* unmapped before the output is removed
*/ */
tll_foreach(wayl->terms, t) { tll_foreach(wayl->terms, t)
tll_foreach(t->item->window->on_outputs, o) { surface_leave(t->item->window, NULL /* wl_surface - unused */, mon->output);
if (o->item != &it->item)
continue;
/* Remove terminal from this output */
tll_remove(t->item->window->on_outputs, o);
update_term_for_output_change(t->item);
break;
}
}
monitor_destroy(&it->item); monitor_destroy(&it->item);
tll_remove(wayl->monitors, it); tll_remove(wayl->monitors, it);