Skip to content

Commit aaca2ac

Browse files
committed
[lldb][gui] do not show the help window on first gui startup
It's rather annoying if it's there after every startup, and that 'Help (F6)' at the top should be enough to help people who don't know. Differential Revision: https://reviews.llvm.org/D122997
1 parent 163e188 commit aaca2ac

File tree

5 files changed

+4
-25
lines changed

5 files changed

+4
-25
lines changed

lldb/source/Core/IOHandlerCursesGUI.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7667,14 +7667,6 @@ void IOHandlerCursesGUI::Activate() {
76677667
status_window_sp->SetDelegate(
76687668
WindowDelegateSP(new StatusBarWindowDelegate(m_debugger)));
76697669

7670-
// Show the main help window once the first time the curses GUI is
7671-
// launched
7672-
static bool g_showed_help = false;
7673-
if (!g_showed_help) {
7674-
g_showed_help = true;
7675-
main_window_sp->CreateHelpSubwindow();
7676-
}
7677-
76787670
// All colors with black background.
76797671
init_pair(1, COLOR_BLACK, COLOR_BLACK);
76807672
init_pair(2, COLOR_RED, COLOR_BLACK);

lldb/test/API/commands/gui/basic/TestGuiBasic.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,9 @@ def test_gui(self):
2626

2727
escape_key = chr(27).encode()
2828

29-
# Start the GUI for the first time and check for the welcome window.
29+
# Start the GUI.
3030
self.child.sendline("gui")
31-
self.child.expect_exact("Welcome to the LLDB curses GUI.")
3231

33-
# Press escape to quit the welcome screen
34-
self.child.send(escape_key)
35-
# Press escape again to quit the gui
36-
self.child.send(escape_key)
37-
self.expect_prompt()
38-
39-
# Start the GUI a second time, this time we should have the normal GUI.
40-
self.child.sendline("gui")
4132
# Check for GUI elements in the menu bar.
4233
self.child.expect_exact("Target")
4334
self.child.expect_exact("Process")

lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@ def test_gui(self):
2525

2626
escape_key = chr(27).encode()
2727

28-
# Start the GUI and close the welcome window.
28+
# Start the GUI.
2929
self.child.sendline("gui")
30-
self.child.expect("Welcome to the LLDB curses GUI.")
31-
self.child.send(escape_key)
3230

3331
# Simulate a simple debugging session.
3432
self.child.send("s") # step

lldb/test/API/commands/gui/breakpoints/TestGuiBreakpoints.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ def test_gui(self):
2929
escape_key = chr(27).encode()
3030
down_key = chr(27)+'OB' # for vt100 terminal (lldbexpect sets TERM=vt100)
3131

32-
# Start the GUI and close the welcome window.
32+
# Start the GUI.
3333
self.child.sendline("gui")
34-
self.child.send(escape_key)
3534
self.child.expect_exact("Sources") # wait for gui
3635

3736
# Go to next line, set a breakpoint.

lldb/test/API/commands/gui/viewlarge/TestGuiViewLarge.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ def test_gui(self):
3131
right_key = chr(27)+'OC'
3232
ctrl_l = chr(12)
3333

34-
# Start the GUI and close the welcome window.
34+
# Start the GUI.
3535
self.child.sendline("gui")
36-
self.child.send(escape_key)
3736

3837
# Check the sources window.
3938
self.child.expect_exact("Sources")

0 commit comments

Comments
 (0)