ncurses 6.0 - patch 20160319

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

diff --git a/ncurses/base/lib_chgat.c b/ncurses/base/lib_chgat.c
index fc8a22f4543f08d6f2533c128c599ff915ce37e1..1eb1f59e2385d65f78ec65b8375538f34f01adbd 100644 (file)
--- a/ncurses/base/lib_chgat.c
+++ b/ncurses/base/lib_chgat.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2001,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2014 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            *
@@ -42,21 +42,32 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_chgat.c,v 1.6 2005/01/29 21:46:12 tom Exp $")
+MODULE_ID("$Id: lib_chgat.c,v 1.10 2014/02/01 22:13:31 tom Exp $")
 
 NCURSES_EXPORT(int)
-wchgat(WINDOW *win, int n, attr_t attr, short color, const void *opts GCC_UNUSED)
+wchgat(WINDOW *win,
+       int n,
+       attr_t attr,
+       NCURSES_PAIRS_T color,
+       const void *opts GCC_UNUSED)
 {
     int i;
 
-    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),
+       (int) color));
 
     if (win) {
-       toggle_attr_on(attr, COLOR_PAIR(color));
+       struct ldat *line = &(win->_line[win->_cury]);
+
+       toggle_attr_on(attr, ColorPair(color));
 
        for (i = win->_curx; i <= win->_maxx && (n == -1 || (n-- > 0)); i++) {
-           SetAttr(win->_line[win->_cury].text[i], attr);
-           SetPair(win->_line[win->_cury].text[i], color);
+           SetAttr(line->text[i], attr);
+           SetPair(line->text[i], color);
+           CHANGED_CELL(line, i);
        }
 
        returnCode(OK);