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

LibVT+TerminalSettings: Move settings parsing functions to LibVT

Browse Source 
This change moves the automark and bell settings parsing functions to
LibVT, so that they can be shared between Terminal and TerminalSettings.
This commit is contained in:
Tim Ledbetter 2024-02-07 06:05:16 +00:00 committed by Ali Mohammad Pur
parent 2850bb881a
commit 5c8962b8f1
Notes: sideshowbarker 2024-07-16 23:17:55 +09:00 
Author: https://github.com/tcl3
Commit: https://github.com/SerenityOS/serenity/commit/5c8962b8f1
Pull-request: https://github.com/SerenityOS/serenity/pull/23107
4 changed files with 52 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
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)).value_or(VT::TerminalWidget::BellMode::Visible);
m_bell_mode = VT::TerminalWidget::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)).value_or(VT::TerminalWidget::AutoMarkMode::MarkInteractiveShellPrompt);
m_automark_mode = VT::TerminalWidget::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) {
@ -63,17 +63,17 @@ ErrorOr<void> MainWidget::setup()
beep_bell_radio.on_checked = [this](bool) {
m_bell_mode = VT::TerminalWidget::BellMode::AudibleBeep;
Config::write_string("Terminal"sv, "Window"sv, "Bell"sv, stringify_bell(m_bell_mode));
Config::write_string("Terminal"sv, "Window"sv, "Bell"sv, VT::TerminalWidget::stringify_bell(m_bell_mode));
set_modified(true);
};
visual_bell_radio.on_checked = [this](bool) {
m_bell_mode = VT::TerminalWidget::BellMode::Visible;
Config::write_string("Terminal"sv, "Window"sv, "Bell"sv, stringify_bell(m_bell_mode));
Config::write_string("Terminal"sv, "Window"sv, "Bell"sv, VT::TerminalWidget::stringify_bell(m_bell_mode));
set_modified(true);
};
no_bell_radio.on_checked = [this](bool) {
m_bell_mode = VT::TerminalWidget::BellMode::Disabled;
Config::write_string("Terminal"sv, "Window"sv, "Bell"sv, stringify_bell(m_bell_mode));
Config::write_string("Terminal"sv, "Window"sv, "Bell"sv, VT::TerminalWidget::stringify_bell(m_bell_mode));
set_modified(true);
};
@ -88,12 +88,12 @@ ErrorOr<void> MainWidget::setup()
automark_off_radio.on_checked = [this](bool) {
m_automark_mode = VT::TerminalWidget::AutoMarkMode::MarkNothing;
Config::write_string("Terminal"sv, "Terminal"sv, "AutoMark"sv, stringify_automark_mode(m_automark_mode));
Config::write_string("Terminal"sv, "Terminal"sv, "AutoMark"sv, VT::TerminalWidget::stringify_automark_mode(m_automark_mode));
set_modified(true);
};
automark_on_interactive_prompt_radio.on_checked = [this](bool) {
m_automark_mode = VT::TerminalWidget::AutoMarkMode::MarkInteractiveShellPrompt;
Config::write_string("Terminal"sv, "Terminal"sv, "AutoMark"sv, stringify_automark_mode(m_automark_mode));
Config::write_string("Terminal"sv, "Terminal"sv, "AutoMark"sv, VT::TerminalWidget::stringify_automark_mode(m_automark_mode));
set_modified(true);
};
@ -109,46 +109,6 @@ ErrorOr<void> MainWidget::setup()
return {};
}
Optional<VT::TerminalWidget::BellMode> MainWidget::parse_bell(StringView bell_string)
{
if (bell_string == "AudibleBeep")
return VT::TerminalWidget::BellMode::AudibleBeep;
if (bell_string == "Visible")
return VT::TerminalWidget::BellMode::Visible;
if (bell_string == "Disabled")
return VT::TerminalWidget::BellMode::Disabled;
return {};
}
ByteString MainWidget::stringify_bell(VT::TerminalWidget::BellMode bell_mode)
{
if (bell_mode == VT::TerminalWidget::BellMode::AudibleBeep)
return "AudibleBeep";
if (bell_mode == VT::TerminalWidget::BellMode::Disabled)
return "Disabled";
if (bell_mode == VT::TerminalWidget::BellMode::Visible)
return "Visible";
VERIFY_NOT_REACHED();
}
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;
return {};
}
ByteString MainWidget::stringify_automark_mode(VT::TerminalWidget::AutoMarkMode automark_mode)
{
if (automark_mode == VT::TerminalWidget::AutoMarkMode::MarkNothing)
return "MarkNothing";
if (automark_mode == VT::TerminalWidget::AutoMarkMode::MarkInteractiveShellPrompt)
return "MarkInteractiveShellPrompt";
VERIFY_NOT_REACHED();
}
void MainWidget::apply_settings()
{
m_original_bell_mode = m_bell_mode;
@ -158,7 +118,7 @@ void MainWidget::apply_settings()
void MainWidget::write_back_settings() const
{
Config::write_bool("Terminal"sv, "Terminal"sv, "ConfirmClose"sv, m_orignal_confirm_close);
Config::write_string("Terminal"sv, "Window"sv, "Bell"sv, stringify_bell(m_original_bell_mode));
Config::write_string("Terminal"sv, "Window"sv, "Bell"sv, VT::TerminalWidget::stringify_bell(m_original_bell_mode));
}
void MainWidget::cancel_settings()

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

@ -28,11 +28,6 @@ private:
ErrorOr<void> setup();
void write_back_settings() const;
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);
VT::TerminalWidget::BellMode m_bell_mode { VT::TerminalWidget::BellMode::Disabled };
VT::TerminalWidget::AutoMarkMode m_automark_mode { VT::TerminalWidget::AutoMarkMode::MarkInteractiveShellPrompt };
bool m_confirm_close { true };

