From aaca2acd5f3434ccd1d568596161628ce53d9066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Thu, 30 Jul 2020 17:24:39 +0200 Subject: [PATCH] [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 --- lldb/source/Core/IOHandlerCursesGUI.cpp | 8 -------- lldb/test/API/commands/gui/basic/TestGuiBasic.py | 11 +---------- .../API/commands/gui/basicdebug/TestGuiBasicDebug.py | 4 +--- .../commands/gui/breakpoints/TestGuiBreakpoints.py | 3 +-- .../API/commands/gui/viewlarge/TestGuiViewLarge.py | 3 +-- 5 files changed, 4 insertions(+), 25 deletions(-) diff --git a/lldb/source/Core/IOHandlerCursesGUI.cpp b/lldb/source/Core/IOHandlerCursesGUI.cpp index bb15f4d55936..8577f4b28297 100644 --- a/lldb/source/Core/IOHandlerCursesGUI.cpp +++ b/lldb/source/Core/IOHandlerCursesGUI.cpp @@ -7667,14 +7667,6 @@ void IOHandlerCursesGUI::Activate() { status_window_sp->SetDelegate( WindowDelegateSP(new StatusBarWindowDelegate(m_debugger))); - // Show the main help window once the first time the curses GUI is - // launched - static bool g_showed_help = false; - if (!g_showed_help) { - g_showed_help = true; - main_window_sp->CreateHelpSubwindow(); - } - // All colors with black background. init_pair(1, COLOR_BLACK, COLOR_BLACK); init_pair(2, COLOR_RED, COLOR_BLACK); diff --git a/lldb/test/API/commands/gui/basic/TestGuiBasic.py b/lldb/test/API/commands/gui/basic/TestGuiBasic.py index 4e1a0f990a68..a28754473ded 100644 --- a/lldb/test/API/commands/gui/basic/TestGuiBasic.py +++ b/lldb/test/API/commands/gui/basic/TestGuiBasic.py @@ -26,18 +26,9 @@ class BasicGuiCommandTest(PExpectTest): escape_key = chr(27).encode() - # Start the GUI for the first time and check for the welcome window. + # Start the GUI. self.child.sendline("gui") - self.child.expect_exact("Welcome to the LLDB curses GUI.") - # Press escape to quit the welcome screen - self.child.send(escape_key) - # Press escape again to quit the gui - self.child.send(escape_key) - self.expect_prompt() - - # Start the GUI a second time, this time we should have the normal GUI. - self.child.sendline("gui") # Check for GUI elements in the menu bar. self.child.expect_exact("Target") self.child.expect_exact("Process") diff --git a/lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py b/lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py index a7df72509d58..98c8ff5db08b 100644 --- a/lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py +++ b/lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py @@ -25,10 +25,8 @@ class TestGuiBasicDebugCommandTest(PExpectTest): escape_key = chr(27).encode() - # Start the GUI and close the welcome window. + # Start the GUI. self.child.sendline("gui") - self.child.expect("Welcome to the LLDB curses GUI.") - self.child.send(escape_key) # Simulate a simple debugging session. self.child.send("s") # step diff --git a/lldb/test/API/commands/gui/breakpoints/TestGuiBreakpoints.py b/lldb/test/API/commands/gui/breakpoints/TestGuiBreakpoints.py index 70729594fde4..627fa7a9aed9 100644 --- a/lldb/test/API/commands/gui/breakpoints/TestGuiBreakpoints.py +++ b/lldb/test/API/commands/gui/breakpoints/TestGuiBreakpoints.py @@ -29,9 +29,8 @@ class TestGuiBasicDebugCommandTest(PExpectTest): escape_key = chr(27).encode() down_key = chr(27)+'OB' # for vt100 terminal (lldbexpect sets TERM=vt100) - # Start the GUI and close the welcome window. + # Start the GUI. self.child.sendline("gui") - self.child.send(escape_key) self.child.expect_exact("Sources") # wait for gui # Go to next line, set a breakpoint. diff --git a/lldb/test/API/commands/gui/viewlarge/TestGuiViewLarge.py b/lldb/test/API/commands/gui/viewlarge/TestGuiViewLarge.py index b1be950dd200..633aa1f57008 100644 --- a/lldb/test/API/commands/gui/viewlarge/TestGuiViewLarge.py +++ b/lldb/test/API/commands/gui/viewlarge/TestGuiViewLarge.py @@ -31,9 +31,8 @@ class GuiViewLargeCommandTest(PExpectTest): right_key = chr(27)+'OC' ctrl_l = chr(12) - # Start the GUI and close the welcome window. + # Start the GUI. self.child.sendline("gui") - self.child.send(escape_key) # Check the sources window. self.child.expect_exact("Sources")