X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Ftput.c;h=5b43ca713d414a4e42274ee676d61091df1e5bab;hp=5069a5c31e4fc510ef193ddf9597d273e349ea07;hb=fb6c095b1b63de26712d67de11dc6e35ea223f16;hpb=34d602f272c394e9a980438e636e1ce4d355f83b diff --git a/progs/tput.c b/progs/tput.c index 5069a5c3..5b43ca71 100644 --- a/progs/tput.c +++ b/progs/tput.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2013,2014 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,22 +40,26 @@ */ #include +#include +#include #if !PURE_TERMINFO #include #include #endif #include +#include -MODULE_ID("$Id: tput.c,v 1.50 2014/05/21 16:57:16 tom Exp $") +MODULE_ID("$Id: tput.c,v 1.69 2017/01/21 17:40:51 tom Exp $") #define PUTS(s) fputs(s, stdout) -#define PUTCHAR(c) putchar(c) -#define FLUSH fflush(stdout) + +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,...) @@ -77,11 +81,21 @@ usage(void) ExitProgram(EXIT_FAILURE); } -static void -check_aliases(const char *name) +static char * +check_aliases(char *name, bool program) { - is_init = same_program(name, PROG_INIT); - is_reset = same_program(name, PROG_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 @@ -104,120 +118,42 @@ exit_code(int token, int value) } static int -tput(int argc, char *argv[]) +tput_cmd(int fd, TTY * saved_settings, int argc, char *argv[]) { NCURSES_CONST char *name; char *s; - int i, j, c; int status; - FILE *f; #if !PURE_TERMINFO bool termcap = FALSE; #endif - if ((name = argv[0]) == 0) - name = ""; - check_aliases(name); + name = check_aliases(argv[0], FALSE); if (is_reset || is_init) { - if (init_prog != 0) { - system(init_prog); - } - FLUSH; + TTY oldmode; - if (is_reset && reset_1string != 0) { - PUTS(reset_1string); - } else if (init_1string != 0) { - PUTS(init_1string); - } - FLUSH; + int terasechar = -1; /* new erase character */ + int intrchar = -1; /* new interrupt character */ + int tkillchar = -1; /* new kill character */ - if (is_reset && reset_2string != 0) { - PUTS(reset_2string); - } else if (init_2string != 0) { - PUTS(init_2string); + if (is_reset) { + reset_start(stdout, TRUE, FALSE); + reset_tty_settings(fd, saved_settings); + } else { + reset_start(stdout, FALSE, TRUE); } - FLUSH; -#ifdef set_lr_margin - if (set_lr_margin != 0) { - PUTS(TPARM_2(set_lr_margin, 0, columns - 1)); - } else -#endif -#ifdef set_left_margin_parm - if (set_left_margin_parm != 0 - && set_right_margin_parm != 0) { - PUTS(TPARM_1(set_left_margin_parm, 0)); - PUTS(TPARM_1(set_right_margin_parm, columns - 1)); - } else +#if HAVE_SIZECHANGE + set_window_size(fd, &lines, &columns); +#else + (void) fd; #endif - if (clear_margins != 0 - && set_left_margin != 0 - && set_right_margin != 0) { - PUTS(clear_margins); - if (carriage_return != 0) { - PUTS(carriage_return); - } else { - PUTCHAR('\r'); - } - PUTS(set_left_margin); - if (parm_right_cursor) { - PUTS(TPARM_1(parm_right_cursor, columns - 1)); - } else { - for (i = 0; i < columns - 1; i++) { - PUTCHAR(' '); - } - } - PUTS(set_right_margin); - if (carriage_return != 0) { - PUTS(carriage_return); - } else { - PUTCHAR('\r'); - } - } - FLUSH; - - if (init_tabs != 8) { - if (clear_all_tabs != 0 && set_tab != 0) { - for (i = 0; i < columns - 1; i += 8) { - if (parm_right_cursor) { - PUTS(TPARM_1(parm_right_cursor, 8)); - } else { - for (j = 0; j < 8; j++) - PUTCHAR(' '); - } - PUTS(set_tab); - } - FLUSH; - } + set_control_chars(saved_settings, terasechar, intrchar, tkillchar); + set_conversions(saved_settings); + if (send_init_strings(fd, &oldmode)) { + reset_flush(); } - if (is_reset && reset_file != 0) { - f = fopen(reset_file, "r"); - if (f == 0) { - quit(4 + errno, "Can't open reset_file: '%s'", reset_file); - } - while ((c = fgetc(f)) != EOF) { - PUTCHAR(c); - } - fclose(f); - } else if (init_file != 0) { - f = fopen(init_file, "r"); - if (f == 0) { - quit(4 + errno, "Can't open init_file: '%s'", init_file); - } - while ((c = fgetc(f)) != EOF) { - PUTCHAR(c); - } - fclose(f); - } - FLUSH; - - if (is_reset && reset_3string != 0) { - PUTS(reset_3string); - } else if (init_3string != 0) { - PUTS(init_3string); - } - FLUSH; + update_tty_settings(&oldmode, saved_settings); return 0; } @@ -228,7 +164,9 @@ tput(int argc, char *argv[]) #if !PURE_TERMINFO retry: #endif - if ((status = tigetflag(name)) != -1) { + if (strcmp(name, "clear") == 0) { + return clear_cmd(); + } else if ((status = tigetflag(name)) != -1) { return exit_code(BOOLEAN, status); } else if ((status = tigetnum(name)) != CANCELLED_NUMERIC) { (void) printf("%d\n", status); @@ -242,18 +180,15 @@ tput(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; @@ -327,8 +262,10 @@ main(int argc, char **argv) int c; char buf[BUFSIZ]; int result = 0; + int fd; + TTY tty_settings; - check_aliases(prg_name = _nc_rootname(argv[0])); + prg_name = check_aliases(_nc_rootname(argv[0]), TRUE); term = getenv("TERM"); @@ -353,7 +290,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; @@ -367,13 +304,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(argc, argv)); + ExitProgram(tput_cmd(fd, &tty_settings, argc, argv)); } while (fgets(buf, sizeof(buf), stdin) != 0) { @@ -394,7 +333,7 @@ main(int argc, char **argv) argvec[argnum] = 0; if (argnum != 0 - && tput(argnum, argvec) != 0) { + && tput_cmd(fd, &tty_settings, argnum, argvec) != 0) { if (result == 0) result = 4; /* will return value >4 */ ++result;