imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-04-02 05:27:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

impr: Properly display custom encoding characters that are split between lines

Browse Source
This commit is contained in:
WerWolv
2023-03-14 09:35:43 +01:00
parent bd190d2b65
commit 3a840c4ced
4 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
plugins/builtin/source/ui/hex_editor.cpp
View File

@@ -93,8 +93,10 @@ namespace hex::plugin::builtin::ui {
{
auto bytesPerRow = ContentRegistry::Settings::getSetting("hex.builtin.setting.hex_editor", "hex.builtin.setting.hex_editor.bytes_per_row");
if (bytesPerRow.is_number())
if (bytesPerRow.is_number()) {
this->m_bytesPerRow = static_cast<int>(bytesPerRow);
this->m_encodingLineStartAddresses.clear();
}
}
{
@@ -195,12 +197,34 @@ namespace hex::plugin::builtin::ui {
ImColor color;
};
static CustomEncodingData queryCustomEncodingData(prv::Provider *provider, const EncodingFile &encodingFile, u64 address) {
static CustomEncodingData queryCustomEncodingData(prv::Provider *provider, const EncodingFile &encodingFile, std::vector<u64> &lineStartAddresses, u32 bytesPerRow, u64 address) {
const auto longestSequence = encodingFile.getLongestSequence();
if (longestSequence == 0)
return { ".", 1, 0xFFFF8000 };
if (lineStartAddresses.empty() || lineStartAddresses.size() <= address / bytesPerRow) {
auto prevSize = lineStartAddresses.size();
auto newSize = address / bytesPerRow + 1;
lineStartAddresses.reserve(newSize);
std::vector<u8> buffer;
for (auto i = prevSize; i < newSize; i++) {
u32 offset = 0;
while (offset < bytesPerRow) {
size_t readSize = std::min<size_t>(longestSequence, provider->getActualSize() - address);
buffer.resize(readSize);
provider->read(address, buffer.data(), readSize);
offset += encodingFile.getEncodingLengthFor(buffer);
}
lineStartAddresses.push_back(offset % bytesPerRow);
}
}
address += lineStartAddresses[address / bytesPerRow];
size_t size = std::min<size_t>(longestSequence, provider->getActualSize() - address);
std::vector<u8> buffer(size);
@@ -560,7 +584,7 @@ namespace hex::plugin::builtin::ui {
do {
const u64 address = y * this->m_bytesPerRow + offset + this->m_provider->getBaseAddress() + this->m_provider->getCurrentPageAddress();
auto result = queryCustomEncodingData(this->m_provider, *this->m_currCustomEncoding, address);
auto result = queryCustomEncodingData(this->m_provider, *this->m_currCustomEncoding, this->m_encodingLineStartAddresses, this->m_bytesPerRow, address);
offset += std::max<size_t>(1, result.advance);
encodingData.emplace_back(address, result);