ncurses 5.9 - patch 20110528

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

diff --git a/ncurses/widechar/lib_cchar.c b/ncurses/widechar/lib_cchar.c
index 86b5e2efa5105bec45a85e47c3167e8f5f419734..67b1aa4397b9f20ffa79ebf1f5c31571a0a45dcb 100644 (file)
--- a/ncurses/widechar/lib_cchar.c
+++ b/ncurses/widechar/lib_cchar.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2001,2002 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2001-2010,2011 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            *


@@ -35,46 +35,56 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_cchar.c,v 1.6 2002/08/10 22:27:37 tom Exp $")
+MODULE_ID("$Id: lib_cchar.c,v 1.22 2011/05/28 21:15:43 tom Exp $")

 
 /* 
  * The SuSv2 description leaves some room for interpretation.  We'll assume wch
 
 /* 
  * The SuSv2 description leaves some room for interpretation.  We'll assume wch

- * is L'\0' terminated, contains at most one character with strictly positive
- * width, which must be the first, and contains no characters of negative
- * width.
+ * points to a string which is L'\0' terminated, contains at least one
+ * character with strictly positive width, which must be the first, and
+ * contains no characters of negative width.

  */
 NCURSES_EXPORT(int)
  */
 NCURSES_EXPORT(int)

-setcchar(cchar_t * wcval, const wchar_t * wch, const attr_t attrs,
-        short color_pair, const void *opts)
+setcchar(cchar_t *wcval,
+        const wchar_t *wch,
+        const attr_t attrs,
+        short color_pair,
+        const void *opts)

 {
 {

-    int i;
-    int len;
+    unsigned i;
+    unsigned len;

     int code = OK;
 
     int code = OK;
 

-    TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,%ld,%d,%p)"),
-                     wcval, _nc_viswbuf(wch), attrs, color_pair, opts));
+    TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,%lu,%d,%p)"),
+                     (void *) wcval, _nc_viswbuf(wch),
+                     (unsigned long) attrs, color_pair, opts));

 
 

-    if (opts != NULL || (len = wcslen(wch)) > CCHARW_MAX
-       || (len > 0 && wcwidth(wch[0]) < 0)) {
+    if (opts != NULL
+       || wch == NULL
+       || ((len = wcslen(wch)) > 1 && wcwidth(wch[0]) < 0)) {

        code = ERR;
     } else {
        code = ERR;
     } else {

+       if (len > CCHARW_MAX)
+           len = CCHARW_MAX;

 
 

+       /*
+        * If we have a following spacing-character, stop at that point.  We
+        * are only interested in adding non-spacing characters.
+        */

        for (i = 1; i < len; ++i) {
            if (wcwidth(wch[i]) != 0) {
        for (i = 1; i < len; ++i) {
            if (wcwidth(wch[i]) != 0) {

-               code = ERR;
+               len = i;

                break;
            }
        }
 
                break;
            }
        }
 

-       if (code != ERR) {
-           memset(wcval, 0, sizeof(*wcval));
+       memset(wcval, 0, sizeof(*wcval));

 
 

-           if (len != 0) {
-               SetAttr(*wcval, attrs | color_pair);
-               memcpy(&wcval->chars, wch, len * sizeof(wchar_t));
-               TR(TRACE_CCALLS, ("copy %d wchars, first is %s", len,
-                                 _tracecchar_t(wcval)));
-           }
+       if (len != 0) {
+           SetAttr(*wcval, attrs | (attr_t) ColorPair(color_pair));
+           SetPair(CHDEREF(wcval), color_pair);
+           memcpy(&wcval->chars, wch, len * sizeof(wchar_t));
+           TR(TRACE_CCALLS, ("copy %d wchars, first is %s", len,
+                             _tracecchar_t(wcval)));

        }
     }
 
        }
     }
 


@@ -83,26 +93,39 @@ setcchar(cchar_t * wcval, const wchar_t * wch, const attr_t attrs,
 }
 
 NCURSES_EXPORT(int)
 }
 
 NCURSES_EXPORT(int)

-getcchar(const cchar_t * wcval, wchar_t * wch, attr_t * attrs,
-        short *color_pair, void *opts)
+getcchar(const cchar_t *wcval,
+        wchar_t *wch,
+        attr_t *attrs,
+        short *color_pair,
+        void *opts)

 {
     wchar_t *wp;
     int len;
     int code = ERR;
 
     TR(TRACE_CCALLS, (T_CALLED("getcchar(%p,%p,%p,%p,%p)"),
 {
     wchar_t *wp;
     int len;
     int code = ERR;
 
     TR(TRACE_CCALLS, (T_CALLED("getcchar(%p,%p,%p,%p,%p)"),

-                     wcval, wch, attrs, color_pair, opts));
+                     (const void *) wcval,
+                     (void *) wch,
+                     (void *) attrs,
+                     (void *) color_pair,
+                     opts));

 
 

-    if (opts == NULL) {
-       len = (wp = wmemchr(wcval->chars, L'\0', CCHARW_MAX))
-           ? wp - wcval->chars
-           : CCHARW_MAX;
+    if (opts == NULL && wcval != NULL) {
+       len = ((wp = wmemchr(wcval->chars, L'\0', CCHARW_MAX))
+              ? (int) (wp - wcval->chars)
+              : CCHARW_MAX);

 
        if (wch == NULL) {
 
        if (wch == NULL) {

-           code = len;
+           /*
+            * If the value is a null, set the length to 1.
+            * 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) {
+           code = ERR;

        } else if (len >= 0) {
        } else if (len >= 0) {

-           *attrs = AttrOf(*wcval);
-           *color_pair = AttrOf(*wcval) & A_COLOR;
+           *attrs = AttrOf(*wcval) & A_ATTRIBUTES;
+           *color_pair = (short) GetPair(*wcval);

            wmemcpy(wch, wcval->chars, (unsigned) len);
            wch[len] = L'\0';
            code = OK;
            wmemcpy(wch, wcval->chars, (unsigned) len);
            wch[len] = L'\0';
            code = OK;