X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Ftput.c;h=8ff3be1ba57346943770dbec9de7df5a63b9aa38;hp=18b2d165dae24c5dacaf7be7caa745cad99cf711;hb=29a36e53e1f77a0c3672f2e267d573823d6a9a60;hpb=55ccd2b959766810cf7db8d1c4462f338ce0afc8 diff --git a/progs/tput.c b/progs/tput.c index 18b2d165..8ff3be1b 100644 --- a/progs/tput.c +++ b/progs/tput.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. * + * Copyright (c) 1998-2015,2016 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 * @@ -29,6 +29,7 @@ /**************************************************************************** * Author: Zeyd M. Ben-Halim 1992,1995 * * and: Eric S. Raymond * + * and: Thomas E. Dickey 1996-on * ****************************************************************************/ /* @@ -38,24 +39,20 @@ * Ross Ridge's mytinfo package. */ -#include +#include +#include #if !PURE_TERMINFO +#include #include #endif #include -MODULE_ID("$Id: tput.c,v 1.35 2005/04/03 14:25:32 tom Exp $") +MODULE_ID("$Id: tput.c,v 1.57 2016/08/20 21:46:31 tom Exp $") #define PUTS(s) fputs(s, stdout) -#define PUTCHAR(c) putchar(c) -#define FLUSH fflush(stdout) -typedef enum { - Numbers = 0 - ,Num_Str - ,Num_Str_Str -} TParams; +const char *_nc_progname = "tput"; static char *prg_name; static bool is_init = FALSE; @@ -82,46 +79,10 @@ usage(void) } static void -check_aliases(const char *name) +check_aliases(const char *name, bool program) { - is_init = (strcmp(name, PROG_INIT) == 0); - is_reset = (strcmp(name, PROG_RESET) == 0); -} - -/* - * Lookup the type of call we should make to tparm(). This ignores the actual - * terminfo capability (bad, because it is not extensible), but makes this - * code portable to platforms where sizeof(int) != sizeof(char *). - * - * FIXME: If we want extensibility, analyze the capability string as we do - * in tparm() to decide how to parse the varargs list. - */ -static TParams -tparm_type(const char *name) -{ -#define TD(code, longname, ti, tc) {code,longname},{code,ti},{code,tc} - TParams result = Numbers; - /* *INDENT-OFF* */ - static const struct { - TParams code; - const char *name; - } table[] = { - TD(Num_Str, "pkey_key", "pfkey", "pk"), - TD(Num_Str, "pkey_local", "pfloc", "pl"), - TD(Num_Str, "pkey_xmit", "pfx", "px"), - TD(Num_Str, "plab_norm", "pln", "pn"), - TD(Num_Str_Str, "pkey_plab", "pfxl", "xl"), - }; - /* *INDENT-ON* */ - - unsigned n; - for (n = 0; n < SIZEOF(table); n++) { - if (!strcmp(name, table[n].name)) { - result = table[n].code; - break; - } - } - return result; + is_init = same_program(name, program ? PROG_INIT : "init"); + is_reset = same_program(name, program ? PROG_RESET : "reset"); } static int @@ -144,117 +105,37 @@ exit_code(int token, int value) } static int -tput(int argc, char *argv[]) +tput_cmd(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); + check_aliases(name, FALSE); if (is_reset || is_init) { - if (init_prog != 0) { - system(init_prog); - } - FLUSH; + TTY mode, 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); - } - FLUSH; + (void) save_tty_settings(&mode); -#ifdef set_lr_margin - if (set_lr_margin != 0) { - PUTS(tparm(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(set_left_margin_parm, 0)); - PUTS(tparm(set_right_margin_parm, columns - 1)); - } else -#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(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(parm_right_cursor, 8)); - } else { - for (j = 0; j < 8; j++) - PUTCHAR(' '); - } - PUTS(set_tab); - } - FLUSH; - } - } + reset_start(stdout, is_reset, is_init); + reset_tty_settings(&mode); - 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); + set_control_chars(&mode, terasechar, intrchar, tkillchar); + set_conversions(&mode); + if (send_init_strings(&oldmode)) { + reset_flush(); } - FLUSH; - if (is_reset && reset_3string != 0) { - PUTS(reset_3string); - } else if (init_2string != 0) { - PUTS(init_2string); - } - FLUSH; + update_tty_settings(&oldmode, &mode); return 0; } @@ -263,40 +144,45 @@ tput(int argc, char *argv[]) return 0; } #if !PURE_TERMINFO - { - const struct name_table_entry *np; - - if ((np = _nc_find_entry(name, _nc_get_hash_table(1))) != 0) - switch (np->nte_type) { - case BOOLEAN: - if (bool_from_termcap[np->nte_index]) - name = boolnames[np->nte_index]; - break; - - case NUMBER: - if (num_from_termcap[np->nte_index]) - name = numnames[np->nte_index]; - break; - - case STRING: - if (str_from_termcap[np->nte_index]) - name = strnames[np->nte_index]; - break; - } - } + retry: #endif - if ((status = tigetflag(name)) != -1) { return exit_code(BOOLEAN, status); } else if ((status = tigetnum(name)) != CANCELLED_NUMERIC) { (void) printf("%d\n", status); return exit_code(NUMBER, 0); } else if ((s = tigetstr(name)) == CANCELLED_STRING) { +#if !PURE_TERMINFO + if (!termcap) { + const struct name_table_entry *np; + + termcap = TRUE; + 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]; + break; + + case NUMBER: + if (num_from_termcap[np->nte_index]) + name = numnames[np->nte_index]; + break; + + case STRING: + if (str_from_termcap[np->nte_index]) + name = strnames[np->nte_index]; + break; + } + goto retry; + } + } +#endif quit(4, "unknown terminfo capability '%s'", name); } else if (s != ABSENT_STRING) { if (argc > 1) { int k; - int popcount; + int ignored; long numbers[1 + NUM_PARM]; char *strings[1 + NUM_PARM]; char *p_is_s[NUM_PARM]; @@ -320,24 +206,25 @@ tput(int argc, char *argv[]) switch (tparm_type(name)) { case Num_Str: - s = tparm(s, numbers[1], strings[2]); + s = TPARM_2(s, numbers[1], strings[2]); break; case Num_Str_Str: - s = tparm(s, numbers[1], strings[2], strings[3]); + s = TPARM_3(s, numbers[1], strings[2], strings[3]); break; + case Numbers: default: - (void) _nc_tparm_analyze(s, p_is_s, &popcount); -#define myParam(n) (p_is_s[n - 1] != 0 ? ((long) strings[n]) : numbers[n]) - s = tparm(s, - myParam(1), - myParam(2), - myParam(3), - myParam(4), - myParam(5), - myParam(6), - myParam(7), - myParam(8), - myParam(9)); + (void) _nc_tparm_analyze(s, p_is_s, &ignored); +#define myParam(n) (p_is_s[n - 1] != 0 ? ((TPARM_ARG) strings[n]) : numbers[n]) + s = TPARM_9(s, + myParam(1), + myParam(2), + myParam(3), + myParam(4), + myParam(5), + myParam(6), + myParam(7), + myParam(8), + myParam(9)); break; } } @@ -359,11 +246,11 @@ main(int argc, char **argv) char buf[BUFSIZ]; int result = 0; - check_aliases(prg_name = _nc_rootname(argv[0])); + check_aliases(prg_name = _nc_rootname(argv[0]), TRUE); term = getenv("TERM"); - while ((c = getopt(argc, argv, "ST:V")) != EOF) { + while ((c = getopt(argc, argv, "ST:V")) != -1) { switch (c) { case 'S': cmdline = FALSE; @@ -374,7 +261,7 @@ main(int argc, char **argv) break; case 'V': puts(curses_version()); - return EXIT_SUCCESS; + ExitProgram(EXIT_SUCCESS); default: usage(); /* NOTREACHED */ @@ -404,7 +291,7 @@ main(int argc, char **argv) if (cmdline) { if ((argc <= 0) && !is_reset && !is_init) usage(); - return tput(argc, argv); + ExitProgram(tput_cmd(argc, argv)); } while (fgets(buf, sizeof(buf), stdin) != 0) { @@ -425,12 +312,12 @@ main(int argc, char **argv) argvec[argnum] = 0; if (argnum != 0 - && tput(argnum, argvec) != 0) { + && tput_cmd(argnum, argvec) != 0) { if (result == 0) result = 4; /* will return value >4 */ ++result; } } - return result; + ExitProgram(result); }