RJK's `pterm --help' patch. I _must_ find a better alternative to

this init sequence - it surely can't be right that `pterm --help'
with no DISPLAY complains at the lack of DISPLAY rather than giving
a help message!

[originally from svn r2164]
This commit is contained in:
Simon Tatham 2002-10-30 18:22:37 +00:00
Родитель 28a75f8b84
Коммит db71c5006e
2 изменённых файлов: 33 добавлений и 0 удалений

Просмотреть файл

@ -103,6 +103,8 @@ resources which do not have their own command-line options. For
example:
pterm -xrm 'ScrollbarOnLeft: 1'
.IP "\fB-help\fP, \fB--help\fP"
Display a message summarizing the available options
.SH X RESOURCES
\fIpterm\fP can be more completely configured by means of X
resources. All of these resources are of the form \fIpterm.FOO\fP

Просмотреть файл

@ -1728,6 +1728,33 @@ char *get_x_display(void *frontend)
char *app_name = "pterm";
static void help(FILE *fp) {
if(fprintf(fp,
"pterm option summary:\n"
"\n"
" --display DISPLAY Specify X display to use (note '--')\n"
" -name PREFIX Prefix when looking up resources (default: pterm)\n"
" -fn FONT Normal text font\n"
" -fb FONT Bold text font\n"
" -geometry WIDTHxHEIGHT Size of terminal in characters\n"
" -sl LINES Number of lines of scrollback\n"
" -fg COLOUR, -bg COLOUR Foreground/background colour\n"
" -bfg COLOUR, -bbg COLOUR Foreground/background bold colour\n"
" -cfg COLOUR, -bfg COLOUR Foreground/background cursor colour\n"
" -T TITLE Window title\n"
" -ut, +ut Do(default) or do not update utmp\n"
" -ls, +ls Do(default) or do not make shell a login shell\n"
" -sb, +sb Do(default) or do not display a scrollbar\n"
" -log PATH Log all output to a file\n"
" -nethack Map numeric keypad to hjklyubn direction keys\n"
" -xrm RESOURCE-STRING Set an X resource\n"
" -e COMMAND [ARGS...] Execute command (consumes all remaining args)\n"
) < 0 || fflush(fp) < 0) {
perror("output error");
exit(1);
}
}
int do_cmdline(int argc, char **argv, int do_everything)
{
int err = 0;
@ -1881,6 +1908,10 @@ int do_cmdline(int argc, char **argv, int do_everything)
EXPECTS_ARG;
provide_xrm_string(val);
} else if(!strcmp(p, "-help") || !strcmp(p, "--help")) {
help(stdout);
exit(0);
} else {
err = 1;
fprintf(stderr, "pterm: unrecognized option '%s'\n", p);