mirror of
https://github.com/xzeldon/htop.git
synced 2025-07-12 12:14:36 +03:00
LED Meter: display wide characters and restore non-wide ncurses support
Print wide characters, like degree sign, properly via mvadd_wch(). Ignore attributes when returning value from RichString_getCharVal() in non-wide ncurses mode to test against raw characters.
This commit is contained in:

committed by
cgzones

parent
b9adc30b86
commit
b5a5e83470
@ -22,13 +22,13 @@ in the source distribution for its full text.
|
||||
#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_getCharVal(this, i) ((this).chptr[i].chars[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)
|
||||
#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_getCharVal(this, i) ((this).chptr[i] & 0xff)
|
||||
#define RichString_setChar(this, at, ch) do { (this)->chptr[(at)] = ch; } while (0)
|
||||
#define CharType chtype
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user