ncurses 5.7 - patch 20091010
[ncurses.git] / ncurses / trace / lib_traceatr.c
index 6cda1c8dac69152b57d8f5b15ae6c29ed9729ea8..66d35f40b69b66fa85010d95c4a94be109f7836f 100644 (file)
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2008,2009 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            *
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas Dickey 1996-2001                                         *
+ *  Author: Thomas Dickey                           1996-on                 *
  *     and: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Juergen Pfeifer                                                 *
  ****************************************************************************/
 
 /*
  */
 
 #include <curses.priv.h>
-#include <term.h>              /* acs_chars */
 
-MODULE_ID("$Id: lib_traceatr.c,v 1.43 2002/09/28 12:37:03 tom Exp $")
+#ifndef CUR
+#define CUR SP_TERMTYPE 
+#endif
+
+MODULE_ID("$Id: lib_traceatr.c,v 1.66 2009/05/10 00:48:29 tom Exp $")
 
-#define COLOR_OF(c) (c < 0 || c > 7 ? "default" : colors[c].name)
+#define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name))
 
 #ifdef TRACE
 
-static const char l_brace[] = {L_BRACE, 0};
-static const char r_brace[] = {R_BRACE, 0};
+static const char l_brace[] = StringOf(L_BRACE);
+static const char r_brace[] = StringOf(R_BRACE);
+
+#ifndef USE_TERMLIB
+
+#define my_buffer _nc_globals.traceatr_color_buf
+#define my_select _nc_globals.traceatr_color_sel
+#define my_cached _nc_globals.traceatr_color_last
+
+static char *
+color_of(int c)
+{
+    if (c != my_cached) {
+       my_cached = c;
+       my_select = !my_select;
+       if (c == COLOR_DEFAULT)
+           strcpy(my_buffer[my_select], "default");
+       else
+           sprintf(my_buffer[my_select], "color%d", c);
+    }
+    return my_buffer[my_select];
+}
+
+#undef my_buffer
+#undef my_select
+#endif /* !USE_TERMLIB */
 
 NCURSES_EXPORT(char *)
-_traceattr2(int bufnum, attr_t newmode)
+_traceattr2(int bufnum, chtype newmode)
 {
-    char *buf = _nc_trace_buf(bufnum, BUFSIZ);
-    char *tmp = buf;
     static const struct {
        unsigned int val;
        const char *name;
@@ -73,7 +99,9 @@ _traceattr2(int bufnum, attr_t newmode)
        { A_COLOR,              "A_COLOR" },
        /* *INDENT-ON* */
 
-    },
+    }
+#ifndef USE_TERMLIB
+    ,
        colors[] =
     {
        /* *INDENT-OFF* */
@@ -87,44 +115,58 @@ _traceattr2(int bufnum, attr_t newmode)
        { COLOR_WHITE,          "COLOR_WHITE" },
        /* *INDENT-ON* */
 
-    };
+    }
+#endif /* !USE_TERMLIB */
+    ;
     size_t n;
