ncurses 6.2 - patch 20200912

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

diff --git a/ncurses/base/lib_slkatr_set.c b/ncurses/base/lib_slkatr_set.c
index 7fba7ac33e6c5c967b41b30931425156088d072f..7c5a23acdb1f9a8fb743be31a7cbcea667490b66 100644 (file)
--- a/ncurses/base/lib_slkatr_set.c
+++ b/ncurses/base/lib_slkatr_set.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2014,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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -38,27 +39,31 @@
  */
 #include <curses.priv.h>
 
  */
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_slkatr_set.c,v 1.12 2009/02/15 00:33:48 tom Exp $")
+MODULE_ID("$Id: lib_slkatr_set.c,v 1.17 2020/02/02 23:34:34 tom Exp $")

 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(slk_attr_set) (NCURSES_SP_DCLx
                               const attr_t attr,
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(slk_attr_set) (NCURSES_SP_DCLx
                               const attr_t attr,

-                              short color_pair_number,
+                              NCURSES_PAIRS_T pair_arg,

                               void *opts)
 {
     int code = ERR;
                               void *opts)
 {
     int code = ERR;

+    int color_pair = pair_arg;

 
 

-    T((T_CALLED("slk_attr_set(%s,%d)"), _traceattr(attr), color_pair_number));
+    T((T_CALLED("slk_attr_set(%p,%s,%d)"),
+       (void *) SP_PARM,
+       _traceattr(attr),
+       color_pair));

 
 

+    set_extended_pair(opts, color_pair);

     if (SP_PARM != 0
        && SP_PARM->_slk != 0
     if (SP_PARM != 0
        && SP_PARM->_slk != 0

-       && !opts
-       && color_pair_number >= 0
-       && color_pair_number < SP_PARM->_pair_limit) {
+       && color_pair >= 0
+       && color_pair < SP_PARM->_pair_limit) {

        TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
        SetAttr(SP_PARM->_slk->attr, attr);
        TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
        SetAttr(SP_PARM->_slk->attr, attr);

-       if (color_pair_number > 0) {
-           SetPair(SP_PARM->_slk->attr, color_pair_number);
+       if (color_pair > 0) {
+           SetPair(SP_PARM->_slk->attr, color_pair);

        }
        TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
        code = OK;
        }
        TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
        code = OK;


@@ -68,9 +73,9 @@ NCURSES_SP_NAME(slk_attr_set) (NCURSES_SP_DCLx
 
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
 
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)

-slk_attr_set(const attr_t attr, short color_pair_number, void *opts)
+slk_attr_set(const attr_t attr, NCURSES_COLOR_T pair_arg, void *opts)

 {
     return NCURSES_SP_NAME(slk_attr_set) (CURRENT_SCREEN, attr,
 {
     return NCURSES_SP_NAME(slk_attr_set) (CURRENT_SCREEN, attr,

-                                         color_pair_number, opts);
+                                         pair_arg, opts);

 }
 #endif
 }
 #endif