ncurses 6.2 - patch 20200816

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

diff --git a/ncurses/base/lib_wattroff.c b/ncurses/base/lib_wattroff.c
index a6c9f0f1804e1daf540eb008c3d59d9f85e943ac..eac07f08a4ee143555fe4b8bfb7b36fcd4cfe523 100644 (file)
--- a/ncurses/base/lib_wattroff.c
+++ b/ncurses/base/lib_wattroff.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2006,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            *
@@ -29,6 +30,7 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
 /*
@@ -41,15 +43,23 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_wattroff.c,v 1.4 1998/05/10 12:02:11 tom Exp $")
+MODULE_ID("$Id: lib_wattroff.c,v 1.11 2020/02/02 23:34:34 tom Exp $")
 
-int wattr_off(WINDOW *win, NCURSES_CONST attr_t at, void *opts GCC_UNUSED)
+NCURSES_EXPORT(int)
+wattr_off(WINDOW *win, attr_t at, void *opts GCC_UNUSED)
 {
-       T((T_CALLED("wattr_off(%p,%s)"), win, _traceattr(at)));
-       if (win) {
-               T(("... current %s", _traceattr(win->_attrs)));
-               toggle_attr_off(win->_attrs,at);
-               returnCode(OK);
-       } else
-               returnCode(ERR);
+    T((T_CALLED("wattr_off(%p,%s)"), (void *) win, _traceattr(at)));
+    if (win) {
+       T(("... current %s (%d)",
+          _traceattr(WINDOW_ATTRS(win)),
+          GET_WINDOW_PAIR(win)));
+
+       if_EXT_COLORS({
+           if (at & A_COLOR)
+               win->_color = 0;
+       });
+       toggle_attr_off(WINDOW_ATTRS(win), at);
+       returnCode(OK);
+    } else
+       returnCode(ERR);
 }