ncurses 5.9 - patch 20110820

[ncurses.git] / test / view.c

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

- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2011 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,7 +50,7 @@
  * 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.67 2008/01/19 21:01:21 tom Exp $
+ * $Id: view.c,v 1.83 2011/05/21 18:40:49 tom Exp $

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


@@ -62,8 +62,10 @@
 #if HAVE_TERMIOS_H
 # include <termios.h>
 #else
 #if HAVE_TERMIOS_H
 # include <termios.h>
 #else

+#if !defined(__MINGW32__)

 # include <sgtty.h>
 #endif
 # include <sgtty.h>
 #endif

+#endif

 
 #if !defined(sun) || !HAVE_TERMIOS_H
 # if HAVE_SYS_IOCTL_H
 
 #if !defined(sun) || !HAVE_TERMIOS_H
 # if HAVE_SYS_IOCTL_H


@@ -79,6 +81,23 @@
 #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);
 


@@ -102,6 +121,8 @@ static NCURSES_CH_T **vec_lines;
 static NCURSES_CH_T **lptr;
 static int num_lines;
 
 static NCURSES_CH_T **lptr;
 static int num_lines;
 

+static void usage(void) GCC_NORETURN;
+

 static void
 usage(void)
 {
 static void
 usage(void)
 {


@@ -132,11 +153,19 @@ ch_len(NCURSES_CH_T * src)
 {
     int result = 0;
 #if USE_WIDEC_SUPPORT
 {
     int result = 0;
 #if USE_WIDEC_SUPPORT

+    int count;

 #endif
 
 #if USE_WIDEC_SUPPORT
 #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++;
 #else
     while (*src++)
        result++;


@@ -151,24 +180,26 @@ ch_len(NCURSES_CH_T * src)
 static NCURSES_CH_T *
 ch_dup(char *src)
 {
 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);
     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;
 #if USE_WIDEC_SUPPORT
     wchar_t wstr[CCHARW_MAX + 1];
     wchar_t wch;
     int l = 0;

-    mbstate_t state;

     size_t rc;
     int width;
     size_t rc;
     int width;

+#ifndef state_unused
+    mbstate_t state;

 #endif
 #endif

+#endif /* USE_WIDEC_SUPPORT */

 
 #if 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
 #endif
     for (j = k = 0; j < len; j++) {
 #if USE_WIDEC_SUPPORT

-       rc = mbrtowc(&wch, src + j, len - j, &state);
+       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 (rc == (size_t) -1 || rc == (size_t) -2)
            break;
        j += rc - 1;


@@ -185,7 +216,7 @@ ch_dup(char *src)
            wstr[l++] = L' ';
        wstr[l++] = wch;
 #else
            wstr[l++] = L' ';
        wstr[l++] = wch;
 #else

-       dst[k++] = src[j];
+       dst[k++] = (chtype) UChar(src[j]);

 #endif
     }
 #if USE_WIDEC_SUPPORT
 #endif
     }
 #if USE_WIDEC_SUPPORT


@@ -238,7 +269,8 @@ main(int argc, char *argv[])
            CATCHALL(SIG_IGN);
            break;
        case 'n':
            CATCHALL(SIG_IGN);
            break;
        case 'n':

-           if ((MAXLINES = atoi(optarg)) < 1)
+           if ((MAXLINES = atoi(optarg)) < 1 ||
+               (MAXLINES + 2) <= 1)

                usage();
            break;
 #if CAN_RESIZE
                usage();
            break;
 #if CAN_RESIZE


@@ -261,9 +293,11 @@ main(int argc, char *argv[])
     if (optind + 1 != argc)
        usage();
 
     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();
 
        usage();
 

+    assert(vec_lines != 0);
+

     fname = argv[optind];
     if ((fp = fopen(fname, "r")) == 0) {
        perror(fname);
     fname = argv[optind];
     if ((fp = fopen(fname, "r")) == 0) {
        perror(fname);


@@ -301,14 +335,14 @@ main(int argc, char *argv[])
            } else {
                sprintf(d, "\\%03o", UChar(*s));
                d += strlen(d);
            } else {
                sprintf(d, "\\%03o", UChar(*s));
                d += strlen(d);

-               col = (d - temp);
+               col = (int) (d - temp);

            }
 #endif
        }
        *lptr = ch_dup(temp);
     }
     (void) fclose(fp);
            }
 #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) initscr();          /* initialize the curses library */
     keypad(stdscr, TRUE);      /* enable keyboard mapping */


@@ -335,7 +369,6 @@ main(int argc, char *argv[])
        if (!got_number)
            show_all(my_label);
 
        if (!got_number)
            show_all(my_label);
 

-       n = 0;

        for (;;) {
 #if CAN_RESIZE
            if (interrupted) {
        for (;;) {
 #if CAN_RESIZE
            if (interrupted) {


@@ -348,7 +381,7 @@ main(int argc, char *argv[])
            waiting = FALSE;
            if ((c < 127) && isdigit(c)) {
                if (!got_number) {
            waiting = FALSE;
            if ((c < 127) && isdigit(c)) {
                if (!got_number) {

-                   mvprintw(0, 0, "Count: ");
+                   MvPrintw(0, 0, "Count: ");

                    clrtoeol();
                }
                addch(UChar(c));
                    clrtoeol();
                }
                addch(UChar(c));


@@ -374,7 +407,7 @@ main(int argc, char *argv[])
                    lptr++;
                else
                    break;
                    lptr++;
                else
                    break;

-           scrl(lptr - olptr);
+           scrl((int) (lptr - olptr));

            break;
 
        case KEY_UP:
            break;
 
        case KEY_UP:


@@ -385,7 +418,7 @@ main(int argc, char *argv[])
                    lptr--;
                else
                    break;
                    lptr--;
                else
                    break;

-           scrl(lptr - olptr);
+           scrl((int) (lptr - olptr));

            break;
 
        case 'h':
            break;
 
        case 'h':


@@ -470,12 +503,11 @@ finish(int sig)
 
 #if CAN_RESIZE
 /*
 
 #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.
  *
  * The 'wrefresh(curscr)' is needed to force the refresh to start from the top
  * of the screen -- some xterms mangle the bitmap while resizing.


@@ -488,7 +520,7 @@ adjust(int sig)
 
        if (ioctl(fileno(stdout), TIOCGWINSZ, &size) == 0) {
            resize_term(size.ws_row, size.ws_col);
 
        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;
            show_all(sig ? "SIGWINCH" : "interrupt");
        }
        interrupted = FALSE;


@@ -508,9 +540,13 @@ show_all(const char *tag)
     time_t this_time;
 
 #if CAN_RESIZE
     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);
 #else
     (void) tag;
     sprintf(temp, "view %.*s", (int) sizeof(temp) - 7, fname);


@@ -520,7 +556,7 @@ show_all(const char *tag)
     clrtoeol();
     this_time = time((time_t *) 0);
     strcpy(temp, ctime(&this_time));
     clrtoeol();
     this_time = time((time_t *) 0);
     strcpy(temp, ctime(&this_time));

-    if ((i = strlen(temp)) != 0) {
+    if ((i = (int) strlen(temp)) != 0) {

        temp[--i] = 0;
        if (move(0, COLS - i - 2) != ERR)
            printw("  %s", temp);
        temp[--i] = 0;
        if (move(0, COLS - i - 2) != ERR)
            printw("  %s", temp);