mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-12-28 00:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUI: Remove ANSI color code from TTY

Browse Source
This commit is contained in:
illusion0001 2023-02-03 17:32:00 -06:00 committed by Megamouse
parent acf9caa4ae
commit ba06198012
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rpcs3/rpcs3qt/gui_settings.h
View File

@ -199,6 +199,7 @@ namespace gui
const gui_save l_stack_err = gui_save(logger, "ERR_stack", true);
const gui_save l_stack = gui_save(logger, "stack", true);
const gui_save l_stack_tty = gui_save(logger, "TTY_stack", false);
const gui_save l_ansi_code = gui_save(logger, "ANSI_code", true);
const gui_save l_limit = gui_save(logger, "limit", 1000);
const gui_save l_limit_tty = gui_save(logger, "TTY_limit", 1000);

24
rpcs3/rpcs3qt/log_frame.cpp
View File

@ -249,6 +249,14 @@ void log_frame::CreateAndConnectActions()
m_stack_tty = checked;
});
m_ansi_act_tty = new QAction(tr("ANSI Code (TTY)"), this);
m_ansi_act_tty->setCheckable(true);
connect(m_ansi_act_tty, &QAction::toggled, [this](bool checked)
{
m_gui_settings->SetValue(gui::l_ansi_code, checked);
m_ansi_tty = checked;
});
m_tty_channel_acts = new QActionGroup(this);
// Special Channel: All
QAction* all_channels_act = new QAction(tr("All user channels"), m_tty_channel_acts);
@ -344,6 +352,7 @@ void log_frame::CreateAndConnectActions()
menu->addSeparator();
menu->addAction(m_tty_act);
menu->addAction(m_stack_act_tty);
menu->addAction(m_ansi_act_tty);
menu->addSeparator();
menu->addActions(m_tty_channel_acts->actions());
menu->exec(m_tty->viewport()->mapToGlobal(pos));
@ -402,8 +411,10 @@ void log_frame::LoadSettings()
SetTTYLogging(m_gui_settings->GetValue(gui::l_tty).toBool());
m_stack_log = m_gui_settings->GetValue(gui::l_stack).toBool();
m_stack_tty = m_gui_settings->GetValue(gui::l_stack_tty).toBool();
m_ansi_tty = m_gui_settings->GetValue(gui::l_ansi_code).toBool();
m_stack_act_log->setChecked(m_stack_log);
m_stack_act_tty->setChecked(m_stack_tty);
m_ansi_act_tty->setChecked(m_ansi_tty);
m_stack_act_err->setChecked(!g_log_all_errors);
s_gui_listener.show_prefix = m_gui_settings->GetValue(gui::l_prefix).toBool();
@ -544,7 +555,18 @@ void log_frame::UpdateUI()
// clear selection or else it will get colorized as well
text_cursor.clearSelection();
const QString tty_text = QString::fromStdString(buf_line);
QString tty_text;
if (m_ansi_tty)
{
tty_text = QString::fromStdString(buf_line);
}
else
{
// Strip ANSI color code
static const QRegularExpression ansi_color_code("\\[\\d+;\\d+(;\\d+)?m|\\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]");
tty_text = QString::fromStdString(buf_line).remove(ansi_color_code);
}
// create counter suffix and remove recurring line if needed
if (m_stack_tty)

2
rpcs3/rpcs3qt/log_frame.h
View File

@ -60,6 +60,7 @@ private:
usz m_tty_counter{};
bool m_stack_log{};
bool m_stack_tty{};
bool m_ansi_tty{};
logs::level m_old_log_level{};
fs::file m_tty_file;
@ -83,6 +84,7 @@ private:
QAction* m_stack_act_log = nullptr;
QAction* m_stack_act_tty = nullptr;
QAction* m_ansi_act_tty = nullptr;
QAction* m_stack_act_err = nullptr;
QAction* m_show_prefix_act = nullptr;