X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Freset_cmd.c;h=2e118ae58bae9ad55b10cf47a950cd165e74f0f1;hp=a4e44efc0f572b9d8abf572bdbe27684ce78ccfa;hb=790a85dbd4a81d5f5d8dd02a44d84f01512ef443;hpb=cd142df6d9934f1bda19f5b968cc666291be5072 diff --git a/progs/reset_cmd.c b/progs/reset_cmd.c index a4e44efc..2e118ae5 100644 --- a/progs/reset_cmd.c +++ b/progs/reset_cmd.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 2016,2017 Free Software Foundation, Inc. * + * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 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 * @@ -52,7 +53,7 @@ #include #endif -MODULE_ID("$Id: reset_cmd.c,v 1.13 2017/10/07 20:56:03 tom Exp $") +MODULE_ID("$Id: reset_cmd.c,v 1.21 2020/05/27 23:46:20 tom Exp $") /* * SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS, @@ -341,7 +342,7 @@ default_erase(void) int result; if (over_strike - && key_backspace != 0 + && VALID_STRING(key_backspace) && strlen(key_backspace) == 1) { result = key_backspace[0]; } else { @@ -398,7 +399,7 @@ set_conversions(TTY * tty_settings) #endif /* OXTABS */ /* test used to be tgetflag("NL") */ - if (newline != (char *) 0 && newline[0] == '\n' && !newline[1]) { + if (VALID_STRING(newline) && newline[0] == '\n' && !newline[1]) { /* Newline, not linefeed. */ #ifdef ONLCR tty_settings->c_oflag &= ~((unsigned) ONLCR); @@ -407,12 +408,34 @@ set_conversions(TTY * tty_settings) } #ifdef OXTABS /* test used to be tgetflag("pt") */ - if (has_hardware_tabs) /* Print tabs. */ + if (VALID_STRING(set_tab) && VALID_STRING(clear_all_tabs)) tty_settings->c_oflag &= ~OXTABS; #endif /* OXTABS */ tty_settings->c_lflag |= (ECHOE | ECHOK); } +static bool +sent_string(const char *s) +{ + bool sent = FALSE; + if (VALID_STRING(s)) { + tputs(s, 0, out_char); + sent = TRUE; + } + return sent; +} + +static bool +to_left_margin(void) +{ + if (VALID_STRING(carriage_return)) { + sent_string(carriage_return); + } else { + out_char('\r'); + } + return TRUE; +} + /* * Set the hardware tabs on the terminal, using the 'ct' (clear all tabs), * 'st' (set one tab) and 'ch' (horizontal cursor addressing) capabilities. @@ -423,41 +446,28 @@ set_conversions(TTY * tty_settings) static bool reset_tabstops(int wide) { - if ((init_tabs != 8) && (set_tab && clear_all_tabs)) { + if ((init_tabs != 8) + && VALID_NUMERIC(init_tabs) + && VALID_STRING(set_tab) + && VALID_STRING(clear_all_tabs)) { int c; - (void) putc('\r', my_file); /* Force to left margin. */ + to_left_margin(); tputs(clear_all_tabs, 0, out_char); - - for (c = 8; c < wide; c += 8) { - /* Get to the right column. In BSD tset, this used to try a bunch - * of half-clever things with cup and hpa, for an average saving of - * somewhat less than two character times per tab stop, less than - * .01 sec at 2400cps. We lost all this cruft because it seemed to - * be introducing some odd bugs. - * -----------12345678----------- */ - (void) fputs(" ", my_file); - tputs(set_tab, 0, out_char); + if (init_tabs > 1) { + if (init_tabs > wide) + init_tabs = (short) wide; + for (c = init_tabs; c < wide; c += init_tabs) { + fprintf(my_file, "%*s", init_tabs, " "); + tputs(set_tab, 0, out_char); + } + to_left_margin(); } - putc('\r', my_file); return (TRUE); } return (FALSE); } -static bool -sent_string(const char *s) -{ - bool sent = FALSE; - if (s != 0) { - tputs(s, 0, out_char); - sent = TRUE; - } - return sent; -} - -#define PUTCHAR(c) fputc(c, my_file) - /* Output startup string. */ bool send_init_strings(int fd GCC_UNUSED, TTY * old_settings) @@ -474,7 +484,7 @@ send_init_strings(int fd GCC_UNUSED, TTY * old_settings) } #endif if (use_reset || use_init) { - if (init_prog != 0) { + if (VALID_STRING(init_prog)) { IGNORE_RC(system(init_prog)); } @@ -486,44 +496,37 @@ send_init_strings(int fd GCC_UNUSED, TTY * old_settings) ? reset_2string : init_2string); + if (VALID_STRING(clear_margins)) { + need_flush |= sent_string(clear_margins); + } else #if defined(set_lr_margin) - if (set_lr_margin != 0) { - need_flush |= sent_string(TPARM_2(set_lr_margin, 0, - columns - 1)); + if (VALID_STRING(set_lr_margin)) { + need_flush |= sent_string(TIPARM_2(set_lr_margin, 0, columns - 1)); } else #endif #if defined(set_left_margin_parm) && defined(set_right_margin_parm) - if (set_left_margin_parm != 0 - && set_right_margin_parm != 0) { - need_flush |= sent_string(TPARM_1(set_left_margin_parm, 0)); - need_flush |= sent_string(TPARM_1(set_right_margin_parm, - columns - 1)); + if (VALID_STRING(set_left_margin_parm) + && VALID_STRING(set_right_margin_parm)) { + need_flush |= sent_string(TIPARM_1(set_left_margin_parm, 0)); + need_flush |= sent_string(TIPARM_1(set_right_margin_parm, + columns - 1)); } else #endif - if (clear_margins != 0 - && set_left_margin != 0 - && set_right_margin != 0) { - need_flush |= sent_string(clear_margins); - if (carriage_return != 0) { - need_flush |= sent_string(carriage_return); - } else { - PUTCHAR('\r'); - } + if (VALID_STRING(set_left_margin) + && VALID_STRING(set_right_margin)) { + need_flush |= to_left_margin(); need_flush |= sent_string(set_left_margin); - if (parm_right_cursor) { - need_flush |= sent_string(TPARM_1(parm_right_cursor, - columns - 1)); + if (VALID_STRING(parm_right_cursor)) { + need_flush |= sent_string(TIPARM_1(parm_right_cursor, + columns - 1)); } else { for (i = 0; i < columns - 1; i++) { - PUTCHAR(' '); + out_char(' '); + need_flush = TRUE; } } need_flush |= sent_string(set_right_margin); - if (carriage_return != 0) { - need_flush |= sent_string(carriage_return); - } else { - PUTCHAR('\r'); - } + need_flush |= to_left_margin(); } need_flush |= reset_tabstops(columns);