diff options
Diffstat (limited to 'contrib/ncurses/ncurses/widechar/lib_get_wch.c')
| -rw-r--r-- | contrib/ncurses/ncurses/widechar/lib_get_wch.c | 50 |
1 files changed, 35 insertions, 15 deletions
diff --git a/contrib/ncurses/ncurses/widechar/lib_get_wch.c b/contrib/ncurses/ncurses/widechar/lib_get_wch.c index 21c40a506ccc..c73c363be531 100644 --- a/contrib/ncurses/ncurses/widechar/lib_get_wch.c +++ b/contrib/ncurses/ncurses/widechar/lib_get_wch.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2002 Free Software Foundation, Inc. * + * Copyright (c) 2002-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 2002 * + * Author: Thomas E. Dickey 2002-on * ****************************************************************************/ /* @@ -38,28 +38,47 @@ */ #include <curses.priv.h> +#include <ctype.h> -MODULE_ID("$Id: lib_get_wch.c,v 1.3 2002/03/17 16:14:45 tom Exp $") +MODULE_ID("$Id: lib_get_wch.c,v 1.13 2006/06/03 17:27:57 tom Exp $") + +#if HAVE_MBTOWC && HAVE_MBLEN +#define reset_mbytes(state) mblen(NULL, 0), mbtowc(NULL, NULL, 0) +#define count_mbytes(buffer,length,state) mblen(buffer,length) +#define check_mbytes(wch,buffer,length,state) \ + (int) mbtowc(&wch, buffer, length) +#define state_unused +#elif HAVE_MBRTOWC && HAVE_MBRLEN +#define reset_mbytes(state) init_mb(state) +#define count_mbytes(buffer,length,state) mbrlen(buffer,length,&state) +#define check_mbytes(wch,buffer,length,state) \ + (int) mbrtowc(&wch, buffer, length, &state) +#else +make an error +#endif NCURSES_EXPORT(int) -wget_wch(WINDOW *win, wint_t * result) +wget_wch(WINDOW *win, wint_t *result) { int code; - char buffer[(MB_CUR_MAX * 9) + 1]; /* allow some redundant shifts */ + char buffer[(MB_LEN_MAX * 9) + 1]; /* allow some redundant shifts */ int status; - mbstate_t state; size_t count = 0; unsigned long value; wchar_t wch; +#ifndef state_unused + mbstate_t state; +#endif T((T_CALLED("wget_wch(%p)"), win)); + /* * We can get a stream of single-byte characters and KEY_xxx codes from * _nc_wgetch(), while we want to return a wide character or KEY_xxx code. */ for (;;) { - T(("reading %d of %d", count + 1, sizeof(buffer))); - code = _nc_wgetch(win, &value, TRUE); + T(("reading %d of %d", count + 1, sizeof(buffer))); + code = _nc_wgetch(win, &value, TRUE EVENTLIST_2nd((_nc_eventlist *) 0)); if (code == ERR) { break; } else if (code == KEY_CODE_YES) { @@ -71,22 +90,23 @@ wget_wch(WINDOW *win, wint_t * result) * would be worth the effort. */ if (count != 0) { - ungetch(value); + ungetch((int) value); code = ERR; } break; } else if (count + 1 >= sizeof(buffer)) { - ungetch(value); + ungetch((int) value); code = ERR; break; } else { buffer[count++] = UChar(value); - memset(&state, 0, sizeof(state)); - status = mbrlen(buffer, count, &state); + reset_mbytes(state); + status = count_mbytes(buffer, count, state); if (status >= 0) { - memset(&state, 0, sizeof(state)); - if ((int) mbrtowc(&wch, buffer, count, &state) != status) { + reset_mbytes(state); + if (check_mbytes(wch, buffer, count, state) != status) { code = ERR; /* the two calls should match */ + ungetch((int) value); } value = wch; break; @@ -94,6 +114,6 @@ wget_wch(WINDOW *win, wint_t * result) } } *result = value; - T(("result %#o", value)); + T(("result %#lo", value)); returnCode(code); } |