X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftrace%2Fvisbuf.c;h=126e69fffa3081a86b8390310f78b5cdd32887cb;hp=6a836b4004c873fa6e30c7a4b2db20a8c5605d18;hb=3853a8e97d7efa8cb6a3c93c696d2c52895d6a70;hpb=55ccd2b959766810cf7db8d1c4462f338ce0afc8;ds=sidebyside diff --git a/ncurses/trace/visbuf.c b/ncurses/trace/visbuf.c index 6a836b40..126e69ff 100644 --- a/ncurses/trace/visbuf.c +++ b/ncurses/trace/visbuf.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2001-2004,2005 Free Software Foundation, Inc. * + * Copyright (c) 2001-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 * @@ -36,12 +36,23 @@ * visbuf.c - Tracing/Debugging support routines */ +#define NEED_NCURSES_CH_T #include #include #include -MODULE_ID("$Id: visbuf.c,v 1.14 2005/08/20 20:01:20 tom Exp $") +MODULE_ID("$Id: visbuf.c,v 1.24 2007/06/02 18:55:10 tom Exp $") + +#define NormalLen(len) (unsigned) ((len + 1) * 4) +#define WideLen(len) (unsigned) ((len + 1) * 4 * MB_CUR_MAX) + +#ifdef TRACE +#define StringOf(ch) {ch, 0} +static const char d_quote[] = StringOf(D_QUOTE); +static const char l_brace[] = StringOf(L_BRACE); +static const char r_brace[] = StringOf(R_BRACE); +#endif static char * _nc_vischar(char *tp, unsigned c) @@ -91,11 +102,11 @@ _nc_visbuf2n(int bufnum, const char *buf, int len) len = strlen(buf); #ifdef TRACE - tp = vbuf = _nc_trace_buf(bufnum, (unsigned) (len * 4) + 5); + tp = vbuf = _nc_trace_buf(bufnum, NormalLen(len)); #else { - static char *mybuf[2]; - mybuf[bufnum] = typeRealloc(char, (unsigned) (len * 4) + 5, mybuf[bufnum]); + static char *mybuf[4]; + mybuf[bufnum] = typeRealloc(char, NormalLen(len), mybuf[bufnum]); tp = vbuf = mybuf[bufnum]; } #endif @@ -126,8 +137,8 @@ _nc_visbufn(const char *buf, int len) return _nc_visbuf2n(0, buf, len); } -#if USE_WIDEC_SUPPORT #ifdef TRACE +#if USE_WIDEC_SUPPORT #if defined(USE_TERMLIB) #define _nc_wchstrlen _my_wchstrlen @@ -156,11 +167,11 @@ _nc_viswbuf2n(int bufnum, const wchar_t *buf, int len) len = wcslen(buf); #ifdef TRACE - tp = vbuf = _nc_trace_buf(bufnum, (unsigned) (len * 4) + 5); + tp = vbuf = _nc_trace_buf(bufnum, WideLen(len)); #else { static char *mybuf[2]; - mybuf[bufnum] = typeRealloc(char, (unsigned) (len * 4) + 5, mybuf[bufnum]); + mybuf[bufnum] = typeRealloc(char, WideLen(len), mybuf[bufnum]); tp = vbuf = mybuf[bufnum]; } #endif @@ -173,7 +184,7 @@ _nc_viswbuf2n(int bufnum, const wchar_t *buf, int len) j = strlen(temp); } for (k = 0; k < j; ++k) { - tp = _nc_vischar(tp, temp[k]); + tp = _nc_vischar(tp, UChar(temp[k])); } } *tp++ = D_QUOTE; @@ -220,85 +231,88 @@ _nc_viswibuf(const wint_t *buf) return _nc_viswbuf2(0, mybuf); } +#endif /* USE_WIDEC_SUPPORT */ +/* use these functions for displaying parts of a line within a window */ NCURSES_EXPORT(const char *) -_nc_viscbuf2(int bufnum, const cchar_t *buf, int len) +_nc_viscbuf2(int bufnum, const NCURSES_CH_T * buf, int len) { char *result = _nc_trace_buf(bufnum, BUFSIZ); - int n; - bool same = TRUE; - attr_t attr = A_NORMAL; + int first; const char *found; +#if USE_WIDEC_SUPPORT if (len < 0) len = _nc_wchstrlen(buf); - - for (n = 1; n < len; n++) { - if (!SameAttrOf(buf[n], buf[0])) { - same = FALSE; - break; - } - } +#endif /* USE_WIDEC_SUPPORT */ /* - * If the rendition is the same for the whole string, display it as a - * quoted string, followed by the rendition. Otherwise, use the more - * detailed trace function that displays each character separately. + * Display one or more strings followed by attributes. */ - if (same) { - static const char d_quote[] = - {D_QUOTE, 0}; + first = 0; + while (first < len) { + attr_t attr = AttrOf(buf[first]); + int last = len - 1; + int j; + + for (j = first + 1; j < len; ++j) { + if (!SameAttrOf(buf[j], buf[first])) { + last = j - 1; + break; + } + } + result = _nc_trace_bufcat(bufnum, l_brace); result = _nc_trace_bufcat(bufnum, d_quote); - while (len-- > 0) { - if ((found = _nc_altcharset_name(attr, CharOfD(buf))) != 0) { + for (j = first; j <= last; ++j) { + found = _nc_altcharset_name(attr, (chtype) CharOf(buf[j])); + if (found != 0) { result = _nc_trace_bufcat(bufnum, found); attr &= ~A_ALTCHARSET; - } else if (!isWidecExt(CHDEREF(buf))) { + } else +#if USE_WIDEC_SUPPORT + if (!isWidecExt(buf[j])) { PUTC_DATA; PUTC_INIT; - do { - PUTC_ch = PUTC_i < CCHARW_MAX ? buf->chars[PUTC_i] : L'\0'; - PUTC_n = wcrtomb(PUTC_buf, buf->chars[PUTC_i], &PUT_st); + for (PUTC_i = 0; PUTC_i < CCHARW_MAX; ++PUTC_i) { + int k; + + PUTC_ch = buf[j].chars[PUTC_i]; if (PUTC_ch == L'\0') - --PUTC_n; + break; + PUTC_n = wcrtomb(PUTC_buf, buf[j].chars[PUTC_i], &PUT_st); if (PUTC_n <= 0) break; - for (n = 0; n < PUTC_n; n++) { + for (k = 0; k < PUTC_n; k++) { char temp[80]; - _nc_vischar(temp, UChar(PUTC_buf[n])); + _nc_vischar(temp, UChar(PUTC_buf[k])); result = _nc_trace_bufcat(bufnum, temp); } - ++PUTC_i; - } while (PUTC_ch != L'\0'); + } } - buf++; +#else + { + char temp[80]; + _nc_vischar(temp, UChar(buf[j])); + result = _nc_trace_bufcat(bufnum, temp); + } +#endif /* USE_WIDEC_SUPPORT */ } result = _nc_trace_bufcat(bufnum, d_quote); if (attr != A_NORMAL) { result = _nc_trace_bufcat(bufnum, " | "); result = _nc_trace_bufcat(bufnum, _traceattr2(bufnum + 20, attr)); } - } else { - static const char l_brace[] = - {L_BRACE, 0}; - static const char r_brace[] = - {R_BRACE, 0}; - strcpy(result, l_brace); - while (len-- > 0) { - result = _nc_trace_bufcat(bufnum, - _tracecchar_t2(bufnum + 20, buf++)); - } result = _nc_trace_bufcat(bufnum, r_brace); + first = last + 1; } return result; } NCURSES_EXPORT(const char *) -_nc_viscbuf(const cchar_t *buf, int len) +_nc_viscbuf(const NCURSES_CH_T * buf, int len) { return _nc_viscbuf2(0, buf, len); } #endif /* TRACE */ -#endif /* USE_WIDEC_SUPPORT */