RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 09:04:59 +00:00
Code Issues Activity Actions

less: Use LibLine to compute line arrangement with fixed line width

Browse source
This commit is contained in:
Lucas CHOLLET 2022-11-08 01:58:46 +01:00 • committed by Ali Mohammad Pur
parent 299ca10fd5
commit 84fd011c49
2 changed files with 9 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

47
Userland/Utilities/less.cpp
View file

@ -4,19 +4,12 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <AK/Format.h>
#include <AK/HashMap.h>
#include <AK/LexicalPath.h>
#include <AK/String.h>
#include <AK/StringBuilder.h>
#include <AK/Utf8View.h>
#include <AK/Vector.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/System.h>
#include <LibLine/Editor.h>
#include <LibMain/Main.h>
#include <csignal>
#include <ctype.h>
#include <fcntl.h>
#include <stdio.h>
#include <sys/ioctl.h>
#include <termios.h>
@ -59,41 +52,15 @@ static ErrorOr<void> teardown_tty(bool switch_buffer)
static Vector<StringView> wrap_line(String const& string, size_t width)
{
Utf8View utf8(string);
Vector<size_t> splits;
size_t offset = 0;
bool in_ansi = false;
// for (auto codepoint : string) {
for (auto it = utf8.begin(); it != utf8.end(); ++it) {
if (offset >= width) {
splits.append(utf8.byte_offset_of(it));
offset = 0;
}
if (*it == '\e')
in_ansi = true;
if (!in_ansi) {
if (*it == '\t') {
// Tabs are a special case, because their width is variable.
offset += (8 - (offset % 8));
} else {
// FIXME: calculate the printed width of the character.
offset++;
}
}
if (isalpha(*it))
in_ansi = false;
}
auto const result = Line::Editor::actual_rendered_string_metrics(string, {}, width);
Vector<StringView> spans;
size_t span_start = 0;
for (auto split : splits) {
spans.append(string.substring_view(span_start, split - span_start));
span_start = split;
for (auto const& line_metric : result.line_metrics) {
VERIFY(line_metric.bit_length.has_value());
auto const bit_length = line_metric.bit_length.value();
spans.append(string.substring_view(span_start, bit_length));
span_start += bit_length;
}
spans.append(string.substring_view(span_start));