ncurses 6.0 - patch 20151101

[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 2ba16b5cf9240a57f87147215e756df8534dd2ec..80c1ea4ebc04699ecdad7b4122eb07221825c50d 100644 (file)
--- a/ncurses/widechar/lib_vid_attr.c
+++ b/ncurses/widechar/lib_vid_attr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2002-2005,2006 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -31,16 +31,21 @@
  ****************************************************************************/
 
 #include <curses.priv.h>
  ****************************************************************************/
 
 #include <curses.priv.h>

-#include <term.h>

 
 

-MODULE_ID("$Id: lib_vid_attr.c,v 1.4 2006/11/26 00:26:00 tom Exp $")
+#ifndef CUR
+#define CUR SP_TERMTYPE
+#endif
+
+MODULE_ID("$Id: lib_vid_attr.c,v 1.23 2014/06/07 22:13:46 tom Exp $")

 
 

-#define doPut(mode) TPUTS_TRACE(#mode); tputs(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); }
 
        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 */
        if ((turn_off & mask) && mode) { doPut(mode); turn_off &= ~mask; }
 
        /* if there is no current screen, assume we *can* do color */


@@ -50,14 +55,22 @@ MODULE_ID("$Id: lib_vid_attr.c,v 1.4 2006/11/26 00:26:00 tom Exp $")
                if ((pair != old_pair) \
                 || (fix_pair0 && (pair == 0)) \
                 || (reverse ^ ((old_attr & A_REVERSE) != 0))) { \
                if ((pair != old_pair) \
                 || (fix_pair0 && (pair == 0)) \
                 || (reverse ^ ((old_attr & A_REVERSE) != 0))) { \

-                       _nc_do_color(old_pair, pair, reverse, outc); \
+                   NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_ARGx \
+                                                  old_pair, pair, \
+                                                  reverse, outc); \

                } \
        }
 
                } \
        }
 

-#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_EXPORT(int)

-vid_puts(attr_t newmode, short pair, void *opts GCC_UNUSED, int (*outc) (int))
+NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
+                          attr_t newmode,
+                          NCURSES_PAIRS_T pair,
+                          void *opts GCC_UNUSED,
+                          NCURSES_SP_OUTC outc)

 {
 #if NCURSES_EXT_COLORS
     static attr_t previous_attr = A_NORMAL;
 {
 #if NCURSES_EXT_COLORS
     static attr_t previous_attr = A_NORMAL;


@@ -65,28 +78,29 @@ vid_puts(attr_t newmode, short pair, void *opts GCC_UNUSED, int (*outc) (int))
 
     attr_t turn_on, turn_off;
     bool reverse = FALSE;
 
     attr_t turn_on, turn_off;
     bool reverse = FALSE;

-    bool can_color = (SP == 0 || SP->_coloron);
+    bool can_color = (SP_PARM == 0 || SP_PARM->_coloron);

 #if NCURSES_EXT_FUNCS
 #if NCURSES_EXT_FUNCS

-    bool fix_pair0 = (SP != 0 && SP->_coloron && !SP->_default_color);
+    bool fix_pair0 = (SP_PARM != 0 && SP_PARM->_coloron && !SP_PARM->_default_color);

 #else
 #define fix_pair0 FALSE
 #endif
 
 #else
 #define fix_pair0 FALSE
 #endif
 

+    newmode &= A_ATTRIBUTES;

     T((T_CALLED("vid_puts(%s,%d)"), _traceattr(newmode), pair));
 
     /* this allows us to go on whether or not newterm() has been called */
     T((T_CALLED("vid_puts(%s,%d)"), _traceattr(newmode), pair));
 
     /* this allows us to go on whether or not newterm() has been called */

-    if (SP) {
-       previous_attr = AttrOf(SCREEN_ATTRS(SP));
-       previous_pair = GetPair(SCREEN_ATTRS(SP));
+    if (SP_PARM) {
+       previous_attr = AttrOf(SCREEN_ATTRS(SP_PARM));
+       previous_pair = GetPair(SCREEN_ATTRS(SP_PARM));

     }
 
     TR(TRACE_ATTRS, ("previous attribute was %s, %d",
                     _traceattr(previous_attr), previous_pair));
 
 #if !USE_XMC_SUPPORT
     }
 
     TR(TRACE_ATTRS, ("previous attribute was %s, %d",
                     _traceattr(previous_attr), previous_pair));
 
 #if !USE_XMC_SUPPORT

-    if ((SP != 0)
+    if ((SP_PARM != 0)

        && (magic_cookie_glitch > 0))
        && (magic_cookie_glitch > 0))

-       newmode &= ~(SP->_xmc_suppress);
+       newmode &= ~(SP_PARM->_xmc_suppress);

 #endif
 
     /*
 #endif
 
     /*


@@ -108,7 +122,7 @@ vid_puts(attr_t newmode, short pair, void *opts GCC_UNUSED, int (*outc) (int))
         * A_ALTCHARSET (256) down 2 to line up.  We use the NCURSES_BITS
         * macro so this will work properly for the wide-character layout.
         */
         * 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);
        attr_t mask = NCURSES_BITS((value & 63)
                                   | ((value & 192) << 1)
                                   | ((value & 256) >> 2), 8);


@@ -130,7 +144,7 @@ vid_puts(attr_t newmode, short pair, void *opts GCC_UNUSED, int (*outc) (int))
     }
 
     turn_off = (~newmode & previous_attr) & ALL_BUT_COLOR;
     }
 
     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);
 
 
     SetColorsIf(((pair == 0) && !fix_pair0), previous_attr, previous_pair);
 


@@ -143,12 +157,17 @@ vid_puts(attr_t newmode, short pair, void *opts GCC_UNUSED, int (*outc) (int))
            if (exit_attribute_mode) {
                doPut(exit_attribute_mode);
            } else {
            if (exit_attribute_mode) {
                doPut(exit_attribute_mode);
            } else {

-               if (!SP || SP->_use_rmul) {
+               if (!SP_PARM || SP_PARM->_use_rmul) {

                    TurnOff(A_UNDERLINE, exit_underline_mode);
                }
                    TurnOff(A_UNDERLINE, exit_underline_mode);
                }

-               if (!SP || SP->_use_rmso) {
+               if (!SP_PARM || SP_PARM->_use_rmso) {

                    TurnOff(A_STANDOUT, exit_standout_mode);
                }
                    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;
            }
            previous_attr &= ALL_BUT_COLOR;
            previous_pair = 0;


@@ -158,19 +177,30 @@ vid_puts(attr_t newmode, short pair, void *opts GCC_UNUSED, int (*outc) (int))
     } else if (set_attributes) {
        if (turn_on || turn_off) {
            TPUTS_TRACE("set_attributes");
     } else if (set_attributes) {
        if (turn_on || turn_off) {
            TPUTS_TRACE("set_attributes");

-           tputs(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), 1, outc);
+           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),
+                                   1, outc);

            previous_attr &= ALL_BUT_COLOR;
            previous_pair = 0;
        }
            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 {
 
        SetColorsIf((pair != 0) || fix_pair0, previous_attr, previous_pair);
     } else {
 


@@ -178,14 +208,18 @@ vid_puts(attr_t newmode, short pair, void *opts GCC_UNUSED, int (*outc) (int))
 
        TurnOff(A_ALTCHARSET, exit_alt_charset_mode);
 
 
        TurnOff(A_ALTCHARSET, exit_alt_charset_mode);
 

-       if (!SP || SP->_use_rmul) {
+       if (!SP_PARM || SP_PARM->_use_rmul) {

            TurnOff(A_UNDERLINE, exit_underline_mode);
        }
 
            TurnOff(A_UNDERLINE, exit_underline_mode);
        }
 

-       if (!SP || SP->_use_rmso) {
+       if (!SP_PARM || SP_PARM->_use_rmso) {

            TurnOff(A_STANDOUT, exit_standout_mode);
        }
            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);
        if (turn_off && exit_attribute_mode) {
            doPut(exit_attribute_mode);
            turn_on |= (newmode & ALL_BUT_COLOR);


@@ -205,6 +239,9 @@ vid_puts(attr_t newmode, short pair, void *opts GCC_UNUSED, int (*outc) (int))
        TurnOn(A_PROTECT,       enter_protected_mode);
        TurnOn(A_INVIS,         enter_secure_mode);
        TurnOn(A_UNDERLINE,     enter_underline_mode);
        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);
 #if USE_WIDEC_SUPPORT
        TurnOn(A_HORIZONTAL,    enter_horizontal_hl_mode);
        TurnOn(A_LEFT,          enter_left_hl_mode);


@@ -220,9 +257,9 @@ vid_puts(attr_t newmode, short pair, void *opts GCC_UNUSED, int (*outc) (int))
     if (reverse)
        newmode |= A_REVERSE;
 
     if (reverse)
        newmode |= A_REVERSE;
 

-    if (SP) {
-       SetAttr(SCREEN_ATTRS(SP), newmode);
-       SetPair(SCREEN_ATTRS(SP), pair);
+    if (SP_PARM) {
+       SetAttr(SCREEN_ATTRS(SP_PARM), newmode);
+       SetPair(SCREEN_ATTRS(SP_PARM), pair);

     } else {
        previous_attr = newmode;
        previous_pair = pair;
     } else {
        previous_attr = newmode;
        previous_pair = pair;


@@ -230,45 +267,86 @@ vid_puts(attr_t newmode, short pair, void *opts GCC_UNUSED, int (*outc) (int))
 
     returnCode(OK);
 #else
 
     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);
     set_color(newmode, pair);

-    returnCode(vidputs(newmode, outc));
+    returnCode(NCURSES_SP_NAME(vidputs) (NCURSES_SP_ARGx newmode, outc));

 #endif
 }
 
 #endif
 }
 

