ncurses 6.1 - patch 20191012

[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 8487edf0d94635cc1dde6c85ef8b191d57097a71..b0dfb6be9f82c1c3ca982596693dea6bf0214aa4 100644 (file)
--- a/ncurses/widechar/lib_vid_attr.c
+++ b/ncurses/widechar/lib_vid_attr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2002-2014,2017 Free Software Foundation, Inc.              *
+ * Copyright (c) 2002-2018,2019 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,17 +36,24 @@
 #define CUR SP_TERMTYPE
 #endif
 
 #define CUR SP_TERMTYPE
 #endif
 

-MODULE_ID("$Id: lib_vid_attr.c,v 1.24 2017/03/17 00:17:32 tom Exp $")
+MODULE_ID("$Id: lib_vid_attr.c,v 1.27 2019/04/13 22:40:48 tom Exp $")

 
 #define doPut(mode) \
        TPUTS_TRACE(#mode); \
        NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx mode, 1, outc)
 
 #define TurnOn(mask, mode) \
 
 #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) \
 
 #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) \
 
        /* if there is no current screen, assume we *can* do color */
 #define SetColorsIf(why, old_attr, old_pair) \


@@ -86,6 +93,9 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
 #define fix_pair0 FALSE
 #endif
 
 #define fix_pair0 FALSE
 #endif
 

+    if (!IsValidTIScreen(SP_PARM))
+       returnCode(ERR);
+

     newmode &= A_ATTRIBUTES;
     set_extended_pair(opts, color_pair);
     T((T_CALLED("vid_puts(%s,%d)"), _traceattr(newmode), color_pair));
     newmode &= A_ATTRIBUTES;
     set_extended_pair(opts, color_pair);
     T((T_CALLED("vid_puts(%s,%d)"), _traceattr(newmode), color_pair));


@@ -244,7 +254,7 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
 #if USE_ITALIC
        TurnOn(A_ITALIC,        enter_italics_mode);
 #endif
 #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);
        TurnOn(A_HORIZONTAL,    enter_horizontal_hl_mode);
        TurnOn(A_LEFT,          enter_left_hl_mode);
        TurnOn(A_LOW,           enter_low_hl_mode);


@@ -328,6 +338,7 @@ NCURSES_SP_NAME(term_attrs) (NCURSES_SP_DCL0)
     if (SP_PARM) {
        attrs = NCURSES_SP_NAME(termattrs) (NCURSES_SP_ARG);
 
     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;
        /* these are only supported for wide-character mode */
        if (enter_horizontal_hl_mode)
            attrs |= WA_HORIZONTAL;


@@ -341,6 +352,7 @@ NCURSES_SP_NAME(term_attrs) (NCURSES_SP_DCL0)
            attrs |= WA_TOP;
        if (enter_vertical_hl_mode)
            attrs |= WA_VERTICAL;
            attrs |= WA_TOP;
        if (enter_vertical_hl_mode)
            attrs |= WA_VERTICAL;

+#endif

     }
 
     returnAttr(attrs);
     }
 
     returnAttr(attrs);