ncurses 5.9 - patch 20130112

[ncurses.git] / ncurses / widechar / lib_vid_attr.c

diff --git a/ncurses/widechar/lib_vid_attr.c b/ncurses/widechar/lib_vid_attr.c
index 0b5648b0fef782917376fa6fa1216b40b51b044f..c752c1d149703e78a8cefe238f4281d592f18d4c 100644 (file)
--- a/ncurses/widechar/lib_vid_attr.c
+++ b/ncurses/widechar/lib_vid_attr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -31,11 +31,14 @@
  ****************************************************************************/
 
 #include <curses.priv.h>
  ****************************************************************************/
 
 #include <curses.priv.h>

-#include <term.h>

 
 

-MODULE_ID("$Id: lib_vid_attr.c,v 1.7 2009/05/02 23:30:44 tom Exp $")
+#ifndef CUR
+#define CUR SP_TERMTYPE
+#endif
+
+MODULE_ID("$Id: lib_vid_attr.c,v 1.17 2013/01/12 18:01:35 tom Exp $")

 
 

-#define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc)
+#define doPut(mode) TPUTS_TRACE(#mode); NCURSES_SP_NAME(tputs)(NCURSES_SP_ARGx mode, 1, outc)

 
 #define TurnOn(mask,mode) \
        if ((turn_on & mask) && mode) { doPut(mode); }
 
 #define TurnOn(mask,mode) \
        if ((turn_on & mask) && mode) { doPut(mode); }


@@ -50,18 +53,22 @@ MODULE_ID("$Id: lib_vid_attr.c,v 1.7 2009/05/02 23:30:44 tom Exp $")
                if ((pair != old_pair) \
                 || (fix_pair0 && (pair == 0)) \
                 || (reverse ^ ((old_attr & A_REVERSE) != 0))) { \
                if ((pair != old_pair) \
                 || (fix_pair0 && (pair == 0)) \
                 || (reverse ^ ((old_attr & A_REVERSE) != 0))) { \

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

                } \
        }
 
                } \
        }
 

-#define set_color(mode, pair) mode &= ALL_BUT_COLOR; mode |= COLOR_PAIR(pair)
+#define set_color(mode, pair) \
+       mode &= ALL_BUT_COLOR; \
+       mode |= (attr_t) ColorPair(pair)

 
 NCURSES_EXPORT(int)
 
 NCURSES_EXPORT(int)

-NCURSES_SP_NAME(vid_puts)(NCURSES_SP_DCLx
-                         attr_t newmode,
-                         short pair,
-                         void *opts GCC_UNUSED,
-                         int (*outc) (int))
+NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
+                          attr_t newmode,
+                          short pair,
+                          void *opts GCC_UNUSED,
+                          NCURSES_SP_OUTC outc)

 {
 #if NCURSES_EXT_COLORS
     static attr_t previous_attr = A_NORMAL;
 {
 #if NCURSES_EXT_COLORS
     static attr_t previous_attr = A_NORMAL;


@@ -113,7 +120,7 @@ NCURSES_SP_NAME(vid_puts)(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);


@@ -163,16 +170,18 @@ NCURSES_SP_NAME(vid_puts)(NCURSES_SP_DCLx
     } 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");

-           tputs(TPARM_9(set_attributes,
-                         (newmode & A_STANDOUT) != 0,
-                         (newmode & A_UNDERLINE) != 0,
-                         (newmode & A_REVERSE) != 0,
-                         (newmode & A_BLINK) != 0,
-                         (newmode & A_DIM) != 0,
-                         (newmode & A_BOLD) != 0,
-                         (newmode & A_INVIS) != 0,
-                         (newmode & A_PROTECT) != 0,
-                         (newmode & A_ALTCHARSET) != 0), 1, outc);
+           NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
+                                   TPARM_9(set_attributes,
+                                           (newmode & A_STANDOUT) != 0,
+                                           (newmode & A_UNDERLINE) != 0,
+                                           (newmode & A_REVERSE) != 0,
+                                           (newmode & A_BLINK) != 0,
+                                           (newmode & A_DIM) != 0,
+                                           (newmode & A_BOLD) != 0,
+                                           (newmode & A_INVIS) != 0,
+                                           (newmode & A_PROTECT) != 0,
+                                           (newmode & A_ALTCHARSET) != 0),
+                                   1, outc);

            previous_attr &= ALL_BUT_COLOR;
            previous_pair = 0;
        }
            previous_attr &= ALL_BUT_COLOR;
            previous_pair = 0;
        }


