toby/dwl
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pipe status info into -s command

Browse source 
Unlike with X window managers, the display socket in Wayland isn't set
up prior to starting the compositor.  Because of this, you can't pipe
the compositor's output directly into a program which needs access to
$WAYLAND_DISPLAY, which is a typical setup for this purpose.  Existing
scripts have been forced to create a pipe/FIFO or a temporary file as an
intermediary.

Instead, send the status info directly to stdin of the -s command, which
*does* have access to $WAYLAND_DISPLAY.

Fixes #103.
This commit is contained in:
Devin J. Pohly 2021-04-14 11:15:26 -05:00
parent 9071ce6c84
commit b372d4b55e
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dwl.c
View file

@ -1805,15 +1805,22 @@ run(char *startup_cmd)
setenv("WAYLAND_DISPLAY", socket, 1); setenv("WAYLAND_DISPLAY", socket, 1);
if (startup_cmd) { if (startup_cmd) {
int piperw[2];
pipe(piperw);
startup_pid = fork(); startup_pid = fork();
if (startup_pid < 0) if (startup_pid < 0)
EBARF("startup: fork"); EBARF("startup: fork");
if (startup_pid == 0) { if (startup_pid == 0) {
dup2(STDERR_FILENO, STDOUT_FILENO); dup2(piperw[0], STDIN_FILENO);
close(piperw[1]);
execl("/bin/sh", "/bin/sh", "-c", startup_cmd, NULL); execl("/bin/sh", "/bin/sh", "-c", startup_cmd, NULL);
EBARF("startup: execl"); EBARF("startup: execl");
} }
dup2(piperw[1], STDOUT_FILENO);
close(piperw[0]);
} }
/* If nobody is reading the status output, don't terminate */
signal(SIGPIPE, SIG_IGN);
/* Run the Wayland event loop. This does not return until you exit the /* Run the Wayland event loop. This does not return until you exit the
* compositor. Starting the backend rigged up all of the necessary event * compositor. Starting the backend rigged up all of the necessary event