fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-06 11:28:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

window: add display_destroy()

Browse source 
Add a function to destroy the 'struct display', supposedly with all
contained resources, that are not explicitly created by the application.

The implementation at this time is incomplete. It does clean up the
following:
- xkb structure is freed (needs new libxkbcommon from git)
- EGL resources are freed
- wl_display is flushed and destroyed

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
This commit is contained in:
Pekka Paalanen 2011-12-15 15:20:04 +02:00
parent 826d795448
commit fe6079ac09
2 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
clients/window.c
View file

@ -2379,6 +2379,12 @@ init_xkb(struct display *d)
}
}
static void
fini_xkb(struct display *display)
{
xkb_free_keymap(display->xkb);
}
static int
init_egl(struct display *d)
{
@ -2465,6 +2471,21 @@ init_egl(struct display *d)
return 0;
}
static void
fini_egl(struct display *display)
{
#ifdef HAVE_CAIRO_EGL
cairo_device_destroy(display->argb_device);
cairo_device_destroy(display->rgb_device);
#endif
eglMakeCurrent(display->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE,
EGL_NO_CONTEXT);
eglTerminate(display->dpy);
eglReleaseThread();
}
static int
event_mask_update(uint32_t mask, void *data)
{
@ -2558,6 +2579,17 @@ display_create(int *argc, char **argv[], const GOptionEntry *option_entries)
return d;
}
void
display_destroy(struct display *display)
{
fini_xkb(display);
fini_egl(display);
wl_display_flush(display->display);
wl_display_destroy(display->display);
free(display);
}
void
display_set_user_data(struct display *display, void *data)
{

3
clients/window.h
View file

@ -49,6 +49,9 @@ struct rectangle {
struct display *
display_create(int *argc, char **argv[], const GOptionEntry *option_entries);
void
display_destroy(struct display *display);
void
display_set_user_data(struct display *display, void *data);