ncurses 5.6 - patch 20070612

[ncurses.git] / ncurses / tty / lib_vidattr.c

diff --git a/ncurses/tty/lib_vidattr.c b/ncurses/tty/lib_vidattr.c
index 00611f4e15013195122794aa8f48e408c17d3a61..4bee100abe191e1d1645ab45bf6dd26686e72877 100644 (file)
--- a/ncurses/tty/lib_vidattr.c
+++ b/ncurses/tty/lib_vidattr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc.         *
+ * Copyright (c) 1998-2006,2007 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            *


@@ -29,6 +29,7 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *

+ *     and: Thomas E. Dickey                        1996 on                 *

  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*


@@ -64,7 +65,7 @@
 #include <curses.priv.h>
 #include <term.h>
 
 #include <curses.priv.h>
 #include <term.h>
 

-MODULE_ID("$Id: lib_vidattr.c,v 1.39 2001/08/26 00:40:46 Philippe.Blain Exp $")
+MODULE_ID("$Id: lib_vidattr.c,v 1.48 2007/04/21 23:25:38 tom Exp $")

 
 #define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc)
 
 
 #define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc)
 


@@ -86,11 +87,11 @@ MODULE_ID("$Id: lib_vidattr.c,v 1.39 2001/08/26 00:40:46 Philippe.Blain Exp $")
                } \
        }
 
                } \
        }
 

+#define PreviousAttr _nc_prescreen.previous_attr
+

 NCURSES_EXPORT(int)
 NCURSES_EXPORT(int)

