ncurses 5.6 - patch 20070421

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

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

- * Copyright (c) 1998-2005,2006 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            *


@@ -65,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.46 2006/01/21 23:39:40 tom 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)
 


@@ -87,10 +87,11 @@ MODULE_ID("$Id: lib_vidattr.c,v 1.46 2006/01/21 23:39:40 tom Exp $")
                } \
        }
 
                } \
        }
 

+#define PreviousAttr _nc_prescreen.previous_attr
+

 NCURSES_EXPORT(int)
 vidputs(chtype newmode, int (*outc) (int))
 {
 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;
     attr_t turn_on, turn_off;
     int pair;
     bool reverse = FALSE;


@@ -105,14 +106,14 @@ vidputs(chtype newmode, int (*outc) (int))
 
     /* 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 = 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 ((SP != 0)
        && (magic_cookie_glitch > 0)) {
 #if USE_XMC_SUPPORT
 
     if ((SP != 0)
        && (magic_cookie_glitch > 0)) {
 #if USE_XMC_SUPPORT

-       static chtype table[] =
+       static const chtype table[] =

        {
            A_STANDOUT,
            A_UNDERLINE,
        {
            A_STANDOUT,
            A_UNDERLINE,


@@ -183,7 +184,7 @@ vidputs(chtype newmode, int (*outc) (int))
        newmode &= ~mask;
     }
 
        newmode &= ~mask;
     }
 

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

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


@@ -192,17 +193,17 @@ vidputs(chtype newmode, int (*outc) (int))
        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 {


@@ -213,10 +214,10 @@ vidputs(chtype newmode, int (*outc) (int))
                    TurnOff(A_STANDOUT, exit_standout_mode);
                }
            }
                    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");
     } else if (set_attributes) {
        if (turn_on || turn_off) {
            TPUTS_TRACE("set_attributes");


@@ -230,9 +231,9 @@ vidputs(chtype newmode, int (*outc) (int))
                        (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 &= 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)));
     } else {
 
        TR(TRACE_ATTRS, ("turning %s off", _traceattr(turn_off)));


@@ -250,9 +251,9 @@ vidputs(chtype newmode, int (*outc) (int))
        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);

-           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* */
 
        TR(TRACE_ATTRS, ("turning %s on", _traceattr(turn_on)));
        /* *INDENT-OFF* */


@@ -283,7 +284,7 @@ vidputs(chtype newmode, int (*outc) (int))
     if (SP)
        SetAttr(SCREEN_ATTRS(SP), newmode);
     else
     if (SP)
        SetAttr(SCREEN_ATTRS(SP), newmode);
     else

-       previous_attr = newmode;
+       PreviousAttr = newmode;

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