X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftrace%2Flib_traceatr.c;h=6db61254b32379d13ecc0f90e4fa9cbd07d63124;hp=d9e007517f76b72cd7ecb8f10d72ade4c2b2a927;hb=7a27c7d49c2e8b4a1ecbe85b4423d647cbc75ea5;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce

diff --git a/ncurses/trace/lib_traceatr.c b/ncurses/trace/lib_traceatr.c
index d9e00751..6db61254 100644
--- a/ncurses/trace/lib_traceatr.c
+++ b/ncurses/trace/lib_traceatr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2006,2007 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,31 +27,62 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
+ *  Author: Thomas Dickey                           1996-on                 *
+ *     and: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-
-
 /*
  *	lib_traceatr.c - Tracing/Debugging routines (attributes)
  */
 
 #include <curses.priv.h>
-#include <term.h>	/* acs_chars */
+#include <term.h>		/* acs_chars */
 
-MODULE_ID("$Id: lib_traceatr.c,v 1.28 1998/03/21 18:39:36 tom Exp $")
+MODULE_ID("$Id: lib_traceatr.c,v 1.58 2007/04/21 22:54:45 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
-char *_traceattr2(int bufnum, attr_t newmode)
+
+static const char l_brace[] = {L_BRACE, 0};
+static const char r_brace[] = {R_BRACE, 0};
+
+#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, chtype newmode)
 {
-char	*buf = _nc_trace_buf(bufnum, BUFSIZ);
-char	*tmp = buf;
-static const	struct {unsigned int val; const char *name;}
-names[] =
+    char *buf = _nc_trace_buf(bufnum, BUFSIZ);
+    char temp[80];
+    static const struct {
+	unsigned int val;
+	const char *name;
+    } names[] =
     {
+	/* *INDENT-OFF* */
 	{ A_STANDOUT,		"A_STANDOUT" },
 	{ A_UNDERLINE,		"A_UNDERLINE" },
 	{ A_REVERSE,		"A_REVERSE" },
@@ -64,9 +95,14 @@ names[] =
 	{ A_CHARTEXT,		"A_CHARTEXT" },
 	{ A_NORMAL,		"A_NORMAL" },
 	{ A_COLOR,		"A_COLOR" },
-    },
-colors[] =
+	/* *INDENT-ON* */
+
+    }
+#ifndef USE_TERMLIB
+    ,
+	colors[] =
     {
+	/* *INDENT-OFF* */
 	{ COLOR_BLACK,		"COLOR_BLACK" },
 	{ COLOR_RED,		"COLOR_RED" },
 	{ COLOR_GREEN,		"COLOR_GREEN" },
@@ -75,144 +111,234 @@ colors[] =
 	{ COLOR_MAGENTA,	"COLOR_MAGENTA" },
 	{ COLOR_CYAN,		"COLOR_CYAN" },
 	{ COLOR_WHITE,		"COLOR_WHITE" },
-    };
-size_t n;
-unsigned save_nc_tracing = _nc_tracing;
-	_nc_tracing = 0;
-
-	strcpy(tmp++, "{");
-
-	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);
-			}
+	/* *INDENT-ON* */
+
+    }
+#endif /* !USE_TERMLIB */
+    ;
+    size_t n;
+    unsigned save_nc_tracing = _nc_tracing;
+    _nc_tracing = 0;
+
+    strcpy(buf, l_brace);
+
+    for (n = 0; n < SIZEOF(names); n++) {
+	if ((newmode & names[n].val) != 0) {
+	    if (buf[1] != '\0')
+		buf = _nc_trace_bufcat(bufnum, "|");
+	    buf = _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
+		buf = _nc_trace_bufcat(bufnum, temp);
+	    }
 	}
-	if (AttrOf(newmode) == A_NORMAL) {
-		if (buf[1] != '\0')
-			strcat(tmp, "|");
-		strcat(tmp, "A_NORMAL");
-	}
+    }
+    if (ChAttrOf(newmode) == A_NORMAL) {
+	if (buf[1] != '\0')
+	    (void) _nc_trace_bufcat(bufnum, "|");
+	(void) _nc_trace_bufcat(bufnum, "A_NORMAL");
+    }
 
-	_nc_tracing = save_nc_tracing;
-	return (strcat(buf,"}"));
+    _nc_tracing = save_nc_tracing;
+    return (_nc_trace_bufcat(bufnum, r_brace));
 }
 
-char *_traceattr(attr_t newmode)
+NCURSES_EXPORT(char *)
+_traceattr(attr_t newmode)
 {
-	return _traceattr2(0, newmode);
+    return _traceattr2(0, newmode);
 }
 
 /* Trace 'int' return-values */
