Skip to content

feat: fd-based readiness notification #791

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
Senderman wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: fd-based readiness notification #791

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c88b99
feat: fd-based readiness notification
Senderman Mar 20, 2026
92d1e20
Merge branch 'main' into feat/readiness-notification
Senderman Apr 2, 2026
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: 20 additions & 4 deletions src/mango.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ static void requestdecorationmode(struct wl_listener *listener, void *data);
static void requestdrmlease(struct wl_listener *listener, void *data);
static void requeststartdrag(struct wl_listener *listener, void *data);
static void resize(Client *c, struct wlr_box geo, int32_t interact);
static void run(char *startup_cmd);
static void run(char *startup_cmd, int readiness_fd);
static void setcursor(struct wl_listener *listener, void *data);
static void setfloating(Client *c, int32_t floating);
static void setfakefullscreen(Client *c, int32_t fakefullscreen);
Expand Down Expand Up @@ -4939,7 +4939,7 @@ void set_activation_env() {
}

void // 17
run(char *startup_cmd) {
run(char *startup_cmd, int readiness_fd) {

set_env();

Expand Down Expand Up @@ -5000,6 +5000,15 @@ run(char *startup_cmd) {
run_exec();
run_exec_once();

/*
* If running inside supervision suite like s6, notify about successfull startup
* by writing \n to the provided file descriptor and closing it
*/
if (readiness_fd > 2){
write(readiness_fd, "\n", 1);
close(readiness_fd);
}

/* Run the Wayland event loop. This does not return until you exit the
* compositor. Starting the backend rigged up all of the necessary event
* loop configuration to listen to libinput events, DRM events, generate
Expand Down Expand Up @@ -6650,8 +6659,9 @@ static void setgeometrynotify(struct wl_listener *listener, void *data) {
int32_t main(int32_t argc, char *argv[]) {
char *startup_cmd = NULL;
int32_t c;
int readiness_fd = 0;

while ((c = getopt(argc, argv, "s:c:hdvp")) != -1) {
while ((c = getopt(argc, argv, "s:c:r:hdvp")) != -1) {
if (c == 's') {
startup_cmd = optarg;
} else if (c == 'd') {
Expand All @@ -6663,6 +6673,11 @@ int32_t main(int32_t argc, char *argv[]) {
cli_config_path = optarg;
} else if (c == 'p') {
return parse_config() ? EXIT_SUCCESS : EXIT_FAILURE;
} else if (c == 'r') {
readiness_fd = atoi(optarg);
if (readiness_fd < 3) {
goto usage;
}
} else {
goto usage;
}
Expand All @@ -6676,7 +6691,7 @@ int32_t main(int32_t argc, char *argv[]) {
if (!getenv("XDG_RUNTIME_DIR"))
die("XDG_RUNTIME_DIR must be set");
setup();
run(startup_cmd);
run(startup_cmd, readiness_fd);
cleanup();
return EXIT_SUCCESS;
usage:
Expand All @@ -6687,6 +6702,7 @@ int32_t main(int32_t argc, char *argv[]) {
" -d Enable debug log\n"
" -c <file> Use custom configuration file\n"
" -s <command> Execute startup command\n"
" -r <fdnum> When WM is ready, write '\\n' to the given file descriptor and close it. fdnum >= 3\n"
" -p Check configuration file error\n");
return EXIT_SUCCESS;
}