X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fpicsmap.c;h=3c4eb697a4de710a91be75b4e3aa3732bff09dbb;hp=5ad88b12a8c47a95a15e7fc4d62fe17795615d6a;hb=d61c3c6a831d18ef0ed6f797ac97d60fffc2f158;hpb=a20e6eb464be80b9cd8cae7ce925d27fe9c209ed diff --git a/test/picsmap.c b/test/picsmap.c index 5ad88b12..3c4eb697 100644 --- a/test/picsmap.c +++ b/test/picsmap.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 2017 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.90 2017/08/12 17:21:48 tom Exp $ + * $Id: picsmap.c,v 1.134 2020/07/11 23:01:49 tom Exp $ * * Author: Thomas E. Dickey * @@ -34,9 +35,8 @@ * measure the time taken to paint it normally vs randomly. * * TODO improve use of rgb-names using tsearch. - * TODO when not using tsearch, dispense with intermediate index - * TODO count/report uses of each color, giving percentiles. * + * TODO add option to dump picture in non-optimized mode, e.g., like tput. * TODO write cells/second to stderr (or log) * TODO write picture left-to-right/top-to-bottom * TODO write picture randomly @@ -50,10 +50,16 @@ */ #include -#include #include #include +#if HAVE_STDINT_H +#include +#define my_intptr_t intptr_t +#else +#define my_intptr_t long +#endif + #if HAVE_TSEARCH #include #endif @@ -66,45 +72,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 struct { - char ch; /* nominal character to display */ - NUM_COLOR fg; /* foreground color */ -} PICS_CELL; - -typedef struct { - NUM_COLOR fgcol; - unsigned short which; - unsigned short 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; @@ -116,18 +95,29 @@ typedef struct { size_t cell; } HOW_MUCH; -#define stop_curses() if (in_curses) endwin() +#undef MAX +#define MAX(a,b) ((a)>(b)?(a):(b)) + +/* + * tfind will return null on failure, so we map subscripts starting at one. + */ +#define P2I(n) (((int)(my_intptr_t)(n)) - 1) +#define I2P(n) (void *)(my_intptr_t)((n) + 1) + +#define pause_curses() if (in_curses) stop_curses() #define debugmsg if (debugging) logmsg #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; @@ -138,13 +128,13 @@ static HOW_MUCH how_much; static int reading_last; static int reading_size; -static FG_NODE **reading_ncols; +static FG_NODE *reading_ncols; #if HAVE_TSEARCH 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; @@ -153,7 +143,7 @@ static bool use_extended_colors = FALSE; #endif static void -logmsg(const char *fmt,...) +logmsg(const char *fmt, ...) { if (logfp != 0) { va_list ap; @@ -166,7 +156,7 @@ logmsg(const char *fmt,...) } static void -logmsg2(const char *fmt,...) +logmsg2(const char *fmt, ...) { if (logfp != 0) { va_list ap; @@ -198,7 +188,7 @@ close_log(void) static void cleanup(int code) { - stop_curses(); + pause_curses(); close_log(); ExitProgram(code); /* NOTREACHED */ @@ -214,7 +204,7 @@ failed(const char *msg) } static void -warning(const char *fmt,...) +warning(const char *fmt, ...) { if (logfp != 0) { va_list ap; @@ -246,14 +236,6 @@ static PICS_HEAD * free_pics_head(PICS_HEAD * pics) { if (pics != 0) { -#if !(HAVE_TSEARCH && HAVE_TDESTROY) - int n; - if (pics->fgcol != 0) { - for (n = 0; n < pics->colors; ++n) { - free(pics->fgcol[n]); - } - } -#endif free(pics->fgcol); free(pics->cells); free(pics->name); @@ -268,17 +250,19 @@ begin_c_values(int size) { reading_last = 0; reading_size = size; - reading_ncols = typeCalloc(FG_NODE *, size + 1); - how_much.pair += (sizeof(FG_NODE *) * (size_t) size); + reading_ncols = typeCalloc(FG_NODE, size + 1); + how_much.pair += (sizeof(FG_NODE) * (size_t) size); + /* black is always the first slot, to work around P2I/I2P logic */ + gather_c_values(0); } #if HAVE_TSEARCH static int compare_c_values(const void *p, const void *q) { - const FG_NODE *a = (const FG_NODE *) p; - const FG_NODE *b = (const FG_NODE *) q; - return (a->fgcol - b->fgcol); + const int a = P2I(p); + const int b = P2I(q); + return (reading_ncols[a].fgcol - reading_ncols[b].fgcol); } #ifdef DEBUG_TSEARCH @@ -288,36 +272,26 @@ check_c_values(int ln) static int oops = 5; FG_NODE **ft; int n; - if (oops-- <= 0) - return; for (n = 0; n < reading_last; ++n) { - if (reading_ncols[n] == 0) - continue; - ft = tfind(reading_ncols[n], &reading_ntree, compare_c_values); - if (ft != 0 && *ft != 0) { - if ((*ft)->fgcol != reading_ncols[n]->fgcol) { - logmsg("@%d, %d:%d (%d) %p %p fgcol %06X %06X", ln, n, - reading_last - 1, - reading_size, - (*ft), reading_ncols[n], - reading_ncols[n]->fgcol, - (*ft)->fgcol); - } - if ((*ft)->which != reading_ncols[n]->which) { - logmsg("@%d, %d:%d (%d) %p %p which %d %d", ln, n, + ft = tfind(I2P(n), &reading_ntree, compare_c_values); + if (ft != 0) { + int q = P2I(*ft); + if (reading_ncols[q].fgcol != reading_ncols[n].fgcol) { + logmsg("@%d, %d:%d (%d) %d %d fgcol %06X %06X", ln, n, reading_last - 1, reading_size, - (*ft), reading_ncols[n], - reading_ncols[n]->which, - (*ft)->which); + q, n, + reading_ncols[n].fgcol, + reading_ncols[q].fgcol); } } else { - logmsg("@%d, %d:%d (%d) %p %p null %06X %d", ln, n, + logmsg("@%d, %d:%d (%d) ? %d null %06X", ln, n, reading_last - 1, reading_size, - ft, reading_ncols[n], - reading_ncols[n]->fgcol, - reading_ncols[n]->which); + n, + reading_ncols[n].fgcol); + if (oops-- <= 0) + return; } } } @@ -326,44 +300,41 @@ check_c_values(int ln) #endif #endif -#undef MAX -#define MAX(a,b) ((a)>(b)?(a):(b)) - static int gather_c_values(int fg) { int found = -1; #if HAVE_TSEARCH FG_NODE **ft; - FG_NODE *find = typeMalloc(FG_NODE, 1); + int next = reading_last; - how_much.pair += sizeof(FG_NODE); - find->fgcol = fg; - find->which = 0; + reading_ncols[next].fgcol = fg; + reading_ncols[next].count = 0; check_c_values(__LINE__); - if ((ft = tfind(find, &reading_ntree, compare_c_values)) != 0) { - found = (*ft)->which; + if ((ft = tfind(I2P(next), &reading_ntree, compare_c_values)) != 0) { + found = P2I(*ft); } else { - if (reading_last + 1 >= reading_size) { + if (reading_last + 2 >= reading_size) { int more = ((MAX(reading_last, reading_size) + 2) * 3) / 2; - FG_NODE **p = typeRealloc(FG_NODE *, more, reading_ncols); + int last = reading_last + 1; + FG_NODE *p = typeRealloc(FG_NODE, more, reading_ncols); if (p == 0) goto done; - /* FIXME - this won't reallocate pointers for tsearch */ - how_much.pair -= (sizeof(FG_NODE *) * (size_t) reading_size); - how_much.pair += (sizeof(FG_NODE *) * (size_t) more); reading_size = more; reading_ncols = p; - memset(reading_ncols + reading_last, 0, - sizeof(FG_NODE *) * (size_t) (more - reading_last)); + memset(reading_ncols + last, 0, + sizeof(FG_NODE) * (size_t) (more - last)); check_c_values(__LINE__); } - reading_ncols[reading_last] = find; - find->which = (unsigned short) reading_last++; - if ((ft = tsearch(find, &reading_ntree, compare_c_values)) != 0) { - found = find->which; + ++reading_last; + how_much.pair += sizeof(FG_NODE); + if ((ft = tsearch(I2P(next), &reading_ntree, compare_c_values)) != 0) { + found = P2I(*ft); + if (found != next) + logmsg("OOPS expected slot %d, got %d", next, found); + debugmsg("allocated color #%d as #%06X", next, fg); check_c_values(__LINE__); } } @@ -371,30 +342,26 @@ gather_c_values(int fg) int n; for (n = 0; n < reading_last; ++n) { - if (reading_ncols[n]->fgcol == fg) { + if (reading_ncols[n].fgcol == fg) { found = n; break; } } if (found < 0) { - FG_NODE *node = typeMalloc(FG_NODE, 1); - how_much.pair += sizeof(FG_NODE); if (reading_last + 2 >= reading_size) { int more = ((reading_last + 2) * 3) / 2; - FG_NODE **p = typeRealloc(FG_NODE *, more, reading_ncols); + FG_NODE *p = typeRealloc(FG_NODE, more, reading_ncols); if (p == 0) goto done; - how_much.pair -= (sizeof(FG_NODE *) * reading_size); - how_much.pair += (sizeof(FG_NODE *) * more); + how_much.pair -= (sizeof(FG_NODE) * (size_t) reading_size); + how_much.pair += (sizeof(FG_NODE) * (size_t) more); reading_size = more; reading_ncols = p; memset(reading_ncols + reading_last, 0, - sizeof(FG_NODE) * (more - reading_last)); + sizeof(FG_NODE) * (size_t) (more - reading_last)); } - node->fgcol = fg; - node->which = reading_last; - reading_ncols[reading_last] = node; + reading_ncols[reading_last].fgcol = fg; found = reading_last++; } #endif @@ -416,23 +383,16 @@ finish_c_values(PICS_HEAD * head) static void dispose_c_values(void) { - int n; #if HAVE_TSEARCH if (reading_ntree != 0) { -#if HAVE_TDESTROY - tdestroy(reading_ntree, free); -#else + int n; for (n = 0; n < reading_last; ++n) { - tdelete(reading_ncols[n], &reading_ntree, compare_c_values); + tdelete(I2P(n), &reading_ntree, compare_c_values); } -#endif reading_ntree = 0; } #endif if (reading_ncols != 0) { - for (n = 0; n < reading_last; ++n) { - free(reading_ncols[n]); - } free(reading_ncols); reading_ncols = 0; } @@ -464,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 = typeMalloc(char, size + 1); - bool had_line = TRUE; + char *blob = typeCalloc(char, size + 1); bool binary = FALSE; - unsigned j; unsigned k = 0; result = typeCalloc(char *, size + 1); @@ -483,13 +441,18 @@ 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 && - !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) { @@ -532,7 +495,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" @@ -545,7 +512,7 @@ usage(void) }; size_t n; - stop_curses(); + pause_curses(); fflush(stdout); for (n = 0; n < SIZEOF(msg); n++) @@ -554,11 +521,11 @@ usage(void) } static void -giveup(const char *fmt,...) +giveup(const char *fmt, ...) { va_list ap; - stop_curses(); + pause_curses(); fflush(stdout); va_start(ap, fmt); @@ -588,7 +555,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; @@ -599,16 +568,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; @@ -616,7 +588,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; @@ -624,8 +597,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; } @@ -635,7 +609,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; } @@ -657,21 +631,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) { @@ -682,9 +662,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); @@ -706,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); + } } } } @@ -782,7 +762,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) @@ -810,7 +790,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; @@ -899,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); @@ -907,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); @@ -975,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) { @@ -982,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; } @@ -1010,6 +1004,10 @@ parse_xbm(char **data) result = typeCalloc(PICS_HEAD, 1); how_much.head += sizeof(PICS_HEAD); + begin_c_values(2); + gather_c_values(0); + gather_c_values(0xffffff); + for (n = 0; data[n] != 0; ++n) { if (strlen(s = data[n]) >= sizeof(buf) - 1) continue; @@ -1024,6 +1022,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) { @@ -1060,20 +1060,21 @@ 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; goto finish; } - /* TODO: which order? */ for (b = 0; b < 8; ++b) { if (((1L << b) & value) != 0) { result->cells[which].ch = '*'; result->cells[which].fg = 1; + reading_ncols[1].count++; } else { result->cells[which].ch = ' '; result->cells[which].fg = 0; + reading_ncols[0].count++; } if (++which > cells) { state = -1; @@ -1100,9 +1101,6 @@ parse_xbm(char **data) result = free_pics_head(result); } } else { - begin_c_values(2); - gather_c_values(0); - gather_c_values(0xffffff); finish_c_values(result); } return result; @@ -1167,8 +1165,8 @@ parse_xpm(char **data) result->cells = typeCalloc(PICS_CELL, cells); how_much.cell += sizeof(PICS_CELL) * (size_t) cells; - list = typeCalloc(char *, result->colors); - how_much.list += sizeof(char *) * (size_t) result->colors; + list = typeCalloc(char *, result->colors + 1); + how_much.list += sizeof(char *) * (size_t) (result->colors + 1); cpp = num[3]; state = 3; @@ -1179,6 +1177,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); @@ -1202,10 +1201,12 @@ parse_xpm(char **data) found = gather_c_values(0); /* actually an error */ } debugmsg(" [%d:%d] %06X", num_colors, result->colors, - reading_ncols[(found >= 0) ? found : 0]->fgcol); + reading_ncols[(found >= 0) ? found : 0].fgcol); if (num_colors >= result->colors) { finish_c_values(result); state = 4; + if (list[0] == 0) + list[0] = strdup("\033"); } break; case 4: @@ -1216,9 +1217,14 @@ parse_xpm(char **data) /* FIXME - factor out */ for (c = 0; c < result->colors; ++c) { - if (!strncmp(cs, list[c], (size_t) cpp)) { + if (list[c] == 0) { + /* should not happen... */ + continue; + } + if (!(strncmp) (cs, list[c], (size_t) cpp)) { result->cells[which].ch = list[c][0]; result->cells[which].fg = c; + result->fgcol[c].count++; break; } } @@ -1232,7 +1238,10 @@ parse_xpm(char **data) state = 5; break; } - for (c = cpp; c > 0; --c, ++cs) ; + for (c = cpp; c > 0; --c, ++cs) { + if (*cs == '\0') + break; + } } } break; @@ -1263,7 +1272,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]; @@ -1273,9 +1283,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); @@ -1287,11 +1297,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; } @@ -1301,11 +1311,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) { @@ -1339,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))) @@ -1353,11 +1364,13 @@ 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 > 255 || - g > 255 || - b > 255 || + if (r > MaxRGB || + g > MaxRGB || + b > MaxRGB || check != (unsigned) ((r << 16) | (g << 8) | b)) { okay = FALSE; break; @@ -1368,9 +1381,12 @@ parse_img(const char *filename) check == 0xffffff) ? ' ' : '#'); - result->cells[which].fg = ((c >= 0 && c < reading_last) - ? c - : -1); + if (c >= 0 && c < reading_last) { + result->cells[which].fg = c; + reading_ncols[c].count++; + } else { + result->cells[which].fg = -1; + } } else { okay = FALSE; break; @@ -1382,7 +1398,7 @@ parse_img(const char *filename) if (okay) { /* FIXME - is this trimming needed? */ for (len = result->colors; len > 3; len--) { - if (result->fgcol[len - 1] == 0) { + if (result->fgcol[len - 1].fgcol == 0) { result->colors = len - 1; } else { break; @@ -1423,7 +1439,7 @@ read_picture(const char *filename, char **data) return pics; } -#define fg_color(pics,n) (pics->fgcol[n]->fgcol) +#define fg_color(pics,n) (pics->fgcol[n].fgcol) static void dump_picture(PICS_HEAD * pics) @@ -1448,25 +1464,49 @@ 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); + stop_curses(); + } +} + static void show_picture(PICS_HEAD * pics) { int y, x; int n; - 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 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); @@ -1485,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); @@ -1516,22 +1559,139 @@ 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) +{ + const FG_NODE *p = (const FG_NODE *) a; + const FG_NODE *q = (const FG_NODE *) b; + return (q->count - p->count); +} + +static void +report_colors(PICS_HEAD * pics) +{ + int accum; + double level; + int j; + int shift; + int total; + char buffer[256]; + + if (logfp == 0) + return; + + qsort(pics->fgcol, (size_t) pics->colors, sizeof(FG_NODE), compare_fg_counts); + /* + * For debugging, show a (short) list of the colors used. + */ + 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) + ++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) { + int k; + char *s = buffer; + *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) { + _nc_SPRINTF(s, _nc_SLIMIT(want) "%*s", 8 - digits, + " "); + s += strlen(s); + } + } + if (pics->fgcol[n].fgcol >= 0) { + _nc_SPRINTF(s, _nc_SLIMIT(want) "%3d #%06X %*d", n, + pics->fgcol[n].fgcol, + digits, pics->fgcol[n].count); + } else { + _nc_SPRINTF(s, _nc_SLIMIT(want) "%3d (empty) %*d", n, + digits, pics->fgcol[n].count); + } + s += strlen(s); + if ((s - buffer) > 100) + break; + } + logmsg("%s", buffer); + } + } + + /* + * Given the list of colors sorted by the number of times they are used, + * log a short report showing the number of colors for 90%, 99%, 99.9%, + * etc. + */ + logmsg("Number of colors versus number of cells"); + total = pics->high * pics->wide; + accum = 0; + level = 0.1; + shift = 1; + for (j = 0; j < pics->colors; ++j) { + accum += pics->fgcol[j].count; + if (accum >= (total * (1.0 - level))) { + int after = (shift > 2) ? shift - 2 : 0; + logmsg("%8d colors (%.1f%%) in %d cells (%.*f%%)", + j + 1, + (100.0 * (j + 1)) / pics->colors, + accum, + after, (100.0 * accum) / total); + if (accum >= total) + break; + level /= 10.0; + shift++; + } + } +} 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': @@ -1582,19 +1742,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"); @@ -1612,6 +1760,7 @@ main(int argc, char *argv[]) } else { dump_picture(pics); } + report_colors(pics); dispose_c_values(); free_data(data); free_pics_head(pics);