X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fcurses.priv.h;h=86505e839cd9c3722cc571ce09582dfc0d3c56dd;hp=973eb998e3fd8119840df419306f7eeadcf68d64;hb=28e9f9700c7bf7280cf9d71304a880b570a0b4ea;hpb=aabbbcb7892fd946828a4170378b13b9d12435c6 diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h index 973eb998..86505e83 100644 --- a/ncurses/curses.priv.h +++ b/ncurses/curses.priv.h @@ -34,7 +34,7 @@ /* - * $Id: curses.priv.h,v 1.340 2007/09/08 21:44:40 tom Exp $ + * $Id: curses.priv.h,v 1.344 2007/10/06 21:29:02 tom Exp $ * * curses.priv.h * @@ -560,6 +560,9 @@ typedef struct { pthread_mutex_t mutex_set_SP; pthread_mutex_t mutex_use_screen; pthread_mutex_t mutex_windowlist; + pthread_mutex_t mutex_tst_tracef; + pthread_mutex_t mutex_tracef; + int nested_tracef; #endif } NCURSES_GLOBALS; @@ -583,6 +586,10 @@ typedef struct { chtype *real_acs_map; int _LINES; int _COLS; +#ifdef TRACE + long _outchars; + const char *_tputs_trace; +#endif #endif } NCURSES_PRESCREEN; @@ -805,6 +812,10 @@ struct screen { int _TABSIZE; int _LINES; int _COLS; +#ifdef TRACE + int _outchars; + const char *_tputs_trace; +#endif #endif /* * ncurses/ncursesw are the same up to this point. @@ -895,10 +906,16 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; #endif #ifdef TRACE -#define TRACE_OUTCHARS(n) _nc_outchars += (n); +#if USE_REENTRANT +#define COUNT_OUTCHARS(n) _nc_count_outchars(n); #else -#define TRACE_OUTCHARS(n) /* nothing */ +#define COUNT_OUTCHARS(n) _nc_outchars += (n); #endif +#else +#define COUNT_OUTCHARS(n) /* nothing */ +#endif + +#define RESET_OUTCHARS() COUNT_OUTCHARS(-_nc_outchars) #define UChar(c) ((unsigned char)(c)) #define ChCharOf(c) ((c) & (chtype)A_CHARTEXT) @@ -919,6 +936,35 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; #define NulColor /* nothing */ #endif +#define AttrEq(a,b) ((a).attr == (b).attr) +#define ExtcEq(a,b) ((a).ext_color == (b).ext_color) +#define TextEq(a,b) (!memcmp((a).chars, (b).chars, sizeof(a.chars))) + +/* + * cchar_t may not be packed, e.g., on a 64-bit platform. + * + * Set "NCURSES_CHAR_EQ" to use a workaround that compares the structure + * member-by-member so that valgrind will not see compares against the + * uninitialized filler bytes. + */ +#if NCURSES_CHAR_EQ +#if defined(USE_TERMLIB) && !defined(NEED_NCURSES_CH_T) +#else +static NCURSES_INLINE int +_nc_char_eq(NCURSES_CH_T a, NCURSES_CH_T b) +{ +#if NCURSES_EXT_COLORS + return (AttrEq(a,b) && TextEq(a,b) && ExtcEq(a,b)); +#else + return (AttrEq(a,b) && TextEq(a,b)); +#endif +} +#define CharEq(a,b) _nc_char_eq(a,b) +#endif +#else +#define CharEq(a,b) (!memcmp(&(a), &(b), sizeof(a))) +#endif + #define NulChar 0,0,0,0 /* FIXME: see CCHARW_MAX */ #define CharOf(c) ((c).chars[0]) #define AttrOf(c) ((c).attr) @@ -927,7 +973,6 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; #define SetAttr(c,a) AttrOf(c) = ((a) & A_ATTRIBUTES) | WidecExt(c) #define NewChar2(c,a) { a, { c, NulChar } NulColor } #define NewChar(ch) NewChar2(ChCharOf(ch), ChAttrOf(ch)) -#define CharEq(a,b) (!memcmp(&(a), &(b), sizeof(a))) #define SetChar(ch,c,a) do { \ NCURSES_CH_T *_cp = &ch; \ memset(_cp, 0, sizeof(ch)); \ @@ -945,7 +990,7 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; #define PUTC(ch,b) do { if(!isWidecExt(ch)) { \ if (Charable(ch)) { \ fputc(CharOf(ch), b); \ - TRACE_OUTCHARS(1); \ + COUNT_OUTCHARS(1); \ } else { \ PUTC_INIT; \ for (PUTC_i = 0; PUTC_i < CCHARW_MAX; ++PUTC_i) { \ @@ -961,11 +1006,11 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; } \ fwrite(PUTC_buf, (unsigned) PUTC_n, 1, b); \ } \ - TRACE_OUTCHARS(PUTC_i); \ + COUNT_OUTCHARS(PUTC_i); \ } } } while (0) -#define BLANK { WA_NORMAL, {' '} NulColor } -#define ZEROS { WA_NORMAL, {'\0'} NulColor } +#define BLANK NewChar2(' ', WA_NORMAL) +#define ZEROS NewChar2('\0', WA_NORMAL) #define ISBLANK(ch) ((ch).chars[0] == L' ' && (ch).chars[1] == L'\0') /* @@ -1091,6 +1136,12 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; #ifdef TRACE +#if USE_REENTRANT +#define TPUTS_TRACE(s) _nc_set_tputs_trace(s); +#else +#define TPUTS_TRACE(s) _nc_tputs_trace = s; +#endif + #define START_TRACE() \ if ((_nc_tracing & TRACE_MAXIMUM) == 0) { \ int t = _nc_getenv_num("NCURSES_TRACE"); \ @@ -1098,9 +1149,21 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; trace((unsigned) t); \ } -#define TR(n, a) if (_nc_tracing & (n)) _tracef a +/* + * Many of the _tracef() calls use static buffers; lock the trace state before + * trying to fill them. + */ +#if USE_REENTRANT +#define USE_TRACEF(mask) _nc_use_tracef(mask) +extern NCURSES_EXPORT(int) _nc_use_tracef (unsigned); +extern NCURSES_EXPORT(void) _nc_locked_tracef (const char *, ...) GCC_PRINTFLIKE(1,2); +#else +#define USE_TRACEF(mask) (_nc_tracing & (mask)) +#define _nc_locked_tracef _tracef +#endif + +#define TR(n, a) if (USE_TRACEF(n)) _nc_locked_tracef a #define T(a) TR(TRACE_CALLS, a) -#define TPUTS_TRACE(s) _nc_tputs_trace = s; #define TRACE_RETURN(value,type) return _nc_retrace_##type(value) #define returnAttr(code) TRACE_RETURN(code,attr_t) @@ -1131,8 +1194,19 @@ extern NCURSES_EXPORT(int) _nc_retrace_int (int); extern NCURSES_EXPORT(unsigned) _nc_retrace_unsigned (unsigned); extern NCURSES_EXPORT(void *) _nc_retrace_void_ptr (void *); extern NCURSES_EXPORT(void) _nc_fifo_dump (void); + +#if USE_REENTRANT +NCURSES_WRAPPED_VAR(long, _nc_outchars); +NCURSES_WRAPPED_VAR(const char *, _nc_tputs_trace); +#define _nc_outchars NCURSES_PUBLIC_VAR(_nc_outchars()) +#define _nc_tputs_trace NCURSES_PUBLIC_VAR(_nc_tputs_trace()) +extern NCURSES_EXPORT(void) _nc_set_tputs_trace (const char *); +extern NCURSES_EXPORT(void) _nc_count_outchars (long); +#else extern NCURSES_EXPORT_VAR(const char *) _nc_tputs_trace; extern NCURSES_EXPORT_VAR(long) _nc_outchars; +#endif + extern NCURSES_EXPORT_VAR(unsigned) _nc_tracing; #if USE_WIDEC_SUPPORT