diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-02-20 17:37:16 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-02-20 17:37:16 +0000 |
| commit | bb3c20e284be6820d06e49d63887689f63f042c3 (patch) | |
| tree | 6cbd67601bd94cdf3efb404e009f39c1e8e50064 /main.c | |
| parent | README: list 'lightweigh' under features (diff) | |
| parent | doc: add --login-shell (diff) | |
Merge branch 'login-shell'
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -46,6 +46,7 @@ print_usage(const char *prog_name) " -c,--config=PATH load configuration from PATH (XDG_CONFIG_HOME/footrc)\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" + " --login-shell start shell as a login shell\n" " -g,--geometry=WIDTHxHEIGHT set initial width and height\n" " -s,--server[=PATH] run as a server (use 'footclient' to start terminals).\n" " Without PATH, XDG_RUNTIME_DIR/foot.sock will be used.\n" @@ -136,6 +137,7 @@ main(int argc, char *const *argv) static const struct option longopts[] = { {"config", required_argument, NULL, 'c'}, {"term", required_argument, NULL, 't'}, + {"login-shell", no_argument, NULL, 'L'}, {"font", required_argument, NULL, 'f'}, {"geometry", required_argument, NULL, 'g'}, {"server", optional_argument, NULL, 's'}, @@ -151,6 +153,7 @@ main(int argc, char *const *argv) const char *conf_path = NULL; const char *conf_term = NULL; + bool login_shell = false; tll(char *) conf_fonts = tll_init(); int conf_width = -1; int conf_height = -1; @@ -164,7 +167,7 @@ main(int argc, char *const *argv) bool log_syslog = true; while (true) { - int c = getopt_long(argc, argv, "c:t:f:g:s::Pp:l::Svh", longopts, NULL); + int c = getopt_long(argc, argv, "c:t:Lf:g:s::Pp:l::Svh", longopts, NULL); if (c == -1) break; @@ -177,6 +180,10 @@ main(int argc, char *const *argv) conf_term = optarg; break; + case 'L': + login_shell = true; + break; + case 'f': tll_free_and_free(conf_fonts, free); for (char *font = strtok(optarg, ","); font != NULL; font = strtok(NULL, ",")) { @@ -279,6 +286,8 @@ main(int argc, char *const *argv) free(conf.term); conf.term = strdup(conf_term); } + if (login_shell) + conf.login_shell = true; if (tll_length(conf_fonts) > 0) { tll_free_and_free(conf.fonts, free); tll_foreach(conf_fonts, it) @@ -323,7 +332,8 @@ main(int argc, char *const *argv) goto out; if (!as_server && (term = term_init( - &conf, fdm, wayl, conf.term, "foot", cwd, argc, argv, + &conf, fdm, wayl, conf.term, conf.login_shell, + "foot", cwd, argc, argv, &term_shutdown_cb, &shutdown_ctx)) == NULL) { free(cwd); goto out; |
