mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-04 04:06:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

url-mode: add support for XDG activation when opening URLs

Browse source 
First, add a ‘token’ argument to spawn(). When non-NULL, spawn() will
set the ‘XDG_ACTIVATION_TOKEN’ environment variable in the forked
process. If DISPLAY is non-NULL, we also set DESKTOP_STARTUP_ID, for
compatibility with X11 applications. Note that failing to set either
of these environment variables are considered non-fatal - i.e. we
ignore failures.

Next, add a helper function, wayl_get_activation_token(), to generate
an XDG activation token, and call a user-provided callback when it’s
‘done (since token generation is asynchronous). This function takes an
optional ‘seat’ and ‘serial’ arguments - when both are non-NULL/zero,
we set the serial on the token. ‘win’ is a required argument, used to
set the surface on the token.

Re-write wayl_win_set_urgent() to use the new helper function.

Finally, rewrite activate_url() to first try to get an activation
token (and spawn the URL launcher in the token callback). If that
fails, or if we don’t have XDG activation support, spawn the URL
launcher immediately (like before this patch).

Closes #1058
This commit is contained in:
Daniel Eklöf 2022-05-03 19:37:04 +02:00
parent bd8dd9ff7e
commit ea1aac88db
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
9 changed files with 209 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

15
spawn.c
View file

@ -17,7 +17,8 @@
bool
spawn(struct reaper *reaper, const char *cwd, char *const argv[],
int stdin_fd, int stdout_fd, int stderr_fd)
int stdin_fd, int stdout_fd, int stderr_fd,
const char *xdg_activation_token)
{
int pipe_fds[2] = {-1, -1};
if (pipe2(pipe_fds, O_CLOEXEC) < 0) {
@ -47,14 +48,24 @@ spawn(struct reaper *reaper, const char *cwd, char *const argv[],
/* Restore ignored (SIG_IGN) signals */
struct sigaction dfl = {.sa_handler = SIG_DFL};
sigemptyset(&dfl.sa_mask);
if (sigaction(SIGHUP, &dfl, NULL) < 0)
if (sigaction(SIGHUP, &dfl, NULL) < 0 ||
sigaction(SIGPIPE, &dfl, NULL) < 0)
{
goto child_err;
}
if (cwd != NULL && chdir(cwd) < 0) {
LOG_WARN("failed to change working directory to %s: %s",
cwd, strerror(errno));
}
if (xdg_activation_token != NULL) {
setenv("XDG_ACTIVATION_TOKEN", xdg_activation_token, 1);
if (getenv("DISPLAY") != NULL)
setenv("DESKTOP_STARTUP_ID", xdg_activation_token, 1);
}
bool close_stderr = stderr_fd >= 0;
bool close_stdout = stdout_fd >= 0 && stdout_fd != stderr_fd;
bool close_stdin = stdin_fd >= 0 && stdin_fd != stdout_fd && stdin_fd != stderr_fd;