ncurses 6.1 - patch 20180317

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

diff --git a/ncurses/base/lib_chgat.c b/ncurses/base/lib_chgat.c
index c67e5993db9af829a8cc4f430e2d6db847f46eae..e969d69bebb76e2d2a4dbac71fd20dcbdaa636f7 100644 (file)
--- a/ncurses/base/lib_chgat.c
+++ b/ncurses/base/lib_chgat.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2014,2016 Free Software Foundation, Inc.              *
+ * Copyright (c) 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            *
@@ -42,34 +42,38 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_chgat.c,v 1.11 2016/05/28 23:11:26 tom Exp $")
+MODULE_ID("$Id: lib_chgat.c,v 1.12 2017/03/16 23:45:20 tom Exp $")
 
 NCURSES_EXPORT(int)
 wchgat(WINDOW *win,
        int n,
        attr_t attr,
-       NCURSES_PAIRS_T color,
+       NCURSES_PAIRS_T pair_arg,
        const void *opts GCC_UNUSED)
 {
+    int code = ERR;
+    int color_pair = pair_arg;
+
     T((T_CALLED("wchgat(%p,%d,%s,%d)"),
        (void *) win,
        n,
        _traceattr(attr),
-       (int) color));
+       color_pair));
 
+    set_extended_pair(opts, color_pair);
     if (win) {
        struct ldat *line = &(win->_line[win->_cury]);
        int i;
 
-       toggle_attr_on(attr, ColorPair(color));
+       toggle_attr_on(attr, ColorPair(color_pair));
 
        for (i = win->_curx; i <= win->_maxx && (n == -1 || (n-- > 0)); i++) {
            SetAttr(line->text[i], attr);
-           SetPair(line->text[i], color);
+           SetPair(line->text[i], color_pair);
            CHANGED_CELL(line, i);
        }
 
-       returnCode(OK);
-    } else
-       returnCode(ERR);
+       code = OK;
+    }
+    returnCode(code);
 }