ncurses 6.0 - patch 20160528

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

diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c
index cc3e8781dac801687b52fdd41508a181125a3c11..2c0727947f35638f04288bc5226a4ea1b5f93081 100644 (file)
--- a/ncurses/base/lib_addch.c
+++ b/ncurses/base/lib_addch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2014,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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -36,7 +36,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
 #include <curses.priv.h>
 #include <ctype.h>
 

-MODULE_ID("$Id: lib_addch.c,v 1.112 2008/05/17 19:08:40 Miroslav.Lichvar Exp $")
+MODULE_ID("$Id: lib_addch.c,v 1.130 2016/05/28 23:12:00 tom Exp $")

 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 
 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 


@@ -51,7 +51,7 @@ static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
  */
 
 /* Return bit mask for clearing color pair number if given ch has color */
  */
 
 /* Return bit mask for clearing color pair number if given ch has color */

-#define COLOR_MASK(ch) (~(attr_t)((ch) & A_COLOR ? A_COLOR : 0))
+#define COLOR_MASK(ch) (~(attr_t)(((ch) & A_COLOR) ? A_COLOR : 0))

 
 static NCURSES_INLINE NCURSES_CH_T
 render_char(WINDOW *win, NCURSES_CH_T ch)
 
 static NCURSES_INLINE NCURSES_CH_T
 render_char(WINDOW *win, NCURSES_CH_T ch)


@@ -77,12 +77,6 @@ render_char(WINDOW *win, NCURSES_CH_T ch)
            if ((pair = GET_WINDOW_PAIR(win)) == 0)
                pair = GetPair(win->_nc_bkgd);
        }
            if ((pair = GET_WINDOW_PAIR(win)) == 0)
                pair = GetPair(win->_nc_bkgd);
        }

-#if 0
-       if (pair > 255) {
-           NCURSES_CH_T fixme = ch;
-           SetPair(fixme, pair);
-       }
-#endif

        AddAttr(ch, (a & COLOR_MASK(AttrOf(ch))));
        SetPair(ch, pair);
     }
        AddAttr(ch, (a & COLOR_MASK(AttrOf(ch))));
        SetPair(ch, pair);
     }


@@ -131,7 +125,7 @@ newline_forces_scroll(WINDOW *win, NCURSES_SIZE_T * ypos)
        *ypos = win->_regbottom;
        result = TRUE;
     } else {
        *ypos = win->_regbottom;
        result = TRUE;
     } else {

-       *ypos += 1;
+       *ypos = (NCURSES_SIZE_T) (*ypos + 1);

     }
     return result;
 }
     }
     return result;
 }


@@ -176,8 +170,8 @@ fill_cells(WINDOW *win, int count)
        if (waddch_literal(win, blank) == ERR)
            break;
     }
        if (waddch_literal(win, blank) == ERR)
            break;
     }

-    win->_curx = save_x;
-    win->_cury = save_y;
+    win->_curx = (NCURSES_SIZE_T) save_x;
+    win->_cury = (NCURSES_SIZE_T) save_y;

 }
 #endif
 
 }
 #endif
 


@@ -210,12 +204,13 @@ _nc_build_wch(WINDOW *win, ARG_CH_T ch)
     WINDOW_EXT(win, addch_y) = y;
 
     init_mb(state);
     WINDOW_EXT(win, addch_y) = y;
 
     init_mb(state);

-    buffer[WINDOW_EXT(win, addch_used)] = CharOf(CHDEREF(ch));
+    buffer[WINDOW_EXT(win, addch_used)] = (char) CharOf(CHDEREF(ch));

     WINDOW_EXT(win, addch_used) += 1;
     buffer[WINDOW_EXT(win, addch_used)] = '\0';
     WINDOW_EXT(win, addch_used) += 1;
     buffer[WINDOW_EXT(win, addch_used)] = '\0';

