RPJosh
/
wayvnc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Autoprint option default values 

Signed-off-by: Jim Ramsay <i.am@jimramsay.com>
wayvncctl-polishing
Jim Ramsay 2023-01-11 22:09:23 -05:00
parent 177ea507e3
commit cc27b127d1
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.c
View File

@ -1292,7 +1292,7 @@ int main(int argc, char* argv[])
{ 'r', "render-cursor", NULL, { 'r', "render-cursor", NULL,
"Enable overlay cursor rendering." }, "Enable overlay cursor rendering." },
{ 'f', "max-fps", "<fps>", { 'f', "max-fps", "<fps>",
"Set rate limit (default 30).", "Set rate limit.",
.default_ = "30" }, .default_ = "30" },
{ 'p', "performance", NULL, { 'p', "performance", NULL,
"Show performance counters." }, "Show performance counters." },

14
src/option-parser.c
View File

@ -75,6 +75,16 @@ static int get_left_col_width(const struct wv_option* opts, int n)
return max_width; return max_width;
} }
static const char* format_help(const struct wv_option* opt)
{
if (!opt->default_)
return opt->help;
static char help_buf[256];
snprintf(help_buf, sizeof(help_buf), "%s\nDefault: %s", opt->help, opt->default_);
return help_buf;
}
static void format_option(struct table_printer* printer, const struct wv_option* opt) static void format_option(struct table_printer* printer, const struct wv_option* opt)
{ {
if (!opt->help || opt->positional) if (!opt->help || opt->positional)
@ -93,7 +103,7 @@ static void format_option(struct table_printer* printer, const struct wv_option*
n_chars += snprintf(buf + n_chars, sizeof(buf) - n_chars, n_chars += snprintf(buf + n_chars, sizeof(buf) - n_chars,
"%s%s", opt->long_opt ? "=" : "", opt->schema); "%s%s", opt->long_opt ? "=" : "", opt->schema);
table_printer_print_line(printer, buf, opt->help); table_printer_print_line(printer, buf, format_help(opt));
} }
void option_parser_print_options(struct option_parser* self, FILE* stream) void option_parser_print_options(struct option_parser* self, FILE* stream)
@ -159,7 +169,7 @@ int option_parser_print_arguments(struct option_parser* self, FILE* stream)
const struct wv_option* opt = &self->options[i]; const struct wv_option* opt = &self->options[i];
if (!opt->positional || !opt->help || opt->is_subcommand) if (!opt->positional || !opt->help || opt->is_subcommand)
continue; continue;
table_printer_print_line(&printer, opt->positional, opt->help); table_printer_print_line(&printer, opt->positional, format_help(opt));
} }
return i; return i;
} }