Fixed compile on Linux

Simple configuration parsing for size scaling

.gitignore

@@ -2,3 +2,9 @@
 cmake-build-debug/
 
 cmake-build-release/
+
+build-linux/
+build/
+
+*.mgc
+imgui.ini

CMakeLists.txt

@@ -10,14 +10,21 @@ find_package(OpenGL REQUIRED)
 include_directories(include ${GLFW_INCLUDE_DIRS} libs/ImGui/include libs/glad/include)
 SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -DIMGUI_IMPL_OPENGL_LOADER_GLAD")
 
+if (WIN32)
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++ -static-libgcc -static")
+endif (WIN32)
+
 add_executable(ImHex
         source/main.cpp
         source/window.cpp
         source/utils.cpp
         source/crypto.cpp
 
-        source/parser/lexer.cpp
-        source/parser/parser.cpp
+        source/lang/preprocessor.cpp
+        source/lang/lexer.cpp
+        source/lang/parser.cpp
+        source/lang/validator.cpp
+        source/lang/evaluator.cpp
 
         source/provider/file_provider.cpp
 
@@ -26,21 +33,27 @@ add_executable(ImHex
         source/views/view_pattern_data.cpp
         source/views/view_hashes.cpp
         source/views/view_information.cpp
+        source/views/view_help.cpp
+        source/views/view_tools.cpp
+        source/views/view_strings.cpp
+        source/views/view_data_inspector.cpp
 
         libs/glad/source/glad.c
 
         libs/ImGui/source/imgui.cpp
-        libs/ImGui/source/imgui_demo.cpp
         libs/ImGui/source/imgui_draw.cpp
         libs/ImGui/source/imgui_widgets.cpp
+        libs/ImGui/source/imgui_demo.cpp
         libs/ImGui/source/imgui_impl_glfw.cpp
         libs/ImGui/source/imgui_impl_opengl3.cpp
+        libs/ImGui/source/ImGuiFileBrowser.cpp
+        libs/ImGui/source/TextEditor.cpp
 
-        res.rc
+        resource.rc
         )
 
 if (WIN32)
-    target_link_libraries(ImHex libglfw3.a libgcc.a libstdc++.a libmagic.a libgnurx.a libtre.a libintl.a libiconv.a shlwapi.lib libcrypto.a)
+    target_link_libraries(ImHex libglfw3.a libgcc.a libstdc++.a libmagic.a libgnurx.a libtre.a libintl.a libiconv.a shlwapi.lib ws2_32.lib libcrypto.a libwinpthread.a)
 endif (WIN32)
 
 if (UNIX)

README.md

@@ -4,4 +4,4 @@ A Hex editor written in C++ using OpenGL, GLFW and Dear ImGui
 
 ## Screenshots
 
-![](https://i.imgur.com/BewCMbw.png)
+![](https://i.imgur.com/ClEsNwL.png)

include/event.hpp

@@ -6,25 +6,28 @@
 namespace hex {
 
     enum class Events {
-        DataChanged
+        DataChanged,
+        PatternChanged,
+        FileDropped,
+        ByteSelected
     };
 
     struct EventHandler {
         void *sender;
         Events eventType;
-        std::function<void(void*)> callback;
+        std::function<void(const void*)> callback;
     };
 
     class EventManager {
     public:
 
-        void post(Events eventType, void *userData) {
+        void post(Events eventType, const void *userData) {
             for (auto &handler : this->m_eventHandlers)
                 if (eventType == handler.eventType)
                     handler.callback(userData);
         }
 
-        void subscribe(Events eventType, void *sender, std::function<void(void*)> callback) {
+        void subscribe(Events eventType, void *sender, std::function<void(const void*)> callback) {
             for (auto &handler : this->m_eventHandlers)
                 if (eventType == handler.eventType && sender == handler.sender)
                     return;

include/hex.hpp

@@ -15,5 +15,5 @@ using s32   = std::int32_t;
 using s64   = std::int64_t;
 using s128  = __int128_t;
 
-#include "parser/result.hpp"
-#include "parser/results.hpp"
+#include "lang/result.hpp"
+#include "lang/results.hpp"

include/lang/ast_node.hpp

@@ -3,6 +3,7 @@
 #include "token.hpp"
 
 #include <optional>
+#include <unordered_map>
 #include <vector>
 
 namespace hex::lang {
@@ -13,6 +14,9 @@ namespace hex::lang {
             VariableDecl,
             TypeDecl,
             Struct,
+            Union,
+            Enum,
+            Bitfield,
             Scope,
         };
 
@@ -64,6 +68,30 @@ namespace hex::lang {
         std::vector<ASTNode*> m_nodes;
     };
 
+    class ASTNodeUnion : public ASTNode {
+    public:
+        explicit ASTNodeUnion(std::string name, std::vector<ASTNode*> nodes)
+                : ASTNode(Type::Union), m_name(name), m_nodes(nodes) { }
+
+        const std::string& getName() const { return this->m_name; }
+        std::vector<ASTNode*> &getNodes() { return this->m_nodes; }
+    private:
+        std::string m_name;
+        std::vector<ASTNode*> m_nodes;
+    };
+
+    class ASTNodeBitField : public ASTNode {
+    public:
+        explicit ASTNodeBitField(std::string name, std::vector<std::pair<std::string, size_t>> fields)
+        : ASTNode(Type::Bitfield), m_name(name), m_fields(fields) { }
+
+        const std::string& getName() const { return this->m_name; }
+        std::vector<std::pair<std::string, size_t>> &getFields() { return this->m_fields; }
+    private:
+        std::string m_name;
+        std::vector<std::pair<std::string, size_t>> m_fields;
+    };
+
     class ASTNodeTypeDecl : public ASTNode {
     public:
         explicit ASTNodeTypeDecl(const Token::TypeToken::Type &type, const std::string &name, const std::string& customTypeName = "")
@@ -78,4 +106,19 @@ namespace hex::lang {
         std::string m_name, m_customTypeName;
     };
 
+    class ASTNodeEnum : public ASTNode {
+    public:
+        explicit ASTNodeEnum(const Token::TypeToken::Type &type, const std::string &name)
+                : ASTNode(Type::Enum), m_type(type), m_name(name) { }
+
+        const std::string& getName() const { return this->m_name; };
+
+        const Token::TypeToken::Type& getUnderlyingType() const { return this->m_type; }
+        std::vector<std::pair<u64, std::string>>& getValues() { return this->m_values; }
+    private:
+        Token::TypeToken::Type m_type;
+        std::string m_name;
+        std::vector<std::pair<u64, std::string>> m_values;
+    };
+
 }

include/lang/evaluator.hpp

@@ -0,0 +1,34 @@
+#pragma once
+
+#include <hex.hpp>
+
+#include "lang/pattern_data.hpp"
+#include "ast_node.hpp"
+
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+namespace hex::lang {
+
+    class Evaluator {
+    public:
+        Evaluator();
+
+        std::pair<Result, std::vector<PatternData*>> evaluate(const std::vector<ASTNode*>& ast);
+
+    private:
+        std::unordered_map<std::string, ASTNode*> m_types;
+
+        std::pair<PatternData*, size_t> createStructPattern(ASTNodeVariableDecl *varDeclNode, u64 offset);
+        std::pair<PatternData*, size_t> createUnionPattern(ASTNodeVariableDecl *varDeclNode, u64 offset);
+        std::pair<PatternData*, size_t> createEnumPattern(ASTNodeVariableDecl *varDeclNode, u64 offset);
+        std::pair<PatternData*, size_t> createBitfieldPattern(ASTNodeVariableDecl *varDeclNode, u64 offset);
+        std::pair<PatternData*, size_t> createArrayPattern(ASTNodeVariableDecl *varDeclNode, u64 offset);
+        std::pair<PatternData*, size_t> createStringPattern(ASTNodeVariableDecl *varDeclNode, u64 offset);
+        std::pair<PatternData*, size_t> createCustomTypePattern(ASTNodeVariableDecl *varDeclNode, u64 offset);
+        std::pair<PatternData*, size_t> createBuiltInTypePattern(ASTNodeVariableDecl *varDeclNode, u64 offset);
+
+    };
+
+}

include/lang/pattern_data.hpp

@@ -0,0 +1,527 @@
+#pragma once
+
+#include <hex.hpp>
+#include <string>
+
+#include "imgui.h"
+#include "imgui_memory_editor.h"
+
+#include "providers/provider.hpp"
+#include "utils.hpp"
+
+#include <random>
+
+namespace hex::lang {
+
+    namespace {
+
+        std::string makeDisplayable(u8 *data, size_t size) {
+            std::string result;
+            for (u8* c = data; c < (data + size); c++) {
+                if (iscntrl(*c) || *c > 0x7F)
+                    result += " ";
+                else
+                    result += *c;
+            }
+
+            return result;
+        }
+
+    }
+
+    class PatternData {
+    public:
+        enum class Type { Padding, Unsigned, Signed, Float, Character, String, Struct, Union, Array, Enum };
+
+        PatternData(Type type, u64 offset, size_t size, const std::string &name, u32 color = 0)
+        : m_type(type), m_offset(offset), m_size(size), m_color(color), m_name(name) {
+            constexpr u32 Palette[] = { 0x50b4771f, 0x500e7fff, 0x502ca02c, 0x502827d6, 0x50bd6794, 0x504b568c, 0x50c277e3, 0x507f7f7f, 0x5022bdbc, 0x50cfbe17 };
+
+            if (color != 0)
+                return;
+
+            this->m_color = Palette[PatternData::s_paletteOffset++];
+
+            if (PatternData::s_paletteOffset >= (sizeof(Palette) / sizeof(u32)))
+                PatternData::s_paletteOffset = 0;
+        }
+        virtual ~PatternData() = default;
+
+        [[nodiscard]] Type getPatternType() const { return this->m_type; }
+        [[nodiscard]] u64 getOffset() const { return this->m_offset; }
+        [[nodiscard]] size_t getSize() const { return this->m_size; }
+
+        [[nodiscard]] u32 getColor() const { return this->m_color; }
+        [[nodiscard]] const std::string& getName() const { return this->m_name; }
+
+        virtual void createEntry(prv::Provider* &provider) = 0;
+        virtual std::string getTypeName() = 0;
+
+        virtual std::optional<u32> highlightBytes(size_t offset) {
+            if (offset >= this->getOffset() && offset < (this->getOffset() + this->getSize()))
+                return this->getColor();
+            else
+                return { };
+        }
+
+        virtual void sort(ImGuiTableSortSpecs *sortSpecs, prv::Provider *provider) { }
+
+        static bool sortPatternDataTable(ImGuiTableSortSpecs *sortSpecs, prv::Provider *provider, lang::PatternData* left, lang::PatternData* right) {
+            if (sortSpecs->Specs->ColumnUserID == ImGui::GetID("name")) {
+                if (sortSpecs->Specs->SortDirection == ImGuiSortDirection_Ascending)
+                    return left->getName() > right->getName();
+                else
+                    return left->getName() < right->getName();
+            }
+            else if (sortSpecs->Specs->ColumnUserID == ImGui::GetID("offset")) {
+                if (sortSpecs->Specs->SortDirection == ImGuiSortDirection_Ascending)
+                    return left->getOffset() > right->getOffset();
+                else
+                    return left->getOffset() < right->getOffset();
+            }
+            else if (sortSpecs->Specs->ColumnUserID == ImGui::GetID("size")) {
+                if (sortSpecs->Specs->SortDirection == ImGuiSortDirection_Ascending)
+                    return left->getSize() > right->getSize();
+                else
+                    return left->getSize() < right->getSize();
+            }
+            else if (sortSpecs->Specs->ColumnUserID == ImGui::GetID("value")) {
+                size_t biggerSize = std::max(left->getSize(), right->getSize());
+                std::vector<u8> leftBuffer(biggerSize, 0x00), rightBuffer(biggerSize, 0x00);
+
+                provider->read(left->getOffset(), leftBuffer.data(), left->getSize());
+                provider->read(right->getOffset(), rightBuffer.data(), right->getSize());
+
+                if (sortSpecs->Specs->SortDirection == ImGuiSortDirection_Ascending)
+                    return leftBuffer > rightBuffer;
+                else
+                    return leftBuffer < rightBuffer;
+            }
+            else if (sortSpecs->Specs->ColumnUserID == ImGui::GetID("type")) {
+                if (sortSpecs->Specs->SortDirection == ImGuiSortDirection_Ascending)
+                    return left->getTypeName() > right->getTypeName();
+                else
+                    return left->getTypeName() < right->getTypeName();
+            }
+            else if (sortSpecs->Specs->ColumnUserID == ImGui::GetID("color")) {
+                if (sortSpecs->Specs->SortDirection == ImGuiSortDirection_Ascending)
+                    return left->getColor() > right->getColor();
+                else
+                    return left->getColor() < right->getColor();
+            }
+
+            return false;
+        }
+
+        static void resetPalette() { PatternData::s_paletteOffset = 0; }
+
+    protected:
+        void createDefaultEntry(std::string value) {
+            ImGui::TableNextRow();
+            ImGui::TreeNodeEx(this->getName().c_str(), ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_SpanFullWidth);
+            ImGui::TableNextColumn();
+            ImGui::ColorButton("color", ImColor(this->getColor()), ImGuiColorEditFlags_NoTooltip);
+            ImGui::TableNextColumn();
+            ImGui::Text("%s", this->getName().c_str());
+            ImGui::TableNextColumn();
+            ImGui::Text("0x%08lx : 0x%08lx", this->getOffset(), this->getOffset() + this->getSize() - 1);
+            ImGui::TableNextColumn();
+            ImGui::Text("0x%04lx", this->getSize());
+            ImGui::TableNextColumn();
+            ImGui::Text("%s", this->getTypeName().c_str());
+            ImGui::TableNextColumn();
+            ImGui::Text("%s", value.c_str());
+        }
+
+    private:
+        Type m_type;
+        u64 m_offset;
+        size_t m_size;
+
+        u32 m_color;
+        std::string m_name;
+
+        static inline u8 s_paletteOffset = 0;
+    };
+
+    class PatternDataPadding : public PatternData {
+    public:
+        PatternDataPadding(u64 offset, size_t size) : PatternData(Type::Padding, offset, size, "", 0x00FFFFFF) { }
+
+        void createEntry(prv::Provider* &provider) override {
+        }
+
+        std::string getTypeName() override {
+            return "";
+        }
+    };
+
+    class PatternDataUnsigned : public PatternData {
+    public:
+        PatternDataUnsigned(u64 offset, size_t size, const std::string &name, u32 color = 0) : PatternData(Type::Unsigned, offset, size, name, color) { }
+
+        void createEntry(prv::Provider* &provider) override {
+            u64 data = 0;
+            provider->read(this->getOffset(), &data, this->getSize());
+
+            this->createDefaultEntry(hex::format("%lu (0x%0*lx)", data, this->getSize() * 2, data));
+        }
+
+        std::string getTypeName() override {
+            switch (this->getSize()) {
+                case 1:     return "u8";
+                case 2:     return "u16";
+                case 4:     return "u32";
+                case 8:     return "u64";
+                case 16:    return "u128";
+                default:    return "Unsigned data";
+            }
+        }
+    };
+
+    class PatternDataSigned : public PatternData {
+    public:
+        PatternDataSigned(u64 offset, size_t size, const std::string &name, u32 color = 0) : PatternData(Type::Signed, offset, size, name, color) { }
+
+       void createEntry(prv::Provider* &provider) override {
+            u64 data = 0;
+            provider->read(this->getOffset(), &data, this->getSize());
+
+            s64 signedData = signedData = hex::signExtend(data, this->getSize(), 64);
+
+           this->createDefaultEntry(hex::format("%ld (0x%0*lx)", signedData, this->getSize() * 2, data));
+        }
+
+        std::string getTypeName() override {
+            switch (this->getSize()) {
+                case 1:     return "s8";
+                case 2:     return "s16";
+                case 4:     return "s32";
+                case 8:     return "s64";
+                case 16:    return "s128";
+                default:    return "Signed data";
+            }
+        }
+    };
+
+    class PatternDataFloat : public PatternData {
+    public:
+        PatternDataFloat(u64 offset, size_t size, const std::string &name, u32 color = 0) : PatternData(Type::Float, offset, size, name, color) { }
+
+        void createEntry(prv::Provider* &provider) override {
+            double formatData = 0;
+            if (this->getSize() == 4) {
+                float data = 0;
+                provider->read(this->getOffset(), &data, 4);
+                formatData = data;
+            } else if (this->getSize() == 8) {
+                double data = 0;
+                provider->read(this->getOffset(), &data, 8);
+                formatData = data;
+            }
+
+            this->createDefaultEntry(hex::format("%f (0x%0*lx)", formatData, this->getSize() * 2, formatData));
+        }
+
+        std::string getTypeName() override {
+            switch (this->getSize()) {
+                case 4:     return "float";
+                case 8:     return "double";
+                default:    return "Floating point data";
+            }
+        }
+    };
+
+    class PatternDataCharacter : public PatternData {
+    public:
+        PatternDataCharacter(u64 offset, size_t size, const std::string &name, u32 color = 0) : PatternData(Type::Character, offset, size, name, color) { }
+
+        void createEntry(prv::Provider* &provider) override {
+            char character;
+            provider->read(this->getOffset(), &character, 1);
+
+            this->createDefaultEntry(hex::format("'%c'", character));
+        }
+
+        std::string getTypeName() override {
+            return "Character";
+        }
+    };
+
+    class PatternDataString : public PatternData {
+    public:
+        PatternDataString(u64 offset, size_t size, const std::string &name, u32 color = 0) : PatternData(Type::String, offset, size, name, color) { }
+
+        void createEntry(prv::Provider* &provider) override {
+            std::vector<u8> buffer(this->getSize() + 1, 0x00);
+            provider->read(this->getOffset(), buffer.data(), this->getSize());
+            buffer[this->getSize()] = '\0';
+
+            this->createDefaultEntry(hex::format("\"%s\"", makeDisplayable(buffer.data(), this->getSize()).c_str()));
+        }
+
+        std::string getTypeName() override {
+           return "String";
+        }
+    };
+
+    class PatternDataArray : public PatternData {
+    public:
+        PatternDataArray(u64 offset, size_t size, const std::string &name, const std::vector<PatternData*> & entries, u32 color = 0)
+            : PatternData(Type::Array, offset, size, name, color), m_entries(entries) { }
+
+        void createEntry(prv::Provider* &provider) override {
+            ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
+            ImGui::TableNextColumn();
+            ImGui::ColorButton("color", ImColor(this->getColor()), ImGuiColorEditFlags_NoTooltip);
+            ImGui::TableNextColumn();
+            bool open = ImGui::TreeNodeEx(this->getName().c_str(), ImGuiTreeNodeFlags_SpanFullWidth);
+            ImGui::TableNextColumn();
+            ImGui::Text("0x%08lx : 0x%08lx", this->getOffset(), this->getOffset() + this->getSize() - 1);
+            ImGui::TableNextColumn();
+            ImGui::Text("0x%04lx", this->getSize());
+            ImGui::TableNextColumn();
+            ImGui::Text("%s", this->getTypeName().c_str());
+            ImGui::TableNextColumn();
+            ImGui::Text("%s", "{ ... }");
+
+            if (open) {
+                for (auto &member : this->m_entries)
+                    member->createEntry(provider);
+
+                ImGui::TreePop();
+            }
+        }
+
+        std::optional<u32> highlightBytes(size_t offset) override{
+            for (auto &entry : this->m_entries) {
+                if (auto color = entry->highlightBytes(offset); color.has_value())
+                    return color.value();
+            }
+
+            return { };
+        }
+
+        std::string getTypeName() override {
+            return this->m_entries[0]->getTypeName() + "[" + std::to_string(this->m_entries.size()) + "]";
+        }
+
+    private:
+        std::vector<PatternData*> m_entries;
+    };
+
+    class PatternDataStruct : public PatternData {
+    public:
+        PatternDataStruct(u64 offset, size_t size, const std::string &name, const std::string &structName, const std::vector<PatternData*> & members, u32 color = 0)
+                : PatternData(Type::Struct, offset, size, name, color), m_structName(structName), m_members(members), m_sortedMembers(members) { }
+
+        void createEntry(prv::Provider* &provider) override {
+            ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
+            ImGui::TableNextColumn();
+            ImGui::ColorButton("color", ImColor(this->getColor()), ImGuiColorEditFlags_NoTooltip | ImGuiColorEditFlags_AlphaPreview);
+            ImGui::TableNextColumn();
+            bool open = ImGui::TreeNodeEx(this->getName().c_str(), ImGuiTreeNodeFlags_SpanFullWidth);
+            ImGui::TableNextColumn();
+            ImGui::Text("0x%08lx : 0x%08lx", this->getOffset(), this->getOffset() + this->getSize() - 1);
+            ImGui::TableNextColumn();
+            ImGui::Text("0x%04lx", this->getSize());
+            ImGui::TableNextColumn();
+            ImGui::Text("%s", this->getTypeName().c_str());
+            ImGui::TableNextColumn();
+            ImGui::Text("%s", "{ ... }");
+
+            if (open) {
+                for (auto &member : this->m_sortedMembers)
+                    member->createEntry(provider);
+
+                ImGui::TreePop();
+            }
+
+        }
+
+        std::optional<u32> highlightBytes(size_t offset) override{
+            for (auto &member : this->m_members) {
+                if (auto color = member->highlightBytes(offset); color.has_value())
+                    return color.value();
+            }
+
+            return { };
+        }
+
+        void sort(ImGuiTableSortSpecs *sortSpecs, prv::Provider *provider) override {
+            this->m_sortedMembers = this->m_members;
+
+            std::sort(this->m_sortedMembers.begin(), this->m_sortedMembers.end(), [&sortSpecs, &provider](PatternData *left, PatternData *right) {
+                return PatternData::sortPatternDataTable(sortSpecs, provider, left, right);
+            });
+
+            for (auto &member : this->m_members)
+                member->sort(sortSpecs, provider);
+        }
+
+        std::string getTypeName() override {
+            return "struct " + this->m_structName;
+        }
+
+    private:
+        std::string m_structName;
+        std::vector<PatternData*> m_members;
+        std::vector<PatternData*> m_sortedMembers;
+    };
+
+    class PatternDataUnion : public PatternData {
+    public:
+        PatternDataUnion(u64 offset, size_t size, const std::string &name, const std::string &unionName, const std::vector<PatternData*> & members, u32 color = 0)
+                : PatternData(Type::Union, offset, size, name, color), m_unionName(unionName), m_members(members), m_sortedMembers(members) { }
+
+        void createEntry(prv::Provider* &provider) override {
+            ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
+            ImGui::TableNextColumn();
+            ImGui::ColorButton("color", ImColor(this->getColor()), ImGuiColorEditFlags_NoTooltip | ImGuiColorEditFlags_AlphaPreview);
+            ImGui::TableNextColumn();
+            bool open = ImGui::TreeNodeEx(this->getName().c_str(), ImGuiTreeNodeFlags_SpanFullWidth);
+            ImGui::TableNextColumn();
+            ImGui::Text("0x%08lx : 0x%08lx", this->getOffset(), this->getOffset() + this->getSize() - 1);
+            ImGui::TableNextColumn();
+            ImGui::Text("0x%04lx", this->getSize());
+            ImGui::TableNextColumn();
+            ImGui::Text("%s", this->getTypeName().c_str());
+            ImGui::TableNextColumn();
+            ImGui::Text("%s", "{ ... }");
+
+            if (open) {
+                for (auto &member : this->m_sortedMembers)
+                    member->createEntry(provider);
+
+                ImGui::TreePop();
+            }
+
+        }
+
+        std::optional<u32> highlightBytes(size_t offset) override{
+            for (auto &member : this->m_members) {
+                if (auto color = member->highlightBytes(offset); color.has_value())
+                    return color.value();
+            }
+
+            return { };
+        }
+
+        void sort(ImGuiTableSortSpecs *sortSpecs, prv::Provider *provider) override {
+            this->m_sortedMembers = this->m_members;
+
+            std::sort(this->m_sortedMembers.begin(), this->m_sortedMembers.end(), [&sortSpecs, &provider](PatternData *left, PatternData *right) {
+                return PatternData::sortPatternDataTable(sortSpecs, provider, left, right);
+            });
+
+            for (auto &member : this->m_members)
+                member->sort(sortSpecs, provider);
+        }
+
+        std::string getTypeName() override {
+            return "union " + this->m_unionName;
+        }
+
+    private:
+        std::string m_unionName;
+        std::vector<PatternData*> m_members;
+        std::vector<PatternData*> m_sortedMembers;
+    };
+
+    class PatternDataEnum : public PatternData {
+    public:
+        PatternDataEnum(u64 offset, size_t size, const std::string &name, const std::string &enumName, std::vector<std::pair<u64, std::string>> enumValues, u32 color = 0)
+            : PatternData(Type::Enum, offset, size, name, color), m_enumName(enumName), m_enumValues(enumValues) { }
+
+        void createEntry(prv::Provider* &provider) override {
+            u64 value = 0;
+            provider->read(this->getOffset(), &value, this->getSize());
+
+            std::string valueString = this->m_enumName + "::";
+
+            bool foundValue = false;
+            for (auto &[entryValue, entryName] : this->m_enumValues) {
+                if (value == entryValue) {
+                    valueString += entryName;
+                    foundValue = true;
+                    break;
+                }
+            }
+
+            if (!foundValue)
+                valueString += "???";
+
+            this->createDefaultEntry(hex::format("%s (0x0*lx)", valueString.c_str(), this->getSize() * 2, value));
+        }
+
+        std::string getTypeName() override {
+            return "enum " + this->m_enumName;
+        }
+
+    private:
+        std::string m_enumName;
+        std::vector<std::pair<u64, std::string>> m_enumValues;
+    };
+
+    class PatternDataBitfield : public PatternData {
+    public:
+        PatternDataBitfield(u64 offset, size_t size, const std::string &name, const std::string &bitfieldName, std::vector<std::pair<std::string, size_t>> fields, u32 color = 0)
+                : PatternData(Type::Enum, offset, size, name, color), m_bitfieldName(bitfieldName), m_fields(fields) { }
+
+        void createEntry(prv::Provider* &provider) override {
+            u64 value = 0;
+            provider->read(this->getOffset(), &value, this->getSize());
+
+            ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
+            ImGui::TableNextColumn();
+            ImGui::ColorButton("color", ImColor(0x00FFFFFF), ImGuiColorEditFlags_NoTooltip | ImGuiColorEditFlags_AlphaPreview);
+            ImGui::TableNextColumn();
+            bool open = ImGui::TreeNodeEx(this->getName().c_str(), ImGuiTreeNodeFlags_SpanFullWidth);
+            ImGui::TableNextColumn();
+            ImGui::Text("0x%08lx : 0x%08lx", this->getOffset(), this->getOffset() + this->getSize() - 1);
+            ImGui::TableNextColumn();
+            ImGui::Text("0x%04lx", this->getSize());
+            ImGui::TableNextColumn();
+            ImGui::Text("%s", this->getTypeName().c_str());
+            ImGui::TableNextColumn();
+            ImGui::Text("{ %llx }", value);
+
+            if (open) {
+                u16 bitOffset = 0;
+                for (auto &[entryName, entrySize] : this->m_fields) {
+                    ImGui::TableNextRow();
+                    ImGui::TreeNodeEx(this->getName().c_str(), ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_SpanFullWidth);
+                    ImGui::TableNextColumn();
+                    ImGui::ColorButton("color", ImColor(this->getColor()), ImGuiColorEditFlags_NoTooltip);
+                    ImGui::TableNextColumn();
+                    ImGui::Text("%s", entryName.c_str());
+                    ImGui::TableNextColumn();
+                    ImGui::Text("0x%08lx : 0x%08lx", this->getOffset() + (bitOffset >> 3), this->getOffset() + ((bitOffset + entrySize) >> 3) - 1);
+                    ImGui::TableNextColumn();
+                    if (entrySize == 1)
+                        ImGui::Text("%llu bit", entrySize);
+                    else
+                        ImGui::Text("%llu bits", entrySize);
+                    ImGui::TableNextColumn();
+                    ImGui::Text("%s", entryName.c_str());
+                    ImGui::TableNextColumn();
+                    ImGui::Text("%llx", hex::extract((bitOffset + entrySize) - 1, bitOffset, value));
+                    bitOffset += entrySize;
+                }
+
+                ImGui::TreePop();
+            }
+
+        }
+
+        std::string getTypeName() override {
+            return "bitfield " + this->m_bitfieldName;
+        }
+
+    private:
+        std::string m_bitfieldName;
+        std::vector<std::pair<std::string, size_t>> m_fields;
+    };
+
+
+}

include/lang/preprocessor.hpp

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <hex.hpp>
+
+#include "token.hpp"
+
+#include <string>
+#include <utility>
+#include <set>
+
+namespace hex::lang {
+
+    class Preprocessor {
+    public:
+        Preprocessor();
+
+        std::pair<Result, std::string> preprocess(const std::string& code, bool applyDefines = true);
+
+    private:
+        std::set<std::pair<std::string, std::string>> m_defines;
+    };
+
+}

include/lang/results.hpp

@@ -0,0 +1,14 @@
+#pragma once
+
+#include "result.hpp"
+
+namespace hex::lang {
+
+    constexpr Result ResultSuccess(0, 0);
+
+    constexpr Result ResultPreprocessingError(1, 1);
+    constexpr Result ResultLexicalError(2, 1);
+    constexpr Result ResultParseError(3, 1);
+    constexpr Result ResultEvaluatorError(4, 1);
+
+}

include/lang/token.hpp

@@ -25,7 +25,10 @@ namespace hex::lang {
         struct KeywordToken {
             enum class Keyword {
                 Struct,
-                Using
+                Union,
+                Using,
+                Enum,
+                Bitfield
             } keyword;
         } keywordToken;
         struct IdentifierToken {
@@ -34,7 +37,8 @@ namespace hex::lang {
         struct OperatorToken {
             enum class Operator {
                 AtDeclaration,
-                Assignment
+                Assignment,
+                Inherit
             } op;
         } operatorToken;
         struct IntegerToken {
@@ -54,7 +58,8 @@ namespace hex::lang {
                 Signed128Bit        = 0x101,
                 Float               = 0x42,
                 Double              = 0x82,
-                CustomType          = 0x00
+                CustomType          = 0x00,
+                Padding             = 0x1F
             } type;
         } typeToken;
     };

include/lang/validator.hpp

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <hex.hpp>
+
+#include "token.hpp"
+#include "ast_node.hpp"
+
+#include <string>
+#include <vector>
+
+namespace hex::lang {
+
+    class Validator {
+    public:
+        Validator();
+
+        bool validate(const std::vector<ASTNode*>& ast);
+    };
+
+}

include/parser/results.hpp

@@ -1,12 +0,0 @@
-#pragma once
-
-#include "result.hpp"
-
-namespace hex::lang {
-
-    constexpr Result ResultSuccess(0, 0);
-
-    constexpr Result ResultLexicalError(1, 1);
-    constexpr Result ResultParseError(2, 1);
-
-}

include/providers/file_provider.hpp

@@ -4,6 +4,8 @@
 
 #include <string_view>
 
+#include <sys/stat.h>
+
 namespace hex::prv {
 
     class FileProvider : public Provider {
@@ -19,8 +21,14 @@ namespace hex::prv {
         void write(u64 offset, void *buffer, size_t size) override;
         size_t getSize() override;
 
+        std::vector<std::pair<std::string, std::string>> getDataInformation() override;
+
     private:
         FILE *m_file;
+        std::string m_path;
+
+        bool m_fileStatsValid = false;
+        struct stat m_fileStats = { 0 };
 
         bool m_readable, m_writable;
     };

include/providers/provider.hpp

@@ -2,6 +2,9 @@
 
 #include <hex.hpp>
 
+#include <string>
+#include <vector>
+
 namespace hex::prv {
 
     class Provider {
@@ -16,6 +19,8 @@ namespace hex::prv {
         virtual void read(u64 offset, void *buffer, size_t size) = 0;
         virtual void write(u64 offset, void *buffer, size_t size) = 0;
         virtual size_t getSize() = 0;
+
+        virtual std::vector<std::pair<std::string, std::string>> getDataInformation() = 0;
     };
 
 }

include/utils.hpp

@@ -3,9 +3,94 @@
 #include <hex.hpp>
 
 #include <array>
+#include <functional>
+#include <memory>
 #include <optional>
 #include <string>
+#include <vector>
+
+#include "lang/token.hpp"
 
 namespace hex {
 
+    template<typename ... Args>
+    inline std::string format(const std::string &format, Args ... args) {
+        size_t size = snprintf( nullptr, 0, format.c_str(), args ... );
+
+        if( size <= 0 )
+            return "";
+
+        std::vector<char> buffer(size + 1, 0x00);
+        snprintf(buffer.data(), size + 1, format.c_str(), args ...);
+
+        return std::string(buffer.data(), buffer.data() + size);
+    }
+
+    [[nodiscard]] constexpr inline u64 signExtend(u64 value, u8 currWidth, u8 targetWidth) {
+        u64 mask = 1LLU << (currWidth - 1);
+        return (((value ^ mask) - mask) << (64 - targetWidth)) >> (64 - targetWidth);
+    }
+
+    constexpr inline bool isUnsigned(const lang::Token::TypeToken::Type type) {
+        return (static_cast<u32>(type) & 0x0F) == 0x00;
+    }
+
+    constexpr inline bool isSigned(const lang::Token::TypeToken::Type type) {
+        return (static_cast<u32>(type) & 0x0F) == 0x01;
+    }
+
+    constexpr inline bool isFloatingPoint(const lang::Token::TypeToken::Type type) {
+        return (static_cast<u32>(type) & 0x0F) == 0x02;
+    }
+
+    constexpr inline u32 getTypeSize(const lang::Token::TypeToken::Type type) {
+        return static_cast<u32>(type) >> 4;
+    }
+
+    inline std::string toByteString(u64 bytes) {
+        double value = bytes;
+        u8 unitIndex = 0;
+
+        while (value > 1024) {
+            value /= 1024;
+            unitIndex++;
+
+            if (unitIndex == 6)
+                break;
+        }
+
+        std::string result = std::to_string(value);
+
+        switch (unitIndex) {
+            case 0: result += " Bytes"; break;
+            case 1: result += " kB"; break;
+            case 2: result += " MB"; break;
+            case 3: result += " GB"; break;
+            case 4: result += " TB"; break;
+            case 5: result += " PB"; break;
+            case 6: result += " EB"; break;
+            default: result = "A lot!";
+        }
+
+        return result;
+    }
+
+    [[nodiscard]] constexpr inline u64 extract(u8 from, u8 to, const u64 &value) {
+        u64 mask = (std::numeric_limits<u64>::max() >> (63 - (from - to))) << to;
+        return (value & mask) >> to;
+    }
+
+
+    class ScopeExit {
+    public:
+        ScopeExit(std::function<void()> func) : m_func(func) {}
+        ~ScopeExit() { if (this->m_func != nullptr) this->m_func(); }
+
+        void release() {
+            this->m_func = nullptr;
+        }
+
+    private:
+        std::function<void()> m_func;
+    };
 }

include/views/highlight.hpp

@@ -1,20 +0,0 @@
-#pragma once
-
-#include <hex.hpp>
-#include <string>
-
-namespace hex {
-
-    struct Highlight {
-        Highlight(u64 offset, size_t size, u32 color, std::string name)
-        : offset(offset), size(size), color(color), name(name) {
-
-        }
-
-        u64 offset;
-        size_t size;
-        u32 color;
-        std::string name;
-    };
-
-}

include/views/view.hpp

@@ -6,6 +6,10 @@
 
 #include "event.hpp"
 
+#include <functional>
+#include <vector>
+
+
 namespace hex {
 
     class View {
@@ -17,8 +21,16 @@ namespace hex {
         virtual void createMenu() { }
         virtual bool handleShortcut(int key, int mods) { return false; }
 
+        static std::vector<std::function<void()>>& getDeferedCalls() {
+            return View::s_deferedCalls;
+        }
+
+        static void postEvent(Events eventType, const void *userData = nullptr) {
+            View::s_eventManager.post(eventType, userData);
+        }
+
     protected:
-        void subscribeEvent(Events eventType, std::function<void(void*)> callback) {
+        void subscribeEvent(Events eventType, std::function<void(const void*)> callback) {
             View::s_eventManager.subscribe(eventType, this, callback);
         }
 
@@ -26,12 +38,13 @@ namespace hex {
             View::s_eventManager.unsubscribe(eventType, this);
         }
 
-        void postEvent(Events eventType, void *userData = nullptr) {
-            View::s_eventManager.post(eventType, userData);
+        void doLater(std::function<void()> &&function) {
+            View::s_deferedCalls.push_back(function);
         }
 
     private:
         static inline EventManager s_eventManager;
+        static inline std::vector<std::function<void()>> s_deferedCalls;
     };
 
 }

include/views/view_data_inspector.hpp

@@ -0,0 +1,61 @@
+#pragma once
+
+#include "views/view.hpp"
+
+#include <cstdio>
+#include <ctime>
+#include <string>
+
+namespace hex {
+
+    namespace prv { class Provider; }
+
+    struct GUID {
+        u32 data1;
+        u16 data2;
+        u16 data3;
+        u8  data4[8];
+    };
+
+    union PreviewData {
+        u8 unsigned8;
+        s8 signed8;
+        u16 unsigned16;
+        s16 signed16;
+        u32 unsigned32;
+        s32 signed32;
+        u64 unsigned64;
+        s64 signed64;
+        char8_t ansiChar;
+        char16_t wideChar;
+        u8 utf8Char[4];
+        float float32;
+        double float64;
+        #if defined(_WIN64)
+            __time32_t time32;
+            __time64_t time64;
+        #else
+            time_t time;
+        #endif
+        GUID guid;
+    };
+
+    class ViewDataInspector : public View {
+    public:
+        explicit ViewDataInspector(prv::Provider* &dataProvider);
+        ~ViewDataInspector() override;
+
+        void createView() override;
+        void createMenu() override;
+
+    private:
+        prv::Provider* &m_dataProvider;
+        bool m_windowOpen = true;
+        bool m_shouldInvalidate = true;
+
+        PreviewData m_previewData = { 0 };
+        size_t m_validBytes = 0;
+        std::vector<std::pair<std::string, std::string>> m_cachedData;
+    };
+
+}

include/views/view_help.hpp

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <hex.hpp>
+
+#include "imgui.h"
+#include "views/view.hpp"
+#include "lang/pattern_data.hpp"
+
+#include <vector>
+#include <tuple>
+#include <cstdio>
+
+namespace hex {
+
+    namespace prv { class Provider; }
+
+    class ViewHelp : public View {
+    public:
+        ViewHelp();
+        ~ViewHelp() override;
+
+        void createView() override;
+        void createMenu() override;
+
+    private:
+        bool m_aboutWindowOpen = false;
+        bool m_patternHelpWindowOpen = false;
+
+        void drawAboutPopup();
+        void drawPatternHelpPopup();
+    };
+
+}

include/views/view_hexeditor.hpp

@@ -4,21 +4,23 @@
 #include "views/view.hpp"
 
 #include "imgui_memory_editor.h"
-#include "imfilebrowser.h"
+#include "ImGuiFileBrowser.h"
 
 #include <tuple>
 #include <random>
 #include <vector>
 
-#include "views/highlight.hpp"
+#include "lang/pattern_data.hpp"
 
 namespace hex {
 
     namespace prv { class Provider; }
 
+    using SearchFunction = std::vector<std::pair<u64, u64>> (*)(prv::Provider* &provider, std::string string);
+
     class ViewHexEditor : public View {
     public:
-        ViewHexEditor(prv::Provider* &dataProvider, std::vector<Highlight> &highlights);
+        ViewHexEditor(prv::Provider* &dataProvider, std::vector<lang::PatternData*> &patternData);
         ~ViewHexEditor() override;
 
         void createView() override;
@@ -27,21 +29,35 @@ namespace hex {
 
     private:
         MemoryEditor m_memoryEditor;
-
-        ImGui::FileBrowser m_fileBrowser;
-
+        imgui_addons::ImGuiFileBrowser m_fileBrowser;
 
         prv::Provider* &m_dataProvider;
-        std::vector<Highlight> &m_highlights;
+        std::vector<lang::PatternData*> &m_patternData;
+
+        char m_searchStringBuffer[0xFFFF] = { 0 };
+        char m_searchHexBuffer[0xFFFF] = { 0 };
+        SearchFunction m_searchFunction = nullptr;
+        std::vector<std::pair<u64, u64>> *m_lastSearchBuffer;
 
-        char m_searchBuffer[0xFFFF] = { 0 };
         s64 m_lastSearchIndex = 0;
-        std::vector<std::pair<u64, u64>> m_lastSearch;
-        u64 m_gotoAddress = 0;
+        std::vector<std::pair<u64, u64>> m_lastStringSearch;
+        std::vector<std::pair<u64, u64>> m_lastHexSearch;
+
+        s64 m_gotoAddress = 0;
 
 
         void drawSearchPopup();
         void drawGotoPopup();
+
+        void openFile(std::string path);
+
+        enum class Language { C, Cpp, CSharp, Rust, Python, Java, JavaScript };
+        void copyBytes();
+        void copyString();
+        void copyLanguageArray(Language language);
+        void copyHexView();
+        void copyHexViewHTML();
+
     };
 
 }

include/views/view_information.hpp

@@ -23,6 +23,7 @@ namespace hex {
         prv::Provider* &m_dataProvider;
         bool m_windowOpen = true;
 
+        u32 m_blockSize = 0;
         float m_averageEntropy = 0;
         float m_highestBlockEntropy = 0;
         std::vector<float> m_blockEntropy;

include/views/view_pattern.hpp

@@ -1,41 +1,39 @@
 #pragma once
 
-#include "parser/ast_node.hpp"
-#include "parser/parser.hpp"
-#include "parser/lexer.hpp"
+#include "lang/ast_node.hpp"
+
 #include "views/view.hpp"
+#include "lang/pattern_data.hpp"
+
+#include "providers/provider.hpp"
 
 #include <concepts>
 #include <cstring>
 
-#include "views/highlight.hpp"
 
-#include "imfilebrowser.h"
+#include "ImGuiFileBrowser.h"
+#include "TextEditor.h"
 
 namespace hex {
 
     class ViewPattern : public View {
     public:
-        explicit ViewPattern(std::vector<Highlight> &highlights);
+        explicit ViewPattern(prv::Provider* &dataProvider, std::vector<lang::PatternData*> &patternData);
         ~ViewPattern() override;
 
         void createMenu() override;
         void createView() override;
 
     private:
-        char *m_buffer;
-
-        std::vector<Highlight> &m_highlights;
+        std::vector<lang::PatternData*> &m_patternData;
+        prv::Provider* &m_dataProvider;
         bool m_windowOpen = true;
 
-        ImGui::FileBrowser m_fileBrowser;
+        TextEditor m_textEditor;
+        imgui_addons::ImGuiFileBrowser m_fileBrowser;
 
-
-        void setHighlight(u64 offset, size_t size, std::string name, u32 color = 0);
+        void clearPatternData();
         void parsePattern(char *buffer);
-
-        s32 highlightUsingDecls(std::vector<lang::ASTNode*> &ast, lang::ASTNodeTypeDecl* currTypeDeclNode, lang::ASTNodeVariableDecl* currVarDec, u64 offset);
-        s32 highlightStruct(std::vector<lang::ASTNode*> &ast, lang::ASTNodeStruct* currStructNode, u64 offset);
     };
 
 }

include/views/view_pattern_data.hpp

@@ -4,7 +4,7 @@
 
 #include "imgui.h"
 #include "views/view.hpp"
-#include "views/highlight.hpp"
+#include "lang/pattern_data.hpp"
 
 #include <vector>
 #include <tuple>
@@ -16,7 +16,7 @@ namespace hex {
 
     class ViewPatternData : public View {
     public:
-        ViewPatternData(prv::Provider* &dataProvider, std::vector<Highlight> &highlights);
+        ViewPatternData(prv::Provider* &dataProvider, std::vector<lang::PatternData*> &patternData);
         ~ViewPatternData() override;
 
         void createView() override;
@@ -24,7 +24,8 @@ namespace hex {
 
     private:
         prv::Provider* &m_dataProvider;
-        std::vector<Highlight> &m_highlights;
+        std::vector<lang::PatternData*> &m_patternData;
+        std::vector<lang::PatternData*> m_sortedPatternData;
         bool m_windowOpen = true;
     };
 

include/views/view_strings.hpp

@@ -0,0 +1,36 @@
+#pragma once
+
+#include "views/view.hpp"
+
+#include <cstdio>
+#include <string>
+
+namespace hex {
+
+    namespace prv { class Provider; }
+
+    struct FoundString {
+        std::string string;
+        u64 offset;
+        size_t size;
+    };
+
+    class ViewStrings : public View {
+    public:
+        explicit ViewStrings(prv::Provider* &dataProvider);
+        ~ViewStrings() override;
+
+        void createView() override;
+        void createMenu() override;
+
+    private:
+        prv::Provider* &m_dataProvider;
+        bool m_windowOpen = true;
+        bool m_shouldInvalidate = false;
+
+        std::vector<FoundString> m_foundStrings;
+        int m_minimumLength = 5;
+        char *m_filter;
+    };
+
+}

include/views/view_tools.hpp

@@ -0,0 +1,44 @@
+#pragma once
+
+#include <hex.hpp>
+
+#include "imgui.h"
+#include "views/view.hpp"
+
+#include <array>
+#include <string>
+
+namespace hex {
+
+    namespace prv { class Provider; }
+
+    class ViewTools : public View {
+    public:
+        ViewTools();
+        ~ViewTools() override;
+
+        void createView() override;
+        void createMenu() override;
+
+    private:
+        bool m_windowOpen = true;
+
+        char *m_mangledBuffer = nullptr;
+        char *m_demangledName = nullptr;
+
+        bool m_asciiTableShowOctal = false;
+
+        char *m_regexInput = nullptr;
+        char *m_regexPattern = nullptr;
+        char *m_replacePattern = nullptr;
+        std::string m_regexOutput;
+
+        std::array<float, 4> m_pickedColor;
+
+        void drawDemangler();
+        void drawASCIITable();
+        void drawRegexReplacer();
+        void drawColorPicker();
+    };
+
+}

include/window.hpp

@@ -24,6 +24,9 @@ namespace hex {
             return static_cast<T*>(this->m_views.back());
         }
 
+    public:
+        float m_globalScale = 1.0f, m_fontScale = 1.0f;
+
     private:
         void frameBegin();
         void frameEnd();

libs/ImGui/include/ImGuiFileBrowser.h

@@ -0,0 +1,123 @@
+#ifndef IMGUIFILEBROWSER_H
+#define IMGUIFILEBROWSER_H
+
+#include <imgui.h>
+#include <string>
+#include <vector>
+
+namespace imgui_addons
+{
+    class ImGuiFileBrowser
+    {
+        public:
+            ImGuiFileBrowser();
+            ~ImGuiFileBrowser();
+
+            enum class DialogMode
+            {
+                SELECT, //Select Directory Mode
+                OPEN,   //Open File mode
+                SAVE    //Save File mode.
+            };
+
+            /* Use this to show an open file dialog. The function takes label for the window,
+             * the size, a DialogMode enum value defining in which mode the dialog should operate and optionally the extensions that are valid for opening.
+             * Note that the select directory mode doesn't need any extensions.
+             */
+            bool showFileDialog(const std::string& label, const DialogMode mode, const ImVec2& sz_xy = ImVec2(0,0), const std::string& valid_types = "*.*");
+
+            /* Store the opened/saved file name or dir name (incase of selectDirectoryDialog) and the absolute path to the selection
+             * Should only be accessed when above functions return true else may contain garbage.
+             */
+            std::string selected_fn;
+            std::string selected_path;
+            std::string ext;    // Store the saved file extension
+
+
+        private:
+            struct Info
+            {
+                Info(std::string name, bool is_hidden) : name(name), is_hidden(is_hidden)
+                {
+                }
+                std::string name;
+                bool is_hidden;
+            };
+
+            //Enum used as bit flags.
+            enum FilterMode
+            {
+                FilterMode_Files = 0x01,
+                FilterMode_Dirs = 0x02
+            };
+
+            //Helper Functions
+            static std::string wStringToString(const wchar_t* wchar_arr);
+            static bool alphaSortComparator(const Info& a, const Info& b);
+            ImVec2 getButtonSize(std::string button_text);
+
+            /* Helper Functions that render secondary modals
+             * and help in validating file extensions and for filtering, parsing top navigation bar.
+             */
+            void setValidExtTypes(const std::string& valid_types_string);
+            bool validateFile();
+            void showErrorModal();
+            void showInvalidFileModal();
+            bool showReplaceFileModal();
+            void showHelpMarker(std::string desc);
+            void parsePathTabs(std::string str);
+            void filterFiles(int filter_mode);
+
+            /* Core Functions that render the 4 different regions making up
+             * a simple file dialog
+             */
+            bool renderNavAndSearchBarRegion();
+            bool renderFileListRegion();
+            bool renderInputTextAndExtRegion();
+            bool renderButtonsAndCheckboxRegion();
+            bool renderInputComboBox();
+            void renderExtBox();
+
+            /* Core Functions that handle navigation and
+             * reading directories/files
+             */
+            bool readDIR(std::string path);
+            bool onNavigationButtonClick(int idx);
+            bool onDirClick(int idx);
+
+            // Functions that reset state and/or clear file list when reading new directory
+            void clearFileList();
+            void closeDialog();
+
+            #if defined (WIN32) || defined (_WIN32) || defined (__WIN32)
+            bool loadWindowsDrives(); // Helper Function for Windows to load Drive Letters.
+            #endif
+
+            #if defined(unix) || defined(__unix__) || defined(__unix) || defined(__APPLE__)
+            void initCurrentPath();   // Helper function for UNIX based system to load Absolute path using realpath
+            #endif
+
+            ImVec2 min_size, max_size, input_combobox_pos, input_combobox_sz;
+            DialogMode dialog_mode;
+            int filter_mode, col_items_limit, selected_idx, selected_ext_idx;
+            float col_width, ext_box_width;
+            bool show_hidden, show_inputbar_combobox, is_dir, is_appearing, filter_dirty, validate_file, path_input_enabled;
+            char input_fn[256];
+            char temp_dir_input[256];
+
+            std::vector<std::string> valid_exts;
+            std::vector<std::string> current_dirlist;
+            std::vector<Info> subdirs;
+            std::vector<Info> subfiles;
+            std::string current_path, error_msg, error_title, invfile_modal_id, repfile_modal_id;
+
+            ImGuiTextFilter filter;
+            std::string valid_types;
+            std::vector<const Info*> filtered_dirs; // Note: We don't need to call delete. It's just for storing filtered items from subdirs and subfiles so we don't use PassFilter every frame.
+            std::vector<const Info*> filtered_files;
+            std::vector< std::reference_wrapper<std::string> > inputcb_filter_files;
+    };
+}
+
+
+#endif // IMGUIFILEBROWSER_H

libs/ImGui/include/TextEditor.h

@@ -0,0 +1,395 @@
+#pragma once
+
+#include <string>
+#include <vector>
+#include <array>
+#include <memory>
+#include <unordered_set>
+#include <unordered_map>
+#include <map>
+#include <regex>
+#include "imgui.h"
+
+class TextEditor
+{
+public:
+	enum class PaletteIndex
+	{
+		Default,
+		Keyword,
+		Number,
+		String,
+		CharLiteral,
+		Punctuation,
+		Preprocessor,
+		Identifier,
+		KnownIdentifier,
+		PreprocIdentifier,
+		Comment,
+		MultiLineComment,
+		Background,
+		Cursor,
+		Selection,
+		ErrorMarker,
+		Breakpoint,
+		LineNumber,
+		CurrentLineFill,
+		CurrentLineFillInactive,
+		CurrentLineEdge,
+		Max
+	};
+
+	enum class SelectionMode
+	{
+		Normal,
+		Word,
+		Line
+	};
+
+	struct Breakpoint
+	{
+		int mLine;
+		bool mEnabled;
+		std::string mCondition;
+
+		Breakpoint()
+			: mLine(-1)
+			, mEnabled(false)
+		{}
+	};
+
+	// Represents a character coordinate from the user's point of view,
+	// i. e. consider an uniform grid (assuming fixed-width font) on the
+	// screen as it is rendered, and each cell has its own coordinate, starting from 0.
+	// Tabs are counted as [1..mTabSize] count empty spaces, depending on
+	// how many space is necessary to reach the next tab stop.
+	// For example, coordinate (1, 5) represents the character 'B' in a line "\tABC", when mTabSize = 4,
+	// because it is rendered as "    ABC" on the screen.
+	struct Coordinates
+	{
+		int mLine, mColumn;
+		Coordinates() : mLine(0), mColumn(0) {}
+		Coordinates(int aLine, int aColumn) : mLine(aLine), mColumn(aColumn)
+		{
+			assert(aLine >= 0);
+			assert(aColumn >= 0);
+		}
+		static Coordinates Invalid() { static Coordinates invalid(-1, -1); return invalid; }
+
+		bool operator ==(const Coordinates& o) const
+		{
+			return
+				mLine == o.mLine &&
+				mColumn == o.mColumn;
+		}
+
+		bool operator !=(const Coordinates& o) const
+		{
+			return
+				mLine != o.mLine ||
+				mColumn != o.mColumn;
+		}
+
+		bool operator <(const Coordinates& o) const
+		{
+			if (mLine != o.mLine)
+				return mLine < o.mLine;
+			return mColumn < o.mColumn;
+		}
+
+		bool operator >(const Coordinates& o) const
+		{
+			if (mLine != o.mLine)
+				return mLine > o.mLine;
+			return mColumn > o.mColumn;
+		}
+
+		bool operator <=(const Coordinates& o) const
+		{
+			if (mLine != o.mLine)
+				return mLine < o.mLine;
+			return mColumn <= o.mColumn;
+		}
+
+		bool operator >=(const Coordinates& o) const
+		{
+			if (mLine != o.mLine)
+				return mLine > o.mLine;
+			return mColumn >= o.mColumn;
+		}
+	};
+
+	struct Identifier
+	{
+		Coordinates mLocation;
+		std::string mDeclaration;
+	};
+
+	typedef std::string String;
+	typedef std::unordered_map<std::string, Identifier> Identifiers;
+	typedef std::unordered_set<std::string> Keywords;
+	typedef std::map<int, std::string> ErrorMarkers;
+	typedef std::unordered_set<int> Breakpoints;
+	typedef std::array<ImU32, (unsigned)PaletteIndex::Max> Palette;
+	typedef uint8_t Char;
+
+	struct Glyph
+	{
+		Char mChar;
+		PaletteIndex mColorIndex = PaletteIndex::Default;
+		bool mComment : 1;
+		bool mMultiLineComment : 1;
+		bool mPreprocessor : 1;
+
+		Glyph(Char aChar, PaletteIndex aColorIndex) : mChar(aChar), mColorIndex(aColorIndex),
+			mComment(false), mMultiLineComment(false), mPreprocessor(false) {}
+	};
+
+	typedef std::vector<Glyph> Line;
+	typedef std::vector<Line> Lines;
+
+	struct LanguageDefinition
+	{
+		typedef std::pair<std::string, PaletteIndex> TokenRegexString;
+		typedef std::vector<TokenRegexString> TokenRegexStrings;
+		typedef bool(*TokenizeCallback)(const char * in_begin, const char * in_end, const char *& out_begin, const char *& out_end, PaletteIndex & paletteIndex);
+
+		std::string mName;
+		Keywords mKeywords;
+		Identifiers mIdentifiers;
+		Identifiers mPreprocIdentifiers;
+		std::string mCommentStart, mCommentEnd, mSingleLineComment;
+		char mPreprocChar;
+		bool mAutoIndentation;
+
+		TokenizeCallback mTokenize;
+
+		TokenRegexStrings mTokenRegexStrings;
+
+		bool mCaseSensitive;
+
+		LanguageDefinition()
+			: mPreprocChar('#'), mAutoIndentation(true), mTokenize(nullptr), mCaseSensitive(true)
+		{
+		}
+
+		static const LanguageDefinition& CPlusPlus();
+		static const LanguageDefinition& HLSL();
+		static const LanguageDefinition& GLSL();
+		static const LanguageDefinition& C();
+		static const LanguageDefinition& SQL();
+		static const LanguageDefinition& AngelScript();
+		static const LanguageDefinition& Lua();
+	};
+
+	TextEditor();
+	~TextEditor();
+
+	void SetLanguageDefinition(const LanguageDefinition& aLanguageDef);
+	const LanguageDefinition& GetLanguageDefinition() const { return mLanguageDefinition; }
+
+	const Palette& GetPalette() const { return mPaletteBase; }
+	void SetPalette(const Palette& aValue);
+
+	void SetErrorMarkers(const ErrorMarkers& aMarkers) { mErrorMarkers = aMarkers; }
+	void SetBreakpoints(const Breakpoints& aMarkers) { mBreakpoints = aMarkers; }
+
+	void Render(const char* aTitle, const ImVec2& aSize = ImVec2(), bool aBorder = false);
+	void SetText(const std::string& aText);
+	std::string GetText() const;
+
+	void SetTextLines(const std::vector<std::string>& aLines);
+	std::vector<std::string> GetTextLines() const;
+
+	std::string GetSelectedText() const;
+	std::string GetCurrentLineText()const;
+
+	int GetTotalLines() const { return (int)mLines.size(); }
+	bool IsOverwrite() const { return mOverwrite; }
+
+	void SetReadOnly(bool aValue);
+	bool IsReadOnly() const { return mReadOnly; }
+	bool IsTextChanged() const { return mTextChanged; }
+	bool IsCursorPositionChanged() const { return mCursorPositionChanged; }
+
+	bool IsColorizerEnabled() const { return mColorizerEnabled; }
+	void SetColorizerEnable(bool aValue);
+
+	Coordinates GetCursorPosition() const { return GetActualCursorCoordinates(); }
+	void SetCursorPosition(const Coordinates& aPosition);
+
+	inline void SetHandleMouseInputs    (bool aValue){ mHandleMouseInputs    = aValue;}
+	inline bool IsHandleMouseInputsEnabled() const { return mHandleKeyboardInputs; }
+
+	inline void SetHandleKeyboardInputs (bool aValue){ mHandleKeyboardInputs = aValue;}
+	inline bool IsHandleKeyboardInputsEnabled() const { return mHandleKeyboardInputs; }
+
+	inline void SetImGuiChildIgnored    (bool aValue){ mIgnoreImGuiChild     = aValue;}
+	inline bool IsImGuiChildIgnored() const { return mIgnoreImGuiChild; }
+
+	inline void SetShowWhitespaces(bool aValue) { mShowWhitespaces = aValue; }
+	inline bool IsShowingWhitespaces() const { return mShowWhitespaces; }
+
+	void SetTabSize(int aValue);
+	inline int GetTabSize() const { return mTabSize; }
+
+	void InsertText(const std::string& aValue);
+	void InsertText(const char* aValue);
+
+	void MoveUp(int aAmount = 1, bool aSelect = false);
+	void MoveDown(int aAmount = 1, bool aSelect = false);
+	void MoveLeft(int aAmount = 1, bool aSelect = false, bool aWordMode = false);
+	void MoveRight(int aAmount = 1, bool aSelect = false, bool aWordMode = false);
+	void MoveTop(bool aSelect = false);
+	void MoveBottom(bool aSelect = false);
+	void MoveHome(bool aSelect = false);
+	void MoveEnd(bool aSelect = false);
+
+	void SetSelectionStart(const Coordinates& aPosition);
+	void SetSelectionEnd(const Coordinates& aPosition);
+	void SetSelection(const Coordinates& aStart, const Coordinates& aEnd, SelectionMode aMode = SelectionMode::Normal);
+	void SelectWordUnderCursor();
+	void SelectAll();
+	bool HasSelection() const;
+
+	void Copy();
+	void Cut();
+	void Paste();
+	void Delete();
+
+	bool CanUndo() const;
+	bool CanRedo() const;
+	void Undo(int aSteps = 1);
+	void Redo(int aSteps = 1);
+
+	static const Palette& GetDarkPalette();
+	static const Palette& GetLightPalette();
+	static const Palette& GetRetroBluePalette();
+
+private:
+	typedef std::vector<std::pair<std::regex, PaletteIndex>> RegexList;
+
+	struct EditorState
+	{
+		Coordinates mSelectionStart;
+		Coordinates mSelectionEnd;
+		Coordinates mCursorPosition;
+	};
+
+	class UndoRecord
+	{
+	public:
+		UndoRecord() {}
+		~UndoRecord() {}
+
+		UndoRecord(
+			const std::string& aAdded,
+			const TextEditor::Coordinates aAddedStart,
+			const TextEditor::Coordinates aAddedEnd,
+
+			const std::string& aRemoved,
+			const TextEditor::Coordinates aRemovedStart,
+			const TextEditor::Coordinates aRemovedEnd,
+
+			TextEditor::EditorState& aBefore,
+			TextEditor::EditorState& aAfter);
+
+		void Undo(TextEditor* aEditor);
+		void Redo(TextEditor* aEditor);
+
+		std::string mAdded;
+		Coordinates mAddedStart;
+		Coordinates mAddedEnd;
+
+		std::string mRemoved;
+		Coordinates mRemovedStart;
+		Coordinates mRemovedEnd;
+
+		EditorState mBefore;
+		EditorState mAfter;
+	};
+
+	typedef std::vector<UndoRecord> UndoBuffer;
+
+	void ProcessInputs();
+	void Colorize(int aFromLine = 0, int aCount = -1);
+	void ColorizeRange(int aFromLine = 0, int aToLine = 0);
+	void ColorizeInternal();
+	float TextDistanceToLineStart(const Coordinates& aFrom) const;
+	void EnsureCursorVisible();
+	int GetPageSize() const;
+	std::string GetText(const Coordinates& aStart, const Coordinates& aEnd) const;
+	Coordinates GetActualCursorCoordinates() const;
+	Coordinates SanitizeCoordinates(const Coordinates& aValue) const;
+	void Advance(Coordinates& aCoordinates) const;
+	void DeleteRange(const Coordinates& aStart, const Coordinates& aEnd);
+	int InsertTextAt(Coordinates& aWhere, const char* aValue);
+	void AddUndo(UndoRecord& aValue);
+	Coordinates ScreenPosToCoordinates(const ImVec2& aPosition) const;
+	Coordinates FindWordStart(const Coordinates& aFrom) const;
+	Coordinates FindWordEnd(const Coordinates& aFrom) const;
+	Coordinates FindNextWord(const Coordinates& aFrom) const;
+	int GetCharacterIndex(const Coordinates& aCoordinates) const;
+	int GetCharacterColumn(int aLine, int aIndex) const;
+	int GetLineCharacterCount(int aLine) const;
+	int GetLineMaxColumn(int aLine) const;
+	bool IsOnWordBoundary(const Coordinates& aAt) const;
+	void RemoveLine(int aStart, int aEnd);
+	void RemoveLine(int aIndex);
+	Line& InsertLine(int aIndex);
+	void EnterCharacter(ImWchar aChar, bool aShift);
+	void Backspace();
+	void DeleteSelection();
+	std::string GetWordUnderCursor() const;
+	std::string GetWordAt(const Coordinates& aCoords) const;
+	ImU32 GetGlyphColor(const Glyph& aGlyph) const;
+
+	void HandleKeyboardInputs();
+	void HandleMouseInputs();
+	void Render();
+
+	float mLineSpacing;
+	Lines mLines;
+	EditorState mState;
+	UndoBuffer mUndoBuffer;
+	int mUndoIndex;
+
+	int mTabSize;
+	bool mOverwrite;
+	bool mReadOnly;
+	bool mWithinRender;
+	bool mScrollToCursor;
+	bool mScrollToTop;
+	bool mTextChanged;
+	bool mColorizerEnabled;
+	float mTextStart;                   // position (in pixels) where a code line starts relative to the left of the TextEditor.
+	int  mLeftMargin;
+	bool mCursorPositionChanged;
+	int mColorRangeMin, mColorRangeMax;
+	SelectionMode mSelectionMode;
+	bool mHandleKeyboardInputs;
+	bool mHandleMouseInputs;
+	bool mIgnoreImGuiChild;
+	bool mShowWhitespaces;
+
+	Palette mPaletteBase;
+	Palette mPalette;
+	LanguageDefinition mLanguageDefinition;
+	RegexList mRegexList;
+
+	bool mCheckComments;
+	Breakpoints mBreakpoints;
+	ErrorMarkers mErrorMarkers;
+	ImVec2 mCharAdvance;
+	Coordinates mInteractiveStart, mInteractiveEnd;
+	std::string mLineBuffer;
+	uint64_t mStartTime;
+
+	float mLastClick;
+};
+
+bool TokenizeCStyleString(const char * in_begin, const char * in_end, const char *& out_begin, const char *& out_end);
+bool TokenizeCStyleCharacterLiteral(const char * in_begin, const char * in_end, const char *& out_begin, const char *& out_end);
+bool TokenizeCStyleIdentifier(const char * in_begin, const char * in_end, const char *& out_begin, const char *& out_end);
+bool TokenizeCStyleNumber(const char * in_begin, const char * in_end, const char *& out_begin, const char *& out_end);
+bool TokenizeCStylePunctuation(const char * in_begin, const char * in_end, const char *& out_begin, const char *& out_end);

libs/ImGui/include/imconfig.h

@@ -31,7 +31,7 @@
 // It is very strongly recommended to NOT disable the demo windows during development. Please read comments in imgui_demo.cpp.
 //#define IMGUI_DISABLE                                     // Disable everything: all headers and source files will be empty.
 //#define IMGUI_DISABLE_DEMO_WINDOWS                        // Disable demo windows: ShowDemoWindow()/ShowStyleEditor() will be empty. Not recommended.
-//#define IMGUI_DISABLE_METRICS_WINDOW                      // Disable debug/metrics window: ShowMetricsWindow() will be empty.
+//#define IMGUI_DISABLE_METRICS_WINDOW                      // Disable metrics/debugger window: ShowMetricsWindow() will be empty.
 
 //---- Don't implement some functions to reduce linkage requirements.
 //#define IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS   // [Win32] Don't implement default clipboard handler. Won't use and link with OpenClipboard/GetClipboardData/CloseClipboard etc.

libs/ImGui/include/imfilebrowser.h

@@ -1,721 +0,0 @@
-/*
-MIT License
-
-Copyright (c) 2019-2020 Zhuang Guan
-
-https://github.com/AirGuanZ
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#pragma once
-
-#include <algorithm>
-#include <array>
-#include <cstring>
-#include <filesystem>
-#include <memory>
-#include <set>
-#include <string>
-#include <vector>
-
-#ifndef IMGUI_VERSION
-#   error "include imgui.h before this header"
-#endif
-
-using ImGuiFileBrowserFlags = int;
-
-enum ImGuiFileBrowserFlags_
-{
-    ImGuiFileBrowserFlags_SelectDirectory   = 1 << 0, // select directory instead of regular file
-    ImGuiFileBrowserFlags_EnterNewFilename  = 1 << 1, // allow user to enter new filename when selecting regular file
-    ImGuiFileBrowserFlags_NoModal           = 1 << 2, // file browsing window is modal by default. specify this to use a popup window
-    ImGuiFileBrowserFlags_NoTitleBar        = 1 << 3, // hide window title bar
-    ImGuiFileBrowserFlags_NoStatusBar       = 1 << 4, // hide status bar at the bottom of browsing window
-    ImGuiFileBrowserFlags_CloseOnEsc        = 1 << 5, // close file browser when pressing 'ESC'
-    ImGuiFileBrowserFlags_CreateNewDir      = 1 << 6, // allow user to create new directory
-    ImGuiFileBrowserFlags_MultipleSelection = 1 << 7, // allow user to select multiple files. this will hide ImGuiFileBrowserFlags_EnterNewFilename
-};
-
-namespace ImGui
-{
-    class FileBrowser
-    {
-    public:
-
-        // pwd is set to current working directory by default
-        explicit FileBrowser(ImGuiFileBrowserFlags flags = 0);
-
-        FileBrowser(const FileBrowser &copyFrom);
-
-        FileBrowser &operator=(const FileBrowser &copyFrom);
-
-        // set the window size (in pixels)
-        // default is (700, 450)
-        void SetWindowSize(int width, int height) noexcept;
-
-        // set the window title text
-        void SetTitle(std::string title);
-
-        // open the browsing window
-        void Open();
-
-        // close the browsing window
-        void Close();
-
-        // the browsing window is opened or not
-        bool IsOpened() const noexcept;
-
-        // display the browsing window if opened
-        void Display();
-
-        // returns true when there is a selected filename and the "ok" button was clicked
-        bool HasSelected() const noexcept;
-
-        // set current browsing directory
-        bool SetPwd(const std::filesystem::path &pwd =
-                                    std::filesystem::current_path());
-
-        // get current browsing directory
-        const std::filesystem::path &GetPwd() const noexcept;
-
-        // returns selected filename. make sense only when HasSelected returns true
-        // when ImGuiFileBrowserFlags_MultipleSelection is enabled, only one of
-        // selected filename will be returned
-        std::filesystem::path GetSelected() const;
-
-        // returns all selected filenames.
-        // when ImGuiFileBrowserFlags_MultipleSelection is enabled, use this
-        // instead of GetSelected
-        std::vector<std::filesystem::path> GetMultiSelected() const;
-
-        // set selected filename to empty
-        void ClearSelected();
-
-        // set file type filters. eg. { ".h", ".cpp", ".hpp", ".cc", ".inl" }
-        void SetTypeFilters(const std::vector<const char*> &typeFilters);
-
-    private:
-    
-        template <class Functor>
-        struct ScopeGuard
-        {
-            ScopeGuard(Functor&& t) : func(std::move(t)) { }
-
-            ~ScopeGuard()
-            {
-                func();
-            }
-
-        private:
-
-            Functor func;
-        };
-
-        void SetPwdUncatched(const std::filesystem::path &pwd);
-
-#ifdef _WIN32
-        static std::uint32_t GetDrivesBitMask();
-#endif
-
-        // for c++17 compatibility
-
-#if defined(__cpp_lib_char8_t)
-        static std::string u8StrToStr(std::u8string s);
-#endif
-        static std::string u8StrToStr(std::string s);
-
-        int width_;
-        int height_;
-        ImGuiFileBrowserFlags flags_;
-
-        std::string title_;
-        std::string openLabel_;
-
-        bool openFlag_;
-        bool closeFlag_;
-        bool isOpened_;
-        bool ok_;
-
-        std::string statusStr_;
-
-        std::vector<const char*> typeFilters_;
-        int typeFilterIndex_;
-
-        std::filesystem::path pwd_;
-        std::set<std::filesystem::path> selectedFilenames_;
-
-        struct FileRecord
-        {
-            bool isDir = false;
-            std::filesystem::path name;
-            std::string showName;
-            std::filesystem::path extension;
-        };
-        std::vector<FileRecord> fileRecords_;
-
-        // IMPROVE: truncate when selectedFilename_.length() > inputNameBuf_.size() - 1
-        static constexpr size_t INPUT_NAME_BUF_SIZE = 512;
-        std::unique_ptr<std::array<char, INPUT_NAME_BUF_SIZE>> inputNameBuf_;
-
-        std::string openNewDirLabel_;
-        std::unique_ptr<std::array<char, INPUT_NAME_BUF_SIZE>> newDirNameBuf_;
-
-#ifdef _WIN32
-        uint32_t drives_;
-#endif
-    };
-} // namespace ImGui
-
-inline ImGui::FileBrowser::FileBrowser(ImGuiFileBrowserFlags flags)
-    : width_(700), height_(450), flags_(flags),
-      openFlag_(false), closeFlag_(false), isOpened_(false), ok_(false),
-      inputNameBuf_(std::make_unique<std::array<char, INPUT_NAME_BUF_SIZE>>())
-{
-    if(flags_ & ImGuiFileBrowserFlags_CreateNewDir)
-        newDirNameBuf_ = std::make_unique<
-                                std::array<char, INPUT_NAME_BUF_SIZE>>();
-
-    inputNameBuf_->front() = '\0';
-    inputNameBuf_->back() = '\0';
-    SetTitle("file browser");
-    SetPwd(std::filesystem::current_path());
-
-    typeFilters_.clear();
-    typeFilterIndex_ = 0;
-
-#ifdef _WIN32
-    drives_ = GetDrivesBitMask();
-#endif
-}
-
-inline ImGui::FileBrowser::FileBrowser(const FileBrowser &copyFrom)
-    : FileBrowser()
-{
-    *this = copyFrom;
-}
-
-inline ImGui::FileBrowser &ImGui::FileBrowser::operator=(
-    const FileBrowser &copyFrom)
-{
-    flags_ = copyFrom.flags_;
-    SetTitle(copyFrom.title_);
-
-    openFlag_  = copyFrom.openFlag_;
-    closeFlag_ = copyFrom.closeFlag_;
-    isOpened_  = copyFrom.isOpened_;
-    ok_        = copyFrom.ok_;
-    
-    statusStr_ = "";
-    pwd_ = copyFrom.pwd_;
-    selectedFilenames_ = copyFrom.selectedFilenames_;
-
-    fileRecords_ = copyFrom.fileRecords_;
-
-    *inputNameBuf_ = *copyFrom.inputNameBuf_;
-
-    if(flags_ & ImGuiFileBrowserFlags_CreateNewDir)
-    {
-        newDirNameBuf_ = std::make_unique<
-                                std::array<char, INPUT_NAME_BUF_SIZE>>();
-        *newDirNameBuf_ = *copyFrom.newDirNameBuf_;
-    }
-
-    return *this;
-}
-
-inline void ImGui::FileBrowser::SetWindowSize(int width, int height) noexcept
-{
-    assert(width > 0 && height > 0);
-    width_  = width;
-    height_ = height;
-}
-
-inline void ImGui::FileBrowser::SetTitle(std::string title)
-{
-    title_ = std::move(title);
-    openLabel_ = title_ + "##filebrowser_" +
-                 std::to_string(reinterpret_cast<size_t>(this));
-    openNewDirLabel_ = "new dir##new_dir_" +
-                       std::to_string(reinterpret_cast<size_t>(this));
-}
-
-inline void ImGui::FileBrowser::Open()
-{
-    ClearSelected();
-    statusStr_ = std::string();
-    openFlag_ = true;
-    closeFlag_ = false;
-}
-
-inline void ImGui::FileBrowser::Close()
-{
-    ClearSelected();
-    statusStr_ = std::string();
-    closeFlag_ = true;
-    openFlag_ = false;
-}
-
-inline bool ImGui::FileBrowser::IsOpened() const noexcept
-{
-    return isOpened_;
-}
-
-inline void ImGui::FileBrowser::Display()
-{
-    PushID(this);
-    ScopeGuard exitThis([this]
-    {
-        openFlag_ = false;
-        closeFlag_ = false;
-        PopID();
-    });
-
-    if(openFlag_)
-        OpenPopup(openLabel_.c_str());
-    isOpened_ = false;
-
-    // open the popup window
-
-    if(openFlag_ && (flags_ & ImGuiFileBrowserFlags_NoModal))
-    {
-        SetNextWindowSize(
-            ImVec2(static_cast<float>(width_), static_cast<float>(height_)));
-    }
-    else
-    {
-        SetNextWindowSize(
-            ImVec2(static_cast<float>(width_), static_cast<float>(height_)),
-            ImGuiCond_FirstUseEver);
-    }
-    if(flags_ & ImGuiFileBrowserFlags_NoModal)
-    {
-        if(!BeginPopup(openLabel_.c_str()))
-            return;
-    }
-    else if(!BeginPopupModal(openLabel_.c_str(), nullptr,
-                             flags_ & ImGuiFileBrowserFlags_NoTitleBar ?
-                                ImGuiWindowFlags_NoTitleBar : 0))
-    {
-        return;
-    }
-    isOpened_ = true;
-    ScopeGuard endPopup([] { EndPopup(); });
-
-    // display elements in pwd
-
-#ifdef _WIN32
-    char currentDrive = static_cast<char>(pwd_.c_str()[0]);
-    char driveStr[] = { currentDrive, ':', '\0' };
-
-    PushItemWidth(4 * GetFontSize());
-    if(BeginCombo("##select_drive", driveStr))
-    {
-        ScopeGuard guard([&] { ImGui::EndCombo(); });
-        for(int i = 0; i < 26; ++i)
-        {
-            if(!(drives_ & (1 << i)))
-                continue;
-            char driveCh = static_cast<char>('A' + i);
-            char selectableStr[] = { driveCh, ':', '\0' };
-            bool selected = currentDrive == driveCh;
-            if(Selectable(selectableStr, selected) && !selected)
-            {
-                char newPwd[] = { driveCh, ':', '\\', '\0' };
-                SetPwd(newPwd);
-            }
-        }
-    }
-    PopItemWidth();
-
-    SameLine();
-#endif
-
-    int secIdx = 0, newPwdLastSecIdx = -1;
-    for(auto &sec : pwd_)
-    {
-#ifdef _WIN32
-        if(secIdx == 1)
-        {
-            ++secIdx;
-            continue;
-        }
-#endif
-        PushID(secIdx);
-        if(secIdx > 0)
-            SameLine();
-        if(SmallButton(u8StrToStr(sec.u8string()).c_str()))
-            newPwdLastSecIdx = secIdx;
-        PopID();
-        ++secIdx;
-    }
-
-    if(newPwdLastSecIdx >= 0)
-    {
-        int i = 0;
-        std::filesystem::path newPwd;
-        for(auto &sec : pwd_)
-        {
-            if(i++ > newPwdLastSecIdx)
-                break;
-            newPwd /= sec;
-        }
-#ifdef _WIN32
-        if(newPwdLastSecIdx == 0)
-            newPwd /= "\\";
-#endif
-        SetPwd(newPwd);
-    }
-
-    SameLine();
-
-    if(SmallButton("*"))
-        SetPwd(pwd_);
-
-    if(newDirNameBuf_)
-    {
-        SameLine();
-        if(SmallButton("+"))
-        {
-            OpenPopup(openNewDirLabel_.c_str());
-            (*newDirNameBuf_)[0] = '\0';
-        }
-
-        if(BeginPopup(openNewDirLabel_.c_str()))
-        {
-            ScopeGuard endNewDirPopup([] { EndPopup(); });
-
-            InputText("name", newDirNameBuf_->data(), newDirNameBuf_->size());
-            SameLine();
-
-            if(Button("ok") && (*newDirNameBuf_)[0] != '\0')
-            {
-                ScopeGuard closeNewDirPopup([] { CloseCurrentPopup(); });
-                if(create_directory(pwd_ / newDirNameBuf_->data()))
-                    SetPwd(pwd_);
-                else
-                {
-                    statusStr_ = "failed to create " +
-                                 std::string(newDirNameBuf_->data());
-                }
-            }
-        }
-    }
-
-    // browse files in a child window
-
-    float reserveHeight = GetFrameHeightWithSpacing();
-    std::filesystem::path newPwd; bool setNewPwd = false;
-    if(!(flags_ & ImGuiFileBrowserFlags_SelectDirectory) &&
-       (flags_ & ImGuiFileBrowserFlags_EnterNewFilename))
-        reserveHeight += GetFrameHeightWithSpacing();
-    {
-        BeginChild("ch", ImVec2(0, -reserveHeight), true,
-            (flags_ & ImGuiFileBrowserFlags_NoModal) ?
-                ImGuiWindowFlags_AlwaysHorizontalScrollbar : 0);
-        ScopeGuard endChild([] { EndChild(); });
-
-        for(auto &rsc : fileRecords_)
-        {
-            if (!rsc.isDir && typeFilters_.size() > 0 &&
-                static_cast<size_t>(typeFilterIndex_) < typeFilters_.size() &&
-                !(rsc.extension == typeFilters_[typeFilterIndex_]))
-                continue;
-
-            if(!rsc.name.empty() && rsc.name.c_str()[0] == '$')
-                continue;
-
-            bool selected = selectedFilenames_.find(rsc.name)
-                         != selectedFilenames_.end();
-
-            if(Selectable(rsc.showName.c_str(), selected,
-                          ImGuiSelectableFlags_DontClosePopups))
-            {
-                const bool multiSelect =
-                    (flags_ & ImGuiFileBrowserFlags_MultipleSelection) &&
-                    IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows) &&
-                    (GetIO().KeyCtrl || GetIO().KeyShift);
-
-                if(selected)
-                {
-                    if(!multiSelect)
-                        selectedFilenames_.clear();
-                    else
-                        selectedFilenames_.erase(rsc.name);
-
-                    (*inputNameBuf_)[0] = '\0';
-                }
-                else if(rsc.name != "..")
-                {
-                    if((rsc.isDir && (flags_ & ImGuiFileBrowserFlags_SelectDirectory)) ||
-                       (!rsc.isDir && !(flags_ & ImGuiFileBrowserFlags_SelectDirectory)))
-                    {
-                        if(!multiSelect)
-                            selectedFilenames_.clear();
-                        selectedFilenames_.insert(rsc.name);
-                        if(!(flags_ & ImGuiFileBrowserFlags_SelectDirectory))
-                        {
-#ifdef _MSC_VER
-                            strcpy_s(
-                                inputNameBuf_->data(), inputNameBuf_->size(),
-                                u8StrToStr(rsc.name.u8string()).c_str());
-#else
-                            std::strncpy(inputNameBuf_->data(),
-                                         u8StrToStr(rsc.name.u8string()).c_str(),
-                                         inputNameBuf_->size() - 1);
-#endif
-                        }
-                    }
-                }
-                else
-                {
-                    if(!multiSelect)
-                        selectedFilenames_.clear();
-                }
-            }
-
-            if(IsItemClicked(0) && IsMouseDoubleClicked(0))
-            {
-                if(rsc.isDir)
-                {
-                    setNewPwd = true;
-                    newPwd = (rsc.name != "..") ? (pwd_ / rsc.name) :
-                                                   pwd_.parent_path();
-                }
-                else if(!(flags_ & ImGuiFileBrowserFlags_SelectDirectory))
-                {
-                    selectedFilenames_ = { rsc.name };
-                    ok_ = true;
-                    CloseCurrentPopup();
-                }
-            }
-        }
-    }
-
-    if(setNewPwd)
-        SetPwd(newPwd);
-
-    if(!(flags_ & ImGuiFileBrowserFlags_SelectDirectory) &&
-       (flags_ & ImGuiFileBrowserFlags_EnterNewFilename))
-    {
-        PushID(this);
-        ScopeGuard popTextID([] { PopID(); });
-
-        PushItemWidth(-1);
-        if(InputText("", inputNameBuf_->data(), inputNameBuf_->size()) &&
-           inputNameBuf_->at(0) != '\0')
-        {
-            selectedFilenames_ = { inputNameBuf_->data() };
-        }
-        PopItemWidth();
-    }
-
-    if(!(flags_ & ImGuiFileBrowserFlags_SelectDirectory))
-    {
-        if(Button(" ok ") && !selectedFilenames_.empty())
-        {
-            ok_ = true;
-            CloseCurrentPopup();
-        }
-    }
-    else
-    {
-        if(Button(" ok "))
-        {
-            ok_ = true;
-            CloseCurrentPopup();
-        }
-    }
-
-    SameLine();
-
-    int escIdx = GetIO().KeyMap[ImGuiKey_Escape];
-    if(Button("cancel") || closeFlag_ ||
-        ((flags_ & ImGuiFileBrowserFlags_CloseOnEsc) &&
-         IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows) &&
-         escIdx >= 0 && IsKeyPressed(escIdx)))
-        CloseCurrentPopup();
-
-    if(!statusStr_.empty() && !(flags_ & ImGuiFileBrowserFlags_NoStatusBar))
-    {
-        SameLine();
-        Text("%s", statusStr_.c_str());
-    }
-
-    if(!typeFilters_.empty())
-    {
-        SameLine();
-        PushItemWidth(8 * GetFontSize());
-        Combo("##type_filters", &typeFilterIndex_,
-              typeFilters_.data(), int(typeFilters_.size()));
-        PopItemWidth();
-    }
-}
-
-inline bool ImGui::FileBrowser::HasSelected() const noexcept
-{
-    return ok_;
-}
-
-inline bool ImGui::FileBrowser::SetPwd(const std::filesystem::path &pwd)
-{
-    try
-    {
-        SetPwdUncatched(pwd);
-        return true;
-    }
-    catch(const std::exception &err)
-    {
-        statusStr_ = std::string("last error: ") + err.what();
-    }
-    catch(...)
-    {
-        statusStr_ = "last error: unknown";
-    }
-
-    SetPwdUncatched(std::filesystem::current_path());
-    return false;
-}
-
-inline const class std::filesystem::path &ImGui::FileBrowser::GetPwd() const noexcept
-{
-    return pwd_;
-}
-
-inline std::filesystem::path ImGui::FileBrowser::GetSelected() const
-{
-    // when ok_ is true, selectedFilenames_ may be empty if SelectDirectory
-    // is enabled. return pwd in that case.
-    if(selectedFilenames_.empty())
-        return pwd_;
-    return pwd_ / *selectedFilenames_.begin();
-}
-
-inline std::vector<std::filesystem::path>
-    ImGui::FileBrowser::GetMultiSelected() const
-{
-    if(selectedFilenames_.empty())
-        return { pwd_ };
-    std::vector<std::filesystem::path> ret;
-    ret.reserve(selectedFilenames_.size());
-    for(auto &s : selectedFilenames_)
-        ret.push_back(pwd_ / s);
-    return ret;
-}
-
-inline void ImGui::FileBrowser::ClearSelected()
-{
-    selectedFilenames_.clear();
-    (*inputNameBuf_)[0] = '\0';
-    ok_ = false;
-}
-
-inline void ImGui::FileBrowser::SetTypeFilters(
-    const std::vector<const char*> &typeFilters)
-{
-    typeFilters_ = typeFilters;
-    typeFilterIndex_ = 0;
-}
-
-inline void ImGui::FileBrowser::SetPwdUncatched(const std::filesystem::path &pwd)
-{
-    fileRecords_ = { FileRecord{ true, "..", "[D] ..", "" } };
-
-    for(auto &p : std::filesystem::directory_iterator(pwd))
-    {
-        FileRecord rcd;
-
-        if(p.is_regular_file())
-            rcd.isDir = false;
-        else if(p.is_directory())
-            rcd.isDir = true;
-        else
-            continue;
-
-        rcd.name = p.path().filename();
-        if(rcd.name.empty())
-            continue;
-
-        rcd.extension = p.path().filename().extension();
-
-        rcd.showName = (rcd.isDir ? "[D] " : "[F] ") +
-                       u8StrToStr(p.path().filename().u8string());
-        fileRecords_.push_back(rcd);
-    }
-
-    std::sort(fileRecords_.begin(), fileRecords_.end(),
-        [](const FileRecord &L, const FileRecord &R)
-    {
-        return (L.isDir ^ R.isDir) ? L.isDir : (L.name < R.name);
-    });
-
-    pwd_ = absolute(pwd);
-    selectedFilenames_.clear();
-    (*inputNameBuf_)[0] = '\0';
-}
-
-#if defined(__cpp_lib_char8_t)
-inline std::string ImGui::FileBrowser::u8StrToStr(std::u8string s)
-{
-    return std::string(s.begin(), s.end());
-}
-#endif
-
-inline std::string ImGui::FileBrowser::u8StrToStr(std::string s)
-{
-    return s;
-}
-
-#ifdef _WIN32
-
-#ifndef _INC_WINDOWS
-
-#ifndef WIN32_LEAN_AND_MEAN
-
-#define IMGUI_FILEBROWSER_UNDEF_WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-
-#endif // #ifndef WIN32_LEAN_AND_MEAN
-
-#include <windows.h>
-
-#ifdef IMGUI_FILEBROWSER_UNDEF_WIN32_LEAN_AND_MEAN
-#undef IMGUI_FILEBROWSER_UNDEF_WIN32_LEAN_AND_MEAN
-#undef WIN32_LEAN_AND_MEAN
-#endif // #ifdef IMGUI_FILEBROWSER_UNDEF_WIN32_LEAN_AND_MEAN
-
-#endif // #ifdef _INC_WINDOWS
-
-inline std::uint32_t ImGui::FileBrowser::GetDrivesBitMask()
-{
-    DWORD mask = GetLogicalDrives();
-    uint32_t ret = 0;
-    for(int i = 0; i < 26; ++i)
-    {
-        if(!(mask & (1 << i)))
-            continue;
-        char rootName[4] = { static_cast<char>('A' + i), ':', '\\', '\0' };
-        UINT type = GetDriveTypeA(rootName);
-        if(type == DRIVE_REMOVABLE || type == DRIVE_FIXED)
-            ret |= (1 << i);
-    }
-    return ret;
-}
-
-#endif

libs/ImGui/include/imgui.h

@@ -34,6 +34,8 @@ Index of this file:
 // Font API (ImFontConfig, ImFontGlyph, ImFontGlyphRangesBuilder, ImFontAtlasFlags, ImFontAtlas, ImFont)
 // Platform interface for multi-viewport support (ImGuiPlatformIO, ImGuiPlatformMonitor, ImGuiViewportFlags, ImGuiViewport)
 
+// FIXME-TABLE: Add ImGuiTableSortSpecsColumn and ImGuiTableSortSpecs in "Misc data structures" section above (we don't do it right now to facilitate merging various branches)
+
 */
 
 #pragma once
@@ -61,7 +63,7 @@ Index of this file:
 // Version
 // (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY99 then bounce up to XYY00, XYY01 etc. when release tagging happens)
 #define IMGUI_VERSION               "1.80 WIP"
-#define IMGUI_VERSION_NUM           17905
+#define IMGUI_VERSION_NUM           17906
 #define IMGUI_CHECKVERSION()        ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx))
 #define IMGUI_HAS_VIEWPORT          1 // Viewport WIP branch
 #define IMGUI_HAS_DOCK              1 // Docking WIP branch
@@ -81,13 +83,6 @@ Index of this file:
 #include <assert.h>
 #define IM_ASSERT(_EXPR)            assert(_EXPR)                               // You can override the default assert handler by editing imconfig.h
 #endif
-#if !defined(IMGUI_USE_STB_SPRINTF) && (defined(__clang__) || defined(__GNUC__))
-#define IM_FMTARGS(FMT)             __attribute__((format(printf, FMT, FMT+1))) // To apply printf-style warnings to our functions.
-#define IM_FMTLIST(FMT)             __attribute__((format(printf, FMT, 0)))
-#else
-#define IM_FMTARGS(FMT)
-#define IM_FMTLIST(FMT)
-#endif
 #define IM_ARRAYSIZE(_ARR)          ((int)(sizeof(_ARR) / sizeof(*(_ARR))))     // Size of a static C-style array. Don't use on pointers!
 #define IM_UNUSED(_VAR)             ((void)(_VAR))                              // Used to silence "unused variable warnings". Often useful as asserts may be stripped out from final builds.
 #if (__cplusplus >= 201100)
@@ -95,6 +90,16 @@ Index of this file:
 #else
 #define IM_OFFSETOF(_TYPE,_MEMBER)  ((size_t)&(((_TYPE*)0)->_MEMBER))           // Offset of _MEMBER within _TYPE. Old style macro.
 #endif
+#if !defined(IMGUI_USE_STB_SPRINTF) && defined(__clang__)
+#define IM_FMTARGS(FMT)             __attribute__((format(printf, FMT, FMT+1)))     // Apply printf-style warnings to our formatting functions.
+#define IM_FMTLIST(FMT)             __attribute__((format(printf, FMT, 0)))
+#elif !defined(IMGUI_USE_STB_SPRINTF) && defined(__GNUC__) && defined(__MINGW32__)
+#define IM_FMTARGS(FMT)             __attribute__((format(gnu_printf, FMT, FMT+1))) // Apply printf-style warnings to our formatting functions.
+#define IM_FMTLIST(FMT)             __attribute__((format(gnu_printf, FMT, 0)))
+#else
+#define IM_FMTARGS(FMT)
+#define IM_FMTLIST(FMT)
+#endif
 
 // Warnings
 #if defined(__clang__)
@@ -138,6 +143,8 @@ struct ImGuiPlatformMonitor;        // Multi-viewport support: user-provided bou
 struct ImGuiSizeCallbackData;       // Callback data when using SetNextWindowSizeConstraints() (rare/advanced use)
 struct ImGuiStorage;                // Helper for key->value storage
 struct ImGuiStyle;                  // Runtime data for styling/colors
+struct ImGuiTableSortSpecs;         // Sorting specifications for a table (often handling sort specs for a single column, occasionally more)
+struct ImGuiTableSortSpecsColumn;   // Sorting specification for one column of a table
 struct ImGuiTextBuffer;             // Helper to hold and append into a text buffer (~string builder)
 struct ImGuiTextFilter;             // Helper to parse and apply text filters (e.g. "aaaaa[,bbbbb][,ccccc]")
 struct ImGuiViewport;               // Viewport (generally ~1 per window to output to at the OS level. Need per-platform support to use multiple viewports)
@@ -155,7 +162,9 @@ typedef int ImGuiKey;               // -> enum ImGuiKey_             // Enum: A
 typedef int ImGuiNavInput;          // -> enum ImGuiNavInput_        // Enum: An input identifier for navigation
 typedef int ImGuiMouseButton;       // -> enum ImGuiMouseButton_     // Enum: A mouse button identifier (0=left, 1=right, 2=middle)
 typedef int ImGuiMouseCursor;       // -> enum ImGuiMouseCursor_     // Enum: A mouse cursor identifier
+typedef int ImGuiSortDirection;     // -> enum ImGuiSortDirection_   // Enum: A sorting direction (ascending or descending)
 typedef int ImGuiStyleVar;          // -> enum ImGuiStyleVar_        // Enum: A variable identifier for styling
+typedef int ImGuiTableBgTarget;     // -> enum ImGuiTableBgTarget_   // Enum: A color target for TableSetBgColor()
 typedef int ImDrawCornerFlags;      // -> enum ImDrawCornerFlags_    // Flags: for ImDrawList::AddRect(), AddRectFilled() etc.
 typedef int ImDrawListFlags;        // -> enum ImDrawListFlags_      // Flags: for ImDrawList
 typedef int ImFontAtlasFlags;       // -> enum ImFontAtlasFlags_     // Flags: for ImFontAtlas build
@@ -175,6 +184,9 @@ typedef int ImGuiSelectableFlags;   // -> enum ImGuiSelectableFlags_ // Flags: f
 typedef int ImGuiSliderFlags;       // -> enum ImGuiSliderFlags_     // Flags: for DragFloat(), DragInt(), SliderFloat(), SliderInt() etc.
 typedef int ImGuiTabBarFlags;       // -> enum ImGuiTabBarFlags_     // Flags: for BeginTabBar()
 typedef int ImGuiTabItemFlags;      // -> enum ImGuiTabItemFlags_    // Flags: for BeginTabItem()
+typedef int ImGuiTableFlags;        // -> enum ImGuiTableFlags_      // Flags: For BeginTable()
+typedef int ImGuiTableColumnFlags;  // -> enum ImGuiTableColumnFlags_// Flags: For TableSetupColumn()
+typedef int ImGuiTableRowFlags;     // -> enum ImGuiTableRowFlags_   // Flags: For TableNextRow()
 typedef int ImGuiTreeNodeFlags;     // -> enum ImGuiTreeNodeFlags_   // Flags: for TreeNode(), TreeNodeEx(), CollapsingHeader()
 typedef int ImGuiViewportFlags;     // -> enum ImGuiViewportFlags_   // Flags: for ImGuiViewport
 typedef int ImGuiWindowFlags;       // -> enum ImGuiWindowFlags_     // Flags: for Begin(), BeginChild()
@@ -266,7 +278,7 @@ namespace ImGui
     // Demo, Debug, Information
     IMGUI_API void          ShowDemoWindow(bool* p_open = NULL);        // create Demo window (previously called ShowTestWindow). demonstrate most ImGui features. call this to learn about the library! try to make it always available in your application!
     IMGUI_API void          ShowAboutWindow(bool* p_open = NULL);       // create About window. display Dear ImGui version, credits and build/system information.
-    IMGUI_API void          ShowMetricsWindow(bool* p_open = NULL);     // create Debug/Metrics window. display Dear ImGui internals: draw commands (with individual draw calls and vertices), window list, basic internal state, etc.
+    IMGUI_API void          ShowMetricsWindow(bool* p_open = NULL);     // create Metrics/Debugger window. display Dear ImGui internals: windows, draw commands, various internal state, etc.
     IMGUI_API void          ShowStyleEditor(ImGuiStyle* ref = NULL);    // add style editor block (not a window). you can pass in a reference ImGuiStyle structure to compare to, revert to and save to (else it uses the default style)
     IMGUI_API bool          ShowStyleSelector(const char* label);       // add style selector block (not a window), essentially a combo listing the default styles.
     IMGUI_API void          ShowFontSelector(const char* label);        // add font selector block (not a window), essentially a combo listing the loaded fonts.
@@ -297,7 +309,10 @@ namespace ImGui
     // - Use child windows to begin into a self-contained independent scrolling/clipping regions within a host window. Child windows can embed their own child.
     // - For each independent axis of 'size': ==0.0f: use remaining host window size / >0.0f: fixed size / <0.0f: use remaining window size minus abs(size) / Each axis can use a different mode, e.g. ImVec2(0,400).
     // - BeginChild() returns false to indicate the window is collapsed or fully clipped, so you may early out and omit submitting anything to the window.
-    //   Always call a matching EndChild() for each BeginChild() call, regardless of its return value [as with Begin: this is due to legacy reason and inconsistent with most BeginXXX functions apart from the regular Begin() which behaves like BeginChild().]
+    //   Always call a matching EndChild() for each BeginChild() call, regardless of its return value.
+    //   [Important: due to legacy reason, this is inconsistent with most other functions such as BeginMenu/EndMenu,
+    //    BeginPopup/EndPopup, etc. where the EndXXX call should only be called if the corresponding BeginXXX function
+    //    returned true. Begin and BeginChild are the only odd ones out. Will be fixed in a future update.]
     IMGUI_API bool          BeginChild(const char* str_id, const ImVec2& size = ImVec2(0, 0), bool border = false, ImGuiWindowFlags flags = 0);
     IMGUI_API bool          BeginChild(ImGuiID id, const ImVec2& size = ImVec2(0, 0), bool border = false, ImGuiWindowFlags flags = 0);
     IMGUI_API void          EndChild();
@@ -364,6 +379,10 @@ namespace ImGui
     IMGUI_API void          PushStyleVar(ImGuiStyleVar idx, float val);
     IMGUI_API void          PushStyleVar(ImGuiStyleVar idx, const ImVec2& val);
     IMGUI_API void          PopStyleVar(int count = 1);
+    IMGUI_API void          PushAllowKeyboardFocus(bool allow_keyboard_focus);              // allow focusing using TAB/Shift-TAB, enabled by default but you can disable it for certain widgets
+    IMGUI_API void          PopAllowKeyboardFocus();
+    IMGUI_API void          PushButtonRepeat(bool repeat);                                  // in 'repeat' mode, Button*() functions return repeated true in a typematic manner (using io.KeyRepeatDelay/io.KeyRepeatRate setting). Note that you can call IsItemActive() after any Button() to tell if the button is held in the current frame.
+    IMGUI_API void          PopButtonRepeat();
     IMGUI_API const ImVec4& GetStyleColorVec4(ImGuiCol idx);                                // retrieve style color as stored in ImGuiStyle structure. use to feed back into PushStyleColor(), otherwise use GetColorU32() to get style color with style alpha baked in.
     IMGUI_API ImFont*       GetFont();                                                      // get current font
     IMGUI_API float         GetFontSize();                                                  // get current font size (= height in pixels) of current font with current scale applied
@@ -379,10 +398,6 @@ namespace ImGui
     IMGUI_API float         CalcItemWidth();                                                // width of item given pushed settings and current cursor position. NOT necessarily the width of last item unlike most 'Item' functions.
     IMGUI_API void          PushTextWrapPos(float wrap_local_pos_x = 0.0f);                 // push word-wrapping position for Text*() commands. < 0.0f: no wrapping; 0.0f: wrap to end of window (or column); > 0.0f: wrap at 'wrap_pos_x' position in window local space
     IMGUI_API void          PopTextWrapPos();
-    IMGUI_API void          PushAllowKeyboardFocus(bool allow_keyboard_focus);              // allow focusing using TAB/Shift-TAB, enabled by default but you can disable it for certain widgets
-    IMGUI_API void          PopAllowKeyboardFocus();
-    IMGUI_API void          PushButtonRepeat(bool repeat);                                  // in 'repeat' mode, Button*() functions return repeated true in a typematic manner (using io.KeyRepeatDelay/io.KeyRepeatRate setting). Note that you can call IsItemActive() after any Button() to tell if the button is held in the current frame.
-    IMGUI_API void          PopButtonRepeat();
 
     // Cursor / Layout
     // - By "cursor" we mean the current output position.
@@ -396,8 +411,8 @@ namespace ImGui
     IMGUI_API void          NewLine();                                                      // undo a SameLine() or force a new line when in an horizontal-layout context.
     IMGUI_API void          Spacing();                                                      // add vertical spacing.
     IMGUI_API void          Dummy(const ImVec2& size);                                      // add a dummy item of given size. unlike InvisibleButton(), Dummy() won't take the mouse click or be navigable into.
-    IMGUI_API void          Indent(float indent_w = 0.0f);                                  // move content position toward the right, by style.IndentSpacing or indent_w if != 0
-    IMGUI_API void          Unindent(float indent_w = 0.0f);                                // move content position back to the left, by style.IndentSpacing or indent_w if != 0
+    IMGUI_API void          Indent(float indent_w = 0.0f);                                  // move content position toward the right, by indent_w, or style.IndentSpacing if indent_w <= 0
+    IMGUI_API void          Unindent(float indent_w = 0.0f);                                // move content position back to the left, by indent_w, or style.IndentSpacing if indent_w <= 0
     IMGUI_API void          BeginGroup();                                                   // lock horizontal starting position
     IMGUI_API void          EndGroup();                                                     // unlock horizontal starting position + capture the whole group bounding box into one "item" (so you can use IsItemHovered() or layout primitives such as SameLine() on whole group, etc.)
     IMGUI_API ImVec2        GetCursorPos();                                                 // cursor position in window coordinates (relative to window position)
@@ -456,6 +471,7 @@ namespace ImGui
     IMGUI_API void          Image(ImTextureID user_texture_id, const ImVec2& size, const ImVec2& uv0 = ImVec2(0, 0), const ImVec2& uv1 = ImVec2(1,1), const ImVec4& tint_col = ImVec4(1,1,1,1), const ImVec4& border_col = ImVec4(0,0,0,0));
     IMGUI_API bool          ImageButton(ImTextureID user_texture_id, const ImVec2& size, const ImVec2& uv0 = ImVec2(0, 0),  const ImVec2& uv1 = ImVec2(1,1), int frame_padding = -1, const ImVec4& bg_col = ImVec4(0,0,0,0), const ImVec4& tint_col = ImVec4(1,1,1,1));    // <0 frame_padding uses default frame padding settings. 0 for no padding
     IMGUI_API bool          Checkbox(const char* label, bool* v);
+    IMGUI_API bool          CheckboxFlags(const char* label, int* flags, int flags_value);
     IMGUI_API bool          CheckboxFlags(const char* label, unsigned int* flags, unsigned int flags_value);
     IMGUI_API bool          RadioButton(const char* label, bool active);                    // use with e.g. if (RadioButton("one", my_value==1)) { my_value = 1; }
     IMGUI_API bool          RadioButton(const char* label, int* v, int v_button);           // shortcut to handle the above pattern when value is an integer
@@ -648,11 +664,66 @@ namespace ImGui
     //  - IsPopupOpen() with ImGuiPopupFlags_AnyPopupId + ImGuiPopupFlags_AnyPopupLevel: return true if any popup is open.
     IMGUI_API bool          IsPopupOpen(const char* str_id, ImGuiPopupFlags flags = 0);                         // return true if the popup is open.
 
-    // Columns
+    // Tables
+    // [ALPHA API] API may evolve!
+    // - Full-featured replacement for old Columns API.
+    // - See Demo->Tables for details.
+    // - See ImGuiTableFlags_ and ImGuiTableColumnFlags_ enums for a description of available flags.
+    // The typical call flow is:
+    // - 1. Call BeginTable()
+    // - 2. Optionally call TableSetupColumn() to submit column name/flags/defaults
+    // - 3. Optionally call TableSetupScrollFreeze() to request scroll freezing of columns/rows
+    // - 4. Optionally call TableHeadersRow() to submit a header row (names will be pulled from data submitted to TableSetupColumns)
+    // - 5. Populate contents
+    //    - In most situations you can use TableNextRow() + TableSetColumnIndex(xx) to start appending into a column.
+    //    - If you are using tables as a sort of grid, where every columns is holding the same type of contents,
+    //      you may prefer using TableNextColumn() instead of TableNextRow() + TableSetColumnIndex().
+    //      TableNextColumn() will automatically wrap-around into the next row if needed.
+    //    - IMPORTANT: Comparatively to the old Columns() API, we need to call TableNextColumn() for the first column!
+    //    - Both TableSetColumnIndex() and TableNextColumn() return false when the column is not visible, so you can
+    //      skip submitting the contents of a cell but only if you know the contents is not going to alter row height.
+    //    - Summary of possible call flow:
+    //      ----------------------------------------------------------------------------------------------------------
+    //       TableNextRow() -> TableSetColumnIndex(0) -> Text("Hello 0") -> TableSetColumnIndex(1) -> Text("Hello 1")  // OK
+    //       TableNextRow() -> TableNextColumn()         Text("Hello 0") -> TableNextColumn()      -> Text("Hello 1")  // OK
+    //                         TableNextColumn()         Text("Hello 0") -> TableNextColumn()      -> Text("Hello 1")  // OK: TableNextColumn() automatically gets to next row!
+    //       TableNextRow()                              Text("Hello 0")                                               // Not OK! Missing TableSetColumnIndex() or TableNextColumn()! Text will not appear!
+    //      ----------------------------------------------------------------------------------------------------------
+    // - 5. Call EndTable()
+    #define IMGUI_HAS_TABLE 1
+    IMGUI_API bool          BeginTable(const char* str_id, int columns_count, ImGuiTableFlags flags = 0, const ImVec2& outer_size = ImVec2(0, 0), float inner_width = 0.0f);
+    IMGUI_API void          EndTable();                                 // only call EndTable() if BeginTable() returns true!
+    IMGUI_API void          TableNextRow(ImGuiTableRowFlags row_flags = 0, float min_row_height = 0.0f); // append into the first cell of a new row.
+    IMGUI_API bool          TableNextColumn();                          // append into the next column (or first column of next row if currently in last column). Return false when column is not visible.
+    IMGUI_API bool          TableSetColumnIndex(int column_n);          // append into the specified column. Return false when column is not visible.
+    IMGUI_API int           TableGetColumnIndex();                      // return current column index.
+    // Tables: Headers & Columns declaration
+    // - Use TableSetupColumn() to specify label, resizing policy, default width/weight, id, various other flags etc.
+    //   Important: this will not display anything! The name passed to TableSetupColumn() is used by TableHeadersRow() and context-menus.
+    // - Use TableHeadersRow() to create a row and automatically submit a TableHeader() for each column.
+    //   Headers are required to perform: reordering, sorting, and opening the context menu (but context menu can also be available in columns body using ImGuiTableFlags_ContextMenuInBody).
+    // - You may manually submit headers using TableNextRow() + TableHeader() calls, but this is only useful in some advanced cases (e.g. adding custom widgets in header row).
+    // - Use TableSetupScrollFreeze() to lock columns (from the right) or rows (from the top) so they stay visible when scrolled.
+    IMGUI_API void          TableSetupColumn(const char* label, ImGuiTableColumnFlags flags = 0, float init_width_or_weight = -1.0f, ImU32 user_id = 0);
+    IMGUI_API void          TableSetupScrollFreeze(int cols, int rows); // lock columns/rows so they stay visible when scrolled.
+    IMGUI_API void          TableHeadersRow();                          // submit all headers cells based on data provided to TableSetupColumn() + submit context menu
+    IMGUI_API void          TableHeader(const char* label);             // submit one header cell manually (rarely used)
+    // Tables: Miscellaneous functions
+    // - Most functions taking 'int column_n' treat the default value of -1 as the same as passing the current column index
+    // - Sorting: call TableGetSortSpecs() to retrieve latest sort specs for the table. Return value will be NULL if no sorting.
+    //   When 'SpecsDirty == true' you should sort your data. It will be true when sorting specs have changed since last call, or the first time.
+    //   Make sure to set 'SpecsDirty = false' after sorting, else you may wastefully sort your data every frame!
+    //   Lifetime: don't hold on this pointer over multiple frames or past any subsequent call to BeginTable().
+    IMGUI_API int           TableGetColumnCount();                      // return number of columns (value passed to BeginTable)
+    IMGUI_API const char*   TableGetColumnName(int column_n = -1);      // return "" if column didn't have a name declared by TableSetupColumn(). Pass -1 to use current column.
+    IMGUI_API bool          TableGetColumnIsVisible(int column_n = -1); // return true if column is visible. Same value is also returned by TableNextColumn() and TableSetColumnIndex(). Pass -1 to use current column.
+    IMGUI_API bool          TableGetColumnIsSorted(int column_n = -1);  // return true if column is included in the sort specs. Rarely used, can be useful to tell if a data change should trigger resort. Equivalent to test ImGuiTableSortSpecs's ->ColumnsMask & (1 << column_n). Pass -1 to use current column.
+    IMGUI_API int           TableGetHoveredColumn();                    // return hovered column. return -1 when table is not hovered. return columns_count if the unused space at the right of visible columns is hovered.
+    IMGUI_API ImGuiTableSortSpecs* TableGetSortSpecs();                 // get latest sort specs for the table (NULL if not sorting).
+    IMGUI_API void          TableSetBgColor(ImGuiTableBgTarget bg_target, ImU32 color, int column_n = -1);  // change the color of a cell, row, or column. See ImGuiTableBgTarget_ flags for details.
+
+    // Legacy Columns API (2020: prefer using Tables!)
     // - You can also use SameLine(pos_x) to mimic simplified columns.
-    // - The columns API is work-in-progress and rather lacking (columns are arguably the worst part of dear imgui at the moment!)
-    // - There is a maximum of 64 columns.
-    // - Currently working on new 'Tables' api which will replace columns around Q2 2020 (see GitHub #2957).
     IMGUI_API void          Columns(int count = 1, const char* id = NULL, bool border = true);
     IMGUI_API void          NextColumn();                                                       // next column, defaults to current row or next row if the current row is finished
     IMGUI_API int           GetColumnIndex();                                                   // get current column index
@@ -1004,6 +1075,122 @@ enum ImGuiTabItemFlags_
     ImGuiTabItemFlags_Trailing                      = 1 << 7    // Enforce the tab position to the right of the tab bar (before the scrolling buttons)
 };
 
+// Flags for ImGui::BeginTable()
+// - Important! Sizing policies have particularly complex and subtle side effects, more so than you would expect.
+//   Read comments/demos carefully + experiment with live demos to get acquainted with them.
+// - The default sizing policy for columns depends on whether the ScrollX flag is set on the table:
+//   When ScrollX is off:
+//    - Table defaults to ImGuiTableFlags_SizingPolicyStretchX -> all Columns defaults to ImGuiTableColumnFlags_WidthStretch.
+//    - Columns sizing policy allowed: Fixed/Auto or Stretch.
+//    - Stretch Columns will share the width available in table.
+//    - Fixed Columns will generally obtain their requested width unless the Table cannot fit them all.
+//   When ScrollX is on:
+//    - Table defaults to ImGuiTableFlags_SizingPolicyFixedX -> all Columns defaults to ImGuiTableColumnFlags_WidthFixed.
+//    - Columns sizing policy allowed: Fixed/Auto mostly! Using Stretch columns OFTEN DOES NOT MAKE SENSE if ScrollX is on, UNLESS you have specified a value for 'inner_width' in BeginTable().
+//    - Fixed Columns can be enlarged as needed. Table will show an horizontal scrollbar if needed.
+//    - Stretch Columns, if any, will calculate their width using inner_width, assuming no scrolling (it really doesn't make sense to do otherwise).
+// - Mixing up columns with different sizing policy is possible BUT can be tricky and has some side-effects and restrictions.
+//   (their visible order and the scrolling state have subtle but necessary effects on how they can be manually resized).
+//   The typical use of mixing sizing policies is to have ScrollX disabled, one or two Stretch Column and many Fixed Columns.
+enum ImGuiTableFlags_
+{
+    // Features
+    ImGuiTableFlags_None                            = 0,
+    ImGuiTableFlags_Resizable                       = 1 << 0,   // Allow resizing columns.
+    ImGuiTableFlags_Reorderable                     = 1 << 1,   // Allow reordering columns in header row (need calling TableSetupColumn() + TableHeadersRow() to display headers)
+    ImGuiTableFlags_Hideable                        = 1 << 2,   // Allow hiding columns in context menu.
+    ImGuiTableFlags_Sortable                        = 1 << 3,   // Allow sorting on one column (sort_specs_count will always be == 1). Call TableGetSortSpecs() to obtain sort specs.
+    ImGuiTableFlags_MultiSortable                   = 1 << 4,   // Allow sorting on multiple columns by holding Shift (sort_specs_count may be > 1). Call TableGetSortSpecs() to obtain sort specs.
+    ImGuiTableFlags_NoSavedSettings                 = 1 << 5,   // Disable persisting columns order, width and sort settings in the .ini file.
+    ImGuiTableFlags_ContextMenuInBody               = 1 << 6,   // Right-click on columns body/contents will display table context menu. By default it is available in TableHeadersRow().
+    // Decoration
+    ImGuiTableFlags_RowBg                           = 1 << 7,   // Set each RowBg color with ImGuiCol_TableRowBg or ImGuiCol_TableRowBgAlt (equivalent to calling TableSetBgColor with ImGuiTableBgFlags_RowBg0 on each row manually)
+    ImGuiTableFlags_BordersInnerH                   = 1 << 8,   // Draw horizontal borders between rows.
+    ImGuiTableFlags_BordersOuterH                   = 1 << 9,   // Draw horizontal borders at the top and bottom.
+    ImGuiTableFlags_BordersInnerV                   = 1 << 10,  // Draw vertical borders between columns.
+    ImGuiTableFlags_BordersOuterV                   = 1 << 11,  // Draw vertical borders on the left and right sides.
+    ImGuiTableFlags_BordersH                        = ImGuiTableFlags_BordersInnerH | ImGuiTableFlags_BordersOuterH, // Draw horizontal borders.
+    ImGuiTableFlags_BordersV                        = ImGuiTableFlags_BordersInnerV | ImGuiTableFlags_BordersOuterV, // Draw vertical borders.
+    ImGuiTableFlags_BordersInner                    = ImGuiTableFlags_BordersInnerV | ImGuiTableFlags_BordersInnerH, // Draw inner borders.
+    ImGuiTableFlags_BordersOuter                    = ImGuiTableFlags_BordersOuterV | ImGuiTableFlags_BordersOuterH, // Draw outer borders.
+    ImGuiTableFlags_Borders                         = ImGuiTableFlags_BordersInner | ImGuiTableFlags_BordersOuter,   // Draw all borders.
+    ImGuiTableFlags_NoBordersInBody                 = 1 << 12,  // Disable vertical borders in columns Body (borders will always appears in Headers).
+    ImGuiTableFlags_NoBordersInBodyUntilResize      = 1 << 13,  // Disable vertical borders in columns Body until hovered for resize (borders will always appears in Headers).
+    // Sizing
+    ImGuiTableFlags_SizingPolicyFixedX              = 1 << 14,  // Default if ScrollX is on. Columns will default to use _WidthFixed or _WidthAlwaysAutoResize policy. Read description above for more details.
+    ImGuiTableFlags_SizingPolicyStretchX            = 1 << 15,  // Default if ScrollX is off. Columns will default to use _WidthStretch policy. Read description above for more details.
+    ImGuiTableFlags_NoHeadersWidth                  = 1 << 16,  // Disable header width contribution to automatic width calculation.
+    ImGuiTableFlags_NoHostExtendY                   = 1 << 17,  // (FIXME-TABLE: Reword as SizingPolicy?) Disable extending past the limit set by outer_size.y, only meaningful when neither of ScrollX|ScrollY are set (data below the limit will be clipped and not visible)
+    ImGuiTableFlags_NoKeepColumnsVisible            = 1 << 18,  // Disable keeping column always minimally visible when table width gets too small and ScrllX is off.
+    ImGuiTableFlags_PreciseStretchWidths            = 1 << 19,  // Disable distributing remainder width to stretched columns (width allocation on a 100-wide table with 3 columns: Without this flag: 33,33,34. With this flag: 33,33,33). With larger number of columns, resizing will appear to be less smooth.
+    ImGuiTableFlags_NoClip                          = 1 << 20,  // Disable clipping rectangle for every individual columns (reduce draw command count, items will be able to overflow into other columns). Generally incompatible with TableSetupScrollFreeze().
+    // Padding
+    ImGuiTableFlags_PadOuterX                       = 1 << 21,  // Default if BordersOuterV is on. Enable outer-most padding.
+    ImGuiTableFlags_NoPadOuterX                     = 1 << 22,  // Default if BordersOuterV is off. Disable outer-most padding.
+    ImGuiTableFlags_NoPadInnerX                     = 1 << 23,  // Disable inner padding between columns (double inner padding if BordersOuterV is on, single inner padding if BordersOuterV is off).
+    // Scrolling
+    ImGuiTableFlags_ScrollX                         = 1 << 24,  // Enable horizontal scrolling. Require 'outer_size' parameter of BeginTable() to specify the container size. Changes default sizing policy. Because this create a child window, ScrollY is currently generally recommended when using ScrollX.
+    ImGuiTableFlags_ScrollY                         = 1 << 25,  // Enable vertical scrolling. Require 'outer_size' parameter of BeginTable() to specify the container size.
+
+    // [Internal] Combinations and masks
+    ImGuiTableFlags_SizingPolicyMaskX_              = ImGuiTableFlags_SizingPolicyStretchX | ImGuiTableFlags_SizingPolicyFixedX
+};
+
+// Flags for ImGui::TableSetupColumn()
+// FIXME-TABLE: Rename to ImGuiColumns_*, stick old columns api flags in there under an obsolete api block
+enum ImGuiTableColumnFlags_
+{
+    ImGuiTableColumnFlags_None                      = 0,
+    ImGuiTableColumnFlags_DefaultHide               = 1 << 0,   // Default as a hidden column.
+    ImGuiTableColumnFlags_DefaultSort               = 1 << 1,   // Default as a sorting column.
+    ImGuiTableColumnFlags_WidthFixed                = 1 << 2,   // Column will keep a fixed size, preferable with horizontal scrolling enabled (default if table sizing policy is SizingPolicyFixedX and table is resizable).
+    ImGuiTableColumnFlags_WidthStretch              = 1 << 3,   // Column will stretch, preferable with horizontal scrolling disabled (default if table sizing policy is SizingPolicyStretchX).
+    ImGuiTableColumnFlags_WidthAlwaysAutoResize     = 1 << 4,   // Column will keep resizing based on submitted contents (with a one frame delay) == Fixed with auto resize (default if table sizing policy is SizingPolicyFixedX and table is not resizable).
+    ImGuiTableColumnFlags_NoResize                  = 1 << 5,   // Disable manual resizing.
+    ImGuiTableColumnFlags_NoClipX                   = 1 << 6,   // Disable clipping for this column (all NoClipX columns will render in a same draw command).
+    ImGuiTableColumnFlags_NoSort                    = 1 << 7,   // Disable ability to sort on this field (even if ImGuiTableFlags_Sortable is set on the table).
+    ImGuiTableColumnFlags_NoSortAscending           = 1 << 8,   // Disable ability to sort in the ascending direction.
+    ImGuiTableColumnFlags_NoSortDescending          = 1 << 9,   // Disable ability to sort in the descending direction.
+    ImGuiTableColumnFlags_NoHide                    = 1 << 10,  // Disable hiding this column.
+    ImGuiTableColumnFlags_NoHeaderWidth             = 1 << 11,  // Header width don't contribute to automatic column width.
+    ImGuiTableColumnFlags_PreferSortAscending       = 1 << 12,  // Make the initial sort direction Ascending when first sorting on this column (default).
+    ImGuiTableColumnFlags_PreferSortDescending      = 1 << 13,  // Make the initial sort direction Descending when first sorting on this column.
+    ImGuiTableColumnFlags_IndentEnable              = 1 << 14,  // Use current Indent value when entering cell (default for 1st column).
+    ImGuiTableColumnFlags_IndentDisable             = 1 << 15,  // Ignore current Indent value when entering cell (default for columns after the 1st one). Indentation changes _within_ the cell will still be honored.
+    ImGuiTableColumnFlags_NoReorder                 = 1 << 16,  // Disable reordering this column, this will also prevent other columns from crossing over this column.
+
+    // [Internal] Combinations and masks
+    ImGuiTableColumnFlags_WidthMask_                = ImGuiTableColumnFlags_WidthFixed | ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_WidthAlwaysAutoResize,
+    ImGuiTableColumnFlags_IndentMask_               = ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_IndentDisable,
+    ImGuiTableColumnFlags_NoDirectResize_           = 1 << 20   // [Internal] Disable user resizing this column directly (it may however we resized indirectly from its left edge)
+};
+
+// Flags for ImGui::TableNextRow()
+enum ImGuiTableRowFlags_
+{
+    ImGuiTableRowFlags_None                         = 0,
+    ImGuiTableRowFlags_Headers                      = 1 << 0    // Identify header row (set default background color + width of its contents accounted different for auto column width)
+};
+
+// Enum for ImGui::TableSetBgColor()
+// Background colors are rendering in 3 layers:
+//  - Layer 0: draw with RowBg0 color if set, otherwise draw with ColumnBg0 if set.
+//  - Layer 1: draw with RowBg1 color if set, otherwise draw with ColumnBg1 if set.
+//  - Layer 2: draw with CellBg color if set.
+// The purpose of the two row/columns layers is to let you decide if a background color changes should override or blend with the existing color.
+// When using ImGuiTableFlags_RowBg on the table, each row has the RowBg0 color automatically set for odd/even rows.
+// If you set the color of RowBg0 target, your color will override the existing RowBg0 color.
+// If you set the color of RowBg1 or ColumnBg1 target, your color will blend over the RowBg0 color.
+enum ImGuiTableBgTarget_
+{
+    ImGuiTableBgTarget_None                         = 0,
+    //ImGuiTableBgTarget_ColumnBg0                  = 1,        // FIXME-TABLE: Todo. Set column background color 0 (generally used for background
+    //ImGuiTableBgTarget_ColumnBg1                  = 2,        // FIXME-TABLE: Todo. Set column background color 1 (generally used for selection marking)
+    ImGuiTableBgTarget_RowBg0                       = 3,        // Set row background color 0 (generally used for background, automatically set when ImGuiTableFlags_RowBg is used)
+    ImGuiTableBgTarget_RowBg1                       = 4,        // Set row background color 1 (generally used for selection marking)
+    ImGuiTableBgTarget_CellBg                       = 5         // Set cell background color (top-most color)
+};
+
 // Flags for ImGui::IsWindowFocused()
 enum ImGuiFocusedFlags_
 {
@@ -1096,6 +1283,14 @@ enum ImGuiDir_
     ImGuiDir_COUNT
 };
 
+// A sorting direction
+enum ImGuiSortDirection_
+{
+    ImGuiSortDirection_None         = 0,
+    ImGuiSortDirection_Ascending    = 1,    // Ascending = 0->9, A->Z etc.
+    ImGuiSortDirection_Descending   = 2     // Descending = 9->0, Z->A etc.
+};
+
 // User fill ImGuiIO.KeyMap[] array with indices into the ImGuiIO.KeysDown[512] array
 enum ImGuiKey_
 {
@@ -1256,6 +1451,11 @@ enum ImGuiCol_
     ImGuiCol_PlotLinesHovered,
     ImGuiCol_PlotHistogram,
     ImGuiCol_PlotHistogramHovered,
+    ImGuiCol_TableHeaderBg,         // Table header background
+    ImGuiCol_TableBorderStrong,     // Table outer and header borders (prefer using Alpha=1.0 here)
+    ImGuiCol_TableBorderLight,      // Table inner borders (prefer using Alpha=1.0 here)
+    ImGuiCol_TableRowBg,            // Table row background (even rows)
+    ImGuiCol_TableRowBgAlt,         // Table row background (odd rows)
     ImGuiCol_TextSelectedBg,
     ImGuiCol_DragDropTarget,
     ImGuiCol_NavHighlight,          // Gamepad/keyboard: current highlighted item
@@ -1296,6 +1496,7 @@ enum ImGuiStyleVar_
     ImGuiStyleVar_ItemSpacing,         // ImVec2    ItemSpacing
     ImGuiStyleVar_ItemInnerSpacing,    // ImVec2    ItemInnerSpacing
     ImGuiStyleVar_IndentSpacing,       // float     IndentSpacing
+    ImGuiStyleVar_CellPadding,         // ImVec2    CellPadding
     ImGuiStyleVar_ScrollbarSize,       // float     ScrollbarSize
     ImGuiStyleVar_ScrollbarRounding,   // float     ScrollbarRounding
     ImGuiStyleVar_GrabMinSize,         // float     GrabMinSize
@@ -1532,6 +1733,7 @@ struct ImGuiStyle
     float       FrameBorderSize;            // Thickness of border around frames. Generally set to 0.0f or 1.0f. (Other values are not well tested and more CPU/GPU costly).
     ImVec2      ItemSpacing;                // Horizontal and vertical spacing between widgets/lines.
     ImVec2      ItemInnerSpacing;           // Horizontal and vertical spacing between within elements of a composed widget (e.g. a slider and its label).
+    ImVec2      CellPadding;                // Padding within a table cell
     ImVec2      TouchExtraPadding;          // Expand reactive bounding box for touch-based system where touch position is not accurate enough. Unfortunately we don't sort widgets so priority on overlap will always be given to the first widget. So don't grow this too much!
     float       IndentSpacing;              // Horizontal indentation when e.g. entering a tree node. Generally == (FontSize + FramePadding.x*2).
     float       ColumnsMinSpacing;          // Minimum horizontal spacing between two columns. Preferably > (FramePadding.x + 1).
@@ -1611,7 +1813,7 @@ struct ImGuiIO
     bool        ConfigInputTextCursorBlink;     // = true           // Set to false to disable blinking cursor, for users who consider it distracting. (was called: io.OptCursorBlink prior to 1.63)
     bool        ConfigWindowsResizeFromEdges;   // = true           // Enable resizing of windows from their edges and from the lower-left corner. This requires (io.BackendFlags & ImGuiBackendFlags_HasMouseCursors) because it needs mouse cursor feedback. (This used to be a per-window ImGuiWindowFlags_ResizeFromAnySide flag)
     bool        ConfigWindowsMoveFromTitleBarOnly; // = false       // [BETA] Set to true to only allow moving windows when clicked+dragged from the title bar. Windows without a title bar are not affected.
-    float       ConfigWindowsMemoryCompactTimer;// = 60.0f          // [BETA] Compact window memory usage when unused. Set to -1.0f to disable.
+    float       ConfigMemoryCompactTimer;       // = 60.0f          // [BETA] Free transient windows/tables memory buffers when unused for given amount of time. Set to -1.0f to disable.
 
     //------------------------------------------------------------------
     // Platform Functions
@@ -1797,6 +1999,31 @@ struct ImGuiPayload
     bool IsDelivery() const                 { return Delivery; }
 };
 
+// Sorting specification for one column of a table (sizeof == 8 bytes)
+struct ImGuiTableSortSpecsColumn
+{
+    ImGuiID                     ColumnUserID;       // User id of the column (if specified by a TableSetupColumn() call)
+    ImU8                        ColumnIndex;        // Index of the column
+    ImU8                        SortOrder;          // Index within parent ImGuiTableSortSpecs (always stored in order starting from 0, tables sorted on a single criteria will always have a 0 here)
+    ImGuiSortDirection          SortDirection : 8;  // ImGuiSortDirection_Ascending or ImGuiSortDirection_Descending (you can use this or SortSign, whichever is more convenient for your sort function)
+
+    ImGuiTableSortSpecsColumn() { ColumnUserID = 0; ColumnIndex = 0; SortOrder = 0; SortDirection = ImGuiSortDirection_Ascending; }
+};
+
+// Sorting specifications for a table (often handling sort specs for a single column, occasionally more)
+// Obtained by calling TableGetSortSpecs().
+// When 'SpecsDirty == true' you can sort your data. It will be true with sorting specs have changed since last call, or the first time.
+// Make sure to set 'SpecsDirty = false' after sorting, else you may wastefully sort your data every frame!
+struct ImGuiTableSortSpecs
+{
+    const ImGuiTableSortSpecsColumn* Specs;     // Pointer to sort spec array.
+    int                         SpecsCount;     // Sort spec count. Most often 1 unless e.g. ImGuiTableFlags_MultiSortable is enabled.
+    bool                        SpecsDirty;     // Set to true when specs have changed since last time! Use this to sort again, then clear the flag.
+    ImU64                       ColumnsMask;    // Set to the mask of column indexes included in the Specs array. e.g. (1 << N) when column N is sorted.
+
+    ImGuiTableSortSpecs()       { Specs = NULL; SpecsCount = 0; SpecsDirty = false; ColumnsMask = 0x00; }
+};
+
 //-----------------------------------------------------------------------------
 // Obsolete functions (Will be removed! Read 'API BREAKING CHANGES' section in imgui.cpp for details)
 // Please keep your copy of dear imgui up to date! Occasionally set '#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS' in imconfig.h to stay ahead.
@@ -1985,6 +2212,7 @@ struct ImGuiListClipper
     // [Internal]
     int     ItemsCount;
     int     StepNo;
+    int     ItemsFrozen;
     float   ItemsHeight;
     float   StartPosY;
 
@@ -2110,22 +2338,31 @@ struct ImDrawVert
 IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT;
 #endif
 
-// For use by ImDrawListSplitter.
+// [Internal] For use by ImDrawList
+struct ImDrawCmdHeader
+{
+    ImVec4          ClipRect;
+    ImTextureID     TextureId;
+    unsigned int    VtxOffset;
+};
+
+// [Internal] For use by ImDrawListSplitter
 struct ImDrawChannel
 {
     ImVector<ImDrawCmd>         _CmdBuffer;
     ImVector<ImDrawIdx>         _IdxBuffer;
 };
 
+
 // Split/Merge functions are used to split the draw list into different layers which can be drawn into out of order.
-// This is used by the Columns api, so items of each column can be batched together in a same draw call.
+// This is used by the Columns/Tables API, so items of each column can be batched together in a same draw call.
 struct ImDrawListSplitter
 {
     int                         _Current;    // Current channel number (0)
     int                         _Count;      // Number of active channels (1+)
     ImVector<ImDrawChannel>     _Channels;   // Draw channels (not resized down so _Count might be < Channels.Size)
 
-    inline ImDrawListSplitter()  { Clear(); }
+    inline ImDrawListSplitter()  { memset(this, 0, sizeof(*this)); }
     inline ~ImDrawListSplitter() { ClearFreeMemory(); }
     inline void                 Clear() { _Current = 0; _Count = 1; } // Do not clear Channels[] so our allocations are reused next frame
     IMGUI_API void              ClearFreeMemory();
@@ -2176,19 +2413,19 @@ struct ImDrawList
     ImDrawListFlags         Flags;              // Flags, you may poke into these to adjust anti-aliasing settings per-primitive.
 
     // [Internal, used while building lists]
+    unsigned int            _VtxCurrentIdx;     // [Internal] generally == VtxBuffer.Size unless we are past 64K vertices, in which case this gets reset to 0.
     const ImDrawListSharedData* _Data;          // Pointer to shared draw data (you can use ImGui::GetDrawListSharedData() to get the one from current ImGui context)
     const char*             _OwnerName;         // Pointer to owner window's name for debugging
-    unsigned int            _VtxCurrentIdx;     // [Internal] Generally == VtxBuffer.Size unless we are past 64K vertices, in which case this gets reset to 0.
     ImDrawVert*             _VtxWritePtr;       // [Internal] point within VtxBuffer.Data after each add command (to avoid using the ImVector<> operators too much)
     ImDrawIdx*              _IdxWritePtr;       // [Internal] point within IdxBuffer.Data after each add command (to avoid using the ImVector<> operators too much)
     ImVector<ImVec4>        _ClipRectStack;     // [Internal]
     ImVector<ImTextureID>   _TextureIdStack;    // [Internal]
     ImVector<ImVec2>        _Path;              // [Internal] current path building
-    ImDrawCmd               _CmdHeader;         // [Internal] Template of active commands. Fields should match those of CmdBuffer.back().
+    ImDrawCmdHeader         _CmdHeader;         // [Internal] template of active commands. Fields should match those of CmdBuffer.back().
     ImDrawListSplitter      _Splitter;          // [Internal] for channels api (note: prefer using your own persistent instance of ImDrawListSplitter!)
 
     // If you want to create ImDrawList instances, pass them ImGui::GetDrawListSharedData() or create and use your own ImDrawListSharedData (so you can use ImDrawList without ImGui)
-    ImDrawList(const ImDrawListSharedData* shared_data) { _Data = shared_data; Flags = ImDrawListFlags_None; _VtxCurrentIdx = 0; _VtxWritePtr = NULL; _IdxWritePtr = NULL; _OwnerName = NULL; }
+    ImDrawList(const ImDrawListSharedData* shared_data) { memset(this, 0, sizeof(*this)); _Data = shared_data; }
 
     ~ImDrawList() { _ClearFreeMemory(); }
     IMGUI_API void  PushClipRect(ImVec2 clip_rect_min, ImVec2 clip_rect_max, bool intersect_with_current_clip_rect = false);  // Render-level scissoring. This is passed down to your render function but not used for CPU-side coarse clipping. Prefer using higher-level ImGui::PushClipRect() to affect logic (hit-testing and widget culling)

libs/ImGui/include/imgui_internal.h

@@ -23,6 +23,7 @@ Index of this file:
 // [SECTION] Docking support
 // [SECTION] Viewport support
 // [SECTION] Settings support
+// [SECTION] Metrics, Debug
 // [SECTION] Generic context hooks
 // [SECTION] ImGuiContext (main imgui context)
 // [SECTION] ImGuiWindowTempData, ImGuiWindow
@@ -110,9 +111,14 @@ struct ImGuiNextWindowData;         // Storage for SetNextWindow** functions
 struct ImGuiNextItemData;           // Storage for SetNextItem** functions
 struct ImGuiPopupData;              // Storage for current popup stack
 struct ImGuiSettingsHandler;        // Storage for one type registered in the .ini file
+struct ImGuiStackSizes;             // Storage of stack sizes for debugging/asserting
 struct ImGuiStyleMod;               // Stacked style modifier, backup of modified data so we can restore it
 struct ImGuiTabBar;                 // Storage for a tab bar
 struct ImGuiTabItem;                // Storage for a tab item (within a tab bar)
+struct ImGuiTable;                  // Storage for a table
+struct ImGuiTableColumn;            // Storage for one column of a table
+struct ImGuiTableSettings;          // Storage for a table .ini settings
+struct ImGuiTableColumnsSettings;   // Storage for a column .ini settings
 struct ImGuiWindow;                 // Storage for one window
 struct ImGuiWindowTempData;         // Temporary storage for one window (that's the data which in theory we could ditch at the end of the frame)
 struct ImGuiWindowSettings;         // Storage for a window .ini settings (we keep one of those even if the actual window wasn't instanced during this session)
@@ -254,6 +260,7 @@ namespace ImStb
 // - Helper: ImRect
 // - Helper: ImBitArray
 // - Helper: ImBitVector
+// - Helper: ImSpan<>, ImSpanAllocator<>
 // - Helper: ImPool<>
 // - Helper: ImChunkStream<>
 //-----------------------------------------------------------------------------
@@ -273,6 +280,7 @@ IMGUI_API ImU32         ImAlphaBlendColors(ImU32 col_a, ImU32 col_b);
 
 // Helpers: Bit manipulation
 static inline bool      ImIsPowerOfTwo(int v)           { return v != 0 && (v & (v - 1)) == 0; }
+static inline bool      ImIsPowerOfTwo(ImU64 v)         { return v != 0 && (v & (v - 1)) == 0; }
 static inline int       ImUpperPowerOfTwo(int v)        { v--; v |= v >> 1; v |= v >> 2; v |= v >> 4; v |= v >> 8; v |= v >> 16; v++; return v; }
 
 // Helpers: String, Formatting
@@ -465,21 +473,35 @@ struct IMGUI_API ImRect
 };
 
 // Helper: ImBitArray
-inline bool          ImBitArrayTestBit(const ImU32* arr, int n)         { ImU32 mask = (ImU32)1 << (n & 31); return (arr[n >> 5] & mask) != 0; }
-inline void          ImBitArrayClearBit(ImU32* arr, int n)              { ImU32 mask = (ImU32)1 << (n & 31); arr[n >> 5] &= ~mask; }
-inline void          ImBitArraySetBit(ImU32* arr, int n)                { ImU32 mask = (ImU32)1 << (n & 31); arr[n >> 5] |= mask; }
-inline void          ImBitArraySetBitRange(ImU32* arr, int n, int n2)
+inline bool     ImBitArrayTestBit(const ImU32* arr, int n)      { ImU32 mask = (ImU32)1 << (n & 31); return (arr[n >> 5] & mask) != 0; }
+inline void     ImBitArrayClearBit(ImU32* arr, int n)           { ImU32 mask = (ImU32)1 << (n & 31); arr[n >> 5] &= ~mask; }
+inline void     ImBitArraySetBit(ImU32* arr, int n)             { ImU32 mask = (ImU32)1 << (n & 31); arr[n >> 5] |= mask; }
+inline void     ImBitArraySetBitRange(ImU32* arr, int n, int n2)
 {
     while (n <= n2)
     {
         int a_mod = (n & 31);
-        int b_mod = ((n2 >= n + 31) ? 31 : (n2 & 31)) + 1;
+        int b_mod = (n2 > (n | 31) ? 31 : (n2 & 31)) + 1;
         ImU32 mask = (ImU32)(((ImU64)1 << b_mod) - 1) & ~(ImU32)(((ImU64)1 << a_mod) - 1);
         arr[n >> 5] |= mask;
         n = (n + 32) & ~31;
     }
 }
 
+// Helper: ImBitArray class (wrapper over ImBitArray functions)
+// Store 1-bit per value. NOT CLEARED by constructor.
+template<int BITCOUNT>
+struct IMGUI_API ImBitArray
+{
+    ImU32           Storage[(BITCOUNT + 31) >> 5];
+    ImBitArray()                                { }
+    void            ClearBits()                 { memset(Storage, 0, sizeof(Storage)); }
+    bool            TestBit(int n) const        { IM_ASSERT(n < BITCOUNT); return ImBitArrayTestBit(Storage, n); }
+    void            SetBit(int n)               { IM_ASSERT(n < BITCOUNT); ImBitArraySetBit(Storage, n); }
+    void            ClearBit(int n)             { IM_ASSERT(n < BITCOUNT); ImBitArrayClearBit(Storage, n); }
+    void            SetBitRange(int n1, int n2) { ImBitArraySetBitRange(Storage, n1, n2); }
+};
+
 // Helper: ImBitVector
 // Store 1-bit per value.
 struct IMGUI_API ImBitVector
@@ -492,6 +514,54 @@ struct IMGUI_API ImBitVector
     void            ClearBit(int n)             { IM_ASSERT(n < (Storage.Size << 5)); ImBitArrayClearBit(Storage.Data, n); }
 };
 
+// Helper: ImSpan<>
+// Pointing to a span of data we don't own.
+template<typename T>
+struct ImSpan
+{
+    T*                  Data;
+    T*                  DataEnd;
+
+    // Constructors, destructor
+    inline ImSpan()                                 { Data = DataEnd = NULL; }
+    inline ImSpan(T* data, int size)                { Data = data; DataEnd = data + size; }
+    inline ImSpan(T* data, T* data_end)             { Data = data; DataEnd = data_end; }
+
+    inline void         set(T* data, int size)      { Data = data; DataEnd = data + size; }
+    inline void         set(T* data, T* data_end)   { Data = data; DataEnd = data_end; }
+    inline int          size() const                { return (int)(ptrdiff_t)(DataEnd - Data); }
+    inline T&           operator[](int i)           { T* p = Data + i; IM_ASSERT(p >= Data && p < DataEnd); return *p; }
+    inline const T&     operator[](int i) const     { const T* p = Data + i; IM_ASSERT(p >= Data && p < DataEnd); return *p; }
+
+    inline T*           begin()                     { return Data; }
+    inline const T*     begin() const               { return Data; }
+    inline T*           end()                       { return DataEnd; }
+    inline const T*     end() const                 { return DataEnd; }
+
+    // Utilities
+    inline int  index_from_ptr(const T* it) const   { IM_ASSERT(it >= Data && it < DataEnd); const ptrdiff_t off = it - Data; return (int)off; }
+};
+
+// Helper: ImSpanAllocator<>
+// Facilitate storing multiple chunks into a single large block (the "arena")
+template<int CHUNKS>
+struct ImSpanAllocator
+{
+    char*   BasePtr;
+    int     TotalSize;
+    int     CurrSpan;
+    int     Offsets[CHUNKS];
+
+    ImSpanAllocator()                               { memset(this, 0, sizeof(*this)); }
+    inline void  ReserveBytes(int n, size_t sz)     { IM_ASSERT(n == CurrSpan && n < CHUNKS); IM_UNUSED(n); Offsets[CurrSpan++] = TotalSize; TotalSize += (int)sz; }
+    inline int   GetArenaSizeInBytes()              { return TotalSize; }
+    inline void  SetArenaBasePtr(void* base_ptr)    { BasePtr = (char*)base_ptr; }
+    inline void* GetSpanPtrBegin(int n)             { IM_ASSERT(n >= 0 && n < CHUNKS && CurrSpan == CHUNKS); return (void*)(BasePtr + Offsets[n]); }
+    inline void* GetSpanPtrEnd(int n)               { IM_ASSERT(n >= 0 && n < CHUNKS && CurrSpan == CHUNKS); return (n + 1 < CHUNKS) ? BasePtr + Offsets[n + 1] : (void*)(BasePtr + TotalSize); }
+    template<typename T>
+    inline void  GetSpan(int n, ImSpan<T>* span)    { span->set((T*)GetSpanPtrBegin(n), (T*)GetSpanPtrEnd(n)); }
+};
+
 // Helper: ImPool<>
 // Basic keyed storage for contiguous instances, slow/amortized insertion, O(1) indexable, O(Log N) queries by ID over a dense/hot buffer,
 // Honor constructor/destructor. Add/remove invalidate all pointers. Indexes have the same lifetime as the associated object.
@@ -538,6 +608,8 @@ struct IMGUI_API ImChunkStream
     T*      end()                       { return (T*)(void*)(Buf.Data + Buf.Size); }
     int     offset_from_ptr(const T* p) { IM_ASSERT(p >= begin() && p < end()); const ptrdiff_t off = (const char*)p - Buf.Data; return (int)off; }
     T*      ptr_from_offset(int off)    { IM_ASSERT(off >= 4 && off < Buf.Size); return (T*)(void*)(Buf.Data + off); }
+    void    swap(ImChunkStream<T>& rhs) { rhs.Buf.swap(Buf); }
+
 };
 
 //-----------------------------------------------------------------------------
@@ -838,6 +910,7 @@ struct ImGuiStyleMod
 // Stacked storage data for BeginGroup()/EndGroup()
 struct ImGuiGroupData
 {
+    ImGuiID     WindowID;
     ImVec2      BackupCursorPos;
     ImVec2      BackupCursorMaxPos;
     ImVec1      BackupIndent;
@@ -856,7 +929,7 @@ struct IMGUI_API ImGuiMenuColumns
     float       Width, NextWidth;
     float       Pos[3], NextWidths[3];
 
-    ImGuiMenuColumns();
+    ImGuiMenuColumns() { memset(this, 0, sizeof(*this)); }
     void        Update(int count, float spacing, bool clear);
     float       DeclColumns(float w0, float w1, float w2);
     float       CalcExtraSpace(float avail_w) const;
@@ -909,7 +982,7 @@ struct ImGuiPopupData
     ImVec2              OpenPopupPos;   // Set on OpenPopup(), preferred popup position (typically == OpenMousePos when using mouse)
     ImVec2              OpenMousePos;   // Set on OpenPopup(), copy of mouse position at the time of opening popup
 
-    ImGuiPopupData() { PopupId = 0; Window = SourceWindow = NULL; OpenFrameCount = -1; OpenParentId = 0; }
+    ImGuiPopupData()    { memset(this, 0, sizeof(*this)); OpenFrameCount = -1; }
 };
 
 struct ImGuiNavMoveResult
@@ -1026,7 +1099,7 @@ struct ImGuiColumnData
     ImGuiColumnsFlags   Flags;              // Not exposed
     ImRect              ClipRect;
 
-    ImGuiColumnData()   { OffsetNorm = OffsetNormBeforeResize = 0.0f; Flags = ImGuiColumnsFlags_None; }
+    ImGuiColumnData()   { memset(this, 0, sizeof(*this)); }
 };
 
 struct ImGuiColumns
@@ -1047,21 +1120,7 @@ struct ImGuiColumns
     ImVector<ImGuiColumnData> Columns;
     ImDrawListSplitter  Splitter;
 
-    ImGuiColumns()      { Clear(); }
-    void Clear()
-    {
-        ID = 0;
-        Flags = ImGuiColumnsFlags_None;
-        IsFirstFrame = false;
-        IsBeingResized = false;
-        Current = 0;
-        Count = 1;
-        OffMinX = OffMaxX = 0.0f;
-        LineMinY = LineMaxY = 0.0f;
-        HostCursorPosY = 0.0f;
-        HostCursorMaxPosX = 0.0f;
-        Columns.clear();
-    }
+    ImGuiColumns()      { memset(this, 0, sizeof(*this)); }
 };
 
 //-----------------------------------------------------------------------------
@@ -1124,6 +1183,7 @@ struct ImGuiDockNode
     ImGuiID                 ID;
     ImGuiDockNodeFlags      SharedFlags;                // Flags shared by all nodes of a same dockspace hierarchy (inherited from the root node)
     ImGuiDockNodeFlags      LocalFlags;                 // Flags specific to this node
+    ImGuiDockNodeState      State;
     ImGuiDockNode*          ParentNode;
     ImGuiDockNode*          ChildNodes[2];              // [Split node only] Child nodes (left/right or top/bottom). Consider switching to an array.
     ImVector<ImGuiWindow*>  Windows;                    // Note: unordered list! Iterate TabBar->Tabs for user-order.
@@ -1134,7 +1194,6 @@ struct ImGuiDockNode
     ImGuiAxis               SplitAxis;                  // [Split node only] Split axis (X or Y)
     ImGuiWindowClass        WindowClass;                // [Root node only]
 
-    ImGuiDockNodeState      State;
     ImGuiWindow*            HostWindow;
     ImGuiWindow*            VisibleWindow;              // Generally point to window which is ID is == SelectedTabID, but when CTRL+Tabbing this can be a different window.
     ImGuiDockNode*          CentralNode;                // [Root node only] Pointer to central node.
@@ -1245,7 +1304,7 @@ struct ImGuiWindowSettings
     bool        Collapsed;
     bool        WantApply;      // Set when loaded from .ini data (to enable merging/loading .ini data into an already running context)
 
-    ImGuiWindowSettings()       { ID = 0; Pos = Size = ViewportPos = ImVec2ih(0, 0); ViewportId = DockId = ClassId = 0; DockOrder = -1; Collapsed = WantApply = false; }
+    ImGuiWindowSettings()       { memset(this, 0, sizeof(*this)); DockOrder = -1; }
     char* GetName()             { return (char*)(this + 1); }
 };
 
@@ -1264,6 +1323,10 @@ struct ImGuiSettingsHandler
     ImGuiSettingsHandler() { memset(this, 0, sizeof(*this)); }
 };
 
+//-----------------------------------------------------------------------------
+// [SECTION] Metrics, Debug
+//-----------------------------------------------------------------------------
+
 struct ImGuiMetricsConfig
 {
     bool        ShowWindowsRects;
@@ -1288,6 +1351,21 @@ struct ImGuiMetricsConfig
     }
 };
 
+struct IMGUI_API ImGuiStackSizes
+{
+    short   SizeOfIDStack;
+    short   SizeOfColorStack;
+    short   SizeOfStyleVarStack;
+    short   SizeOfFontStack;
+    short   SizeOfFocusScopeStack;
+    short   SizeOfGroupStack;
+    short   SizeOfBeginPopupStack;
+
+    ImGuiStackSizes() { memset(this, 0, sizeof(*this)); }
+    IMGUI_API void SetToCurrentState();
+    IMGUI_API void CompareWithCurrentState();
+};
+
 //-----------------------------------------------------------------------------
 // [SECTION] Generic context hooks
 //-----------------------------------------------------------------------------
@@ -1330,6 +1408,7 @@ struct ImGuiContext
     bool                    WithinFrameScope;                   // Set by NewFrame(), cleared by EndFrame()
     bool                    WithinFrameScopeWithImplicitWindow; // Set by NewFrame(), cleared by EndFrame() when the implicit debug window has been pushed
     bool                    WithinEndChild;                     // Set within EndChild()
+    bool                    GcCompactAll;                       // Request full GC
     bool                    TestEngineHookItems;                // Will call test engine hooks: ImGuiTestEngineHook_ItemAdd(), ImGuiTestEngineHook_ItemInfo(), ImGuiTestEngineHook_Log()
     ImGuiID                 TestEngineHookIdInfo;               // Will call test engine hooks: ImGuiTestEngineHook_IdInfo() from GetID()
     void*                   TestEngine;                         // Test engine user data
@@ -1386,9 +1465,12 @@ struct ImGuiContext
     ImGuiNextItemData       NextItemData;                       // Storage for SetNextItem** functions
 
     // Shared stacks
-    ImVector<ImGuiColorMod> ColorModifiers;                     // Stack for PushStyleColor()/PopStyleColor()
-    ImVector<ImGuiStyleMod> StyleModifiers;                     // Stack for PushStyleVar()/PopStyleVar()
-    ImVector<ImFont*>       FontStack;                          // Stack for PushFont()/PopFont()
+    ImVector<ImGuiColorMod> ColorStack;                         // Stack for PushStyleColor()/PopStyleColor() - inherited by Begin()
+    ImVector<ImGuiStyleMod> StyleVarStack;                      // Stack for PushStyleVar()/PopStyleVar() - inherited by Begin()
+    ImVector<ImFont*>       FontStack;                          // Stack for PushFont()/PopFont() - inherited by Begin()
+    ImVector<ImGuiID>       FocusScopeStack;                    // Stack for PushFocusScope()/PopFocusScope() - not inherited by Begin(), unless child window
+    ImVector<ImGuiItemFlags>ItemFlagsStack;                     // Stack for PushItemFlag()/PopItemFlag() - inherited by Begin()
+    ImVector<ImGuiGroupData>GroupStack;                         // Stack for BeginGroup()/EndGroup() - not inherited by Begin()
     ImVector<ImGuiPopupData>OpenPopupStack;                     // Which popups are open (persistent)
     ImVector<ImGuiPopupData>BeginPopupStack;                    // Which level of BeginPopup() we are in (reset every frame)
 
@@ -1479,6 +1561,13 @@ struct ImGuiContext
     ImVector<unsigned char> DragDropPayloadBufHeap;             // We don't expose the ImVector<> directly, ImGuiPayload only holds pointer+size
     unsigned char           DragDropPayloadBufLocal[16];        // Local buffer for small payloads
 
+    // Table
+    ImGuiTable*                     CurrentTable;
+    ImPool<ImGuiTable>              Tables;
+    ImVector<ImGuiPtrOrIndex>       CurrentTableStack;
+    ImVector<float>                 TablesLastTimeActive;       // Last used timestamp of each tables (SOA, for efficient GC)
+    ImVector<ImDrawChannel>         DrawChannelsTempMergeBuffer;
+
     // Tab bars
     ImGuiTabBar*                    CurrentTabBar;
     ImPool<ImGuiTabBar>             TabBars;
@@ -1521,6 +1610,7 @@ struct ImGuiContext
     ImGuiTextBuffer         SettingsIniData;                    // In memory .ini settings
     ImVector<ImGuiSettingsHandler>      SettingsHandlers;       // List of .ini settings handlers
     ImChunkStream<ImGuiWindowSettings>  SettingsWindows;        // ImGuiWindow .ini settings entries
+    ImChunkStream<ImGuiTableSettings>   SettingsTables;         // ImGuiTable .ini settings entries
     ImVector<ImGuiContextHook>          Hooks;                  // Hooks for extensions (e.g. test engine)
 
     // Capture/Logging
@@ -1560,6 +1650,7 @@ struct ImGuiContext
         FrameCount = 0;
         FrameCountEnded = FrameCountPlatformEnded = FrameCountRendered = -1;
         WithinFrameScope = WithinFrameScopeWithImplicitWindow = WithinEndChild = false;
+        GcCompactAll = false;
         TestEngineHookItems = false;
         TestEngineHookIdInfo = 0;
         TestEngine = NULL;
@@ -1655,6 +1746,7 @@ struct ImGuiContext
         DragDropHoldJustPressedId = 0;
         memset(DragDropPayloadBufLocal, 0, sizeof(DragDropPayloadBufLocal));
 
+        CurrentTable = NULL;
         CurrentTabBar = NULL;
 
         LastValidMousePos = ImVec2(0.0f, 0.0f);
@@ -1701,7 +1793,8 @@ struct ImGuiContext
 //-----------------------------------------------------------------------------
 
 // Transient per-window data, reset at the beginning of the frame. This used to be called ImGuiDrawContext, hence the DC variable name in ImGuiWindow.
-// FIXME: That's theory, in practice the delimitation between ImGuiWindow and ImGuiWindowTempData is quite tenuous and could be reconsidered.
+// (That's theory, in practice the delimitation between ImGuiWindow and ImGuiWindowTempData is quite tenuous and could be reconsidered..)
+// (This doesn't need a constructor because we zero-clear it as part of ImGuiWindow and all frame-temporary data are setup on Begin)
 struct IMGUI_API ImGuiWindowTempData
 {
     // Layout
@@ -1740,6 +1833,7 @@ struct IMGUI_API ImGuiWindowTempData
     ImVector<ImGuiWindow*>  ChildWindows;
     ImGuiStorage*           StateStorage;           // Current persistent per-window storage (store e.g. tree node open/close state)
     ImGuiColumns*           CurrentColumns;         // Current columns set
+    int                     CurrentTableIdx;        // Current table index (into g.Tables)
     ImGuiLayoutType         LayoutType;
     ImGuiLayoutType         ParentLayoutType;       // Layout type of parent window at the time of Begin()
     int                     FocusCounterRegular;    // (Legacy Focus/Tabbing system) Sequential counter, start at -1 and increase as assigned via FocusableItemRegister() (FIXME-NAV: Needs redesign)
@@ -1747,48 +1841,12 @@ struct IMGUI_API ImGuiWindowTempData
 
     // Local parameters stacks
     // We store the current settings outside of the vectors to increase memory locality (reduce cache misses). The vectors are rarely modified. Also it allows us to not heap allocate for short-lived windows which are not using those settings.
-    ImGuiItemFlags          ItemFlags;              // == ItemFlagsStack.back() [empty == ImGuiItemFlags_Default]
+    ImGuiItemFlags          ItemFlags;              // == g.ItemFlagsStack.back()
     float                   ItemWidth;              // == ItemWidthStack.back(). 0.0: default, >0.0: width in pixels, <0.0: align xx pixels to the right of window
     float                   TextWrapPos;            // == TextWrapPosStack.back() [empty == -1.0f]
-    ImVector<ImGuiItemFlags>ItemFlagsStack;
     ImVector<float>         ItemWidthStack;
     ImVector<float>         TextWrapPosStack;
-    ImVector<ImGuiGroupData>GroupStack;
-    short                   StackSizesBackup[6];    // Store size of various stacks for asserting
-
-    ImGuiWindowTempData()
-    {
-        CursorPos = CursorPosPrevLine = CursorStartPos = CursorMaxPos = ImVec2(0.0f, 0.0f);
-        CurrLineSize = PrevLineSize = ImVec2(0.0f, 0.0f);
-        CurrLineTextBaseOffset = PrevLineTextBaseOffset = 0.0f;
-        Indent = ImVec1(0.0f);
-        ColumnsOffset = ImVec1(0.0f);
-        GroupOffset = ImVec1(0.0f);
-
-        LastItemId = 0;
-        LastItemStatusFlags = ImGuiItemStatusFlags_None;
-        LastItemRect = LastItemDisplayRect = ImRect();
-
-        NavLayerActiveMask = NavLayerActiveMaskNext = 0x00;
-        NavLayerCurrent = ImGuiNavLayer_Main;
-        NavFocusScopeIdCurrent = 0;
-        NavHideHighlightOneFrame = false;
-        NavHasScroll = false;
-
-        MenuBarAppending = false;
-        MenuBarOffset = ImVec2(0.0f, 0.0f);
-        TreeDepth = 0;
-        TreeJumpToParentOnPopMask = 0x00;
-        StateStorage = NULL;
-        CurrentColumns = NULL;
-        LayoutType = ParentLayoutType = ImGuiLayoutType_Vertical;
-        FocusCounterRegular = FocusCounterTabStop = -1;
-
-        ItemFlags = ImGuiItemFlags_Default_;
-        ItemWidth = 0.0f;
-        TextWrapPos = -1.0f;
-        memset(StackSizesBackup, 0, sizeof(StackSizesBackup));
-    }
+    ImGuiStackSizes         StackSizesOnBegin;      // Store size of various stacks for asserting
 };
 
 // Storage for one window
@@ -1852,7 +1910,7 @@ struct IMGUI_API ImGuiWindow
     ImVector<ImGuiID>       IDStack;                            // ID stack. ID are hashes seeded with the value at the top of the stack. (In theory this should be in the TempData structure)
     ImGuiWindowTempData     DC;                                 // Temporary per-window data, reset at the beginning of the frame. This used to be called ImGuiDrawContext, hence the "DC" variable name.
 
-    // The best way to understand what those rectangles are is to use the 'Metrics -> Tools -> Show windows rectangles' viewer.
+    // The best way to understand what those rectangles are is to use the 'Metrics->Tools->Show Windows Rectangles' viewer.
     // The main 'OuterRect', omitted as a field, is window->Rect().
     ImRect                  OuterRectClipped;                   // == Window->Rect() just after setup in Begin(). == window->Rect() for root window.
     ImRect                  InnerRect;                          // Inner rectangle (omit title bar, menu bar, scroll bar)
@@ -1886,9 +1944,9 @@ struct IMGUI_API ImGuiWindow
     ImGuiID                 NavLastIds[ImGuiNavLayer_COUNT];    // Last known NavId for this window, per layer (0/1)
     ImRect                  NavRectRel[ImGuiNavLayer_COUNT];    // Reference rectangle, in window relative space
 
-    bool                    MemoryCompacted;                    // Set when window extraneous data have been garbage collected
     int                     MemoryDrawListIdxCapacity;          // Backup of last idx/vtx count, so when waking up the window we can preallocate and avoid iterative alloc/copy
     int                     MemoryDrawListVtxCapacity;
+    bool                    MemoryCompacted;                    // Set when window extraneous data have been garbage collected
 
     // Docking
     ImGuiDockNode*          DockNode;                           // Which node are we docked into. Important: Prefer testing DockIsActive in many cases as this will still be set when the dock node is hidden.
@@ -2026,7 +2084,212 @@ struct ImGuiTabBar
 //-----------------------------------------------------------------------------
 
 #ifdef IMGUI_HAS_TABLE
-// <this is filled in 'tables' branch>
+
+#define IM_COL32_DISABLE                IM_COL32(0,0,0,1)   // Special sentinel code which cannot be used as a regular color.
+#define IMGUI_TABLE_MAX_COLUMNS         64                  // sizeof(ImU64) * 8. This is solely because we frequently encode columns set in a ImU64.
+#define IMGUI_TABLE_MAX_DRAW_CHANNELS   (4 + 64 * 2)        // See TableUpdateDrawChannels()
+
+// [Internal] sizeof() ~ 100
+// We use the terminology "Visible" to refer to a column that is not Hidden by user or settings. However it may still be out of view and clipped (see IsClipped).
+struct ImGuiTableColumn
+{
+    ImRect                  ClipRect;                       // Clipping rectangle for the column
+    ImGuiID                 UserID;                         // Optional, value passed to TableSetupColumn()
+    ImGuiTableColumnFlags   FlagsIn;                        // Flags as they were provided by user. See ImGuiTableColumnFlags_
+    ImGuiTableColumnFlags   Flags;                          // Effective flags. See ImGuiTableColumnFlags_
+    float                   MinX;                           // Absolute positions
+    float                   MaxX;
+    float                   InitStretchWeightOrWidth;       // Value passed to TableSetupColumn(). For Width it is a content width (_without padding_).
+    float                   StretchWeight;                  // Master width weight when (Flags & _WidthStretch). Often around ~1.0f initially.
+    float                   WidthAuto;                      // Automatic width
+    float                   WidthRequest;                   // Master width absolute value when !(Flags & _WidthStretch). When Stretch this is derived every frame from StretchWeight in TableUpdateLayout()
+    float                   WidthGiven;                     // Final/actual width visible == (MaxX - MinX), locked in TableUpdateLayout(). May be > WidthRequest to honor minimum width, may be < WidthRequest to honor shrinking columns down in tight space.
+    float                   WorkMinX;                       // Start position for the frame, currently ~(MinX + CellPaddingX)
+    float                   WorkMaxX;
+    float                   ContentMaxXFrozen;              // Contents maximum position for frozen rows (apart from headers), from which we can infer content width.
+    float                   ContentMaxXUnfrozen;
+    float                   ContentMaxXHeadersUsed;         // Contents maximum position for headers rows (regardless of freezing). TableHeader() automatically softclip itself + report ideal desired size, to avoid creating extraneous draw calls
+    float                   ContentMaxXHeadersIdeal;
+    ImS16                   NameOffset;                     // Offset into parent ColumnsNames[]
+    bool                    IsVisible;                      // Is the column not marked Hidden by the user? (even if off view, e.g. clipped by scrolling).
+    bool                    IsVisibleNextFrame;
+    bool                    IsClipped;                      // Is not actually in view (e.g. not overlapping the host window clipping rectangle).
+    bool                    IsSkipItems;                    // Do we want item submissions to this column to be ignored early on.
+    ImS8                    NavLayerCurrent;                // ImGuiNavLayer in 1 byte
+    ImS8                    DisplayOrder;                   // Index within Table's IndexToDisplayOrder[] (column may be reordered by users)
+    ImS8                    IndexWithinVisibleSet;          // Index within visible set (<= IndexToDisplayOrder)
+    ImS8                    PrevVisibleColumn;              // Index of prev visible column within Columns[], -1 if first visible column
+    ImS8                    NextVisibleColumn;              // Index of next visible column within Columns[], -1 if last visible column
+    ImS8                    SortOrder;                      // Index of this column within sort specs, -1 if not sorting on this column, 0 for single-sort, may be >0 on multi-sort
+    ImS8                    SortDirection;                  // ImGuiSortDirection_Ascending or ImGuiSortDirection_Descending
+    ImU8                    AutoFitQueue;                   // Queue of 8 values for the next 8 frames to request auto-fit
+    ImU8                    CannotSkipItemsQueue;           // Queue of 8 values for the next 8 frames to disable Clipped/SkipItem
+    ImU8                    DrawChannelCurrent;             // Index within DrawSplitter.Channels[]
+    ImU8                    DrawChannelFrozen;
+    ImU8                    DrawChannelUnfrozen;
+
+    ImGuiTableColumn()
+    {
+        memset(this, 0, sizeof(*this));
+        StretchWeight = WidthRequest = -1.0f;
+        NameOffset = -1;
+        IsVisible = IsVisibleNextFrame = true;
+        DisplayOrder = IndexWithinVisibleSet = -1;
+        PrevVisibleColumn = NextVisibleColumn = -1;
+        SortOrder = -1;
+        SortDirection = ImGuiSortDirection_None;
+        AutoFitQueue = CannotSkipItemsQueue = (1 << 3) - 1; // Skip for three frames
+        DrawChannelCurrent = DrawChannelFrozen = DrawChannelUnfrozen = (ImU8)-1;
+    }
+};
+
+// Transient cell data stored per row.
+// sizeof() ~ 6
+struct ImGuiTableCellData
+{
+    ImU32   BgColor;        // Actual color
+    ImS8    Column;         // Column number
+};
+
+struct ImGuiTable
+{
+    ImGuiID                     ID;
+    ImGuiTableFlags             Flags;
+    void*                       RawData;                    // Single allocation to hold Columns[], DisplayOrderToIndex[] and RowCellData[]
+    ImSpan<ImGuiTableColumn>    Columns;                    // Point within RawData[]
+    ImSpan<ImS8>                DisplayOrderToIndex;        // Point within RawData[]. Store display order of columns (when not reordered, the values are 0...Count-1)
+    ImSpan<ImGuiTableCellData>  RowCellData;                // Point within RawData[]. Store cells background requests for current row.
+    ImU64                       VisibleMaskByIndex;         // Column Index -> IsVisible map (== not hidden by user/api) in a format adequate for iterating column without touching cold data
+    ImU64                       VisibleMaskByDisplayOrder;  // Column DisplayOrder -> IsVisible map
+    ImU64                       VisibleUnclippedMaskByIndex;// Visible and not Clipped, aka "actually visible" "not hidden by some scrolling"
+    ImGuiTableFlags             SettingsLoadedFlags;        // Which data were loaded from the .ini file (e.g. when order is not altered we won't save order)
+    int                         SettingsOffset;             // Offset in g.SettingsTables
+    int                         LastFrameActive;
+    int                         ColumnsCount;               // Number of columns declared in BeginTable()
+    int                         ColumnsVisibleCount;        // Number of non-hidden columns (<= ColumnsCount)
+    int                         CurrentRow;
+    int                         CurrentColumn;
+    ImS16                       InstanceCurrent;            // Count of BeginTable() calls with same ID in the same frame (generally 0). This is a little bit similar to BeginCount for a window, but multiple table with same ID look are multiple tables, they are just synched.
+    ImS16                       InstanceInteracted;         // Mark which instance (generally 0) of the same ID is being interacted with
+    float                       RowPosY1;
+    float                       RowPosY2;
+    float                       RowMinHeight;               // Height submitted to TableNextRow()
+    float                       RowTextBaseline;
+    float                       RowIndentOffsetX;
+    ImGuiTableRowFlags          RowFlags : 16;              // Current row flags, see ImGuiTableRowFlags_
+    ImGuiTableRowFlags          LastRowFlags : 16;
+    int                         RowBgColorCounter;          // Counter for alternating background colors (can be fast-forwarded by e.g clipper), not same as CurrentRow because header rows typically don't increase this.
+    ImU32                       RowBgColor[2];              // Background color override for current row.
+    ImU32                       BorderColorStrong;
+    ImU32                       BorderColorLight;
+    float                       BorderX1;
+    float                       BorderX2;
+    float                       HostIndentX;
+    float                       OuterPaddingX;
+    float                       CellPaddingX;               // Padding from each borders
+    float                       CellPaddingY;
+    float                       CellSpacingX1;              // Spacing between non-bordered cells
+    float                       CellSpacingX2;
+    float                       LastOuterHeight;            // Outer height from last frame
+    float                       LastFirstRowHeight;         // Height of first row from last frame
+    float                       InnerWidth;                 // User value passed to BeginTable(), see comments at the top of BeginTable() for details.
+    float                       ColumnsTotalWidth;          // Sum of current column width
+    float                       ColumnsAutoFitWidth;        // Sum of ideal column width in order nothing to be clipped, used for auto-fitting and content width submission in outer window
+    float                       ResizedColumnNextWidth;
+    float                       RefScale;                   // Reference scale to be able to rescale columns on font/dpi changes.
+    ImRect                      OuterRect;                  // Note: OuterRect.Max.y is often FLT_MAX until EndTable(), unless a height has been specified in BeginTable().
+    ImRect                      WorkRect;
+    ImRect                      InnerClipRect;
+    ImRect                      BgClipRect;                 // We use this to cpu-clip cell background color fill
+    ImRect                      BgClipRectForDrawCmd;
+    ImRect                      HostClipRect;               // This is used to check if we can eventually merge our columns draw calls into the current draw call of the current window.
+    ImRect                      HostBackupWorkRect;         // Backup of InnerWindow->WorkRect at the end of BeginTable()
+    ImRect                      HostBackupParentWorkRect;   // Backup of InnerWindow->ParentWorkRect at the end of BeginTable()
+    ImRect                      HostBackupClipRect;         // Backup of InnerWindow->ClipRect during PushTableBackground()/PopTableBackground()
+    ImVec2                      HostBackupCursorMaxPos;     // Backup of InnerWindow->DC.CursorMaxPos at the end of BeginTable()
+    ImVec1                      HostBackupColumnsOffset;    // Backup of OuterWindow->ColumnsOffset at the end of BeginTable()
+    ImGuiWindow*                OuterWindow;                // Parent window for the table
+    ImGuiWindow*                InnerWindow;                // Window holding the table data (== OuterWindow or a child window)
+    ImGuiTextBuffer             ColumnsNames;               // Contiguous buffer holding columns names
+    ImDrawListSplitter          DrawSplitter;               // We carry our own ImDrawList splitter to allow recursion (FIXME: could be stored outside, worst case we need 1 splitter per recursing table)
+    ImVector<ImGuiTableSortSpecsColumn> SortSpecsData;      // FIXME-OPT: Fixed-size array / small-vector pattern, optimize for single sort spec
+    ImGuiTableSortSpecs         SortSpecs;                  // Public facing sorts specs, this is what we return in TableGetSortSpecs()
+    ImS8                        SortSpecsCount;
+    ImS8                        DeclColumnsCount;           // Count calls to TableSetupColumn()
+    ImS8                        HoveredColumnBody;          // Index of column whose visible region is being hovered. Important: == ColumnsCount when hovering empty region after the right-most column!
+    ImS8                        HoveredColumnBorder;        // Index of column whose right-border is being hovered (for resizing).
+    ImS8                        ResizedColumn;              // Index of column being resized. Reset when InstanceCurrent==0.
+    ImS8                        LastResizedColumn;          // Index of column being resized from previous frame.
+    ImS8                        HeldHeaderColumn;           // Index of column header being held.
+    ImS8                        ReorderColumn;              // Index of column being reordered. (not cleared)
+    ImS8                        ReorderColumnDir;           // -1 or +1
+    ImS8                        RightMostVisibleColumn;     // Index of right-most non-hidden column.
+    ImS8                        LeftMostStretchedColumnDisplayOrder; // Display order of left-most stretched column.
+    ImS8                        ContextPopupColumn;         // Column right-clicked on, of -1 if opening context menu from a neutral/empty spot
+    ImS8                        FreezeRowsRequest;          // Requested frozen rows count
+    ImS8                        FreezeRowsCount;            // Actual frozen row count (== FreezeRowsRequest, or == 0 when no scrolling offset)
+    ImS8                        FreezeColumnsRequest;       // Requested frozen columns count
+    ImS8                        FreezeColumnsCount;         // Actual frozen columns count (== FreezeColumnsRequest, or == 0 when no scrolling offset)
+    ImS8                        RowCellDataCurrent;         // Index of current RowCellData[] entry in current row
+    ImU8                        DummyDrawChannel;           // Redirect non-visible columns here.
+    ImU8                        Bg1DrawChannelCurrent;      // For Selectable() and other widgets drawing accross columns after the freezing line. Index within DrawSplitter.Channels[]
+    ImU8                        Bg1DrawChannelUnfrozen;
+    bool                        IsLayoutLocked;             // Set by TableUpdateLayout() which is called when beginning the first row.
+    bool                        IsInsideRow;                // Set when inside TableBeginRow()/TableEndRow().
+    bool                        IsInitializing;
+    bool                        IsSortSpecsDirty;
+    bool                        IsUsingHeaders;             // Set when the first row had the ImGuiTableRowFlags_Headers flag.
+    bool                        IsContextPopupOpen;         // Set when default context menu is open (also see: ContextPopupColumn, InstanceInteracted).
+    bool                        IsSettingsRequestLoad;
+    bool                        IsSettingsDirty;            // Set when table settings have changed and needs to be reported into ImGuiTableSetttings data.
+    bool                        IsDefaultDisplayOrder;      // Set when display order is unchanged from default (DisplayOrder contains 0...Count-1)
+    bool                        IsResetDisplayOrderRequest;
+    bool                        IsUnfrozen;                 // Set when we got past the frozen row.
+    bool                        MemoryCompacted;
+    bool                        HostSkipItems;              // Backup of InnerWindow->SkipItem at the end of BeginTable(), because we will overwrite InnerWindow->SkipItem on a per-column basis
+
+    IMGUI_API ImGuiTable();
+    IMGUI_API ~ImGuiTable();
+};
+
+// sizeof() ~ 12
+struct ImGuiTableColumnSettings
+{
+    float   WidthOrWeight;
+    ImGuiID UserID;
+    ImS8    Index;
+    ImS8    DisplayOrder;
+    ImS8    SortOrder;
+    ImU8    SortDirection : 2;
+    ImU8    IsVisible : 1;
+    ImU8    IsStretch : 1;
+
+    ImGuiTableColumnSettings()
+    {
+        WidthOrWeight = 0.0f;
+        UserID = 0;
+        Index = -1;
+        DisplayOrder = SortOrder = -1;
+        SortDirection = ImGuiSortDirection_None;
+        IsVisible = 1;
+        IsStretch = 0;
+    }
+};
+
+// This is designed to be stored in a single ImChunkStream (1 header followed by N ImGuiTableColumnSettings, etc.)
+struct ImGuiTableSettings
+{
+    ImGuiID                     ID;                     // Set to 0 to invalidate/delete the setting
+    ImGuiTableFlags             SaveFlags;              // Indicate data we want to save using the Resizable/Reorderable/Sortable/Hideable flags (could be using its own flags..)
+    float                       RefScale;               // Reference scale to be able to rescale columns on font/dpi changes.
+    ImS8                        ColumnsCount;
+    ImS8                        ColumnsCountMax;        // Maximum number of columns this settings instance can store, we can recycle a settings instance with lower number of columns but not higher
+    bool                        WantApply;              // Set when loaded from .ini data (to enable merging/loading .ini data into an already running context)
+
+    ImGuiTableSettings()        { memset(this, 0, sizeof(*this)); }
+    ImGuiTableColumnSettings*   GetColumnSettings()     { return (ImGuiTableColumnSettings*)(this + 1); }
+};
+
 #endif // #ifdef IMGUI_HAS_TABLE
 
 //-----------------------------------------------------------------------------
@@ -2109,6 +2372,7 @@ namespace ImGui
     inline ImGuiItemStatusFlags GetItemStatusFlags() { ImGuiContext& g = *GImGui; return g.CurrentWindow->DC.LastItemStatusFlags; }
     inline ImGuiID          GetActiveID()   { ImGuiContext& g = *GImGui; return g.ActiveId; }
     inline ImGuiID          GetFocusID()    { ImGuiContext& g = *GImGui; return g.NavId; }
+    inline ImGuiItemFlags   GetItemsFlags() { ImGuiContext& g = *GImGui; return g.CurrentWindow->DC.ItemFlags; }
     IMGUI_API void          SetActiveID(ImGuiID id, ImGuiWindow* window);
     IMGUI_API void          SetFocusID(ImGuiID id, ImGuiWindow* window);
     IMGUI_API void          ClearActiveID();
@@ -2171,7 +2435,8 @@ namespace ImGui
     // patterns generally need to react (e.g. clear selection) when landing on an item of the set.
     IMGUI_API void          PushFocusScope(ImGuiID id);
     IMGUI_API void          PopFocusScope();
-    inline ImGuiID          GetFocusScopeID()               { ImGuiContext& g = *GImGui; return g.NavFocusScopeId; }
+    inline ImGuiID          GetFocusedFocusScope()          { ImGuiContext& g = *GImGui; return g.NavFocusScopeId; }                            // Focus scope which is actually active
+    inline ImGuiID          GetFocusScope()                 { ImGuiContext& g = *GImGui; return g.CurrentWindow->DC.NavFocusScopeIdCurrent; }   // Focus scope we are outputting into, set by PushFocusScope()
 
     // Inputs
     // FIXME: Eventually we should aim to move e.g. IsActiveIdUsingKey() into IsKeyXXX functions.
@@ -2249,6 +2514,45 @@ namespace ImGui
     IMGUI_API float         GetColumnOffsetFromNorm(const ImGuiColumns* columns, float offset_norm);
     IMGUI_API float         GetColumnNormFromOffset(const ImGuiColumns* columns, float offset);
 
+    // Tables
+    IMGUI_API ImGuiTable*   TableFindByID(ImGuiID id);
+    IMGUI_API bool          BeginTableEx(const char* name, ImGuiID id, int columns_count, ImGuiTableFlags flags = 0, const ImVec2& outer_size = ImVec2(0, 0), float inner_width = 0.0f);
+    IMGUI_API void          TableBeginUpdateColumns(ImGuiTable* table);
+    IMGUI_API void          TableUpdateDrawChannels(ImGuiTable* table);
+    IMGUI_API void          TableUpdateLayout(ImGuiTable* table);
+    IMGUI_API void          TableUpdateBorders(ImGuiTable* table);
+    IMGUI_API void          TableSetColumnWidth(int column_n, float width);
+    IMGUI_API void          TableSetColumnVisible(int column_n, bool visible);
+    IMGUI_API void          TableDrawBorders(ImGuiTable* table);
+    IMGUI_API void          TableDrawContextMenu(ImGuiTable* table);
+    IMGUI_API void          TableOpenContextMenu(int column_n = -1);
+    IMGUI_API void          TableReorderDrawChannelsForMerge(ImGuiTable* table);
+    IMGUI_API void          TableSetColumnSortDirection(int column_n, ImGuiSortDirection sort_direction, bool append_to_sort_specs);
+    IMGUI_API void          TableSortSpecsSanitize(ImGuiTable* table);
+    IMGUI_API void          TableSortSpecsBuild(ImGuiTable* table);
+    IMGUI_API void          TableBeginRow(ImGuiTable* table);
+    IMGUI_API void          TableEndRow(ImGuiTable* table);
+    IMGUI_API void          TableBeginCell(ImGuiTable* table, int column_n);
+    IMGUI_API void          TableEndCell(ImGuiTable* table);
+    IMGUI_API ImRect        TableGetCellBgRect(const ImGuiTable* table, int column_n);
+    IMGUI_API const char*   TableGetColumnName(const ImGuiTable* table, int column_n);
+    IMGUI_API ImGuiID       TableGetColumnResizeID(const ImGuiTable* table, int column_n, int instance_no = 0);
+    IMGUI_API void          TableSetColumnAutofit(ImGuiTable* table, int column_n);
+    IMGUI_API void          PushTableBackground();
+    IMGUI_API void          PopTableBackground();
+    IMGUI_API void          TableRemove(ImGuiTable* table);
+    IMGUI_API void          TableGcCompactTransientBuffers(ImGuiTable* table);
+    IMGUI_API void          TableGcCompactSettings();
+
+    // Tables: Settings
+    IMGUI_API void                  TableLoadSettings(ImGuiTable* table);
+    IMGUI_API void                  TableSaveSettings(ImGuiTable* table);
+    IMGUI_API ImGuiTableSettings*   TableGetBoundSettings(ImGuiTable* table);
+    IMGUI_API void                  TableSettingsInstallHandler(ImGuiContext* context);
+    IMGUI_API ImGuiTableSettings*   TableSettingsCreate(ImGuiID id, int columns_count);
+    IMGUI_API ImGuiTableSettings*   TableSettingsFindByID(ImGuiID id);
+    IMGUI_API void                  TableSettingsClearByID(ImGuiID id);
+
     // Tab Bars
     IMGUI_API bool          BeginTabBarEx(ImGuiTabBar* tab_bar, const ImRect& bb, ImGuiTabBarFlags flags, ImGuiDockNode* dock_node);
     IMGUI_API ImGuiTabItem* TabBarFindTabByID(ImGuiTabBar* tab_bar, ImGuiID tab_id);
@@ -2325,6 +2629,7 @@ namespace ImGui
     template<typename T, typename SIGNED_T, typename FLOAT_T>   IMGUI_API bool  DragBehaviorT(ImGuiDataType data_type, T* v, float v_speed, T v_min, T v_max, const char* format, ImGuiSliderFlags flags);
     template<typename T, typename SIGNED_T, typename FLOAT_T>   IMGUI_API bool  SliderBehaviorT(const ImRect& bb, ImGuiID id, ImGuiDataType data_type, T* v, T v_min, T v_max, const char* format, ImGuiSliderFlags flags, ImRect* out_grab_bb);
     template<typename T, typename SIGNED_T>                     IMGUI_API T     RoundScalarWithFormatT(const char* format, ImGuiDataType data_type, T v);
+    template<typename T>                                        IMGUI_API bool  CheckboxFlagsT(const char* label, T* flags, T flags_value);
 
     // Data type helpers
     IMGUI_API const ImGuiDataTypeInfo*  DataTypeGetInfo(ImGuiDataType data_type);
@@ -2354,6 +2659,7 @@ namespace ImGui
     IMGUI_API void          ShadeVertsLinearUV(ImDrawList* draw_list, int vert_start_idx, int vert_end_idx, const ImVec2& a, const ImVec2& b, const ImVec2& uv_a, const ImVec2& uv_b, bool clamp);
 
     // Garbage collection
+    IMGUI_API void          GcCompactTransientMiscBuffers();
     IMGUI_API void          GcCompactTransientWindowBuffers(ImGuiWindow* window);
     IMGUI_API void          GcAwakeTransientWindowBuffers(ImGuiWindow* window);
 
@@ -2367,6 +2673,8 @@ namespace ImGui
     IMGUI_API void          DebugNodeDrawCmdShowMeshAndBoundingBox(ImDrawList* out_draw_list, const ImDrawList* draw_list, const ImDrawCmd* draw_cmd, bool show_mesh, bool show_aabb);
     IMGUI_API void          DebugNodeStorage(ImGuiStorage* storage, const char* label);
     IMGUI_API void          DebugNodeTabBar(ImGuiTabBar* tab_bar, const char* label);
+    IMGUI_API void          DebugNodeTable(ImGuiTable* table);
+    IMGUI_API void          DebugNodeTableSettings(ImGuiTableSettings* settings);
     IMGUI_API void          DebugNodeWindow(ImGuiWindow* window, const char* label);
     IMGUI_API void          DebugNodeWindowSettings(ImGuiWindowSettings* settings);
     IMGUI_API void          DebugNodeWindowsList(ImVector<ImGuiWindow*>* windows, const char* label);

libs/ImGui/include/imgui_memory_editor.h

@@ -47,6 +47,8 @@
 #include <stdio.h>      // sprintf, scanf
 #include <stdint.h>     // uint8_t, etc.
 
+#include "views/view.hpp"
+
 #ifdef _MSC_VER
 #define _PRISizeT   "I"
 #define ImSnprintf  _snprintf
@@ -60,6 +62,8 @@
 #pragma warning (disable: 4996) // warning C4996: 'sprintf': This function or variable may be unsafe.
 #endif
 
+ImU32 ImAlphaBlendColors(ImU32 col_a, ImU32 col_b);
+
 struct MemoryEditor
 {
     enum DataFormat
@@ -75,7 +79,6 @@ struct MemoryEditor
     bool            ReadOnly;                                   // = false  // disable any editing.
     int             Cols;                                       // = 16     // number of columns to display.
     bool            OptShowOptions;                             // = true   // display options button/context menu. when disabled, options will be locked unless you provide your own UI for them.
-    bool            OptShowDataPreview;                         // = false  // display a footer previewing the decimal/binary/hex/float representation of the currently selected bytes.
     bool            OptShowHexII;                               // = false  // display values in HexII representation instead of regular hexadecimal: hide null/zero bytes, ascii values as ".X".
     bool            OptShowAscii;                               // = true   // display ASCII representation on the right side.
     bool            OptGreyOutZeroes;                           // = true   // display null/zero bytes using the TextDisabled color.
@@ -91,6 +94,7 @@ struct MemoryEditor
     bool            ContentsWidthChanged;
     size_t          DataPreviewAddr;
     size_t          DataEditingAddr;
+    size_t          DataPreviewAddrEnd;
     bool            DataEditingTakeFocus;
     char            DataInputBuf[32];
     char            AddrInputBuf[32];
@@ -106,7 +110,6 @@ struct MemoryEditor
         ReadOnly = false;
         Cols = 16;
         OptShowOptions = true;
-        OptShowDataPreview = false;
         OptShowHexII = false;
         OptShowAscii = true;
         OptGreyOutZeroes = true;
@@ -120,7 +123,7 @@ struct MemoryEditor
 
         // State/Internals
         ContentsWidthChanged = false;
-        DataPreviewAddr = DataEditingAddr = (size_t)-1;
+        DataPreviewAddr = DataEditingAddr = DataPreviewAddrEnd = (size_t)-1;
         DataEditingTakeFocus = false;
         memset(DataInputBuf, 0, sizeof(DataInputBuf));
         memset(AddrInputBuf, 0, sizeof(AddrInputBuf));
@@ -186,8 +189,6 @@ struct MemoryEditor
 
         if (ImGui::Begin(title, &Open, ImGuiWindowFlags_NoScrollbar))
         {
-            if (ImGui::IsWindowHovered(ImGuiHoveredFlags_RootAndChildWindows) && ImGui::IsMouseReleased(ImGuiMouseButton_Right))
-                ImGui::OpenPopup("context");
             DrawContents(mem_data, mem_size, base_display_addr);
             if (ContentsWidthChanged)
             {
@@ -226,8 +227,18 @@ struct MemoryEditor
         float footer_height = 0;
         if (OptShowOptions)
             footer_height += height_separator + ImGui::GetFrameHeightWithSpacing() * 1;
-        if (OptShowDataPreview)
-            footer_height += height_separator + ImGui::GetFrameHeightWithSpacing() * 1 + ImGui::GetTextLineHeightWithSpacing() * 3;
+
+        ImGui::BeginChild("offset", ImVec2(0, s.LineHeight), false, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoNav);
+        ImGui::Text("% *c   ", s.AddrDigitsCount, ' ');
+        for (int i = 0; i < Cols; i++) {
+            float byte_pos_x = s.PosHexStart + s.HexCellWidth * i;
+            if (OptMidColsCount > 0)
+                byte_pos_x += (float)(i / OptMidColsCount) * s.SpacingBetweenMidCols;
+            ImGui::SameLine(byte_pos_x);
+            ImGui::Text("%02X", i);
+        }
+        ImGui::EndChild();
+
         ImGui::BeginChild("##scrolling", ImVec2(0, -footer_height), false, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoNav);
 
         ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
@@ -249,8 +260,8 @@ struct MemoryEditor
             DataEditingAddr = (size_t)-1;
         if (DataPreviewAddr >= mem_size)
             DataPreviewAddr = (size_t)-1;
-
-        size_t preview_data_type_size = OptShowDataPreview ? DataTypeGetSize(PreviewDataType) : 0;
+        if (DataPreviewAddrEnd >= mem_size)
+            DataPreviewAddrEnd = (size_t)-1;
 
         size_t data_editing_addr_backup = DataEditingAddr;
         size_t data_editing_addr_next = (size_t)-1;
@@ -300,19 +311,24 @@ struct MemoryEditor
                 // Draw highlight
                 bool is_highlight_from_user_range = (addr >= HighlightMin && addr < HighlightMax);
                 bool is_highlight_from_user_func = (HighlightFn && HighlightFn(mem_data, addr, false));
-                bool is_highlight_from_preview = (addr >= DataPreviewAddr && addr < DataPreviewAddr + preview_data_type_size);
+                bool is_highlight_from_preview = (addr >= DataPreviewAddr && addr <= DataPreviewAddrEnd) || (addr >= DataPreviewAddrEnd && addr <= DataPreviewAddr);
                 if (is_highlight_from_user_range || is_highlight_from_user_func || is_highlight_from_preview)
                 {
                     ImVec2 pos = ImGui::GetCursorScreenPos();
                     float highlight_width = s.GlyphWidth * 2;
                     bool is_next_byte_highlighted =  (addr + 1 < mem_size) && ((HighlightMax != (size_t)-1 && addr + 1 < HighlightMax) || (HighlightFn && HighlightFn(mem_data, addr + 1, true)));
-                    if (is_next_byte_highlighted || (n + 1 == Cols))
+                    if (is_next_byte_highlighted)
                     {
                         highlight_width = s.HexCellWidth;
                         if (OptMidColsCount > 0 && n > 0 && (n + 1) < Cols && ((n + 1) % OptMidColsCount) == 0)
                             highlight_width += s.SpacingBetweenMidCols;
                     }
-                    draw_list->AddRectFilled(pos, ImVec2(pos.x + highlight_width, pos.y + s.LineHeight), HighlightColor);
+
+                    ImU32 color = HighlightColor;
+                    if ((is_highlight_from_user_range + is_highlight_from_user_func + is_highlight_from_preview) > 1)
+                        color = (ImAlphaBlendColors(HighlightColor, 0x60C08080) & 0x00FFFFFF) | 0x90000000;
+
+                    draw_list->AddRectFilled(pos, ImVec2(pos.x + highlight_width, pos.y + s.LineHeight), color);
                 }
 
                 if (DataEditingAddr == addr)
@@ -397,10 +413,24 @@ struct MemoryEditor
                         else
                             ImGui::Text(format_byte_space, b);
                     }
-                    if (!ReadOnly && ImGui::IsItemHovered() && ImGui::IsMouseClicked(0))
+                    if (!ReadOnly && ImGui::IsItemHovered() && ImGui::IsMouseClicked(0) && !ImGui::GetIO().KeyShift)
                     {
-                        DataEditingTakeFocus = true;
-                        data_editing_addr_next = addr;
+                        if (ImGui::IsMouseDoubleClicked(0)) {
+                            DataEditingTakeFocus = true;
+                            data_editing_addr_next = addr;
+                        }
+
+                        DataPreviewAddr = addr;
+                        DataPreviewAddrEnd = addr;
+
+                        hex::View::postEvent(hex::Events::ByteSelected, &DataPreviewAddr);
+                    }
+                    if (!ReadOnly && ImGui::IsItemHovered() && ((ImGui::IsMouseClicked(0) && ImGui::GetIO().KeyShift) || ImGui::IsMouseDragging(0))) {
+                        DataPreviewAddrEnd = addr;
+
+                        size_t dataPreviewStart = std::min(DataPreviewAddr, DataPreviewAddrEnd);
+
+                        hex::View::postEvent(hex::Events::ByteSelected, &dataPreviewStart);
                     }
                 }
             }
@@ -411,13 +441,13 @@ struct MemoryEditor
                 ImGui::SameLine(s.PosAsciiStart);
                 ImVec2 pos = ImGui::GetCursorScreenPos();
                 addr = line_i * Cols;
-                ImGui::PushID(line_i);
-                if (ImGui::InvisibleButton("ascii", ImVec2(s.PosAsciiEnd - s.PosAsciiStart, s.LineHeight)))
-                {
-                    DataEditingAddr = DataPreviewAddr = addr + (size_t)((ImGui::GetIO().MousePos.x - pos.x) / s.GlyphWidth);
-                    DataEditingTakeFocus = true;
-                }
+
+                ImGui::PushID(-1);
+                ImGui::SameLine();
+                ImGui::Dummy(ImVec2(s.GlyphWidth, s.LineHeight));
+
                 ImGui::PopID();
+
                 for (int n = 0; n < Cols && addr < mem_size; n++, addr++)
                 {
                     if (addr == DataEditingAddr)
@@ -428,6 +458,42 @@ struct MemoryEditor
                     unsigned char c = ReadFn ? ReadFn(mem_data, addr) : mem_data[addr];
                     char display_c = (c < 32 || c >= 128) ? '.' : c;
                     draw_list->AddText(pos, (display_c == c) ? color_text : color_disabled, &display_c, &display_c + 1);
+
+                    // Draw highlight
+                    bool is_highlight_from_user_range = (addr >= HighlightMin && addr < HighlightMax);
+                    bool is_highlight_from_user_func = (HighlightFn && HighlightFn(mem_data, addr, false));
+                    bool is_highlight_from_preview = (addr >= DataPreviewAddr && addr <= DataPreviewAddrEnd) || (addr >= DataPreviewAddrEnd && addr <= DataPreviewAddr);
+                    if (is_highlight_from_user_range || is_highlight_from_user_func || is_highlight_from_preview)
+                    {
+                        ImU32 color = HighlightColor;
+                        if ((is_highlight_from_user_range + is_highlight_from_user_func + is_highlight_from_preview) > 1)
+                            color = (ImAlphaBlendColors(HighlightColor, 0x60C08080) & 0x00FFFFFF) | 0x90000000;
+
+                        draw_list->AddRectFilled(pos, ImVec2(pos.x + s.GlyphWidth, pos.y + s.LineHeight), color);
+                    }
+
+
+                    ImGui::PushID(line_i * Cols + n);
+                    ImGui::SameLine();
+                    ImGui::Dummy(ImVec2(s.GlyphWidth, s.LineHeight));
+
+                    ImGui::PopID();
+
+                    if (!ReadOnly && ImGui::IsItemHovered() && ImGui::IsMouseClicked(0) && !ImGui::GetIO().KeyShift)
+                    {
+                        if (ImGui::IsMouseDoubleClicked(0)) {
+                            DataEditingTakeFocus = true;
+                            data_editing_addr_next = addr;
+                        }
+
+                        DataPreviewAddr = addr;
+                        DataPreviewAddrEnd = addr;
+
+                    }
+                    if (!ReadOnly && ImGui::IsItemHovered() && ((ImGui::IsMouseClicked(0) && ImGui::GetIO().KeyShift) || ImGui::IsMouseDragging(0))) {
+                        DataPreviewAddrEnd = addr;
+                    }
+
                     pos.x += s.GlyphWidth;
                 }
             }
@@ -447,19 +513,12 @@ struct MemoryEditor
             DataEditingAddr = DataPreviewAddr = data_editing_addr_next;
         }
 
-        const bool lock_show_data_preview = OptShowDataPreview;
         if (OptShowOptions)
         {
             ImGui::Separator();
             DrawOptionsLine(s, mem_data, mem_size, base_display_addr);
         }
 
-        if (lock_show_data_preview)
-        {
-            ImGui::Separator();
-            DrawPreviewLine(s, mem_data, mem_size, base_display_addr);
-        }
-
         // Notify the main window of our ideal child content size (FIXME: we are missing an API to get the contents size from the child)
         ImGui::SetCursorPosX(s.WindowWidth);
     }
@@ -472,13 +531,12 @@ struct MemoryEditor
 
         // Options menu
         if (ImGui::Button("Options"))
-            ImGui::OpenPopup("context");
-        if (ImGui::BeginPopup("context"))
-        {
+            ImGui::OpenPopup("options");
+
+        if (ImGui::BeginPopup("options")) {
             ImGui::PushItemWidth(56);
             if (ImGui::DragInt("##cols", &Cols, 0.2f, 4, 32, "%d cols")) { ContentsWidthChanged = true; if (Cols < 1) Cols = 1; }
             ImGui::PopItemWidth();
-            ImGui::Checkbox("Show Data Preview", &OptShowDataPreview);
             ImGui::Checkbox("Show HexII", &OptShowHexII);
             if (ImGui::Checkbox("Show Ascii", &OptShowAscii)) { ContentsWidthChanged = true; }
             ImGui::Checkbox("Grey out zeroes", &OptGreyOutZeroes);
@@ -516,66 +574,7 @@ struct MemoryEditor
         }
     }
 
-    void DrawPreviewLine(const Sizes& s, void* mem_data_void, size_t mem_size, size_t base_display_addr)
-    {
-        IM_UNUSED(base_display_addr);
-        ImU8* mem_data = (ImU8*)mem_data_void;
-        ImGuiStyle& style = ImGui::GetStyle();
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text("Preview as:");
-        ImGui::SameLine();
-        ImGui::PushItemWidth((s.GlyphWidth * 10.0f) + style.FramePadding.x * 2.0f + style.ItemInnerSpacing.x);
-        if (ImGui::BeginCombo("##combo_type", DataTypeGetDesc(PreviewDataType), ImGuiComboFlags_HeightLargest))
-        {
-            for (int n = 0; n < ImGuiDataType_COUNT; n++)
-                if (ImGui::Selectable(DataTypeGetDesc((ImGuiDataType)n), PreviewDataType == n))
-                    PreviewDataType = (ImGuiDataType)n;
-            ImGui::EndCombo();
-        }
-        ImGui::PopItemWidth();
-        ImGui::SameLine();
-        ImGui::PushItemWidth((s.GlyphWidth * 6.0f) + style.FramePadding.x * 2.0f + style.ItemInnerSpacing.x);
-        ImGui::Combo("##combo_endianess", &PreviewEndianess, "LE\0BE\0\0");
-        ImGui::PopItemWidth();
-
-        char buf[128] = "";
-        float x = s.GlyphWidth * 6.0f;
-        bool has_value = DataPreviewAddr != (size_t)-1;
-        if (has_value)
-            DrawPreviewData(DataPreviewAddr, mem_data, mem_size, PreviewDataType, DataFormat_Dec, buf, (size_t)IM_ARRAYSIZE(buf));
-        ImGui::Text("Dec"); ImGui::SameLine(x); ImGui::TextUnformatted(has_value ? buf : "N/A");
-        if (has_value)
-            DrawPreviewData(DataPreviewAddr, mem_data, mem_size, PreviewDataType, DataFormat_Hex, buf, (size_t)IM_ARRAYSIZE(buf));
-        ImGui::Text("Hex"); ImGui::SameLine(x); ImGui::TextUnformatted(has_value ? buf : "N/A");
-        if (has_value)
-            DrawPreviewData(DataPreviewAddr, mem_data, mem_size, PreviewDataType, DataFormat_Bin, buf, (size_t)IM_ARRAYSIZE(buf));
-        buf[IM_ARRAYSIZE(buf) - 1] = 0;
-        ImGui::Text("Bin"); ImGui::SameLine(x); ImGui::TextUnformatted(has_value ? buf : "N/A");
-    }
-
-    // Utilities for Data Preview
-    const char* DataTypeGetDesc(ImGuiDataType data_type) const
-    {
-        const char* descs[] = { "Int8", "Uint8", "Int16", "Uint16", "Int32", "Uint32", "Int64", "Uint64", "Float", "Double" };
-        IM_ASSERT(data_type >= 0 && data_type < ImGuiDataType_COUNT);
-        return descs[data_type];
-    }
-
-    size_t DataTypeGetSize(ImGuiDataType data_type) const
-    {
-        const size_t sizes[] = { 1, 1, 2, 2, 4, 4, 8, 8, sizeof(float), sizeof(double) };
-        IM_ASSERT(data_type >= 0 && data_type < ImGuiDataType_COUNT);
-        return sizes[data_type];
-    }
-
-    const char* DataFormatGetDesc(DataFormat data_format) const
-    {
-        const char* descs[] = { "Bin", "Dec", "Hex" };
-        IM_ASSERT(data_format >= 0 && data_format < DataFormat_COUNT);
-        return descs[data_format];
-    }
-
-    bool IsBigEndian() const
+    static bool IsBigEndian()
     {
         uint16_t x = 1;
         char c[2];
@@ -622,132 +621,6 @@ struct MemoryEditor
             fp = IsBigEndian() ? EndianessCopyBigEndian : EndianessCopyLittleEndian;
         return fp(dst, src, size, PreviewEndianess);
     }
-
-    const char* FormatBinary(const uint8_t* buf, int width) const
-    {
-        IM_ASSERT(width <= 64);
-        size_t out_n = 0;
-        static char out_buf[64 + 8 + 1];
-        int n = width / 8;
-        for (int j = n - 1; j >= 0; --j)
-        {
-            for (int i = 0; i < 8; ++i)
-                out_buf[out_n++] = (buf[j] & (1 << (7 - i))) ? '1' : '0';
-            out_buf[out_n++] = ' ';
-        }
-        IM_ASSERT(out_n < IM_ARRAYSIZE(out_buf));
-        out_buf[out_n] = 0;
-        return out_buf;
-    }
-
-    // [Internal]
-    void DrawPreviewData(size_t addr, const ImU8* mem_data, size_t mem_size, ImGuiDataType data_type, DataFormat data_format, char* out_buf, size_t out_buf_size) const
-    {
-        uint8_t buf[8];
-        size_t elem_size = DataTypeGetSize(data_type);
-        size_t size = addr + elem_size > mem_size ? mem_size - addr : elem_size;
-        if (ReadFn)
-            for (int i = 0, n = (int)size; i < n; ++i)
-                buf[i] = ReadFn(mem_data, addr + i);
-        else
-            memcpy(buf, mem_data + addr, size);
-
-        if (data_format == DataFormat_Bin)
-        {
-            uint8_t binbuf[8];
-            EndianessCopy(binbuf, buf, size);
-            ImSnprintf(out_buf, out_buf_size, "%s", FormatBinary(binbuf, (int)size * 8));
-            return;
-        }
-
-        out_buf[0] = 0;
-        switch (data_type)
-        {
-            case ImGuiDataType_S8:
-            {
-                int8_t int8 = 0;
-                EndianessCopy(&int8, buf, size);
-                if (data_format == DataFormat_Dec) { ImSnprintf(out_buf, out_buf_size, "%hhd", int8); return; }
-                if (data_format == DataFormat_Hex) { ImSnprintf(out_buf, out_buf_size, "0x%02x", int8 & 0xFF); return; }
-                break;
-            }
-            case ImGuiDataType_U8:
-            {
-                uint8_t uint8 = 0;
-                EndianessCopy(&uint8, buf, size);
-                if (data_format == DataFormat_Dec) { ImSnprintf(out_buf, out_buf_size, "%hhu", uint8); return; }
-                if (data_format == DataFormat_Hex) { ImSnprintf(out_buf, out_buf_size, "0x%02x", uint8 & 0XFF); return; }
-                break;
-            }
-            case ImGuiDataType_S16:
-            {
-                int16_t int16 = 0;
-                EndianessCopy(&int16, buf, size);
-                if (data_format == DataFormat_Dec) { ImSnprintf(out_buf, out_buf_size, "%hd", int16); return; }
-                if (data_format == DataFormat_Hex) { ImSnprintf(out_buf, out_buf_size, "0x%04x", int16 & 0xFFFF); return; }
-                break;
-            }
-            case ImGuiDataType_U16:
-            {
-                uint16_t uint16 = 0;
-                EndianessCopy(&uint16, buf, size);
-                if (data_format == DataFormat_Dec) { ImSnprintf(out_buf, out_buf_size, "%hu", uint16); return; }
-                if (data_format == DataFormat_Hex) { ImSnprintf(out_buf, out_buf_size, "0x%04x", uint16 & 0xFFFF); return; }
-                break;
-            }
-            case ImGuiDataType_S32:
-            {
-                int32_t int32 = 0;
-                EndianessCopy(&int32, buf, size);
-                if (data_format == DataFormat_Dec) { ImSnprintf(out_buf, out_buf_size, "%d", int32); return; }
-                if (data_format == DataFormat_Hex) { ImSnprintf(out_buf, out_buf_size, "0x%08x", int32); return; }
-                break;
-            }
-            case ImGuiDataType_U32:
-            {
-                uint32_t uint32 = 0;
-                EndianessCopy(&uint32, buf, size);
-                if (data_format == DataFormat_Dec) { ImSnprintf(out_buf, out_buf_size, "%u", uint32); return; }
-                if (data_format == DataFormat_Hex) { ImSnprintf(out_buf, out_buf_size, "0x%08x", uint32); return; }
-                break;
-            }
-            case ImGuiDataType_S64:
-            {
-                int64_t int64 = 0;
-                EndianessCopy(&int64, buf, size);
-                if (data_format == DataFormat_Dec) { ImSnprintf(out_buf, out_buf_size, "%lld", (long long)int64); return; }
-                if (data_format == DataFormat_Hex) { ImSnprintf(out_buf, out_buf_size, "0x%016llx", (long long)int64); return; }
-                break;
-            }
-            case ImGuiDataType_U64:
-            {
-                uint64_t uint64 = 0;
-                EndianessCopy(&uint64, buf, size);
-                if (data_format == DataFormat_Dec) { ImSnprintf(out_buf, out_buf_size, "%llu", (long long)uint64); return; }
-                if (data_format == DataFormat_Hex) { ImSnprintf(out_buf, out_buf_size, "0x%016llx", (long long)uint64); return; }
-                break;
-            }
-            case ImGuiDataType_Float:
-            {
-                float float32 = 0.0f;
-                EndianessCopy(&float32, buf, size);
-                if (data_format == DataFormat_Dec) { ImSnprintf(out_buf, out_buf_size, "%f", float32); return; }
-                if (data_format == DataFormat_Hex) { ImSnprintf(out_buf, out_buf_size, "%a", float32); return; }
-                break;
-            }
-            case ImGuiDataType_Double:
-            {
-                double float64 = 0.0;
-                EndianessCopy(&float64, buf, size);
-                if (data_format == DataFormat_Dec) { ImSnprintf(out_buf, out_buf_size, "%f", float64); return; }
-                if (data_format == DataFormat_Hex) { ImSnprintf(out_buf, out_buf_size, "%a", float64); return; }
-                break;
-            }
-            case ImGuiDataType_COUNT:
-                break;
-        } // Switch
-        IM_ASSERT(0); // Shouldn't reach
-    }
 };
 
 #undef _PRISizeT

libs/ImGui/source/imgui_draw.cpp

@@ -60,12 +60,16 @@ Index of this file:
 #if __has_warning("-Wunknown-warning-option")
 #pragma clang diagnostic ignored "-Wunknown-warning-option"         // warning: unknown warning group 'xxx'                      // not all warnings are known by all Clang versions and they tend to be rename-happy.. so ignoring warnings triggers new warnings on some configuration. Great!
 #endif
+#if __has_warning("-Walloca")
+#pragma clang diagnostic ignored "-Walloca"                         // warning: use of function '__builtin_alloca' is discouraged
+#endif
 #pragma clang diagnostic ignored "-Wunknown-pragmas"                // warning: unknown warning group 'xxx'
 #pragma clang diagnostic ignored "-Wold-style-cast"                 // warning: use of old-style cast                            // yes, they are more terse.
 #pragma clang diagnostic ignored "-Wfloat-equal"                    // warning: comparing floating point with == or != is unsafe // storing and comparing against same constants ok.
 #pragma clang diagnostic ignored "-Wglobal-constructors"            // warning: declaration requires a global destructor         // similar to above, not sure what the exact difference is.
 #pragma clang diagnostic ignored "-Wsign-conversion"                // warning: implicit conversion changes signedness
 #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"  // warning: zero as null pointer constant                    // some standard header variations use #define NULL 0
+#pragma clang diagnostic ignored "-Walloca"                         // warning: use of function '__builtin_alloca' is discouraged
 #pragma clang diagnostic ignored "-Wcomma"                          // warning: possible misuse of comma operator here
 #pragma clang diagnostic ignored "-Wreserved-id-macro"              // warning: macro name is a reserved identifier
 #pragma clang diagnostic ignored "-Wdouble-promotion"               // warning: implicit conversion from 'float' to 'double' when passing argument to function  // using printf() is a misery with this as C++ va_arg ellipsis changes float to double.
@@ -221,6 +225,11 @@ void ImGui::StyleColorsDark(ImGuiStyle* dst)
     colors[ImGuiCol_PlotLinesHovered]       = ImVec4(1.00f, 0.43f, 0.35f, 1.00f);
     colors[ImGuiCol_PlotHistogram]          = ImVec4(0.90f, 0.70f, 0.00f, 1.00f);
     colors[ImGuiCol_PlotHistogramHovered]   = ImVec4(1.00f, 0.60f, 0.00f, 1.00f);
+    colors[ImGuiCol_TableHeaderBg]          = ImVec4(0.19f, 0.19f, 0.20f, 1.00f);
+    colors[ImGuiCol_TableBorderStrong]      = ImVec4(0.31f, 0.31f, 0.35f, 1.00f);   // Prefer using Alpha=1.0 here
+    colors[ImGuiCol_TableBorderLight]       = ImVec4(0.23f, 0.23f, 0.25f, 1.00f);   // Prefer using Alpha=1.0 here
+    colors[ImGuiCol_TableRowBg]             = ImVec4(0.00f, 0.00f, 0.00f, 0.00f);
+    colors[ImGuiCol_TableRowBgAlt]          = ImVec4(1.00f, 1.00f, 1.00f, 0.07f);
     colors[ImGuiCol_TextSelectedBg]         = ImVec4(0.26f, 0.59f, 0.98f, 0.35f);
     colors[ImGuiCol_DragDropTarget]         = ImVec4(1.00f, 1.00f, 0.00f, 0.90f);
     colors[ImGuiCol_NavHighlight]           = ImVec4(0.26f, 0.59f, 0.98f, 1.00f);
@@ -278,6 +287,11 @@ void ImGui::StyleColorsClassic(ImGuiStyle* dst)
     colors[ImGuiCol_PlotLinesHovered]       = ImVec4(0.90f, 0.70f, 0.00f, 1.00f);
     colors[ImGuiCol_PlotHistogram]          = ImVec4(0.90f, 0.70f, 0.00f, 1.00f);
     colors[ImGuiCol_PlotHistogramHovered]   = ImVec4(1.00f, 0.60f, 0.00f, 1.00f);
+    colors[ImGuiCol_TableHeaderBg]          = ImVec4(0.27f, 0.27f, 0.38f, 1.00f);
+    colors[ImGuiCol_TableBorderStrong]      = ImVec4(0.31f, 0.31f, 0.45f, 1.00f);   // Prefer using Alpha=1.0 here
+    colors[ImGuiCol_TableBorderLight]       = ImVec4(0.26f, 0.26f, 0.28f, 1.00f);   // Prefer using Alpha=1.0 here
+    colors[ImGuiCol_TableRowBg]             = ImVec4(0.00f, 0.00f, 0.00f, 0.00f);
+    colors[ImGuiCol_TableRowBgAlt]          = ImVec4(1.00f, 1.00f, 1.00f, 0.07f);
     colors[ImGuiCol_TextSelectedBg]         = ImVec4(0.00f, 0.00f, 1.00f, 0.35f);
     colors[ImGuiCol_DragDropTarget]         = ImVec4(1.00f, 1.00f, 0.00f, 0.90f);
     colors[ImGuiCol_NavHighlight]           = colors[ImGuiCol_HeaderHovered];
@@ -336,6 +350,11 @@ void ImGui::StyleColorsLight(ImGuiStyle* dst)
     colors[ImGuiCol_PlotLinesHovered]       = ImVec4(1.00f, 0.43f, 0.35f, 1.00f);
     colors[ImGuiCol_PlotHistogram]          = ImVec4(0.90f, 0.70f, 0.00f, 1.00f);
     colors[ImGuiCol_PlotHistogramHovered]   = ImVec4(1.00f, 0.45f, 0.00f, 1.00f);
+    colors[ImGuiCol_TableHeaderBg]          = ImVec4(0.78f, 0.87f, 0.98f, 1.00f);
+    colors[ImGuiCol_TableBorderStrong]      = ImVec4(0.57f, 0.57f, 0.64f, 1.00f);   // Prefer using Alpha=1.0 here
+    colors[ImGuiCol_TableBorderLight]       = ImVec4(0.68f, 0.68f, 0.74f, 1.00f);   // Prefer using Alpha=1.0 here
+    colors[ImGuiCol_TableRowBg]             = ImVec4(0.00f, 0.00f, 0.00f, 0.00f);
+    colors[ImGuiCol_TableRowBgAlt]          = ImVec4(0.30f, 0.30f, 0.30f, 0.07f);
     colors[ImGuiCol_TextSelectedBg]         = ImVec4(0.26f, 0.59f, 0.98f, 0.35f);
     colors[ImGuiCol_DragDropTarget]         = ImVec4(0.26f, 0.59f, 0.98f, 0.95f);
     colors[ImGuiCol_NavHighlight]           = colors[ImGuiCol_HeaderHovered];
@@ -350,21 +369,12 @@ void ImGui::StyleColorsLight(ImGuiStyle* dst)
 
 ImDrawListSharedData::ImDrawListSharedData()
 {
-    Font = NULL;
-    FontSize = 0.0f;
-    CurveTessellationTol = 0.0f;
-    CircleSegmentMaxError = 0.0f;
-    ClipRectFullscreen = ImVec4(-8192.0f, -8192.0f, +8192.0f, +8192.0f);
-    InitialFlags = ImDrawListFlags_None;
-
-    // Lookup tables
+    memset(this, 0, sizeof(*this));
     for (int i = 0; i < IM_ARRAYSIZE(ArcFastVtx); i++)
     {
         const float a = ((float)i * 2 * IM_PI) / (float)IM_ARRAYSIZE(ArcFastVtx);
         ArcFastVtx[i] = ImVec2(ImCos(a), ImSin(a));
     }
-    memset(CircleSegmentCounts, 0, sizeof(CircleSegmentCounts)); // This will be set by SetCircleSegmentMaxError()
-    TexUvLines = NULL;
 }
 
 void ImDrawListSharedData::SetCircleSegmentMaxError(float max_error)
@@ -1432,10 +1442,14 @@ void ImDrawListSplitter::ClearFreeMemory()
 
 void ImDrawListSplitter::Split(ImDrawList* draw_list, int channels_count)
 {
+    IM_UNUSED(draw_list);
     IM_ASSERT(_Current == 0 && _Count <= 1 && "Nested channel splitting is not supported. Please use separate instances of ImDrawListSplitter.");
     int old_channels_count = _Channels.Size;
     if (old_channels_count < channels_count)
+    {
+        _Channels.reserve(channels_count); // Avoid over reserving since this is likely to stay stable
         _Channels.resize(channels_count);
+    }
     _Count = channels_count;
 
     // Channels[] (24/32 bytes each) hold storage that we'll swap with draw_list->_CmdBuffer/_IdxBuffer
@@ -1453,12 +1467,6 @@ void ImDrawListSplitter::Split(ImDrawList* draw_list, int channels_count)
             _Channels[i]._CmdBuffer.resize(0);
             _Channels[i]._IdxBuffer.resize(0);
         }
-        if (_Channels[i]._CmdBuffer.Size == 0)
-        {
-            ImDrawCmd draw_cmd;
-            ImDrawCmd_HeaderCopy(&draw_cmd, &draw_list->_CmdHeader); // Copy ClipRect, TextureId, VtxOffset
-            _Channels[i]._CmdBuffer.push_back(draw_cmd);
-        }
     }
 }
 
@@ -1548,8 +1556,10 @@ void ImDrawListSplitter::SetCurrentChannel(ImDrawList* draw_list, int idx)
     draw_list->_IdxWritePtr = draw_list->IdxBuffer.Data + draw_list->IdxBuffer.Size;
 
     // If current command is used with different settings we need to add a new command
-    ImDrawCmd* curr_cmd = &draw_list->CmdBuffer.Data[draw_list->CmdBuffer.Size - 1];
-    if (curr_cmd->ElemCount == 0)
+    ImDrawCmd* curr_cmd = (draw_list->CmdBuffer.Size == 0) ? NULL : &draw_list->CmdBuffer.Data[draw_list->CmdBuffer.Size - 1];
+    if (curr_cmd == NULL)
+        draw_list->AddDrawCmd();
+    else if (curr_cmd->ElemCount == 0)
         ImDrawCmd_HeaderCopy(curr_cmd, &draw_list->_CmdHeader); // Copy ClipRect, TextureId, VtxOffset
     else if (ImDrawCmd_HeaderCompare(curr_cmd, &draw_list->_CmdHeader) != 0)
         draw_list->AddDrawCmd();

magic_dbs/nintendo_magic

@@ -0,0 +1,18 @@
+# A libmagic database containing definitions for files used by Nintendo consoles
+
+# Nintendo Switch NRO file
+0x10    string      NRO0                Nintendo Switch NRO file
+>0x08   string      HOMEBREW            (Homebrew)
+>0x18   long        x                   (Size %d)
+
+# Nintendo Switch NSO file
+0x00    string      NSO0                Nintendo Switch NSO file
+>0x04   long        x                   Version %d
+>0x0C   long        x                   Flags %08x
+
+# Nintendo Switch NCA file
+0x200   string      NCA                 Nintendo Switch NCA file
+>0x203  byte        x                   Version %c
+>0x204  byte        0                   System NCA
+>0x204  byte        1                   Gamecard NCA
+>0x210  quad        x                   ProgramId %016llx

res.rc

@@ -1 +0,0 @@
-id ICON "icon.ico"

resource.rc

@@ -0,0 +1 @@
+GLFW_ICON ICON icon.ico

source/lang/evaluator.cpp

@@ -0,0 +1,347 @@
+#include "lang/evaluator.hpp"
+
+#include <bit>
+#include <unordered_map>
+
+namespace hex::lang {
+
+    Evaluator::Evaluator() {
+
+    }
+
+    std::pair<PatternData*, size_t> Evaluator::createStructPattern(ASTNodeVariableDecl *varDeclNode, u64 offset) {
+        std::vector<PatternData*> members;
+
+        auto structNode = static_cast<ASTNodeStruct*>(this->m_types[varDeclNode->getCustomVariableTypeName()]);
+
+        if (structNode == nullptr)
+            return { nullptr, 0 };
+
+        size_t structSize = 0;
+        for (const auto &node : structNode->getNodes()) {
+            const auto &member = static_cast<ASTNodeVariableDecl*>(node);
+
+            const auto typeDeclNode = static_cast<ASTNodeTypeDecl*>(this->m_types[member->getCustomVariableTypeName()]);
+
+            if (member->getVariableType() == Token::TypeToken::Type::Signed8Bit && member->getArraySize() > 1) {
+                const auto &[pattern, size] = this->createStringPattern(member, offset + structSize);
+
+                if (pattern == nullptr)
+                    return { nullptr, 0 };
+
+                members.push_back(pattern);
+                structSize += size;
+            } else if (member->getVariableType() == Token::TypeToken::Type::CustomType
+                && typeDeclNode != nullptr && typeDeclNode->getAssignedType() == Token::TypeToken::Type::Signed8Bit
+                && member->getArraySize() > 1) {
+
+                const auto &[pattern, size] = this->createStringPattern(member, offset + structSize);
+
+                if (pattern == nullptr)
+                    return { nullptr, 0 };
+
+                members.push_back(pattern);
+                structSize += size;
+            }
+            else if (member->getArraySize() > 1) {
+                const auto &[pattern, size] = this->createArrayPattern(member, offset + structSize);
+
+                if (pattern == nullptr)
+                    return { nullptr, 0 };
+
+                members.push_back(pattern);
+                structSize += size;
+            }
+            else if (member->getVariableType() != Token::TypeToken::Type::CustomType) {
+                const auto &[pattern, size] = this->createBuiltInTypePattern(member, offset + structSize);
+
+                if (pattern == nullptr)
+                    return { nullptr, 0 };
+
+                members.push_back(pattern);
+                structSize += size;
+            }
+            else {
+                const auto &[pattern, size] = this->createCustomTypePattern(member, offset + structSize);
+
+                if (pattern == nullptr)
+                    return { nullptr, 0 };
+
+                members.push_back(pattern);
+                structSize += size;
+            }
+        }
+
+        return { new PatternDataStruct(offset, structSize, varDeclNode->getVariableName(), structNode->getName(), members, 0x00FFFFFF), structSize };
+    }
+
+    std::pair<PatternData*, size_t> Evaluator::createUnionPattern(ASTNodeVariableDecl *varDeclNode, u64 offset) {
+        std::vector<PatternData*> members;
+
+        auto unionNode = static_cast<ASTNodeUnion*>(this->m_types[varDeclNode->getCustomVariableTypeName()]);
+
+        if (unionNode == nullptr)
+            return { nullptr, 0 };
+
+        size_t unionSize = 0;
+        for (const auto &node : unionNode->getNodes()) {
+            const auto &member = static_cast<ASTNodeVariableDecl*>(node);
+
+            const auto typeDeclNode = static_cast<ASTNodeTypeDecl*>(this->m_types[member->getCustomVariableTypeName()]);
+
+            if (member->getVariableType() == Token::TypeToken::Type::Signed8Bit && member->getArraySize() > 1) {
+                const auto &[pattern, size] = this->createStringPattern(member, offset);
+
+                if (pattern == nullptr)
+                    return { nullptr, 0 };
+
+                members.push_back(pattern);
+                unionSize = std::max(size, unionSize);
+            } else if (member->getVariableType() == Token::TypeToken::Type::CustomType
+                       && typeDeclNode != nullptr && typeDeclNode->getAssignedType() == Token::TypeToken::Type::Signed8Bit
+                       && member->getArraySize() > 1) {
+
+                const auto &[pattern, size] = this->createStringPattern(member, offset);
+
+                if (pattern == nullptr)
+                    return { nullptr, 0 };
+
+                members.push_back(pattern);
+                unionSize = std::max(size, unionSize);
+            }
+            else if (member->getArraySize() > 1) {
+                const auto &[pattern, size] = this->createArrayPattern(member, offset);
+
+                if (pattern == nullptr)
+                    return { nullptr, 0 };
+
+                members.push_back(pattern);
+                unionSize = std::max(size, unionSize);
+            }
+            else if (member->getVariableType() != Token::TypeToken::Type::CustomType) {
+                const auto &[pattern, size] = this->createBuiltInTypePattern(member, offset);
+
+                if (pattern == nullptr)
+                    return { nullptr, 0 };
+
+                members.push_back(pattern);
+                unionSize = std::max(size, unionSize);
+            }
+            else {
+                const auto &[pattern, size] = this->createCustomTypePattern(member, offset);
+
+                if (pattern == nullptr)
+                    return { nullptr, 0 };
+
+                members.push_back(pattern);
+                unionSize = std::max(size, unionSize);
+            }
+        }
+
+        return { new PatternDataUnion(offset, unionSize, varDeclNode->getVariableName(), unionNode->getName(), members, 0x00FFFFFF), unionSize };
+    }
+
+    std::pair<PatternData*, size_t> Evaluator::createEnumPattern(ASTNodeVariableDecl *varDeclNode, u64 offset) {
+        std::vector<std::pair<u64, std::string>> enumValues;
+
+        auto *enumType = static_cast<ASTNodeEnum*>(this->m_types[varDeclNode->getCustomVariableTypeName()]);
+
+        if (enumType == nullptr)
+            return { nullptr, 0 };
+
+        size_t size = getTypeSize(enumType->getUnderlyingType());
+
+        return { new PatternDataEnum(offset, size, varDeclNode->getVariableName(), enumType->getName(), enumType->getValues()), size };
+    }
+
+    std::pair<PatternData*, size_t> Evaluator::createBitfieldPattern(ASTNodeVariableDecl *varDeclNode, u64 offset) {
+
+        auto *bitfieldType = static_cast<ASTNodeBitField*>(this->m_types[varDeclNode->getCustomVariableTypeName()]);
+
+        if (bitfieldType == nullptr)
+            return { nullptr, 0 };
+
+        size_t size = 0;
+        for (auto &[fieldName, fieldSize] : bitfieldType->getFields())
+            size += fieldSize;
+
+        size = std::bit_ceil(size) / 8;
+
+        return { new PatternDataBitfield(offset, size, varDeclNode->getVariableName(), bitfieldType->getName(), bitfieldType->getFields()), size };
+    }
+
+    std::pair<PatternData*, size_t> Evaluator::createArrayPattern(ASTNodeVariableDecl *varDeclNode, u64 offset) {
+        std::vector<PatternData*> entries;
+
+        size_t arrayOffset = 0;
+        for (u32 i = 0; i < varDeclNode->getArraySize(); i++) {
+            ASTNodeVariableDecl *nonArrayVarDeclNode = new ASTNodeVariableDecl(varDeclNode->getVariableType(), "[" + std::to_string(i) + "]", varDeclNode->getCustomVariableTypeName(), varDeclNode->getOffset(), 1);
+
+            if (varDeclNode->getVariableType() == Token::TypeToken::Type::Padding) {
+                return { new PatternDataPadding(offset, varDeclNode->getArraySize()), varDeclNode->getArraySize() };
+            } else if (varDeclNode->getVariableType() != Token::TypeToken::Type::CustomType) {
+                const auto &[pattern, size] = this->createBuiltInTypePattern(nonArrayVarDeclNode, offset + arrayOffset);
+
+                if (pattern == nullptr)
+                    return { nullptr, 0 };
+
+                entries.push_back(pattern);
+                arrayOffset += size;
+            } else {
+                const auto &[pattern, size] = this->createCustomTypePattern(nonArrayVarDeclNode, offset + arrayOffset);
+
+                if (pattern == nullptr)
+                    return { nullptr, 0 };
+
+                entries.push_back(pattern);
+                arrayOffset += size;
+            }
+
+            delete nonArrayVarDeclNode;
+        }
+
+        return { new PatternDataArray(offset, arrayOffset, varDeclNode->getVariableName(), entries, 0x00FFFFFF), arrayOffset };
+    }
+
+    std::pair<PatternData*, size_t> Evaluator::createStringPattern(ASTNodeVariableDecl *varDeclNode, u64 offset) {
+        size_t arraySize = varDeclNode->getArraySize();
+
+        return { new PatternDataString(offset, arraySize, varDeclNode->getVariableName()), arraySize };
+    }
+
+    std::pair<PatternData*, size_t> Evaluator::createCustomTypePattern(ASTNodeVariableDecl *varDeclNode, u64 offset) {
+        auto &currType = this->m_types[varDeclNode->getCustomVariableTypeName()];
+
+        if (currType == nullptr)
+            return { nullptr, 0 };
+
+        switch (currType->getType()) {
+            case ASTNode::Type::Struct:
+                return this->createStructPattern(varDeclNode, offset);
+            case ASTNode::Type::Union:
+                return this->createUnionPattern(varDeclNode, offset);
+            case ASTNode::Type::Enum:
+                return this->createEnumPattern(varDeclNode, offset);
+            case ASTNode::Type::Bitfield:
+                return this->createBitfieldPattern(varDeclNode, offset);
+            case ASTNode::Type::TypeDecl:
+                return this->createBuiltInTypePattern(varDeclNode, offset);
+        }
+
+        return { nullptr, 0 };
+    }
+
+    std::pair<PatternData*, size_t> Evaluator::createBuiltInTypePattern(ASTNodeVariableDecl *varDeclNode, u64 offset) {
+        auto type = varDeclNode->getVariableType();
+        if (type == Token::TypeToken::Type::CustomType) {
+            const auto &currType =  static_cast<ASTNodeTypeDecl*>(this->m_types[varDeclNode->getCustomVariableTypeName()]);
+            if (currType == nullptr)
+                return { nullptr, 0 };
+
+            type = currType->getAssignedType();
+        }
+
+        size_t typeSize = getTypeSize(type);
+        size_t arraySize = varDeclNode->getArraySize();
+
+         if (isSigned(type)) {
+            if (typeSize == 1 && arraySize == 1)
+                return { new PatternDataCharacter(offset, typeSize, varDeclNode->getVariableName()), 1 };
+            else if (arraySize > 1)
+                return createArrayPattern(varDeclNode, offset);
+            else
+                return { new PatternDataSigned(offset, typeSize, varDeclNode->getVariableName()), typeSize * arraySize };
+        } else if (isUnsigned(varDeclNode->getVariableType())) {
+            if (arraySize > 1)
+                return createArrayPattern(varDeclNode, offset);
+            else
+                return { new PatternDataUnsigned(offset, typeSize, varDeclNode->getVariableName()), typeSize * arraySize };
+        } else if (isFloatingPoint(varDeclNode->getVariableType())) {
+            if (arraySize > 1)
+                return createArrayPattern(varDeclNode, offset);
+            else
+                return { new PatternDataFloat(offset, typeSize, varDeclNode->getVariableName()), typeSize * arraySize };
+        }
+
+        return { nullptr, 0 };
+    }
+
+    std::pair<Result, std::vector<PatternData*>> Evaluator::evaluate(const std::vector<ASTNode *> &ast) {
+
+        // Evaluate types
+        for (const auto &node : ast) {
+
+            switch(node->getType()) {
+                case ASTNode::Type::Struct:
+                {
+                    auto *structNode = static_cast<ASTNodeStruct*>(node);
+                    this->m_types.emplace(structNode->getName(), structNode);
+                }
+                    break;
+                case ASTNode::Type::Union:
+                {
+                    auto *unionNode = static_cast<ASTNodeUnion*>(node);
+                    this->m_types.emplace(unionNode->getName(), unionNode);
+                }
+                    break;
+                case ASTNode::Type::Enum:
+                {
+                    auto *enumNode = static_cast<ASTNodeEnum*>(node);
+                    this->m_types.emplace(enumNode->getName(), enumNode);
+                }
+                    break;
+                case ASTNode::Type::Bitfield:
+                {
+                    auto *bitfieldNode = static_cast<ASTNodeBitField*>(node);
+                    this->m_types.emplace(bitfieldNode->getName(), bitfieldNode);
+                }
+                    break;
+                case ASTNode::Type::TypeDecl:
+                {
+                    auto *typeDeclNode = static_cast<ASTNodeTypeDecl*>(node);
+
+                    if (typeDeclNode->getAssignedType() == Token::TypeToken::Type::CustomType)
+                        this->m_types.emplace(typeDeclNode->getTypeName(), this->m_types[typeDeclNode->getAssignedCustomTypeName()]);
+                    else
+                        this->m_types.emplace(typeDeclNode->getTypeName(), typeDeclNode);
+                }
+                    break;
+                case ASTNode::Type::VariableDecl: break;
+                case ASTNode::Type::Scope: break;
+            }
+        }
+
+        // Evaluate variable declarations
+
+        std::vector<PatternData*> variables;
+        for (const auto &node : ast) {
+            if (node->getType() != ASTNode::Type::VariableDecl)
+                continue;
+
+            auto *varDeclNode = static_cast<ASTNodeVariableDecl*>(node);
+
+            if (varDeclNode->getVariableType() == Token::TypeToken::Type::Signed8Bit && varDeclNode->getArraySize() > 1) {
+                const auto &[pattern, _] = createStringPattern(varDeclNode, varDeclNode->getOffset().value());
+                variables.push_back(pattern);
+            }
+            else if (varDeclNode->getArraySize() > 1) {
+                const auto &[pattern, _] = this->createArrayPattern(varDeclNode, varDeclNode->getOffset().value());
+                variables.push_back(pattern);
+
+            } else if (varDeclNode->getVariableType() != Token::TypeToken::Type::CustomType) {
+                const auto &[pattern, _] = this->createBuiltInTypePattern(varDeclNode, varDeclNode->getOffset().value());
+                variables.push_back(pattern);
+            } else {
+                const auto &[pattern, _] = this->createCustomTypePattern(varDeclNode, varDeclNode->getOffset().value());
+                variables.push_back(pattern);
+            }
+        }
+
+        for (const auto &var : variables)
+            if (var == nullptr)
+                return { ResultEvaluatorError, { } };
+
+        return { ResultSuccess, variables };
+    }
+
+}

source/lang/lexer.cpp

@@ -0,0 +1,199 @@
+#include "lang/lexer.hpp"
+
+#include <vector>
+#include <functional>
+
+namespace hex::lang {
+
+    Lexer::Lexer() { }
+
+    std::string matchTillInvalid(const char* characters, std::function<bool(char)> predicate) {
+        std::string ret;
+
+        while (*characters != 0x00) {
+            ret += *characters;
+            characters++;
+
+            if (!predicate(*characters))
+                break;
+        }
+
+        return ret;
+    }
+
+    std::optional<u64> parseInt(std::string_view string) {
+        u64 integer = 0;
+        u8 base;
+
+        std::string_view numberData;
+
+        if (string.starts_with("0x")) {
+            numberData = string.substr(2);
+            base = 16;
+
+            if (numberData.find_first_not_of("0123456789ABCDEFabcdef") != std::string_view::npos)
+                return { };
+        } else if (string.starts_with("0b")) {
+            numberData = string.substr(2);
+            base = 2;
+
+            if (numberData.find_first_not_of("01") != std::string_view::npos)
+                return { };
+        } else if (isdigit(string[0])) {
+            numberData = string;
+            base = 10;
+
+            if (numberData.find_first_not_of("0123456789") != std::string_view::npos)
+                return { };
+        } else return { };
+
+        if (numberData.length() == 0)
+            return { };
+
+        for (const char& c : numberData) {
+                integer *= base;
+
+            if (isdigit(c))
+                integer += (c - '0');
+            else if (c >= 'A' && c <= 'F')
+                integer += 10 + (c - 'A');
+            else if (c >= 'a' && c <= 'f')
+                integer += 10 + (c - 'a');
+            else return { };
+        }
+
+        return integer;
+    }
+
+    std::pair<Result, std::vector<Token>> Lexer::lex(const std::string& code) {
+        std::vector<Token> tokens;
+        u32 offset = 0;
+
+        while (offset < code.length()) {
+
+            // Handle comments
+            if (code[offset] == '/') {
+                offset++;
+
+                if (offset < code.length() && code[offset] == '/') {
+                    offset++;
+                    while (offset < code.length()) {
+                        if (code[offset] == '\n' || code[offset] == '\r')
+                            break;
+                        offset++;
+                    }
+                } else if (offset < code.length() && code[offset] == '*') {
+                    offset++;
+                    while (offset < (code.length() - 1)) {
+                        if (code[offset] == '*' && code[offset + 1] == '/')
+                            break;
+                        offset++;
+                    }
+
+                    offset += 2;
+                } else offset--;
+            }
+
+            const char& c = code[offset];
+
+            if (c == 0x00)
+                break;
+
+            if (std::isblank(c) || std::isspace(c)) {
+                offset += 1;
+            } else if (c == ';') {
+                tokens.push_back({ .type = Token::Type::EndOfExpression });
+                offset += 1;
+            } else if (c == '{') {
+                tokens.push_back({ .type = Token::Type::ScopeOpen });
+                offset += 1;
+            } else if (c == '}') {
+                tokens.push_back({ .type = Token::Type::ScopeClose });
+                offset += 1;
+            } else if (c == '[') {
+                tokens.push_back({ .type = Token::Type::ArrayOpen });
+                offset += 1;
+            } else if (c == ']') {
+                tokens.push_back({.type = Token::Type::ArrayClose});
+                offset += 1;
+            } else if (c == ',') {
+                tokens.push_back({ .type = Token::Type::Separator });
+                offset += 1;
+            } else if (c == '@') {
+              tokens.push_back({ .type = Token::Type::Operator, .operatorToken = { .op = Token::OperatorToken::Operator::AtDeclaration } });
+              offset += 1;
+            } else if (c == '=') {
+                tokens.push_back({ .type = Token::Type::Operator, .operatorToken = { .op = Token::OperatorToken::Operator::Assignment } });
+                offset += 1;
+            } else if (c == ':') {
+                tokens.push_back({ .type = Token::Type::Operator, .operatorToken = { .op = Token::OperatorToken::Operator::Inherit } });
+                offset += 1;
+            } else if (std::isalpha(c)) {
+                std::string identifier = matchTillInvalid(&code[offset], [](char c) -> bool { return std::isalnum(c) || c == '_'; });
+
+                // Check for reserved keywords
+
+                if (identifier == "struct")
+                    tokens.push_back({ .type = Token::Type::Keyword, .keywordToken = { .keyword = Token::KeywordToken::Keyword::Struct } });
+                else if (identifier == "union")
+                    tokens.push_back({ .type = Token::Type::Keyword, .keywordToken = { .keyword = Token::KeywordToken::Keyword::Union } });
+                else if (identifier == "using")
+                    tokens.push_back({ .type = Token::Type::Keyword, .keywordToken = { .keyword = Token::KeywordToken::Keyword::Using } });
+                else if (identifier == "enum")
+                    tokens.push_back({ .type = Token::Type::Keyword, .keywordToken = { .keyword = Token::KeywordToken::Keyword::Enum } });
+                else if (identifier == "bitfield")
+                    tokens.push_back({ .type = Token::Type::Keyword, .keywordToken = { .keyword = Token::KeywordToken::Keyword::Bitfield } });
+
+                // Check for built-in types
+                else if (identifier == "u8")
+                    tokens.push_back({ .type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Unsigned8Bit } });
+                else if (identifier == "s8")
+                    tokens.push_back({ .type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Signed8Bit } });
+                else if (identifier == "u16")
+                    tokens.push_back({ .type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Unsigned16Bit } });
+                else if (identifier == "s16")
+                    tokens.push_back({ .type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Signed16Bit } });
+                else if (identifier == "u32")
+                    tokens.push_back({ .type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Unsigned32Bit } });
+                else if (identifier == "s32")
+                    tokens.push_back({ .type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Signed32Bit } });
+                else if (identifier == "u64")
+                    tokens.push_back({ .type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Unsigned64Bit } });
+                else if (identifier == "s64")
+                    tokens.push_back({ .type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Signed64Bit } });
+                else if (identifier == "u128")
+                    tokens.push_back({ .type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Unsigned128Bit } });
+                else if (identifier == "s128")
+                    tokens.push_back({ .type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Signed128Bit } });
+                else if (identifier == "float")
+                    tokens.push_back({ .type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Float } });
+                else if (identifier == "double")
+                    tokens.push_back({ .type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Double } });
+                else if (identifier == "padding")
+                    tokens.push_back({ .type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Padding } });
+
+                // If it's not a keyword and a builtin type, it has to be an identifier
+
+                else
+                    tokens.push_back({.type = Token::Type::Identifier, .identifierToken = { .identifier = identifier } });
+
+                offset += identifier.length();
+            } else if (std::isdigit(c)) {
+                char *end = nullptr;
+                std::strtoull(&code[offset], &end, 0);
+
+                auto integer = parseInt(std::string_view(&code[offset], end));
+
+                if (!integer.has_value())
+                    return { ResultLexicalError, {}};
+
+                tokens.push_back({ .type = Token::Type::Integer, .integerToken = { .integer = integer.value() } });
+                offset += (end - &code[offset]);
+            } else return { ResultLexicalError, {}};
+        }
+
+        tokens.push_back({ .type = Token::Type::EndOfProgram });
+
+        return { ResultSuccess, tokens };
+    }
+}

source/lang/parser.cpp

@@ -1,4 +1,4 @@
-#include "parser/parser.hpp"
+#include "lang/parser.hpp"
 
 #include <optional>
 
@@ -39,6 +39,10 @@ namespace hex::lang {
         return new ASTNodeVariableDecl(curr[-6].typeToken.type, curr[-5].identifierToken.identifier, "", { }, curr[-3].integerToken.integer);
     }
 
+    ASTNode* parsePaddingDecl(TokenIter &curr) {
+        return new ASTNodeVariableDecl(curr[-5].typeToken.type, "", "", { }, curr[-3].integerToken.integer);
+    }
+
     ASTNode* parseCustomTypeArrayDecl(TokenIter &curr) {
         return new ASTNodeVariableDecl(Token::TypeToken::Type::CustomType, curr[-5].identifierToken.identifier, curr[-6].identifierToken.identifier, { }, curr[-3].integerToken.integer);
     }
@@ -51,10 +55,41 @@ namespace hex::lang {
         return new ASTNodeVariableDecl(Token::TypeToken::Type::CustomType, curr[-4].identifierToken.identifier, curr[-5].identifierToken.identifier, curr[-2].integerToken.integer);
     }
 
-    std::optional<ASTNode*> parseStruct(TokenIter &curr) {
+    ASTNode* parseStruct(TokenIter &curr) {
         const std::string &structName = curr[-2].identifierToken.identifier;
         std::vector<ASTNode*> nodes;
 
+        while (!tryConsume(curr, {Token::Type::ScopeClose})) {
+            if (tryConsume(curr, {Token::Type::Type, Token::Type::Identifier, Token::Type::EndOfExpression}))
+                nodes.push_back(parseBuiltinVariableDecl(curr));
+            else if (tryConsume(curr, {Token::Type::Identifier, Token::Type::Identifier, Token::Type::EndOfExpression}))
+                nodes.push_back(parseCustomTypeVariableDecl(curr));
+            else if (tryConsume(curr, {Token::Type::Type, Token::Type::Identifier, Token::Type::ArrayOpen, Token::Type::Integer, Token::Type::ArrayClose, Token::Type::EndOfExpression}))
+                nodes.push_back(parseBuiltinArrayDecl(curr));
+            else if (tryConsume(curr, {Token::Type::Identifier, Token::Type::Identifier, Token::Type::ArrayOpen, Token::Type::Integer, Token::Type::ArrayClose, Token::Type::EndOfExpression}))
+                nodes.push_back(parseCustomTypeArrayDecl(curr));
+            else if (tryConsume(curr, {Token::Type::Type, Token::Type::ArrayOpen, Token::Type::Integer, Token::Type::ArrayClose, Token::Type::EndOfExpression})) {
+                if (curr[-5].typeToken.type != Token::TypeToken::Type::Padding) {
+                    for(auto &node : nodes) delete node;
+                    return nullptr;
+                }
+                nodes.push_back(parsePaddingDecl(curr));
+            }
+            else break;
+        }
+
+        if (!tryConsume(curr, {Token::Type::EndOfExpression})) {
+            for(auto &node : nodes) delete node;
+            return nullptr;
+        }
+
+        return new ASTNodeStruct(structName, nodes);
+    }
+
+    ASTNode* parseUnion(TokenIter &curr) {
+        const std::string &unionName = curr[-2].identifierToken.identifier;
+        std::vector<ASTNode*> nodes;
+
         while (!tryConsume(curr, {Token::Type::ScopeClose})) {
             if (tryConsume(curr, {Token::Type::Type, Token::Type::Identifier, Token::Type::EndOfExpression}))
                 nodes.push_back(parseBuiltinVariableDecl(curr));
@@ -69,10 +104,76 @@ namespace hex::lang {
 
         if (!tryConsume(curr, {Token::Type::EndOfExpression})) {
             for(auto &node : nodes) delete node;
-            return { };
+            return nullptr;
         }
 
-        return new ASTNodeStruct(structName, nodes);
+        return new ASTNodeUnion(unionName, nodes);
+    }
+
+    ASTNode* parseEnum(TokenIter &curr) {
+        const std::string &enumName = curr[-4].identifierToken.identifier;
+        const Token::TypeToken::Type underlyingType = curr[-2].typeToken.type;
+
+        if (curr[-3].operatorToken.op != Token::OperatorToken::Operator::Inherit)
+            return nullptr;
+
+        if ((static_cast<u32>(underlyingType) & 0x0F) != 0x00)
+            return nullptr;
+
+        auto enumNode = new ASTNodeEnum(underlyingType, enumName);
+
+        while (!tryConsume(curr, {Token::Type::ScopeClose})) {
+            if (tryConsume(curr, { Token::Type::Identifier, Token::Type::Separator }) || tryConsume(curr, { Token::Type::Identifier, Token::Type::ScopeClose })) {
+                u64 value;
+                if (enumNode->getValues().empty())
+                    value = 0;
+                else
+                    value = enumNode->getValues().back().first + 1;
+
+                enumNode->getValues().emplace_back(value, curr[-2].identifierToken.identifier);
+
+                if (curr[-1].type == Token::Type::ScopeClose)
+                    break;
+            }
+            else if (tryConsume(curr, { Token::Type::Identifier, Token::Type::Operator, Token::Type::Integer, Token::Type::Separator})) {
+                enumNode->getValues().emplace_back(curr[-2].integerToken.integer, curr[-4].identifierToken.identifier);
+            }
+            else if (tryConsume(curr, { Token::Type::Identifier, Token::Type::Operator, Token::Type::Integer, Token::Type::ScopeClose})) {
+                enumNode->getValues().emplace_back(curr[-2].integerToken.integer, curr[-4].identifierToken.identifier);
+                break;
+            }
+            else {
+                delete enumNode;
+                return nullptr;
+            }
+        }
+
+        if (!tryConsume(curr, {Token::Type::EndOfExpression})) {
+            delete enumNode;
+            return nullptr;
+        }
+
+        return enumNode;
+    }
+
+    ASTNode *parseBitField(TokenIter &curr) {
+        const std::string &bitfieldName = curr[-2].identifierToken.identifier;
+        std::vector<std::pair<std::string, size_t>> fields;
+
+        while (!tryConsume(curr, {Token::Type::ScopeClose})) {
+            if (tryConsume(curr, {Token::Type::Identifier, Token::Type::Operator, Token::Type::Integer, Token::Type::EndOfExpression})) {
+                if (curr[-3].operatorToken.op != Token::OperatorToken::Operator::Inherit)
+                    return nullptr;
+
+                fields.emplace_back(curr[-4].identifierToken.identifier, curr[-2].integerToken.integer);
+            }
+            else break;
+        }
+
+        if (!tryConsume(curr, {Token::Type::EndOfExpression}))
+            return nullptr;
+
+        return new ASTNodeBitField(bitfieldName, fields);
     }
 
     ASTNode *parseScope(TokenIter &curr) {
@@ -111,16 +212,48 @@ namespace hex::lang {
             if (curr[-3].keywordToken.keyword == Token::KeywordToken::Keyword::Struct) {
                 auto structAst = parseStruct(curr);
 
-                if (!structAst.has_value()) {
+                if (structAst == nullptr) {
                     for(auto &node : program) delete node;
                     return { };
                 }
 
-                program.push_back(structAst.value());
+                program.push_back(structAst);
+            } else if (curr[-3].keywordToken.keyword == Token::KeywordToken::Keyword::Union) {
+                auto unionAst = parseUnion(curr);
+
+                if (unionAst == nullptr) {
+                    for(auto &node : program) delete node;
+                    return { };
+                }
+
+                program.push_back(unionAst);
+            } else if (curr[-3].keywordToken.keyword == Token::KeywordToken::Keyword::Bitfield) {
+                auto bitfieldAst = parseBitField(curr);
+
+                if (bitfieldAst == nullptr) {
+                    for(auto &node : program) delete node;
+                    return { };
+                }
+
+                program.push_back(bitfieldAst);
             }
 
             return program;
 
+        } // Enum
+        else if (tryConsume(curr, { Token::Type::Keyword, Token::Type::Identifier, Token::Type::Operator, Token::Type::Type, Token::Type::ScopeOpen })) {
+            if (curr[-5].keywordToken.keyword == Token::KeywordToken::Keyword::Enum) {
+                auto enumAst = parseEnum(curr);
+
+                if (enumAst == nullptr) {
+                    for(auto &node : program) delete node;
+                    return { };
+                }
+
+                program.push_back(enumAst);
+            }
+
+            return program;
         // Scope
         } else if (tryConsume(curr, { Token::Type::ScopeOpen })) {
             program.push_back(parseScope(curr));
@@ -196,7 +329,7 @@ namespace hex::lang {
 
         auto program = parseTillToken(currentToken, Token::Type::EndOfProgram);
 
-        if (program.empty())
+        if (program.empty() || currentToken != tokens.end())
             return { ResultParseError, { } };
 
         return { ResultSuccess, program };

source/lang/preprocessor.cpp

@@ -0,0 +1,120 @@
+#include "lang/preprocessor.hpp"
+
+namespace hex::lang {
+
+    Preprocessor::Preprocessor() {
+
+    }
+
+    std::pair<Result, std::string> Preprocessor::preprocess(const std::string& code, bool applyDefines) {
+        u32 offset = 0;
+
+        if (applyDefines)
+            this->m_defines.clear();
+
+        std::string output;
+        output.reserve(code.length());
+
+        while (offset < code.length()) {
+            if (code[offset] == '#') {
+                offset += 1;
+
+                if (code.substr(offset, 7) == "include") {
+                    offset += 7;
+
+                    while (std::isblank(code[offset]) || std::isspace(code[offset]))
+                        offset += 1;
+
+                    if (code[offset] != '<' && code[offset] != '"')
+                        return { ResultPreprocessingError, "" };
+
+                    char endChar = code[offset];
+                    if (endChar == '<') endChar = '>';
+
+                    offset += 1;
+
+                    std::string includeFile;
+                    while (code[offset] != endChar) {
+                        includeFile += code[offset];
+                        offset += 1;
+
+                        if (offset >= code.length())
+                            return { ResultPreprocessingError, "" };
+                    }
+                    offset += 1;
+
+                    if (includeFile[0] != '/')
+                        includeFile = "include/" + includeFile;
+
+                    FILE *file = fopen(includeFile.c_str(), "r");
+                    if (file == nullptr)
+                        return { ResultPreprocessingError, "" };
+
+                    fseek(file, 0, SEEK_END);
+                    size_t size = ftell(file);
+                    char *buffer = new char[size + 1];
+                    rewind(file);
+
+                    fread(buffer, size, 1, file);
+                    buffer[size] = 0x00;
+
+                    auto [result, preprocessedInclude] = this->preprocess(buffer, false);
+                    if (result.failed())
+                        return { ResultPreprocessingError, "" };
+
+                    output += preprocessedInclude;
+
+                    delete[] buffer;
+
+                    fclose(file);
+                } else if (code.substr(offset, 6) == "define") {
+                    offset += 6;
+
+                    while (std::isblank(code[offset]))
+                        offset += 1;
+
+                    std::string defineName;
+                    while (!std::isblank(code[offset])) {
+                        defineName += code[offset];
+                        offset += 1;
+
+                        if (offset >= code.length() || code[offset] == '\n' || code[offset] == '\r')
+                            return { ResultPreprocessingError, "" };
+                    }
+
+                    while (std::isblank(code[offset]))
+                        offset += 1;
+
+                    std::string replaceValue;
+                    do {
+                        if (offset >= code.length())
+                            return { ResultPreprocessingError, "" };
+
+                        replaceValue += code[offset];
+                        offset += 1;
+                    } while (code[offset] != '\n' && code[offset] != '\r');
+
+                    this->m_defines.emplace(defineName, replaceValue);
+                }
+            }
+
+            output += code[offset];
+            offset += 1;
+        }
+
+        if (applyDefines) {
+            for (const auto &[define, value] : this->m_defines) {
+                s32 index = 0;
+                while((index = output.find(define, index)) != std::string::npos) {
+                    if (index > 0) {
+                        output.replace(index, define.length(), value);
+                        index += value.length();
+                    }
+                }
+            }
+        }
+
+        return { ResultSuccess, output };
+    }
+
+}

source/lang/validator.cpp

@@ -0,0 +1,92 @@
+#include "lang/validator.hpp"
+
+#include <unordered_set>
+#include <string>
+
+namespace hex::lang {
+
+    Validator::Validator() {
+
+    }
+
+    bool Validator::validate(const std::vector<ASTNode*>& ast) {
+
+        std::unordered_set<std::string> typeNames;
+
+        for (const auto &node : ast) {
+            switch (node->getType()) {
+                case ASTNode::Type::VariableDecl:
+                {
+                    // Check for duplicate variable names
+                    auto varDeclNode = static_cast<ASTNodeVariableDecl*>(node);
+                    if (!typeNames.insert(varDeclNode->getVariableName()).second)
+                        return false;
+                }
+                    break;
+                case ASTNode::Type::TypeDecl:
+                {
+                    // Check for duplicate type names
+                    auto typeDeclNode = static_cast<ASTNodeTypeDecl*>(node);
+                    if (!typeNames.insert(typeDeclNode->getTypeName()).second)
+                        return false;
+
+                    if (typeDeclNode->getAssignedType() == Token::TypeToken::Type::CustomType && !typeNames.contains(typeDeclNode->getAssignedCustomTypeName()))
+                        return false;
+                }
+                break;
+                case ASTNode::Type::Struct:
+                {
+                    // Check for duplicate type name
+                    auto structNode = static_cast<ASTNodeStruct*>(node);
+                    if (!typeNames.insert(structNode->getName()).second)
+                        return false;
+
+                    // Check for duplicate member names
+                    std::unordered_set<std::string> memberNames;
+                    for (const auto &member : structNode->getNodes())
+                        if (!memberNames.insert(static_cast<ASTNodeVariableDecl*>(member)->getVariableName()).second)
+                            return false;
+                }
+                break;
+                case ASTNode::Type::Enum:
+                {
+                    // Check for duplicate type name
+                    auto enumNode = static_cast<ASTNodeEnum*>(node);
+                    if (!typeNames.insert(enumNode->getName()).second)
+                        return false;
+
+                    // Check for duplicate constant names
+                    std::unordered_set<std::string> constantNames;
+                    for (const auto &[value, name] : enumNode->getValues())
+                        if (!constantNames.insert(name).second)
+                            return false;
+                }
+                case ASTNode::Type::Bitfield:
+                {
+                    // Check for duplicate type name
+                    auto bitfieldNode = static_cast<ASTNodeBitField*>(node);
+                    if (!typeNames.insert(bitfieldNode->getName()).second)
+                        return false;
+
+                    size_t bitfieldSize = 0;
+
+                    // Check for duplicate constant names
+                    std::unordered_set<std::string> flagNames;
+                    for (const auto &[name, size] : bitfieldNode->getFields()) {
+                        if (!flagNames.insert(name).second)
+                            return false;
+
+                        bitfieldSize += size;
+                    }
+
+                    if (bitfieldSize > 64)
+                        return false;
+                }
+                break;
+            }
+        }
+
+        return true;
+    }
+
+}

source/main.cpp

@@ -1,11 +1,15 @@
 #include "window.hpp"
 
-#include "views/highlight.hpp"
+#include "lang/pattern_data.hpp"
 #include "views/view_hexeditor.hpp"
 #include "views/view_pattern.hpp"
 #include "views/view_pattern_data.hpp"
 #include "views/view_hashes.hpp"
 #include "views/view_information.hpp"
+#include "views/view_help.hpp"
+#include "views/view_tools.hpp"
+#include "views/view_strings.hpp"
+#include "views/view_data_inspector.hpp"
 
 #include "providers/provider.hpp"
 
@@ -15,15 +19,19 @@ int main() {
     hex::Window window;
 
     // Shared Data
-    std::vector<hex::Highlight> highlights;
+    std::vector<hex::lang::PatternData*> patternData;
     hex::prv::Provider *dataProvider = nullptr;
 
     // Create views
-    window.addView<hex::ViewHexEditor>(dataProvider, highlights);
-    window.addView<hex::ViewPattern>(highlights);
-    window.addView<hex::ViewPatternData>(dataProvider, highlights);
+    window.addView<hex::ViewHexEditor>(dataProvider, patternData);
+    window.addView<hex::ViewPattern>(dataProvider, patternData);
+    window.addView<hex::ViewPatternData>(dataProvider, patternData);
+    window.addView<hex::ViewDataInspector>(dataProvider);
     window.addView<hex::ViewHashes>(dataProvider);
     window.addView<hex::ViewInformation>(dataProvider);
+    window.addView<hex::ViewStrings>(dataProvider);
+    window.addView<hex::ViewHelp>();
+    window.addView<hex::ViewTools>();
 
     window.loop();
 

source/parser/lexer.cpp

@@ -1,161 +0,0 @@
-#include "parser/lexer.hpp"
-
-#include <vector>
-#include <functional>
-
-namespace hex::lang {
-
-    Lexer::Lexer() { }
-
-    std::string matchTillInvalid(const char* characters, std::function<bool(char)> predicate) {
-        std::string ret;
-
-        while (*characters != 0x00) {
-            ret += *characters;
-            characters++;
-
-            if (!predicate(*characters))
-                break;
-        }
-
-        return ret;
-    }
-
-    std::optional<u64> parseInt(std::string_view string) {
-        u64 integer = 0;
-        u8 base;
-
-        std::string_view numberData;
-
-        if (string.starts_with("0x")) {
-            numberData = string.substr(2);
-            base = 16;
-
-            if (numberData.find_first_not_of("0123456789ABCDEFabcdef") != std::string_view::npos)
-                return { };
-        } else if (string.starts_with("0b")) {
-            numberData = string.substr(2);
-            base = 2;
-
-            if (numberData.find_first_not_of("01") != std::string_view::npos)
-                return { };
-        } else if (isdigit(string[0])) {
-            numberData = string;
-            base = 10;
-
-            if (numberData.find_first_not_of("0123456789") != std::string_view::npos)
-                return { };
-        } else return { };
-
-        if (numberData.length() == 0)
-            return { };
-
-        for (const char& c : numberData) {
-                integer *= base;
-
-            if (isdigit(c))
-                integer += (c - '0');
-            else if (c >= 'A' && c <= 'F')
-                integer += 10 + (c - 'A');
-            else if (c >= 'a' && c <= 'f')
-                integer += 10 + (c - 'a');
-            else return { };
-        }
-
-        return integer;
-    }
-
-    std::pair<Result, std::vector<Token>> Lexer::lex(const std::string& code) {
-        std::vector<Token> tokens;
-        u32 offset = 0;
-
-        while (offset < code.length()) {
-            const char& c = code[offset];
-
-            if (std::isblank(c) || std::isspace(c)) {
-                offset += 1;
-            } else if (c == ';') {
-                tokens.push_back({.type = Token::Type::EndOfExpression});
-                offset += 1;
-            } else if (c == '{') {
-                tokens.push_back({.type = Token::Type::ScopeOpen});
-                offset += 1;
-            } else if (c == '}') {
-                tokens.push_back({.type = Token::Type::ScopeClose});
-                offset += 1;
-            } else if (c == '[') {
-                tokens.push_back({.type = Token::Type::ArrayOpen});
-                offset += 1;
-            } else if (c == ']') {
-                tokens.push_back({.type = Token::Type::ArrayClose});
-                offset += 1;
-            } else if (c == ',') {
-                tokens.push_back({.type = Token::Type::Separator});
-                offset += 1;
-            } else if (c == '@') {
-              tokens.push_back({.type = Token::Type::Operator, .operatorToken = { .op = Token::OperatorToken::Operator::AtDeclaration}});
-              offset += 1;
-            } else if (c == '=') {
-                tokens.push_back({.type = Token::Type::Operator, .operatorToken = { .op = Token::OperatorToken::Operator::Assignment}});
-                offset += 1;
-            } else if (std::isalpha(c)) {
-                std::string identifier = matchTillInvalid(&code[offset], [](char c) -> bool { return std::isalnum(c) || c == '_'; });
-
-                // Check for reserved keywords
-
-                if (identifier == "struct")
-                    tokens.push_back({.type = Token::Type::Keyword, .keywordToken = { .keyword = Token::KeywordToken::Keyword::Struct}});
-                else if (identifier == "using")
-                    tokens.push_back({.type = Token::Type::Keyword, .keywordToken = { .keyword = Token::KeywordToken::Keyword::Using}});
-
-                // Check for built-in types
-                else if (identifier == "u8")
-                    tokens.push_back({.type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Unsigned8Bit }});
-                else if (identifier == "s8")
-                    tokens.push_back({.type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Signed8Bit }});
-                else if (identifier == "u16")
-                    tokens.push_back({.type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Unsigned16Bit }});
-                else if (identifier == "s16")
-                    tokens.push_back({.type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Signed16Bit }});
-                else if (identifier == "u32")
-                    tokens.push_back({.type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Unsigned32Bit }});
-                else if (identifier == "s32")
-                    tokens.push_back({.type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Signed32Bit }});
-                else if (identifier == "u64")
-                    tokens.push_back({.type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Unsigned64Bit }});
-                else if (identifier == "s64")
-                    tokens.push_back({.type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Signed64Bit }});
-                else if (identifier == "u128")
-                    tokens.push_back({.type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Unsigned128Bit }});
-                else if (identifier == "s128")
-                    tokens.push_back({.type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Signed128Bit }});
-                else if (identifier == "float")
-                    tokens.push_back({.type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Float }});
-                else if (identifier == "double")
-                    tokens.push_back({.type = Token::Type::Type, .typeToken = { .type = Token::TypeToken::Type::Double }});
-
-                // If it's not a keyword and a builtin type, it has to be an identifier
-
-                else
-                    tokens.push_back({.type = Token::Type::Identifier, .identifierToken = { .identifier = identifier}});
-
-                offset += identifier.length();
-            } else if (std::isdigit(c)) {
-                char *end = nullptr;
-                std::strtoull(&code[offset], &end, 0);
-
-                auto integer = parseInt(std::string_view(&code[offset], end));
-
-                if (!integer.has_value())
-                    return { ResultLexicalError, {}};
-
-                tokens.push_back({.type = Token::Type::Integer, .integerToken = { .integer = integer.value() }});
-                offset += (end - &code[offset]);
-            } else return { ResultLexicalError, {}};
-        }
-
-        tokens.push_back({.type = Token::Type::EndOfProgram});
-
-        return { ResultSuccess, tokens };
-    }
-}

source/provider/file_provider.cpp

@@ -1,10 +1,18 @@
 #include "providers/file_provider.hpp"
 
+#undef __STRICT_ANSI__
 #include <cstdio>
 
+#include <sys/stat.h>
+#include <time.h>
+
+#include "utils.hpp"
+
 namespace hex::prv {
 
-    FileProvider::FileProvider(std::string_view path) {
+    FileProvider::FileProvider(std::string_view path) : Provider(), m_path(path) {
+        this->m_fileStatsValid = stat(path.data(), &this->m_fileStats) == 0;
+
         this->m_file = fopen(path.data(), "r+b");
 
         this->m_readable = true;
@@ -14,6 +22,7 @@ namespace hex::prv {
             this->m_file = fopen(path.data(), "rb");
             this->m_writable = false;
         }
+
     }
 
     FileProvider::~FileProvider() {
@@ -39,7 +48,7 @@ namespace hex::prv {
         if ((offset + size) > this->getSize() || buffer == nullptr || size == 0)
             return;
 
-        fseek(this->m_file, offset, SEEK_SET);
+        fseeko64(this->m_file, offset, SEEK_SET);
         fread(buffer, 1, size, this->m_file);
     }
 
@@ -47,13 +56,28 @@ namespace hex::prv {
         if (buffer == nullptr || size == 0)
             return;
 
-        fseek(this->m_file, offset, SEEK_SET);
+        fseeko64(this->m_file, offset, SEEK_SET);
         fwrite(buffer, 1, size, this->m_file);
     }
 
     size_t FileProvider::getSize() {
-        fseek(this->m_file, 0, SEEK_END);
-        return ftell(this->m_file);
+        fseeko64(this->m_file, 0, SEEK_END);
+        return ftello64(this->m_file);
+    }
+
+    std::vector<std::pair<std::string, std::string>> FileProvider::getDataInformation() {
+        std::vector<std::pair<std::string, std::string>> result;
+
+        result.emplace_back("File path", this->m_path);
+        result.emplace_back("Size", hex::toByteString(this->getSize()));
+
+        if (this->m_fileStatsValid) {
+            result.emplace_back("Creation time", ctime(&this->m_fileStats.st_ctime));
+            result.emplace_back("Last access time", ctime(&this->m_fileStats.st_atime));
+            result.emplace_back("Last modification time", ctime(&this->m_fileStats.st_mtime));
+        }
+
+        return result;
     }
 
 }

source/views/view_data_inspector.cpp

@@ -0,0 +1,151 @@
+#include "views/view_data_inspector.hpp"
+
+#include "providers/provider.hpp"
+#include "utils.hpp"
+
+#include <cstring>
+
+extern int ImTextCharFromUtf8(unsigned int* out_char, const char* in_text, const char* in_text_end);
+
+namespace hex {
+
+    ViewDataInspector::ViewDataInspector(prv::Provider* &dataProvider) : View(), m_dataProvider(dataProvider) {
+        View::subscribeEvent(Events::ByteSelected, [this](const void* userData){
+            size_t offset = *static_cast<const size_t*>(userData);
+
+            this->m_validBytes = std::min(this->m_dataProvider->getSize() - offset, sizeof(PreviewData));
+            std::memset(&this->m_previewData, 0x00, sizeof(PreviewData));
+            this->m_dataProvider->read(offset, &this->m_previewData, sizeof(PreviewData));
+
+            this->m_shouldInvalidate = true;
+        });
+    }
+
+    ViewDataInspector::~ViewDataInspector() {
+        View::unsubscribeEvent(Events::ByteSelected);
+    }
+
+    void ViewDataInspector::createView() {
+        if (!this->m_windowOpen)
+            return;
+
+        if (this->m_shouldInvalidate) {
+            this->m_shouldInvalidate = false;
+
+            this->m_cachedData.clear();
+
+            {
+                std::string binary;
+                for (u8 i = 0; i < 8; i++)
+                    binary += ((this->m_previewData.unsigned8 << i) & 0x80) == 0 ? '0' : '1';
+                this->m_cachedData.emplace_back("Binary (8 bit)", binary);
+            }
+
+            this->m_cachedData.emplace_back("uint8_t",  hex::format("%u",   this->m_previewData.unsigned8));
+            this->m_cachedData.emplace_back("int8_t",   hex::format("%d",   this->m_previewData.unsigned8));
+            this->m_cachedData.emplace_back("uint16_t", hex::format("%u",   this->m_previewData.unsigned16));
+            this->m_cachedData.emplace_back("int16_t",  hex::format("%d",   this->m_previewData.unsigned16));
+            this->m_cachedData.emplace_back("uint32_t", hex::format("%lu",  this->m_previewData.unsigned32));
+            this->m_cachedData.emplace_back("int32_t",  hex::format("%ld",  this->m_previewData.unsigned32));
+            this->m_cachedData.emplace_back("uint64_t", hex::format("%llu", this->m_previewData.unsigned64));
+            this->m_cachedData.emplace_back("int64_t",  hex::format("%lld", this->m_previewData.unsigned64));
+
+            this->m_cachedData.emplace_back("ANSI Character / char8_t",  hex::format("%c", this->m_previewData.ansiChar));
+            this->m_cachedData.emplace_back("Wide Character / char16_t",  hex::format("%lc", this->m_previewData.wideChar));
+            {
+                char buffer[5] = { 0 };
+                std::memcpy(buffer, &this->m_previewData.utf8Char, 4);
+                u32 utf8 = 0;
+                ImTextCharFromUtf8(&utf8, buffer, buffer + 4);
+                this->m_cachedData.emplace_back("UTF-8 code point",  hex::format("U+%08lx", utf8));
+            }
+
+            this->m_cachedData.emplace_back("float (32 bit)", hex::format("%e", this->m_previewData.float32));
+            this->m_cachedData.emplace_back("double (64 bit)",  hex::format("%e", this->m_previewData.float64));
+
+            #if defined(_WIN64)
+            {
+                std::tm * ptm = _localtime32(&this->m_previewData.time32);
+                char buffer[32];
+                if (std::strftime(buffer, 32, "%a, %d.%m.%Y %H:%M:%S", ptm))
+                    this->m_cachedData.emplace_back("__time32_t", buffer);
+                else
+                    this->m_cachedData.emplace_back("__time32_t", "Invalid");
+            }
+
+            {
+                std::tm * ptm = _localtime64(&this->m_previewData.time64);
+                char buffer[64];
+                if (std::strftime(buffer, 64, "%a, %d.%m.%Y %H:%M:%S", ptm) != 0)
+                    this->m_cachedData.emplace_back("__time64_t", buffer);
+                else
+                    this->m_cachedData.emplace_back("__time64_t", "Invalid");
+            }
+            #else
+            {
+                std::tm * ptm = localtime(&this->m_previewData.time);
+                char buffer[64];
+                if (std::strftime(buffer, 64, "%a, %d.%m.%Y %H:%M:%S", ptm) != 0)
+                    this->m_cachedData.emplace_back("time_t", buffer);
+                else
+                    this->m_cachedData.emplace_back("time_t", "Invalid");
+            }
+            #endif
+
+            this->m_cachedData.emplace_back("GUID", hex::format("{%08lX-%04hX-%04hX-%02hhX%02hhX-%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX}",
+                this->m_previewData.guid.data1, this->m_previewData.guid.data2, this->m_previewData.guid.data3,
+                this->m_previewData.guid.data4[0], this->m_previewData.guid.data4[1], this->m_previewData.guid.data4[2], this->m_previewData.guid.data4[3],
+                this->m_previewData.guid.data4[4], this->m_previewData.guid.data4[5], this->m_previewData.guid.data4[6], this->m_previewData.guid.data4[7]));
+        }
+
+
+        if (ImGui::Begin("Data Preview", &this->m_windowOpen)) {
+            if (this->m_dataProvider != nullptr && this->m_dataProvider->isReadable()) {
+                if (ImGui::BeginChild("##scrolling")) {
+                    if (ImGui::BeginTable("##datainspector", 2, ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable | ImGuiTableFlags_RowBg)) {
+                        ImGui::TableSetupColumn("Name");
+                        ImGui::TableSetupColumn("Value");
+
+                        ImGui::TableHeadersRow();
+                        u32 rowCount = 0;
+                        for (const auto &[name, value] : this->m_cachedData) {
+                            ImGui::TableNextRow();
+                            ImGui::TableNextColumn();
+                            ImGui::TextUnformatted(name.c_str());
+                            ImGui::TableNextColumn();
+                            ImGui::TextUnformatted(value.c_str());
+                            ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0,
+                                                   ((rowCount % 2) == 0) ? 0xFF101010 : 0xFF303030);
+                            rowCount++;
+                        }
+
+                        {
+                            ImGui::TableNextRow();
+                            ImGui::TableNextColumn();
+                            ImGui::TextUnformatted("RGBA Color");
+                            ImGui::TableNextColumn();
+                            ImGui::ColorButton("##nolabel", ImColor(this->m_previewData.unsigned32),
+                                               ImGuiColorEditFlags_None, ImVec2(ImGui::GetColumnWidth(), 15));
+                            ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0,
+                                                   ((rowCount % 2) == 0) ? 0xFF101010 : 0xFF303030);
+                            rowCount++;
+                        }
+
+
+                        ImGui::EndTable();
+                    }
+                }
+                ImGui::EndChild();
+            }
+        }
+        ImGui::End();
+    }
+
+    void ViewDataInspector::createMenu() {
+        if (ImGui::BeginMenu("View")) {
+            ImGui::MenuItem("Data Preview View", "", &this->m_windowOpen);
+            ImGui::EndMenu();
+        }
+    }
+
+}

source/views/view_hashes.cpp

@@ -6,10 +6,16 @@
 
 #include <vector>
 
+#ifdef __MINGW32__
+#include <winsock.h>
+#else
+#include <arpa/inet.h>
+#endif
+
 namespace hex {
 
     ViewHashes::ViewHashes(prv::Provider* &dataProvider) : View(), m_dataProvider(dataProvider) {
-        View::subscribeEvent(Events::DataChanged, [this](void*){
+        View::subscribeEvent(Events::DataChanged, [this](const void*){
             this->m_shouldInvalidate = true;
         });
     }
@@ -21,7 +27,7 @@ namespace hex {
 
     static void formatBigHexInt(auto dataArray, char *buffer, size_t bufferSize) {
         for (int i = 0; i < dataArray.size(); i++)
-            snprintf(buffer + 8 * i, bufferSize - 8 * i, "%08X", __builtin_bswap32(dataArray[i]));
+            snprintf(buffer + 8 * i, bufferSize - 8 * i, "%08X", htonl(dataArray[i]));
     }
 
     void ViewHashes::createView() {

source/views/view_help.cpp

@@ -0,0 +1,202 @@
+#include "views/view_help.hpp"
+
+namespace hex {
+
+    ViewHelp::ViewHelp() {
+
+    }
+
+    ViewHelp::~ViewHelp() {
+
+    }
+
+    void ViewHelp::drawAboutPopup() {
+        ImGui::SetNextWindowSizeConstraints(ImVec2(450, 300), ImVec2(450, 300));
+        if (ImGui::BeginPopupModal("About", &this->m_aboutWindowOpen, ImGuiWindowFlags_NoResize)) {
+
+            ImGui::Text("ImHex Hex Editor");
+            ImGui::Text("by WerWolv");
+            ImGui::Separator();
+            ImGui::NewLine();
+
+            ImGui::Text("Source code found at"); ImGui::SameLine();
+            ImGui::TextColored(ImVec4(0.4F, 0.4F, 0.8F, 1.0F), "https://github.com/WerWolv/ImHex");
+            ImGui::NewLine();
+
+            ImGui::Separator();
+            ImGui::Text("Libraries used");
+            ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(0.2F, 0.2F, 0.2F, 0.3F));
+            ImGui::BeginChild("##scroll");
+            ImGui::NewLine();
+            ImGui::BulletText("ImGui by ocornut");
+            ImGui::BulletText("imgui_club by ocornut");
+            ImGui::BulletText("ImGui-Addons by gallickgunner");
+            ImGui::BulletText("ImGuiColorTextEdit by BalazsJako");
+            ImGui::NewLine();
+            ImGui::BulletText("GNU libmagic");
+            ImGui::BulletText("OpenSSL libcrypto");
+            ImGui::BulletText("GLFW3");
+
+            ImGui::EndChild();
+            ImGui::PopStyleColor();
+            ImGui::EndPopup();
+        }
+    }
+
+    void ViewHelp::drawPatternHelpPopup() {
+        ImGui::SetNextWindowSizeConstraints(ImVec2(450, 300), ImVec2(450, 300));
+
+        constexpr static auto DrawTitle = [](const std::string &title) {
+            ImGui::TextColored(ImVec4(0.6F, 0.6F, 1.0F, 1.0F), title.c_str());
+        };
+
+        constexpr static auto DrawCodeSegment = [](const std::string &id, size_t height, const std::string &code) {
+            ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(0.2F, 0.2F, 0.2F, 0.3F));
+            ImGui::NewLine();
+            ImGui::BeginChild(id.c_str(), ImVec2(-1, height));
+
+            ImGui::Text("%s", code.c_str());
+
+            ImGui::EndChild();
+            ImGui::NewLine();
+            ImGui::PopStyleColor();
+        };
+
+        ImGui::SetNextWindowSizeConstraints(ImVec2(450, 300), ImVec2(2000, 1000));
+        if (ImGui::BeginPopupModal("Cheat Sheet", &this->m_patternHelpWindowOpen)) {
+            ImGui::Text("ImHex Pattern Language Cheat Sheet");
+            ImGui::Separator();
+            ImGui::NewLine();
+
+            DrawTitle("Preprocessor directives");
+            ImGui::TextWrapped(
+                    "Preprocessor directives can be used to alter the code before it's being parsed. Supported are "
+                    "#define to replace one string with another and #include to include a separate file");
+            DrawCodeSegment("preprocessor", 40,
+                            "#define HEADER_OFFSET 0x100\n"
+                            "#include <cstdint.hexpat>\n"
+                            "#include \"mypattern.hexpat\""
+            );
+
+            DrawTitle("Built-in types");
+            ImGui::TextWrapped(
+                    "The following built-in types are available for use");
+            DrawCodeSegment("built-in", 80,
+                    "u8, s8\n"
+                    "u16, s16\n"
+                    "u32, s32\n"
+                    "u64, s64\n"
+                    "u128, s128\n"
+                    "float, double"
+                    );
+
+            DrawTitle("Variables and Arrays");
+            ImGui::TextWrapped(
+                    "Normal variables as well as arrays are used to highlight and display values.");
+            DrawCodeSegment("vars arrays", 30,
+                    "u32 variable;\n"
+                    "s8 string[16];"
+            );
+
+            DrawTitle("Structs");
+            ImGui::TextWrapped(
+                    "To bundle multiple variables together, a struct can be used. To insert padding bytes which won't show "
+                    "up in the pattern data view or be highlighted, use the padding[size] syntax.");
+            DrawCodeSegment("struct", 85,
+                "struct Header {\n"
+                "   u32 magic;\n"
+                "   u8 version;\n"
+                "   padding[4];\n"
+                "   Flags flags;\n"
+                "}"
+            );
+
+            DrawTitle("Unions");
+            ImGui::TextWrapped(
+                    "A union is used to make two or more variables occupy the same region of memory. "
+                    "The union will have the size of the biggest contained variable.");
+            DrawCodeSegment("union", 55,
+                            "union Color {\n"
+                            "   u32 rgba;\n"
+                            "   Components components;\n"
+                            "}"
+            );
+
+            DrawTitle("Bitfields");
+            ImGui::TextWrapped(
+                    "To decode values that are stored in fields that don't follow the typical 8 bit alignment, bitfields can be used. "
+                    "The size of these fields get specified in numbers of bits.");
+            DrawCodeSegment("bitfield", 70,
+                            "bitfield Permission {\n"
+                            "   r : 1;\n"
+                            "   w : 1;\n"
+                            "   x : 1;\n"
+                            "}"
+            );
+
+            DrawTitle("Enum");
+            ImGui::TextWrapped(
+                    "If a value can only be a few specific values with special meaning, an enum can be used. "
+                    "The underlying type has to be specified using a unsigned, built-in type after the name. "
+                    "Entries can be listed with or without a value. The values start counting at zero and increase by one "
+                    "for every next entry");
+            DrawCodeSegment("enum", 70,
+                    "enum OperatingSystem : u8 {\n"
+                    "   Windows = 0x10,\n"
+                    "   MacOSX,\n"
+                    "   Linux\n"
+                    "}"
+            );
+
+            DrawTitle("Using declarations");
+            ImGui::TextWrapped(
+                    "A using declaration can be used to create type aliases for already existing types. This can be "
+                    "a built-in type, a struct, enum or another alias type.");
+            DrawCodeSegment("using", 15,
+                            "using magic_t = u32;"
+            );
+
+            DrawTitle("Comments");
+            ImGui::TextWrapped(
+                    "To create a comment the C // or /*  */ syntax can be used. //-style comments end at the next new line "
+                    "and /*-style comments only end when at the next */.");
+            DrawCodeSegment("comment", 55,
+                            "// This is a single line comment\n\n"
+                            "/* This is a\n"
+                            "multiline comment */"
+            );
+
+            DrawTitle("Variable placement");
+            ImGui::TextWrapped(
+                    "In order to highlight bytes and displaying their value in the pattern data window, "
+                    "a variable needs to be created and placed in memory. The following line of code creates"
+                    "a unsigned 32 bit variable named data and places it at offset 0x100."
+                    );
+            DrawCodeSegment("var placement", 15, "u32 data @ 0x100;");
+            ImGui::EndPopup();
+        }
+    }
+
+    void ViewHelp::createView() {
+        this->drawAboutPopup();
+        this->drawPatternHelpPopup();
+    }
+
+    void ViewHelp::createMenu() {
+        if (ImGui::BeginMenu("Help")) {
+            if (ImGui::MenuItem("About", ""))
+                View::doLater([this]{
+                    ImGui::OpenPopup("About");
+                    this->m_aboutWindowOpen = true;
+                });
+            ImGui::Separator();
+            if (ImGui::MenuItem("Cheat Sheet", ""))
+                View::doLater([this]{
+                    ImGui::OpenPopup("Cheat Sheet");
+                    this->m_patternHelpWindowOpen = true;
+                });
+            ImGui::EndMenu();
+        }
+    }
+
+}

source/views/view_hexeditor.cpp

@@ -7,8 +7,8 @@
 
 namespace hex {
 
-    ViewHexEditor::ViewHexEditor(prv::Provider* &dataProvider, std::vector<Highlight> &highlights)
-            : View(), m_dataProvider(dataProvider), m_highlights(highlights) {
+    ViewHexEditor::ViewHexEditor(prv::Provider* &dataProvider, std::vector<lang::PatternData*> &patternData)
+            : View(), m_dataProvider(dataProvider), m_patternData(patternData) {
 
         this->m_memoryEditor.ReadFn = [](const ImU8 *data, size_t off) -> ImU8 {
             ViewHexEditor *_this = (ViewHexEditor *) data;
@@ -35,20 +35,27 @@ namespace hex {
         this->m_memoryEditor.HighlightFn = [](const ImU8 *data, size_t off, bool next) -> bool {
             ViewHexEditor *_this = (ViewHexEditor *) data;
 
-            for (auto&[offset, size, color, name] : _this->m_highlights) {
-                if (next && off == (offset + size)) {
+            for (auto& pattern : _this->m_patternData) {
+                if (next && pattern->highlightBytes(off - 1) != pattern->highlightBytes(off)) {
                     return false;
                 }
 
-                if (off >= offset && off < (offset + size)) {
-                    _this->m_memoryEditor.HighlightColor = color;
+                if (auto color = pattern->highlightBytes(off); color.has_value()) {
+                    _this->m_memoryEditor.HighlightColor = color.value();
                     return true;
                 }
             }
 
-            _this->m_memoryEditor.HighlightColor = 0x50C08080;
+            _this->m_memoryEditor.HighlightColor = 0x60C08080;
             return false;
         };
+
+        View::subscribeEvent(Events::FileDropped, [this](const void *userData) {
+            auto filePath = static_cast<const char*>(userData);
+
+            if (filePath != nullptr)
+                this->openFile(filePath);
+        });
     }
 
     ViewHexEditor::~ViewHexEditor() {
@@ -57,7 +64,358 @@ namespace hex {
         this->m_dataProvider = nullptr;
     }
 
-    static auto findString(prv::Provider* &provider, std::string string) {
+    void ViewHexEditor::createView() {
+        if (!this->m_memoryEditor.Open)
+            return;
+
+        size_t dataSize = (this->m_dataProvider == nullptr || !this->m_dataProvider->isReadable()) ? 0x00 : this->m_dataProvider->getSize();
+
+        this->m_memoryEditor.DrawWindow("Hex Editor", this, dataSize);
+
+        if (dataSize != 0x00) {
+            this->drawSearchPopup();
+            this->drawGotoPopup();
+        }
+
+        if (this->m_fileBrowser.showFileDialog("Open File", imgui_addons::ImGuiFileBrowser::DialogMode::OPEN)) {
+            this->openFile(this->m_fileBrowser.selected_path);
+        }
+
+    }
+
+    void ViewHexEditor::openFile(std::string path) {
+        if (this->m_dataProvider != nullptr)
+            delete this->m_dataProvider;
+
+        this->m_dataProvider = new prv::FileProvider(path);
+        View::postEvent(Events::DataChanged);
+    }
+
+    void ViewHexEditor::copyBytes() {
+        size_t start = std::min(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
+        size_t end = std::max(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
+
+        size_t copySize = (end - start) + 1;
+
+        std::vector<u8> buffer(copySize, 0x00);
+        this->m_dataProvider->read(start, buffer.data(), buffer.size());
+
+        std::string str;
+        for (const auto &byte : buffer)
+            str += hex::format("%02X ", byte);
+        str.pop_back();
+
+        ImGui::SetClipboardText(str.c_str());
+    }
+
+    void ViewHexEditor::copyString() {
+        size_t start = std::min(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
+        size_t end = std::max(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
+
+        size_t copySize = (end - start) + 1;
+
+        std::string buffer;
+        buffer.reserve(copySize + 1);
+        this->m_dataProvider->read(start, buffer.data(), copySize);
+
+        ImGui::SetClipboardText(buffer.c_str());
+    }
+
+    void ViewHexEditor::copyLanguageArray(Language language) {
+        size_t start = std::min(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
+        size_t end = std::max(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
+
+        size_t copySize = (end - start) + 1;
+
+        std::vector<u8> buffer(copySize, 0x00);
+        this->m_dataProvider->read(start, buffer.data(), buffer.size());
+
+        std::string str;
+        switch (language) {
+            case Language::C:
+                str += "const unsigned char data[" + std::to_string(buffer.size()) + "] = { ";
+
+                for (const auto &byte : buffer)
+                    str += hex::format("0x%02X, ", byte);
+
+                // Remove trailing comma
+                str.pop_back();
+                str.pop_back();
+
+                str += " };";
+                break;
+            case Language::Cpp:
+                str += "constexpr std::array<unsigned char, " + std::to_string(buffer.size()) + "> data = { ";
+
+                for (const auto &byte : buffer)
+                    str += hex::format("0x%02X, ", byte);
+
+                // Remove trailing comma
+                str.pop_back();
+                str.pop_back();
+
+                str += " };";
+                break;
+            case Language::Java:
+                str += "final byte[] data = { ";
+
+                for (const auto &byte : buffer)
+                    str += hex::format("0x%02X, ", byte);
+
+                // Remove trailing comma
+                str.pop_back();
+                str.pop_back();
+
+                str += " };";
+                break;
+            case Language::CSharp:
+                str += "const byte[] data = { ";
+
+                for (const auto &byte : buffer)
+                    str += hex::format("0x%02X, ", byte);
+
+                // Remove trailing comma
+                str.pop_back();
+                str.pop_back();
+
+                str += " };";
+                break;
+            case Language::Rust:
+                str += "let data: [u8, " + std::to_string(buffer.size()) + "] = [ ";
+
+                for (const auto &byte : buffer)
+                    str += hex::format("0x%02X, ", byte);
+
+                // Remove trailing comma
+                str.pop_back();
+                str.pop_back();
+
+                str += " ];";
+                break;
+            case Language::Python:
+                str += "data = bytes([ ";
+
+                for (const auto &byte : buffer)
+                    str += hex::format("0x%02X, ", byte);
+
+                // Remove trailing comma
+                str.pop_back();
+                str.pop_back();
+
+                str += " ]);";
+                break;
+            case Language::JavaScript:
+                str += "const data = new Uint8Array([ ";
+
+                for (const auto &byte : buffer)
+                    str += hex::format("0x%02X, ", byte);
+
+                // Remove trailing comma
+                str.pop_back();
+                str.pop_back();
+
+                str += " ]);";
+                break;
+        }
+
+        ImGui::SetClipboardText(str.c_str());
+    }
+
+    void ViewHexEditor::copyHexView() {
+        size_t start = std::min(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
+        size_t end = std::max(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
+
+        size_t copySize = (end - start) + 1;
+
+        std::vector<u8> buffer(copySize, 0x00);
+        this->m_dataProvider->read(start, buffer.data(), buffer.size());
+
+        std::string str = "Hex View  00 01 02 03 04 05 06 07  08 09 0A 0B 0C 0D 0E 0F\n\n";
+
+
+        for (u32 col = start >> 4; col <= (end >> 4); col++) {
+            str += hex::format("%08lX  ", col << 4);
+            for (u64 i = 0 ; i < 16; i++) {
+
+                if (col == (start >> 4) && i < (start & 0xF) || col == (end >> 4) && i > (end & 0xF))
+                    str += "   ";
+                else
+                    str += hex::format("%02lX ", buffer[((col << 4) - start) + i]);
+
+                if ((i & 0xF) == 0x7)
+                    str += " ";
+            }
+
+            str += " ";
+
+            for (u64 i = 0 ; i < 16; i++) {
+
+                if (col == (start >> 4) && i < (start & 0xF) || col == (end >> 4) && i > (end & 0xF))
+                    str += " ";
+                else {
+                    u8 c = buffer[((col << 4) - start) + i];
+                    char displayChar = (c < 32 || c >= 128) ? '.' : c;
+                    str += hex::format("%c", displayChar);
+                }
+            }
+
+            str += "\n";
+        }
+
+
+        ImGui::SetClipboardText(str.c_str());
+    }
+
+    void ViewHexEditor::copyHexViewHTML() {
+        size_t start = std::min(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
+        size_t end = std::max(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
+
+        size_t copySize = (end - start) + 1;
+
+        std::vector<u8> buffer(copySize, 0x00);
+        this->m_dataProvider->read(start, buffer.data(), buffer.size());
+
+        std::string str =
+R"(
+<div>
+    <style type="text/css">
+        .offsetheader { color:#0000A0; line-height:200% }
+        .offsetcolumn { color:#0000A0 }
+        .hexcolumn { color:#000000 }
+        .textcolumn { color:#000000 }
+    </style>
+
+    <code>
+        <span class="offsetheader">Hex View&nbsp&nbsp00 01 02 03 04 05 06 07&nbsp 08 09 0A 0B 0C 0D 0E 0F</span><br/>
+)";
+
+
+        for (u32 col = start >> 4; col <= (end >> 4); col++) {
+            str += hex::format("        <span class=\"offsetcolumn\">%08lX</span>&nbsp&nbsp<span class=\"hexcolumn\">", col << 4);
+            for (u64 i = 0 ; i < 16; i++) {
+
+                if (col == (start >> 4) && i < (start & 0xF) || col == (end >> 4) && i > (end & 0xF))
+                    str += "&nbsp&nbsp ";
+                else
+                    str += hex::format("%02lX ", buffer[((col << 4) - start) + i]);
+
+                if ((i & 0xF) == 0x7)
+                    str += "&nbsp";
+            }
+
+            str += "</span>&nbsp&nbsp<span class=\"textcolumn\">";
+
+            for (u64 i = 0 ; i < 16; i++) {
+
+                if (col == (start >> 4) && i < (start & 0xF) || col == (end >> 4) && i > (end & 0xF))
+                    str += "&nbsp";
+                else {
+                    u8 c = buffer[((col << 4) - start) + i];
+                    char displayChar = (c < 32 || c >= 128) ? '.' : c;
+                    str += hex::format("%c", displayChar);
+                }
+            }
+
+            str += "</span><br/>\n";
+        }
+
+        str +=
+R"(
+    </code>
+</div>
+)";
+
+
+        ImGui::SetClipboardText(str.c_str());
+    }
+
+    void ViewHexEditor::createMenu() {
+
+        if (ImGui::BeginMenu("File")) {
+            if (ImGui::MenuItem("Open File...", "CTRL + O")) {
+                View::doLater([]{ ImGui::OpenPopup("Open File"); });
+            }
+
+            ImGui::Separator();
+
+            if (ImGui::MenuItem("Search", "CTRL + F")) {
+                View::doLater([]{ ImGui::OpenPopup("Search"); });
+            }
+
+            if (ImGui::MenuItem("Goto", "CTRL + G")) {
+                View::doLater([]{ ImGui::OpenPopup("Goto"); });
+            }
+
+            ImGui::EndMenu();
+        }
+
+        if (ImGui::BeginMenu("Edit")) {
+            if (ImGui::BeginMenu("Copy as...", this->m_memoryEditor.DataPreviewAddr != -1 && this->m_memoryEditor.DataPreviewAddrEnd != -1)) {
+                if (ImGui::MenuItem("Bytes", "CTRL + ALT + C"))
+                    this->copyBytes();
+                if (ImGui::MenuItem("Hex String", "CTRL + SHIFT + C"))
+                    this->copyString();
+
+                ImGui::Separator();
+
+                if (ImGui::MenuItem("C Array"))
+                    this->copyLanguageArray(Language::C);
+                if (ImGui::MenuItem("C++ Array"))
+                    this->copyLanguageArray(Language::Cpp);
+                if (ImGui::MenuItem("C# Array"))
+                    this->copyLanguageArray(Language::CSharp);
+                if (ImGui::MenuItem("Rust Array"))
+                    this->copyLanguageArray(Language::Rust);
+                if (ImGui::MenuItem("Python Array"))
+                    this->copyLanguageArray(Language::Python);
+                if (ImGui::MenuItem("Java Array"))
+                    this->copyLanguageArray(Language::Java);
+                if (ImGui::MenuItem("JavaScript Array"))
+                    this->copyLanguageArray(Language::JavaScript);
+
+                ImGui::Separator();
+
+                if (ImGui::MenuItem("Editor View"))
+                    this->copyHexView();
+                if (ImGui::MenuItem("HTML"))
+                    this->copyHexViewHTML();
+
+                ImGui::EndMenu();
+            }
+
+
+            ImGui::EndMenu();
+        }
+
+        if (ImGui::BeginMenu("View")) {
+            ImGui::MenuItem("Hex View", "", &this->m_memoryEditor.Open);
+            ImGui::EndMenu();
+        }
+    }
+
+    bool ViewHexEditor::handleShortcut(int key, int mods) {
+        if (mods == GLFW_MOD_CONTROL && key == GLFW_KEY_F) {
+            ImGui::OpenPopup("Search");
+            return true;
+        } else if (mods == GLFW_MOD_CONTROL && key == GLFW_KEY_G) {
+            ImGui::OpenPopup("Goto");
+            return true;
+        } else if (mods == GLFW_MOD_CONTROL && key == GLFW_KEY_O) {
+            ImGui::OpenPopup("Open File");
+            return true;
+        } else if (mods == (GLFW_MOD_CONTROL | GLFW_MOD_ALT) && key == GLFW_KEY_C) {
+            this->copyBytes();
+            return true;
+        } else if (mods == (GLFW_MOD_CONTROL | GLFW_MOD_SHIFT) && key == GLFW_KEY_C) {
+            this->copyString();
+            return true;
+        }
+
+        return false;
+    }
+
+
+    static std::vector<std::pair<u64, u64>> findString(prv::Provider* &provider, std::string string) {
         std::vector<std::pair<u64, u64>> results;
 
         u32 foundCharacters = 0;
@@ -75,7 +433,7 @@ namespace hex {
                     foundCharacters = 0;
 
                 if (foundCharacters == string.size()) {
-                    results.push_back({ offset + i - foundCharacters + 1, offset + i + 1 });
+                    results.emplace_back(offset + i - foundCharacters + 1, offset + i + 1);
                     foundCharacters = 0;
                 }
             }
@@ -84,114 +442,130 @@ namespace hex {
         return results;
     }
 
-    void ViewHexEditor::createView() {
-        if (!this->m_memoryEditor.Open)
-            return;
+    static std::vector<std::pair<u64, u64>> findHex(prv::Provider* &provider, std::string string) {
+        std::vector<std::pair<u64, u64>> results;
 
-        size_t dataSize = (this->m_dataProvider == nullptr || !this->m_dataProvider->isReadable()) ? 0x00 : this->m_dataProvider->getSize();
+        if ((string.size() % 2) == 1)
+            string = "0" + string;
 
-        this->m_memoryEditor.DrawWindow("Hex Editor", this, dataSize);
+        std::vector<u8> hex;
+        hex.reserve(string.size() / 2);
 
-        if (dataSize != 0x00) {
-            this->drawSearchPopup();
-            this->drawGotoPopup();
+        for (u32 i = 0; i < string.size(); i += 2) {
+            char byte[3] = { string[i], string[i + 1], 0 };
+            hex.push_back(strtoul(byte, nullptr, 16));
         }
 
-        this->m_fileBrowser.Display();
+        u32 foundCharacters = 0;
 
-        if (this->m_fileBrowser.HasSelected()) {
-            if (this->m_dataProvider != nullptr)
-                delete this->m_dataProvider;
+        std::vector<u8> buffer(1024, 0x00);
+        size_t dataSize = provider->getSize();
+        for (u64 offset = 0; offset < dataSize; offset += 1024) {
+            size_t usedBufferSize = std::min(buffer.size(), dataSize - offset);
+            provider->read(offset, buffer.data(), usedBufferSize);
 
-            this->m_dataProvider = new prv::FileProvider(this->m_fileBrowser.GetSelected().string());
-            View::postEvent(Events::DataChanged);
-            this->m_fileBrowser.ClearSelected();
-        }
+            for (u64 i = 0; i < usedBufferSize; i++) {
+                if (buffer[i] == hex[foundCharacters])
+                    foundCharacters++;
+                else
+                    foundCharacters = 0;
 
-    }
-
-    void ViewHexEditor::createMenu() {
-
-        if (ImGui::BeginMenu("File")) {
-            if (ImGui::MenuItem("Open File...")) {
-                this->m_fileBrowser.SetTitle("Open File");
-                this->m_fileBrowser.Open();
+                if (foundCharacters == hex.size()) {
+                    results.emplace_back(offset + i - foundCharacters + 1, offset + i + 1);
+                    foundCharacters = 0;
+                }
             }
-
-            ImGui::EndMenu();
         }
 
-        if (ImGui::BeginMenu("View")) {
-            ImGui::MenuItem("Hex View", "", &this->m_memoryEditor.Open);
-            ImGui::EndMenu();
-        }
-    }
-
-    bool ViewHexEditor::handleShortcut(int key, int mods) {
-        if (mods & GLFW_MOD_CONTROL && key == GLFW_KEY_F) {
-            ImGui::OpenPopup("Search");
-            return true;
-        } else if (mods & GLFW_MOD_CONTROL && key == GLFW_KEY_G) {
-            ImGui::OpenPopup("Goto");
-            return true;
-        }
-
-        return false;
+        return results;
     }
 
 
     void ViewHexEditor::drawSearchPopup() {
+        static auto InputCallback = [](ImGuiInputTextCallbackData* data) -> int {
+            auto _this = static_cast<ViewHexEditor*>(data->UserData);
+
+            *_this->m_lastSearchBuffer = _this->m_searchFunction(_this->m_dataProvider, data->Buf);
+            _this->m_lastSearchIndex = 0;
+
+            if (_this->m_lastSearchBuffer->size() > 0)
+                _this->m_memoryEditor.GotoAddrAndHighlight((*_this->m_lastSearchBuffer)[0].first, (*_this->m_lastSearchBuffer)[0].second);
+
+            return 0;
+        };
+
+        static auto Find = [this](char *buffer) {
+            *this->m_lastSearchBuffer = this->m_searchFunction(this->m_dataProvider, buffer);
+            this->m_lastSearchIndex = 0;
+
+            if (this->m_lastSearchBuffer->size() > 0)
+                this->m_memoryEditor.GotoAddrAndHighlight((*this->m_lastSearchBuffer)[0].first, (*this->m_lastSearchBuffer)[0].second);
+        };
+
+        static auto FindNext = [this]() {
+            if (this->m_lastSearchBuffer->size() > 0) {
+                ++this->m_lastSearchIndex %= this->m_lastSearchBuffer->size();
+                this->m_memoryEditor.GotoAddrAndHighlight((*this->m_lastSearchBuffer)[this->m_lastSearchIndex].first,
+                                                          (*this->m_lastSearchBuffer)[this->m_lastSearchIndex].second);
+            }
+        };
+
+        static auto FindPrevious = [this]() {
+            if (this->m_lastSearchBuffer->size() > 0) {
+                this->m_lastSearchIndex--;
+
+                if (this->m_lastSearchIndex < 0)
+                    this->m_lastSearchIndex = this->m_lastSearchBuffer->size() - 1;
+
+                this->m_lastSearchIndex %= this->m_lastSearchBuffer->size();
+
+                this->m_memoryEditor.GotoAddrAndHighlight((*this->m_lastSearchBuffer)[this->m_lastSearchIndex].first,
+                                                          (*this->m_lastSearchBuffer)[this->m_lastSearchIndex].second);
+            }
+        };
+
         if (ImGui::BeginPopup("Search")) {
             ImGui::TextUnformatted("Search");
-            ImGui::InputText("##nolabel", this->m_searchBuffer, 0xFFFF, ImGuiInputTextFlags_CallbackCompletion,
-             [](ImGuiInputTextCallbackData* data) -> int {
-                auto _this = static_cast<ViewHexEditor*>(data->UserData);
+            if (ImGui::BeginTabBar("searchTabs")) {
+                char *currBuffer;
+                if (ImGui::BeginTabItem("String")) {
+                    this->m_searchFunction = findString;
+                    this->m_lastSearchBuffer = &this->m_lastStringSearch;
+                    currBuffer = this->m_searchStringBuffer;
 
-                 _this->m_lastSearch = findString(_this->m_dataProvider, _this->m_searchBuffer);
-                 _this->m_lastSearchIndex = 0;
-
-                 if (_this->m_lastSearch.size() > 0)
-                     _this->m_memoryEditor.GotoAddrAndHighlight(_this->m_lastSearch[0].first, _this->m_lastSearch[0].second);
-
-                 return 0;
-             }, this);
-
-
-            if (ImGui::Button("Find")) {
-                this->m_lastSearch = findString(this->m_dataProvider, this->m_searchBuffer);
-                this->m_lastSearchIndex = 0;
-
-                if (this->m_lastSearch.size() > 0)
-                    this->m_memoryEditor.GotoAddrAndHighlight(this->m_lastSearch[0].first, this->m_lastSearch[0].second);
-            }
-
-            if (this->m_lastSearch.size() > 0) {
-
-                if ((ImGui::Button("Find Next"))) {
-                    if (this->m_lastSearch.size() > 0) {
-                        ++this->m_lastSearchIndex %= this->m_lastSearch.size();
-                        this->m_memoryEditor.GotoAddrAndHighlight(this->m_lastSearch[this->m_lastSearchIndex].first,
-                                                                  this->m_lastSearch[this->m_lastSearchIndex].second);
-                    }
+                    ImGui::InputText("##nolabel", currBuffer, 0xFFFF, ImGuiInputTextFlags_CallbackCompletion,
+                                     InputCallback, this);
+                    ImGui::EndTabItem();
                 }
 
-                ImGui::SameLine();
+                if (ImGui::BeginTabItem("Hex")) {
+                    this->m_searchFunction = findHex;
+                    this->m_lastSearchBuffer = &this->m_lastHexSearch;
+                    currBuffer = this->m_searchHexBuffer;
 
-                if ((ImGui::Button("Find Prev"))) {
-                    if (this->m_lastSearch.size() > 0) {
-                        this->m_lastSearchIndex--;
-
-                        if (this->m_lastSearchIndex < 0)
-                            this->m_lastSearchIndex = this->m_lastSearch.size() - 1;
-
-                        this->m_lastSearchIndex %= this->m_lastSearch.size();
-
-                        this->m_memoryEditor.GotoAddrAndHighlight(this->m_lastSearch[this->m_lastSearchIndex].first,
-                                                                  this->m_lastSearch[this->m_lastSearchIndex].second);
-                    }
+                    ImGui::InputText("##nolabel", currBuffer, 0xFFFF,
+                                     ImGuiInputTextFlags_CharsHexadecimal | ImGuiInputTextFlags_CallbackCompletion,
+                                     InputCallback, this);
+                    ImGui::EndTabItem();
                 }
+
+                if (ImGui::Button("Find"))
+                    Find(currBuffer);
+
+                if (this->m_lastSearchBuffer->size() > 0) {
+                    if ((ImGui::Button("Find Next")))
+                        FindNext();
+
+                    ImGui::SameLine();
+
+                    if ((ImGui::Button("Find Prev")))
+                        FindPrevious();
+                }
+
+                ImGui::EndTabBar();
             }
 
+
             ImGui::EndPopup();
         }
     }
@@ -199,13 +573,57 @@ namespace hex {
     void ViewHexEditor::drawGotoPopup() {
         if (ImGui::BeginPopup("Goto")) {
             ImGui::TextUnformatted("Goto");
-            ImGui::InputScalar("##nolabel", ImGuiDataType_U64, &this->m_gotoAddress, nullptr, nullptr, "%llx", ImGuiInputTextFlags_CharsHexadecimal);
+            if (ImGui::BeginTabBar("gotoTabs")) {
+                s64 newOffset = 0;
+                if (ImGui::BeginTabItem("Begin")) {
+                    ImGui::InputScalar("##nolabel", ImGuiDataType_U64, &this->m_gotoAddress, nullptr, nullptr, "%llx", ImGuiInputTextFlags_CharsHexadecimal);
 
-            if (this->m_gotoAddress >= this->m_dataProvider->getSize())
-                this->m_gotoAddress = this->m_dataProvider->getSize() - 1;
+                    if (this->m_gotoAddress >= this->m_dataProvider->getSize())
+                        this->m_gotoAddress = this->m_dataProvider->getSize() - 1;
 
-            if (ImGui::Button("Goto")) {
-                this->m_memoryEditor.GotoAddr = this->m_gotoAddress;
+                    newOffset = this->m_gotoAddress;
+
+                    ImGui::EndTabItem();
+                }
+                if (ImGui::BeginTabItem("Current")) {
+                    ImGui::InputScalar("##nolabel", ImGuiDataType_S64, &this->m_gotoAddress, nullptr, nullptr, "%llx", ImGuiInputTextFlags_CharsHexadecimal);
+
+                    if (this->m_memoryEditor.DataPreviewAddr == -1 || this->m_memoryEditor.DataPreviewAddrEnd == -1) {
+                        this->m_memoryEditor.DataPreviewAddr = 0;
+                        this->m_memoryEditor.DataPreviewAddrEnd = 0;
+                    }
+
+                    s64 currHighlightStart = std::min(this->m_memoryEditor.DataPreviewAddr, this->m_memoryEditor.DataPreviewAddrEnd);
+
+                    newOffset = this->m_gotoAddress + currHighlightStart;
+                    if (newOffset >= this->m_dataProvider->getSize()) {
+                        newOffset = this->m_dataProvider->getSize() - 1;
+                        this->m_gotoAddress = (this->m_dataProvider->getSize() - 1) - currHighlightStart;
+                    } else if (newOffset < 0) {
+                        newOffset = 0;
+                        this->m_gotoAddress = -currHighlightStart;
+                    }
+
+                    ImGui::EndTabItem();
+                }
+                if (ImGui::BeginTabItem("End")) {
+                    ImGui::InputScalar("##nolabel", ImGuiDataType_U64, &this->m_gotoAddress, nullptr, nullptr, "%llx", ImGuiInputTextFlags_CharsHexadecimal);
+
+                    if (this->m_gotoAddress >= this->m_dataProvider->getSize())
+                        this->m_gotoAddress = this->m_dataProvider->getSize() - 1;
+
+                    newOffset = (this->m_dataProvider->getSize() - 1) - this->m_gotoAddress;
+
+                    ImGui::EndTabItem();
+                }
+
+                if (ImGui::Button("Goto")) {
+                    this->m_memoryEditor.GotoAddr = newOffset;
+                    this->m_memoryEditor.DataPreviewAddr = newOffset;
+                    this->m_memoryEditor.DataPreviewAddrEnd = newOffset;
+                }
+
+                ImGui::EndTabBar();
             }
 
             ImGui::EndPopup();

source/views/view_information.cpp

@@ -22,7 +22,7 @@
 namespace hex {
 
     ViewInformation::ViewInformation(prv::Provider* &dataProvider) : View(), m_dataProvider(dataProvider) {
-        View::subscribeEvent(Events::DataChanged, [this](void*) {
+        View::subscribeEvent(Events::DataChanged, [this](const void*) {
            this->m_shouldInvalidate = true;
         });
     }
@@ -48,26 +48,27 @@ namespace hex {
         if (!this->m_windowOpen)
             return;
 
-        if (ImGui::Begin("File Information", &this->m_windowOpen)) {
+        if (ImGui::Begin("Data Information", &this->m_windowOpen)) {
             ImGui::BeginChild("##scrolling", ImVec2(0, 0), false, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoNav);
 
             if (this->m_dataProvider != nullptr && this->m_dataProvider->isReadable()) {
                 if (this->m_shouldInvalidate) {
 
                     {
-                        std::vector<u8> buffer(512, 0x00);
+                        this->m_blockSize = std::ceil(this->m_dataProvider->getSize() / 2048.0F);
+                        std::vector<u8> buffer(this->m_blockSize, 0x00);
                         std::memset(this->m_valueCounts.data(), 0x00, this->m_valueCounts.size() * sizeof(u32));
                         this->m_blockEntropy.clear();
 
-                        for (u64 i = 0; i < this->m_dataProvider->getSize(); i += 512) {
+                        for (u64 i = 0; i < this->m_dataProvider->getSize(); i += this->m_blockSize) {
                             std::array<float, 256> blockValueCounts = { 0 };
-                            this->m_dataProvider->read(i, buffer.data(), std::min(size_t(512), this->m_dataProvider->getSize() - i));
+                            this->m_dataProvider->read(i, buffer.data(), std::min(size_t(this->m_blockSize), this->m_dataProvider->getSize() - i));
 
-                            for (u16 j = 0; j < 512; j++) {
+                            for (size_t j = 0; j < this->m_blockSize; j++) {
                                 blockValueCounts[buffer[j]]++;
                                 this->m_valueCounts[buffer[j]]++;
                             }
-                            this->m_blockEntropy.push_back(calculateEntropy(blockValueCounts, 512));
+                            this->m_blockEntropy.push_back(calculateEntropy(blockValueCounts, this->m_blockSize));
                         }
 
                         this->m_averageEntropy = calculateEntropy(this->m_valueCounts, this->m_dataProvider->getSize());
@@ -126,24 +127,8 @@ namespace hex {
 
                 ImGui::NewLine();
 
-                ImGui::Text("Byte Distribution");
-                ImGui::PlotHistogram("##nolabel", this->m_valueCounts.data(), 256, 0, nullptr, FLT_MAX, FLT_MAX, ImVec2(0, 100));
-
-                ImGui::NewLine();
-                ImGui::Separator();
-                ImGui::NewLine();
-
-                ImGui::Text("Entropy");
-                ImGui::PlotLines("##nolabel", this->m_blockEntropy.data(), this->m_blockEntropy.size(), 0, nullptr, FLT_MAX, FLT_MAX, ImVec2(0, 100));
-
-                ImGui::NewLine();
-
-                ImGui::LabelText("Average entropy", "%.8f", this->m_averageEntropy);
-                ImGui::LabelText("Highest entropy block", "%.8f", this->m_highestBlockEntropy);
-
-                if (this->m_averageEntropy > 0.83 && this->m_highestBlockEntropy > 0.9) {
-                    ImGui::NewLine();
-                    ImGui::TextColored(ImVec4(0.92F, 0.25F, 0.2F, 1.0F), "This data is most likely encrypted or compressed!");
+                for (auto &[name, value] : this->m_dataProvider->getDataInformation()) {
+                    ImGui::LabelText(name.c_str(), "%s", value.c_str());
                 }
 
                 ImGui::NewLine();
@@ -161,6 +146,30 @@ namespace hex {
                     ImGui::TextWrapped("%s", this->m_mimeType.c_str());
                     ImGui::NewLine();
                 }
+
+                ImGui::Separator();
+                ImGui::NewLine();
+
+                ImGui::Text("Byte Distribution");
+                ImGui::PlotHistogram("##nolabel", this->m_valueCounts.data(), 256, 0, nullptr, FLT_MAX, FLT_MAX, ImVec2(0, 100));
+
+                ImGui::NewLine();
+                ImGui::Separator();
+                ImGui::NewLine();
+
+                ImGui::Text("Entropy");
+                ImGui::PlotLines("##nolabel", this->m_blockEntropy.data(), this->m_blockEntropy.size(), 0, nullptr, FLT_MAX, FLT_MAX, ImVec2(0, 100));
+
+                ImGui::NewLine();
+
+                ImGui::LabelText("Block size", "2048 blocks à %lu bytes", this->m_blockSize);
+                ImGui::LabelText("Average entropy", "%.8f", this->m_averageEntropy);
+                ImGui::LabelText("Highest entropy block", "%.8f", this->m_highestBlockEntropy);
+
+                if (this->m_averageEntropy > 0.83 && this->m_highestBlockEntropy > 0.9) {
+                    ImGui::NewLine();
+                    ImGui::TextColored(ImVec4(0.92F, 0.25F, 0.2F, 1.0F), "This data is most likely encrypted or compressed!");
+                }
             }
 
             ImGui::EndChild();
@@ -170,7 +179,7 @@ namespace hex {
 
     void ViewInformation::createMenu() {
         if (ImGui::BeginMenu("View")) {
-            ImGui::MenuItem("Entropy View", "", &this->m_windowOpen);
+            ImGui::MenuItem("Data Information View", "", &this->m_windowOpen);
             ImGui::EndMenu();
         }
     }

source/views/view_pattern.cpp

@@ -1,24 +1,86 @@
-#include <random>
 #include "views/view_pattern.hpp"
 
+#include "lang/preprocessor.hpp"
+#include "lang/parser.hpp"
+#include "lang/lexer.hpp"
+#include "lang/validator.hpp"
+#include "lang/evaluator.hpp"
 #include "utils.hpp"
 
 namespace hex {
 
-    ViewPattern::ViewPattern(std::vector<Highlight> &highlights) : View(), m_highlights(highlights) {
-        this->m_buffer = new char[0xFFFFFF];
-        std::memset(this->m_buffer, 0x00, 0xFFFFFF);
+    static const TextEditor::LanguageDefinition& PatternLanguage() {
+        static bool initialized = false;
+        static TextEditor::LanguageDefinition langDef;
+        if (!initialized) {
+            static const char* const keywords[] = {
+                "using", "struct", "union", "enum", "bitfield"
+            };
+            for (auto& k : keywords)
+                langDef.mKeywords.insert(k);
+
+            static std::pair<const char* const, size_t> builtInTypes[] = {
+                    { "u8", 1 }, { "u16", 2 }, { "u32", 4 }, { "u64", 8 }, { "u128", 16 },
+                    { "s8", 1 }, { "s16", 2 }, { "s32", 4 }, { "s64", 8 }, { "s128", 16 },
+                    { "float", 4 }, { "double", 8 }, { "padding", 1 }
+            };
+            for (const auto &[name, size] : builtInTypes) {
+                TextEditor::Identifier id;
+                id.mDeclaration = std::to_string(size);
+                id.mDeclaration += size == 1 ? " byte" : " bytes";
+                langDef.mIdentifiers.insert(std::make_pair(std::string(name), id));
+            }
+
+            langDef.mTokenize = [](const char * inBegin, const char * inEnd, const char *& outBegin, const char *& outEnd, TextEditor::PaletteIndex & paletteIndex) -> bool {
+                paletteIndex = TextEditor::PaletteIndex::Max;
+
+                while (inBegin < inEnd && isascii(*inBegin) && isblank(*inBegin))
+                    inBegin++;
+
+                if (inBegin == inEnd) {
+                    outBegin = inEnd;
+                    outEnd = inEnd;
+                    paletteIndex = TextEditor::PaletteIndex::Default;
+                }
+                else if (TokenizeCStyleIdentifier(inBegin, inEnd, outBegin, outEnd))
+                    paletteIndex = TextEditor::PaletteIndex::Identifier;
+                else if (TokenizeCStyleNumber(inBegin, inEnd, outBegin, outEnd))
+                    paletteIndex = TextEditor::PaletteIndex::Number;
+
+                return paletteIndex != TextEditor::PaletteIndex::Max;
+            };
+
+            langDef.mCommentStart = "/*";
+            langDef.mCommentEnd = "*/";
+            langDef.mSingleLineComment = "//";
+
+            langDef.mCaseSensitive = true;
+            langDef.mAutoIndentation = true;
+            langDef.mPreprocChar = '#';
+
+            langDef.mName = "Pattern Language";
+
+            initialized = true;
+        }
+        return langDef;
     }
+
+
+    ViewPattern::ViewPattern(prv::Provider* &dataProvider, std::vector<lang::PatternData*> &patternData)
+        : View(), m_dataProvider(dataProvider), m_patternData(patternData) {
+
+        this->m_textEditor.SetLanguageDefinition(PatternLanguage());
+        this->m_textEditor.SetShowWhitespaces(false);
+    }
+
     ViewPattern::~ViewPattern() {
-        delete[] this->m_buffer;
+
     }
 
     void ViewPattern::createMenu() {
         if (ImGui::BeginMenu("File")) {
             if (ImGui::MenuItem("Load pattern...")) {
-                this->m_fileBrowser.SetTitle("Open Hex Pattern");
-                this->m_fileBrowser.SetTypeFilters({ ".hexpat" });
-                this->m_fileBrowser.Open();
+                View::doLater([]{ ImGui::OpenPopup("Open Hex Pattern"); });
             }
             ImGui::EndMenu();
         }
@@ -34,54 +96,49 @@ namespace hex {
             return;
 
         if (ImGui::Begin("Pattern", &this->m_windowOpen, ImGuiWindowFlags_None)) {
-            ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
-            ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0, 0));
+            if (this->m_dataProvider != nullptr && this->m_dataProvider->isAvailable()) {
+                this->m_textEditor.Render("Pattern");
 
-            auto size = ImGui::GetWindowSize();
-            size.y -= 50;
-            ImGui::InputTextMultiline("Pattern", this->m_buffer, 0xFFFF, size, ImGuiInputTextFlags_AllowTabInput | ImGuiInputTextFlags_CallbackEdit,
-                [](ImGuiInputTextCallbackData* data) -> int {
-                    auto _this = static_cast<ViewPattern*>(data->UserData);
-
-                    _this->parsePattern(data->Buf);
-
-                    return 0;
-                }, this
-            );
-
-            ImGui::PopStyleVar(2);
+                if (this->m_textEditor.IsTextChanged()) {
+                    this->parsePattern(this->m_textEditor.GetText().data());
+                }
+            }
         }
         ImGui::End();
 
-        this->m_fileBrowser.Display();
+        if (this->m_fileBrowser.showFileDialog("Open Hex Pattern", imgui_addons::ImGuiFileBrowser::DialogMode::OPEN, ImVec2(0, 0), ".hexpat")) {
 
-        if (this->m_fileBrowser.HasSelected()) {
-            FILE *file = fopen(this->m_fileBrowser.GetSelected().string().c_str(), "rb");
+            FILE *file = fopen(this->m_fileBrowser.selected_path.c_str(), "rb");
 
-            fseek(file, 0, SEEK_END);
-            size_t size = ftell(file);
-            rewind(file);
+            if (file != nullptr) {
+                char *buffer;
+                fseek(file, 0, SEEK_END);
+                size_t size = ftell(file);
+                rewind(file);
 
-            if (size > 0xFF'FFFF)
-                return;
+                buffer = new char[size + 1];
 
-            fread(this->m_buffer, size, 1, file);
+                fread(buffer, size, 1, file);
+                buffer[size] = 0x00;
 
-            fclose(file);
 
-            this->parsePattern(this->m_buffer);
+                fclose(file);
+
+                this->parsePattern(buffer);
+                this->m_textEditor.SetText(buffer);
+
+                delete[] buffer;
+            }
         }
     }
 
 
-    void ViewPattern::setHighlight(u64 offset, size_t size, std::string name, u32 color) {
-        if (color == 0)
-            color = std::mt19937(std::random_device()())();
+    void ViewPattern::clearPatternData() {
+        for (auto &data : this->m_patternData)
+            delete data;
 
-        color &= ~0xFF00'0000;
-        color |= 0x5000'0000;
-
-        this->m_highlights.emplace_back(offset, size, color, name);
+        this->m_patternData.clear();
+        lang::PatternData::resetPalette();
     }
 
     template<std::derived_from<lang::ASTNode> T>
@@ -96,125 +153,43 @@ namespace hex {
     }
 
     void ViewPattern::parsePattern(char *buffer) {
-        static hex::lang::Lexer lexer;
-        static hex::lang::Parser parser;
+        hex::lang::Preprocessor preprocessor;
+        hex::lang::Lexer lexer;
+        hex::lang::Parser parser;
+        hex::lang::Validator validator;
+        hex::lang::Evaluator evaluator;
 
-        this->m_highlights.clear();
+        this->clearPatternData();
+        this->postEvent(Events::PatternChanged);
 
-        auto [lexResult, tokens] = lexer.lex(buffer);
+        auto [preprocessingResult, preprocesedCode] = preprocessor.preprocess(buffer);
+        if (preprocessingResult.failed())
+            return;
 
+        auto [lexResult, tokens] = lexer.lex(preprocesedCode);
         if (lexResult.failed()) {
             return;
         }
 
         auto [parseResult, ast] = parser.parse(tokens);
         if (parseResult.failed()) {
-            for(auto &node : ast) delete node;
             return;
         }
 
-        for (auto &varNode : findNodes<lang::ASTNodeVariableDecl>(lang::ASTNode::Type::VariableDecl, ast)) {
-            if (!varNode->getOffset().has_value())
-                continue;
-
-            u64 offset = varNode->getOffset().value();
-            if (varNode->getVariableType() != lang::Token::TypeToken::Type::CustomType) {
-                this->setHighlight(offset, (static_cast<u32>(varNode->getVariableType()) >> 4) * varNode->getArraySize(), varNode->getVariableName());
-            } else {
-                for (auto &structNode : findNodes<lang::ASTNodeStruct>(lang::ASTNode::Type::Struct, ast))
-                    if (varNode->getCustomVariableTypeName() == structNode->getName())
-                        if (this->highlightStruct(ast, structNode, offset) == -1)
-                            this->m_highlights.clear();
-
-                for (auto &usingNode : findNodes<lang::ASTNodeTypeDecl>(lang::ASTNode::Type::TypeDecl, ast))
-                    if (varNode->getCustomVariableTypeName() == usingNode->getTypeName())
-                        if (this->highlightUsingDecls(ast, usingNode, varNode, offset) == -1)
-                            this->m_highlights.clear();
-            }
+        hex::ScopeExit deleteAst([&ast]{ for(auto &node : ast) delete node; });
 
+        auto validatorResult = validator.validate(ast);
+        if (!validatorResult) {
+            return;
         }
 
-        for(auto &node : ast) delete node;
-    }
-
-    s32 ViewPattern::highlightUsingDecls(std::vector<lang::ASTNode*> &ast, lang::ASTNodeTypeDecl* currTypeDeclNode, lang::ASTNodeVariableDecl* currVarDecl, u64 offset) {
-        if (currTypeDeclNode->getAssignedType() != lang::Token::TypeToken::Type::CustomType) {
-            size_t size = (static_cast<u32>(currTypeDeclNode->getAssignedType()) >> 4) * currVarDecl->getArraySize();
-
-            this->setHighlight(offset, size, currVarDecl->getVariableName());
-            offset += size;
-        } else {
-            bool foundType = false;
-            for (auto &structNode : findNodes<lang::ASTNodeStruct>(lang::ASTNode::Type::Struct, ast))
-                if (structNode->getName() == currTypeDeclNode->getAssignedCustomTypeName()) {
-                    offset = this->highlightStruct(ast, structNode, offset);
-                    foundType = true;
-                    break;
-                }
-
-            for (auto &typeDeclNode : findNodes<lang::ASTNodeTypeDecl>(lang::ASTNode::Type::TypeDecl, ast))
-                if (typeDeclNode->getTypeName() == currTypeDeclNode->getAssignedCustomTypeName()) {
-                    offset = this->highlightUsingDecls(ast, typeDeclNode, currVarDecl, offset);
-                    foundType = true;
-                    break;
-                }
-
-            if (!foundType)
-                return -1;
+        auto [evaluateResult, patternData] = evaluator.evaluate(ast);
+        if (evaluateResult.failed()) {
+            return;
         }
+        this->m_patternData = patternData;
 
-        return offset;
-    }
-
-    s32 ViewPattern::highlightStruct(std::vector<lang::ASTNode*> &ast, lang::ASTNodeStruct* currStructNode, u64 offset) {
-        u64 startOffset = offset;
-
-        for (auto &node : currStructNode->getNodes()) {
-            auto var = static_cast<lang::ASTNodeVariableDecl*>(node);
-
-            if (var->getVariableType() != lang::Token::TypeToken::Type::CustomType) {
-                size_t size = (static_cast<u32>(var->getVariableType()) >> 4) * var->getArraySize();
-
-                this->setHighlight(offset, size, var->getVariableName());
-                offset += size;
-            } else {
-                bool foundType = false;
-                for (auto &structNode : findNodes<lang::ASTNodeStruct>(lang::ASTNode::Type::Struct, ast))
-                    if (structNode->getName() == var->getCustomVariableTypeName()) {
-                        size_t size = 0;
-                        for (size_t i = 0; i < var->getArraySize(); i++) {
-                            size = this->highlightStruct(ast, structNode, offset);
-
-                            if (size == -1)
-                                return -1;
-
-                            offset += size;
-                        }
-
-                        offset += size;
-                        foundType = true;
-                        break;
-                    }
-
-                for (auto &typeDeclNode : findNodes<lang::ASTNodeTypeDecl>(lang::ASTNode::Type::TypeDecl, ast))
-                    if (typeDeclNode->getTypeName() == var->getCustomVariableTypeName()) {
-                        auto size = this->highlightUsingDecls(ast, typeDeclNode, var, offset);
-
-                        if (size == -1)
-                            return -1;
-
-                        offset = size;
-                        foundType = true;
-                        break;
-                    }
-
-                if (!foundType)
-                    return -1;
-            }
-
-        }
-
-        return offset - startOffset;
+        this->postEvent(Events::PatternChanged);
     }
 
 }

source/views/view_pattern_data.cpp

@@ -1,30 +1,50 @@
 #include "views/view_pattern_data.hpp"
 
 #include "providers/provider.hpp"
-
-#include <cstring>
+#include "lang/pattern_data.hpp"
 
 namespace hex {
 
-    ViewPatternData::ViewPatternData(prv::Provider* &dataProvider, std::vector<Highlight> &highlights)
-        : View(), m_dataProvider(dataProvider), m_highlights(highlights) {
+    ViewPatternData::ViewPatternData(prv::Provider* &dataProvider, std::vector<lang::PatternData*> &patternData)
+        : View(), m_dataProvider(dataProvider), m_patternData(patternData) {
 
+        this->subscribeEvent(Events::PatternChanged, [this](auto data) {
+            this->m_sortedPatternData.clear();
+        });
     }
 
     ViewPatternData::~ViewPatternData() {
-
+        this->unsubscribeEvent(Events::PatternChanged);
     }
 
-    std::string makeDisplayable(u8 *data, size_t size) {
-        std::string result;
-        for (u8* c = data; c < (data + size - 1); c++) {
-            if (iscntrl(*c) || *c > 0x7F)
-                result += " ";
-            else
-                result += *c;
+    static bool beginPatternDataTable(prv::Provider* &provider, const std::vector<lang::PatternData*> &patterns, std::vector<lang::PatternData*> &sortedPatterns) {
+        if (ImGui::BeginTable("##patterndatatable", 6, ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable | ImGuiTableFlags_Sortable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_RowBg)) {
+            ImGui::TableSetupColumn("Color", 0, -1, ImGui::GetID("color"));
+            ImGui::TableSetupColumn("Name", 0, -1, ImGui::GetID("name"));
+            ImGui::TableSetupColumn("Offset", 0, -1, ImGui::GetID("offset"));
+            ImGui::TableSetupColumn("Size", 0, -1, ImGui::GetID("size"));
+            ImGui::TableSetupColumn("Type", 0, -1, ImGui::GetID("type"));
+            ImGui::TableSetupColumn("Value", 0, -1, ImGui::GetID("value"));
+
+            auto sortSpecs = ImGui::TableGetSortSpecs();
+
+            if (sortSpecs->SpecsDirty || sortedPatterns.empty()) {
+                sortedPatterns = patterns;
+
+                std::sort(sortedPatterns.begin(), sortedPatterns.end(), [&sortSpecs, &provider](lang::PatternData* left, lang::PatternData* right) -> bool {
+                    return lang::PatternData::sortPatternDataTable(sortSpecs, provider, left, right);
+                });
+
+                for (auto &pattern : sortedPatterns)
+                    pattern->sort(sortSpecs, provider);
+
+                sortSpecs->SpecsDirty = false;
+            }
+
+            return true;
         }
 
-        return result;
+        return false;
     }
 
     void ViewPatternData::createView() {
@@ -36,22 +56,23 @@ namespace hex {
 
             if (this->m_dataProvider != nullptr && this->m_dataProvider->isReadable()) {
 
-                for (auto&[offset, size, color, name] : this->m_highlights) {
-                    std::vector<u8> buffer(size + 1, 0x00);
+                if (beginPatternDataTable(this->m_dataProvider, this->m_patternData, this->m_sortedPatternData)) {
+                    if (this->m_sortedPatternData.size() > 0) {
+                        ImGui::TableHeadersRow();
 
-                    this->m_dataProvider->read(offset, buffer.data(), size);
+                        u32 rowCount = 0;
+                        for (auto &patternData : this->m_sortedPatternData) {
+                            patternData->createEntry(this->m_dataProvider);
+                            ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0,
+                                                   ((rowCount % 2) == 0) ? 0xFF101010 : 0xFF303030);
+                            rowCount++;
+                        }
 
-                    if (size <= 8) {
-                        u64 data = 0;
-                        std::memcpy(&data, buffer.data(), size);
+                    }
 
-                        ImGui::LabelText(name.c_str(), "[0x%08lx:0x%08lx]   %lu (0x%08lx) \"%s\"", offset,
-                                         offset + size, data, data,
-                                         makeDisplayable(buffer.data(), buffer.size()).c_str());
-                    } else
-                        ImGui::LabelText(name.c_str(), "[0x%08lx:0x%08lx]   [ ARRAY ] \"%s\"", offset, offset + size,
-                                         makeDisplayable(buffer.data(), buffer.size()).c_str());
+                    ImGui::EndTable();
                 }
+
             }
 
             ImGui::EndChild();

source/views/view_strings.cpp

@@ -0,0 +1,152 @@
+#include "views/view_strings.hpp"
+
+#include "providers/provider.hpp"
+
+#include <cstring>
+
+namespace hex {
+
+    ViewStrings::ViewStrings(prv::Provider* &dataProvider) : View(), m_dataProvider(dataProvider) {
+        View::subscribeEvent(Events::DataChanged, [this](const void*){
+            this->m_shouldInvalidate = true;
+        });
+
+        this->m_filter = new char[0xFFFF];
+        std::memset(this->m_filter, 0x00, 0xFFFF);
+    }
+
+    ViewStrings::~ViewStrings() {
+        View::unsubscribeEvent(Events::DataChanged);
+        delete[] this->m_filter;
+    }
+
+    void ViewStrings::createView() {
+        if (!this->m_windowOpen)
+            return;
+
+        if (this->m_shouldInvalidate) {
+            this->m_shouldInvalidate = false;
+
+            this->m_foundStrings.clear();
+
+
+            std::vector<u8> buffer(1024, 0x00);
+            u32 foundCharacters = 0;
+            for (u64 offset = 0; offset < this->m_dataProvider->getSize(); offset += buffer.size()) {
+                this->m_dataProvider->read(offset,  buffer.data(), buffer.size());
+
+                for (u32 i = 0; i < buffer.size(); i++) {
+                    if (buffer[i] >= 0x20 && buffer[i] <= 0x7E)
+                        foundCharacters++;
+                    else {
+                        if (foundCharacters >= this->m_minimumLength) {
+                            FoundString foundString;
+
+                            foundString.offset = offset + i - foundCharacters;
+                            foundString.size = foundCharacters;
+                            foundString.string.reserve(foundCharacters);
+                            foundString.string.resize(foundCharacters);
+                            this->m_dataProvider->read(foundString.offset, foundString.string.data(), foundCharacters);
+
+                            this->m_foundStrings.push_back(foundString);
+                        }
+
+                        foundCharacters = 0;
+                    }
+                }
+            }
+        }
+
+
+        if (ImGui::Begin("Strings", &this->m_windowOpen)) {
+            if (this->m_dataProvider != nullptr && this->m_dataProvider->isReadable()) {
+                if (ImGui::InputInt("Minimum length", &this->m_minimumLength, 1, 0))
+                    this->m_shouldInvalidate = true;
+
+                ImGui::InputText("Filter", this->m_filter, 0xFFFF);
+
+                ImGui::Separator();
+                ImGui::NewLine();
+
+                ImGui::BeginChild("##scrolling", ImVec2(0, 0), false, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoNav);
+
+                if (ImGui::BeginTable("##strings", 3,
+                                      ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable | ImGuiTableFlags_Sortable |
+                                      ImGuiTableFlags_Reorderable | ImGuiTableFlags_RowBg)) {
+                    ImGui::TableSetupColumn("Offset", 0, -1, ImGui::GetID("offset"));
+                    ImGui::TableSetupColumn("Size", 0, -1, ImGui::GetID("size"));
+                    ImGui::TableSetupColumn("String", 0, -1, ImGui::GetID("string"));
+
+                    auto sortSpecs = ImGui::TableGetSortSpecs();
+
+                    if (sortSpecs->SpecsDirty) {
+                        std::sort(this->m_foundStrings.begin(), this->m_foundStrings.end(),
+                                  [&sortSpecs](FoundString &left, FoundString &right) -> bool {
+                                      if (sortSpecs->Specs->ColumnUserID == ImGui::GetID("offset")) {
+                                          if (sortSpecs->Specs->SortDirection == ImGuiSortDirection_Ascending)
+                                              return left.offset > right.offset;
+                                          else
+                                              return left.offset < right.offset;
+                                      } else if (sortSpecs->Specs->ColumnUserID == ImGui::GetID("size")) {
+                                          if (sortSpecs->Specs->SortDirection == ImGuiSortDirection_Ascending)
+                                              return left.size > right.size;
+                                          else
+                                              return left.size < right.size;
+                                      } else if (sortSpecs->Specs->ColumnUserID == ImGui::GetID("string")) {
+                                          if (sortSpecs->Specs->SortDirection == ImGuiSortDirection_Ascending)
+                                              return left.string > right.string;
+                                          else
+                                              return left.string < right.string;
+                                      }
+
+                                      return false;
+                                  });
+
+                        sortSpecs->SpecsDirty = false;
+                    }
+
+                    ImGui::TableHeadersRow();
+
+                    ImGuiListClipper clipper;
+                    clipper.Begin(this->m_foundStrings.size());
+
+                    while (clipper.Step()) {
+                        u32 rowCount = clipper.DisplayStart;
+                        for (u64 i = clipper.DisplayStart; i < clipper.DisplayEnd; i++) {
+                            auto &foundString = this->m_foundStrings[i];
+
+                            if (strlen(this->m_filter) != 0 &&
+                                foundString.string.find(this->m_filter) == std::string::npos)
+                                continue;
+
+                            ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
+                            ImGui::TableNextColumn();
+                            ImGui::Text("0x%08lx : 0x%08lx", foundString.offset, foundString.offset + foundString.size);
+                            ImGui::TableNextColumn();
+                            ImGui::Text("0x%04lx", foundString.size);
+                            ImGui::TableNextColumn();
+                            ImGui::Text("%s", foundString.string.c_str());
+                            ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0,
+                                                   ((rowCount % 2) == 0) ? 0xFF101010 : 0xFF303030);
+                            rowCount++;
+                        }
+                    }
+                    clipper.End();
+
+                    ImGui::EndTable();
+                }
+
+                ImGui::EndChild();
+            }
+        }
+        ImGui::End();
+    }
+
+    void ViewStrings::createMenu() {
+        if (ImGui::BeginMenu("View")) {
+            ImGui::MenuItem("Strings View", "", &this->m_windowOpen);
+            ImGui::EndMenu();
+        }
+    }
+
+}

source/views/view_tools.cpp

@@ -0,0 +1,198 @@
+#include "views/view_tools.hpp"
+
+#include <cxxabi.h>
+#include <cstring>
+#include <regex>
+
+namespace hex {
+
+    ViewTools::ViewTools() {
+        this->m_mangledBuffer = new char[0xF'FFFF];
+        this->m_demangledName = static_cast<char*>(malloc(8));
+
+        std::memset(this->m_mangledBuffer, 0x00, 0xF'FFFF);
+        strcpy(this->m_demangledName, "< ??? >");
+
+        this->m_regexInput = new char[0xF'FFFF];
+        this->m_regexPattern = new char[0xF'FFFF];
+        this->m_replacePattern = new char[0xF'FFFF];
+        std::memset(this->m_regexInput, 0x00, 0xF'FFFF);
+        std::memset(this->m_regexPattern, 0x00, 0xF'FFFF);
+        std::memset(this->m_replacePattern, 0x00, 0xF'FFFF);
+    }
+
+    ViewTools::~ViewTools() {
+        delete[] this->m_mangledBuffer;
+        free(this->m_demangledName);
+
+        delete[] this->m_regexInput;
+        delete[] this->m_regexPattern;
+    }
+
+    static std::string toASCIITableString(char c) {
+        switch (c) {
+            case 0:   return "NUL";
+            case 1:   return "SOH";
+            case 2:   return "STX";
+            case 3:   return "ETX";
+            case 4:   return "EOT";
+            case 5:   return "ENQ";
+            case 6:   return "ACK";
+            case 7:   return "BEL";
+            case 8:   return "BS";
+            case 9:   return "TAB";
+            case 10:  return "LF";
+            case 11:  return "VT";
+            case 12:  return "FF";
+            case 13:  return "CR";
+            case 14:  return "SO";
+            case 15:  return "SI";
+            case 16:  return "DLE";
+            case 17:  return "DC1";
+            case 18:  return "DC2";
+            case 19:  return "DC3";
+            case 20:  return "DC4";
+            case 21:  return "NAK";
+            case 22:  return "SYN";
+            case 23:  return "ETB";
+            case 24:  return "CAN";
+            case 25:  return "EM";
+            case 26:  return "SUB";
+            case 27:  return "ESC";
+            case 28:  return "FS";
+            case 29:  return "GS";
+            case 30:  return "RS";
+            case 31:  return "US";
+            case 32:  return "Space";
+            case 127: return "DEL";
+            default:  return std::string() + c;
+        }
+    }
+
+    void ViewTools::drawDemangler() {
+        if (ImGui::CollapsingHeader("Itanium demangler")) {
+            if (ImGui::InputText("Mangled name", this->m_mangledBuffer, 0xF'FFFF)) {
+                size_t length = 0;
+                int status = 0;
+
+                if (this->m_demangledName != nullptr)
+                    free(this->m_demangledName);
+
+                this->m_demangledName = abi::__cxa_demangle(this->m_mangledBuffer, nullptr, &length, &status);
+
+                if (status != 0) {
+                    this->m_demangledName = static_cast<char*>(malloc(8));
+                    strcpy(this->m_demangledName, "< ??? >");
+                }
+            }
+
+            ImGui::InputText("Demangled name", this->m_demangledName, strlen(this->m_demangledName), ImGuiInputTextFlags_ReadOnly);
+            ImGui::NewLine();
+        }
+    }
+
+    void ViewTools::drawASCIITable() {
+        if (ImGui::CollapsingHeader("ASCII table")) {
+            ImGui::BeginTable("##asciitable", 4);
+            ImGui::TableSetupColumn("");
+            ImGui::TableSetupColumn("");
+            ImGui::TableSetupColumn("");
+            ImGui::TableSetupColumn("");
+
+            ImGui::TableNextColumn();
+
+            for (u8 tablePart = 0; tablePart < 4; tablePart++) {
+                ImGui::BeginTable("##asciitablepart", this->m_asciiTableShowOctal ? 4 : 3, ImGuiTableFlags_BordersInnerV | ImGuiTableFlags_BordersOuter | ImGuiTableFlags_RowBg);
+                ImGui::TableSetupColumn("dec");
+                if (this->m_asciiTableShowOctal)
+                    ImGui::TableSetupColumn("oct");
+                ImGui::TableSetupColumn("hex");
+                ImGui::TableSetupColumn("char");
+
+                ImGui::TableHeadersRow();
+
+                u32 rowCount = 0;
+                for (u8 i = 0; i < 0x80 / 4; i++) {
+                    ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
+
+                    ImGui::TableNextColumn();
+                    ImGui::Text("%02d", i + 32 * tablePart);
+
+                    if (this->m_asciiTableShowOctal) {
+                        ImGui::TableNextColumn();
+                        ImGui::Text("0o%02o", i + 32 * tablePart);
+                    }
+
+                    ImGui::TableNextColumn();
+                    ImGui::Text("0x%02x", i + 32 * tablePart);
+
+                    ImGui::TableNextColumn();
+                    ImGui::Text("%s", toASCIITableString(i + 32 * tablePart).c_str());
+
+                    ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0, ((rowCount % 2) == 0) ? 0xFF101010 : 0xFF303030);
+
+                    rowCount++;
+                }
+
+                ImGui::EndTable();
+                ImGui::TableNextColumn();
+            }
+            ImGui::EndTable();
+
+            ImGui::Checkbox("Show octal", &this->m_asciiTableShowOctal);
+            ImGui::NewLine();
+        }
+    }
+
+    void ViewTools::drawRegexReplacer() {
+        if (ImGui::CollapsingHeader("Regex replacer")) {
+            bool shouldInvalidate;
+
+            shouldInvalidate = ImGui::InputText("Regex pattern", this->m_regexPattern, 0xF'FFFF);
+            shouldInvalidate = ImGui::InputText("Replace pattern", this->m_replacePattern, 0xF'FFFF) || shouldInvalidate;
+            shouldInvalidate = ImGui::InputTextMultiline("Input", this->m_regexInput, 0xF'FFFF)  || shouldInvalidate;
+
+            if (shouldInvalidate) {
+                try {
+                    this->m_regexOutput = std::regex_replace(this->m_regexInput, std::regex(this->m_regexPattern), this->m_replacePattern);
+                } catch (std::regex_error&) {}
+            }
+
+            ImGui::InputTextMultiline("Output", this->m_regexOutput.data(), this->m_regexOutput.size(), ImVec2(0, 0), ImGuiInputTextFlags_ReadOnly);
+            ImGui::NewLine();
+
+
+        }
+    }
+
+    void ViewTools::drawColorPicker() {
+        if (ImGui::CollapsingHeader("Color picker")) {
+            ImGui::ColorPicker4("Color Picker", this->m_pickedColor.data(),
+            ImGuiColorEditFlags_Uint8 | ImGuiColorEditFlags_AlphaBar | ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_DisplayHex);
+            ImGui::NewLine();
+        }
+    }
+
+    void ViewTools::createView() {
+        if (!this->m_windowOpen)
+            return;
+
+        if (ImGui::Begin("Tools", &this->m_windowOpen)) {
+
+            this->drawDemangler();
+            this->drawASCIITable();
+            this->drawRegexReplacer();
+            this->drawColorPicker();
+
+        }
+        ImGui::End();
+    }
+
+    void ViewTools::createMenu() {
+        if (ImGui::BeginMenu("View")) {
+            ImGui::MenuItem("Tools View", "", &this->m_windowOpen);
+            ImGui::EndMenu();
+        }
+    }
+
+}

source/window.cpp

@@ -3,6 +3,7 @@
 #include <iostream>
 
 #include "imgui.h"
+#include "imgui_internal.h"
 #include "imgui_impl_glfw.h"
 #include "imgui_impl_opengl3.h"
 
@@ -11,6 +12,44 @@
 
 namespace hex {
 
+    namespace {
+
+        void *ImHexSettingsHandler_ReadOpenFn(ImGuiContext *ctx, ImGuiSettingsHandler *, const char *) {
+            return ctx; // Unused, but the return value has to be non-null
+        }
+
+        void ImHexSettingsHandler_ReadLine(ImGuiContext*, ImGuiSettingsHandler *handler, void *, const char* line) {
+            auto *window = reinterpret_cast<Window *>(handler->UserData);
+
+            float scale;
+            if (sscanf(line, "Scale=%f", &scale) == 1)            { window->m_globalScale = scale; }
+            else if (sscanf(line, "FontScale=%f", &scale) == 1)   { window->m_fontScale   = scale; }
+        }
+
+        void ImHexSettingsHandler_ApplyAll(ImGuiContext *ctx, ImGuiSettingsHandler *handler) {
+            auto *window = reinterpret_cast<Window *>(handler->UserData);
+            auto &style  = ImGui::GetStyle();
+            auto &io     = ImGui::GetIO();
+
+            if (window->m_globalScale != 0.0f)
+                style.ScaleAllSizes(window->m_globalScale);
+            if (window->m_fontScale != 0.0f)
+                io.FontGlobalScale = window->m_fontScale;
+        }
+
+        void ImHexSettingsHandler_WriteAll(ImGuiContext* ctx, ImGuiSettingsHandler *handler, ImGuiTextBuffer *buf) {
+            auto *window = reinterpret_cast<Window *>(handler->UserData);
+
+            buf->reserve(buf->size() + 0x20); // Ballpark reserve
+
+            buf->appendf("[%s][General]\n", handler->TypeName);
+            buf->appendf("Scale=%.1f\n", window->m_globalScale);
+            buf->appendf("FontScale=%.1f\n", window->m_fontScale);
+            buf->append("\n");
+        }
+
+    }
+
     Window::Window() {
         this->initGLFW();
         this->initImGui();
@@ -28,6 +67,10 @@ namespace hex {
         while (!glfwWindowShouldClose(this->m_window)) {
             this->frameBegin();
 
+            for (const auto &call : View::getDeferedCalls())
+                call();
+            View::getDeferedCalls().clear();
+
             for (auto &view : this->m_views) {
                 view->createView();
             }
@@ -94,6 +137,7 @@ namespace hex {
 
     void Window::frameEnd() {
         ImGui::Render();
+
         int display_w, display_h;
         glfwGetFramebufferSize(this->m_window, &display_w, &display_h);
         glViewport(0, 0, display_w, display_h);
@@ -133,6 +177,13 @@ namespace hex {
                 Window::s_currShortcut = { key, mods };
         });
 
+        glfwSetDropCallback(this->m_window, [](GLFWwindow *window, int count, const char **paths) {
+            if (count != 1)
+                return;
+
+            View::postEvent(Events::FileDropped, paths[0]);
+        });
+
          glfwSetWindowSizeLimits(this->m_window, 720, 480, GLFW_DONT_CARE, GLFW_DONT_CARE);
 
         if (gladLoadGL() == 0)
@@ -141,10 +192,21 @@ namespace hex {
 
     void Window::initImGui() {
         IMGUI_CHECKVERSION();
-        ImGui::CreateContext();
-        ImGuiIO& io = ImGui::GetIO(); (void)io;
+        auto *ctx = ImGui::CreateContext();
+        ImGuiIO& io = ImGui::GetIO();
         io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
 
+        // Install custom settings handler
+        ImGuiSettingsHandler handler;
+        handler.TypeName = "ImHex";
+        handler.TypeHash = ImHashStr("ImHex");
+        handler.ReadOpenFn = ImHexSettingsHandler_ReadOpenFn;
+        handler.ReadLineFn = ImHexSettingsHandler_ReadLine;
+        handler.ApplyAllFn = ImHexSettingsHandler_ApplyAll;
+        handler.WriteAllFn = ImHexSettingsHandler_WriteAll;
+        handler.UserData   = this;
+        ctx->SettingsHandlers.push_back(handler);
+
         ImGui::StyleColorsDark();
 
         ImGui_ImplGlfw_InitForOpenGL(this->m_window, true);