ncurses 6.3 - patch 20220416

[ncurses.git] / test / picsmap.c

diff --git a/test/picsmap.c b/test/picsmap.c
index a2e4c430e03cfcb001574562281dbaf72ee36ab2..bf8133a42399d4b1c4e5f245055e20af34dcb1be 100644 (file)
--- a/test/picsmap.c
+++ b/test/picsmap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2022 Thomas E. Dickey                                *
  * Copyright 2017,2018 Free Software Foundation, Inc.                       *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: picsmap.c,v 1.135 2020/12/26 18:04:03 tom Exp $
+ * $Id: picsmap.c,v 1.145 2022/04/16 18:21:05 tom Exp $
  *
  * Author: Thomas E. Dickey
  *
@@ -109,7 +109,7 @@ typedef struct {
 #define debugmsg if (debugging) logmsg
 #define debugmsg2 if (debugging) logmsg2
 
-static void cleanup(int) GCC_NORETURN;
+static GCC_NORETURN void cleanup(int);
 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);
@@ -604,7 +604,6 @@ read_palette(const char *filename)
                    continue;
                }
            }
-           s += strlen(s);
 
            if (tries & 2) {
                int len = (int) strlen(filename);
@@ -798,6 +797,7 @@ match_c(const char *source, const char *pattern, ...)
     int ch;
     int *ip;
     char *cp;
+    float *fp;
     long lv;
 
     va_start(ap, pattern);
@@ -811,10 +811,13 @@ match_c(const char *source, const char *pattern, ...)
            continue;
        }
        /* %c, %d, %s are like sscanf except for special treatment of blanks */
-       if (ch == '%' && *pattern != '\0' && strchr("cdnsx", *pattern)) {
+       if (ch == '%' && *pattern != '\0' && strchr("%cdnfsx", *pattern)) {
            bool found = FALSE;
            ch = *pattern++;
            switch (ch) {
+           case '%':
+               source++;
+               break;
            case 'c':
                cp = va_arg(ap, char *);
                do {
@@ -833,6 +836,29 @@ match_c(const char *source, const char *pattern, ...)
                    goto finish;
                }
                break;
+           case 'f':
+               /* floating point for pixels... */
+               fp = va_arg(ap, float *);
+               lv = strtol(source, &cp, 10);
+               if (cp == 0 || cp == source)
+                   goto finish;
+               *fp = (float) lv;
+               source = cp;
+               if (*source == '.') {
+                   lv = strtol(++source, &cp, 10);
+                   if (cp == 0 || cp == source)
+                       goto finish;
+                   {
+                       float scale = 1.0f;
+                       int digits = (int) (cp - source);
+                       while (digits-- > 0) {
+                           scale *= 10.0f;
+                       }
+                       *fp += (float) lv / scale;
+                   }
+                   source = cp;
+               }
+               break;
            case 'n':
                /* not really sscanf... */
                limit = *va_arg(ap, int *);
@@ -990,7 +1016,7 @@ parse_xbm(char **data)
 {
     int n;
     int state = 0;
-    char buf[BUFSIZ];
+    char buf[2048];
     int num;
     char ch;
     char *s;
@@ -1015,7 +1041,7 @@ parse_xbm(char **data)
        case 0:
        case 1:
        case 2:
-           if (sscanf(s, "#define %s %d%c", buf, &num, &ch) >= 2) {
+           if (sscanf(s, "#define %1024s %d%c", buf, &num, &ch) >= 2) {
                if ((t = strstr(buf, "_width")) != 0) {
                    state |= 1;
                    result->wide = (short) bytes_of(num);
@@ -1036,7 +1062,7 @@ parse_xbm(char **data)
            }
            break;
        case 3:
-           if (sscanf(s, "static char %[^_ ]_bits[]%c", buf, &ch) >= 1) {
+           if (sscanf(s, "static char %1024[^_ ]_bits[]%c", buf, &ch) >= 1) {
                if (strcmp(result->name, buf)) {
                    goto finish;
                }
@@ -1347,11 +1373,16 @@ parse_img(const char *filename)
                    break;
                }
            } else {
-               /* subsequent lines begin "col,row: (r,g,b,a) #RGB" */
+               /*
+                * subsequent lines begin "col,row: (r,g,b,a) #RGB".
+                * Those r/g/b could be integers (0..255) or float-percentages.
+                */
                int r, g, b, nocolor;
+               float rf, gf, bf;
                unsigned check;
                char *t;
                char *s = t = strchr(buffer, '#');
+               bool matched = FALSE;
 
                if (s != 0) {
                    /* after the "#RGB", there are differences - just ignore */
@@ -1359,19 +1390,44 @@ parse_img(const char *filename)
                        ++s;
                    *++s = '\0';
                }
+
                if (match_c(buffer,
                            "%d,%d: (%d,%d,%d,%d) #%x ",
                            &col, &row,
                            &r, &g, &b, &nocolor,
                            &check)) {
+                   matched = TRUE;
+               } else if (match_c(buffer,
+                                  "%d,%d: (%f%%,%f%%,%f%%,%d) #%x ",
+                                  &col, &row,
+                                  &rf, &gf, &bf, &nocolor,
+                                  &check) ||
+                          match_c(buffer,
+                                  "%d,%d: (%f%%,%f%%,%f%%) #%x ",
+                                  &col, &row,
+                                  &rf, &gf, &bf,
+                                  &check)) {
+                   matched = TRUE;
+
+#define fp_fix(n) (int) (MaxRGB * (((n) > 100.0 ? 100.0 : (n)) / 100.0))
+
+                   r = fp_fix(rf);
+                   g = fp_fix(gf);
+                   b = fp_fix(bf);
+               }
+               if ((s - t) > 8)        /* 6 hex digits vs 8 */
+                   check /= 256;
+               if (matched) {
                    int which, c;
+                   int want_r = (check >> 16) & 0xff;
+                   int want_g = (check >> 8) & 0xff;
+                   int want_b = (check >> 0) & 0xff;
+
+#define fp_err(tst,ref) ((tst > MaxRGB) || ((tst - ref)*(tst - ref)) > 4)
 
-                   if ((s - t) > 8)    /* 6 hex digits vs 8 */
-                       check /= 256;
-                   if (r > MaxRGB ||
-                       g > MaxRGB ||
-                       b > MaxRGB ||
-                       check != (unsigned) ((r << 16) | (g << 8) | b)) {
+                   if (fp_err(r, want_r) ||
+                       fp_err(g, want_g) ||
+                       fp_err(b, want_b)) {
                        okay = FALSE;
                        break;
                    }
@@ -1471,6 +1527,7 @@ init_display(const char *palette_path, int opt_d)
     (void) opt_d;
     if (isatty(fileno(stdout))) {
        in_curses = TRUE;
+       setlocale(LC_ALL, "");
        initscr();
        cbreak();
        noecho();