ncurses 5.9 - patch 20120303

[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 45cc89cb0d894ac7cadc65ed734ba7775dd5d33c..bd5f539672a7747d681d522d2aec3162ae755331 100644 (file)
--- a/ncurses/base/lib_slkatr_set.c
+++ b/ncurses/base/lib_slkatr_set.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2005,2009 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            *
@@ -28,28 +28,52 @@
 
 /****************************************************************************
  *  Author:  Juergen Pfeifer, 1998                                          *
+ *     and:  Thomas E. Dickey 2005-on                                       *
  ****************************************************************************/
 
 /*
  *     lib_slkatr_set.c
  *     Soft key routines.
- *      Set the labels attributes
+ *     Set the label's attributes
  */
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_slkatr_set.c,v 1.7 2003/10/25 15:27:03 tom Exp $")
+MODULE_ID("$Id: lib_slkatr_set.c,v 1.14 2009/10/24 22:47:03 tom Exp $")
 
 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)
 {
-    T((T_CALLED("slk_attr_set(%s,%d)"), _traceattr(attr), color_pair_number));
+    int code = ERR;
 
-    if (SP != 0 && SP->_slk != 0 && !opts &&
-       color_pair_number >= 0 && color_pair_number < COLOR_PAIRS) {
-       SP->_slk->attr = attr;
-       toggle_attr_on(SP->_slk->attr, COLOR_PAIR(color_pair_number));
-       returnCode(OK);
-    } else
-       returnCode(ERR);
+    T((T_CALLED("slk_attr_set(%p,%s,%d)"),
+       (void *) SP_PARM,
+       _traceattr(attr),
+       color_pair_number));
+
+    if (SP_PARM != 0
+       && SP_PARM->_slk != 0
+       && !opts
+       && color_pair_number >= 0
+       && 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) {
+           SetPair(SP_PARM->_slk->attr, color_pair_number);
+       }
+       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
+       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