mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-20 02:42:42 +01:00
Code Issues Releases Wiki Activity

Codechange: Use Utf8View to const-iterate over strings, if no particular error handling is needed.

Browse Source
This commit is contained in:
frosch
2025-04-02 16:16:14 +02:00
committed by frosch
parent 22ab0244d8
commit f06bfc0dad
5 changed files with 45 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/gfx_layout.cpp
View File

@@ -12,6 +12,7 @@
#include "gfx_layout.h"
#include "string_func.h"
#include "strings_func.h"
#include "core/utf8.hpp"
#include "debug.h"
#include "table/control_codes.h"
@@ -74,15 +75,12 @@ static inline void GetLayouter(Layouter::LineCacheItem &line, std::string_view s
font_mapping.clear();
auto cur = str.begin();
/*
* Go through the whole string while adding Font instances to the font map
* whenever the font changes, and convert the wide characters into a format
* usable by ParagraphLayout.
*/
for (; buff < buffer_last && cur != str.end();) {
char32_t c = Utf8Consume(cur);
for (char32_t c : Utf8View(str)) {
if (c == '\0' || c == '\n') {
/* Caller should already have filtered out these characters. */
NOT_REACHED();
@@ -102,6 +100,7 @@ static inline void GetLayouter(Layouter::LineCacheItem &line, std::string_view s
* needed for RTL languages which need more proper shaping support. */
if (!T::SUPPORTS_RTL && IsTextDirectionChar(c)) continue;
buff += T::AppendToBuffer(buff, buffer_last, c);
if (buff >= buffer_last) break;
continue;
}
@@ -235,24 +234,28 @@ ParagraphLayouter::Position Layouter::GetCharPosition(std::string_view::const_it
return p;
}
/* Initial position, returned if character not found. */
const ParagraphLayouter::Position initial_position = Point{_current_text_dir == TD_LTR ? 0 : line->GetWidth(), 0};
/* Find the code point index which corresponds to the char
* pointer into our UTF-8 source string. */
size_t index = 0;
auto str = this->string.begin();
while (str < ch) {
char32_t c = Utf8Consume(str);
if (!IsConsumedFormattingCode(c)) index += line->GetInternalCharLength(c);
{
Utf8View view(this->string);
const size_t offset = ch - this->string.begin();
const auto pos = view.GetIterAtByte(offset);
/* We couldn't find the code point index. */
if (pos.GetByteOffset() != offset) return initial_position;
for (auto it = view.begin(); it < pos; ++it) {
char32_t c = *it;
if (!IsConsumedFormattingCode(c)) index += line->GetInternalCharLength(c);
}
}
/* Initial position, returned if character not found. */
const ParagraphLayouter::Position initial_position = Point{_current_text_dir == TD_LTR ? 0 : line->GetWidth(), 0};
const ParagraphLayouter::Position *position = &initial_position;
/* We couldn't find the code point index. */
if (str != ch) return *position;
/* Valid character. */
/* Scan all runs until we've found our code point index. */
size_t best_index = SIZE_MAX;
for (int run_index = 0; run_index < line->CountRuns(); run_index++) {
@@ -311,10 +314,11 @@ ptrdiff_t Layouter::GetCharAtPosition(int x, size_t line_index) const
size_t index = charmap[i];
size_t cur_idx = 0;
for (auto str = this->string.begin(); str != this->string.end();) {
if (cur_idx == index) return str - this->string.begin();
Utf8View view(this->string);
for (auto it = view.begin(), end = view.end(); it != end; ++it) {
if (cur_idx == index) return it.GetByteOffset();
char32_t c = Utf8Consume(str);
char32_t c = *it;
if (!IsConsumedFormattingCode(c)) cur_idx += line->GetInternalCharLength(c);
}
}