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.h | |
| 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.h')
| -rw-r--r-- | terminal.h | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -836,6 +836,10 @@ struct terminal { bool grapheme_shaping; bool size_notifications; + + /* For spawn-terminal */ + int argc; + char **argv; }; struct config; @@ -843,7 +847,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); bool term_shutdown(struct terminal *term); |
