ncurses 6.0 - patch 20160827

[ncurses.git] / ncurses / widechar / lib_vid_attr.c

diff --git a/ncurses/widechar/lib_vid_attr.c b/ncurses/widechar/lib_vid_attr.c
index edd510ea03d486c46eebf445b500bc527b76d7ae..80c1ea4ebc04699ecdad7b4122eb07221825c50d 100644 (file)
--- a/ncurses/widechar/lib_vid_attr.c
+++ b/ncurses/widechar/lib_vid_attr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2002-2009,2010 Free Software Foundation, Inc.              *
+ * Copyright (c) 2002-2013,2014 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            *
@@ -36,14 +36,16 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_vid_attr.c,v 1.12 2010/01/23 17:59:27 tom Exp $")
+MODULE_ID("$Id: lib_vid_attr.c,v 1.23 2014/06/07 22:13:46 tom Exp $")
 
-#define doPut(mode) TPUTS_TRACE(#mode); NCURSES_SP_NAME(tputs)(NCURSES_SP_ARGx mode, 1, outc)
+#define doPut(mode) \
+       TPUTS_TRACE(#mode); \
+       NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx mode, 1, outc)
 
-#define TurnOn(mask,mode) \
+#define TurnOn(mask, mode) \
        if ((turn_on & mask) && mode) { doPut(mode); }
 
-#define TurnOff(mask,mode) \
+#define TurnOff(mask, mode) \
        if ((turn_off & mask) && mode) { doPut(mode); turn_off &= ~mask; }
 
        /* if there is no current screen, assume we *can* do color */
@@ -59,12 +61,14 @@ MODULE_ID("$Id: lib_vid_attr.c,v 1.12 2010/01/23 17:59:27 tom Exp $")
                } \
        }
 
-#define set_color(mode, pair) mode &= ALL_BUT_COLOR; mode |= COLOR_PAIR(pair)
+#define set_color(mode, pair) \
+       mode &= ALL_BUT_COLOR; \
+       mode |= (attr_t) ColorPair(pair)
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
                           attr_t newmode,
-                          short pair,
+                          NCURSES_PAIRS_T pair,
                           void *opts GCC_UNUSED,
                           NCURSES_SP_OUTC outc)
 {
@@ -118,7 +122,7 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
         * A_ALTCHARSET (256) down 2 to line up.  We use the NCURSES_BITS
         * macro so this will work properly for the wide-character layout.
         */
-       unsigned value = no_color_video;
+       unsigned value = (unsigned) no_color_video;
        attr_t mask = NCURSES_BITS((value & 63)
                                   | ((value & 192) << 1)
                                   | ((value & 256) >> 2), 8);
@@ -140,7 +144,7 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
     }
 
     turn_off = (~newmode & previous_attr) & ALL_BUT_COLOR;
-    turn_on = (newmode & ~previous_attr) & ALL_BUT_COLOR;
+    turn_on = (newmode & ~(previous_attr & TPARM_ATTR)) & ALL_BUT_COLOR;
 
     SetColorsIf(((pair == 0) && !fix_pair0), previous_attr, previous_pair);
 
@@ -159,6 +163,11 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
                if (!SP_PARM || SP_PARM->_use_rmso) {
                    TurnOff(A_STANDOUT, exit_standout_mode);
                }
+#if USE_ITALIC
+               if (!SP_PARM || SP_PARM->_use_ritm) {
+                   TurnOff(A_ITALIC, exit_italics_mode);
+               }
+#endif
            }
            previous_attr &= ALL_BUT_COLOR;
            previous_pair = 0;
@@ -183,6 +192,15 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
            previous_attr &= ALL_BUT_COLOR;
            previous_pair = 0;
        }
