diff options
| author | christos <christos@NetBSD.org> | 2016-04-11 00:50:13 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2016-04-11 00:50:13 +0000 |
| commit | 074960bb097ee8f2b57d7f3e9588ddd18a031c05 (patch) | |
| tree | 3229482b7e2624f94116037ef25056c7a1e4eb36 /lib/libedit/refresh.c | |
| parent | 914fbc62fa09a6335ae580c073d3cd6ca42f2209 (diff) | |
Char -> wchar_t from Ingo Schwarze.
Diffstat (limited to 'lib/libedit/refresh.c')
| -rw-r--r-- | lib/libedit/refresh.c | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/lib/libedit/refresh.c b/lib/libedit/refresh.c index bb788ddcab2..8e702aad982 100644 --- a/lib/libedit/refresh.c +++ b/lib/libedit/refresh.c @@ -1,4 +1,4 @@ -/* $NetBSD: refresh.c,v 1.47 2016/04/11 00:22:48 christos Exp $ */ +/* $NetBSD: refresh.c,v 1.48 2016/04/11 00:50:13 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)refresh.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: refresh.c,v 1.47 2016/04/11 00:22:48 christos Exp $"); +__RCSID("$NetBSD: refresh.c,v 1.48 2016/04/11 00:50:13 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -52,16 +52,16 @@ __RCSID("$NetBSD: refresh.c,v 1.47 2016/04/11 00:22:48 christos Exp $"); private void re_nextline(EditLine *); private void re_addc(EditLine *, wint_t); -private void re_update_line(EditLine *, Char *, Char *, int); -private void re_insert (EditLine *, Char *, int, int, Char *, int); -private void re_delete(EditLine *, Char *, int, int, int); +private void re_update_line(EditLine *, wchar_t *, wchar_t *, int); +private void re_insert (EditLine *, wchar_t *, int, int, wchar_t *, int); +private void re_delete(EditLine *, wchar_t *, int, int, int); private void re_fastputc(EditLine *, wint_t); private void re_clear_eol(EditLine *, int, int, int); -private void re__strncopy(Char *, Char *, size_t); -private void re__copy_and_pad(Char *, const Char *, size_t); +private void re__strncopy(wchar_t *, wchar_t *, size_t); +private void re__copy_and_pad(wchar_t *, const wchar_t *, size_t); #ifdef DEBUG_REFRESH -private void re_printstr(EditLine *, const char *, Char *, Char *); +private void re_printstr(EditLine *, const char *, wchar_t *, wchar_t *); #define __F el->el_errfile #define ELRE_ASSERT(a, b, c) do \ if (/*CONSTCOND*/ a) { \ @@ -75,7 +75,7 @@ private void re_printstr(EditLine *, const char *, Char *, Char *); * Print a string on the debugging pty */ private void -re_printstr(EditLine *el, const char *str, Char *f, Char *t) +re_printstr(EditLine *el, const char *str, wchar_t *f, wchar_t *t) { ELRE_DEBUG(1, (__F, "%s:\"", str)); @@ -104,7 +104,7 @@ re_nextline(EditLine *el) */ if (el->el_refresh.r_cursor.v + 1 >= el->el_terminal.t_size.v) { int i, lins = el->el_terminal.t_size.v; - Char *firstline = el->el_vdisplay[0]; + wchar_t *firstline = el->el_vdisplay[0]; for(i = 1; i < lins; i++) el->el_vdisplay[i - 1] = el->el_vdisplay[i]; @@ -126,7 +126,7 @@ re_nextline(EditLine *el) private void re_addc(EditLine *el, wint_t c) { - switch (ct_chr_class((Char)c)) { + switch (ct_chr_class(c)) { case CHTYPE_TAB: /* expand the tab */ for (;;) { re_putc(el, ' ', 1); @@ -145,9 +145,9 @@ re_addc(EditLine *el, wint_t c) re_putc(el, c, 1); break; default: { - Char visbuf[VISUAL_WIDTH_MAX]; + wchar_t visbuf[VISUAL_WIDTH_MAX]; ssize_t i, n = - ct_visual_char(visbuf, VISUAL_WIDTH_MAX, (Char)c); + ct_visual_char(visbuf, VISUAL_WIDTH_MAX, c); for (i = 0; n-- > 0; ++i) re_putc(el, visbuf[i], 1); break; @@ -171,7 +171,7 @@ re_putc(EditLine *el, wint_t c, int shift) re_putc(el, ' ', 1); el->el_vdisplay[el->el_refresh.r_cursor.v] - [el->el_refresh.r_cursor.h] = (Char)c; + [el->el_refresh.r_cursor.h] = c; /* assumes !shift is only used for single-column chars */ i = w; while (--i > 0) @@ -201,7 +201,7 @@ protected void re_refresh(EditLine *el) { int i, rhdiff; - Char *cp, *st; + wchar_t *cp, *st; coord_t cur; #ifdef notyet size_t termsz; @@ -360,9 +360,9 @@ re_goto_bottom(EditLine *el) private void /*ARGSUSED*/ re_insert(EditLine *el __attribute__((__unused__)), - Char *d, int dat, int dlen, Char *s, int num) + wchar_t *d, int dat, int dlen, wchar_t *s, int num) { - Char *a, *b; + wchar_t *a, *b; if (num <= 0) return; @@ -411,9 +411,9 @@ re_insert(EditLine *el __attribute__((__unused__)), private void /*ARGSUSED*/ re_delete(EditLine *el __attribute__((__unused__)), - Char *d, int dat, int dlen, int num) + wchar_t *d, int dat, int dlen, int num) { - Char *a, *b; + wchar_t *a, *b; if (num <= 0) return; @@ -443,7 +443,7 @@ re_delete(EditLine *el __attribute__((__unused__)), * Like strncpy without padding. */ private void -re__strncopy(Char *a, Char *b, size_t n) +re__strncopy(wchar_t *a, wchar_t *b, size_t n) { while (n-- && *b) @@ -502,11 +502,11 @@ new: eddie> Oh, my little buggy says to me, as lurgid as #define MIN_END_KEEP 4 private void -re_update_line(EditLine *el, Char *old, Char *new, int i) +re_update_line(EditLine *el, wchar_t *old, wchar_t *new, int i) { - Char *o, *n, *p, c; - Char *ofd, *ols, *oe, *nfd, *nls, *ne; - Char *osb, *ose, *nsb, *nse; + wchar_t *o, *n, *p, c; + wchar_t *ofd, *ols, *oe, *nfd, *nls, *ne; + wchar_t *osb, *ose, *nsb, *nse; int fx, sx; size_t len; @@ -972,7 +972,7 @@ re_update_line(EditLine *el, Char *old, Char *new, int i) * Copy string and pad with spaces */ private void -re__copy_and_pad(Char *dst, const Char *src, size_t width) +re__copy_and_pad(wchar_t *dst, const wchar_t *src, size_t width) { size_t i; @@ -995,7 +995,7 @@ re__copy_and_pad(Char *dst, const Char *src, size_t width) protected void re_refresh_cursor(EditLine *el) { - Char *cp; + wchar_t *cp; int h, v, th, w; if (el->el_line.cursor >= el->el_line.lastchar) { @@ -1058,12 +1058,12 @@ re_refresh_cursor(EditLine *el) private void re_fastputc(EditLine *el, wint_t c) { - int w = wcwidth((Char)c); + int w = wcwidth(c); while (w > 1 && el->el_cursor.h + w > el->el_terminal.t_size.h) re_fastputc(el, ' '); terminal__putc(el, c); - el->el_display[el->el_cursor.v][el->el_cursor.h++] = (Char)c; + el->el_display[el->el_cursor.v][el->el_cursor.h++] = c; while (--w > 0) el->el_display[el->el_cursor.v][el->el_cursor.h++] = MB_FILL_CHAR; @@ -1080,7 +1080,7 @@ re_fastputc(EditLine *el, wint_t c) */ if (el->el_cursor.v + 1 >= el->el_terminal.t_size.v) { int i, lins = el->el_terminal.t_size.v; - Char *firstline = el->el_display[0]; + wchar_t *firstline = el->el_display[0]; for(i = 1; i < lins; i++) el->el_display[i - 1] = el->el_display[i]; @@ -1111,7 +1111,7 @@ re_fastputc(EditLine *el, wint_t c) protected void re_fastaddc(EditLine *el) { - Char c; + wchar_t c; int rhdiff; c = el->el_line.cursor[-1]; @@ -1135,9 +1135,9 @@ re_fastaddc(EditLine *el) break; case CHTYPE_ASCIICTL: case CHTYPE_NONPRINT: { - Char visbuf[VISUAL_WIDTH_MAX]; + wchar_t visbuf[VISUAL_WIDTH_MAX]; ssize_t i, n = - ct_visual_char(visbuf, VISUAL_WIDTH_MAX, (Char)c); + ct_visual_char(visbuf, VISUAL_WIDTH_MAX, c); for (i = 0; n-- > 0; ++i) re_fastputc(el, visbuf[i]); break; |