-    unsigned save_nc_tracing = _nc_tracing;
-    _nc_tracing = 0;
-
-    strcpy(tmp++, l_brace);
-
-    for (n = 0; n < SIZEOF(names); n++) {
-       if ((newmode & names[n].val) != 0) {
-           if (buf[1] != '\0')
-               strcat(tmp, "|");
-           strcat(tmp, names[n].name);
-           tmp += strlen(tmp);
-
-           if (names[n].val == A_COLOR) {
-               short pairnum = PAIR_NUMBER(newmode);
-               short fg, bg;
-
-               if (pair_content(pairnum, &fg, &bg) == OK)
-                   (void) sprintf(tmp,
-                                  "{%d = {%s, %s}}",
-                                  pairnum,
-                                  COLOR_OF(fg),
-                                  COLOR_OF(bg)
-                       );
-               else
-                   (void) sprintf(tmp, "{%d}", pairnum);
+    char temp[80];
+    char *result = _nc_trace_buf(bufnum, BUFSIZ);
+
+    if (result != 0) {
+       unsigned save_nc_tracing = _nc_tracing;
+
+       _nc_tracing = 0;
+
+       strcpy(result, l_brace);
+
+       for (n = 0; n < SIZEOF(names); n++) {
+           if ((newmode & names[n].val) != 0) {
+               if (result[1] != '\0')
+                   result = _nc_trace_bufcat(bufnum, "|");
+               result = _nc_trace_bufcat(bufnum, names[n].name);
+
+               if (names[n].val == A_COLOR) {
+                   short pairnum = PAIR_NUMBER(newmode);
+#ifdef USE_TERMLIB
+                   /* pair_content lives in libncurses */
+                   (void) sprintf(temp, "{%d}", pairnum);
+#else
+                   short fg, bg;
+
+                   if (pair_content(pairnum, &fg, &bg) == OK) {
+                       (void) sprintf(temp,
+                                      "{%d = {%s, %s}}",
+                                      pairnum,
+                                      COLOR_OF(fg),
+                                      COLOR_OF(bg));
+                   } else {
+                       (void) sprintf(temp, "{%d}", pairnum);
+                   }
+#endif
+                   result = _nc_trace_bufcat(bufnum, temp);
+               }
            }
        }
-    }
-    if (ChAttrOf(newmode) == A_NORMAL) {
-       if (buf[1] != '\0')
-           strcat(tmp, "|");
-       strcat(tmp, "A_NORMAL");
-    }
+       if (ChAttrOf(newmode) == A_NORMAL) {
+           if (result != 0 && result[1] != '\0')
+               (void) _nc_trace_bufcat(bufnum, "|");
+           (void) _nc_trace_bufcat(bufnum, "A_NORMAL");
+       }
 
-    _nc_tracing = save_nc_tracing;
-    return (strcat(buf, r_brace));
+       _nc_tracing = save_nc_tracing;
+       result = _nc_trace_bufcat(bufnum, r_brace);
+    }
+    return result;
 }
 
 NCURSES_EXPORT(char *)
@@ -144,53 +186,56 @@ _nc_retrace_attr_t(attr_t code)
 const char *
 _nc_altcharset_name(attr_t attr, chtype ch)
 {
+    typedef struct {
+       unsigned int val;
+       const char *name;
+    } 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}
+    };
+
     const char *result = 0;
 
