ncurses 5.7 - patch 20101113

[ncurses.git] / test / view.c

diff --git a/test/view.c b/test/view.c
index 5b52e9807696c9a5f02ccd6ccdf2a73f2817f3a8..6e5c2411cf411d02813d3baf8fa67a89d61aba63 100644 (file)
--- a/test/view.c
+++ b/test/view.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,2010 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.76 2009/10/24 21:26:38 tom Exp $
+ * $Id: view.c,v 1.81 2010/11/14 01:06:02 tom Exp $

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


@@ -178,7 +178,7 @@ 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);
     unsigned j, k;
 #if USE_WIDEC_SUPPORT
     NCURSES_CH_T *dst = typeMalloc(NCURSES_CH_T, len + 1);
     unsigned j, k;
 #if USE_WIDEC_SUPPORT


@@ -197,7 +197,7 @@ ch_dup(char *src)
 #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 = check_mbytes(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;


@@ -214,7 +214,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


@@ -291,9 +291,11 @@ main(int argc, char *argv[])
     if (optind + 1 != argc)
        usage();
 
     if (optind + 1 != argc)
        usage();
 

-    if ((vec_lines = typeCalloc(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);


@@ -331,14 +333,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 */


@@ -365,7 +367,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) {


@@ -378,7 +379,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));


@@ -404,7 +405,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:


@@ -415,7 +416,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':


@@ -500,12 +501,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.


@@ -518,7 +518,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;


@@ -539,9 +539,12 @@ show_all(const char *tag)
 
 #if CAN_RESIZE
     sprintf(temp, "%.20s (%3dx%3d) col %d ", tag, LINES, COLS, shift);
 
 #if CAN_RESIZE
     sprintf(temp, "%.20s (%3dx%3d) col %d ", tag, LINES, COLS, shift);

-    i = strlen(temp);
-    if ((i + 7) < (int) sizeof(temp))
-       sprintf(temp + i, "view %.*s", (int) (sizeof(temp) - 7 - i), fname);
+    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);


@@ -551,7 +554,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);