X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;ds=sidebyside;f=test%2Ftest_addstr.c;h=ba8a90e5cd82e4e295b75202f5b9bf50af7824ba;hb=HEAD;hp=a0029706d66c2672ec470eb5654603f5a8f74ab2;hpb=3511767aa77f332927de0c4a610f9fb37ea18101;p=ncurses.git diff --git a/test/test_addstr.c b/test/test_addstr.c index a0029706..ba8a90e5 100644 --- a/test/test_addstr.c +++ b/test/test_addstr.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 2009 Free Software Foundation, Inc. * + * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2009-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 * @@ -26,30 +27,25 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_addstr.c,v 1.2 2009/09/12 22:52:29 tom Exp $ + * $Id: test_addstr.c,v 1.20 2022/12/10 22:28:50 tom Exp $ * * Demonstrate the waddstr() and waddch functions. * Thomas Dickey - 2009/9/12 */ #include - #include +/* + * redefinitions to simplify comparison between test_*str programs + */ #define AddNStr addnstr #define AddStr addstr -#define MvAddNStr mvaddnstr -#define MvAddStr mvaddstr -#define MvWAddNStr mvwaddnstr -#define MvWAddStr mvwaddstr +#define MvAddNStr (void) mvaddnstr +#define MvWAddNStr (void) mvwaddnstr #define WAddNStr waddnstr #define WAddStr waddstr -#define AddCh addch -#define MvAddCh mvaddch -#define MvWAddCh mvwaddch -#define WAddCh waddch - #define MY_TABSIZE 8 typedef enum { @@ -66,7 +62,7 @@ static int n_opt = -1; static void legend(WINDOW *win, int level, Options state, char *buffer, int length) { - NCURSES_CONST char *showstate; + const char *showstate; switch (state) { default: @@ -88,7 +84,7 @@ legend(WINDOW *win, int level, Options state, char *buffer, int length) wprintw(win, "The Strings/Chars displays should match. Enter any characters, except:\n"); wprintw(win, - "down-arrow or ^N to repeat on next line, 'w' for inner window, 'q' to exit.\n"); + "down-arrow or ^N to repeat on next line, ^W for inner window, ESC to exit.\n"); wclrtoeol(win); wprintw(win, "Level %d,%s added %d characters <%s>", level, showstate, length, buffer); @@ -133,7 +129,7 @@ ColOf(char *buffer, int length, int margin) #define LEN(n) ((length - (n) > n_opt) ? n_opt : (length - (n))) static void -test_adds(int level) +recursive_test(int level) { static bool first = TRUE; @@ -159,12 +155,22 @@ test_adds(int level) static char cmd[80]; setlocale(LC_ALL, ""); - putenv(strcpy(cmd, "TABSIZE=8")); + _nc_STRCPY(cmd, "TABSIZE=8", sizeof(cmd)); + putenv(cmd); initscr(); (void) cbreak(); /* take input chars one at a time, no wait for \n */ (void) noecho(); /* don't echo input */ keypad(stdscr, TRUE); + + /* + * Show the characters added in color, to distinguish from those that + * are shifted. + */ + if (has_colors()) { + start_color(); + init_pair(1, COLOR_WHITE, COLOR_BLUE); + } } limit = LINES - 5; @@ -182,14 +188,14 @@ test_adds(int level) keypad(work, TRUE); for (col = margin + 1; col < COLS; col += MY_TABSIZE) - mvwvline(work, row, col, '.', limit - 2); + MvWVLine(work, row, col, '.', limit - 2); - mvwvline(work, row, margin, ACS_VLINE, limit - 2); - mvwvline(work, row, margin + 1, ACS_VLINE, limit - 2); + MvWVLine(work, row, margin, ACS_VLINE, limit - 2); + MvWVLine(work, row, margin + 1, ACS_VLINE, limit - 2); limit /= 2; - mvwaddstr(work, 1, 2, "String"); - mvwaddstr(work, limit + 1, 2, "Chars"); + MvWAddStr(work, 1, 2, "String"); + MvWAddStr(work, limit + 1, 2, "Chars"); wnoutrefresh(work); buffer[length = 0] = '\0'; @@ -198,27 +204,23 @@ test_adds(int level) doupdate(); - /* - * Show the characters added in color, to distinguish from those that - * are shifted. - */ if (has_colors()) { - start_color(); - init_pair(1, COLOR_WHITE, COLOR_BLUE); - wbkgdset(work, COLOR_PAIR(1) | ' '); + wbkgdset(work, (chtype) (COLOR_PAIR(1) | ' ')); } while ((ch = read_linedata(work)) != ERR && !isQUIT(ch)) { wmove(work, row, margin + 1); switch (ch) { case key_RECUR: - test_adds(level + 1); + recursive_test(level + 1); - touchwin(look); + if (look) + touchwin(look); touchwin(work); touchwin(show); - wnoutrefresh(look); + if (look) + wnoutrefresh(look); wnoutrefresh(work); wnoutrefresh(show); @@ -312,7 +314,7 @@ test_adds(int level) beep(); break; } - buffer[length++] = ch; + buffer[length++] = (char) ch; buffer[length] = '\0'; /* put the string in, one character at a time */ @@ -365,40 +367,44 @@ test_adds(int level) break; } } + delwin(show); if (level > 0) { - delwin(show); delwin(work); delwin(look); } } static void -usage(void) +usage(int ok) { static const char *tbl[] = { "Usage: test_addstr [options]" ,"" + ,USAGE_COMMON ,"Options:" - ," -f FILE read data from given file" - ," -n NUM limit string-adds to NUM bytes on ^N replay" - ," -m perform wmove/move separately from add-functions" - ," -w use window-parameter even when stdscr would be implied" + ," -f FILE read data from given file" + ," -n NUM limit string-adds to NUM bytes on ^N replay" + ," -m perform wmove/move separately from add-functions" + ," -w use window-parameter even when stdscr would be implied" }; unsigned n; for (n = 0; n < SIZEOF(tbl); ++n) fprintf(stderr, "%s\n", tbl[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { int ch; setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "f:mn:w")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "f:mn:w")) != -1) { switch (ch) { case 'f': init_linedata(optarg); @@ -414,15 +420,18 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) case 'w': w_opt = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (optind < argc) - usage(); + usage(FALSE); - test_adds(0); + recursive_test(0); endwin(); ExitProgram(EXIT_SUCCESS); }