X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Finserts.c;h=ae38fa21752167566de9d00a92f67521c916f50a;hp=b3b4857ed6b6ed94619e678eeb6c91b2b2662d9d;hb=1c551ea75ea57f9186fbe8d79674ac85baa4d358;hpb=55ccd2b959766810cf7db8d1c4462f338ce0afc8 diff --git a/test/inserts.c b/test/inserts.c index b3b4857e..ae38fa21 100644 --- a/test/inserts.c +++ b/test/inserts.c @@ -1,5 +1,32 @@ +/**************************************************************************** + * Copyright (c) 2002-2010,2012 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 * + * "Software"), to deal in the Software without restriction, including * + * without limitation the rights to use, copy, modify, merge, publish, * + * distribute, distribute with modifications, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included * + * in all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + * * + * Except as contained in this notice, the name(s) of the above copyright * + * holders shall not be used in advertising or otherwise to promote the * + * sale, use or other dealings in this Software without prior written * + * authorization. * + ****************************************************************************/ /* - * $Id: inserts.c,v 1.13 2005/04/16 15:56:42 tom Exp $ + * $Id: inserts.c,v 1.27 2012/12/16 00:35:27 tom Exp $ * * Demonstrate the winsstr() and winsch functions. * Thomas Dickey - 2002/10/19 @@ -7,21 +34,25 @@ #include +#if HAVE_WINSSTR + +#include + #define InsNStr insnstr #define InsStr insstr -#define MvInsNStr mvinsnstr -#define MvInsStr mvinsstr -#define MvWInsNStr mvwinsnstr -#define MvWInsStr mvwinsstr +#define MvInsNStr (void) mvinsnstr +#define MvInsStr (void) mvinsstr +#define MvWInsNStr (void) mvwinsnstr +#define MvWInsStr (void) mvwinsstr #define WInsNStr winsnstr #define WInsStr winsstr #define InsCh insch -#define MvInsCh mvinsch -#define MvWInsCh mvwinsch +#define MvInsCh (void) mvinsch +#define MvWInsCh (void) mvwinsch #define WInsCh winsch -#define TABSIZE 8 +#define MY_TABSIZE 8 typedef enum { oDefault = 0, @@ -37,7 +68,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: @@ -59,7 +90,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 inserted %d characters <%s>", level, showstate, length, buffer); @@ -87,7 +118,7 @@ ColOf(char *buffer, int length, int margin) --result; break; case '\t': - result += (TABSIZE - (result % TABSIZE)); + result += (MY_TABSIZE - (result % MY_TABSIZE)); break; case '\177': result += 2; @@ -118,9 +149,13 @@ test_inserts(int level) WINDOW *look = 0; WINDOW *work = 0; WINDOW *show = 0; - int margin = (2 * TABSIZE) - 1; - Options option = ((m_opt ? oMove : oDefault) - | ((w_opt || (level > 0)) ? oWindow : oDefault)); + int margin = (2 * MY_TABSIZE) - 1; + Options option = (Options) ((unsigned) (m_opt + ? oMove + : oDefault) + | (unsigned) ((w_opt || (level > 0)) + ? oWindow + : oDefault)); if (first) { static char cmd[80]; @@ -132,6 +167,15 @@ test_inserts(int level) (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 inserted in color, to distinguish from those + * that are shifted. + */ + if (has_colors()) { + start_color(); + init_pair(1, COLOR_WHITE, COLOR_BLUE); + } } limit = LINES - 5; @@ -148,15 +192,15 @@ test_inserts(int level) } keypad(work, TRUE); - for (col = margin + 1; col < COLS; col += TABSIZE) - mvwvline(work, row, col, '.', limit - 2); + for (col = margin + 1; col < COLS; col += MY_TABSIZE) + 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'; @@ -165,38 +209,29 @@ test_inserts(int level) doupdate(); - /* - * Show the characters inserted 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 = wgetch(work)) != 'q') { - if (ch == ERR) { - beep(); - break; - } + while ((ch = read_linedata(work)) != ERR && !isQUIT(ch)) { wmove(work, row, margin + 1); switch (ch) { - case 'w': + case key_RECUR: test_inserts(level + 1); - touchwin(look); + if (look) + touchwin(look); touchwin(work); touchwin(show); - wnoutrefresh(look); + if (look) + wnoutrefresh(look); wnoutrefresh(work); wnoutrefresh(show); doupdate(); break; - case CTRL('N'): - case KEY_DOWN: + case key_NEWLINE: if (row < limit) { ++row; /* put the whole string in, all at once */ @@ -279,15 +314,12 @@ test_inserts(int level) beep(); } break; - case KEY_BACKSPACE: - ch = '\b'; - /* FALLTHRU */ default: if (ch <= 0 || ch > 255) { beep(); break; } - buffer[length++] = ch; + buffer[length++] = (char) ch; buffer[length] = '\0'; /* put the string in, one character at a time */ @@ -341,10 +373,10 @@ test_inserts(int level) } } if (level > 0) { - delwin(show); delwin(work); delwin(look); } + delwin(show); } static void @@ -355,6 +387,7 @@ usage(void) "Usage: inserts [options]" ,"" ,"Options:" + ," -f FILE read data from given file" ," -n NUM limit string-inserts to NUM bytes on ^N replay" ," -m perform wmove/move separately from insert-functions" ," -w use window-parameter even when stdscr would be implied" @@ -372,8 +405,11 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "mn:w")) != EOF) { + while ((ch = getopt(argc, argv, "f:mn:w")) != -1) { switch (ch) { + case 'f': + init_linedata(optarg); + break; case 'm': m_opt = TRUE; break; @@ -397,3 +433,11 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) endwin(); ExitProgram(EXIT_SUCCESS); } +#else +int +main(void) +{ + printf("This program requires the winsstr function\n"); + ExitProgram(EXIT_FAILURE); +} +#endif /* HAVE_WINSSTR */