/****************************************************************************
- * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc. *
+ * Copyright 2019-2020,2021 Thomas E. Dickey *
+ * Copyright 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.129 2017/10/22 00:49:23 tom Exp $
+ * $Id: view.c,v 1.142 2021/06/12 23:16:31 tom Exp $
*/
#include <test.priv.h>
#include <sys/stat.h>
#include <time.h>
-#undef CTRL /* conflict on AIX 5.2 with <sys/ioctl.h> */
-
-static void finish(int sig) GCC_NORETURN;
+static GCC_NORETURN void finish(int sig);
#define my_pair 1
-#undef CTRL
-#define CTRL(x) ((x) & 0x1f)
-
static int shift = 0;
static bool try_color = FALSE;
static bool n_option = FALSE;
#endif
-static void usage(void) GCC_NORETURN;
-
-static void
+static GCC_NORETURN void
failed(const char *msg)
{
endwin();
}
static int
-ch_len(NCURSES_CH_T * src)
+ch_len(NCURSES_CH_T *src)
{
int result = 0;
-#if USE_WIDEC_SUPPORT
- int count;
-#endif
#if USE_WIDEC_SUPPORT
for (;;) {
+ int count;
TEST_CCHAR(src, count, {
int len = wcwidth(test_wch[0]);
result += (len > 0) ? len : 1;
show_all(const char *tag)
{
int i;
+ int digits;
char temp[BUFSIZ];
- NCURSES_CH_T *s;
time_t this_time;
+ for (digits = 1, i = num_lines; i > 0; i /= 10) {
+ ++digits;
+ }
+
_nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
"view %.*s", (int) strlen(tag), tag);
i = (int) strlen(temp);
- _nc_SPRINTF(temp + i, _nc_SLIMIT(sizeof(temp) - i)
+ _nc_SPRINTF(temp + i, _nc_SLIMIT(sizeof(temp) - (size_t) i)
" %.*s", (int) sizeof(temp) - i - 2, fname);
move(0, 0);
printw("%.*s", COLS, temp);
scrollok(stdscr, FALSE); /* prevent screen from moving */
for (i = 1; i < LINES; i++) {
+ NCURSES_CH_T *s;
int len;
int actual = (int) (lptr + i - vec_lines);
+
if (actual > num_lines) {
if (i < LINES - 1) {
int y, x;
break;
}
move(i, 0);
- printw("%3d:", actual);
+ printw("%*d:", digits, actual);
clrtoeol();
if ((s = lptr[i - 1]) == 0) {
continue;
*/
{
int j;
- int width = 1, count;
+ int width = 1;
+
for (j = actual = 0; j < shift; ++j) {
+ int count;
+
TEST_CCHAR(s + j, count, {
width = wcwidth(test_wch[0]);
}
}
len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp);
- my_blob[sb.st_size] = '\0';
fclose(fp);
+ if (len > (size_t) sb.st_size)
+ len = (size_t) sb.st_size;
+ my_blob[len] = '\0';
+
for (pass = 0; pass < 2; ++pass) {
char *base = my_blob;
k = 0;
++k;
}
}
+ if (base != (my_blob + j)) {
+ if (pass)
+ my_vec[k] = base;
+ ++k;
+ }
num_lines = k;
- if (base != (my_blob + j))
- ++num_lines;
- if (!pass &&
- ((my_vec = typeCalloc(char *, (size_t) k + 2)) == 0)) {
- failed("cannot allocate line-vector #1");
+ if (pass == 0) {
+ if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == 0)) {
+ failed("cannot allocate line-vector #1");
+ }
+ } else {
+ if (my_vec[0] == NULL)
+ my_vec[0] = my_blob;
}
}
#if USE_WIDEC_SUPPORT
- if (!memcmp("", my_blob, 3)) {
+ if (!memcmp("\357\273\277", my_blob, 3)) {
char *s = my_blob + 3;
char *d = my_blob;
Trace(("trim BOM"));
}
width = (width + 1) * 5;
my_win = newwin(2, width, 0, 0);
- if (my_win == 0)
+ if (my_win == 0) {
failed("cannot allocate temporary window");
+ }
- if ((vec_lines = typeCalloc(NCURSES_CH_T *, (size_t) num_lines + 2)) == 0)
+ if ((vec_lines = typeCalloc(NCURSES_CH_T *, (size_t) num_lines + 2)) == 0) {
failed("cannot allocate line-vector #2");
+ }
/*
* Use the curses library for rendering, including tab-conversion. This
if (y)
x = width - 1;
wmove(my_win, 0, 0);
- if ((vec_lines[k] = typeCalloc(NCURSES_CH_T, (size_t) x + 1)) == 0)
+ /* "x + 1" works with standard curses; some implementations are buggy */
+ if ((vec_lines[k] = typeCalloc(NCURSES_CH_T, x + width + 1)) == 0) {
failed("cannot allocate line-vector #3");
+ }
#if USE_WIDEC_SUPPORT
win_wchnstr(my_win, vec_lines[k], x);
#else
free(my_blob);
}
-static void
+static GCC_NORETURN void
usage(void)
{
static const char *msg[] =
" 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",
+ " <,> - scroll the viewport left/right by 8 columns",
"",
" h,<Home> - scroll the viewport to top of file",
" ^F,<PageDn> - scroll to the next page",
setlocale(LC_ALL, "");
- while ((i = getopt(argc, argv, "cirstT:")) != -1) {
+ while ((i = getopt(argc, argv, "cinstT:")) != -1) {
switch (i) {
case 'c':
try_color = TRUE;
case 'i':
ignore_sigs = TRUE;
break;
+#if USE_WIDEC_SUPPORT
+ case 'n':
+ n_option = TRUE;
+ break;
+#endif
case 's':
single_step = TRUE;
break;
int tvalue = (int) strtol(optarg, &next, 0);
if (tvalue < 0 || (next != 0 && *next != 0))
usage();
- trace((unsigned) tvalue);
+ curses_trace((unsigned) tvalue);
}
break;
case 't':
- trace(TRACE_CALLS);
+ curses_trace(TRACE_CALLS);
break;
#endif
default:
scrl((int) (lptr - olptr));
break;
- case '<':
- shift = 0;
- /* FALLTHRU */
case 'h':
/* FALLTHRU */
case KEY_HOME:
lptr = vec_lines;
break;
+ case '<':
+ if ((shift -= 8) < 0)
+ shift = 0;
+ break;
case '>':
- shift = 0;
- /* FALLTHRU */
+ shift += 8;
+ break;
+
case 'e':
/* FALLTHRU */
case KEY_END: