From 1b805a31720727008b32b1129a167758519fd4db Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Mon, 2 May 2022 16:04:21 +0200 Subject: New upstream version 3.2.0 --- InfoScreen.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'InfoScreen.c') diff --git a/InfoScreen.c b/InfoScreen.c index f431f79..105d9c3 100644 --- a/InfoScreen.c +++ b/InfoScreen.c @@ -57,13 +57,13 @@ void InfoScreen_drawTitled(InfoScreen* this, const char* fmt, ...) { attrset(CRT_colors[DEFAULT_COLOR]); Panel_draw(this->display, true, true, true, false); - IncSet_drawBar(this->inc); + IncSet_drawBar(this->inc, CRT_colors[FUNCTION_BAR]); } void InfoScreen_addLine(InfoScreen* this, const char* line) { Vector_add(this->lines, (Object*) ListItem_new(line, 0)); const char* incFilter = IncSet_filter(this->inc); - if (!incFilter || String_contains_i(line, incFilter)) { + if (!incFilter || String_contains_i(line, incFilter, true)) { Panel_add(this->display, Vector_get(this->lines, Vector_size(this->lines) - 1)); } } @@ -72,7 +72,7 @@ void InfoScreen_appendLine(InfoScreen* this, const char* line) { ListItem* last = (ListItem*)Vector_get(this->lines, Vector_size(this->lines) - 1); ListItem_append(last, line); const char* incFilter = IncSet_filter(this->inc); - if (incFilter && Panel_get(this->display, Panel_size(this->display) - 1) != (Object*)last && String_contains_i(line, incFilter)) { + if (incFilter && Panel_get(this->display, Panel_size(this->display) - 1) != (Object*)last && String_contains_i(line, incFilter, true)) { Panel_add(this->display, (Object*)last); } } @@ -89,15 +89,9 @@ void InfoScreen_run(InfoScreen* this) { while (looping) { Panel_draw(panel, false, true, true, false); - IncSet_drawBar(this->inc); + IncSet_drawBar(this->inc, CRT_colors[FUNCTION_BAR]); - if (this->inc->active) { - (void) move(LINES - 1, CRT_cursorX); - } -#ifdef HAVE_SET_ESCDELAY - set_escdelay(25); -#endif - int ch = getch(); + int ch = Panel_getCh(panel); if (ch == ERR) { if (As_InfoScreen(this)->onErr) { -- cgit v1.2.3