@@ -237,10 +246,26 @@ NCURSES_SP_NAME(vid_puts)(NCURSES_SP_DCLx
 #else
     T((T_CALLED("vid_puts(%s,%d)"), _traceattr(newmode), pair));
     set_color(newmode, pair);
 #else
     T((T_CALLED("vid_puts(%s,%d)"), _traceattr(newmode), pair));
     set_color(newmode, pair);

-    returnCode(vidputs(newmode, outc));
+    returnCode(NCURSES_SP_NAME(vidputs) (NCURSES_SP_ARGx newmode, outc));

 #endif
 }
 
 #endif
 }
 

+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+vid_puts(attr_t newmode,
+        short pair,
+        void *opts GCC_UNUSED,
+        NCURSES_OUTC outc)
+{
+    SetSafeOutcWrapper(outc);
+    return NCURSES_SP_NAME(vid_puts) (CURRENT_SCREEN,
+                                     newmode,
+                                     pair,
+                                     opts,
+                                     _nc_outc_wrapper);
+}
+#endif
+

 #undef vid_attr
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(vid_attr) (NCURSES_SP_DCLx
 #undef vid_attr
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(vid_attr) (NCURSES_SP_DCLx


@@ -249,16 +274,14 @@ NCURSES_SP_NAME(vid_attr) (NCURSES_SP_DCLx
                           void *opts)
 {
     T((T_CALLED("vid_attr(%s,%d)"), _traceattr(newmode), pair));
                           void *opts)
 {
     T((T_CALLED("vid_attr(%s,%d)"), _traceattr(newmode), pair));

-    returnCode(vid_puts(newmode, pair, opts, _nc_outch));
+    returnCode(NCURSES_SP_NAME(vid_puts) (NCURSES_SP_ARGx
+                                         newmode,
+                                         pair,
+                                         opts,
+                                         NCURSES_SP_NAME(_nc_putchar)));

 }
 
 #if NCURSES_SP_FUNCS
 }
 
 #if NCURSES_SP_FUNCS

-NCURSES_EXPORT(int)
-vid_puts(attr_t newmode, short pair, void *opts GCC_UNUSED, int (*outc) (int))
-{
-    return NCURSES_SP_NAME(vid_puts) (CURRENT_SCREEN, newmode, pair, opts, outc);
-}
-

 NCURSES_EXPORT(int)
 vid_attr(attr_t newmode, short pair, void *opts)
 {
 NCURSES_EXPORT(int)
 vid_attr(attr_t newmode, short pair, void *opts)
 {


@@ -271,26 +294,36 @@ vid_attr(attr_t newmode, short pair, void *opts)
  * we can use termattrs() for part of the logic.
  */
 NCURSES_EXPORT(attr_t)
  * we can use termattrs() for part of the logic.
  */
 NCURSES_EXPORT(attr_t)

-term_attrs(void)
+NCURSES_SP_NAME(term_attrs) (NCURSES_SP_DCL0)

 {
 {

-    attr_t attrs;
+    attr_t attrs = 0;

 
     T((T_CALLED("term_attrs()")));
 
     T((T_CALLED("term_attrs()")));

-    attrs = termattrs();
-
-    /* these are only supported for wide-character mode */
-    if (enter_horizontal_hl_mode)
-       attrs |= WA_HORIZONTAL;
-    if (enter_left_hl_mode)
-       attrs |= WA_LEFT;
-    if (enter_low_hl_mode)
-       attrs |= WA_LOW;
-    if (enter_right_hl_mode)
-       attrs |= WA_RIGHT;
-    if (enter_top_hl_mode)
-       attrs |= WA_TOP;
-    if (enter_vertical_hl_mode)
-       attrs |= WA_VERTICAL;
+    if (SP_PARM) {
+       attrs = NCURSES_SP_NAME(termattrs) (NCURSES_SP_ARG);
+
+       /* these are only supported for wide-character mode */
+       if (enter_horizontal_hl_mode)
+           attrs |= WA_HORIZONTAL;
+       if (enter_left_hl_mode)
+           attrs |= WA_LEFT;
+       if (enter_low_hl_mode)
+           attrs |= WA_LOW;
+       if (enter_right_hl_mode)
+           attrs |= WA_RIGHT;
+       if (enter_top_hl_mode)
+           attrs |= WA_TOP;
+       if (enter_vertical_hl_mode)
+           attrs |= WA_VERTICAL;
+    }

 
     returnAttr(attrs);
 }
 
     returnAttr(attrs);
 }

+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(attr_t)
+term_attrs(void)
+{
+    return NCURSES_SP_NAME(term_attrs) (CURRENT_SCREEN);
+}
+#endif