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

LibLine: Avoid crashing on a 0x0 terminal

Browse source 
Some terminals start with a 0x0 buffer, run the shell, then switch to
a normal buffer size; avoid crashing in this case.

Also downgrade the paging TODO to a FIXME, a slightly broken terminal is
okay if all you're doing is using unimplemented features such as putting
too much text into the terminal.
This commit is contained in:
Ali Mohammad Pur 2022-10-27 23:43:36 +03:30 • committed by Ali Mohammad Pur
parent 1ffaad29e1
commit 922fa2e9d0
1 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Userland/Libraries/LibLine/Editor.cpp
View file

@ -201,8 +201,7 @@ Editor::~Editor()
void Editor::ensure_free_lines_from_origin(size_t count) void Editor::ensure_free_lines_from_origin(size_t count)
{ {
if (count > m_num_lines) { if (count > m_num_lines) {
// It's hopeless... // FIXME: Implement paging
TODO();
} }
if (m_origin_row + count <= m_num_lines) if (m_origin_row + count <= m_num_lines)
@ -2174,12 +2173,14 @@ size_t StringMetrics::lines_with_addition(StringMetrics const& offset, size_t co
{ {
size_t lines = 0; size_t lines = 0;
for (size_t i = 0; i < line_metrics.size() - 1; ++i) if (!line_metrics.is_empty()) {
lines += (line_metrics[i].total_length() + column_width) / column_width; for (size_t i = 0; i < line_metrics.size() - 1; ++i)
lines += (line_metrics[i].total_length() + column_width) / column_width;
auto last = line_metrics.last().total_length(); auto last = line_metrics.last().total_length();
last += offset.line_metrics.first().total_length(); last += offset.line_metrics.first().total_length();
lines += (last + column_width) / column_width; lines += (last + column_width) / column_width;
}
for (size_t i = 1; i < offset.line_metrics.size(); ++i) for (size_t i = 1; i < offset.line_metrics.size(); ++i)
lines += (offset.line_metrics[i].total_length() + column_width) / column_width; lines += (offset.line_metrics[i].total_length() + column_width) / column_width;
@ -2192,9 +2193,16 @@ size_t StringMetrics::offset_with_addition(StringMetrics const& offset, size_t c
if (offset.line_metrics.size() > 1) if (offset.line_metrics.size() > 1)
return offset.line_metrics.last().total_length() % column_width; return offset.line_metrics.last().total_length() % column_width;
auto last = line_metrics.last().total_length(); if (!line_metrics.is_empty()) {
last += offset.line_metrics.first().total_length(); auto last = line_metrics.last().total_length();
return last % column_width; last += offset.line_metrics.first().total_length();
return last % column_width;
}
if (offset.line_metrics.is_empty())
return 0;
return offset.line_metrics.first().total_length() % column_width;
} }
bool Editor::Spans::contains_up_to_offset(Spans const& other, size_t offset) const bool Editor::Spans::contains_up_to_offset(Spans const& other, size_t offset) const