From a78d10220c7484307adfe66e3b7e42c8bd50d53c Mon Sep 17 00:00:00 2001 From: Duncan Ogilvie Date: Wed, 6 Jul 2022 18:07:56 +0200 Subject: ccmake: Fix mangled configuration log with PDCurses on Windows This fix seems to work on both Windows and Ubuntu (WSL). Issue: #18053 --- Source/CursesDialog/cmCursesLongMessageForm.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/CursesDialog/cmCursesLongMessageForm.cxx b/Source/CursesDialog/cmCursesLongMessageForm.cxx index 8a7bb86..b14a751 100644 --- a/Source/CursesDialog/cmCursesLongMessageForm.cxx +++ b/Source/CursesDialog/cmCursesLongMessageForm.cxx @@ -43,7 +43,8 @@ void cmCursesLongMessageForm::UpdateContent(std::string const& output, if (!output.empty() && this->Messages.size() < MAX_CONTENT_SIZE) { this->Messages.push_back('\n'); this->Messages.append(output); - form_driver(this->Form, REQ_NEW_LINE); + form_driver(this->Form, REQ_NEXT_LINE); + form_driver(this->Form, REQ_BEG_LINE); this->DrawMessage(output.c_str()); } @@ -152,7 +153,8 @@ void cmCursesLongMessageForm::DrawMessage(const char* msg) const int i = 0; while (msg[i] != '\0' && i < MAX_CONTENT_SIZE) { if (msg[i] == '\n' && msg[i + 1] != '\0') { - form_driver(this->Form, REQ_NEW_LINE); + form_driver(this->Form, REQ_NEXT_LINE); + form_driver(this->Form, REQ_BEG_LINE); } else { form_driver(this->Form, msg[i]); } -- cgit v0.12