+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+vid_puts(attr_t newmode,
+        NCURSES_PAIRS_T pair,
+        void *opts GCC_UNUSED,
+        NCURSES_OUTC outc)
+{
+    SetSafeOutcWrapper(outc);
+    return NCURSES_SP_NAME(vid_puts) (CURRENT_SCREEN,
+                                     newmode,
+                                     pair,
+                                     opts,
+                                     _nc_outc_wrapper);
+}
+#endif
+

 #undef vid_attr
 NCURSES_EXPORT(int)
 #undef vid_attr
 NCURSES_EXPORT(int)

-vid_attr(attr_t newmode, short pair, void *opts)
+NCURSES_SP_NAME(vid_attr) (NCURSES_SP_DCLx
+                          attr_t newmode,
+                          NCURSES_PAIRS_T pair,
+                          void *opts)
+{
+    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_putchar)));
+}
+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+vid_attr(attr_t newmode, NCURSES_PAIRS_T pair, void *opts)

 {
 {

-    T((T_CALLED("vid_attr(%s,%d)"), _traceattr(newmode), pair));
-    returnCode(vid_puts(newmode, pair, opts, _nc_outch));
+    return NCURSES_SP_NAME(vid_attr) (CURRENT_SCREEN, newmode, pair, opts);

 }
 }

+#endif

 
 /*
  * This implementation uses the same mask values for A_xxx and WA_xxx, so
  * we can use termattrs() for part of the logic.
  */
 NCURSES_EXPORT(attr_t)
 
 /*
  * This implementation uses the same mask values for A_xxx and WA_xxx, so
  * we can use termattrs() for part of the logic.
  */
 NCURSES_EXPORT(attr_t)

-term_attrs(void)
+NCURSES_SP_NAME(term_attrs) (NCURSES_SP_DCL0)

 {
 {

-    attr_t attrs;
+    attr_t attrs = 0;

 
     T((T_CALLED("term_attrs()")));
 
     T((T_CALLED("term_attrs()")));

-    attrs = termattrs();
-
-    /* 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);
 }
 
     returnAttr(attrs);
 }

+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(attr_t)
+term_attrs(void)
+{
+    return NCURSES_SP_NAME(term_attrs) (CURRENT_SCREEN);
+}
+#endif