X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=ncurses%2Fwidechar%2Flib_cchar.c;h=b6458ee4a1f406870a5b8bf33582c5f27c5bb2d0;hb=614ef82f41eda084798068d715ef91b072014ca9;hp=75dbf4a521a2c1cab1f5f63ab5479f7a288aca86;hpb=a8987e73ec254703634802b4f7ee30d3a485524d;p=ncurses.git

diff --git a/ncurses/widechar/lib_cchar.c b/ncurses/widechar/lib_cchar.c
index 75dbf4a5..b6458ee4 100644
--- a/ncurses/widechar/lib_cchar.c
+++ b/ncurses/widechar/lib_cchar.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2001-2002,2003 Free Software Foundation, Inc.              *
+ * Copyright (c) 2001-2004,2005 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            *
@@ -35,17 +35,20 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_cchar.c,v 1.8 2003/05/25 00:07:41 tom Exp $")
+MODULE_ID("$Id: lib_cchar.c,v 1.11 2005/01/29 21:29:16 tom Exp $")
 
 /* 
  * 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)
-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;
@@ -54,10 +57,13 @@ setcchar(cchar_t * wcval, const wchar_t * wch, const attr_t attrs,
     TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,%ld,%d,%p)"),
 		      wcval, _nc_viswbuf(wch), attrs, color_pair, opts));
 
-    if (opts != NULL || (len = wcslen(wch)) > CCHARW_MAX
+    len = wcslen(wch);
+    if (opts != NULL
 	|| (len > 1 && wcwidth(wch[0]) < 0)) {
 	code = ERR;
     } else {
+	if (len > CCHARW_MAX)
+	    len = CCHARW_MAX;
 
 	/*
 	 * If we have a following spacing-character, stop at that point.  We
@@ -73,7 +79,8 @@ setcchar(cchar_t * wcval, const wchar_t * wch, const attr_t attrs,
 	memset(wcval, 0, sizeof(*wcval));
 
 	if (len != 0) {
-	    SetAttr(*wcval, attrs | color_pair);
+	    SetAttr(*wcval, attrs | COLOR_PAIR(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)));
@@ -85,8 +92,11 @@ setcchar(cchar_t * wcval, const wchar_t * wch, const attr_t attrs,
 }
 
 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;
@@ -105,8 +115,8 @@ getcchar(const cchar_t * wcval, wchar_t * wch, attr_t * attrs,
 	} else if (attrs == 0 || color_pair == 0) {
 	    code = ERR;
 	} else if (len >= 0) {
-	    *attrs = AttrOf(*wcval);
-	    *color_pair = AttrOf(*wcval) & A_COLOR;
+	    *attrs = AttrOf(*wcval) & A_ATTRIBUTES;
+	    *color_pair = GetPair(*wcval);
 	    wmemcpy(wch, wcval->chars, (unsigned) len);
 	    wch[len] = L'\0';
 	    code = OK;