diff options
Diffstat (limited to 'contrib/ncurses/ncurses/trace/visbuf.c')
| -rw-r--r-- | contrib/ncurses/ncurses/trace/visbuf.c | 227 |
1 files changed, 153 insertions, 74 deletions
diff --git a/contrib/ncurses/ncurses/trace/visbuf.c b/contrib/ncurses/ncurses/trace/visbuf.c index 5f2460f3ed2c..0540ee6d8184 100644 --- a/contrib/ncurses/ncurses/trace/visbuf.c +++ b/contrib/ncurses/ncurses/trace/visbuf.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2001 Free Software Foundation, Inc. * + * Copyright (c) 2001-2005,2006 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 E. Dickey 1996-2001 * + * Author: Thomas E. Dickey 1996-on * * and: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * * and: Eric S. Raymond <esr@snark.thyrsus.com> * ****************************************************************************/ @@ -36,12 +36,17 @@ * visbuf.c - Tracing/Debugging support routines */ +#define NEED_NCURSES_CH_T #include <curses.priv.h> #include <tic.h> #include <ctype.h> -MODULE_ID("$Id: visbuf.c,v 1.3 2001/11/10 23:47:51 tom Exp $") +MODULE_ID("$Id: visbuf.c,v 1.21 2006/12/02 21:20:28 tom Exp $") + +static const char d_quote[] = {D_QUOTE, 0}; +static const char l_brace[] = {L_BRACE, 0}; +static const char r_brace[] = {R_BRACE, 0}; static char * _nc_vischar(char *tp, unsigned c) @@ -68,14 +73,15 @@ _nc_vischar(char *tp, unsigned c) *tp++ = '^'; *tp++ = '@' + c; } else { - sprintf(tp, "\\%03lo", ChCharOf(c)); + sprintf(tp, "\\%03lo", (unsigned long) ChCharOf(c)); tp += strlen(tp); } + *tp = 0; return tp; } -NCURSES_EXPORT(const char *) -_nc_visbuf2(int bufnum, const char *buf) +static const char * +_nc_visbuf2n(int bufnum, const char *buf, int len) { char *vbuf; char *tp; @@ -86,17 +92,20 @@ _nc_visbuf2(int bufnum, const char *buf) if (buf == CANCELLED_STRING) return ("(cancelled)"); + if (len < 0) + len = strlen(buf); + #ifdef TRACE - tp = vbuf = _nc_trace_buf(bufnum, (strlen(buf) * 4) + 5); + tp = vbuf = _nc_trace_buf(bufnum, (unsigned) (len * 4) + 5); #else { static char *mybuf[2]; - mybuf[bufnum] = _nc_doalloc(mybuf[bufnum], (strlen(buf) * 4) + 5); + mybuf[bufnum] = typeRealloc(char, (unsigned) (len * 4) + 5, mybuf[bufnum]); tp = vbuf = mybuf[bufnum]; } #endif *tp++ = D_QUOTE; - while ((c = *buf++) != '\0') { + while ((--len >= 0) && (c = *buf++) != '\0') { tp = _nc_vischar(tp, UChar(c)); } *tp++ = D_QUOTE; @@ -105,35 +114,72 @@ _nc_visbuf2(int bufnum, const char *buf) } NCURSES_EXPORT(const char *) +_nc_visbuf2(int bufnum, const char *buf) +{ + return _nc_visbuf2n(bufnum, buf, -1); +} + +NCURSES_EXPORT(const char *) _nc_visbuf(const char *buf) { return _nc_visbuf2(0, buf); } -#if USE_WIDEC_SUPPORT -#ifdef TRACE NCURSES_EXPORT(const char *) -_nc_viswbuf2(int bufnum, const wchar_t * buf) +_nc_visbufn(const char *buf, int len) +{ + return _nc_visbuf2n(0, buf, len); +} + +#ifdef TRACE +#if USE_WIDEC_SUPPORT + +#if defined(USE_TERMLIB) +#define _nc_wchstrlen _my_wchstrlen +static int +_nc_wchstrlen(const cchar_t *s) +{ + int result = 0; + while (CharOf(s[result]) != L'\0') { + result++; + } + return result; +} +#endif + +static const char * +_nc_viswbuf2n(int bufnum, const wchar_t *buf, int len) { char *vbuf; char *tp; - int c; + wchar_t c; if (buf == 0) return ("(null)"); + if (len < 0) + len = wcslen(buf); + #ifdef TRACE - tp = vbuf = _nc_trace_buf(bufnum, (wcslen(buf) * 4) + 5); + tp = vbuf = _nc_trace_buf(bufnum, (unsigned) (len * 4) + 5); #else { static char *mybuf[2]; - mybuf[bufnum] = _nc_doalloc(mybuf[bufnum], (wcslen(buf) * 4) + 5); + mybuf[bufnum] = typeRealloc(char, (unsigned) (len * 4) + 5, mybuf[bufnum]); tp = vbuf = mybuf[bufnum]; } #endif *tp++ = D_QUOTE; - while ((c = *buf++) != '\0') { - tp = _nc_vischar(tp, ChCharOf(c)); + while ((--len >= 0) && (c = *buf++) != '\0') { + char temp[CCHARW_MAX + 80]; + int j = wctomb(temp, c), k; + if (j <= 0) { + sprintf(temp, "\\u%08X", (wint_t) c); + j = strlen(temp); + } + for (k = 0; k < j; ++k) { + tp = _nc_vischar(tp, UChar(temp[k])); + } } *tp++ = D_QUOTE; *tp++ = '\0'; @@ -141,92 +187,125 @@ _nc_viswbuf2(int bufnum, const wchar_t * buf) } NCURSES_EXPORT(const char *) -_nc_viswbuf(const wchar_t * buf) +_nc_viswbuf2(int bufnum, const wchar_t *buf) +{ + return _nc_viswbuf2n(bufnum, buf, -1); +} + +NCURSES_EXPORT(const char *) +_nc_viswbuf(const wchar_t *buf) { return _nc_viswbuf2(0, buf); } NCURSES_EXPORT(const char *) -_nc_viscbuf2(int bufnum, const cchar_t * buf, int len) +_nc_viswbufn(const wchar_t *buf, int len) +{ + return _nc_viswbuf2n(0, buf, len); +} + +/* this special case is used for wget_wstr() */ +NCURSES_EXPORT(const char *) +_nc_viswibuf(const wint_t *buf) +{ + static wchar_t *mybuf; + static unsigned mylen; + unsigned n; + + for (n = 0; buf[n] != 0; ++n) ; + if (mylen < ++n) { + mylen = n + 80; + if (mybuf != 0) + mybuf = typeRealloc(wchar_t, mylen, mybuf); + else + mybuf = typeMalloc(wchar_t, mylen); + } + for (n = 0; buf[n] != 0; ++n) + mybuf[n] = (wchar_t) buf[n]; + + 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 NCURSES_CH_T * buf, int len) { - size_t have = BUFSIZ; - char *result = _nc_trace_buf(bufnum, have); - char *tp = result; - int n; - bool same = TRUE; - attr_t attr = A_NORMAL; + char *result = _nc_trace_buf(bufnum, BUFSIZ); + int first; const char *found; +#if USE_WIDEC_SUPPORT if (len < 0) len = _nc_wchstrlen(buf); - - for (n = 1; n < len; n++) { - if (AttrOf(buf[n]) != AttrOf(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) { - *tp++ = D_QUOTE; - while (len-- > 0) { - if ((found = _nc_altcharset_name(attr, CharOfD(buf))) != 0) { - (void) strcpy(tp, found); - tp += strlen(tp); + 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); + for (j = first; j <= last; ++j) { + if ((found = _nc_altcharset_name(attr, (chtype) CharOf(buf[j]))) != 0) { + result = _nc_trace_bufcat(bufnum, found); attr &= ~A_ALTCHARSET; - } else if (!isnac(CHDEREF(buf))) { + } else +#if USE_WIDEC_SUPPORT + if (!isWidecExt(buf[j])) { PUTC_DATA; - memset(&PUT_st, '\0', sizeof(PUT_st)); - PUTC_i = 0; - do { - PUTC_ch = PUTC_i < CCHARW_MAX ? buf->chars[PUTC_i] : L'\0'; - PUTC_n = wcrtomb(PUTC_buf, buf->chars[PUTC_i], &PUT_st); + PUTC_INIT; + 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++) { - tp = _nc_vischar(tp, UChar(PUTC_buf[n])); + for (k = 0; k < PUTC_n; k++) { + char temp[80]; + _nc_vischar(temp, UChar(PUTC_buf[k])); + result = _nc_trace_bufcat(bufnum, temp); } - ++PUTC_i; - } while (PUTC_ch != L'\0'); + } } - buf++; - } - *tp++ = D_QUOTE; - *tp++ = '\0'; - if (attr != A_NORMAL) - (void) sprintf(tp, " | %s", - _traceattr2(bufnum + 20, attr)); - } else { - *tp++ = L_BRACE; - while (len-- > 0) { - char *temp = _tracecchar_t2(bufnum + 20, buf++); - size_t used = (tp - result); - size_t want = strlen(temp) + 5 + used; - if (want > have) { - result = _nc_trace_buf(bufnum, have = want); - tp = result + used; +#else + { + char temp[80]; + _nc_vischar(temp, UChar(buf[j])); + result = _nc_trace_bufcat(bufnum, temp); } - (void) strcpy(tp, temp); - tp += strlen(tp); +#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)); } - *tp++ = R_BRACE; - *tp++ = '\0'; + 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 */ |