X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fpicsmap.c;h=3c4eb697a4de710a91be75b4e3aa3732bff09dbb;hp=c9c5770145c202bef5b540e945a7b81bf0ca310c;hb=cf6a62567b2365c8678b7d561845bdbd1739e5da;hpb=eccca377f55c70b12e3e92621d94d1e1c1fcfb7d

diff --git a/test/picsmap.c b/test/picsmap.c
index c9c57701..3c4eb697 100644
--- 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.127 2019/01/21 19:45:57 tom Exp $
+ * $Id: picsmap.c,v 1.134 2020/07/11 23:01:49 tom Exp $
  *
  * Author: Thomas E. Dickey
  *
@@ -61,10 +62,6 @@
 
 #if HAVE_TSEARCH
 #include <search.h>
-#if HAVE_TDESTROY && !defined(_GNU_SOURCE)
-#undef HAVE_TDESTROY
-#define HAVE_TDESTROY 0
-#endif
 #endif
 
 #undef CUR			/* use only the curses interface */
@@ -107,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
@@ -191,7 +188,7 @@ close_log(void)
 static void
 cleanup(int code)
 {
-    stop_curses();
+    pause_curses();
     close_log();
     ExitProgram(code);
     /* NOTREACHED */
@@ -383,26 +380,15 @@ finish_c_values(PICS_HEAD * head)
     reading_ncols = 0;
 }
 
-#if HAVE_TSEARCH && HAVE_TDESTROY
-static void
-never_free(void *node GCC_UNUSED)
-{
-}
-#endif
-
 static void
 dispose_c_values(void)
 {
 #if HAVE_TSEARCH
     if (reading_ntree != 0) {
-#if HAVE_TDESTROY
-	tdestroy(reading_ntree, never_free);
-#else
 	int n;
 	for (n = 0; n < reading_last; ++n) {
 	    tdelete(I2P(n), &reading_ntree, compare_c_values);
 	}
-#endif
 	reading_ntree = 0;
     }
 #endif
@@ -438,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);
@@ -457,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 &&
@@ -524,7 +512,7 @@ usage(void)
     };
     size_t n;
 
-    stop_curses();
+    pause_curses();
 
     fflush(stdout);
     for (n = 0; n < SIZEOF(msg); n++)
@@ -537,7 +525,7 @@ giveup(const char *fmt, ...)
 {
     va_list ap;
 
-    stop_curses();
+    pause_curses();
     fflush(stdout);
 
     va_start(ap, fmt);
@@ -698,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);
+		}
 	    }
 	}
     }
@@ -891,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);
 
@@ -899,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);
@@ -967,6 +955,20 @@ parse_rgb(char **data)
     return result;
 }
 
+#define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
+
+static int
+CaselessCmp(const char *a, const char *b)
+{				/* strcasecmp isn't portable */
+    while (*a && *b) {
+	int cmp = LOWERCASE(*a) - LOWERCASE(*b);
+	if (cmp != 0)
+	    break;
+	a++, b++;
+    }
+    return LOWERCASE(*a) - LOWERCASE(*b);
+}
+
 static RGB_NAME *
 lookup_rgb(const char *name)
 {
@@ -974,7 +976,7 @@ lookup_rgb(const char *name)
     if (rgb_table != 0) {
 	int n;
 	for (n = 0; rgb_table[n].name != 0; ++n) {
-	    if (!strcasecmp(name, rgb_table[n].name)) {
+	    if (!CaselessCmp(name, rgb_table[n].name)) {
 		result = &rgb_table[n];
 		break;
 	    }
@@ -1348,9 +1350,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)))
@@ -1362,6 +1364,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 ||
@@ -1464,6 +1468,7 @@ dump_picture(PICS_HEAD * pics)
 static void
 init_display(const char *palette_path, int opt_d)
 {
+    (void) opt_d;
     if (isatty(fileno(stdout))) {
 	in_curses = TRUE;
 	initscr();
@@ -1479,7 +1484,7 @@ init_display(const char *palette_path, int opt_d)
 	    init_palette(palette_path);
 	}
 	scrollok(stdscr, FALSE);
-	exit_curses();
+	stop_curses();
     }
 }
 
@@ -1488,7 +1493,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);
@@ -1501,8 +1505,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);
@@ -1521,7 +1525,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);
@@ -1571,11 +1578,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];
@@ -1589,6 +1594,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)
@@ -1599,6 +1606,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) {