RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 05:17:34 +00:00
Code Issues Activity Actions

LibVT+Everywhere: Introduce 'automarks' and 'clear previous command'

Browse source 
Automarks are similar to bookmarks placed by the terminal, allowing the
user to selectively remove a single command and its output from the
terminal scrollback.
This commit implements a single way to add marks: automatically placing
them when the shell becomes interactive.

To make sure the shell behaves correctly after its expected prompt
position changes, the terminal layer forces a resize event to be passed
to the shell on such (possibly) partial clears; this also has the nice
side effect of fixing the disappearing prompt on the preexisting "clear
including history" action: Fixes #4192.
This commit is contained in:
Ali Mohammad Pur 2024-02-06 01:41:35 +03:30 • committed by Ali Mohammad Pur
parent cde528fdd9
commit 54ab6fe5b9
12 changed files with 238 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Userland/Applications/TerminalSettings/MainWidget.cpp
View file

@ -40,10 +40,15 @@ ErrorOr<void> MainWidget::setup()
auto& beep_bell_radio = *find_descendant_of_type_named<GUI::RadioButton>("beep_bell_radio");
auto& visual_bell_radio = *find_descendant_of_type_named<GUI::RadioButton>("visual_bell_radio");
auto& no_bell_radio = *find_descendant_of_type_named<GUI::RadioButton>("no_bell_radio");
auto& automark_off_radio = *find_descendant_of_type_named<GUI::RadioButton>("automark_of");
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_original_bell_mode = m_bell_mode;
m_automark_mode = parse_automark_mode(Config::read_string("Terminal"sv, "Terminal"sv, "AutoMark"sv));
m_original_automark_mode = m_automark_mode;
switch (m_bell_mode) {
case VT::TerminalWidget::BellMode::Visible:
visual_bell_radio.set_checked(true, GUI::AllowCallback::No);
@ -72,6 +77,26 @@ ErrorOr<void> MainWidget::setup()
set_modified(true);
};
switch (m_automark_mode) {
case VT::TerminalWidget::AutoMarkMode::MarkNothing:
automark_off_radio.set_checked(true, GUI::AllowCallback::No);
break;
case VT::TerminalWidget::AutoMarkMode::MarkInteractiveShellPrompt:
automark_on_interactive_prompt_radio.set_checked(true, GUI::AllowCallback::No);
break;
}
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));
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));
set_modified(true);
};
m_confirm_close = Config::read_bool("Terminal"sv, "Terminal"sv, "ConfirmClose"sv, true);
m_orignal_confirm_close = m_confirm_close;
auto& confirm_close_checkbox = *find_descendant_of_type_named<GUI::CheckBox>("terminal_confirm_close");
@ -106,6 +131,24 @@ ByteString MainWidget::stringify_bell(VT::TerminalWidget::BellMode bell_mode)
VERIFY_NOT_REACHED();
}
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();
}
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;