X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftrace%2Fvisbuf.c;h=ed3d5bb4e2f0eee6c99b888379d6d3d22292e9a7;hp=4fbecc50e4f6132ba50adbe2dd4900dd71f1ce1e;hb=7c4bc0fa99a1be37a14aa19a5943a549570954c4;hpb=46722468f47c2b77b3987729b4bcf2321cccfd01;ds=sidebyside diff --git a/ncurses/trace/visbuf.c b/ncurses/trace/visbuf.c index 4fbecc50..ed3d5bb4 100644 --- a/ncurses/trace/visbuf.c +++ b/ncurses/trace/visbuf.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2001 Free Software Foundation, Inc. * + * Copyright (c) 2001-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 * @@ -27,7 +27,7 @@ ****************************************************************************/ /**************************************************************************** - * Author: Thomas E. Dickey 1996-2001 * + * Author: Thomas E. Dickey 1996-on * * and: Zeyd M. Ben-Halim 1992,1995 * * and: Eric S. Raymond * ****************************************************************************/ @@ -36,12 +36,22 @@ * visbuf.c - Tracing/Debugging support routines */ +#define NEED_NCURSES_CH_T #include #include #include -MODULE_ID("$Id: visbuf.c,v 1.6 2002/10/06 00:03:43 tom Exp $") +MODULE_ID("$Id: visbuf.c,v 1.27 2008/07/05 23:19:59 tom Exp $") + +#define NormalLen(len) (unsigned) ((len + 1) * 4) +#define WideLen(len) (unsigned) ((len + 1) * 4 * MB_CUR_MAX) + +#ifdef TRACE +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) @@ -63,14 +73,19 @@ _nc_vischar(char *tp, unsigned c) } else if (c == '\033') { *tp++ = '\\'; *tp++ = 'e'; + } else if (UChar(c) == 0x7f) { + *tp++ = '\\'; + *tp++ = '^'; + *tp++ = '?'; } else if (is7bits(c) && iscntrl(UChar(c))) { *tp++ = '\\'; *tp++ = '^'; *tp++ = '@' + c; } else { - sprintf(tp, "\\%03lo", ChCharOf(c)); + sprintf(tp, "\\%03lo", (unsigned long) ChCharOf(c)); tp += strlen(tp); } + *tp = 0; return tp; } @@ -90,11 +105,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 @@ -125,10 +140,24 @@ _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 +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) +_nc_viswbuf2n(int bufnum, const wchar_t *buf, int len) { char *vbuf; char *tp; @@ -141,11 +170,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 @@ -154,11 +183,11 @@ _nc_viswbuf2n(int bufnum, const wchar_t * buf, int len) char temp[CCHARW_MAX + 80]; int j = wctomb(temp, c), k; if (j <= 0) { - sprintf(temp, "\\u%08X", (wint_t) c); + sprintf(temp, "\\u%08X", (unsigned) c); 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; @@ -167,104 +196,126 @@ _nc_viswbuf2n(int bufnum, const wchar_t * buf, int len) } NCURSES_EXPORT(const char *) -_nc_viswbuf2(int bufnum, 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) +_nc_viswbuf(const wchar_t *buf) { return _nc_viswbuf2(0, buf); } NCURSES_EXPORT(const char *) -_nc_viswbufn(const wchar_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 cchar_t * buf, int len) +_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) { + found = _nc_altcharset_name(attr, (chtype) CharOf(buf[j])); + if (found != 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 */ } - *tp++ = R_BRACE; - *tp++ = '\0'; + 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)); + } + 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 */