summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Göttsche <cgzones@googlemail.com>2021-01-14 11:01:32 +0100
committercgzones <cgzones@googlemail.com>2021-01-15 20:41:10 +0100
commitb5a5e83470ef2db6cace89a5f513b038a96bbff9 (patch)
treecf43635a79afc062e7d54c8b937bf3c73638e644
parentb9adc30b86ef550655de1e8a8122dae20a6b13df (diff)
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.
-rw-r--r--Meter.c7
-rw-r--r--RichString.h4
2 files changed, 8 insertions, 3 deletions
diff --git a/Meter.c b/Meter.c
index 0fbdcb9d..948ecf64 100644
--- a/Meter.c
+++ b/Meter.c
@@ -414,10 +414,15 @@ static void LEDMeterMode_draw(Meter* this, int x, int y, int w) {
for (int i = 0; i < len; i++) {
int c = RichString_getCharVal(out, i);
if (c >= '0' && c <= '9') {
- LEDMeterMode_drawDigit(xx, y, c - 48);
+ LEDMeterMode_drawDigit(xx, y, c - '0');
xx += 4;
} else {
+#ifdef HAVE_LIBNCURSESW
+ out.chptr[i].attr = 0; /* use LED_COLOR from attrset() */
+ mvadd_wch(yText, xx, &out.chptr[i]);
+#else
mvaddch(yText, xx, c);
+#endif
xx += 1;
}
}
diff --git a/RichString.h b/RichString.h
index d317cb2e..497d0d2f 100644
--- a/RichString.h
+++ b/RichString.h
@@ -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