40
Userland/Libraries/LibVT/TerminalWidget.cpp
View File

@ -1415,6 +1415,46 @@ ByteString TerminalWidget::stringify_cursor_shape(VT::CursorShape cursor_shape)
VERIFY_NOT_REACHED();
}
Optional<TerminalWidget::BellMode> TerminalWidget::parse_bell(StringView bell_string)
{
if (bell_string == "AudibleBeep")
return BellMode::AudibleBeep;
if (bell_string == "Visible")
return BellMode::Visible;
if (bell_string == "Disabled")
return BellMode::Disabled;
return {};
}
ByteString TerminalWidget::stringify_bell(TerminalWidget::BellMode bell_mode)
{
if (bell_mode == BellMode::AudibleBeep)
return "AudibleBeep";
if (bell_mode == BellMode::Disabled)
return "Disabled";
if (bell_mode == BellMode::Visible)
return "Visible";
VERIFY_NOT_REACHED();
}
Optional<TerminalWidget::AutoMarkMode> TerminalWidget::parse_automark_mode(StringView automark_mode)
{
if (automark_mode == "MarkNothing")
return AutoMarkMode::MarkNothing;
if (automark_mode == "MarkInteractiveShellPrompt")
return AutoMarkMode::MarkInteractiveShellPrompt;
return {};
}
ByteString TerminalWidget::stringify_automark_mode(AutoMarkMode automark_mode)
{
if (automark_mode == AutoMarkMode::MarkNothing)
return "MarkNothing";
if (automark_mode == AutoMarkMode::MarkInteractiveShellPrompt)
return "MarkInteractiveShellPrompt";
VERIFY_NOT_REACHED();
}
void TerminalWidget::handle_pty_owner_change(pid_t new_owner)
{
if (m_auto_mark_mode == AutoMarkMode::MarkInteractiveShellPrompt && new_owner == m_startup_process_id) {

4
Userland/Libraries/LibVT/TerminalWidget.h
View File

@ -115,7 +115,11 @@ public:
virtual void set_cursor_shape(CursorShape) override;
static Optional<VT::CursorShape> parse_cursor_shape(StringView);
static Optional<BellMode> parse_bell(StringView);
static Optional<AutoMarkMode> parse_automark_mode(StringView);
static ByteString stringify_cursor_shape(VT::CursorShape);
static ByteString stringify_bell(BellMode);
static ByteString stringify_automark_mode(AutoMarkMode);
private:
TerminalWidget(int ptm_fd, bool automatic_size_policy);