pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

bar/wayland: free XDG outputs, and manager, in cleanup()

Browse source
This commit is contained in:
Daniel Eklöf 2019-02-03 15:16:19 +01:00
parent c6fd99f005
commit 85a1940e47
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bar/wayland.c
View file

@ -355,6 +355,12 @@ handle_global(void *data, struct wl_registry *registry,
struct monitor *mon = &tll_back(backend->monitors); struct monitor *mon = &tll_back(backend->monitors);
wl_output_add_listener(output, &output_listener, mon); wl_output_add_listener(output, &output_listener, mon);
/*
* The "output" interface doesn't give us the monitors'
* identifiers (e.g. "LVDS-1"). Use the XDG output interface
* for that.
*/
assert(backend->xdg_output_manager != NULL); assert(backend->xdg_output_manager != NULL);
mon->xdg = zxdg_output_manager_v1_get_xdg_output( mon->xdg = zxdg_output_manager_v1_get_xdg_output(
backend->xdg_output_manager, mon->output); backend->xdg_output_manager, mon->output);
@ -383,7 +389,6 @@ handle_global(void *data, struct wl_registry *registry,
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)
{ {
//struct wayland_backend *backend = data;
} }
static const struct wl_registry_listener registry_listener = { static const struct wl_registry_listener registry_listener = {
@ -579,6 +584,15 @@ cleanup(struct bar *_bar)
tll_remove(backend->buffers, it); tll_remove(backend->buffers, it);
} }
tll_foreach(backend->monitors, it) {
struct monitor *mon = &it->item;
free(mon->name);
zxdg_output_v1_destroy(mon->xdg);
wl_output_destroy(mon->output);
tll_remove(backend->monitors, it);
}
zxdg_output_manager_v1_destroy(backend->xdg_output_manager);
/* TODO: move to bar */ /* TODO: move to bar */
free(bar->cursor_name); free(bar->cursor_name);
@ -591,12 +605,6 @@ cleanup(struct bar *_bar)
wl_seat_destroy(backend->seat); wl_seat_destroy(backend->seat);
wl_compositor_destroy(backend->compositor); wl_compositor_destroy(backend->compositor);
wl_shm_destroy(backend->shm); wl_shm_destroy(backend->shm);
tll_foreach(backend->monitors, it) {
struct monitor *mon = &it->item;
free(mon->name);
wl_output_destroy(mon->output);
tll_remove(backend->monitors, it);
}
wl_registry_destroy(backend->registry); wl_registry_destroy(backend->registry);
wl_display_disconnect(backend->display); wl_display_disconnect(backend->display);