From 9f657ce1d673b6439f219cec6b5d82e27462305c Mon Sep 17 00:00:00 2001 From: Sameer Rahmani Date: Sun, 21 Aug 2022 13:09:25 +0100 Subject: [PATCH] break the stop process to a seperate function --- src/compositor.c | 8 +++++++- src/compositor.h | 2 +- src/feynman.c | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/compositor.c b/src/compositor.c index 245fac7..bdbca9e 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -894,8 +894,14 @@ start_feynman (emacs_env *env, struct feynman_server *server) wl_display_run (server->wl_display); + return 0; +} + +void +stop_feynman (emacs_env *env, struct feynman_server *server) +{ + (void)env; /* Once wl_display_run returns, we shut down the server-> */ wl_display_destroy_clients (server->wl_display); wl_display_destroy (server->wl_display); - return 0; } diff --git a/src/compositor.h b/src/compositor.h index b05bb46..5db3dac 100644 --- a/src/compositor.h +++ b/src/compositor.h @@ -120,5 +120,5 @@ struct feynman_keyboard struct wl_listener key; }; int start_feynman (emacs_env *env, struct feynman_server *server); -void stop_feynman (emacs_env *env); +void stop_feynman (emacs_env *env, struct feynman_server *server); #endif diff --git a/src/feynman.c b/src/feynman.c index 83dee3e..3b82d8a 100644 --- a/src/feynman.c +++ b/src/feynman.c @@ -91,7 +91,7 @@ feynman_stop (emacs_env *env, ptrdiff_t nargs, emacs_value args[], void *data) struct feynman_server *server = (struct feynman_server *)env->get_user_ptr (env, first_arg); - wl_display_destroy (server->wl_display); + stop_feynman (env, server); // deinit_queue(feynman_events_q); emacs_value t = env->intern (env, "t");