X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fview.c;h=e24628e2fb263f4b1e66e46ecfd1db9d94e81813;hp=f775040a8d79018bac73a4719a56b4694b55c90e;hb=12b49d3c56a6130feb2d39fbe2d6c1bc0838f0fa;hpb=a1e63be290fce9e589bc57c9f753be09e8ac0cc7 diff --git a/test/view.c b/test/view.c index f775040a..e24628e2 100644 --- a/test/view.c +++ b/test/view.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2012,2013 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 * @@ -50,11 +50,12 @@ * scroll operation worked, and the refresh() code only had to do a * partial repaint. * - * $Id: view.c,v 1.91 2013/01/13 01:00:44 tom Exp $ + * $Id: view.c,v 1.104 2017/09/30 17:50:38 tom Exp $ */ #include #include +#include #include @@ -85,7 +86,7 @@ #undef CTRL #define CTRL(x) ((x) & 0x1f) -static RETSIGTYPE finish(int sig) GCC_NORETURN; +static void finish(int sig) GCC_NORETURN; static void show_all(const char *tag); #if defined(SIGWINCH) && defined(TIOCGWINSZ) && HAVE_RESIZE_TERM @@ -95,7 +96,7 @@ static void show_all(const char *tag); #endif #if CAN_RESIZE -static RETSIGTYPE adjust(int sig); +static void adjust(int sig); static int interrupted; static bool waiting = FALSE; #endif @@ -188,20 +189,23 @@ ch_dup(char *src) for (j = k = 0; j < len; j++) { #if USE_WIDEC_SUPPORT rc = (size_t) check_mbytes(wch, src + j, len - j, state); - if (rc == (size_t) -1 || rc == (size_t) -2) + if (rc == (size_t) -1 || rc == (size_t) -2) { break; + } j += rc - 1; - if ((width = wcwidth(wch)) < 0) - break; - if ((width > 0 && l > 0) || l == CCHARW_MAX) { + width = wcwidth(wch); + if (width == 0) { + if (l == 0) { + wstr[l++] = L' '; + } + } else if ((l > 0) || (l == CCHARW_MAX)) { wstr[l] = L'\0'; l = 0; - if (setcchar(dst + k, wstr, 0, 0, NULL) != OK) + if (setcchar(dst + k, wstr, 0, 0, NULL) != OK) { break; + } ++k; } - if (width == 0 && l == 0) - wstr[l++] = L' '; wstr[l++] = wch; #else dst[k++] = (chtype) UChar(src[j]); @@ -224,6 +228,28 @@ ch_dup(char *src) int main(int argc, char *argv[]) { + static const char *help[] = + { + "Commands:", + " q,^Q,ESC - quit this program", + "", + " p, - scroll the viewport up by one row", + " n, - scroll the viewport down by one row", + " l, - scroll the viewport left by one column", + " r, - scroll the viewport right by one column", + "", + " h, - scroll the viewport to top of file", + " e, - scroll the viewport to end of file", + "", + " ^L - repaint using redrawwin()", + "", + " 0 through 9 - enter digits for count", + " s - use entered count for halfdelay() parameter", + " - if no entered count, stop nodelay()", + " - begin nodelay()", + 0 + }; + int MAXLINES = 1000; FILE *fp; char buf[BUFSIZ]; @@ -233,7 +259,8 @@ main(int argc, char *argv[]) int value = 0; bool done = FALSE; bool got_number = FALSE; - bool single_step = TRUE; + bool ignore_sigs = FALSE; + bool single_step = FALSE; #if CAN_RESIZE bool nonposix_resize = FALSE; #endif @@ -255,7 +282,7 @@ main(int argc, char *argv[]) try_color = TRUE; break; case 'i': - CATCHALL(SIG_IGN); + ignore_sigs = TRUE; break; case 'n': if ((MAXLINES = atoi(optarg)) < 1 || @@ -329,10 +356,11 @@ main(int argc, char *argv[]) /* convert tabs and nonprinting chars so that shift will work properly */ for (s = buf, d = temp, col = 0; (*d = *s) != '\0'; s++) { if (*d == '\r') { - if (s[1] == '\n') + if (s[1] == '\n') { continue; - else + } else { break; + } } if (*d == '\n') { *d = '\0'; @@ -349,7 +377,8 @@ main(int argc, char *argv[]) col++; d++; } else { - sprintf(d, "\\%03o", UChar(*s)); + _nc_SPRINTF(d, _nc_SLIMIT(sizeof(temp) - (d - buf)) + "\\%03o", UChar(*s)); d += strlen(d); col = (int) (d - temp); } @@ -360,7 +389,11 @@ main(int argc, char *argv[]) (void) fclose(fp); num_lines = (int) (lptr - vec_lines); - (void) initscr(); /* initialize the curses library */ + if (ignore_sigs) { + InitAndCatch(initscr(), SIG_IGN); + } else { + initscr(); + } keypad(stdscr, TRUE); /* enable keyboard mapping */ (void) nonl(); /* tell curses not to do NL->CR/NL on output */ (void) cbreak(); /* take input chars one at a time, no wait for \n */ @@ -468,6 +501,8 @@ main(int argc, char *argv[]) break; case 'q': + case QUIT: + case ESCAPE: done = TRUE; break; @@ -476,12 +511,17 @@ main(int argc, char *argv[]) break; #endif case 's': +#if HAVE_HALFDELAY if (got_number) { halfdelay(my_delay = n); } else { nodelay(stdscr, FALSE); my_delay = -1; } +#else + nodelay(stdscr, FALSE); + my_delay = -1; +#endif break; case ' ': nodelay(stdscr, TRUE); @@ -494,6 +534,9 @@ main(int argc, char *argv[]) if (!my_delay) napms(50); break; + case HELP_KEY_1: + popup_msg(stdscr, help); + break; default: beep(); break; @@ -507,7 +550,7 @@ main(int argc, char *argv[]) finish(0); /* we're done */ } -static RETSIGTYPE +static void finish(int sig) { endwin(); @@ -534,7 +577,7 @@ finish(int sig) * The 'wrefresh(curscr)' is needed to force the refresh to start from the top * of the screen -- some xterms mangle the bitmap while resizing. */ -static RETSIGTYPE +static void adjust(int sig) { if (waiting || sig == 0) { @@ -562,22 +605,25 @@ show_all(const char *tag) time_t this_time; #if CAN_RESIZE - sprintf(temp, "%.20s (%3dx%3d) col %d ", tag, LINES, COLS, shift); + _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) + "%.20s (%3dx%3d) col %d ", tag, LINES, COLS, shift); i = (int) strlen(temp); if ((i + 7) < (int) sizeof(temp)) { - sprintf(temp + i, "view %.*s", - (int) (sizeof(temp) - 7 - (size_t) i), - fname); + _nc_SPRINTF(temp + i, _nc_SLIMIT(sizeof(temp) - (size_t) i) + "view %.*s", + (int) (sizeof(temp) - 7 - (size_t) i), + fname); } #else (void) tag; - sprintf(temp, "view %.*s", (int) sizeof(temp) - 7, fname); + _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) + "view %.*s", (int) sizeof(temp) - 7, fname); #endif move(0, 0); printw("%.*s", COLS, temp); clrtoeol(); this_time = time((time_t *) 0); - strncpy(temp, ctime(&this_time), 30); + _nc_STRNCPY(temp, ctime(&this_time), (size_t) 30); if ((i = (int) strlen(temp)) != 0) { temp[--i] = 0; if (move(0, COLS - i - 2) != ERR) @@ -600,7 +646,7 @@ show_all(const char *tag) } #if defined(NCURSES_VERSION) || defined(HAVE_WCHGAT) if (try_color) - wchgat(stdscr, -1, A_NORMAL, my_pair, NULL); + wchgat(stdscr, -1, WA_NORMAL, my_pair, NULL); #endif } }