ncurses 5.6 - patch 20080308

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

diff --git a/ncurses/base/lib_slkattr.c b/ncurses/base/lib_slkattr.c
index 5044a08d727adf644fa243b1965665d3f0ee8701..da82ee5b623ec64fbbd5419092c6cb8122046003 100644 (file)
--- a/ncurses/base/lib_slkattr.c
+++ b/ncurses/base/lib_slkattr.c
@@ -27,8 +27,8 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
- *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *  Author:  Juergen Pfeifer, 1997                                          *
+ *     and:  Thomas E. Dickey 2005                                          *
  ****************************************************************************/
 
 /*
@@ -38,7 +38,7 @@
  */
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_slkattr.c,v 1.5 2000/12/10 02:43:27 tom Exp $")
+MODULE_ID("$Id: lib_slkattr.c,v 1.6 2005/01/08 21:44:28 tom Exp $")
 
 NCURSES_EXPORT(attr_t)
 slk_attr(void)
@@ -46,7 +46,11 @@ slk_attr(void)
     T((T_CALLED("slk_attr()")));
 
     if (SP != 0 && SP->_slk != 0) {
-       returnAttr(SP->_slk->attr);
+       attr_t result = AttrOf(SP->_slk->attr) & ALL_BUT_COLOR;
+       int pair = GetPair(SP->_slk->attr);
+
+       result |= COLOR_PAIR(pair);
+       returnAttr(result);
     } else
        returnAttr(0);
 }