-    if ((len = mbrtowc(&result,
-                      buffer,
-                      WINDOW_EXT(win, addch_used), &state)) > 0) {
+    if ((len = (int) mbrtowc(&result,
+                            buffer,
+                            (size_t) WINDOW_EXT(win, addch_used),
+                            &state)) > 0) {

        attr_t attrs = AttrOf(CHDEREF(ch));
        if_EXT_COLORS(int pair = GetPair(CHDEREF(ch)));
        SetChar(CHDEREF(ch), result, attrs);
        attr_t attrs = AttrOf(CHDEREF(ch));
        if_EXT_COLORS(int pair = GetPair(CHDEREF(ch)));
        SetChar(CHDEREF(ch), result, attrs);


@@ -260,20 +255,37 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
     /*
      * Build up multibyte characters until we have a wide-character.
      */
     /*
      * Build up multibyte characters until we have a wide-character.
      */

+#if NCURSES_SP_FUNCS
+#define DeriveSP() SCREEN *sp = _nc_screen_of(win);
+#else
+#define DeriveSP()             /*nothing */
+#endif

     if_WIDEC({
     if_WIDEC({

+       DeriveSP();

        if (WINDOW_EXT(win, addch_used) != 0 || !Charable(ch)) {
            int len = _nc_build_wch(win, CHREF(ch));
 
            if (len >= -1) {
        if (WINDOW_EXT(win, addch_used) != 0 || !Charable(ch)) {
            int len = _nc_build_wch(win, CHREF(ch));
 
            if (len >= -1) {

-               /* handle EILSEQ */
-               if (is8bits(CharOf(ch))) {
-                   const char *s = unctrl((chtype) CharOf(ch));
-                   if (s[1] != 0) {
-                       return waddstr(win, s);
+               attr_t attr = AttrOf(ch);
+
+               /* handle EILSEQ (i.e., when len >= -1) */
+               if (len == -1 && is8bits(CharOf(ch))) {
+                   const char *s = NCURSES_SP_NAME(unctrl)
+                     (NCURSES_SP_ARGx (chtype) CharOf(ch));
+
+                   if (s[1] != '\0') {
+                       int rc = OK;
+                       while (*s != '\0') {
+                           rc = waddch(win, UChar(*s) | attr);
+                           if (rc != OK)
+                               break;
+                           ++s;
+                       }
+                       return rc;

                    }
                }
                if (len == -1)
                    }
                }
                if (len == -1)

-                   return waddch(win, ' ');
+                   return waddch(win, ' ' | attr);

            } else {
                return OK;
            }
            } else {
                return OK;
            }


@@ -327,6 +339,7 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
                    return ERR;
                x = win->_curx;
                y = win->_cury;
                    return ERR;
                x = win->_curx;
                y = win->_cury;

+               line = win->_line + y;

            }
            /*
             * Check for cells which are orphaned by adding this character, set
            }
            /*
             * Check for cells which are orphaned by adding this character, set


@@ -384,7 +397,7 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
     if (x > win->_maxx) {
        return wrap_to_next_line(win);
     }
     if (x > win->_maxx) {
        return wrap_to_next_line(win);
     }

-    win->_curx = x;
+    win->_curx = (NCURSES_SIZE_T) x;

     return OK;
 }
 
     return OK;
 }
 


@@ -393,30 +406,36 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
 /* the workhorse function -- add a character to the given window */
 {
     NCURSES_SIZE_T x, y;
 /* the workhorse function -- add a character to the given window */
 {
     NCURSES_SIZE_T x, y;

-    chtype t = CharOf(ch);
-    const char *s = unctrl(t);
+    chtype t = (chtype) CharOf(ch);
+#if USE_WIDEC_SUPPORT || NCURSES_SP_FUNCS || USE_REENTRANT
+    SCREEN *sp = _nc_screen_of(win);
+#endif
+    const char *s = NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx t);
+    int tabsize = 8;

 
     /*
      * If we are using the alternate character set, forget about locale.
      * Otherwise, if unctrl() returns a single-character or the locale
 
     /*
      * If we are using the alternate character set, forget about locale.
      * Otherwise, if unctrl() returns a single-character or the locale

-     * claims the code is printable, treat it that way.
+     * claims the code is printable (and not also a control character),
+     * treat it that way.

      */
     if ((AttrOf(ch) & A_ALTCHARSET)
        || (
 #if USE_WIDEC_SUPPORT
      */
     if ((AttrOf(ch) & A_ALTCHARSET)
        || (
 #if USE_WIDEC_SUPPORT

-              (SP != 0 && SP->_legacy_coding) &&
+              (sp != 0 && sp->_legacy_coding) &&

 #endif
               s[1] == 0
        )
        || (
 #endif
               s[1] == 0
        )
        || (

-              isprint(t)
+              (isprint((int) t) && !iscntrl((int) t))

 #if USE_WIDEC_SUPPORT
 #if USE_WIDEC_SUPPORT

-              || ((SP == 0 || !SP->_legacy_coding) &&
+              || ((sp == 0 || !sp->_legacy_coding) &&

                   (WINDOW_EXT(win, addch_used)
                    || !_nc_is_charable(CharOf(ch))))
 #endif
                   (WINDOW_EXT(win, addch_used)
                    || !_nc_is_charable(CharOf(ch))))
 #endif

-       ))
+       )) {

        return waddch_literal(win, ch);
        return waddch_literal(win, ch);

+    }

 
     /*
      * Handle carriage control and other codes that are not printable, or are
 
     /*
      * Handle carriage control and other codes that are not printable, or are


@@ -427,8 +446,12 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
 
     switch (t) {
     case '\t':
 
     switch (t) {
     case '\t':

-       x += (TABSIZE - (x % TABSIZE));
-
+#if USE_REENTRANT
+       tabsize = *ptrTabsize(sp);
+#else
+       tabsize = TABSIZE;
+#endif
+       x = (NCURSES_SIZE_T) (x + (tabsize - (x % tabsize)));

        /*
         * Space-fill the tab on the bottom line so that we'll get the
         * "correct" cursor position.
        /*
         * Space-fill the tab on the bottom line so that we'll get the
         * "correct" cursor position.


@@ -478,7 +501,7 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
     default:
        while (*s) {
            NCURSES_CH_T sch;
     default:
        while (*s) {
            NCURSES_CH_T sch;

-           SetChar(sch, *s++, AttrOf(ch));
+           SetChar(sch, UChar(*s++), AttrOf(ch));

            if_EXT_COLORS(SetPair(sch, GetPair(ch)));
            if (waddch_literal(win, sch) == ERR)
                return ERR;
            if_EXT_COLORS(SetPair(sch, GetPair(ch)));
            if (waddch_literal(win, sch) == ERR)
                return ERR;


@@ -514,7 +537,7 @@ waddch(WINDOW *win, const chtype ch)
     NCURSES_CH_T wch;
     SetChar2(wch, ch);
 
     NCURSES_CH_T wch;
     SetChar2(wch, ch);
 

-    TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("waddch(%p, %s)"), win,
+    TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("waddch(%p, %s)"), (void *) win,

                                      _tracechtype(ch)));
 
     if (win && (waddch_nosync(win, wch) != ERR)) {
                                      _tracechtype(ch)));
 
     if (win && (waddch_nosync(win, wch) != ERR)) {


@@ -533,7 +556,8 @@ wechochar(WINDOW *win, const chtype ch)
     NCURSES_CH_T wch;
     SetChar2(wch, ch);
 
     NCURSES_CH_T wch;
     SetChar2(wch, ch);
 

-    TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("wechochar(%p, %s)"), win,
+    TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("wechochar(%p, %s)"),
+                                     (void *) win,

                                      _tracechtype(ch)));
 
     if (win && (waddch_nosync(win, wch) != ERR)) {
                                      _tracechtype(ch)));
 
     if (win && (waddch_nosync(win, wch) != ERR)) {