ncurses 6.1 - patch 20180707
[ncurses.git] / ncurses / trace / lib_traceatr.c
index 6bbcc6230d114cac346d03ffb2cee79fa4b60003..a4144ab5c4caa10cb815f8cc27d89e8834f3c4c8 100644 (file)
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************
- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
 #define CUR SP_TERMTYPE
 #endif
 
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_traceatr.c,v 1.75 2011/05/28 22:56:56 tom Exp $")
+MODULE_ID("$Id: lib_traceatr.c,v 1.92 2018/05/05 17:49:17 tom Exp $")
 
 #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name))
 
 
 #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name))
 
+#define TRACE_BUF_SIZE(num) (_nc_globals.tracebuf_ptr[num].size)
+#define COLOR_BUF_SIZE(num) (sizeof(my_buffer[num]))
+
 #ifdef TRACE
 
 static const char l_brace[] = StringOf(L_BRACE);
 #ifdef TRACE
 
 static const char l_brace[] = StringOf(L_BRACE);
@@ -64,10 +67,13 @@ color_of(int c)
     if (c != my_cached) {
        my_cached = c;
        my_select = !my_select;
     if (c != my_cached) {
        my_cached = c;
        my_select = !my_select;
-       if (c == COLOR_DEFAULT)
-           strcpy(my_buffer[my_select], "default");
+       if (isDefaultColor(c))
+           _nc_STRCPY(my_buffer[my_select], "default",
+                      COLOR_BUF_SIZE(my_select));
        else
        else
-           sprintf(my_buffer[my_select], "color%d", c);
+           _nc_SPRINTF(my_buffer[my_select],
+                       _nc_SLIMIT(COLOR_BUF_SIZE(my_select))
+                       "color%d", c);
     }
     return my_buffer[my_select];
 }
     }
     return my_buffer[my_select];
 }
