Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-01-31 03:53:44 +01:00
Code Releases Wiki Activity

patterns: Fixed various render issues

Browse Source
This commit is contained in:
WerWolv 2022-04-07 12:47:45 +02:00
parent 0462cc3d0c
commit 76f732dc53
8 changed files with 79 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libimhex/include/hex/helpers/logger.hpp
View File

@ -41,26 +41,26 @@ namespace hex::log {
[[maybe_unused]] void debug(const std::string &fmt, auto &&...args) {
#if defined(DEBUG)
print(fg(fmt::color::green_yellow) | fmt::emphasis::bold, "[DEBUG]", fmt, args...);
hex::log::print(fg(fmt::color::green_yellow) | fmt::emphasis::bold, "[DEBUG]", fmt, args...);
#else
hex::unused(fmt, args...);
#endif
}
[[maybe_unused]] void info(const std::string &fmt, auto &&...args) {
print(fg(fmt::color::cadet_blue) | fmt::emphasis::bold, "[INFO] ", fmt, args...);
hex::log::print(fg(fmt::color::cadet_blue) | fmt::emphasis::bold, "[INFO] ", fmt, args...);
}
[[maybe_unused]] void warn(const std::string &fmt, auto &&...args) {
print(fg(fmt::color::orange) | fmt::emphasis::bold, "[WARN] ", fmt, args...);
hex::log::print(fg(fmt::color::orange) | fmt::emphasis::bold, "[WARN] ", fmt, args...);
}
[[maybe_unused]] void error(const std::string &fmt, auto &&...args) {
print(fg(fmt::color::red) | fmt::emphasis::bold, "[ERROR]", fmt, args...);
hex::log::print(fg(fmt::color::red) | fmt::emphasis::bold, "[ERROR]", fmt, args...);
}
[[maybe_unused]] void fatal(const std::string &fmt, auto &&...args) {
print(fg(fmt::color::purple) | fmt::emphasis::bold, "[FATAL]", fmt, args...);
hex::log::print(fg(fmt::color::purple) | fmt::emphasis::bold, "[FATAL]", fmt, args...);
}
[[maybe_unused]] void redirectToFile();

129
lib/libimhex/include/hex/pattern_language/pattern_drawer.hpp
View File

@ -20,8 +20,8 @@
#include <nlohmann/json.hpp>
namespace {
constexpr static auto DisplayEndDefault = 50u;
constexpr static auto DisplayEndStep = 50u;
constexpr auto DisplayEndDefault = 50u;
constexpr auto DisplayEndStep = 50u;
template<typename T>
concept ArrayPattern = requires(T pattern, std::function<void(int, hex::pl::Pattern&)> fn) {
@ -53,9 +53,9 @@ namespace hex::pl {
void visit(PatternBitfieldField& pattern) override {
ImGui::TableNextRow();
ImGui::TableNextColumn();
this->drawNameColumn(pattern);
this->makeSelectable(pattern);
this->drawColorColumn(pattern);
drawNameColumn(pattern);
makeSelectable(pattern);
drawColorColumn(pattern);
auto byteAddr = pattern.getOffset() + pattern.getBitOffset() / 8;
auto firstBitIdx = pattern.getBitOffset() % 8;
@ -84,14 +84,14 @@ namespace hex::pl {
if (!pattern.isInlined()) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
open = this->createTreeNode(pattern);
open = createTreeNode(pattern);
ImGui::TableNextColumn();
this->makeSelectable(pattern);
this->drawCommentTooltip(pattern);
makeSelectable(pattern);
drawCommentTooltip(pattern);
ImGui::TableNextColumn();
this->drawOffsetColumn(pattern);
this->drawSizeColumn(pattern);
this->drawTypenameColumn(pattern, "bitfield");
drawOffsetColumn(pattern);
drawSizeColumn(pattern);
drawTypenameColumn(pattern, "bitfield");
std::string valueString = "{ ";
for (auto i : value)
@ -159,22 +159,22 @@ namespace hex::pl {
valueString += "???";
ImGui::TableNextRow();
this->createLeafNode(pattern);
this->drawCommentTooltip(pattern);
createLeafNode(pattern);
drawCommentTooltip(pattern);
ImGui::TableNextColumn();
this->makeSelectable(pattern);
makeSelectable(pattern);
ImGui::SameLine();
this->drawNameColumn(pattern);
this->drawColorColumn(pattern);
this->drawOffsetColumn(pattern);
this->drawSizeColumn(pattern);
this->drawTypenameColumn(pattern, "enum");
drawNameColumn(pattern);
drawColorColumn(pattern);
drawOffsetColumn(pattern);
drawSizeColumn(pattern);
drawTypenameColumn(pattern, "enum");
ImGui::TextFormatted("{}", pattern.formatDisplayValue(hex::format("{} (0x{:0{}X})", valueString.c_str(), value, pattern.getSize() * 2), &pattern));
}
void visit(PatternFloat& pattern) override {
if (pattern.getSize() == 4) {
float f32 = pattern.getValue(m_provider);
float f32 = static_cast<float>(pattern.getValue(m_provider));
u32 integerResult = 0;
std::memcpy(&integerResult, &f32, sizeof(float));
this->createDefaultEntry(pattern, hex::format("{:e} (0x{:0{}X})", f32, integerResult, pattern.getSize() * 2), f32);
@ -199,14 +199,14 @@ namespace hex::pl {
if (!pattern.isInlined()) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
open = this->createTreeNode(pattern);
open = createTreeNode(pattern);
ImGui::TableNextColumn();
this->makeSelectable(pattern);
this->drawCommentTooltip(pattern);
makeSelectable(pattern);
drawCommentTooltip(pattern);
ImGui::SameLine(0, 0);
this->drawColorColumn(pattern);
this->drawOffsetColumn(pattern);
this->drawSizeColumn(pattern);
drawColorColumn(pattern);
drawOffsetColumn(pattern);
drawSizeColumn(pattern);
ImGui::TextFormattedColored(ImColor(0xFF9BC64D), "{}", pattern.getFormattedName());
ImGui::TableNextColumn();
ImGui::TextFormatted("{}", pattern.formatDisplayValue(hex::format("*(0x{0:X})", data), u128(data)));
@ -243,14 +243,14 @@ namespace hex::pl {
if (!pattern.isInlined()) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
open = this->createTreeNode(pattern);
open = createTreeNode(pattern);
ImGui::TableNextColumn();
this->makeSelectable(pattern);
this->drawCommentTooltip(pattern);
makeSelectable(pattern);
drawCommentTooltip(pattern);
ImGui::TableNextColumn();
this->drawOffsetColumn(pattern);
this->drawSizeColumn(pattern);
this->drawTypenameColumn(pattern, "struct");
drawOffsetColumn(pattern);
drawSizeColumn(pattern);
drawTypenameColumn(pattern, "struct");
ImGui::TextFormatted("{}", pattern.formatDisplayValue("{ ... }", &pattern));
} else {
ImGui::SameLine();
@ -272,14 +272,14 @@ namespace hex::pl {
if (!pattern.isInlined()) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
open = this->createTreeNode(pattern);
open = createTreeNode(pattern);
ImGui::TableNextColumn();
this->makeSelectable(pattern);
this->drawCommentTooltip(pattern);
makeSelectable(pattern);
drawCommentTooltip(pattern);
ImGui::TableNextColumn();
this->drawOffsetColumn(pattern);
this->drawSizeColumn(pattern);
this->drawTypenameColumn(pattern, "union");
drawOffsetColumn(pattern);
drawSizeColumn(pattern);
drawTypenameColumn(pattern, "union");
ImGui::TextFormatted("{}", pattern.formatDisplayValue("{ ... }", &pattern));
} else {
ImGui::SameLine();
@ -321,33 +321,36 @@ namespace hex::pl {
private:
void createDefaultEntry(const Pattern &pattern, const std::string &value, Token::Literal &&literal) const {
ImGui::TableNextRow();
this->createLeafNode(pattern);
createLeafNode(pattern);
ImGui::TableNextColumn();
ImGui::PushID(pattern.getOffset());
ImGui::PushID(pattern.getVariableName().c_str());
this->makeSelectable(pattern);
ImGui::PopID();
ImGui::PopID();
makeSelectable(pattern);
this->drawCommentTooltip(pattern);
drawCommentTooltip(pattern);
ImGui::SameLine();
this->drawNameColumn(pattern);
this->drawColorColumn(pattern);
this->drawOffsetColumn(pattern);
this->drawSizeColumn(pattern);
drawNameColumn(pattern);
drawColorColumn(pattern);
drawOffsetColumn(pattern);
drawSizeColumn(pattern);
ImGui::TextFormattedColored(ImColor(0xFF9BC64D), "{}", pattern.getTypeName().empty() ? pattern.getFormattedName() : pattern.getTypeName());
ImGui::TableNextColumn();
ImGui::TextFormatted("{}", pattern.formatDisplayValue(value, literal));
}
void makeSelectable(const Pattern &pattern) const {
if (ImGui::Selectable(("##PatternLine"s + std::to_string(u64(&pattern))).c_str(), false, ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_AllowItemOverlap)) {
static void makeSelectable(const Pattern &pattern) {
ImGui::PushID(&pattern);
ImGui::PushID(static_cast<int>(pattern.getOffset()));
ImGui::PushID(pattern.getVariableName().c_str());
if (ImGui::Selectable("##PatternLine", false, ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_AllowItemOverlap)) {
ImHexApi::HexEditor::setSelection(pattern.getOffset(), pattern.getSize());
}
ImGui::SameLine();
ImGui::PopID();
ImGui::PopID();
ImGui::PopID();
}
void drawCommentTooltip(const Pattern &pattern) const {
static void drawCommentTooltip(const Pattern &pattern) {
if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByActiveItem) && pattern.getComment().has_value()) {
ImGui::BeginTooltip();
ImGui::TextUnformatted(pattern.getComment()->c_str());
@ -371,15 +374,15 @@ namespace hex::pl {
if (!pattern.isInlined()) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
open = this->createTreeNode(pattern);
open = createTreeNode(pattern);
ImGui::TableNextColumn();
if (ImGui::Selectable(("##PatternLine"s + std::to_string(u64(&pattern))).c_str(), false, ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_AllowItemOverlap)) {
ImHexApi::HexEditor::setSelection(pattern.getOffset(), pattern.getSize());
}
this->drawCommentTooltip(pattern);
drawCommentTooltip(pattern);
ImGui::TableNextColumn();
this->drawOffsetColumn(pattern);
this->drawSizeColumn(pattern);
drawOffsetColumn(pattern);
drawSizeColumn(pattern);
ImGui::TextFormattedColored(ImColor(0xFF9BC64D), "{0}", pattern.getTypeName());
ImGui::SameLine(0, 0);
@ -418,40 +421,40 @@ namespace hex::pl {
}
}
void createLeafNode(const Pattern& pattern) const {
static void createLeafNode(const Pattern& pattern) {
ImGui::TreeNodeEx(pattern.getDisplayName().c_str(), ImGuiTreeNodeFlags_Leaf |
ImGuiTreeNodeFlags_NoTreePushOnOpen |
ImGuiTreeNodeFlags_SpanFullWidth |
ImGuiTreeNodeFlags_AllowItemOverlap);
}
bool createTreeNode(const Pattern& pattern) const {
static bool createTreeNode(const Pattern& pattern) {
return ImGui::TreeNodeEx(pattern.getDisplayName().c_str(), ImGuiTreeNodeFlags_SpanFullWidth);
}
void drawTypenameColumn(const Pattern& pattern, const std::string& pattern_name) const {
static void drawTypenameColumn(const Pattern& pattern, const std::string& pattern_name) {
ImGui::TextFormattedColored(ImColor(0xFFD69C56), pattern_name);
ImGui::SameLine();
ImGui::TextUnformatted(pattern.getTypeName().c_str());
ImGui::TableNextColumn();
}
void drawNameColumn(const Pattern& pattern) const {
static void drawNameColumn(const Pattern& pattern) {
ImGui::TextUnformatted(pattern.getDisplayName().c_str());
ImGui::TableNextColumn();
}
void drawColorColumn(const Pattern& pattern) const {
static void drawColorColumn(const Pattern& pattern) {
ImGui::ColorButton("color", ImColor(pattern.getColor()), ImGuiColorEditFlags_NoTooltip, ImVec2(ImGui::GetColumnWidth(), ImGui::GetTextLineHeight()));
ImGui::TableNextColumn();
}
void drawOffsetColumn(const Pattern& pattern) const {
static void drawOffsetColumn(const Pattern& pattern) {
ImGui::TextFormatted("0x{0:08X} : 0x{1:08X}", pattern.getOffset(), pattern.getOffset() + pattern.getSize() - (pattern.getSize() == 0 ? 0 : 1));
ImGui::TableNextColumn();
}
void drawSizeColumn(const Pattern& pattern) const {
static void drawSizeColumn(const Pattern& pattern) {
ImGui::TextFormatted("0x{0:04X}", pattern.getSize());
ImGui::TableNextColumn();
}

2
lib/libimhex/include/hex/pattern_language/patterns/pattern.hpp
View File

@ -77,7 +77,7 @@ namespace hex::pl {
[[nodiscard]] const std::optional<std::string> &getComment() const { return this->m_comment; }
void setComment(std::string comment) { this->m_comment = std::move(comment); }
[[nodiscard]] const std::string &getTypeName() const { return this->m_typeName; }
[[nodiscard]] virtual std::string getTypeName() const { return this->m_typeName; }
void setTypeName(std::string name) { this->m_typeName = std::move(name); }
[[nodiscard]] u32 getColor() const { return this->m_color; }

4
lib/libimhex/include/hex/pattern_language/patterns/pattern_array_dynamic.hpp
View File

@ -39,7 +39,7 @@ namespace hex::pl {
return this->m_entries[0]->getTypeName() + "[" + std::to_string(this->m_entries.size()) + "]";
}
[[nodiscard]] std::string getTypeName() const {
[[nodiscard]] std::string getTypeName() const override {
return this->m_entries[0]->getTypeName();
}
@ -58,7 +58,7 @@ namespace hex::pl {
return this->m_entries;
}
void forEachArrayEntry(const std::function<void(int, Pattern&)>& fn) {
void forEachArrayEntry(const std::function<void(u64, Pattern&)>& fn) {
for (u64 i = 0; i < this->m_entries.size(); i++)
fn(i, *this->m_entries[i]);
}

3
lib/libimhex/include/hex/pattern_language/patterns/pattern_array_static.hpp
View File

@ -19,9 +19,10 @@ namespace hex::pl {
return std::unique_ptr<Pattern>(new PatternArrayStatic(*this));
}
void forEachArrayEntry(const std::function<void(int, Pattern&)>& fn) {
void forEachArrayEntry(const std::function<void(u64, Pattern&)>& fn) {
auto entry = std::shared_ptr(this->m_template->clone());
for (u64 index = 0; index < this->m_entryCount; index++) {
entry->clearFormatCache();
entry->setVariableName(hex::format("[{0}]", index));
entry->setOffset(this->getOffset() + index * this->m_template->getSize());
fn(index, *entry);

2
lib/libimhex/include/hex/pattern_language/patterns/pattern_enum.hpp
View File

@ -24,7 +24,7 @@ namespace hex::pl {
return "enum " + Pattern::getTypeName();
}
[[nodiscard]] std::string getTypeName() const {
[[nodiscard]] std::string getTypeName() const override {
return Pattern::getTypeName();
}

4
lib/libimhex/include/hex/pattern_language/patterns/pattern_union.hpp
View File

@ -67,10 +67,6 @@ namespace hex::pl {
return "union " + Pattern::getTypeName();
}
[[nodiscard]] std::string getTypeName() const {
return Pattern::getTypeName();
}
[[nodiscard]] const auto &getMembers() const {
return this->m_members;
}

2
lib/libimhex/include/hex/pattern_language/token.hpp
View File

@ -241,6 +241,8 @@ namespace hex::pl {
return "padding";
case ValueType::String:
return "str";
case ValueType::Boolean:
return "bool";
default:
return "< ??? >";
}