ncurses 6.0 - patch 20180120

[ncurses.git] / ncurses / base / lib_insch.c

diff --git a/ncurses/base/lib_insch.c b/ncurses/base/lib_insch.c
index e88b945a741fe178d946694093173bfac4c7daee..1ec70e3af83d3a16e862aaaefcea1de6f363897f 100644 (file)
--- a/ncurses/base/lib_insch.c
+++ b/ncurses/base/lib_insch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2013,2016 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.29 2009/05/30 16:45:16 tom Exp $")
+MODULE_ID("$Id: lib_insch.c,v 1.36 2016/05/28 23:11:26 tom Exp $")
 
 /*
  * Insert the given character, updating the current location to simplify
@@ -53,16 +53,16 @@ NCURSES_EXPORT(int)
 _nc_insert_ch(SCREEN *sp, WINDOW *win, chtype ch)
 {
     int code = OK;
+    int ch8 = (int) ChCharOf(ch);
     NCURSES_CH_T wch;
     int count;
-    NCURSES_CONST char *s;
-    int tabsize =
+    int tabsize = (
 #if USE_REENTRANT
-    sp->_TABSIZE
+                     sp->_TABSIZE
 #else
-    TABSIZE
+                     TABSIZE
 #endif
-     ;
+    );
 
     switch (ch) {
     case '\t':
@@ -82,10 +82,9 @@ _nc_insert_ch(SCREEN *sp, WINDOW *win, chtype ch)
 #if USE_WIDEC_SUPPORT
               WINDOW_EXT(win, addch_used) == 0 &&
 #endif
-              is8bits(ChCharOf(ch)) &&
-              (isprint(ChCharOf(ch)) ||
+              (isprint(ch8) ||
                (ChAttrOf(ch) & A_ALTCHARSET) ||
-               (sp != 0 && sp->_legacy_coding && !iscntrl(ChCharOf(ch))))) {
+               (sp != 0 && sp->_legacy_coding && !iscntrl(ch8)))) {
            if (win->_curx <= win->_maxx) {
                struct ldat *line = &(win->_line[win->_cury]);
                NCURSES_CH_T *end = &(line->text[win->_curx]);
@@ -101,8 +100,9 @@ _nc_insert_ch(SCREEN *sp, WINDOW *win, chtype ch)
                *temp1 = _nc_render(win, wch);
                win->_curx++;
            }
-       } else if (is8bits(ChCharOf(ch)) && iscntrl(ChCharOf(ch))) {
-           s = NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx ChCharOf(ch));
+       } else if (iscntrl(ch8)) {
+           NCURSES_CONST char *s;
+           s = NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx (chtype) ch8);
            while (*s != '\0') {
                code = _nc_insert_ch(sp, win, ChAttrOf(ch) | UChar(*s));
                if (code != OK)
@@ -119,21 +119,18 @@ _nc_insert_ch(SCREEN *sp, WINDOW *win, chtype ch)
            wch = _nc_render(win, wch);
            count = _nc_build_wch(win, &wch);
            if (count > 0) {
-               code = wins_wch(win, &wch);
+               code = _nc_insert_wch(win, &wch);
            } else if (count == -1) {
+               NCURSES_CONST char *s;
                /* handle EILSEQ */
-               if (is8bits(ch)) {
-                   s = NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx ChCharOf(ch));
-                   if (strlen(s) > 1) {
-                       while (*s != '\0') {
-                           code = _nc_insert_ch(sp, win,
-                                                ChAttrOf(ch) | UChar(*s));
-                           if (code != OK)
-                               break;
-                           ++s;
-                       }
-                   } else {
-                       code = ERR;
+               s = NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx (chtype) ch8);
+               if (strlen(s) > 1) {
+                   while (*s != '\0') {
+                       code = _nc_insert_ch(sp, win,
+                                            ChAttrOf(ch) | UChar(*s));
+                       if (code != OK)
+                           break;
+                       ++s;
                    }
                } else {
                    code = ERR;
@@ -149,15 +146,13 @@ _nc_insert_ch(SCREEN *sp, WINDOW *win, chtype ch)
 NCURSES_EXPORT(int)
 winsch(WINDOW *win, chtype c)
 {
-    NCURSES_SIZE_T oy;
-    NCURSES_SIZE_T ox;
     int code = ERR;
 
-    T((T_CALLED("winsch(%p, %s)"), win, _tracechtype(c)));
+    T((T_CALLED("winsch(%p, %s)"), (void *) win, _tracechtype(c)));
 
     if (win != 0) {
-       oy = win->_cury;
-       ox = win->_curx;
+       NCURSES_SIZE_T oy = win->_cury;
+       NCURSES_SIZE_T ox = win->_curx;
 
        code = _nc_insert_ch(_nc_screen_of(win), win, c);