-attr_t _nc_retrace_attr_t(attr_t code)
+NCURSES_EXPORT(attr_t)
+_nc_retrace_attr_t(attr_t code)
 {
-	T((T_RETURN("%s"), _traceattr(code)));
-	return code;
+    T((T_RETURN("%s"), _traceattr(code)));
+    return code;
 }
 
-char *_tracechtype2(int bufnum, chtype ch)
+const char *
+_nc_altcharset_name(attr_t attr, chtype ch)
 {
-char	*buf = _nc_trace_buf(bufnum, BUFSIZ);
-char	*found = 0;
+    typedef struct {
+	unsigned int val;
+	const char *name;
+    } ALT_NAMES;
 
-    strcpy(buf, "{");
-    if (ch & A_ALTCHARSET)
-    {
-	char	*cp;
-	static const	struct {unsigned int val; const char *name;}
-	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}
-	},
-	*sp;
-
-	for (cp = acs_chars; cp[0] && cp[1]; cp += 2)
+    const char *result = 0;
+
+    if ((attr & A_ALTCHARSET) && (acs_chars != 0)) {
+	char *cp;
+	char *found = 0;
+	/* *INDENT-OFF* */
+	static const ALT_NAMES names[] =
 	{
-	    if (TextOf(cp[1]) == TextOf(ch))
-	    {
+	    { '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* */
+	const ALT_NAMES *sp;
+
+	for (cp = acs_chars; cp[0] && cp[1]; cp += 2) {
+	    if (ChCharOf(cp[1]) == ChCharOf(ch)) {
 		found = cp;
 		/* don't exit from loop - there may be redefinitions */
 	    }
 	}
 
-	if (found != 0)
-	{
-	    ch = TextOf(*found);
+	if (found != 0) {
+	    ch = ChCharOf(*found);
 	    for (sp = names; sp->val; sp++)
-		if (sp->val == ch)
-		{
-		    (void) strcat(buf, sp->name);
-		    ch &= ~A_ALTCHARSET;
+		if (sp->val == ch) {
+		    result = sp->name;
 		    break;
 		}
 	}
     }
+    return result;
+}
 
-    if (found == 0)
-	(void) strcat(buf, _tracechar(TextOf(ch)));
+NCURSES_EXPORT(char *)
+_tracechtype2(int bufnum, chtype ch)
+{
+    const char *found;
+
+    strcpy(_nc_trace_buf(bufnum, BUFSIZ), l_brace);
+    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)));
+
+    if (ChAttrOf(ch) != A_NORMAL) {
+	(void) _nc_trace_bufcat(bufnum, " | ");
+	(void) _nc_trace_bufcat(bufnum,
+		_traceattr2(bufnum + 20, ChAttrOf(ch)));
+    }
 
-    if (AttrOf(ch) != A_NORMAL)
-	(void) sprintf(buf + strlen(buf), " | %s", _traceattr2(bufnum+20,AttrOf(ch)));
+    return (_nc_trace_bufcat(bufnum, r_brace));
+}
 
-    strcat(buf, "}");
-    return(buf);
+NCURSES_EXPORT(char *)
+_tracechtype (chtype ch)
+{
+    return _tracechtype2(0, ch);
 }
 
-char *_tracechtype(chtype ch)
+/* Trace 'chtype' return-values */
+NCURSES_EXPORT(chtype)
+_nc_retrace_chtype (chtype code)
 {
-	return _tracechtype2(0, ch);
+    T((T_RETURN("%s"), _tracechtype(code)));
+    return code;
 }
+
+#if USE_WIDEC_SUPPORT
+NCURSES_EXPORT(char *)
+_tracecchar_t2 (int bufnum, const cchar_t *ch)
+{
+    char *buf = _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, (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, _tracechar(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, " }");
+	}
+	if (attr != A_NORMAL) {
+	    (void) _nc_trace_bufcat(bufnum, " | ");
+	    (void) _nc_trace_bufcat(bufnum, _traceattr2(bufnum + 20, attr));
+	}
+    }
+
+    return (_nc_trace_bufcat(bufnum, r_brace));
+}
+
+NCURSES_EXPORT(char *)
+_tracecchar_t (const cchar_t *ch)
+{
+    return _tracecchar_t2(0, ch);
+}
+#endif
+
 #else
-extern	void _nc_lib_traceatr(void);
-	void _nc_lib_traceatr(void) { }
+empty_module(_nc_lib_traceatr)
 #endif /* TRACE */