diff options
| author | Daniel Lange <DLange@git.local> | 2020-09-15 08:00:01 +0200 |
|---|---|---|
| committer | Daniel Lange <DLange@git.local> | 2020-09-15 08:00:01 +0200 |
| commit | 8e8165109aca4e3c2a8558653df088d674061c78 (patch) | |
| tree | d68c91ced3a78c65be9ae262ea84676e73cac68d /RichString.c | |
| parent | e9302ddfaeaad62b12bdd352958fb194a26f3c74 (diff) | |
| parent | f80394a20254938142011855f2954b3f63fe5909 (diff) | |
| download | debian_htop-8e8165109aca4e3c2a8558653df088d674061c78.tar.gz debian_htop-8e8165109aca4e3c2a8558653df088d674061c78.tar.bz2 debian_htop-8e8165109aca4e3c2a8558653df088d674061c78.zip | |
Update upstream source from tag 'upstream/3.0.2'
Update to upstream version '3.0.2'
with Debian dir 26e1b8d7612e50e81b8325506c1ce54f71cba270
Diffstat (limited to 'RichString.c')
| -rw-r--r-- | RichString.c | 57 |
1 files changed, 1 insertions, 56 deletions
diff --git a/RichString.c b/RichString.c index d246f1e..b97e34e 100644 --- a/RichString.c +++ b/RichString.c @@ -7,66 +7,11 @@ in the source distribution for its full text. #include "RichString.h" #include "XAlloc.h" +#include "Macros.h" #include <stdlib.h> #include <string.h> -#define RICHSTRING_MAXLEN 350 - -/*{ -#include "config.h" -#include <ctype.h> - -#include <assert.h> -#ifdef HAVE_NCURSESW_CURSES_H -#include <ncursesw/curses.h> -#elif HAVE_NCURSES_NCURSES_H -#include <ncurses/ncurses.h> -#elif HAVE_NCURSES_CURSES_H -#include <ncurses/curses.h> -#elif HAVE_NCURSES_H -#include <ncurses.h> -#elif HAVE_CURSES_H -#include <curses.h> -#endif - -#ifdef HAVE_LIBNCURSESW -#include <wctype.h> -#endif - -#define RichString_size(this) ((this)->chlen) -#define RichString_sizeVal(this) ((this).chlen) - -#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)] = (CharType) { .chars = { ch, 0 } }; } while(0) -#define CharType cchar_t -#else -#define RichString_printVal(this, y, x) mvaddchstr(y, x, (this).chptr) -#define RichString_printoffnVal(this, y, x, off, n) mvaddchnstr(y, x, (this).chptr + off, n) -#define RichString_getCharVal(this, i) ((this).chptr[i]) -#define RichString_setChar(this, at, ch) do{ (this)->chptr[(at)] = ch; } while(0) -#define CharType chtype -#endif - -typedef struct RichString_ { - int chlen; - CharType* chptr; - CharType chstr[RICHSTRING_MAXLEN+1]; -} RichString; - -}*/ - -#ifndef CLAMP -#define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x))) -#endif - #define charBytes(n) (sizeof(CharType) * (n)) static void RichString_extendLen(RichString* this, int len) { |