fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-04-21 11:10:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

xlib: Fix display closing to work properly

Browse source 
Previously we free()'d the cairo_device's memory which was not good at
all. Now the code causes cairo_device_finish() instead.
This commit is contained in:
Benjamin Otte 2010-04-23 22:22:28 +02:00
parent 637564c562
commit 1687c7b7d3
1 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/cairo-xlib-display.c
View file

@ -107,6 +107,14 @@ _cairo_xlib_display_discard_screens (cairo_xlib_display_t *display)
}
}
static void
_cairo_xlib_display_finish (void *abstract_display)
{
cairo_xlib_display_t *display = abstract_display;
display->display = NULL;
}
static void
_cairo_xlib_display_destroy (void *abstract_display)
{
@ -201,23 +209,24 @@ _cairo_xlib_close_display (Display *dpy, XExtCodes *codes)
if (display == NULL)
return 0;
/* protect the notifies from triggering XErrors */
XSync (dpy, False);
old_handler = XSetErrorHandler (_noop_error_handler);
if (! cairo_device_acquire (&display->base)) {
/* protect the notifies from triggering XErrors */
XSync (dpy, False);
old_handler = XSetErrorHandler (_noop_error_handler);
if (cairo_device_acquire (&display->base)) {
_cairo_xlib_display_notify (display);
_cairo_xlib_call_close_display_hooks (display);
_cairo_xlib_display_discard_screens (display);
_cairo_xlib_display_notify (display);
_cairo_xlib_call_close_display_hooks (display);
_cairo_xlib_display_discard_screens (display);
/* catch any that arrived before marking the display as closed */
_cairo_xlib_display_notify (display);
cairo_device_release (&display->base);
/* catch any that arrived before marking the display as closed */
_cairo_xlib_display_notify (display);
XSync (dpy, False);
XSetErrorHandler (old_handler);
cairo_device_release (&display->base);
}
XSync (dpy, False);
XSetErrorHandler (old_handler);
/*
* Unhook from the global list
*/
@ -250,7 +259,7 @@ static const cairo_device_backend_t _cairo_xlib_device_backend = {
NULL,
NULL, /* flush */
NULL, /* finish */
_cairo_xlib_display_finish,
_cairo_xlib_display_destroy,
};