X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_chgat.c;h=74c4f75b44d909a23769d577637ec7508a97909f;hp=7690ae4a2af3b685c488c15b526bb60bc147edcc;hb=dafd158641767f37aa900c195aaa77b27da38500;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce

diff --git a/ncurses/base/lib_chgat.c b/ncurses/base/lib_chgat.c
index 7690ae4a..74c4f75b 100644
--- a/ncurses/base/lib_chgat.c
+++ b/ncurses/base/lib_chgat.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2016,2017 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,8 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Sven Verdoolaege                        2001                    *
+ *     and: Thomas E. Dickey                        2005                    *
  ****************************************************************************/
 
 /*
@@ -40,23 +43,38 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_chgat.c,v 1.2 1998/02/11 12:14:00 tom Exp $")
+MODULE_ID("$Id: lib_chgat.c,v 1.13 2020/02/02 23:34:34 tom Exp $")
 
-int wchgat(WINDOW *win, int n, attr_t attr, short color, const void *opts GCC_UNUSED)
+NCURSES_EXPORT(int)
+wchgat(WINDOW *win,
+       int n,
+       attr_t attr,
+       NCURSES_PAIRS_T pair_arg,
+       const void *opts GCC_UNUSED)
 {
-    int	i;
+    int code = ERR;
+    int color_pair = pair_arg;
 
-    T((T_CALLED("wchgat(%p,%d,%s,%d)"), win, n, _traceattr(attr), color));
+    T((T_CALLED("wchgat(%p,%d,%s,%d)"),
+       (void *) win,
+       n,
+       _traceattr(attr),
+       color_pair));
 
+    set_extended_pair(opts, color_pair);
     if (win) {
-      toggle_attr_on(attr,COLOR_PAIR(color));
+	struct ldat *line = &(win->_line[win->_cury]);
+	int i;
 
-      for (i = win->_curx; i <= win->_maxx && (n == -1 || (n-- > 0)); i++)
-	win->_line[win->_cury].text[i]
-	  = TextOf(win->_line[win->_cury].text[i]) | attr;
+	toggle_attr_on(attr, ColorPair(color_pair));
 
-      returnCode(OK);
+	for (i = win->_curx; i <= win->_maxx && (n == -1 || (n-- > 0)); i++) {
+	    SetAttr(line->text[i], attr);
+	    SetPair(line->text[i], color_pair);
+	    CHANGED_CELL(line, i);
+	}
+
+	code = OK;
     }
-    else
-      returnCode(ERR);
+    returnCode(code);
 }