X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fpicsmap.c;h=dd33d78c0ceac67d2377f91ea1cc3aa3c322c75f;hp=196cf44692156c7ddf44637e137bb9021bb78b2b;hb=9435f97aa77afd52592028bde9dbd3f60a823fc6;hpb=0485620c03e69b1b58a6b12e5e45c98415fc7575 diff --git a/test/picsmap.c b/test/picsmap.c index 196cf446..dd33d78c 100644 --- a/test/picsmap.c +++ b/test/picsmap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2017 Free Software Foundation, Inc. * + * Copyright (c) 2017-2018,2019 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 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: picsmap.c,v 1.100 2017/08/19 23:42:27 tom Exp $ + * $Id: picsmap.c,v 1.129 2019/04/20 20:33:51 tom Exp $ * * Author: Thomas E. Dickey * @@ -49,11 +49,10 @@ */ #include -#include #include #include -#ifdef HAVE_STDINT_H +#if HAVE_STDINT_H #include #define my_intptr_t intptr_t #else @@ -72,45 +71,18 @@ #define L_CURLY '{' #define R_CURLY '}' +#define MaxSCALE 1000 /* input curses ranges 0..1000 */ +#define MaxRGB 255 /* output color ranges 0..255 */ #define okCOLOR(n) ((n) >= 0 && (n) < COLORS) -#define okRGB(n) ((n) >= 0 && (n) <= 1000) -#define Scaled256(n) (NCURSES_COLOR_T) (int)(((n) * 1000.0) / 256) -#define ScaledColor(n) (NCURSES_COLOR_T) (int)(((n) * 1000.0) / scale) +#define okSCALE(n) ((n) >= 0 && (n) <= MaxSCALE) +#define Scaled256(n) (NCURSES_COLOR_T) (int)(((double)(n) * MaxSCALE) / 255) +#define ScaledColor(n) (NCURSES_COLOR_T) (int)(((double)(n) * MaxSCALE) / scale) +#ifndef RGB_PATH #define RGB_PATH "/etc/X11/rgb.txt" +#endif -typedef int NUM_COLOR; -typedef unsigned short NUM_COUNT; - -typedef struct { - char ch; /* nominal character to display */ - NUM_COLOR fg; /* foreground color */ -} PICS_CELL; - -typedef struct { - NUM_COLOR fgcol; - NUM_COUNT count; -} FG_NODE; - -typedef struct { - char *name; - short high; - short wide; - int colors; - FG_NODE *fgcol; - PICS_CELL *cells; -} PICS_HEAD; - -typedef struct { - const char *name; - int value; -} RGB_NAME; - -typedef struct { - short red; - short green; - short blue; -} RGB_DATA; +#include typedef struct { size_t file; @@ -137,13 +109,14 @@ typedef struct { #define debugmsg2 if (debugging) logmsg2 static void cleanup(int) GCC_NORETURN; -static void giveup(const char *fmt,...) GCC_PRINTFLIKE(1, 2); -static void logmsg(const char *fmt,...) GCC_PRINTFLIKE(1, 2); -static void logmsg2(const char *fmt,...) GCC_PRINTFLIKE(1, 2); -static void warning(const char *fmt,...) GCC_PRINTFLIKE(1, 2); +static void giveup(const char *fmt, ...) GCC_PRINTFLIKE(1, 2); +static void logmsg(const char *fmt, ...) GCC_PRINTFLIKE(1, 2); +static void logmsg2(const char *fmt, ...) GCC_PRINTFLIKE(1, 2); +static void warning(const char *fmt, ...) GCC_PRINTFLIKE(1, 2); static int gather_c_values(int); static FILE *logfp = 0; +static double aspect_ratio = 0.6; static bool in_curses = FALSE; static bool debugging = FALSE; static bool quiet = FALSE; @@ -160,7 +133,7 @@ static FG_NODE *reading_ncols; static void *reading_ntree; #endif -#if HAVE_ALLOC_PAIR && HAVE_INIT_EXTENDED_COLOR +#if HAVE_ALLOC_PAIR && USE_EXTENDED_COLOR #define USE_EXTENDED_COLORS 1 static bool use_extended_pairs = FALSE; static bool use_extended_colors = FALSE; @@ -169,7 +142,7 @@ static bool use_extended_colors = FALSE; #endif static void -logmsg(const char *fmt,...) +logmsg(const char *fmt, ...) { if (logfp != 0) { va_list ap; @@ -182,7 +155,7 @@ logmsg(const char *fmt,...) } static void -logmsg2(const char *fmt,...) +logmsg2(const char *fmt, ...) { if (logfp != 0) { va_list ap; @@ -230,7 +203,7 @@ failed(const char *msg) } static void -warning(const char *fmt,...) +warning(const char *fmt, ...) { if (logfp != 0) { va_list ap; @@ -406,26 +379,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 @@ -484,9 +446,10 @@ read_file(const char *filename) for (j = 0; (size_t) j < size; ++j) { if (blob[j] == '\0' || (UChar(blob[j]) < 32 && - !isspace(blob[j])) || - (UChar(blob[j]) >= 128 && UChar(blob[j]) < 160)) + !isspace(UChar(blob[j]))) || + (UChar(blob[j]) >= 128 && UChar(blob[j]) < 160)) { binary = TRUE; + } if (blob[j] == '\n') { blob[j] = '\0'; if (k && !binary) { @@ -529,7 +492,11 @@ usage(void) ,"Read/display one or more xbm/xpm files (possibly use \"convert\")" ,"" ,"Options:" - ," -d add debugging information to logfile" + ," -a ratio aspect-ratio correction for ImageMagick" +#if HAVE_USE_DEFAULT_COLORS + ," -d invoke use_default_colors" +#endif + ," -L add debugging information to logfile" ," -l logfile write informational messages to logfile" ," -p palette color-palette file (default \"$TERM.dat\")" ," -q less verbose" @@ -551,7 +518,7 @@ usage(void) } static void -giveup(const char *fmt,...) +giveup(const char *fmt, ...) { va_list ap; @@ -585,7 +552,9 @@ read_palette(const char *filename) { static const char *data_dir = DATA_DIR; char **result = 0; - char *full_name = malloc(strlen(data_dir) + 20 + strlen(filename)); + size_t last = strlen(filename); + size_t need = (strlen(data_dir) + 20 + last); + char *full_name = malloc(need); char *s; struct stat sb; @@ -596,16 +565,19 @@ read_palette(const char *filename) *(s = full_name) = '\0'; if (tries & 1) { if (strchr(filename, '/') == 0) { - sprintf(full_name, "%s/", data_dir); + _nc_SPRINTF(full_name, _nc_SLIMIT(need) "%s/", data_dir); } else { continue; } } s += strlen(s); + if (((size_t) (s - full_name) + last + 1) >= need) + continue; - strcpy(s, filename); + _nc_STRCAT(full_name, filename, need); if (tries & 4) { char *t = s; + char *tc; int num; char chr; int found = 0; @@ -613,7 +585,8 @@ read_palette(const char *filename) if (*t == '-') { if (sscanf(t, "-%d%c", &num, &chr) == 2 && chr == 'c' && - !strncmp(strchr(t, chr), "color", 5)) { + (tc = strchr(t, chr)) != 0 && + !(strncmp) (tc, "color", 5)) { found = 1; } break; @@ -621,8 +594,9 @@ read_palette(const char *filename) ++t; } if (found && (t != s) - && strncmp(s, "xterm", (size_t) (t - s))) { - sprintf(s, "xterm%s", filename + (t - s)); + && (strncmp) (s, "xterm", (size_t) (t - s))) { + _nc_SPRINTF(s, _nc_SLIMIT(need - (size_t) (s - full_name)) + "xterm%s", filename + (t - s)); } else { continue; } @@ -632,7 +606,7 @@ read_palette(const char *filename) if (tries & 2) { int len = (int) strlen(filename); if (len <= 4 || strcmp(filename + len - 4, ".dat")) { - strcpy(s, ".dat"); + _nc_STRCAT(full_name, ".dat", need); } else { continue; } @@ -654,21 +628,27 @@ init_palette(const char *palette_file) { if (palette_file != 0) { char **data = read_palette(palette_file); - int cp; all_colors = typeMalloc(RGB_DATA, (unsigned) COLORS); how_much.data += (sizeof(RGB_DATA) * (unsigned) COLORS); - for (cp = 0; cp < COLORS; ++cp) { - color_content((short) cp, - &all_colors[cp].red, - &all_colors[cp].green, - &all_colors[cp].blue); +#if HAVE_COLOR_CONTENT + { + int cp; + for (cp = 0; cp < COLORS; ++cp) { + color_content((short) cp, + &all_colors[cp].red, + &all_colors[cp].green, + &all_colors[cp].blue); + } } +#else + memset(all_colors, 0, sizeof(RGB_DATA) * (size_t) COLORS); +#endif if (data != 0) { int n; int red, green, blue; - int scale = 1000; + int scale = MaxSCALE; int c; for (n = 0; data[n] != 0; ++n) { if (sscanf(data[n], "scale:%d", &c) == 1) { @@ -679,9 +659,9 @@ init_palette(const char *palette_file) &green, &blue) == 4 && okCOLOR(c) - && okRGB(red) - && okRGB(green) - && okRGB(blue)) { + && okSCALE(red) + && okSCALE(green) + && okSCALE(blue)) { /* *INDENT-EQLS* */ all_colors[c].red = ScaledColor(red); all_colors[c].green = ScaledColor(green); @@ -779,7 +759,7 @@ bytes_of(int value) return value; } -static int match_c(const char *, const char *,...) GCC_SCANFLIKE(2,3); +static int match_c(const char *, const char *, ...) GCC_SCANFLIKE(2,3); static char * skip_s(char *s) @@ -807,7 +787,7 @@ skip_word(char *s) } static int -match_c(const char *source, const char *pattern,...) +match_c(const char *source, const char *pattern, ...) { int limit = (int) strlen(source); const char *last_s = source + limit; @@ -1025,6 +1005,8 @@ parse_xbm(char **data) } else if ((t = strstr(buf, "_height")) != 0) { state |= 2; result->high = (short) num; + } else { + break; } *t = '\0'; if (result->name) { @@ -1061,7 +1043,7 @@ parse_xbm(char **data) if (isdigit(UChar(*s))) { long value = strtol(s, &t, 0); int b; - if (t != s || value > 255 || value < 0) { + if (t != s || value > MaxRGB || value < 0) { s = t; } else { state = -1; @@ -1178,6 +1160,7 @@ parse_xpm(char **data) break; } num_colors++; + free(list[reading_last]); list[reading_last] = strdup(arg1); if ((by_name = lookup_rgb(arg3)) != 0) { found = gather_c_values(by_name->value); @@ -1205,7 +1188,7 @@ parse_xpm(char **data) if (num_colors >= result->colors) { finish_c_values(result); state = 4; - if (list != 0 && list[0] == 0) + if (list[0] == 0) list[0] = strdup("\033"); } break; @@ -1221,7 +1204,7 @@ parse_xpm(char **data) /* should not happen... */ continue; } - if (!strncmp(cs, list[c], (size_t) cpp)) { + if (!(strncmp) (cs, list[c], (size_t) cpp)) { result->cells[which].ch = list[c][0]; result->cells[which].fg = c; result->fgcol[c].count++; @@ -1272,7 +1255,8 @@ parse_xpm(char **data) static PICS_HEAD * parse_img(const char *filename) { - char *cmd = malloc(strlen(filename) + 256); + size_t need = strlen(filename) + 256; + char *cmd = malloc(need); FILE *pp; char buffer[BUFSIZ]; char dummy[BUFSIZ]; @@ -1282,9 +1266,9 @@ parse_img(const char *filename) int pic_y = 0; int width = in_curses ? COLS : 80; - sprintf(cmd, "identify \"%s\"", filename); + _nc_SPRINTF(cmd, _nc_SLIMIT(need) "identify \"%s\"", filename); if (quiet) - strcat(cmd, " 2>/dev/null"); + _nc_STRCAT(cmd, " 2>/dev/null", need); logmsg("...opening pipe to %s", cmd); @@ -1296,11 +1280,11 @@ parse_img(const char *filename) size_t n = strlen(filename); debugmsg2("...read %s", buffer); if (strlen(buffer) > n && - !strncmp(buffer, filename, n) && + !(strncmp) (buffer, filename, n) && isspace(UChar(buffer[n])) && sscanf(skip_word(buffer + n), " %dx%d ", &pic_x, &pic_y) == 2) { /* distort image to make it show normally on terminal */ - pic_x = (166 * pic_x) / 100; + pic_x = (int) ((double) pic_x / aspect_ratio); } else { pic_x = pic_y = 0; } @@ -1310,11 +1294,12 @@ parse_img(const char *filename) if (pic_x <= 0 || pic_y <= 0) goto finish; - sprintf(cmd, "convert " "-resize %dx%d\\! " "-thumbnail %dx \"%s\" " - "-define txt:compliance=SVG txt:-", - pic_x, pic_y, width, filename); + _nc_SPRINTF(cmd, _nc_SLIMIT(need) + "convert " "-resize %dx%d\\! " "-thumbnail %dx \"%s\" " + "-define txt:compliance=SVG txt:-", + pic_x, pic_y, width, filename); if (quiet) - strcat(cmd, " 2>/dev/null"); + _nc_STRCAT(cmd, " 2>/dev/null", need); logmsg("...opening pipe to %s", cmd); if ((pp = popen(cmd, "r")) != 0) { @@ -1364,9 +1349,9 @@ parse_img(const char *filename) &check)) { if ((s - t) > 8) /* 6 hex digits vs 8 */ check /= 256; - if (r > 255 || - g > 255 || - b > 255 || + if (r > MaxRGB || + g > MaxRGB || + b > MaxRGB || check != (unsigned) ((r << 16) | (g << 8) | b)) { okay = FALSE; break; @@ -1460,6 +1445,30 @@ dump_picture(PICS_HEAD * pics) } } +#ifndef USE_DISPLAY_DRIVER +static void +init_display(const char *palette_path, int opt_d) +{ + (void) opt_d; + if (isatty(fileno(stdout))) { + in_curses = TRUE; + initscr(); + cbreak(); + noecho(); + curs_set(0); + if (has_colors()) { + start_color(); +#if HAVE_USE_DEFAULT_COLORS + if (opt_d) + use_default_colors(); +#endif + init_palette(palette_path); + } + scrollok(stdscr, FALSE); + exit_curses(); + } +} + static void show_picture(PICS_HEAD * pics) { @@ -1468,9 +1477,10 @@ show_picture(PICS_HEAD * pics) int my_pair, my_color; debugmsg("called show_picture"); -#if USE_EXTENDED_COLORS + logmsg("...using %dx%d screen", LINES, COLS); +#if HAVE_RESET_COLOR_PAIRS reset_color_pairs(); -#else +#elif HAVE_CURSCR wclear(curscr); clear(); #endif @@ -1528,11 +1538,13 @@ show_picture(PICS_HEAD * pics) #endif } } else { - mvgetch(0, 0); + wmove(stdscr, 0, 0); + getch(); } if (!quiet) endwin(); } +#endif static int compare_fg_counts(const void *a, const void *b) @@ -1568,6 +1580,8 @@ report_colors(PICS_HEAD * pics) if (j < 10) ++digits; } + if (digits > 8) + digits = 8; logmsg("These colors were used:"); high = (pics->colors + wide - 1) / wide; for (j = 0; j < high && j < pics->colors; ++j) { @@ -1575,22 +1589,26 @@ report_colors(PICS_HEAD * pics) *s = '\0'; for (k = 0; k < wide; ++k) { int n = j + (k * high); + size_t want = (sizeof(buffer) - (size_t) (s - buffer)); + if (want < 100) + break; if (n >= pics->colors) break; if (k) { *s++ = ' '; if (digits < 8) { - sprintf(s, "%*s", 8 - digits, " "); + _nc_SPRINTF(s, _nc_SLIMIT(want) "%*s", 8 - digits, + " "); s += strlen(s); } } if (pics->fgcol[n].fgcol >= 0) { - sprintf(s, "%3d #%06X %*d", n, - pics->fgcol[n].fgcol, - digits, pics->fgcol[n].count); + _nc_SPRINTF(s, _nc_SLIMIT(want) "%3d #%06X %*d", n, + pics->fgcol[n].fgcol, + digits, pics->fgcol[n].count); } else { - sprintf(s, "%3d (empty) %*d", n, - digits, pics->fgcol[n].count); + _nc_SPRINTF(s, _nc_SLIMIT(want) "%3d (empty) %*d", n, + digits, pics->fgcol[n].count); } s += strlen(s); if ((s - buffer) > 100) @@ -1631,12 +1649,27 @@ int main(int argc, char *argv[]) { int n; + int opt_d = FALSE; + char ignore_ch; const char *palette_path = 0; - const char *rgb_path = "/etc/X11/rgb.txt"; + const char *rgb_path = RGB_PATH; - while ((n = getopt(argc, argv, "dl:p:qr:s:x:")) != -1) { + while ((n = getopt(argc, argv, "a:dLl:p:qr:s:x:")) != -1) { switch (n) { + case 'a': + if (sscanf(optarg, "%lf%c", &aspect_ratio, &ignore_ch) != 1 + || aspect_ratio < 0.1 + || aspect_ratio > 10.) { + fprintf(stderr, "Expected a number in [0.1 to 10.]: %s\n", optarg); + usage(); + } + break; +#if HAVE_USE_DEFAULT_COLORS case 'd': + opt_d = TRUE; + break; +#endif + case 'L': debugging = TRUE; break; case 'l': @@ -1687,19 +1720,7 @@ main(int argc, char *argv[]) if (rgb_data) rgb_table = parse_rgb(rgb_data); - if (isatty(fileno(stdout))) { - in_curses = TRUE; - initscr(); - cbreak(); - noecho(); - curs_set(0); - if (has_colors()) { - start_color(); - init_palette(palette_path); - } - scrollok(stdscr, FALSE); - endwin(); - } + init_display(palette_path, opt_d); if (optind >= argc) giveup("expected at least one image filename");