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

compositor: Shut down properly so we remove the socket

Browse Source
This commit is contained in:
Kristian Høgsberg
2010-12-01 16:43:56 -05:00
parent 2bb3ebe1e4
commit 50dc6989b8
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/compositor-x11.c
+1 -1
View File
@@ -581,7 +581,7 @@ x11_compositor_handle_event(int fd, uint32_t mask, void *data)
client_message = (xcb_client_message_event_t *) event; client_message = (xcb_client_message_event_t *) event;
atom = client_message->data.data32[0]; atom = client_message->data.data32[0];
if (atom == c->atom.wm_delete_window) if (atom == c->atom.wm_delete_window)
exit(1); wl_display_terminate(c->base.wl_display);
break; break;
default: default:
compositor/compositor.c
+12
View File
@@ -1395,10 +1395,18 @@ wlsc_compositor_init(struct wlsc_compositor *ec, struct wl_display *display)
return 0; return 0;
} }
static void on_term_signal(int signal_number, void *data)
{
struct wlsc_compositor *ec = data;
wl_display_terminate(ec->wl_display);
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
struct wl_display *display; struct wl_display *display;
struct wlsc_compositor *ec; struct wlsc_compositor *ec;
struct wl_event_loop *loop;
GError *error = NULL; GError *error = NULL;
GOptionContext *context; GOptionContext *context;
int width, height; int width, height;
@@ -1436,6 +1444,10 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
loop = wl_display_get_event_loop(ec->wl_display);
wl_event_loop_add_signal(loop, SIGTERM, on_term_signal, ec);
wl_event_loop_add_signal(loop, SIGINT, on_term_signal, ec);
wl_display_run(display); wl_display_run(display);
wl_display_destroy(display); wl_display_destroy(display);