Rooba
/
ImHex
mirror of https://github.com/WerWolv/ImHex.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Wrong drawing logic for custom encoding characters (#1150) 

fix https://github.com/WerWolv/ImHex/issues/1146
related
3a840c4ced
This commit is contained in:
shenleban tongying 2023-06-20 18:30:26 -04:00 committed by GitHub
parent c8150f3261
commit b223d9b0ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,34 +122,12 @@ namespace hex::plugin::builtin::ui {
ImColor color; ImColor color;
}; };
static CustomEncodingData queryCustomEncodingData(prv::Provider *provider, const EncodingFile &encodingFile, std::vector<u64> &lineStartAddresses, u32 bytesPerRow, u64 address) { static CustomEncodingData queryCustomEncodingData(prv::Provider *provider, const EncodingFile &encodingFile, u64 address) {
const auto longestSequence = encodingFile.getLongestSequence(); const auto longestSequence = encodingFile.getLongestSequence();
if (longestSequence == 0) if (longestSequence == 0)
return { ".", 1, 0xFFFF8000 }; 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); size_t size = std::min<size_t>(longestSequence, provider->getActualSize() - address);
std::vector<u8> buffer(size); std::vector<u8> buffer(size);
@ -517,16 +495,28 @@ namespace hex::plugin::builtin::ui {
// Draw Custom encoding column // Draw Custom encoding column
if (this->m_showCustomEncoding && this->m_currCustomEncoding.has_value()) { if (this->m_showCustomEncoding && this->m_currCustomEncoding.has_value()) {
std::vector<std::pair<u64, CustomEncodingData>> encodingData; std::vector<std::pair<u64, CustomEncodingData>> encodingData;
u32 offset = 0;
if (this->m_encodingLineStartAddresses.empty()) {
this->m_encodingLineStartAddresses.push_back(0);
}
if (this->m_encodingLineStartAddresses[y] >= this->m_bytesPerRow) {
encodingData.emplace_back(y * this->m_bytesPerRow + this->m_provider->getBaseAddress() + this->m_provider->getCurrentPageAddress(), CustomEncodingData(".", 1, ImGui::GetCustomColorU32(ImGuiCustomCol_ToolbarRed)));
this->m_encodingLineStartAddresses.push_back(0);
} else {
u32 offset = this->m_encodingLineStartAddresses[y];
do { do {
const u64 address = y * this->m_bytesPerRow + offset + this->m_provider->getBaseAddress() + this->m_provider->getCurrentPageAddress(); 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, this->m_encodingLineStartAddresses, this->m_bytesPerRow, address); auto result = queryCustomEncodingData(this->m_provider, *this->m_currCustomEncoding, address);
offset += std::max<size_t>(1, result.advance);
offset += result.advance;
encodingData.emplace_back(address, result); encodingData.emplace_back(address, result);
} while (offset < this->m_bytesPerRow); } while (offset < this->m_bytesPerRow);
this->m_encodingLineStartAddresses.push_back(offset - this->m_bytesPerRow);
}
ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, ImVec2(0, 0)); ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, ImVec2(0, 0));
ImGui::PushID(y); ImGui::PushID(y);
if (ImGui::BeginTable("##encoding_cell", encodingData.size(), ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_NoKeepColumnsVisible)) { if (ImGui::BeginTable("##encoding_cell", encodingData.size(), ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_NoKeepColumnsVisible)) {