+/****************************************************************************
+ * Copyright (c) 1998-2013,2015 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. *
+ ****************************************************************************/
/*
* view.c -- a silly little viewer program
*
* scroll operation worked, and the refresh() code only had to do a
* partial repaint.
*
- * $Id: view.c,v 1.62 2005/05/28 21:40:25 tom Exp $
+ * $Id: view.c,v 1.95 2015/10/10 20:03:58 tom Exp $
*/
#include <test.priv.h>
+#include <widechars.h>
#include <time.h>
#if HAVE_TERMIOS_H
# include <termios.h>
#else
+#if !defined(__MINGW32__)
# include <sgtty.h>
#endif
+#endif
#if !defined(sun) || !HAVE_TERMIOS_H
# if HAVE_SYS_IOCTL_H
#include <sys/ptem.h>
#endif
-static RETSIGTYPE finish(int sig) GCC_NORETURN;
+#undef CTRL
+#define CTRL(x) ((x) & 0x1f)
+
+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
-static bool waiting = FALSE;
static int shift = 0;
static bool try_color = FALSE;
static NCURSES_CH_T **lptr;
static int num_lines;
+static void usage(void) GCC_NORETURN;
+
static void
usage(void)
{
#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"
{
int result = 0;
#if USE_WIDEC_SUPPORT
+ int count;
#endif
#if USE_WIDEC_SUPPORT
- while (getcchar(src++, NULL, NULL, NULL, NULL) > 0)
- result++;
+ for (;;) {
+ TEST_CCHAR(src, count, {
+ ++result;
+ ++src;
+ }
+ , {
+ break;
+ })
+ }
#else
while (*src++)
result++;
static NCURSES_CH_T *
ch_dup(char *src)
{
- unsigned len = strlen(src);
+ unsigned len = (unsigned) strlen(src);
NCURSES_CH_T *dst = typeMalloc(NCURSES_CH_T, len + 1);
- unsigned j, k;
+ size_t j, k;
#if USE_WIDEC_SUPPORT
wchar_t wstr[CCHARW_MAX + 1];
wchar_t wch;
int l = 0;
- mbstate_t state;
size_t rc;
int width;
+#ifndef state_unused
+ mbstate_t state;
#endif
+#endif /* USE_WIDEC_SUPPORT */
#if USE_WIDEC_SUPPORT
- memset(&state, 0, sizeof(state));
+ reset_mbytes(state);
#endif
for (j = k = 0; j < len; j++) {
#if USE_WIDEC_SUPPORT
- rc = mbrtowc(&wch, src + j, len - j, &state);
- if (rc == (size_t) -1 || rc == (size_t) -2)
+ rc = (size_t) check_mbytes(wch, src + j, len - j, state);
+ 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++] = src[j];
+ dst[k++] = (chtype) UChar(src[j]);
#endif
}
#if USE_WIDEC_SUPPORT
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:")) != EOF) {
+ while ((i = getopt(argc, argv, "cin:rstT:")) != -1) {
switch (i) {
case 'c':
try_color = TRUE;
break;
case 'i':
- signal(SIGINT, SIG_IGN);
- signal(SIGQUIT, SIG_IGN);
- signal(SIGTERM, SIG_IGN);
+ CATCHALL(SIG_IGN);
break;
case 'n':
- if ((MAXLINES = atoi(optarg)) < 1)
+ if ((MAXLINES = atoi(optarg)) < 1 ||
+ (MAXLINES + 2) <= 1)
usage();
break;
#if CAN_RESIZE
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);
if (optind + 1 != argc)
usage();
- if ((vec_lines = typeMalloc(NCURSES_CH_T *, MAXLINES + 2)) == 0)
+ if ((vec_lines = typeCalloc(NCURSES_CH_T *, (size_t) MAXLINES + 2)) == 0)
usage();
+ assert(vec_lines != 0);
+
fname = argv[optind];
if ((fp = fopen(fname, "r")) == 0) {
perror(fname);
(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;
} else {
sprintf(d, "\\%03o", UChar(*s));
d += strlen(d);
- col = (d - temp);
+ col = (int) (d - temp);
}
#endif
}
*lptr = ch_dup(temp);
}
(void) fclose(fp);
- num_lines = lptr - vec_lines;
+ num_lines = (int) (lptr - vec_lines);
(void) initscr(); /* initialize the curses library */
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 */
(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;
}
if (!got_number)
show_all(my_label);
- n = 0;
for (;;) {
#if CAN_RESIZE
if (interrupted) {
adjust(0);
my_label = "interrupt";
}
-#endif
waiting = TRUE;
c = getch();
waiting = FALSE;
+#else
+ c = getch();
+#endif
if ((c < 127) && isdigit(c)) {
if (!got_number) {
- mvprintw(0, 0, "Count: ");
+ MvPrintw(0, 0, "Count: ");
clrtoeol();
}
addch(UChar(c));
lptr++;
else
break;
- wscrl(stdscr, lptr - olptr);
+ scrl((int) (lptr - olptr));
break;
case KEY_UP:
lptr--;
else
break;
- wscrl(stdscr, lptr - olptr);
+ scrl((int) (lptr - olptr));
break;
case 'h':
nodelay(stdscr, TRUE);
my_delay = 0;
break;
+ case CTRL('L'):
+ redrawwin(stdscr);
+ break;
case ERR:
if (!my_delay)
napms(50);
finish(0); /* we're done */
}
-static RETSIGTYPE
+static void
finish(int sig)
{
endwin();
#if CAN_RESIZE
/*
- * This uses functions that are "unsafe", but it seems to work on SunOS and
- * Linux. Usually: the "unsafe" refers to the functions that POSIX lists
- * which may be called from a signal handler. Those do not include buffered
- * I/O, which is used for instance in wrefresh(). To be really portable, you
- * should use the KEY_RESIZE return (which relies on ncurses' sigwinch
- * handler).
+ * This uses functions that are "unsafe", but it seems to work on SunOS.
+ * Usually: the "unsafe" refers to the functions that POSIX lists which may be
+ * called from a signal handler. Those do not include buffered I/O, which is
+ * used for instance in wrefresh(). To be really portable, you should use the
+ * KEY_RESIZE return (which relies on ncurses' sigwinch handler).
*
* 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) {
if (ioctl(fileno(stdout), TIOCGWINSZ, &size) == 0) {
resize_term(size.ws_row, size.ws_col);
- wrefresh(curscr); /* Linux needs this */
+ wrefresh(curscr);
show_all(sig ? "SIGWINCH" : "interrupt");
}
interrupted = FALSE;
time_t this_time;
#if CAN_RESIZE
- sprintf(temp, "%s (%3dx%3d) col %d ", tag, LINES, COLS, shift);
- i = strlen(temp);
- sprintf(temp + i, "view %.*s", (int) (sizeof(temp) - 7 - i), fname);
+ sprintf(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);
+ }
#else
+ (void) tag;
sprintf(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));
- if ((i = strlen(temp)) != 0) {
+ strncpy(temp, ctime(&this_time), (size_t) 30);
+ if ((i = (int) strlen(temp)) != 0) {
temp[--i] = 0;
if (move(0, COLS - i - 2) != ERR)
printw(" %s", temp);
projects / ncurses.git / blobdiff