ncurses 6.0 - patch 20170401

[ncurses.git] / ncurses / widechar / lib_cchar.c

diff --git a/ncurses/widechar/lib_cchar.c b/ncurses/widechar/lib_cchar.c
index da28cfc0a59d8938a983d46fc9923ccdec3adcae..b465c36089a159c753fbc6271135c9b758d43d98 100644 (file)
--- a/ncurses/widechar/lib_cchar.c
+++ b/ncurses/widechar/lib_cchar.c
@@ -35,7 +35,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_cchar.c,v 1.29 2017/03/04 19:56:00 tom Exp $")
+MODULE_ID("$Id: lib_cchar.c,v 1.31 2017/03/31 11:14:26 tom Exp $")
 
 /* 
  * The SuSv2 description leaves some room for interpretation.  We'll assume wch
@@ -47,18 +47,19 @@ NCURSES_EXPORT(int)
 setcchar(cchar_t *wcval,
         const wchar_t *wch,
         const attr_t attrs,
-        NCURSES_PAIRS_T color_pair,
+        NCURSES_PAIRS_T pair_arg,
         const void *opts)
 {
-    unsigned len;
     int code = OK;
+    int color_pair = pair_arg;
+    unsigned len;
 
     TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,%lu,%d,%p)"),
                      (void *) wcval, _nc_viswbuf(wch),
-                     (unsigned long) attrs, (int) color_pair, opts));
+                     (unsigned long) attrs, color_pair, opts));
 
-    if (opts != NULL
-       || wch == NULL
+    set_extended_pair(opts, color_pair);
+    if (wch == NULL
        || ((len = (unsigned) wcslen(wch)) > 1 && wcwidth(wch[0]) < 0)
        || color_pair < 0) {
        code = ERR;
@@ -98,16 +99,17 @@ NCURSES_EXPORT(int)
 getcchar(const cchar_t *wcval,
         wchar_t *wch,
         attr_t *attrs,
-        NCURSES_PAIRS_T *color_pair,
+        NCURSES_PAIRS_T *pair_arg,
         void *opts)
 {
     int code = ERR;
+    int color_pair;
 
     TR(TRACE_CCALLS, (T_CALLED("getcchar(%p,%p,%p,%p,%p)"),
                      (const void *) wcval,
                      (void *) wch,
                      (void *) attrs,
-                     (void *) color_pair,
+                     (void *) pair_arg,
                      opts));
 
     if (opts == NULL && wcval != NULL) {
@@ -124,14 +126,16 @@ getcchar(const cchar_t *wcval,
             * If the value is not a null, return the length plus 1 for null.
             */
            code = (len < CCHARW_MAX) ? (len + 1) : CCHARW_MAX;
-       } else if (attrs == 0 || color_pair == 0) {
+       } else if (attrs == 0 || pair_arg == 0) {
            code = ERR;
        } else if (len >= 0) {
            *attrs = AttrOf(*wcval) & A_ATTRIBUTES;
-           *color_pair = (NCURSES_PAIRS_T) GetPair(*wcval);
+           color_pair = GetPair(*wcval);
+           get_extended_pair(opts, color_pair);
+           *pair_arg = limit_PAIRS(color_pair);
            wmemcpy(wch, wcval->chars, (size_t) len);
            wch[len] = L'\0';
-           if (*color_pair >= 0)
+           if (*pair_arg >= 0)
                code = OK;
        }
     }