ncurses 5.7 - patch 20100403

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

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

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


@@ -64,13 +64,12 @@
  */
 
 #include <curses.priv.h>
  */
 
 #include <curses.priv.h>

-#include <term.h>

 
 #ifndef CUR
 
 #ifndef CUR

-#define CUR SP_TERMTYPE 
+#define CUR SP_TERMTYPE

 #endif
 
 #endif
 

-MODULE_ID("$Id: lib_vidattr.c,v 1.56 2009/05/10 00:48:29 tom Exp $")
+MODULE_ID("$Id: lib_vidattr.c,v 1.60 2010/03/31 23:38:02 tom Exp $")

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


@@ -85,13 +84,13 @@ MODULE_ID("$Id: lib_vidattr.c,v 1.56 2009/05/10 00:48:29 tom Exp $")
        /* if there is no current screen, assume we *can* do color */
 #define SetColorsIf(why,old_attr) \
        if (can_color && (why)) { \
        /* if there is no current screen, assume we *can* do color */
 #define SetColorsIf(why,old_attr) \
        if (can_color && (why)) { \

-               int old_pair = PAIR_NUMBER(old_attr); \
+               int old_pair = PairNumber(old_attr); \

                TR(TRACE_ATTRS, ("old pair = %d -- new pair = %d", old_pair, pair)); \
                if ((pair != old_pair) \
                 || (fix_pair0 && (pair == 0)) \
                 || (reverse ^ ((old_attr & A_REVERSE) != 0))) { \
                TR(TRACE_ATTRS, ("old pair = %d -- new pair = %d", old_pair, pair)); \
                if ((pair != old_pair) \
                 || (fix_pair0 && (pair == 0)) \
                 || (reverse ^ ((old_attr & A_REVERSE) != 0))) { \

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

                } \
        }
 
                } \
        }
 


@@ -113,7 +112,11 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
 #endif
 
     newmode &= A_ATTRIBUTES;
 #endif
 
     newmode &= A_ATTRIBUTES;

-    T((T_CALLED("vidputs(%s)"), _traceattr(newmode)));
+
+    T((T_CALLED("vidputs(%p,%s)"), (void *) SP_PARM, _traceattr(newmode)));
+
+    if (!IsTermInfo(SP_PARM))
+       returnCode(ERR);

 
     /* this allows us to go on whether or not newterm() has been called */
     if (SP_PARM)
 
     /* this allows us to go on whether or not newterm() has been called */
     if (SP_PARM)


@@ -198,7 +201,7 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
     if (newmode == PreviousAttr)
        returnCode(OK);
 
     if (newmode == PreviousAttr)
        returnCode(OK);
 

-    pair = PAIR_NUMBER(newmode);
+    pair = PairNumber(newmode);

 
     if (reverse) {
        newmode &= ~A_REVERSE;
 
     if (reverse) {
        newmode &= ~A_REVERSE;


@@ -302,29 +305,31 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
     returnCode(OK);
 }
 
     returnCode(OK);
 }
 

+#if NCURSES_SP_FUNCS

 NCURSES_EXPORT(int)
 NCURSES_EXPORT(int)

-NCURSES_SP_NAME(vidattr) (NCURSES_SP_DCLx
-                         chtype newmode)
+vidputs(chtype newmode, NCURSES_OUTC outc)

 {
 {

-    return NCURSES_SP_NAME(vidputs) (NCURSES_SP_ARGx
+    SetSafeOutcWrapper(outc);
+    return NCURSES_SP_NAME(vidputs) (CURRENT_SCREEN,

                                     newmode,
                                     newmode,

-                                    NCURSES_SP_NAME(_nc_outch));
+                                    _nc_outc_wrapper);

 }
 }

+#endif

 
 

-#if NCURSES_SP_FUNCS

 NCURSES_EXPORT(int)
 NCURSES_EXPORT(int)

-vidputs(chtype newmode, NCURSES_OUTC outc)
+NCURSES_SP_NAME(vidattr) (NCURSES_SP_DCLx chtype newmode)

 {
 {

-    SetSafeOutcWrapper(outc);
-    return NCURSES_SP_NAME(vidputs) (CURRENT_SCREEN, newmode, _nc_outc_wrapper);
+    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)));

 }
 
 }
 

+#if NCURSES_SP_FUNCS

 NCURSES_EXPORT(int)
 vidattr(chtype newmode)
 {
 NCURSES_EXPORT(int)
 vidattr(chtype newmode)
 {

-    T((T_CALLED("vidattr(%s)"), _traceattr(newmode)));
-
-    returnCode(vidputs(newmode, _nc_outch));
+    return NCURSES_SP_NAME(vidattr) (CURRENT_SCREEN, newmode);

 }
 #endif
 
 }
 #endif
 


@@ -333,7 +338,12 @@ NCURSES_SP_NAME(termattrs) (NCURSES_SP_DCL0)
 {
     chtype attrs = A_NORMAL;
 
 {
     chtype attrs = A_NORMAL;
 

-    T((T_CALLED("termattrs()")));
+    T((T_CALLED("termattrs(%p)"), (void *) SP_PARM));
+#ifdef USE_TERM_DRIVER
+    if (HasTerminal(SP_PARM))
+       attrs = CallDriver(SP_PARM, conattr);
+#else
+

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


@@ -364,6 +374,7 @@ NCURSES_SP_NAME(termattrs) (NCURSES_SP_DCL0)
     if (SP_PARM->_coloron)
        attrs |= A_COLOR;
 
     if (SP_PARM->_coloron)
        attrs |= A_COLOR;
 

+#endif

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