mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-27 07:58:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

main: add -h,--help and -v,--version command line options

Browse source
This commit is contained in:
Daniel Eklöf 2019-08-11 16:03:29 +02:00
parent a78765a36f
commit 1060c8e892
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 49 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

31
main.c
View file

@ -192,6 +192,18 @@ static const struct wl_registry_listener registry_listener = {
.global_remove = &handle_global_remove, .global_remove = &handle_global_remove,
}; };
static void
print_usage(const char *prog_name)
{
printf("Usage: %s [OPTION]...\n", prog_name);
printf("\n");
printf("Options:\n");
printf(" -f,--font=FONT font name and style in fontconfig format (monospace)\n"
" -t,--term=TERM value to set the environment variable TERM to (foot)\n"
" -v,--version show the version number and quit\n");
printf("\n");
}
int int
main(int argc, char *const *argv) main(int argc, char *const *argv)
{ {
@ -201,14 +213,18 @@ main(int argc, char *const *argv)
if (!config_load(&conf)) if (!config_load(&conf))
return ret; return ret;
const char *const prog_name = argv[0];
static const struct option longopts[] = { static const struct option longopts[] = {
{"term", required_argument, 0, 't'}, {"term", required_argument, 0, 't'},
{"font", required_argument, 0, 'f'}, {"font", required_argument, 0, 'f'},
{NULL, no_argument, 0, 0}, {"version", no_argument, 0, 'v'},
{"help", no_argument, 0, 'h'},
{NULL, no_argument, 0, 0},
}; };
while (true) { while (true) {
int c = getopt_long(argc, argv, ":t:f:h", longopts, NULL); int c = getopt_long(argc, argv, ":t:f:vh", longopts, NULL);
if (c == -1) if (c == -1)
break; break;
@ -223,8 +239,13 @@ main(int argc, char *const *argv)
tll_push_back(conf.fonts, strdup(optarg)); tll_push_back(conf.fonts, strdup(optarg));
break; break;
case 'v':
printf("foot version %s\n", FOOT_VERSION);
return EXIT_SUCCESS;
case 'h': case 'h':
break; print_usage(prog_name);
return EXIT_SUCCESS;
case ':': case ':':
fprintf(stderr, "error: -%c: missing required argument\n", optopt); fprintf(stderr, "error: -%c: missing required argument\n", optopt);

25
meson.build
View file

@ -9,10 +9,31 @@ project('foot', 'c',
is_debug_build = get_option('buildtype').startswith('debug') is_debug_build = get_option('buildtype').startswith('debug')
version = '"@0@"'.format(meson.project_version())
sh = find_program('sh', native: true)
git = find_program('git', required: false, native: true)
if git.found()
commit_hash = run_command(
[sh.path(), '-c',
'@0@ --git-dir="$MESON_SOURCE_ROOT/.git" describe --always --tags'.format(
git.path())])
branch = run_command(
[sh.path(), '-c',
'@0@ --git-dir="$MESON_SOURCE_ROOT/.git" rev-parse --abbrev-ref HEAD'.format(
git.path())])
if commit_hash.returncode() == 0 and branch.returncode() == 0
version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(
commit_hash.stdout().strip(), branch.stdout().strip())
endif
endif
add_project_arguments( add_project_arguments(
['-D_GNU_SOURCE=200809L', ['-D_GNU_SOURCE=200809L',
#'-DF00SEL_VERSION=@0@'.format(version)] + '-DFOOT_VERSION=@0@'.format(version)] +
] +
(is_debug_build ? ['-D_DEBUG'] : []), (is_debug_build ? ['-D_DEBUG'] : []),
language: 'c', language: 'c',
) )