aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-07-18 12:29:40 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-07-18 12:29:40 +0000
commit7e36027237cc2633bd48fd1808ad97396c82f2ef (patch)
tree9200b94502d1f4d3c03b3e8f1473f6ff1dc0d1e3
parentcsi: color index is an 8-bit unsigned value (diff)
conf: TERM can now be set in footrc
-rw-r--r--config.c12
-rw-r--r--config.h1
-rw-r--r--main.c2
3 files changed, 11 insertions, 4 deletions
diff --git a/config.c b/config.c
index c433ad02..6d234264 100644
--- a/config.c
+++ b/config.c
@@ -85,9 +85,9 @@ static bool
parse_section_main(const char *key, const char *value, struct config *conf,
const char *path, unsigned lineno)
{
- if (strcmp(key, "font") == 0) {
- free(conf->font);
- conf->font = strdup(value);
+ if (strcmp(key, "term") == 0) {
+ free(conf->term);
+ conf->term = strdup(value);
}
else if (strcmp(key, "shell") == 0) {
@@ -95,6 +95,11 @@ parse_section_main(const char *key, const char *value, struct config *conf,
conf->shell = strdup(value);
}
+ else if (strcmp(key, "font") == 0) {
+ free(conf->font);
+ conf->font = strdup(value);
+ }
+
else {
LOG_WARN("%s:%u: invalid key: %s", path, lineno, key);
return false;
@@ -211,6 +216,7 @@ config_load(struct config *conf)
bool ret = false;
*conf = (struct config) {
+ .term = strdup("foot"),
.shell = get_shell(),
.font = strdup("monospace"),
};
diff --git a/config.h b/config.h
index aa96a49b..fdca3c34 100644
--- a/config.h
+++ b/config.h
@@ -3,6 +3,7 @@
#include <stdbool.h>
struct config {
+ char *term;
char *shell;
char *font;
};
diff --git a/main.c b/main.c
index 2c8f0451..70ca3d48 100644
--- a/main.c
+++ b/main.c
@@ -312,7 +312,7 @@ main(int argc, char *const *argv)
argv += optind;
setlocale(LC_ALL, "");
- setenv("TERM", "foot", 1); /* TODO: configurable */
+ setenv("TERM", conf.term, 1);
int repeat_pipe_fds[2] = {-1, -1};
if (pipe2(repeat_pipe_fds, O_CLOEXEC) == -1) {