1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 06:57:45 +00:00

Terminal+TerminalSettings: Allow disabling close confirmations

This commit is contained in:
MacDue 2022-05-04 21:36:07 +01:00 committed by Ali Mohammad Pur
parent d5b550096e
commit e268659d32
4 changed files with 48 additions and 3 deletions

View file

@ -57,8 +57,11 @@ public:
{ {
VERIFY(domain == "Terminal"); VERIFY(domain == "Terminal");
if (group == "Terminal" && key == "ShowScrollBar") { if (group == "Terminal") {
m_parent_terminal.set_show_scrollbar(value); if (key == "ShowScrollBar")
m_parent_terminal.set_show_scrollbar(value);
else if (key == "ConfirmClose" && on_confirm_close_changed)
on_confirm_close_changed(value);
} }
} }
@ -99,6 +102,8 @@ public:
} }
} }
Function<void(bool)> on_confirm_close_changed;
private: private:
VT::TerminalWidget& m_parent_terminal; VT::TerminalWidget& m_parent_terminal;
}; };
@ -297,6 +302,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
Config::monitor_domain("Terminal"); Config::monitor_domain("Terminal");
auto should_confirm_close = Config::read_bool("Terminal", "Terminal", "ConfirmClose", true);
TerminalChangeListener listener { terminal }; TerminalChangeListener listener { terminal };
auto bell = Config::read_string("Terminal", "Window", "Bell", "Visible"); auto bell = Config::read_string("Terminal", "Window", "Bell", "Visible");
@ -352,6 +358,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}; };
auto check_terminal_quit = [&]() -> int { auto check_terminal_quit = [&]() -> int {
if (!should_confirm_close)
return GUI::MessageBox::ExecOK;
Optional<String> close_message; Optional<String> close_message;
if (tty_has_foreground_process()) { if (tty_has_foreground_process()) {
close_message = "There is still a process running in this terminal. Closing the terminal will kill it."; close_message = "There is still a process running in this terminal. Closing the terminal will kill it.";
@ -420,8 +428,19 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->set_modified(tty_has_foreground_process() || shell_child_process_count() > 0); window->set_modified(tty_has_foreground_process() || shell_child_process_count() > 0);
}); });
listener.on_confirm_close_changed = [&](bool confirm_close) {
if (confirm_close) {
modified_state_check_timer->start();
} else {
modified_state_check_timer->stop();
window->set_modified(false);
}
should_confirm_close = confirm_close;
};
window->show(); window->show();
modified_state_check_timer->start(); if (should_confirm_close)
modified_state_check_timer->start();
int result = app->exec(); int result = app->exec();
dbgln("Exiting terminal, updating utmp"); dbgln("Exiting terminal, updating utmp");
utmp_update(ptsname, 0, false); utmp_update(ptsname, 0, false);

View file

@ -61,4 +61,17 @@
orientation: "Horizontal" orientation: "Horizontal"
} }
} }
@GUI::GroupBox {
title: "Exit Behaviour"
shrink_to_fit: true
layout: @GUI::VerticalBoxLayout {
margins: [16, 8, 8]
}
@GUI::CheckBox {
name: "terminal_confirm_close"
text: "Ask before closing if processes are running in the terminal"
}
}
} }

View file

@ -83,6 +83,15 @@ TerminalSettingsMainWidget::TerminalSettingsMainWidget()
Config::write_bool("Terminal", "Terminal", "ShowScrollBar", show_scrollbar); Config::write_bool("Terminal", "Terminal", "ShowScrollBar", show_scrollbar);
}; };
show_scrollbar_checkbox.set_checked(m_show_scrollbar); show_scrollbar_checkbox.set_checked(m_show_scrollbar);
m_confirm_close = Config::read_bool("Terminal", "Terminal", "ConfirmClose", true);
m_orignal_confirm_close = m_confirm_close;
auto& confirm_close_checkbox = *find_descendant_of_type_named<GUI::CheckBox>("terminal_confirm_close");
confirm_close_checkbox.on_checked = [&](bool confirm_close) {
m_confirm_close = confirm_close;
Config::write_bool("Terminal", "Terminal", "ConfirmClose", confirm_close);
};
confirm_close_checkbox.set_checked(m_confirm_close);
} }
TerminalSettingsViewWidget::TerminalSettingsViewWidget() TerminalSettingsViewWidget::TerminalSettingsViewWidget()
@ -190,12 +199,14 @@ void TerminalSettingsMainWidget::apply_settings()
m_original_max_history_size = m_max_history_size; m_original_max_history_size = m_max_history_size;
m_orignal_show_scrollbar = m_show_scrollbar; m_orignal_show_scrollbar = m_show_scrollbar;
m_original_bell_mode = m_bell_mode; m_original_bell_mode = m_bell_mode;
m_orignal_confirm_close = m_confirm_close;
write_back_settings(); write_back_settings();
} }
void TerminalSettingsMainWidget::write_back_settings() const void TerminalSettingsMainWidget::write_back_settings() const
{ {
Config::write_i32("Terminal", "Terminal", "MaxHistorySize", static_cast<i32>(m_original_max_history_size)); Config::write_i32("Terminal", "Terminal", "MaxHistorySize", static_cast<i32>(m_original_max_history_size));
Config::write_bool("Terminal", "Terminal", "ShowScrollBar", m_orignal_show_scrollbar); Config::write_bool("Terminal", "Terminal", "ShowScrollBar", m_orignal_show_scrollbar);
Config::write_bool("Terminal", "Terminal", "ConfirmClose", m_orignal_confirm_close);
Config::write_string("Terminal", "Window", "Bell", stringify_bell(m_original_bell_mode)); Config::write_string("Terminal", "Window", "Bell", stringify_bell(m_original_bell_mode));
} }

View file

@ -29,10 +29,12 @@ private:
VT::TerminalWidget::BellMode m_bell_mode = VT::TerminalWidget::BellMode::Disabled; VT::TerminalWidget::BellMode m_bell_mode = VT::TerminalWidget::BellMode::Disabled;
size_t m_max_history_size; size_t m_max_history_size;
bool m_show_scrollbar { true }; bool m_show_scrollbar { true };
bool m_confirm_close { true };
VT::TerminalWidget::BellMode m_original_bell_mode; VT::TerminalWidget::BellMode m_original_bell_mode;
size_t m_original_max_history_size; size_t m_original_max_history_size;
bool m_orignal_show_scrollbar { true }; bool m_orignal_show_scrollbar { true };
bool m_orignal_confirm_close { true };
}; };
class TerminalSettingsViewWidget final : public GUI::SettingsWindow::Tab { class TerminalSettingsViewWidget final : public GUI::SettingsWindow::Tab {