@@ -79,78 +85,80 @@ color_of(int c)
 NCURSES_EXPORT(char *)
 _traceattr2(int bufnum, chtype newmode)
 {
 NCURSES_EXPORT(char *)
 _traceattr2(int bufnum, chtype newmode)
 {
+#define DATA(name) { name, { #name } }
     static const struct {
        unsigned int val;
     static const struct {
        unsigned int val;
-       const char *name;
+       const char name[14];
     } names[] =
     {
     } names[] =
     {
-       /* *INDENT-OFF* */
-       { A_STANDOUT,           "A_STANDOUT" },
-       { A_UNDERLINE,          "A_UNDERLINE" },
-       { A_REVERSE,            "A_REVERSE" },
-       { A_BLINK,              "A_BLINK" },
-       { A_DIM,                "A_DIM" },
-       { A_BOLD,               "A_BOLD" },
-       { A_ALTCHARSET,         "A_ALTCHARSET" },
-       { A_INVIS,              "A_INVIS" },
-       { A_PROTECT,            "A_PROTECT" },
-       { A_CHARTEXT,           "A_CHARTEXT" },
-       { A_NORMAL,             "A_NORMAL" },
-       { A_COLOR,              "A_COLOR" },
-       /* *INDENT-ON* */
-
+       DATA(A_STANDOUT),
+           DATA(A_UNDERLINE),
+           DATA(A_REVERSE),
+           DATA(A_BLINK),
+           DATA(A_DIM),
+           DATA(A_BOLD),
+           DATA(A_ALTCHARSET),
+           DATA(A_INVIS),
+           DATA(A_PROTECT),
+           DATA(A_CHARTEXT),
+           DATA(A_NORMAL),
+           DATA(A_COLOR),
+#if USE_ITALIC
+           DATA(A_ITALIC),
+#endif
     }
 #ifndef USE_TERMLIB
     ,
        colors[] =
     {
     }
 #ifndef USE_TERMLIB
     ,
        colors[] =
     {
-       /* *INDENT-OFF* */
-       { COLOR_BLACK,          "COLOR_BLACK" },
-       { COLOR_RED,            "COLOR_RED" },
-       { COLOR_GREEN,          "COLOR_GREEN" },
-       { COLOR_YELLOW,         "COLOR_YELLOW" },
-       { COLOR_BLUE,           "COLOR_BLUE" },
-       { COLOR_MAGENTA,        "COLOR_MAGENTA" },
-       { COLOR_CYAN,           "COLOR_CYAN" },
-       { COLOR_WHITE,          "COLOR_WHITE" },
-       /* *INDENT-ON* */
-
+       DATA(COLOR_BLACK),
+           DATA(COLOR_RED),
+           DATA(COLOR_GREEN),
+           DATA(COLOR_YELLOW),
+           DATA(COLOR_BLUE),
+           DATA(COLOR_MAGENTA),
+           DATA(COLOR_CYAN),
+           DATA(COLOR_WHITE),
     }
 #endif /* !USE_TERMLIB */
     ;
     }
 #endif /* !USE_TERMLIB */
     ;
-    size_t n;
-    char temp[80];
-    char *result = _nc_trace_buf(bufnum, BUFSIZ);
+#undef DATA
+    char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ);
 
     if (result != 0) {
 
     if (result != 0) {
+       size_t n;
        unsigned save_nc_tracing = _nc_tracing;
 
        _nc_tracing = 0;
 
        unsigned save_nc_tracing = _nc_tracing;
 
        _nc_tracing = 0;
 
-       strcpy(result, l_brace);
+       _nc_STRCPY(result, l_brace, TRACE_BUF_SIZE(bufnum));
 
        for (n = 0; n < SIZEOF(names); n++) {
 
        for (n = 0; n < SIZEOF(names); n++) {
+
            if ((newmode & names[n].val) != 0) {
                if (result[1] != '\0')
                    (void) _nc_trace_bufcat(bufnum, "|");
                result = _nc_trace_bufcat(bufnum, names[n].name);
 
                if (names[n].val == A_COLOR) {
            if ((newmode & names[n].val) != 0) {
                if (result[1] != '\0')
                    (void) _nc_trace_bufcat(bufnum, "|");
                result = _nc_trace_bufcat(bufnum, names[n].name);
 
                if (names[n].val == A_COLOR) {
+                   char temp[80];
                    short pairnum = (short) PairNumber(newmode);
 #ifdef USE_TERMLIB
                    /* pair_content lives in libncurses */
                    short pairnum = (short) PairNumber(newmode);
 #ifdef USE_TERMLIB
                    /* pair_content lives in libncurses */
-                   (void) sprintf(temp, "{%d}", pairnum);
+                   _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
+                               "{%d}", pairnum);
 #else
 #else
-                   short fg, bg;
+                   NCURSES_COLOR_T fg, bg;
 
                    if (pair_content(pairnum, &fg, &bg) == OK) {
 
                    if (pair_content(pairnum, &fg, &bg) == OK) {
-                       (void) sprintf(temp,
-                                      "{%d = {%s, %s}}",
-                                      pairnum,
-                                      COLOR_OF(fg),
-                                      COLOR_OF(bg));
+                       _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
+                                   "{%d = {%s, %s}}",
+                                   pairnum,
+                                   COLOR_OF(fg),
+                                   COLOR_OF(bg));
                    } else {
                    } else {
-                       (void) sprintf(temp, "{%d}", pairnum);
+                       _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
+                                   "{%d}", pairnum);
                    }
 #endif
                    result = _nc_trace_bufcat(bufnum, temp);
                    }
 #endif
                    result = _nc_trace_bufcat(bufnum, temp);
@@ -194,49 +202,50 @@ _nc_retrace_attr_t(attr_t code)
 const char *
 _nc_altcharset_name(attr_t attr, chtype ch)
 {
 const char *
 _nc_altcharset_name(attr_t attr, chtype ch)
 {
+#define DATA(code, name) { code, { #name } }
     typedef struct {
        unsigned int val;
     typedef struct {
        unsigned int val;
-       const char *name;
+       const char name[13];
     } ALT_NAMES;
 #if NCURSES_SP_FUNCS
     SCREEN *sp = CURRENT_SCREEN;
 #endif
     static const ALT_NAMES names[] =
     {
     } ALT_NAMES;
 #if NCURSES_SP_FUNCS
     SCREEN *sp = CURRENT_SCREEN;
 #endif
     static const ALT_NAMES names[] =
     {
-       {'l', "ACS_ULCORNER"},  /* upper left corner */
-       {'m', "ACS_LLCORNER"},  /* lower left corner */
-       {'k', "ACS_URCORNER"},  /* upper right corner */
-       {'j', "ACS_LRCORNER"},  /* lower right corner */
-       {'t', "ACS_LTEE"},      /* tee pointing right */
-       {'u', "ACS_RTEE"},      /* tee pointing left */
-       {'v', "ACS_BTEE"},      /* tee pointing up */
-       {'w', "ACS_TTEE"},      /* tee pointing down */
-       {'q', "ACS_HLINE"},     /* horizontal line */
-       {'x', "ACS_VLINE"},     /* vertical line */
-       {'n', "ACS_PLUS"},      /* large plus or crossover */
-       {'o', "ACS_S1"},        /* scan line 1 */
-       {'s', "ACS_S9"},        /* scan line 9 */
-       {'`', "ACS_DIAMOND"},   /* diamond */
-       {'a', "ACS_CKBOARD"},   /* checker board (stipple) */
-       {'f', "ACS_DEGREE"},    /* degree symbol */
-       {'g', "ACS_PLMINUS"},   /* plus/minus */
-       {'~', "ACS_BULLET"},    /* bullet */
-       {',', "ACS_LARROW"},    /* arrow pointing left */
-       {'+', "ACS_RARROW"},    /* arrow pointing right */
-       {'.', "ACS_DARROW"},    /* arrow pointing down */
-       {'-', "ACS_UARROW"},    /* arrow pointing up */
-       {'h', "ACS_BOARD"},     /* board of squares */
-       {'i', "ACS_LANTERN"},   /* lantern symbol */
-       {'0', "ACS_BLOCK"},     /* solid square block */
-       {'p', "ACS_S3"},        /* scan line 3 */
-       {'r', "ACS_S7"},        /* scan line 7 */
-       {'y', "ACS_LEQUAL"},    /* less/equal */
-       {'z', "ACS_GEQUAL"},    /* greater/equal */
-       {'{', "ACS_PI"},        /* Pi */
-       {'|', "ACS_NEQUAL"},    /* not equal */
-       {'}', "ACS_STERLING"},  /* UK pound sign */
-       {'\0', (char *) 0}
+       DATA('l', ACS_ULCORNER),        /* upper left corner */
+       DATA('m', ACS_LLCORNER),        /* lower left corner */
+       DATA('k', ACS_URCORNER),        /* upper right corner */
+       DATA('j', ACS_LRCORNER),        /* lower right corner */
+       DATA('t', ACS_LTEE),    /* tee pointing right */
+       DATA('u', ACS_RTEE),    /* tee pointing left */
+       DATA('v', ACS_BTEE),    /* tee pointing up */
+       DATA('w', ACS_TTEE),    /* tee pointing down */
+       DATA('q', ACS_HLINE),   /* horizontal line */
+       DATA('x', ACS_VLINE),   /* vertical line */
+       DATA('n', ACS_PLUS),    /* large plus or crossover */
+       DATA('o', ACS_S1),      /* scan line 1 */
+       DATA('s', ACS_S9),      /* scan line 9 */
+       DATA('`', ACS_DIAMOND), /* diamond */
+       DATA('a', ACS_CKBOARD), /* checker board (stipple) */
+       DATA('f', ACS_DEGREE),  /* degree symbol */
+       DATA('g', ACS_PLMINUS), /* plus/minus */
+       DATA('~', ACS_BULLET),  /* bullet */
+       DATA(',', ACS_LARROW),  /* arrow pointing left */
+       DATA('+', ACS_RARROW),  /* arrow pointing right */
+       DATA('.', ACS_DARROW),  /* arrow pointing down */
+       DATA('-', ACS_UARROW),  /* arrow pointing up */
+       DATA('h', ACS_BOARD),   /* board of squares */
+       DATA('i', ACS_LANTERN), /* lantern symbol */
+       DATA('0', ACS_BLOCK),   /* solid square block */
+       DATA('p', ACS_S3),      /* scan line 3 */
+       DATA('r', ACS_S7),      /* scan line 7 */
+       DATA('y', ACS_LEQUAL),  /* less/equal */
+       DATA('z', ACS_GEQUAL),  /* greater/equal */
+       DATA('{', ACS_PI),      /* Pi */
+       DATA('|', ACS_NEQUAL),  /* not equal */
+       DATA('}', ACS_STERLING),        /* UK pound sign */
     };
     };
+#undef DATA
 
     const char *result = 0;
 
 
     const char *result = 0;
 
@@ -246,7 +255,6 @@ _nc_altcharset_name(attr_t attr, chtype ch)
     if (SP_PARM != 0 && (attr & A_ALTCHARSET) && (acs_chars != 0)) {
        char *cp;
        char *found = 0;
     if (SP_PARM != 0 && (attr & A_ALTCHARSET) && (acs_chars != 0)) {
        char *cp;
        char *found = 0;
-       const ALT_NAMES *strp;
 
        for (cp = acs_chars; cp[0] && cp[1]; cp += 2) {
            if (ChCharOf(UChar(cp[1])) == ChCharOf(ch)) {
 
        for (cp = acs_chars; cp[0] && cp[1]; cp += 2) {
            if (ChCharOf(UChar(cp[1])) == ChCharOf(ch)) {
@@ -256,12 +264,15 @@ _nc_altcharset_name(attr_t attr, chtype ch)
        }
 
        if (found != 0) {
        }
 
        if (found != 0) {
+           size_t n;
+
            ch = ChCharOf(UChar(*found));
            ch = ChCharOf(UChar(*found));
-           for (strp = names; strp->val; strp++)
-               if (strp->val == ch) {
-                   result = strp->name;
+           for (n = 0; n < SIZEOF(names); ++n) {
+               if (names[n].val == ch) {
+                   result = names[n].name;
                    break;
                }
                    break;
                }
+           }
        }
     }
     return result;
        }
     }
     return result;
@@ -270,22 +281,25 @@ _nc_altcharset_name(attr_t attr, chtype ch)
 NCURSES_EXPORT(char *)
 _tracechtype2(int bufnum, chtype ch)
 {
 NCURSES_EXPORT(char *)
 _tracechtype2(int bufnum, chtype ch)
 {
-    const char *found;
-    char *result = _nc_trace_buf(bufnum, BUFSIZ);
+    char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ);
 
     if (result != 0) {
 
     if (result != 0) {
-       strcpy(result, l_brace);
-       if ((found = _nc_altcharset_name(ChAttrOf(ch), ch)) != 0) {
+       const char *found;
+       attr_t attr = ChAttrOf(ch);
+
+       _nc_STRCPY(result, l_brace, TRACE_BUF_SIZE(bufnum));
+       if ((found = _nc_altcharset_name(attr, ch)) != 0) {
            (void) _nc_trace_bufcat(bufnum, found);
            (void) _nc_trace_bufcat(bufnum, found);
+           attr &= ~A_ALTCHARSET;
        } else
            (void) _nc_trace_bufcat(bufnum,
                                    _nc_tracechar(CURRENT_SCREEN,
                                                  (int) ChCharOf(ch)));
 
        } else
            (void) _nc_trace_bufcat(bufnum,
                                    _nc_tracechar(CURRENT_SCREEN,
                                                  (int) ChCharOf(ch)));
 
-       if (ChAttrOf(ch) != A_NORMAL) {
+       if (attr != A_NORMAL) {
            (void) _nc_trace_bufcat(bufnum, " | ");
            (void) _nc_trace_bufcat(bufnum,
            (void) _nc_trace_bufcat(bufnum, " | ");
            (void) _nc_trace_bufcat(bufnum,
-                                   _traceattr2(bufnum + 20, ChAttrOf(ch)));
+                                   _traceattr2(bufnum + 20, attr));
        }
 
        result = _nc_trace_bufcat(bufnum, r_brace);
        }
 
        result = _nc_trace_bufcat(bufnum, r_brace);
@@ -311,14 +325,14 @@ _nc_retrace_chtype(chtype code)
 NCURSES_EXPORT(char *)
 _tracecchar_t2(int bufnum, const cchar_t *ch)
 {
 NCURSES_EXPORT(char *)
 _tracecchar_t2(int bufnum, const cchar_t *ch)
 {
-    char *result = _nc_trace_buf(bufnum, BUFSIZ);
-    attr_t attr;
-    const char *found;
+    char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ);
 
     if (result != 0) {
 
     if (result != 0) {
-       strcpy(result, l_brace);
+       _nc_STRCPY(result, l_brace, TRACE_BUF_SIZE(bufnum));
        if (ch != 0) {
        if (ch != 0) {
-           attr = AttrOfD(ch);
+           const char *found;
+           attr_t attr = AttrOfD(ch);
+
            if ((found = _nc_altcharset_name(attr, (chtype) CharOfD(ch))) != 0) {
                (void) _nc_trace_bufcat(bufnum, found);
                attr &= ~A_ALTCHARSET;
            if ((found = _nc_altcharset_name(attr, (chtype) CharOfD(ch))) != 0) {
                (void) _nc_trace_bufcat(bufnum, found);
                attr &= ~A_ALTCHARSET;
@@ -329,7 +343,6 @@ _tracecchar_t2(int bufnum, const cchar_t *ch)
                PUTC_DATA;
                int n;
 
                PUTC_DATA;
                int n;
 
-               PUTC_INIT;
                (void) _nc_trace_bufcat(bufnum, "{ ");
                for (PUTC_i = 0; PUTC_i < CCHARW_MAX; ++PUTC_i) {
                    PUTC_ch = ch->chars[PUTC_i];
                (void) _nc_trace_bufcat(bufnum, "{ ");
                for (PUTC_i = 0; PUTC_i < CCHARW_MAX; ++PUTC_i) {
                    PUTC_ch = ch->chars[PUTC_i];
@@ -338,6 +351,7 @@ _tracecchar_t2(int bufnum, const cchar_t *ch)
                            (void) _nc_trace_bufcat(bufnum, "\\000");
                        break;
                    }
                            (void) _nc_trace_bufcat(bufnum, "\\000");
                        break;
                    }
+                   PUTC_INIT;
                    PUTC_n = (int) wcrtomb(PUTC_buf, ch->chars[PUTC_i], &PUT_st);
                    if (PUTC_n <= 0) {
                        if (PUTC_ch != L'\0') {
                    PUTC_n = (int) wcrtomb(PUTC_buf, ch->chars[PUTC_i], &PUT_st);
                    if (PUTC_n <= 0) {
                        if (PUTC_ch != L'\0') {
@@ -347,6 +361,14 @@ _tracecchar_t2(int bufnum, const cchar_t *ch)
                                                                  UChar(ch->chars[PUTC_i])));
                        }
                        break;
                                                                  UChar(ch->chars[PUTC_i])));
                        }
                        break;
+                   } else if (ch->chars[PUTC_i] > 255) {
+                       char temp[80];
+                       _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
+                                   "{%d:\\u%lx}",
+                                   wcwidth(ch->chars[PUTC_i]),
+                                   (unsigned long) ch->chars[PUTC_i]);
+                       (void) _nc_trace_bufcat(bufnum, temp);
+                       break;
                    }
                    for (n = 0; n < PUTC_n; n++) {
                        if (n)
                    }
                    for (n = 0; n < PUTC_n; n++) {
                        if (n)
@@ -362,6 +384,18 @@ _tracecchar_t2(int bufnum, const cchar_t *ch)
                (void) _nc_trace_bufcat(bufnum, " | ");
                (void) _nc_trace_bufcat(bufnum, _traceattr2(bufnum + 20, attr));
            }
                (void) _nc_trace_bufcat(bufnum, " | ");
                (void) _nc_trace_bufcat(bufnum, _traceattr2(bufnum + 20, attr));
            }
+#if NCURSES_EXT_COLORS
+           /*
+            * Just in case the extended color is different from the chtype
+            * value, trace both.
+            */
+           if (ch->ext_color != PairNumber(attr)) {
+               char temp[80];
+               _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
+                           " X_COLOR{%d:%d}", ch->ext_color, PairNumber(attr));
+               (void) _nc_trace_bufcat(bufnum, temp);
+           }
+#endif
        }
 
        result = _nc_trace_bufcat(bufnum, r_brace);
        }
 
        result = _nc_trace_bufcat(bufnum, r_brace);