ncurses 5.6 - patch 20080531

[ncurses.git] / ncurses / trace / lib_traceatr.c

diff --git a/ncurses/trace/lib_traceatr.c b/ncurses/trace/lib_traceatr.c
index a9c53c9fd1e452194b2a31698c699aa9fb6f3d39..566e75454cf5e7c2e0f1dd211f00e383b665a523 100644 (file)
--- a/ncurses/trace/lib_traceatr.c
+++ b/ncurses/trace/lib_traceatr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,2008 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            *
@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas Dickey 1996-2003                                         *
+ *  Author: Thomas Dickey                           1996-on                 *
  *     and: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
@@ -39,17 +39,41 @@
 #include <curses.priv.h>
 #include <term.h>              /* acs_chars */
 
-MODULE_ID("$Id: lib_traceatr.c,v 1.48 2004/01/25 22:31:38 tom Exp $")
+MODULE_ID("$Id: lib_traceatr.c,v 1.60 2008/05/31 16:53:15 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 temp[80];
@@ -73,7 +97,9 @@ _traceattr2(int bufnum, attr_t newmode)
        { A_COLOR,              "A_COLOR" },
        /* *INDENT-ON* */
 
-    },
+    }
+#ifndef USE_TERMLIB
+    ,
        colors[] =
     {
        /* *INDENT-OFF* */
@@ -87,7 +113,9 @@ _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;
@@ -102,6 +130,10 @@ _traceattr2(int bufnum, attr_t newmode)
 
            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) {
@@ -113,6 +145,7 @@ _traceattr2(int bufnum, attr_t newmode)
                } else {
                    (void) sprintf(temp, "{%d}", pairnum);
                }
+#endif
                buf = _nc_trace_bufcat(bufnum, temp);
            }
        }
@@ -144,17 +177,19 @@ _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;
+
     const char *result = 0;
 
     if ((attr & A_ALTCHARSET) && (acs_chars != 0)) {
        char *cp;
        char *found = 0;
-       static const struct {
-           unsigned int val;
-           const char *name;
-       } names[] =
+       /* *INDENT-OFF* */
+       static const ALT_NAMES names[] =
        {
-           /* *INDENT-OFF* */
            { 'l', "ACS_ULCORNER" },    /* upper left corner */
            { 'm', "ACS_LLCORNER" },    /* lower left corner */
            { 'k', "ACS_URCORNER" },    /* upper right corner */
@@ -188,9 +223,9 @@ _nc_altcharset_name(attr_t attr, chtype ch)
            { '|', "ACS_NEQUAL" },      /* not equal */
            { '}', "ACS_STERLING" },    /* UK pound sign */
            { '\0', (char *) 0 }
-               /* *INDENT-OFF* */
-       },
-           *sp;
+       };
+       /* *INDENT-OFF* */
+       const ALT_NAMES *sp;
 
        for (cp = acs_chars; cp[0] && cp[1]; cp += 2) {
            if (ChCharOf(cp[1]) == ChCharOf(ch)) {
@@ -220,7 +255,7 @@ _tracechtype2(int bufnum, chtype ch)
     if ((found = _nc_altcharset_name(ChAttrOf(ch), ch)) != 0) {
        (void) _nc_trace_bufcat(bufnum, found);
     } else
-       (void) _nc_trace_bufcat(bufnum, _tracechar(ChCharOf(ch)));
+       (void) _nc_trace_bufcat(bufnum, _nc_tracechar(SP, (int)ChCharOf(ch)));
 
     if (ChAttrOf(ch) != A_NORMAL) {
        (void) _nc_trace_bufcat(bufnum, " | ");
@@ -256,36 +291,36 @@ _tracecchar_t2 (int bufnum, const cchar_t *ch)
     strcpy(buf, l_brace);
     if (ch != 0) {
        attr = AttrOfD(ch);
-       if ((found = _nc_altcharset_name(attr, CharOfD(ch))) != 0) {
+       if ((found = _nc_altcharset_name(attr, (chtype) CharOfD(ch))) != 0) {
            (void) _nc_trace_bufcat(bufnum, found);
            attr &= ~A_ALTCHARSET;
-       } else if (isnac(CHDEREF(ch))) {
+       } 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, "{ ");
-           do {
-               PUTC_ch = PUTC_i < CCHARW_MAX ? ch->chars[PUTC_i] : L'\0';
-               PUTC_n = wcrtomb(PUTC_buf, ch->chars[PUTC_i], &PUT_st);
+           for (PUTC_i = 0; PUTC_i < CCHARW_MAX; ++PUTC_i) {
+               PUTC_ch = ch->chars[PUTC_i];
                if (PUTC_ch == L'\0')
-                   --PUTC_n;
+                   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, _tracechar(UChar(ch->chars[PUTC_i])));
+                       (void) _nc_trace_bufcat(bufnum, _nc_tracechar(SP, 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, _tracechar(UChar(PUTC_buf[n])));
+                   (void) _nc_trace_bufcat(bufnum, _nc_tracechar(SP, UChar(PUTC_buf[n])));
                }
-               ++PUTC_i;
-           } while (PUTC_ch != L'\0');
+           }
            (void) _nc_trace_bufcat(bufnum, " }");
        }
        if (attr != A_NORMAL) {