ncurses 5.9 - patch 20121229

[ncurses.git] / test / view.c

diff --git a/test/view.c b/test/view.c
index 97511ca2159b3aaf6acf59fee84c0fbbefe3dd2e..76a88a3096aeea8ac99f8b4721e3198048f724ae 100644 (file)
--- a/test/view.c
+++ b/test/view.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2011,2012 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -50,10 +50,11 @@
  * scroll operation worked, and the refresh() code only had to do a
  * partial repaint.
  *
  * scroll operation worked, and the refresh() code only had to do a
  * partial repaint.
  *

- * $Id: view.c,v 1.83 2011/05/21 18:40:49 tom Exp $
+ * $Id: view.c,v 1.89 2012/12/29 22:38:28 tom Exp $

  */
 
 #include <test.priv.h>
  */
 
 #include <test.priv.h>

+#include <widechars.h>

 
 #include <time.h>
 
 
 #include <time.h>
 


@@ -81,23 +82,6 @@
 #include <sys/ptem.h>
 #endif
 
 #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 */
-

 static RETSIGTYPE finish(int sig) GCC_NORETURN;
 static void show_all(const char *tag);
 
 static RETSIGTYPE finish(int sig) GCC_NORETURN;
 static void show_all(const char *tag);
 


@@ -110,9 +94,9 @@ static void show_all(const char *tag);
 #if CAN_RESIZE
 static RETSIGTYPE adjust(int sig);
 static int interrupted;
 #if CAN_RESIZE
 static RETSIGTYPE adjust(int sig);
 static int interrupted;

+static bool waiting = FALSE;

 #endif
 
 #endif
 

-static bool waiting = FALSE;

 static int shift = 0;
 static bool try_color = FALSE;
 
 static int shift = 0;
 static bool try_color = FALSE;
 


@@ -280,7 +264,13 @@ main(int argc, char *argv[])
 #endif
 #ifdef TRACE
        case 'T':
 #endif
 #ifdef TRACE
        case 'T':

-           trace((unsigned) atoi(optarg));
+           {
+               char *next = 0;
+               int tvalue = strtol(optarg, &next, 0);
+               if (tvalue < 0 || (next != 0 && *next != 0))
+                   usage();
+               trace((unsigned) tvalue);
+           }

            break;
        case 't':
            trace(TRACE_CALLS);
            break;
        case 't':
            trace(TRACE_CALLS);


@@ -308,7 +298,7 @@ main(int argc, char *argv[])
        (void) signal(SIGWINCH, adjust);        /* arrange interrupts to resize */
 #endif
 
        (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;
     for (lptr = &vec_lines[0]; (lptr - vec_lines) < MAXLINES; lptr++) {
        char temp[BUFSIZ], *s, *d;
        int col;


@@ -316,8 +306,26 @@ main(int argc, char *argv[])
        if (fgets(buf, sizeof(buf), fp) == 0)
            break;
 
        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++) {
        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;
            if (*d == '\n') {
                *d = '\0';
                break;


@@ -356,7 +364,7 @@ main(int argc, char *argv[])
        if (has_colors()) {
            start_color();
            init_pair(my_pair, COLOR_WHITE, COLOR_BLUE);
        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;
        }
        } else {
            try_color = FALSE;
        }


@@ -375,10 +383,12 @@ main(int argc, char *argv[])
                adjust(0);
                my_label = "interrupt";
            }
                adjust(0);
                my_label = "interrupt";
            }

-#endif

            waiting = TRUE;
            c = getch();
            waiting = FALSE;
            waiting = TRUE;
            c = getch();
            waiting = FALSE;

+#else
+           c = getch();
+#endif

            if ((c < 127) && isdigit(c)) {
                if (!got_number) {
                    MvPrintw(0, 0, "Count: ");
            if ((c < 127) && isdigit(c)) {
                if (!got_number) {
                    MvPrintw(0, 0, "Count: ");


@@ -555,7 +565,7 @@ show_all(const char *tag)
     printw("%.*s", COLS, temp);
     clrtoeol();
     this_time = time((time_t *) 0);
     printw("%.*s", COLS, temp);
     clrtoeol();
     this_time = time((time_t *) 0);

-    strcpy(temp, ctime(&this_time));
+    strncpy(temp, ctime(&this_time), 30);

     if ((i = (int) strlen(temp)) != 0) {
        temp[--i] = 0;
        if (move(0, COLS - i - 2) != ERR)
     if ((i = (int) strlen(temp)) != 0) {
        temp[--i] = 0;
        if (move(0, COLS - i - 2) != ERR)