ncurses 6.2 - patch 20210418

[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 9d5c708f370393baa2230cb241a7312a97db67f3..2d9531f1b864c9529a583f13839ac6241d26234c 100644 (file)
--- a/ncurses/widechar/lib_vid_attr.c
+++ b/ncurses/widechar/lib_vid_attr.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2002-2014,2017 Free Software Foundation, Inc.              *
+ * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2002-2014,2017 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,17 +37,24 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_vid_attr.c,v 1.25 2017/06/24 13:22:27 tom Exp $")
+MODULE_ID("$Id: lib_vid_attr.c,v 1.30 2020/05/27 23:54:31 tom Exp $")
 
 #define doPut(mode) \
        TPUTS_TRACE(#mode); \
        NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx mode, 1, outc)
 
 #define TurnOn(mask, mode) \
-       if ((turn_on & mask) && mode) { doPut(mode); }
+       if ((turn_on & mask) && mode) { \
+           TPUTS_TRACE(#mode); \
+           NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx mode, 1, outc); \
+       }
 
 #define TurnOff(mask, mode) \
-       if ((turn_off & mask) && mode) { doPut(mode); turn_off &= ~mask; }
+       if ((turn_off & mask) && mode) { \
+           TPUTS_TRACE(#mode); \
+           NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx mode, 1, outc); \
+           turn_off &= ~mask; \
+       }
 
        /* if there is no current screen, assume we *can* do color */
 #define SetColorsIf(why, old_attr, old_pair) \
@@ -183,16 +191,16 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
        if (turn_on || turn_off) {
            TPUTS_TRACE("set_attributes");
            NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
-                                   TPARM_9(set_attributes,
-                                           (newmode & A_STANDOUT) != 0,
-                                           (newmode & A_UNDERLINE) != 0,
-                                           (newmode & A_REVERSE) != 0,
-                                           (newmode & A_BLINK) != 0,
-                                           (newmode & A_DIM) != 0,
-                                           (newmode & A_BOLD) != 0,
-                                           (newmode & A_INVIS) != 0,
-                                           (newmode & A_PROTECT) != 0,
-                                           (newmode & A_ALTCHARSET) != 0),
+                                   TIPARM_9(set_attributes,
+                                              (newmode & A_STANDOUT) != 0,
+                                              (newmode & A_UNDERLINE) != 0,
+                                              (newmode & A_REVERSE) != 0,
+                                              (newmode & A_BLINK) != 0,
+                                              (newmode & A_DIM) != 0,
+                                              (newmode & A_BOLD) != 0,
+                                              (newmode & A_INVIS) != 0,
+                                              (newmode & A_PROTECT) != 0,
+                                              (newmode & A_ALTCHARSET) != 0),
                                    1, outc);
            previous_attr &= ALL_BUT_COLOR;
            previous_pair = 0;
@@ -247,7 +255,7 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
 #if USE_ITALIC
        TurnOn(A_ITALIC,        enter_italics_mode);
 #endif
-#if USE_WIDEC_SUPPORT
+#if USE_WIDEC_SUPPORT && defined(enter_horizontal_hl_mode)
        TurnOn(A_HORIZONTAL,    enter_horizontal_hl_mode);
        TurnOn(A_LEFT,          enter_left_hl_mode);
        TurnOn(A_LOW,           enter_low_hl_mode);
@@ -256,7 +264,6 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
        TurnOn(A_VERTICAL,      enter_vertical_hl_mode);
 #endif
        /* *INDENT-ON* */
-
     }
 
     if (reverse)
@@ -331,6 +338,7 @@ NCURSES_SP_NAME(term_attrs) (NCURSES_SP_DCL0)
     if (SP_PARM) {
        attrs = NCURSES_SP_NAME(termattrs) (NCURSES_SP_ARG);
 
+#if USE_WIDEC_SUPPORT && defined(enter_horizontal_hl_mode)
        /* these are only supported for wide-character mode */
        if (enter_horizontal_hl_mode)
            attrs |= WA_HORIZONTAL;
@@ -344,6 +352,7 @@ NCURSES_SP_NAME(term_attrs) (NCURSES_SP_DCL0)
            attrs |= WA_TOP;
        if (enter_vertical_hl_mode)
            attrs |= WA_VERTICAL;
+#endif
     }
 
     returnAttr(attrs);