ncurses 5.6 - patch 20070901

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

diff --git a/ncurses/base/lib_slkatron.c b/ncurses/base/lib_slkatron.c
index a24886522cde6f29b6544447771ee2a9083b337e..90add86dc1c8cfac920bc88ee0f1ec542cb2a20c 100644 (file)
--- a/ncurses/base/lib_slkatron.c
+++ b/ncurses/base/lib_slkatron.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2000,2005 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            *


@@ -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,18 +38,21 @@
  */
 #include <curses.priv.h>
 
  */
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_slkatron.c,v 1.4 1998/03/11 19:26:07 juergen Exp $")
+MODULE_ID("$Id: lib_slkatron.c,v 1.8 2005/01/08 23:02:01 tom Exp $")

 
 

-int
+NCURSES_EXPORT(int)

 slk_attron(const chtype attr)
 {
 slk_attron(const chtype attr)
 {

-  T((T_CALLED("slk_attron(%s)"), _traceattr(attr)));
+    T((T_CALLED("slk_attron(%s)"), _traceattr(attr)));

 
 

-  if (SP!=0 && SP->_slk!=0)
-    {
-      toggle_attr_on(SP->_slk->attr,attr);
-      returnCode(OK);
-    }
-  else
-    returnCode(ERR);
+    if (SP != 0 && SP->_slk != 0) {
+       TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP->_slk->attr))));
+       AddAttr(SP->_slk->attr, attr);
+       if ((attr & A_COLOR) != 0) {
+           SetPair(SP->_slk->attr, PAIR_NUMBER(attr));
+       }
+       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr))));
+       returnCode(OK);
+    } else
+       returnCode(ERR);

 }
 }