diff options
| author | Chloe Kudryavtsev <toast@toast.cafe> | 2021-02-26 21:23:43 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-02-26 14:15:05 +0000 |
| commit | 80b95eeb7e66e287a214ca61f765b7da78f2bc2c (patch) | |
| tree | f73d5da662b6677b4c2b29ffee5e8fc6acb482b9 | |
| parent | grid: snapshot: don’t mark all cells as dirty - copy state from source grid (diff) | |
config: reuse HAVE_TERMINFO via DEFAULT_TERM
add detection in --help output
also make it more easily accessible for other locations to change
| -rw-r--r-- | config.c | 6 | ||||
| -rw-r--r-- | config.h | 6 | ||||
| -rw-r--r-- | main.c | 4 |
3 files changed, 9 insertions, 7 deletions
@@ -2158,11 +2158,7 @@ config_load(struct config *conf, const char *conf_path, bool ret = false; *conf = (struct config) { -#ifdef HAVE_TERMINFO - .term = xstrdup("foot"), -#else - .term = xstrdup("xterm-256color"), -#endif + .term = xstrdup(DEFAULT_TERM), .shell = get_shell(), .title = xstrdup("foot"), .app_id = xstrdup("foot"), @@ -9,6 +9,12 @@ #include "user-notification.h" #include "wayland.h" +#ifdef HAVE_TERMINFO + #define DEFAULT_TERM "foot" +#else + #define DEFAULT_TERM "xterm-256color" +#endif + enum conf_size_type {CONF_SIZE_PX, CONF_SIZE_CELLS}; struct config_font { @@ -61,7 +61,7 @@ print_usage(const char *prog_name) " -c,--config=PATH load configuration from PATH ($XDG_CONFIG_HOME/foot/foot.ini)\n" " -C,--check-config verify configuration, exit with 0 if ok, otherwise exit with 1\n" " -f,--font=FONT comma separated list of fonts in fontconfig format (monospace)\n" - " -t,--term=TERM value to set the environment variable TERM to (foot)\n" + " -t,--term=TERM value to set the environment variable TERM to (%s)\n" " -T,--title=TITLE initial window title (foot)\n" " -a,--app-id=ID window application ID (foot)\n" " -m,--maximized start in maximized mode\n" @@ -78,7 +78,7 @@ print_usage(const char *prog_name) " -l,--log-colorize=[{never|always|auto}] enable/disable colorization of log output on stderr\n" " -s,--log-no-syslog disable syslog logging (only applicable in server mode)\n" " -v,--version show the version number and quit\n", - prog_name, prog_name); + prog_name, prog_name, DEFAULT_TERM); } bool |
