From ff9409b1737627857eb47f64f536a3f66b6a09a4 Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Mon, 11 Apr 2016 13:01:07 +0200 Subject: Imported Upstream version 2.0.0 --- RichString.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'RichString.h') diff --git a/RichString.h b/RichString.h index a9cb3f6..796965a 100644 --- a/RichString.h +++ b/RichString.h @@ -9,7 +9,7 @@ Released under the GNU GPL, see the COPYING file in the source distribution for its full text. */ -#define RICHSTRING_MAXLEN 300 +#define RICHSTRING_MAXLEN 350 #include "config.h" #include @@ -27,18 +27,22 @@ in the source distribution for its full text. #include #endif +#ifdef HAVE_LIBNCURSESW +#include +#endif + #define RichString_size(this) ((this)->chlen) #define RichString_sizeVal(this) ((this).chlen) -#define RichString_begin(this) RichString (this); (this).chlen = 0; (this).chptr = (this).chstr; -#define RichString_beginAllocated(this) (this).chlen = 0; (this).chptr = (this).chstr; +#define RichString_begin(this) RichString (this); memset(&this, 0, sizeof(RichString)); (this).chptr = (this).chstr; +#define RichString_beginAllocated(this) memset(&this, 0, sizeof(RichString)); (this).chptr = (this).chstr; #define RichString_end(this) RichString_prune(&(this)); #ifdef HAVE_LIBNCURSESW #define RichString_printVal(this, y, x) mvadd_wchstr(y, x, (this).chptr) #define RichString_printoffnVal(this, y, x, off, n) mvadd_wchnstr(y, x, (this).chptr + off, n) #define RichString_getCharVal(this, i) ((this).chptr[i].chars[0] & 255) -#define RichString_setChar(this, at, ch) do{ (this)->chptr[(at)].chars[0] = ch; } while(0) +#define RichString_setChar(this, at, ch) do{ (this)->chptr[(at)] = (CharType) { .chars = { ch, 0 } }; } while(0) #define CharType cchar_t #else #define RichString_printVal(this, y, x) mvaddchstr(y, x, (this).chptr) @@ -50,17 +54,15 @@ in the source distribution for its full text. typedef struct RichString_ { int chlen; - CharType chstr[RICHSTRING_MAXLEN+1]; CharType* chptr; + CharType chstr[RICHSTRING_MAXLEN+1]; } RichString; -#ifndef MIN -#define MIN(a,b) ((a)<(b)?(a):(b)) -#endif - #define charBytes(n) (sizeof(CharType) * (n)) +#define RichString_setLen(this, len) do{ if(len < RICHSTRING_MAXLEN && this->chlen < RICHSTRING_MAXLEN) { RichString_setChar(this,len,0); this->chlen=len; } else RichString_extendLen(this,len); }while(0) + #ifdef HAVE_LIBNCURSESW extern void RichString_setAttrn(RichString* this, int attrs, int start, int finish); -- cgit v1.2.3