X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_addstr.c;h=7a93c4152e616c685459c67dbd8615fc16a09e34;hp=d6f9345542e34427b3a4c061c418b0e0b8fc9934;hb=55ccd2b959766810cf7db8d1c4462f338ce0afc8;hpb=46722468f47c2b77b3987729b4bcf2321cccfd01;ds=sidebyside diff --git a/ncurses/base/lib_addstr.c b/ncurses/base/lib_addstr.c index d6f93455..7a93c415 100644 --- a/ncurses/base/lib_addstr.c +++ b/ncurses/base/lib_addstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc. * + * Copyright (c) 1998-2003,2004 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 * @@ -29,6 +29,10 @@ /**************************************************************************** * Author: Zeyd M. Ben-Halim 1992,1995 * * and: Eric S. Raymond * + * * + * Rewritten 2001-2004 to support wide-characters by * + * Sven Verdoolaege * + * Thomas Dickey * ****************************************************************************/ /* @@ -40,53 +44,13 @@ #include -MODULE_ID("$Id: lib_addstr.c,v 1.34 2002/10/06 00:25:25 tom Exp $") - -#if USE_WIDEC_SUPPORT -#define CONV_DATA mbstate_t state; wchar_t cached; int clen = 0 -#define CONV_INIT memset (&state, '\0', sizeof (state)); cached = (wchar_t)WEOF -#define NEXT_CHAR(s,ch, n) \ - { \ - int len, i = 0; \ - memset(&ch, 0, sizeof(cchar_t)); \ - if (cached != (wchar_t) WEOF) { \ - ch.chars[i++] = cached; \ - cached = (wchar_t) WEOF; \ - n -= clen; \ - s += clen; \ - } \ - for (; i < CCHARW_MAX && n > 0; ++i) { \ - if ((len = mbrtowc(&ch.chars[i], s, n, &state)) < 0) { \ - code = ERR; \ - break; \ - } \ - if (i == 0 || wcwidth(ch.chars[i]) == 0) { \ - n -= len; \ - s += len; \ - } else { \ - cached = ch.chars[i]; \ - clen = len; \ - ch.chars[i] = L'\0'; \ - break; \ - } \ - } \ - if (code == ERR) \ - break; \ - } -#else -#define CONV_DATA -#define CONV_INIT -#define NEXT_CHAR(s,ch, n) \ - ch = *s++; \ - --n -#endif +MODULE_ID("$Id: lib_addstr.c,v 1.43 2004/12/12 00:15:31 tom Exp $") NCURSES_EXPORT(int) waddnstr(WINDOW *win, const char *astr, int n) { - unsigned const char *str = (unsigned const char *) astr; + const char *str = astr; int code = ERR; - CONV_DATA; T((T_CALLED("waddnstr(%p,%s,%d)"), win, _nc_visbufn(astr, n), n)); @@ -97,11 +61,10 @@ waddnstr(WINDOW *win, const char *astr, int n) n = (int) strlen(astr); TR(TRACE_VIRTPUT, ("str is not null, length = %d", n)); - CONV_INIT; - while ((n > 0) && (*str != '\0')) { + while ((n-- > 0) && (*str != '\0')) { NCURSES_CH_T ch; - TR(TRACE_VIRTPUT, ("*str = %#x", *str)); - NEXT_CHAR(str, ch, n); + TR(TRACE_VIRTPUT, ("*str = %#o", UChar(*str))); + SetChar(ch, UChar(*str++), A_NORMAL); if (_nc_waddch_nosync(win, ch) == ERR) { code = ERR; break; @@ -114,7 +77,7 @@ waddnstr(WINDOW *win, const char *astr, int n) } NCURSES_EXPORT(int) -waddchnstr(WINDOW *win, const chtype * astr, int n) +waddchnstr(WINDOW *win, const chtype *astr, int n) { NCURSES_SIZE_T y = win->_cury; NCURSES_SIZE_T x = win->_curx; @@ -155,8 +118,8 @@ waddchnstr(WINDOW *win, const chtype * astr, int n) #if USE_WIDEC_SUPPORT -int -_nc_wchstrlen(const cchar_t * s) +NCURSES_EXPORT(int) +_nc_wchstrlen(const cchar_t *s) { int result = 0; while (CharOf(s[result]) != L'\0') { @@ -166,13 +129,14 @@ _nc_wchstrlen(const cchar_t * s) } NCURSES_EXPORT(int) -wadd_wchnstr(WINDOW *win, const cchar_t * const astr, int n) +wadd_wchnstr(WINDOW *win, const cchar_t *astr, int n) { + NCURSES_CH_T blank = NewChar(BLANK_TEXT); NCURSES_SIZE_T y = win->_cury; NCURSES_SIZE_T x = win->_curx; int code = OK; struct ldat *line; - int i, start, end; + int i, j, start, len, end; T((T_CALLED("wadd_wchnstr(%p,%s,%d)"), win, _nc_viscbuf(astr, n), n)); @@ -190,22 +154,58 @@ wadd_wchnstr(WINDOW *win, const cchar_t * const astr, int n) line = &(win->_line[y]); start = x; end = x + n - 1; - if (isnac(line->text[x])) { - line->text[x - 1] = win->_nc_bkgd; - --start; + + /* + * Reset orphaned cells of multi-column characters that extend up to the + * new string's location to blanks. + */ + if (x > 0 && isWidecExt(line->text[x])) { + for (i = 0; i <= x; ++i) { + if (!isWidecExt(line->text[x - i])) { + /* must be isWidecBase() */ + start -= i; + while (i > 0) { + line->text[x - i--] = _nc_render(win, blank); + } + break; + } + } } + + /* + * Copy the new string to the window. + */ for (i = 0; i < n && x <= win->_maxx; ++i) { - line->text[x++] = astr[i]; - if (wcwidth(CharOf(astr[i])) > 1) { - if (x <= win->_maxx) - AddAttr(line->text[x++], WA_NAC); - else - line->text[x - 1] = win->_nc_bkgd; + if (isWidecExt(astr[i])) + continue; + + len = wcwidth(CharOf(astr[i])); + + if (x + len - 1 <= win->_maxx) { + line->text[x] = _nc_render(win, astr[i]); + if (len > 1) { + for (j = 0; j < len; ++j) { + if (j != 0) { + line->text[x + j] = line->text[x]; + } + SetWidecExt(line->text[x + j], j); + } + } + x += len; + end += len - 1; + } else { + break; } } - if (x <= win->_maxx && isnac(line->text[x])) { - line->text[x] = win->_nc_bkgd; + + /* + * Set orphaned cells of multi-column characters which lie after the new + * string to blanks. + */ + while (x <= win->_maxx && isWidecExt(line->text[x])) { + line->text[x] = _nc_render(win, blank); ++end; + ++x; } CHANGED_RANGE(line, start, end); @@ -214,12 +214,11 @@ wadd_wchnstr(WINDOW *win, const cchar_t * const astr, int n) } NCURSES_EXPORT(int) -waddnwstr(WINDOW *win, const wchar_t * str, int n) +waddnwstr(WINDOW *win, const wchar_t *str, int n) { int code = ERR; - int i; - T((T_CALLED("waddnwstr(%p,%s,%d)"), win, _nc_viswbufn(str,n), n)); + T((T_CALLED("waddnwstr(%p,%s,%d)"), win, _nc_viswbufn(str, n), n)); if (win && (str != 0)) { TR(TRACE_VIRTPUT | TRACE_ATTRS, ("... current %s", _traceattr(win->_attrs))); @@ -230,16 +229,9 @@ waddnwstr(WINDOW *win, const wchar_t * str, int n) TR(TRACE_VIRTPUT, ("str is not null, length = %d", n)); while ((n-- > 0) && (*str != L('\0'))) { NCURSES_CH_T ch; - TR(TRACE_VIRTPUT, ("*str[0] = %#lx", *str)); + TR(TRACE_VIRTPUT, ("*str[0] = %#lx", (unsigned long) *str)); SetChar(ch, *str++, A_NORMAL); - i = 1; - while (i < CCHARW_MAX && n > 0 && (*str != L('\0')) - && wcwidth(*str) == 0) { - TR(TRACE_VIRTPUT, ("*str[%d] = %#lx", i, *str)); - ch.chars[i++] = *str++; - --n; - } - if (_nc_waddch_nosync(win, ch) == ERR) { + if (wadd_wch(win, &ch) == ERR) { code = ERR; break; }