aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStéphane Klein <contact@stephane-klein.info>2026-01-08 23:31:04 +0000
committerDaniel Eklöf <daniel@ekloef.se>2026-03-02 08:16:36 +0000
commitdc0c8550c38ffd0983789573a1a0d4417016c2c7 (patch)
treea0e238a236f3f071095a803b9a0089f516cac21c
parentsupport four-sided padding (left/top/right/bottom) (diff)
Spawning new terminal with --config from parent instance
Reference: https://codeberg.org/dnkl/foot/issues/1622 Signed-off-by: Stéphane Klein <contact@stephane-klein.info>
-rw-r--r--CHANGELOG.md3
-rw-r--r--config.c3
-rw-r--r--config.h1
-rw-r--r--doc/foot.1.scd3
-rw-r--r--terminal.c12
5 files changed, 21 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e4c2a6f..c3760f10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,9 +80,12 @@
compiled for (e.g. _'Linux'_) ([#2209][2209]).
* `pad` option now supports 4-directional padding format:
`LEFTxTOPxRIGHTxBOTTOM` (e.g., `20x10x20x10`).
+* `--config=PATH` option is now automatically passed to new
+ terminals spawned via `spawn-terminal` action ([#2259][2259]).
[2212]: https://codeberg.org/dnkl/foot/issues/2212
[2209]: https://codeberg.org/dnkl/foot/issues/2209
+[2259]: https://codeberg.org/dnkl/foot/pulls/2259
### Changed
diff --git a/config.c b/config.c
index b1ff329c..bbac7fb6 100644
--- a/config.c
+++ b/config.c
@@ -3459,6 +3459,7 @@ config_load(struct config *conf, const char *conf_path,
enum fcft_capabilities fcft_caps = fcft_capabilities();
*conf = (struct config) {
+ .conf_path = (conf_path ? xstrdup(conf_path) : NULL),
.term = xstrdup(FOOT_DEFAULT_TERM),
.shell = get_shell(),
.title = xstrdup("foot"),
@@ -3914,6 +3915,7 @@ config_clone(const struct config *old)
struct config *conf = xmalloc(sizeof(*conf));
*conf = *old;
+ conf->conf_path = (old->conf_path ? xstrdup(old->conf_path) : NULL);
conf->term = xstrdup(old->term);
conf->shell = xstrdup(old->shell);
conf->title = xstrdup(old->title);
@@ -4014,6 +4016,7 @@ UNITTEST
void
config_free(struct config *conf)
{
+ free(conf->conf_path);
free(conf->term);
free(conf->shell);
free(conf->title);
diff --git a/config.h b/config.h
index d7db5ecc..47743a9c 100644
--- a/config.h
+++ b/config.h
@@ -217,6 +217,7 @@ enum center_when {
};
struct config {
+ char *conf_path;
char *term;
char *shell;
char *title;
diff --git a/doc/foot.1.scd b/doc/foot.1.scd
index 7058e96f..a190db9b 100644
--- a/doc/foot.1.scd
+++ b/doc/foot.1.scd
@@ -27,6 +27,9 @@ the foot command line
*-c*,*--config*=_PATH_
Path to configuration file, see *foot.ini*(5) for details.
+ The configuration file is automatically passed to new terminals
+ spawned via *spawn-terminal* (see *foot.ini*(5)).
+
*-C*,*--check-config*
Verify configuration and then exit with 0 if ok, otherwise exit
with 230 (see *EXIT STATUS*).
diff --git a/terminal.c b/terminal.c
index b670d606..8ce9bd4b 100644
--- a/terminal.c
+++ b/terminal.c
@@ -3802,8 +3802,18 @@ term_bell(struct terminal *term)
bool
term_spawn_new(const struct terminal *term)
{
+ char *argv[4];
+ int argc = 0;
+
+ argv[argc++] = term->foot_exe;
+ if (term->conf->conf_path != NULL) {
+ argv[argc++] = "--config";
+ argv[argc++] = term->conf->conf_path;
+ }
+ argv[argc] = NULL;
+
return spawn(
- term->reaper, term->cwd, (char *const []){term->foot_exe, NULL},
+ term->reaper, term->cwd, argv,
-1, -1, -1, NULL, NULL, NULL) >= 0;
}