ncurses 6.2 - patch 20200321

[ncurses.git] / test / picsmap.c

diff --git a/test/picsmap.c b/test/picsmap.c
index dd33d78c0ceac67d2377f91ea1cc3aa3c322c75f..432fbf7a5790d4894b98438fa372995d6073478a 100644 (file)
--- a/test/picsmap.c
+++ b/test/picsmap.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2017-2018,2019 Free Software Foundation, Inc.              *
+ * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2017,2018 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            *
@@ -26,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: picsmap.c,v 1.129 2019/04/20 20:33:51 tom Exp $
+ * $Id: picsmap.c,v 1.132 2020/02/02 23:34:34 tom Exp $
  *
  * Author: Thomas E. Dickey
  *
@@ -103,7 +104,7 @@ typedef struct {
 #define P2I(n) (((int)(my_intptr_t)(n)) - 1)
 #define I2P(n) (void *)(my_intptr_t)((n) + 1)
 
-#define stop_curses() if (in_curses) endwin()
+#define pause_curses() if (in_curses) stop_curses()
 
 #define debugmsg if (debugging) logmsg
 #define debugmsg2 if (debugging) logmsg2
@@ -187,7 +188,7 @@ close_log(void)
 static void
 cleanup(int code)
 {
-    stop_curses();
+    pause_curses();
     close_log();
     ExitProgram(code);
     /* NOTREACHED */
@@ -423,16 +424,14 @@ read_file(const char *filename)
     struct stat sb;
 
     if (!quiet) {
-       stop_curses();
+       pause_curses();
        printf("** %s\n", filename);
     }
 
     if (is_file(filename, &sb)) {
        size_t size = (size_t) sb.st_size;
        char *blob = typeCalloc(char, size + 1);
-       bool had_line = TRUE;
        bool binary = FALSE;
-       unsigned j;
        unsigned k = 0;
 
        result = typeCalloc(char *, size + 1);
@@ -442,7 +441,11 @@ read_file(const char *filename)
            FILE *fp = fopen(filename, "r");
            if (fp != 0) {
                logmsg("opened %s", filename);
+
                if (fread(blob, sizeof(char), size, fp) == size) {
+                   bool had_line = TRUE;
+                   unsigned j;
+
                    for (j = 0; (size_t) j < size; ++j) {
                        if (blob[j] == '\0' ||
                            (UChar(blob[j]) < 32 &&
@@ -509,7 +512,7 @@ usage(void)
     };
     size_t n;
 
-    stop_curses();
+    pause_curses();
 
     fflush(stdout);
     for (n = 0; n < SIZEOF(msg); n++)
@@ -522,7 +525,7 @@ giveup(const char *fmt, ...)
 {
     va_list ap;
 
-    stop_curses();
+    pause_curses();
     fflush(stdout);
 
     va_start(ap, fmt);
@@ -683,9 +686,9 @@ init_palette(const char *palette_file)
        if ((power2 != COLORS) || ((shift % 3) != 0)) {
            if (all_colors == 0) {
                init_palette(getenv("TERM"));
-           }
-           if (all_colors == 0) {
-               giveup("With %d colors, you need a palette-file", COLORS);
+               if (all_colors == 0) {
+                   giveup("With %d colors, you need a palette-file", COLORS);
+               }
            }
        }
     }
@@ -876,7 +879,6 @@ match_colors(const char *source, int cpp, char *arg1, char *arg2, char *arg3)
        arg1[cpp] = '\0';
        result = 1;
     } else {
-       char *t;
        const char *s = skip_cs(source);
        size_t have = strlen(source);
 
@@ -884,6 +886,7 @@ match_colors(const char *source, int cpp, char *arg1, char *arg2, char *arg3)
            memcpy(arg1, s, (size_t) cpp);
            s += cpp;
            while (*s++ == '\t') {
+               char *t;
                for (t = arg2; (*s != '\0') && strchr("\t\"", *s) == 0;) {
                    if (*s == ' ') {
                        s = skip_cs(s);
@@ -1333,9 +1336,9 @@ parse_img(const char *filename)
                /* subsequent lines begin "col,row: (r,g,b,a) #RGB" */
                int r, g, b, nocolor;
                unsigned check;
-               int which, c;
                char *t;
                char *s = t = strchr(buffer, '#');
+
                if (s != 0) {
                    /* after the "#RGB", there are differences - just ignore */
                    while (*s != '\0' && !isspace(UChar(*s)))
@@ -1347,6 +1350,8 @@ parse_img(const char *filename)
                            &col, &row,
                            &r, &g, &b, &nocolor,
                            &check)) {
+                   int which, c;
+
                    if ((s - t) > 8)    /* 6 hex digits vs 8 */
                        check /= 256;
                    if (r > MaxRGB ||
@@ -1465,7 +1470,7 @@ init_display(const char *palette_path, int opt_d)
            init_palette(palette_path);
        }
        scrollok(stdscr, FALSE);
-       exit_curses();
+       stop_curses();
     }
 }
 
@@ -1474,7 +1479,6 @@ show_picture(PICS_HEAD * pics)
 {
     int y, x;
     int n;
-    int my_pair, my_color;
 
     debugmsg("called show_picture");
     logmsg("...using %dx%d screen", LINES, COLS);
@@ -1487,8 +1491,8 @@ show_picture(PICS_HEAD * pics)
     if (has_colors()) {
        logmsg("...using %d colors", pics->colors);
        for (n = 0; n < pics->colors; ++n) {
-           my_pair = (n + 1);
-           my_color = map_color(fg_color(pics, n));
+           int my_pair = (n + 1);
+           int my_color = map_color(fg_color(pics, n));
 #if USE_EXTENDED_COLORS
            if (use_extended_pairs) {
                init_extended_pair(my_pair, my_color, my_color);
@@ -1507,7 +1511,10 @@ show_picture(PICS_HEAD * pics)
        if (y >= LINES)
            break;
        move(y, 0);
+
        for (x = 0; x < pics->wide; ++x) {
+           int my_pair;
+
            if (x >= COLS)
                break;
            n = (y * pics->wide + x);
@@ -1557,11 +1564,9 @@ compare_fg_counts(const void *a, const void *b)
 static void
 report_colors(PICS_HEAD * pics)
 {
-    int j, k;
-    int high;
-    int wide = 4;
     int accum;
     double level;
+    int j;
     int shift;
     int total;
     char buffer[256];
@@ -1575,6 +1580,8 @@ report_colors(PICS_HEAD * pics)
      */
     if (debugging && (pics->colors < 1000)) {
        int digits = 0;
+       int high;
+       int wide = 4;
        for (j = pics->colors; j != 0; j /= 10) {
            ++digits;
            if (j < 10)
@@ -1585,6 +1592,7 @@ report_colors(PICS_HEAD * pics)
        logmsg("These colors were used:");
        high = (pics->colors + wide - 1) / wide;
        for (j = 0; j < high && j < pics->colors; ++j) {
+           int k;
            char *s = buffer;
            *s = '\0';
            for (k = 0; k < wide; ++k) {