ncurses 5.6 - patch 20070630

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

diff --git a/ncurses/tty/lib_vidattr.c b/ncurses/tty/lib_vidattr.c
index afcc79718cbd4ad5eed17415c850f3207ea374bb..ac2a74f08e015924d7010775770972df27947935 100644 (file)
--- a/ncurses/tty/lib_vidattr.c
+++ b/ncurses/tty/lib_vidattr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2004,2005 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            *
@@ -65,7 +65,7 @@
 #include <curses.priv.h>
 #include <term.h>
 
-MODULE_ID("$Id: lib_vidattr.c,v 1.44 2005/01/22 22:15:44 tom Exp $")
+MODULE_ID("$Id: lib_vidattr.c,v 1.49 2007/06/30 21:58:04 tom Exp $")
 
 #define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc)
 
@@ -87,10 +87,11 @@ MODULE_ID("$Id: lib_vidattr.c,v 1.44 2005/01/22 22:15:44 tom Exp $")
                } \
        }
 
+#define PreviousAttr _nc_prescreen.previous_attr
+
 NCURSES_EXPORT(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;
@@ -101,19 +102,56 @@ vidputs(chtype newmode, int (*outc) (int))
 #define fix_pair0 FALSE
 #endif
 
+    newmode &= A_ATTRIBUTES;
     T((T_CALLED("vidputs(%s)"), _traceattr(newmode)));
 
     /* this allows us to go on whether or not newterm() has been called */
     if (SP)
-       previous_attr = AttrOf(SCREEN_ATTRS(SP));
+       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)
-       && (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
+       TR(TRACE_ATTRS, ("suppressed attribute is %s", _traceattr(newmode)));
+    }
 
     /*
      * If we have a terminal that cannot combine color with video
@@ -147,7 +185,7 @@ vidputs(chtype newmode, int (*outc) (int))
        newmode &= ~mask;
     }
 
-    if (newmode == previous_attr)
+    if (newmode == PreviousAttr)
        returnCode(OK);
 
     pair = PAIR_NUMBER(newmode);
@@ -156,17 +194,17 @@ vidputs(chtype newmode, int (*outc) (int))
        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 ((previous_attr & A_ALTCHARSET) && exit_alt_charset_mode) {
+       if ((PreviousAttr & A_ALTCHARSET) && 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 {
@@ -177,10 +215,10 @@ vidputs(chtype newmode, int (*outc) (int))
                    TurnOff(A_STANDOUT, exit_standout_mode);
                }
            }
-           previous_attr &= ALL_BUT_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");
@@ -194,9 +232,9 @@ vidputs(chtype newmode, int (*outc) (int))
                        (newmode & A_INVIS) != 0,
                        (newmode & A_PROTECT) != 0,
                        (newmode & A_ALTCHARSET) != 0), 1, outc);
-           previous_attr &= ALL_BUT_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)));
@@ -214,9 +252,9 @@ vidputs(chtype newmode, int (*outc) (int))
        if (turn_off && exit_attribute_mode) {
            doPut(exit_attribute_mode);
            turn_on |= (newmode & ALL_BUT_COLOR);
-           previous_attr &= 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* */
@@ -247,7 +285,7 @@ vidputs(chtype newmode, int (*outc) (int))
     if (SP)
        SetAttr(SCREEN_ATTRS(SP), newmode);
     else
-       previous_attr = newmode;
+       PreviousAttr = newmode;
 
     returnCode(OK);
 }