mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window: destroy outputs on display_destroy()

Browse Source 
This will also start calling the output destroy handlers, if an
application has set any.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
This commit is contained in:
Pekka Paalanen
2011-12-16 11:35:34 +02:00
parent 5ec6585753
commit 2c1426a72f
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/window.c
+23
View File
@@ -2232,6 +2232,17 @@ display_add_output(struct display *d, uint32_t id)
wl_output_add_listener(output->output, &output_listener, output); wl_output_add_listener(output->output, &output_listener, output);
} }
static void
output_destroy(struct output *output)
{
if (output->destroy_handler)
(*output->destroy_handler)(output, output->user_data);
wl_output_destroy(output->output);
wl_list_remove(&output->link);
free(output);
}
void void
display_set_output_configure_handler(struct display *display, display_set_output_configure_handler(struct display *display,
display_output_handler_t handler) display_output_handler_t handler)
@@ -2583,9 +2594,21 @@ display_create(int *argc, char **argv[], const GOptionEntry *option_entries)
return d; return d;
} }
static void
display_destroy_outputs(struct display *display)
{
struct output *tmp;
struct output *output;
wl_list_for_each_safe(output, tmp, &display->output_list, link)
output_destroy(output);
}
void void
display_destroy(struct display *display) display_destroy(struct display *display)
{ {
display_destroy_outputs(display);
fini_xkb(display); fini_xkb(display);
fini_egl(display); fini_egl(display);