Skip to content

panel: menu launchers double fork to not remain child of panel #493

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

Open
trigg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

panel: menu launchers double fork to not remain child of panel #493

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
55 changes: 51 additions & 4 deletions src/panel/widgets/menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <glibmm/spawn.h>
#include <iostream>
#include <gtk4-layer-shell.h>
#include <sys/wait.h>

#include "menu.hpp"
#include "gtk-utils.hpp"
Expand Down Expand Up @@ -189,6 +190,45 @@ void WfMenuCategoryButton::on_click()
menu->set_category(category);
}

/* Double forks to launch the grandchild as a child of PID 1. */
void double_fork(const std::function<void()>& action)
{
pid_t pid = fork();
if (pid < 0)
{
return; /* Failed */
}

if (pid > 0)
{
/* Main process. Wait briefly for the intermediate child to clean up and exit */
waitpid(pid, nullptr, 0);
return;
}

/*Intermediate child process. Disavow parent */
setsid();

pid_t grandchild_pid = fork();
if (grandchild_pid < 0)
{
_exit(EXIT_FAILURE); /* Failed */
}

if (grandchild_pid > 0)
{
_exit(EXIT_SUCCESS); /* Intermediate child ends, disavowing parent and child */
}

/* End child process, perform action */
try {
action();
} catch (...)
{}

_exit(EXIT_SUCCESS);
}

WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app) :
Gtk::FlowBoxChild(), menu(_menu), app_info(app)
{
Expand Down Expand Up @@ -304,8 +344,11 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
signals.push_back(action_obj->signal_activate().connect(
[this, action] (Glib::VariantBase vb)
{
auto ctx = Gdk::Display::get_default()->get_app_launch_context();
app_info->launch_action(action, ctx);
double_fork([this, action] ()
{
auto context = Gio::AppLaunchContext::create();
app_info->launch_action(action, context);
});
menu->hide_menu();
}));
m_menu->append_item(menu_item);
Expand Down Expand Up @@ -337,8 +380,12 @@ WfMenuItem::~WfMenuItem()

void WfMenuItem::on_click()
{
auto ctx = Gdk::Display::get_default()->get_app_launch_context();
app_info->launch(std::vector<Glib::RefPtr<Gio::File>>(), ctx);
double_fork([this] ()
{
auto context = Gio::AppLaunchContext::create();
std::vector<Glib::RefPtr<Gio::File>> no_files;
app_info->launch(no_files, context);
});
menu->hide_menu();
}

Expand Down
Loading