-    if (attr & A_ALTCHARSET) {
+    if ((attr & A_ALTCHARSET) && (acs_chars != 0)) {
        char *cp;
        char *found = 0;
-       static const struct {
-           unsigned int val;
-           const char *name;
-       } names[] =
-       {
-           /* *INDENT-OFF* */
-           { '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 }
-               /* *INDENT-OFF* */
-       },
-           *sp;
+       const ALT_NAMES *strp;
 
        for (cp = acs_chars; cp[0] && cp[1]; cp += 2) {
            if (ChCharOf(cp[1]) == ChCharOf(ch)) {
@@ -201,9 +246,9 @@ _nc_altcharset_name(attr_t attr, chtype ch)
 
        if (found != 0) {
            ch = ChCharOf(*found);
-           for (sp = names; sp->val; sp++)
-               if (sp->val == ch) {
-                   result = sp->name;
+           for (strp = names; strp->val; strp++)
+               if (strp->val == ch) {
+                   result = strp->name;
                    break;
                }
        }
@@ -214,31 +259,38 @@ _nc_altcharset_name(attr_t attr, chtype ch)
 NCURSES_EXPORT(char *)
 _tracechtype2(int bufnum, chtype ch)
 {
-    char *buf = _nc_trace_buf(bufnum, BUFSIZ);
     const char *found;
+    char *result = _nc_trace_buf(bufnum, BUFSIZ);
+
+    if (result != 0) {
+       strcpy(result, l_brace);
+       if ((found = _nc_altcharset_name(ChAttrOf(ch), ch)) != 0) {
+           (void) _nc_trace_bufcat(bufnum, found);
+       } else
+           (void) _nc_trace_bufcat(bufnum,
+                                   _nc_tracechar(CURRENT_SCREEN,
+                                                 (int) ChCharOf(ch)));
+
+       if (ChAttrOf(ch) != A_NORMAL) {
+           (void) _nc_trace_bufcat(bufnum, " | ");
+           (void) _nc_trace_bufcat(bufnum,
+                                   _traceattr2(bufnum + 20, ChAttrOf(ch)));
+       }
 
-    strcpy(buf, l_brace);
-    if ((found = _nc_altcharset_name(ChAttrOf(ch), ch)) != 0) {
-       (void) strcat(buf, found);
-    } else
-       (void) strcat(buf, _tracechar(ChCharOf(ch)));
-
-    if (ChAttrOf(ch) != A_NORMAL)
-       (void) sprintf(buf + strlen(buf), " | %s",
-               _traceattr2(bufnum + 20, ChAttrOf(ch)));
-
-    return (strcat(buf, r_brace));
+       result = _nc_trace_bufcat(bufnum, r_brace);
+    }
+    return result;
 }
 
 NCURSES_EXPORT(char *)
-_tracechtype (chtype ch)
+_tracechtype(chtype ch)
 {
     return _tracechtype2(0, ch);
 }
 
 /* Trace 'chtype' return-values */
 NCURSES_EXPORT(chtype)
-_nc_retrace_chtype (chtype code)
+_nc_retrace_chtype(chtype code)
 {
     T((T_RETURN("%s"), _tracechtype(code)));
     return code;
@@ -246,56 +298,70 @@ _nc_retrace_chtype (chtype code)
 
 #if USE_WIDEC_SUPPORT
 NCURSES_EXPORT(char *)
-_tracecchar_t2 (int bufnum, const cchar_t *ch)
+_tracecchar_t2(int bufnum, const cchar_t *ch)
 {
-    char *buf = _nc_trace_buf(bufnum, BUFSIZ);
+    char *result = _nc_trace_buf(bufnum, BUFSIZ);
     attr_t attr;
     const char *found;
 
-    strcpy(buf, l_brace);
-    if (ch != 0) {
-       attr = AttrOfD(ch);
-       if ((found = _nc_altcharset_name(attr, CharOfD(ch))) != 0) {
-           (void) strcat(buf, found);
-           attr &= ~A_ALTCHARSET;
-       } else if (!isnac(CHDEREF(ch))) {
-           PUTC_DATA;
-           int n;
-
-           memset (&PUT_st, '\0', sizeof (PUT_st));
-           PUTC_i = 0;
-           (void) strcat(buf, "{ ");
-           do {
-               PUTC_ch = PUTC_i < CCHARW_MAX ? ch->chars[PUTC_i] : L'\0';
-               PUTC_n = wcrtomb(PUTC_buf, ch->chars[PUTC_i], &PUT_st);
-               if (PUTC_ch == L'\0')
-                   --PUTC_n;
-               if (PUTC_n <= 0)
-                   break;
-               for (n = 0; n < PUTC_n; n++) {
-                   if (n)
-                       (void) strcat(buf, ", ");
-                   (void) strcat(buf, _tracechar(UChar(PUTC_buf[n])));
+    if (result != 0) {
+       strcpy(result, l_brace);
+       if (ch != 0) {
+           attr = AttrOfD(ch);
+           if ((found = _nc_altcharset_name(attr, (chtype) CharOfD(ch))) != 0) {
+               (void) _nc_trace_bufcat(bufnum, found);
+               attr &= ~A_ALTCHARSET;
+           } else if (isWidecExt(CHDEREF(ch))) {
+               (void) _nc_trace_bufcat(bufnum, "{NAC}");
+               attr &= ~A_CHARTEXT;
+           } else {
+               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];
+                   if (PUTC_ch == L'\0')
+                       break;
+                   PUTC_n = wcrtomb(PUTC_buf, ch->chars[PUTC_i], &PUT_st);
+                   if (PUTC_n <= 0) {
+                       if (PUTC_ch != L'\0') {
+                           /* it could not be a multibyte sequence */
+                           (void) _nc_trace_bufcat(bufnum,
+                                                   _nc_tracechar(CURRENT_SCREEN,
+                                                                 UChar(ch->chars[PUTC_i])));
+                       }
+                       break;
+                   }
+                   for (n = 0; n < PUTC_n; n++) {
+                       if (n)
+                           (void) _nc_trace_bufcat(bufnum, ", ");
+                       (void) _nc_trace_bufcat(bufnum,
+                                               _nc_tracechar(CURRENT_SCREEN,
+                                                             UChar(PUTC_buf[n])));
+                   }
                }
-               ++PUTC_i;
-           } while (PUTC_ch != L'\0');
-           (void) strcat(buf, " }");
+               (void) _nc_trace_bufcat(bufnum, " }");
+           }
+           if (attr != A_NORMAL) {
+               (void) _nc_trace_bufcat(bufnum, " | ");
+               (void) _nc_trace_bufcat(bufnum, _traceattr2(bufnum + 20, attr));
+           }
        }
-       if (attr != A_NORMAL)
-           (void) sprintf(buf + strlen(buf), " | %s",
-                   _traceattr2(bufnum + 20, attr));
-    }
 
-    return (strcat(buf, r_brace));
+       result = _nc_trace_bufcat(bufnum, r_brace);
+    }
+    return result;
 }
 
 NCURSES_EXPORT(char *)
-_tracecchar_t (const cchar_t *ch)
+_tracecchar_t(const cchar_t *ch)
 {
     return _tracecchar_t2(0, ch);
 }
 #endif
 
 #else
-empty_module(_nc_lib_traceatr)
+EMPTY_MODULE(_nc_lib_traceatr)
 #endif /* TRACE */