ncurses 5.9 - patch 20130525

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

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

- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2011,2013 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            *


@@ -69,7 +69,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
 #define CUR SP_TERMTYPE
 #endif
 

-MODULE_ID("$Id: lib_vidattr.c,v 1.60 2010/03/31 23:38:02 tom Exp $")
+MODULE_ID("$Id: lib_vidattr.c,v 1.63 2013/01/12 18:00:54 tom Exp $")

 
 #define doPut(mode) \
        TPUTS_TRACE(#mode); \
 
 #define doPut(mode) \
        TPUTS_TRACE(#mode); \


@@ -90,7 +90,9 @@ MODULE_ID("$Id: lib_vidattr.c,v 1.60 2010/03/31 23:38:02 tom Exp $")
                 || (fix_pair0 && (pair == 0)) \
                 || (reverse ^ ((old_attr & A_REVERSE) != 0))) { \
                     NCURSES_SP_NAME(_nc_do_color)(NCURSES_SP_ARGx \
                 || (fix_pair0 && (pair == 0)) \
                 || (reverse ^ ((old_attr & A_REVERSE) != 0))) { \
                     NCURSES_SP_NAME(_nc_do_color)(NCURSES_SP_ARGx \

-                                    old_pair, pair, reverse, outc); \
+                                    (short) old_pair, \
+                                    (short) pair, \
+                                    reverse, outc); \

                } \
        }
 
                } \
        }
 


@@ -185,7 +187,7 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
         * 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);


@@ -322,7 +324,7 @@ NCURSES_SP_NAME(vidattr) (NCURSES_SP_DCLx chtype newmode)
     T((T_CALLED("vidattr(%p,%s)"), (void *) SP_PARM, _traceattr(newmode)));
     returnCode(NCURSES_SP_NAME(vidputs) (NCURSES_SP_ARGx
                                         newmode,
     T((T_CALLED("vidattr(%p,%s)"), (void *) SP_PARM, _traceattr(newmode)));
     returnCode(NCURSES_SP_NAME(vidputs) (NCURSES_SP_ARGx
                                         newmode,

-                                        NCURSES_SP_NAME(_nc_outch)));
+                                        NCURSES_SP_NAME(_nc_putchar)));

 }
 
 #if NCURSES_SP_FUNCS
 }
 
 #if NCURSES_SP_FUNCS


@@ -339,42 +341,44 @@ NCURSES_SP_NAME(termattrs) (NCURSES_SP_DCL0)
     chtype attrs = A_NORMAL;
 
     T((T_CALLED("termattrs(%p)"), (void *) SP_PARM));
     chtype attrs = A_NORMAL;
 
     T((T_CALLED("termattrs(%p)"), (void *) SP_PARM));

+
+    if (HasTerminal(SP_PARM)) {

 #ifdef USE_TERM_DRIVER
 #ifdef USE_TERM_DRIVER

-    if (HasTerminal(SP_PARM))

        attrs = CallDriver(SP_PARM, conattr);
 #else
 
        attrs = CallDriver(SP_PARM, conattr);
 #else
 

-    if (enter_alt_charset_mode)
-       attrs |= A_ALTCHARSET;
+       if (enter_alt_charset_mode)
+           attrs |= A_ALTCHARSET;

 
 

-    if (enter_blink_mode)
-       attrs |= A_BLINK;
+       if (enter_blink_mode)
+           attrs |= A_BLINK;

 
 

-    if (enter_bold_mode)
-       attrs |= A_BOLD;
+       if (enter_bold_mode)
+           attrs |= A_BOLD;

 
 

-    if (enter_dim_mode)
-       attrs |= A_DIM;
+       if (enter_dim_mode)
+           attrs |= A_DIM;

 
 

-    if (enter_reverse_mode)
-       attrs |= A_REVERSE;
+       if (enter_reverse_mode)
+           attrs |= A_REVERSE;

 
 

-    if (enter_standout_mode)
-       attrs |= A_STANDOUT;
+       if (enter_standout_mode)
+           attrs |= A_STANDOUT;

 
 

-    if (enter_protected_mode)
-       attrs |= A_PROTECT;
+       if (enter_protected_mode)
+           attrs |= A_PROTECT;

 
 

-    if (enter_secure_mode)
-       attrs |= A_INVIS;
+       if (enter_secure_mode)
+           attrs |= A_INVIS;

 
 

-    if (enter_underline_mode)
-       attrs |= A_UNDERLINE;
+       if (enter_underline_mode)
+           attrs |= A_UNDERLINE;

 
 

-    if (SP_PARM->_coloron)
-       attrs |= A_COLOR;
+       if (SP_PARM->_coloron)
+           attrs |= A_COLOR;

 
 #endif
 
 #endif

+    }

     returnChtype(attrs);
 }
 
     returnChtype(attrs);
 }