X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fview.c;h=e4d746f4d6c5a631256bd6df4401f9efa084ad97;hp=aa06a3e8d6bd3e3bd1747806acef62d3d9db79bb;hb=fbd79f88d0de057053bd9658499f4e87c10ff2f4;hpb=58369d647d003dd9d9e1ecfc5ab07982db28f3da

diff --git a/test/view.c b/test/view.c
index aa06a3e8..e4d746f4 100644
--- a/test/view.c
+++ b/test/view.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ * Copyright 2019,2020 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            *
@@ -51,7 +52,7 @@
  * 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.138 2020/02/02 23:34:34 tom Exp $
  */
 
 #include <test.priv.h>
@@ -61,15 +62,10 @@
 #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;
 
 #define my_pair 1
 
-#undef CTRL
-#define CTRL(x)	((x) & 0x1f)
-
 static int shift = 0;
 static bool try_color = FALSE;
 
@@ -93,7 +89,7 @@ failed(const char *msg)
 }
 
 static int
-ch_len(NCURSES_CH_T * src)
+ch_len(NCURSES_CH_T *src)
 {
     int result = 0;
 #if USE_WIDEC_SUPPORT
@@ -138,14 +134,19 @@ static void
 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);
@@ -173,7 +174,7 @@ show_all(const char *tag)
 	    break;
 	}
 	move(i, 0);
-	printw("%3d:", actual);
+	printw("%*d:", digits, actual);
 	clrtoeol();
 	if ((s = lptr[i - 1]) == 0) {
 	    continue;
@@ -282,7 +283,7 @@ read_file(const char *filename)
     }
 
 #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"));
@@ -299,11 +300,13 @@ read_file(const char *filename)
     }
     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
@@ -347,8 +350,10 @@ read_file(const char *filename)
 	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
@@ -398,6 +403,7 @@ main(int argc, char *argv[])
 	"  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",
@@ -425,7 +431,7 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    while ((i = getopt(argc, argv, "cirstT:")) != -1) {
+    while ((i = getopt(argc, argv, "cinstT:")) != -1) {
 	switch (i) {
 	case 'c':
 	    try_color = TRUE;
@@ -433,6 +439,11 @@ main(int argc, char *argv[])
 	case 'i':
 	    ignore_sigs = TRUE;
 	    break;
+#if USE_WIDEC_SUPPORT
+	case 'n':
+	    n_option = TRUE;
+	    break;
+#endif
 	case 's':
 	    single_step = TRUE;
 	    break;
@@ -443,11 +454,11 @@ main(int argc, char *argv[])
 		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:
@@ -529,18 +540,20 @@ main(int argc, char *argv[])
 	    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: