https://github.com/JDevlieghere updated
https://github.com/llvm/llvm-project/pull/134203
>From c5df5b2684a42f11c13efa6b03a28ea4e8ff900e Mon Sep 17 00:00:00 2001
From: Jonas Devlieghere <jo...@devlieghere.com>
Date: Wed, 2 Apr 2025 22:52:39 -0700
Subject: [PATCH 1/2] [lldb] Use the "reverse video" effect when colors are
disabled.
When you run lldb without colors (`-X), the status line looks weird
because it doesn't have a background. You end up with what appears to be
floating text at the bottom of your terminal.
This patch changes the statusline to use the reverse video effect, even
when colors are off. The effect doesn't introduce any new colors and
just inverts the foreground and background color.
I considered an alternative approach which changes the behavior of the
`-X` option, so that turning off colors doesn't prevent emitting
non-color related control characters such as bold, underline, and
reverse video. I decided to go with this more targeted fix as (1) nobody
is asking for this more general change and (2) it introduces significant
complexity to plumb this through using a setting and driver flag so that
it can be disabled when running the tests.
Fixes #134112.
---
lldb/source/Core/Statusline.cpp | 7 ++++++
.../statusline/TestStatusline.py | 23 +++++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/lldb/source/Core/Statusline.cpp b/lldb/source/Core/Statusline.cpp
index c18fbb6c5561e..b7650503e16bc 100644
--- a/lldb/source/Core/Statusline.cpp
+++ b/lldb/source/Core/Statusline.cpp
@@ -27,6 +27,7 @@
#define ANSI_CLEAR_LINE ESCAPE "[2K"
#define ANSI_SET_SCROLL_ROWS ESCAPE "[0;%ur"
#define ANSI_TO_START_OF_ROW ESCAPE "[%u;0f"
+#define ANSI_REVERSE_VIDEO ESCAPE "[7m"
#define ANSI_UP_ROWS ESCAPE "[%dA"
using namespace lldb;
@@ -74,6 +75,12 @@ void Statusline::Draw(std::string str) {
locked_stream << ANSI_SAVE_CURSOR;
locked_stream.Printf(ANSI_TO_START_OF_ROW,
static_cast<unsigned>(m_terminal_height));
+
+ // Use "reverse video" to make sure the statusline has a background. Only do
+ // this when colors are disabled, and rely on the statusline format
otherwise.
+ if (!m_debugger.GetUseColor())
+ locked_stream << ANSI_REVERSE_VIDEO;
+
locked_stream << str;
locked_stream << ANSI_NORMAL;
locked_stream << ANSI_RESTORE_CURSOR;
diff --git a/lldb/test/API/functionalities/statusline/TestStatusline.py
b/lldb/test/API/functionalities/statusline/TestStatusline.py
index a58dc5470ed6d..391f788b9df48 100644
--- a/lldb/test/API/functionalities/statusline/TestStatusline.py
+++ b/lldb/test/API/functionalities/statusline/TestStatusline.py
@@ -55,3 +55,26 @@ def test(self):
self.expect(
"set set show-statusline false",
["\x1b[0;{}r".format(terminal_height)]
)
+
+
+ # PExpect uses many timeouts internally and doesn't play well
+ # under ASAN on a loaded machine..
+ @skipIfAsan
+ def test_no_color(self):
+ """Basic test for the statusline with colors disabled."""
+ self.build()
+ self.launch(use_colors=False)
+ self.do_setup()
+
+ # Change the terminal dimensions.
+ terminal_height = 10
+ terminal_width = 60
+ self.child.setwinsize(terminal_height, terminal_width)
+
+ # Enable the statusline and check for the "reverse video" control
character.
+ self.expect(
+ "set set show-statusline true",
+ [
+ "\x1b[7m",
+ ],
+ )
>From 0d1998dd1c8ebc6dbb687c0a23ab2562c9378d01 Mon Sep 17 00:00:00 2001
From: Jonas Devlieghere <jo...@devlieghere.com>
Date: Wed, 2 Apr 2025 23:30:38 -0700
Subject: [PATCH 2/2] Remove newline to appease the formatter
---
lldb/test/API/functionalities/statusline/TestStatusline.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/lldb/test/API/functionalities/statusline/TestStatusline.py
b/lldb/test/API/functionalities/statusline/TestStatusline.py
index 391f788b9df48..747a7a14e0629 100644
--- a/lldb/test/API/functionalities/statusline/TestStatusline.py
+++ b/lldb/test/API/functionalities/statusline/TestStatusline.py
@@ -56,7 +56,6 @@ def test(self):
"set set show-statusline false",
["\x1b[0;{}r".format(terminal_height)]
)
-
# PExpect uses many timeouts internally and doesn't play well
# under ASAN on a loaded machine..
@skipIfAsan
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
