diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2026-11-12 10:50:55 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2026-11-12 11:01:00 +0000 |
| commit | f51f18d33557ea9078f7781f4a4235706228f5c9 (patch) | |
| tree | 7d518d3abac3ecc8bf2e38518c7c5ecbb6ee40a9 /terminal.c | |
| parent | ime: reset view & cancel selection on text commit (diff) | |
spawn-terminal: spawn with all the original command line optionsspawn-terminal-cmdline-arguments
Before this, spawn-terminal would spawn a new foot or footclient,
but *without* any of the command line options the user started the
original foot/footclient with.
We did have a hack for --config, but all other options were forgotten
in the new instance.
This patch fixes this.
* term_init() stores the raw argc/argv in the terminal struct.
* term_spawn_new() calls spawn() with the stored argc/argv.
* for single instances, main() calls term_init() with the unparsed
argc/argv.
* the client/server protocol is extended to always send the raw
argc/argv to the server.
* the server calls term_init() with the argc/argv from the client.
* bonus: on linux, we now use /proc/self/exe to determine which binary
to launch. This means if you run e.g. a foot from your build tree,
spawn-terminal will exec _that_ foot, not the system foot.
A couple of behavioral changes, and/or side-effects, caused by the
above (not exhaustive):
* footclient -E: spawn-terminal will not use the _exact_ environment
from the original footclient, but will simply pass -E to the new
footclient. This means the new instance will inherit the *current*
environment of the original instance.
* foot htop: spawn-instance will _also_ launch a new foot+htop. Before
this patch, spawn-instance would launch a new foot+shell.
Closes #1622
Diffstat (limited to 'terminal.c')
| -rw-r--r-- | terminal.c | 30 |
1 files changed, 19 insertions, 11 deletions
@@ -1172,7 +1172,8 @@ struct terminal * term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper, struct wayland *wayl, const char *foot_exe, const char *cwd, const char *token, const char *pty_path, - int argc, char *const *argv, const char *const *envp, + int slave_argc, char *const *slave_argv, const char *const *slave_envp, + int foot_argc, const char *const *foot_argv, void (*shutdown_cb)(void *data, int exit_code), void *shutdown_data) { int ptmx = -1; @@ -1412,8 +1413,13 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper, .ime_enabled = true, #endif .active_notifications = tll_init(), + .argc = foot_argc, + .argv = xcalloc(foot_argc, sizeof(char *)), }; + for (int i = 0; i < foot_argc; i++) + term->argv[i] = xstrdup(foot_argv[i]); + pixman_region32_init(&term->render.last_overlay_clip); term_update_ascii_printer(term); @@ -1437,8 +1443,8 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper, if (!pty_path) { /* Start the slave/client */ if ((term->slave = slave_spawn( - term->ptmx, argc, term->cwd, argv, envp, &conf->env_vars, - conf->term, conf->shell, conf->login_shell, + term->ptmx, slave_argc, term->cwd, slave_argv, slave_envp, + &conf->env_vars, conf->term, conf->shell, conf->login_shell, &conf->notifications)) == -1) { goto err; @@ -1953,6 +1959,10 @@ term_destroy(struct terminal *term) free(term->mouse_user_cursor); free(term->color_stack.stack); + for (int i = 0; i < term->argc; i++) + free(term->argv[i]); + free(term->argv); + int ret = EXIT_SUCCESS; if (term->slave > 0) { @@ -3815,15 +3825,13 @@ term_bell(struct terminal *term) bool term_spawn_new(const struct terminal *term) { - char *argv[4]; - int argc = 0; + xassert(term->argc > 0); + char *argv[term->argc + 1]; - argv[argc++] = term->foot_exe; - if (term->conf->conf_path != NULL) { - argv[argc++] = "--config"; - argv[argc++] = term->conf->conf_path; - } - argv[argc] = NULL; + argv[0] = term->foot_exe; + for (int i = 1; i < term->argc; i++) + argv[i] = term->argv[i]; + argv[term->argc] = NULL; return spawn( term->reaper, term->cwd, argv, |