-vidputs
-(chtype newmode, int (*outc) (int))
+vidputs(chtype newmode, int (*outc) (int))

 {
 {

-    static attr_t previous_attr = A_NORMAL;

     attr_t turn_on, turn_off;
     int pair;
     bool reverse = FALSE;
     attr_t turn_on, turn_off;
     int pair;
     bool reverse = FALSE;


@@ -105,15 +106,51 @@ vidputs
 
     /* this allows us to go on whether or not newterm() has been called */
     if (SP)
 
     /* this allows us to go on whether or not newterm() has been called */
     if (SP)

-       previous_attr = SP->_current_attr;
+       PreviousAttr = AttrOf(SCREEN_ATTRS(SP));

 
 

-    TR(TRACE_ATTRS, ("previous attribute was %s", _traceattr(previous_attr)));
+    TR(TRACE_ATTRS, ("previous attribute was %s", _traceattr(PreviousAttr)));

 
 

-#if !USE_XMC_SUPPORT

     if ((SP != 0)
     if ((SP != 0)

-       && (magic_cookie_glitch > 0))
+       && (magic_cookie_glitch > 0)) {
+#if USE_XMC_SUPPORT
+       static const chtype table[] =
+       {
+           A_STANDOUT,
+           A_UNDERLINE,
+           A_REVERSE,
+           A_BLINK,
+           A_DIM,
+           A_BOLD,
+           A_INVIS,
+           A_PROTECT,
+       };
+       unsigned n;
+       int used = 0;
+       int limit = (max_attributes <= 0) ? 1 : max_attributes;
+       chtype retain = 0;
+
+       /*
+        * Limit the number of attribute bits set in the newmode according to
+        * the terminfo max_attributes value.
+        */
+       for (n = 0; n < SIZEOF(table); ++n) {
+           if ((table[n] & SP->_ok_attributes) == 0) {
+               newmode &= ~table[n];
+           } else if ((table[n] & newmode) != 0) {
+               if (used++ >= limit) {
+                   newmode &= ~table[n];
+                   if (newmode == retain)
+                       break;
+               } else {
+                   retain = newmode;
+               }
+           }
+       }
+#else

        newmode &= ~(SP->_xmc_suppress);
 #endif
        newmode &= ~(SP->_xmc_suppress);
 #endif

+       TR(TRACE_ATTRS, ("suppressed attribute is %s", _traceattr(newmode)));
+    }

 
     /*
      * If we have a terminal that cannot combine color with video
 
     /*
      * If we have a terminal that cannot combine color with video


@@ -147,7 +184,7 @@ vidputs
        newmode &= ~mask;
     }
 
        newmode &= ~mask;
     }
 

-    if (newmode == previous_attr)
+    if (newmode == PreviousAttr)

        returnCode(OK);
 
     pair = PAIR_NUMBER(newmode);
        returnCode(OK);
 
     pair = PAIR_NUMBER(newmode);


@@ -156,17 +193,17 @@ vidputs
        newmode &= ~A_REVERSE;
     }
 
        newmode &= ~A_REVERSE;
     }
 

-    turn_off = (~newmode & previous_attr) & ALL_BUT_COLOR;
-    turn_on = (newmode & ~previous_attr) & ALL_BUT_COLOR;
+    turn_off = (~newmode & PreviousAttr) & ALL_BUT_COLOR;
+    turn_on = (newmode & ~PreviousAttr) & ALL_BUT_COLOR;

 
 

-    SetColorsIf(((pair == 0) && !fix_pair0), previous_attr);
+    SetColorsIf(((pair == 0) && !fix_pair0), PreviousAttr);

 
     if (newmode == A_NORMAL) {
 
     if (newmode == A_NORMAL) {

-       if ((previous_attr & A_ALTCHARSET) && exit_alt_charset_mode) {
+       if ((PreviousAttr & A_ALTCHARSET) && exit_alt_charset_mode) {

            doPut(exit_alt_charset_mode);
            doPut(exit_alt_charset_mode);

-           previous_attr &= ~A_ALTCHARSET;
+           PreviousAttr &= ~A_ALTCHARSET;

        }
        }

-       if (previous_attr) {
+       if (PreviousAttr) {

            if (exit_attribute_mode) {
                doPut(exit_attribute_mode);
            } else {
            if (exit_attribute_mode) {
                doPut(exit_attribute_mode);
            } else {


@@ -177,10 +214,10 @@ vidputs
                    TurnOff(A_STANDOUT, exit_standout_mode);
                }
            }
                    TurnOff(A_STANDOUT, exit_standout_mode);
                }
            }

-           previous_attr &= ~A_COLOR;
+           PreviousAttr &= ALL_BUT_COLOR;

        }
 
        }
 

-       SetColorsIf((pair != 0) || fix_pair0, previous_attr);
+       SetColorsIf((pair != 0) || fix_pair0, PreviousAttr);

     } 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");


@@ -194,9 +231,9 @@ vidputs
                        (newmode & A_INVIS) != 0,
                        (newmode & A_PROTECT) != 0,
                        (newmode & A_ALTCHARSET) != 0), 1, outc);
                        (newmode & A_INVIS) != 0,
                        (newmode & A_PROTECT) != 0,
                        (newmode & A_ALTCHARSET) != 0), 1, outc);

-           previous_attr &= ~A_COLOR;
+           PreviousAttr &= ALL_BUT_COLOR;

        }
        }

-       SetColorsIf((pair != 0) || fix_pair0, previous_attr);
+       SetColorsIf((pair != 0) || fix_pair0, PreviousAttr);

     } else {
 
        TR(TRACE_ATTRS, ("turning %s off", _traceattr(turn_off)));
     } else {
 
        TR(TRACE_ATTRS, ("turning %s off", _traceattr(turn_off)));


@@ -213,10 +250,10 @@ vidputs
 
        if (turn_off && exit_attribute_mode) {
            doPut(exit_attribute_mode);
 
        if (turn_off && exit_attribute_mode) {
            doPut(exit_attribute_mode);

-           turn_on |= (newmode & (chtype) (~A_COLOR));
-           previous_attr &= ~A_COLOR;
+           turn_on |= (newmode & ALL_BUT_COLOR);
+           PreviousAttr &= ALL_BUT_COLOR;

        }
        }

-       SetColorsIf((pair != 0) || fix_pair0, previous_attr);
+       SetColorsIf((pair != 0) || fix_pair0, PreviousAttr);

 
        TR(TRACE_ATTRS, ("turning %s on", _traceattr(turn_on)));
        /* *INDENT-OFF* */
 
        TR(TRACE_ATTRS, ("turning %s on", _traceattr(turn_on)));
        /* *INDENT-OFF* */


@@ -229,22 +266,12 @@ vidputs
        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);

-#ifdef enter_horizontal_hl_mode
+#if USE_WIDEC_SUPPORT

        TurnOn(A_HORIZONTAL,    enter_horizontal_hl_mode);
        TurnOn(A_HORIZONTAL,    enter_horizontal_hl_mode);

-#endif
-#ifdef enter_left_hl_mode

        TurnOn(A_LEFT,          enter_left_hl_mode);
        TurnOn(A_LEFT,          enter_left_hl_mode);

-#endif
-#ifdef enter_low_hl_mode

        TurnOn(A_LOW,           enter_low_hl_mode);
        TurnOn(A_LOW,           enter_low_hl_mode);

-#endif
-#ifdef enter_right_hl_mode

        TurnOn(A_RIGHT,         enter_right_hl_mode);
        TurnOn(A_RIGHT,         enter_right_hl_mode);

-#endif
-#ifdef enter_top_hl_mode

        TurnOn(A_TOP,           enter_top_hl_mode);
        TurnOn(A_TOP,           enter_top_hl_mode);

-#endif
-#ifdef enter_vertical_hl_mode

        TurnOn(A_VERTICAL,      enter_vertical_hl_mode);
 #endif
        /* *INDENT-ON* */
        TurnOn(A_VERTICAL,      enter_vertical_hl_mode);
 #endif
        /* *INDENT-ON* */


@@ -255,9 +282,9 @@ vidputs
        newmode |= A_REVERSE;
 
     if (SP)
        newmode |= A_REVERSE;
 
     if (SP)

-       SP->_current_attr = newmode;
+       SetAttr(SCREEN_ATTRS(SP), newmode);

     else
     else

-       previous_attr = newmode;
+       PreviousAttr = newmode;

 
     returnCode(OK);
 }
 
     returnCode(OK);
 }