+#if USE_ITALIC
+       if (!SP_PARM || SP_PARM->_use_ritm) {
+           if (turn_on & A_ITALIC) {
+               TurnOn(A_ITALIC, enter_italics_mode);
+           } else if (turn_off & A_ITALIC) {
+               TurnOff(A_ITALIC, exit_italics_mode);
+           }
+       }
+#endif
        SetColorsIf((pair != 0) || fix_pair0, previous_attr, previous_pair);
     } else {
 
@@ -197,7 +215,11 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
        if (!SP_PARM || SP_PARM->_use_rmso) {
            TurnOff(A_STANDOUT, exit_standout_mode);
        }
-
+#if USE_ITALIC
+       if (!SP_PARM || SP_PARM->_use_ritm) {
+           TurnOff(A_ITALIC, exit_italics_mode);
+       }
+#endif
        if (turn_off && exit_attribute_mode) {
            doPut(exit_attribute_mode);
            turn_on |= (newmode & ALL_BUT_COLOR);
@@ -217,6 +239,9 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
        TurnOn(A_PROTECT,       enter_protected_mode);
        TurnOn(A_INVIS,         enter_secure_mode);
        TurnOn(A_UNDERLINE,     enter_underline_mode);
+#if USE_ITALIC
+       TurnOn(A_ITALIC,        enter_italics_mode);
+#endif
 #if USE_WIDEC_SUPPORT
        TurnOn(A_HORIZONTAL,    enter_horizontal_hl_mode);
        TurnOn(A_LEFT,          enter_left_hl_mode);
@@ -242,7 +267,7 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
 
     returnCode(OK);
 #else
-    T((T_CALLED("vid_puts(%s,%d)"), _traceattr(newmode), pair));
+    T((T_CALLED("vid_puts(%s,%d)"), _traceattr(newmode), (int) pair));
     set_color(newmode, pair);
     returnCode(NCURSES_SP_NAME(vidputs) (NCURSES_SP_ARGx newmode, outc));
 #endif
@@ -251,7 +276,7 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
 vid_puts(attr_t newmode,
-        short pair,
+        NCURSES_PAIRS_T pair,
         void *opts GCC_UNUSED,
         NCURSES_OUTC outc)
 {
@@ -268,20 +293,20 @@ vid_puts(attr_t newmode,
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(vid_attr) (NCURSES_SP_DCLx
                           attr_t newmode,
-                          short pair,
+                          NCURSES_PAIRS_T pair,
                           void *opts)
 {
-    T((T_CALLED("vid_attr(%s,%d)"), _traceattr(newmode), pair));
+    T((T_CALLED("vid_attr(%s,%d)"), _traceattr(newmode), (int) pair));
     returnCode(NCURSES_SP_NAME(vid_puts) (NCURSES_SP_ARGx
                                          newmode,
                                          pair,
                                          opts,
-                                         NCURSES_SP_NAME(_nc_outch)));
+                                         NCURSES_SP_NAME(_nc_putchar)));
 }
 
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
-vid_attr(attr_t newmode, short pair, void *opts)
+vid_attr(attr_t newmode, NCURSES_PAIRS_T pair, void *opts)
 {
     return NCURSES_SP_NAME(vid_attr) (CURRENT_SCREEN, newmode, pair, opts);
 }
@@ -294,24 +319,26 @@ vid_attr(attr_t newmode, short pair, void *opts)
 NCURSES_EXPORT(attr_t)
 NCURSES_SP_NAME(term_attrs) (NCURSES_SP_DCL0)
 {
-    attr_t attrs;
+    attr_t attrs = 0;
 
     T((T_CALLED("term_attrs()")));
-    attrs = SP_PARM ? NCURSES_SP_NAME(termattrs) (NCURSES_SP_ARG) : 0;
-
-    /* these are only supported for wide-character mode */
-    if (enter_horizontal_hl_mode)
-       attrs |= WA_HORIZONTAL;
-    if (enter_left_hl_mode)
-       attrs |= WA_LEFT;
-    if (enter_low_hl_mode)
-       attrs |= WA_LOW;
-    if (enter_right_hl_mode)
-       attrs |= WA_RIGHT;
-    if (enter_top_hl_mode)
-       attrs |= WA_TOP;
-    if (enter_vertical_hl_mode)
-       attrs |= WA_VERTICAL;
+    if (SP_PARM) {
+       attrs = NCURSES_SP_NAME(termattrs) (NCURSES_SP_ARG);
+
+       /* these are only supported for wide-character mode */
+       if (enter_horizontal_hl_mode)
+           attrs |= WA_HORIZONTAL;
+       if (enter_left_hl_mode)
+           attrs |= WA_LEFT;
+       if (enter_low_hl_mode)
+           attrs |= WA_LOW;
+       if (enter_right_hl_mode)
+           attrs |= WA_RIGHT;
+       if (enter_top_hl_mode)
+           attrs |= WA_TOP;
+       if (enter_vertical_hl_mode)
+           attrs |= WA_VERTICAL;
+    }
 
     returnAttr(attrs);
 }