/****************************************************************************
- * Copyright (c) 1998-2010,2011 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 *
* scroll operation worked, and the refresh() code only had to do a
* partial repaint.
*
- * $Id: view.c,v 1.84 2011/12/10 15:42:34 tom Exp $
+ * $Id: view.c,v 1.102 2017/09/04 00:39:24 tom Exp $
*/
#include <test.priv.h>
+#include <widechars.h>
+#include <popup_msg.h>
#include <time.h>
#include <sys/ptem.h>
#endif
-#if USE_WIDEC_SUPPORT
-#if HAVE_MBTOWC && HAVE_MBLEN
-#define reset_mbytes(state) IGNORE_RC(mblen(NULL, 0)), IGNORE_RC(mbtowc(NULL, NULL, 0))
-#define count_mbytes(buffer,length,state) mblen(buffer,length)
-#define check_mbytes(wch,buffer,length,state) \
- (int) mbtowc(&wch, buffer, length)
-#define state_unused
-#elif HAVE_MBRTOWC && HAVE_MBRLEN
-#define reset_mbytes(state) init_mb(state)
-#define count_mbytes(buffer,length,state) mbrlen(buffer,length,&state)
-#define check_mbytes(wch,buffer,length,state) \
- (int) mbrtowc(&wch, buffer, length, &state)
-#else
-make an error
-#endif
-#endif /* USE_WIDEC_SUPPORT */
+#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
#endif
#if CAN_RESIZE
-static RETSIGTYPE adjust(int sig);
+static void adjust(int sig);
static int interrupted;
static bool waiting = FALSE;
#endif
#if defined(KEY_RESIZE)
," -r use old-style sigwinch handler rather than KEY_RESIZE"
#endif
+ ," -s start in single-step mode, waiting for input"
#ifdef TRACE
," -t trace screen updates"
," -T NUM specify trace mask"
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]);
int
main(int argc, char *argv[])
{
+ static const char *help[] =
+ {
+ "Commands:",
+ " q,^Q,ESC - quit this program",
+ "",
+ " p,<Up> - scroll the viewport up by one row",
+ " n,<Down> - scroll the viewport down by one row",
+ " l,<Left> - scroll the viewport left by one column",
+ " r,<Right> - scroll the viewport right by one column",
+ "",
+ " h,<Home> - scroll the viewport to top of file",
+ " e,<End> - 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()",
+ " <space> - begin nodelay()",
+ 0
+ };
+
int MAXLINES = 1000;
FILE *fp;
char buf[BUFSIZ];
int value = 0;
bool done = FALSE;
bool got_number = FALSE;
+ bool single_step = FALSE;
#if CAN_RESIZE
bool nonposix_resize = FALSE;
#endif
(void) signal(SIGINT, finish); /* arrange interrupts to terminate */
#endif
- while ((i = getopt(argc, argv, "cin:rtT:")) != -1) {
+ while ((i = getopt(argc, argv, "cin:rstT:")) != -1) {
switch (i) {
case 'c':
try_color = TRUE;
nonposix_resize = TRUE;
break;
#endif
+ case 's':
+ single_step = TRUE;
+ break;
#ifdef TRACE
case 'T':
- trace((unsigned) atoi(optarg));
+ {
+ char *next = 0;
+ int tvalue = (int) strtol(optarg, &next, 0);
+ if (tvalue < 0 || (next != 0 && *next != 0))
+ usage();
+ trace((unsigned) tvalue);
+ }
break;
case 't':
trace(TRACE_CALLS);
(void) signal(SIGWINCH, adjust); /* arrange interrupts to resize */
#endif
- /* slurp the file */
+ Trace(("slurp the file"));
for (lptr = &vec_lines[0]; (lptr - vec_lines) < MAXLINES; lptr++) {
char temp[BUFSIZ], *s, *d;
int col;
if (fgets(buf, sizeof(buf), fp) == 0)
break;
- /* convert tabs so that shift will work properly */
+#if USE_WIDEC_SUPPORT
+ if (lptr == vec_lines) {
+ if (!memcmp("", buf, 3)) {
+ Trace(("trim BOM"));
+ s = buf + 3;
+ d = buf;
+ do {
+ } while ((*d++ = *s++) != '\0');
+ }
+ }
+#endif
+
+ /* 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') {
+ continue;
+ } else {
+ break;
+ }
+ }
if (*d == '\n') {
*d = '\0';
break;
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);
}
(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 */
(void) noecho(); /* don't echo input */
- nodelay(stdscr, TRUE);
+ if (!single_step)
+ nodelay(stdscr, TRUE);
idlok(stdscr, TRUE); /* allow use of insert/delete line */
if (try_color) {
if (has_colors()) {
start_color();
init_pair(my_pair, COLOR_WHITE, COLOR_BLUE);
- bkgd(COLOR_PAIR(my_pair));
+ bkgd((chtype) COLOR_PAIR(my_pair));
} else {
try_color = FALSE;
}
break;
case 'q':
+ case QUIT:
+ case ESCAPE:
done = TRUE;
break;
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);
my_delay = 0;
break;
+ case CTRL('L'):
+ redrawwin(stdscr);
+ break;
case ERR:
if (!my_delay)
napms(50);
break;
+ case HELP_KEY_1:
+ popup_msg(stdscr, help);
+ break;
default:
beep();
break;
finish(0); /* we're done */
}
-static RETSIGTYPE
+static void
finish(int sig)
{
endwin();
* 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) {
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);
- strcpy(temp, ctime(&this_time));
+ _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)
projects / ncurses.git / blobdiff