LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-28 13:43:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

TerminalSettings: Provide default values for terminal settings

Browse Source 
The change ensures that functions that parse string values for terminal
settings fall back to a default value, if there is no value present or
the value is invalid.
This commit is contained in:
Tim Ledbetter 2024-02-07 06:05:16 +00:00 committed by Ali Mohammad Pur
parent 1df31e426d
commit 2850bb881a
Notes: sideshowbarker 2024-07-17 01:12:07 +09:00 
Author: https://github.com/tcl3
Commit: https://github.com/SerenityOS/serenity/commit/2850bb881a
Pull-request: https://github.com/SerenityOS/serenity/pull/23107
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Userland/Applications/TerminalSettings/MainWidget.cpp
View File

@ -43,10 +43,10 @@ ErrorOr<void> MainWidget::setup()
auto& automark_off_radio = *find_descendant_of_type_named<GUI::RadioButton>("automark_off");
auto& automark_on_interactive_prompt_radio = *find_descendant_of_type_named<GUI::RadioButton>("automark_on_interactive_prompt");
m_bell_mode = parse_bell(Config::read_string("Terminal"sv, "Window"sv, "Bell"sv));
m_bell_mode = parse_bell(Config::read_string("Terminal"sv, "Window"sv, "Bell"sv)).value_or(VT::TerminalWidget::BellMode::Visible);
m_original_bell_mode = m_bell_mode;
m_automark_mode = parse_automark_mode(Config::read_string("Terminal"sv, "Terminal"sv, "AutoMark"sv));
m_automark_mode = parse_automark_mode(Config::read_string("Terminal"sv, "Terminal"sv, "AutoMark"sv)).value_or(VT::TerminalWidget::AutoMarkMode::MarkInteractiveShellPrompt);
m_original_automark_mode = m_automark_mode;
switch (m_bell_mode) {
@ -109,7 +109,7 @@ ErrorOr<void> MainWidget::setup()
return {};
}
VT::TerminalWidget::BellMode MainWidget::parse_bell(StringView bell_string)
Optional<VT::TerminalWidget::BellMode> MainWidget::parse_bell(StringView bell_string)
{
if (bell_string == "AudibleBeep")
return VT::TerminalWidget::BellMode::AudibleBeep;
@ -117,7 +117,7 @@ VT::TerminalWidget::BellMode MainWidget::parse_bell(StringView bell_string)
return VT::TerminalWidget::BellMode::Visible;
if (bell_string == "Disabled")
return VT::TerminalWidget::BellMode::Disabled;
VERIFY_NOT_REACHED();
return {};
}
ByteString MainWidget::stringify_bell(VT::TerminalWidget::BellMode bell_mode)
@ -131,13 +131,13 @@ ByteString MainWidget::stringify_bell(VT::TerminalWidget::BellMode bell_mode)
VERIFY_NOT_REACHED();
}
VT::TerminalWidget::AutoMarkMode MainWidget::parse_automark_mode(StringView automark_mode)
Optional<VT::TerminalWidget::AutoMarkMode> MainWidget::parse_automark_mode(StringView automark_mode)
{
if (automark_mode == "MarkNothing")
return VT::TerminalWidget::AutoMarkMode::MarkNothing;
if (automark_mode == "MarkInteractiveShellPrompt")
return VT::TerminalWidget::AutoMarkMode::MarkInteractiveShellPrompt;
VERIFY_NOT_REACHED();
return {};
}
ByteString MainWidget::stringify_automark_mode(VT::TerminalWidget::AutoMarkMode automark_mode)

4
Userland/Applications/TerminalSettings/MainWidget.h
View File

@ -28,8 +28,8 @@ private:
ErrorOr<void> setup();
void write_back_settings() const;
static VT::TerminalWidget::BellMode parse_bell(StringView bell_string);
static VT::TerminalWidget::AutoMarkMode parse_automark_mode(StringView automark_mode);
static Optional<VT::TerminalWidget::BellMode> parse_bell(StringView bell_string);
static Optional<VT::TerminalWidget::AutoMarkMode> parse_automark_mode(StringView automark_mode);
static ByteString stringify_bell(VT::TerminalWidget::BellMode bell_mode);
static ByteString stringify_automark_mode(VT::TerminalWidget::AutoMarkMode automark_mode);