X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Ftput.c;h=9bcde00054f32e57686cbb2efd5aa7d0f7ea1eca;hp=8ff3be1ba57346943770dbec9de7df5a63b9aa38;hb=0485620c03e69b1b58a6b12e5e45c98415fc7575;hpb=29a36e53e1f77a0c3672f2e267d573823d6a9a60 diff --git a/progs/tput.c b/progs/tput.c index 8ff3be1b..9bcde000 100644 --- a/progs/tput.c +++ b/progs/tput.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. * + * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -40,6 +40,7 @@ */ #include +#include #include #if !PURE_TERMINFO @@ -47,8 +48,9 @@ #include #endif #include +#include -MODULE_ID("$Id: tput.c,v 1.57 2016/08/20 21:46:31 tom Exp $") +MODULE_ID("$Id: tput.c,v 1.71 2017/08/19 13:44:27 tom Exp $") #define PUTS(s) fputs(s, stdout) @@ -57,6 +59,7 @@ const char *_nc_progname = "tput"; static char *prg_name; static bool is_init = FALSE; static bool is_reset = FALSE; +static bool is_clear = FALSE; static void quit(int status, const char *fmt,...) @@ -74,15 +77,43 @@ quit(int status, const char *fmt,...) static void usage(void) { - fprintf(stderr, "usage: %s [-V] [-S] [-T term] capname\n", prg_name); +#define KEEP(s) s "\n" + static const char msg[] = + { + KEEP("") + KEEP("Options:") + KEEP(" -S << read commands from standard input") + KEEP(" -T TERM use this instead of $TERM") + KEEP(" -V print curses-version") + KEEP(" -x do not try to clear scrollback") + KEEP("") + KEEP("Commands:") + KEEP(" clear clear the screen") + KEEP(" init initialize the terminal") + KEEP(" reset reinitialize the terminal") + KEEP(" capname unlike clear/init/reset, print value for capability \"capname\"") + }; +#undef KEEP + (void) fprintf(stderr, "Usage: %s [options] [command]\n", prg_name); + fputs(msg, stderr); ExitProgram(EXIT_FAILURE); } -static void -check_aliases(const char *name, bool program) +static char * +check_aliases(char *name, bool program) { - is_init = same_program(name, program ? PROG_INIT : "init"); - is_reset = same_program(name, program ? PROG_RESET : "reset"); + static char my_init[] = "init"; + static char my_reset[] = "reset"; + static char my_clear[] = "clear"; + + char *result = name; + if ((is_init = same_program(name, program ? PROG_INIT : my_init))) + result = my_init; + if ((is_reset = same_program(name, program ? PROG_RESET : my_reset))) + result = my_reset; + if ((is_clear = same_program(name, program ? PROG_CLEAR : my_clear))) + result = my_clear; + return result; } static int @@ -105,7 +136,7 @@ exit_code(int token, int value) } static int -tput_cmd(int argc, char *argv[]) +tput_cmd(int fd, TTY * saved_settings, bool opt_x, int argc, char *argv[]) { NCURSES_CONST char *name; char *s; @@ -114,28 +145,33 @@ tput_cmd(int argc, char *argv[]) bool termcap = FALSE; #endif - if ((name = argv[0]) == 0) - name = ""; - check_aliases(name, FALSE); + name = check_aliases(argv[0], FALSE); if (is_reset || is_init) { - TTY mode, oldmode; + TTY oldmode; int terasechar = -1; /* new erase character */ int intrchar = -1; /* new interrupt character */ int tkillchar = -1; /* new kill character */ - (void) save_tty_settings(&mode); - - reset_start(stdout, is_reset, is_init); - reset_tty_settings(&mode); + if (is_reset) { + reset_start(stdout, TRUE, FALSE); + reset_tty_settings(fd, saved_settings); + } else { + reset_start(stdout, FALSE, TRUE); + } - set_control_chars(&mode, terasechar, intrchar, tkillchar); - set_conversions(&mode); - if (send_init_strings(&oldmode)) { +#if HAVE_SIZECHANGE + set_window_size(fd, &lines, &columns); +#else + (void) fd; +#endif + set_control_chars(saved_settings, terasechar, intrchar, tkillchar); + set_conversions(saved_settings); + if (send_init_strings(fd, &oldmode)) { reset_flush(); } - update_tty_settings(&oldmode, &mode); + update_tty_settings(&oldmode, saved_settings); return 0; } @@ -146,7 +182,9 @@ tput_cmd(int argc, char *argv[]) #if !PURE_TERMINFO retry: #endif - if ((status = tigetflag(name)) != -1) { + if (strcmp(name, "clear") == 0) { + return clear_cmd(opt_x); + } else if ((status = tigetflag(name)) != -1) { return exit_code(BOOLEAN, status); } else if ((status = tigetnum(name)) != CANCELLED_NUMERIC) { (void) printf("%d\n", status); @@ -160,18 +198,15 @@ tput_cmd(int argc, char *argv[]) if ((np = _nc_find_entry(name, _nc_get_hash_table(termcap))) != 0) { switch (np->nte_type) { case BOOLEAN: - if (bool_from_termcap[np->nte_index]) - name = boolnames[np->nte_index]; + name = boolnames[np->nte_index]; break; case NUMBER: - if (num_from_termcap[np->nte_index]) - name = numnames[np->nte_index]; + name = numnames[np->nte_index]; break; case STRING: - if (str_from_termcap[np->nte_index]) - name = strnames[np->nte_index]; + name = strnames[np->nte_index]; break; } goto retry; @@ -245,8 +280,11 @@ main(int argc, char **argv) int c; char buf[BUFSIZ]; int result = 0; + int fd; + TTY tty_settings; + bool opt_x = FALSE; /* clear scrollback if possible */ - check_aliases(prg_name = _nc_rootname(argv[0]), TRUE); + prg_name = check_aliases(_nc_rootname(argv[0]), TRUE); term = getenv("TERM"); @@ -262,6 +300,9 @@ main(int argc, char **argv) case 'V': puts(curses_version()); ExitProgram(EXIT_SUCCESS); + case 'x': /* do not try to clear scrollback */ + opt_x = TRUE; + break; default: usage(); /* NOTREACHED */ @@ -271,7 +312,7 @@ main(int argc, char **argv) /* * Modify the argument list to omit the options we processed. */ - if (is_reset || is_init) { + if (is_clear || is_reset || is_init) { if (optind-- < argc) { argc -= optind; argv += optind; @@ -285,13 +326,15 @@ main(int argc, char **argv) if (term == 0 || *term == '\0') quit(2, "No value for $TERM and no -T specified"); - if (setupterm(term, STDOUT_FILENO, &errret) != OK && errret <= 0) + fd = save_tty_settings(&tty_settings); + + if (setupterm(term, fd, &errret) != OK && errret <= 0) quit(3, "unknown terminal \"%s\"", term); if (cmdline) { - if ((argc <= 0) && !is_reset && !is_init) + if ((argc <= 0) && !(is_clear || is_reset || is_init)) usage(); - ExitProgram(tput_cmd(argc, argv)); + ExitProgram(tput_cmd(fd, &tty_settings, opt_x, argc, argv)); } while (fgets(buf, sizeof(buf), stdin) != 0) { @@ -312,7 +355,7 @@ main(int argc, char **argv) argvec[argnum] = 0; if (argnum != 0 - && tput_cmd(argnum, argvec) != 0) { + && tput_cmd(fd, &tty_settings, opt_x, argnum, argvec) != 0) { if (result == 0) result = 4; /* will return value >4 */ ++result;