ncurses 6.0 - patch 20161210

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

diff --git a/ncurses/base/lib_insch.c b/ncurses/base/lib_insch.c
index ccc5ff5d024dc4460b7c2e599fa3e66de766eb1f..1ec70e3af83d3a16e862aaaefcea1de6f363897f 100644 (file)
--- a/ncurses/base/lib_insch.c
+++ b/ncurses/base/lib_insch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 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            *
@@ -29,10 +29,10 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Sven Verdoolaege                                                *
+ *     and: Thomas E. Dickey                                                *
  ****************************************************************************/
 
-
-
 /*
 **     lib_insch.c
 **
@@ -41,27 +41,124 @@
 */
 
 #include <curses.priv.h>
+#include <ctype.h>
 
-MODULE_ID("$Id: lib_insch.c,v 1.10 1998/06/28 00:26:52 tom Exp $")
+MODULE_ID("$Id: lib_insch.c,v 1.36 2016/05/28 23:11:26 tom Exp $")
 
-int  winsch(WINDOW *win, chtype c)
+/*
+ * Insert the given character, updating the current location to simplify
+ * inserting a string.
+ */
+NCURSES_EXPORT(int)
+_nc_insert_ch(SCREEN *sp, WINDOW *win, chtype ch)
 {
-int code = ERR;
-
-       T((T_CALLED("winsch(%p, %s)"), win, _tracechtype(c)));
+    int code = OK;
+    int ch8 = (int) ChCharOf(ch);
+    NCURSES_CH_T wch;
+    int count;
+    int tabsize = (
+#if USE_REENTRANT
+                     sp->_TABSIZE
+#else
+                     TABSIZE
+#endif
+    );
 
-       if (win) {
+    switch (ch) {
+    case '\t':
+       for (count = (tabsize - (win->_curx % tabsize)); count > 0; count--) {
+           if ((code = _nc_insert_ch(sp, win, ' ')) != OK)
+               break;
+       }
+       break;
+    case '\n':
+    case '\r':
+    case '\b':
+       SetChar2(wch, ch);
+       _nc_waddch_nosync(win, wch);
+       break;
+    default:
+       if (
+#if USE_WIDEC_SUPPORT
+              WINDOW_EXT(win, addch_used) == 0 &&
+#endif
+              (isprint(ch8) ||
+               (ChAttrOf(ch) & A_ALTCHARSET) ||
+               (sp != 0 && sp->_legacy_coding && !iscntrl(ch8)))) {
+           if (win->_curx <= win->_maxx) {
                struct ldat *line = &(win->_line[win->_cury]);
-               chtype *end = &(line->text[win->_curx]);
-               chtype *temp1 = &(line->text[win->_maxx]);
-               chtype *temp2 = temp1 - 1;
+               NCURSES_CH_T *end = &(line->text[win->_curx]);
+               NCURSES_CH_T *temp1 = &(line->text[win->_maxx]);
+               NCURSES_CH_T *temp2 = temp1 - 1;
+
+               SetChar2(wch, ch);
 
                CHANGED_TO_EOL(line, win->_curx, win->_maxx);
                while (temp1 > end)
-                       *temp1-- = *temp2--;
+                   *temp1-- = *temp2--;
 
-               *temp1 = _nc_render(win, c);
-               code = OK;
+               *temp1 = _nc_render(win, wch);
+               win->_curx++;
+           }
+       } 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)
+                   break;
+               ++s;
+           }
+       }
+#if USE_WIDEC_SUPPORT
+       else {
+           /*
+            * Handle multibyte characters here
+            */
+           SetChar2(wch, ch);
+           wch = _nc_render(win, wch);
+           count = _nc_build_wch(win, &wch);
+           if (count > 0) {
+               code = _nc_insert_wch(win, &wch);
+           } else if (count == -1) {
+               NCURSES_CONST char *s;
+               /* handle EILSEQ */
+               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;
+               }
+           }
        }
-       returnCode(code);
+#endif
+       break;
+    }
+    return code;
+}
+
+NCURSES_EXPORT(int)
+winsch(WINDOW *win, chtype c)
+{
+    int code = ERR;
+
+    T((T_CALLED("winsch(%p, %s)"), (void *) win, _tracechtype(c)));
+
+    if (win != 0) {
+       NCURSES_SIZE_T oy = win->_cury;
+       NCURSES_SIZE_T ox = win->_curx;
+
+       code = _nc_insert_ch(_nc_screen_of(win), win, c);
+
+       win->_curx = ox;
+       win->_cury = oy;
+       _nc_synchook(win);
+    }
+    returnCode(code);
 }