From d5443d2903fdd33d91243ca1f1ba45cffd24fda8 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Sun, 27 Apr 2014 00:12:20 -0400 Subject: examples/cogl-x11-tfp.c: Handle WM_DELETE_WINDOW Clean up cleanly when closed rather than dying with an X Error - we do this by advertising support for the WM_DELETE_WINDOW protocol and handling the client message. Reviewed-by: Robert Bragg --- examples/cogl-x11-tfp.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/examples/cogl-x11-tfp.c b/examples/cogl-x11-tfp.c index b5859431..019648b1 100644 --- a/examples/cogl-x11-tfp.c +++ b/examples/cogl-x11-tfp.c @@ -55,6 +55,8 @@ main (int argc, char **argv) XSetWindowAttributes xattr; unsigned long mask; Window xwin; + Atom atom_wm_protocols; + Atom atom_wm_delete_window; int screen; Window tfp_xwin; Pixmap pixmap; @@ -152,6 +154,10 @@ main (int argc, char **argv) xvisinfo->visual, mask, &xattr); + atom_wm_protocols = XInternAtom (xdpy, "WM_PROTOCOLS", False); + atom_wm_delete_window = XInternAtom (xdpy, "WM_DELETE_WINDOW", False); + XSetWMProtocols (xdpy, xwin, &atom_wm_delete_window, 1); + XFree (xvisinfo); cogl_x11_onscreen_set_foreign_window_xid (onscreen, xwin, @@ -208,6 +214,12 @@ main (int argc, char **argv) keysym = XLookupKeysym (&event.xkey, 0); if (keysym == XK_q || keysym == XK_Q || keysym == XK_Escape) return 0; + break; + case ClientMessage: + if (event.xclient.message_type == atom_wm_protocols && + event.xclient.data.l[0] == atom_wm_delete_window) + goto out; + break; } cogl_xlib_renderer_handle_event (renderer, &event); } -- cgit v1.2.1