aboutsummaryrefslogtreecommitdiff
path: root/contrib/ncurses/ncurses/base/lib_insch.c
diff options
context:
space:
mode:
authorRong-En Fan <rafan@FreeBSD.org>2008-02-11 13:37:14 +0000
committerRong-En Fan <rafan@FreeBSD.org>2008-02-11 13:37:14 +0000
commitd8977eaf361f5fdc1261c3f3524988f661ed926e (patch)
tree6e13b0d70c904118d1734988696458ad468a00f1 /contrib/ncurses/ncurses/base/lib_insch.c
parent536bf19adc224388608d1ed2df0b31b9dd159c3f (diff)
downloadsrc-d8977eaf361f5fdc1261c3f3524988f661ed926e.tar.gz
src-d8977eaf361f5fdc1261c3f3524988f661ed926e.zip
Import ncurses 5.6-20080209 snapshot onto the vender branchvendor/ncurses/5.6-20080209
Notes
Notes: svn path=/vendor/ncurses/dist/; revision=176187 svn path=/vendor/ncurses/5.6-20080209/; revision=176189; tag=vendor/ncurses/5.6-20080209
Diffstat (limited to 'contrib/ncurses/ncurses/base/lib_insch.c')
-rw-r--r--contrib/ncurses/ncurses/base/lib_insch.c24
1 files changed, 20 insertions, 4 deletions
diff --git a/contrib/ncurses/ncurses/base/lib_insch.c b/contrib/ncurses/ncurses/base/lib_insch.c
index b8a856df3a82..9166ea5240e7 100644
--- a/contrib/ncurses/ncurses/base/lib_insch.c
+++ b/contrib/ncurses/ncurses/base/lib_insch.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2005,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 *
@@ -43,7 +43,7 @@
#include <curses.priv.h>
#include <ctype.h>
-MODULE_ID("$Id: lib_insch.c,v 1.24 2005/02/26 19:27:28 tom Exp $")
+MODULE_ID("$Id: lib_insch.c,v 1.25 2008/02/03 00:14:37 tom Exp $")
/*
* Insert the given character, updating the current location to simplify
@@ -95,7 +95,8 @@ _nc_insert_ch(WINDOW *win, chtype ch)
} else if (is8bits(ChCharOf(ch)) && iscntrl(ChCharOf(ch))) {
s = unctrl(ChCharOf(ch));
while (*s != '\0') {
- if ((code = _nc_insert_ch(win, ChAttrOf(ch) | UChar(*s))) != OK)
+ code = _nc_insert_ch(win, ChAttrOf(ch) | UChar(*s));
+ if (code != OK)
break;
++s;
}
@@ -107,8 +108,23 @@ _nc_insert_ch(WINDOW *win, chtype ch)
*/
SetChar2(wch, ch);
wch = _nc_render(win, wch);
- if (_nc_build_wch(win, &wch) >= 0)
+ count = _nc_build_wch(win, &wch);
+ if (count > 0) {
code = wins_wch(win, &wch);
+ } else if (count == -1) {
+ /* handle EILSEQ */
+ if (is8bits(ch)) {
+ s = unctrl(ChCharOf(ch));
+ while (*s != '\0') {
+ code = _nc_insert_ch(win, ChAttrOf(ch) | UChar(*s));
+ if (code != OK)
+ break;
+ ++s;
+ }
+ } else {
+ code = ERR;
+ }
+ }
}
#endif
break;