ncurses 5.7 - patch 20100403

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

diff --git a/ncurses/base/lib_slkattr.c b/ncurses/base/lib_slkattr.c
index 5044a08d727adf644fa243b1965665d3f0ee8701..9dd2ec8cc983b5dfcbcbf8cca633a2db27ab50ac 100644 (file)
--- a/ncurses/base/lib_slkattr.c
+++ b/ncurses/base/lib_slkattr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998,2000 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            *
@@ -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,15 +38,27 @@
  */
 #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.10 2010/03/31 23:38:02 tom Exp $")
 
 NCURSES_EXPORT(attr_t)
-slk_attr(void)
+NCURSES_SP_NAME(slk_attr) (NCURSES_SP_DCL0)
 {
-    T((T_CALLED("slk_attr()")));
+    T((T_CALLED("slk_attr(%p)"), (void *) SP_PARM));
+
+    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
+       attr_t result = AttrOf(SP_PARM->_slk->attr) & ALL_BUT_COLOR;
+       int pair = GetPair(SP_PARM->_slk->attr);
 
-    if (SP != 0 && SP->_slk != 0) {
-       returnAttr(SP->_slk->attr);
+       result |= ColorPair(pair);
+       returnAttr(result);
     } else
        returnAttr(0);
 }
+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(attr_t)
+slk_attr(void)
+{
+    return NCURSES_SP_NAME(slk_attr) (CURRENT_SCREEN);
+}
+#endif