Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make glib loop play well with SIGINT/SIGTERM #241

Merged
merged 1 commit into from
Jun 27, 2024
Merged

make glib loop play well with SIGINT/SIGTERM #241

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions src/glib-main-loop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,19 @@
static gboolean on_wayland_fd_event(gint fd, GIOCondition condition,
gpointer user_data);

static int glib_signal_handler(gpointer raw_glib_loop)
{
Glib::RefPtr<Glib::MainLoop> g_loop = Glib::wrap((GMainLoop*)raw_glib_loop);
g_loop->quit();
return G_SOURCE_REMOVE;
}

namespace wf
{
class glib_main_loop_t : public wf::plugin_interface_t
{
Glib::RefPtr<Glib::MainLoop> g_loop;
wf::wl_idle_call idle_shutdown;

public:
void init()
Expand Down Expand Up @@ -48,7 +56,9 @@ class glib_main_loop_t : public wf::plugin_interface_t

g_loop = Glib::MainLoop::create();
wf::get_core().connect(&glib_loop_run);
wf::get_core().connect(&glib_loop_quit);

g_unix_signal_add_full(G_PRIORITY_DEFAULT, SIGTERM, glib_signal_handler, g_loop.get(), NULL);
g_unix_signal_add_full(G_PRIORITY_DEFAULT, SIGINT, glib_signal_handler, g_loop.get(), NULL);
}

void handle_wayland_fd_in(GIOCondition flag)
Expand All @@ -73,14 +83,10 @@ class glib_main_loop_t : public wf::plugin_interface_t
g_unix_fd_add(fd, G_IO_HUP, on_wayland_fd_event, this);

g_loop->run();
};

wf::signal::connection_t<wf::core_shutdown_signal> glib_loop_quit = [=] (auto)
{
auto display = wf::get_core().display;
wl_display_destroy_clients(display);
wl_display_destroy(display);
std::exit(0);
idle_shutdown.run_once([=] ()
{
wl_display_terminate(wf::get_core().display);
});
};

/**
Expand Down
Loading