mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 04:37:44 +00:00
LibVT+Everywhere: Introduce 'automarks' and 'clear previous command'
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:
parent
cde528fdd9
commit
54ab6fe5b9
12 changed files with 238 additions and 0 deletions
|
@ -284,6 +284,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
window->set_obey_widget_min_size(false);
|
||||
|
||||
auto terminal = window->set_main_widget<VT::TerminalWidget>(ptm_fd, true);
|
||||
terminal->set_startup_process_id(shell_pid);
|
||||
|
||||
terminal->on_command_exit = [&] {
|
||||
app->quit(0);
|
||||
};
|
||||
|
@ -309,6 +311,13 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
terminal->set_bell_mode(VT::TerminalWidget::BellMode::Visible);
|
||||
}
|
||||
|
||||
auto automark = Config::read_string("Terminal"sv, "Terminal"sv, "AutoMark"sv, "MarkInteractiveShellPrompt"sv);
|
||||
if (automark == "MarkNothing") {
|
||||
terminal->set_auto_mark_mode(VT::TerminalWidget::AutoMarkMode::MarkNothing);
|
||||
} else {
|
||||
terminal->set_auto_mark_mode(VT::TerminalWidget::AutoMarkMode::MarkInteractiveShellPrompt);
|
||||
}
|
||||
|
||||
auto cursor_shape = VT::TerminalWidget::parse_cursor_shape(Config::read_string("Terminal"sv, "Cursor"sv, "Shape"sv, "Block"sv)).value_or(VT::CursorShape::Block);
|
||||
terminal->set_cursor_shape(cursor_shape);
|
||||
|
||||
|
@ -399,6 +408,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
window->set_fullscreen(!window->is_fullscreen());
|
||||
}));
|
||||
view_menu->add_action(terminal->clear_including_history_action());
|
||||
view_menu->add_action(terminal->clear_to_previous_mark_action());
|
||||
|
||||
auto adjust_font_size = [&](float adjustment, Gfx::Font::AllowInexactSizeMatch preference) {
|
||||
auto& font = terminal->font();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue