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 ee6cf5f1f3d37f175d4cc67f68944d8f4831856a..566e75454cf5e7c2e0f1dd211f00e383b665a523 100644 (file)
--- a/ncurses/trace/lib_traceatr.c
+++ b/ncurses/trace/lib_traceatr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2005,2006 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -39,33 +39,37 @@
 #include <curses.priv.h>
 #include <term.h>              /* acs_chars */
 
 #include <curses.priv.h>
 #include <term.h>              /* acs_chars */
 

-MODULE_ID("$Id: lib_traceatr.c,v 1.56 2006/12/02 21:18:28 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) ? "default" : (c > 7 ? color_of(c) : colors[c].name))
 
 #ifdef TRACE
 
 
 #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
 
 #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)
 {
 static char *
 color_of(int c)
 {

-    static char buffer[2][80];
-    static int sel;
-    static int last = -1;
-
-    if (c != last) {
-       last = c;
-       sel = !sel;
+    if (c != my_cached) {
+       my_cached = c;
+       my_select = !my_select;

        if (c == COLOR_DEFAULT)
        if (c == COLOR_DEFAULT)

-           strcpy(buffer[sel], "default");
+           strcpy(my_buffer[my_select], "default");

        else
        else

-           sprintf(buffer[sel], "color%d", c);
+           sprintf(my_buffer[my_select], "color%d", c);

     }
     }

-    return buffer[sel];
+    return my_buffer[my_select];

 }
 }

+
+#undef my_buffer
+#undef my_select

 #endif /* !USE_TERMLIB */
 
 NCURSES_EXPORT(char *)
 #endif /* !USE_TERMLIB */
 
 NCURSES_EXPORT(char *)


@@ -173,17 +177,19 @@ _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)
 {

+    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;
     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 */
            { 'l', "ACS_ULCORNER" },    /* upper left corner */
            { 'm', "ACS_LLCORNER" },    /* lower left corner */
            { 'k', "ACS_URCORNER" },    /* upper right corner */


@@ -217,9 +223,9 @@ _nc_altcharset_name(attr_t attr, chtype ch)
            { '|', "ACS_NEQUAL" },      /* not equal */
            { '}', "ACS_STERLING" },    /* UK pound sign */
            { '\0', (char *) 0 }
            { '|', "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)) {
 
        for (cp = acs_chars; cp[0] && cp[1]; cp += 2) {
            if (ChCharOf(cp[1]) == ChCharOf(ch)) {


@@ -249,7 +255,7 @@ _tracechtype2(int bufnum, chtype ch)
     if ((found = _nc_altcharset_name(ChAttrOf(ch), ch)) != 0) {
        (void) _nc_trace_bufcat(bufnum, found);
     } else
     if ((found = _nc_altcharset_name(ChAttrOf(ch), ch)) != 0) {
        (void) _nc_trace_bufcat(bufnum, found);
     } else

-       (void) _nc_trace_bufcat(bufnum, _tracechar((int)ChCharOf(ch)));
+       (void) _nc_trace_bufcat(bufnum, _nc_tracechar(SP, (int)ChCharOf(ch)));

 
     if (ChAttrOf(ch) != A_NORMAL) {
        (void) _nc_trace_bufcat(bufnum, " | ");
 
     if (ChAttrOf(ch) != A_NORMAL) {
        (void) _nc_trace_bufcat(bufnum, " | ");


@@ -305,14 +311,14 @@ _tracecchar_t2 (int bufnum, const cchar_t *ch)
                if (PUTC_n <= 0) {
                    if (PUTC_ch != L'\0') {
                        /* it could not be a multibyte sequence */
                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, ", ");
                    }
                    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])));

                }
            }
            (void) _nc_trace_bufcat(bufnum, " }");
                }
            }
            (void) _nc_trace_bufcat(bufnum, " }");