ncurses 5.7 - patch 20100206

[ncurses.git] / ncurses / base / lib_slkatr_set.c

diff --git a/ncurses/base/lib_slkatr_set.c b/ncurses/base/lib_slkatr_set.c
index 9a5709f37f3a0ab7dc5f04ef26aca7e9ec378e87..bd5f539672a7747d681d522d2aec3162ae755331 100644 (file)
--- a/ncurses/base/lib_slkatr_set.c
+++ b/ncurses/base/lib_slkatr_set.c
@@ -38,27 +38,42 @@
  */
 #include <curses.priv.h>
 
  */
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_slkatr_set.c,v 1.11 2009/01/25 00:47:15 tom Exp $")
+MODULE_ID("$Id: lib_slkatr_set.c,v 1.14 2009/10/24 22:47:03 tom Exp $")

 
 NCURSES_EXPORT(int)
 
 NCURSES_EXPORT(int)

-slk_attr_set(const attr_t attr, short color_pair_number, void *opts)
+NCURSES_SP_NAME(slk_attr_set) (NCURSES_SP_DCLx
+                              const attr_t attr,
+                              short color_pair_number,
+                              void *opts)

 {
     int code = ERR;
 
 {
     int code = ERR;
 

-    T((T_CALLED("slk_attr_set(%s,%d)"), _traceattr(attr), color_pair_number));
+    T((T_CALLED("slk_attr_set(%p,%s,%d)"),
+       (void *) SP_PARM,
+       _traceattr(attr),
+       color_pair_number));

 
 

-    if (SP != 0
-       && SP->_slk != 0
+    if (SP_PARM != 0
+       && SP_PARM->_slk != 0

        && !opts
        && color_pair_number >= 0
        && !opts
        && color_pair_number >= 0

-       && color_pair_number < SP->_pair_limit) {
-       TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP->_slk->attr))));
-       SetAttr(SP->_slk->attr, attr);
+       && color_pair_number < SP_PARM->_pair_limit) {
+       TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
+       SetAttr(SP_PARM->_slk->attr, attr);

        if (color_pair_number > 0) {
        if (color_pair_number > 0) {

-           SetPair(SP->_slk->attr, color_pair_number);
+           SetPair(SP_PARM->_slk->attr, color_pair_number);

        }
        }

-       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr))));
+       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));

        code = OK;
     }
     returnCode(code);
 }
        code = OK;
     }
     returnCode(code);
 }

+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+slk_attr_set(const attr_t attr, short color_pair_number, void *opts)
+{
+    return NCURSES_SP_NAME(slk_attr_set) (CURRENT_SCREEN, attr,
+                                         color_pair_number, opts);
+}
+#endif