build: Bumped version to 1.27.1

Closes #931

.github/workflows/release.yml

@@ -71,8 +71,8 @@ jobs:
       - name: ✒️ Prepare PKGBUILD
         run: |
           cp ImHex/dist/Arch/PKGBUILD .
-
-          hash=`md5sum imhex-${{env.IMHEX_VERSION}}-ArchLinux.pkg.tar.zst-x86_64 | cut -d ' ' -f 1`
+          
+          hash=`md5sum imhex-${{env.IMHEX_VERSION}}-ArchLinux-x86_64.pkg.tar.zst | cut -d ' ' -f 1`
 
           sed -i 's/%version%/${{env.IMHEX_VERSION}}/g' PKGBUILD
           sed -i "s/(SKIP)/($hash)/g" PKGBUILD
@@ -122,7 +122,7 @@ jobs:
         with:
           token: ${{ secrets.RELEASE_TOKEN }}
           repository: WerWolv/ImHex-Cpp-Plugin-Template
-          event_type: update_submodule
+          event-type: update_submodule
 
       - name: ✉️ Update Rust Plugin Template
         uses: peter-evans/repository-dispatch@v2
@@ -132,7 +132,7 @@ jobs:
         with:
           token: ${{ secrets.RELEASE_TOKEN }}
           repository: WerWolv/ImHex-Rust-Plugin-Template
-          event_type: update_submodule
+          event-type: update_submodule
 
   release-windows:
     name: Release Windows

CMakeLists.txt

@@ -48,7 +48,7 @@ addBundledLibraries()
 # Add ImHex sources
 add_subdirectory(lib/libimhex)
 add_subdirectory(main)
-add_custom_target(imhex ALL DEPENDS main libimhex)
+add_custom_target(imhex_all ALL DEPENDS main libimhex)
 
 # Add unit tests
 enable_testing()

VERSION

@@ -1 +1 @@
-1.27.0
+1.27.1

cmake/build_helpers.cmake

@@ -185,7 +185,7 @@ macro(createPackage)
                 endif ()
             endif ()
 
-            add_dependencies(imhex ${plugin})
+            add_dependencies(imhex_all ${plugin})
         endif ()
     endforeach()
 
@@ -256,7 +256,7 @@ macro(createPackage)
         set_property(TARGET main PROPERTY MACOSX_BUNDLE_INFO_PLIST ${MACOSX_BUNDLE_INFO_PLIST})
 
         # Fix rpath
-        add_custom_command(TARGET imhex POST_BUILD COMMAND ${CMAKE_INSTALL_NAME_TOOL} -add_rpath "@executable_path/../Frameworks/" $<TARGET_FILE:main>)
+        add_custom_command(TARGET imhex_all POST_BUILD COMMAND ${CMAKE_INSTALL_NAME_TOOL} -add_rpath "@executable_path/../Frameworks/" $<TARGET_FILE:main>)
 
         # FIXME: Remove this once we move/integrate the plugins directory.
         add_custom_target(build-time-make-plugins-directory ALL COMMAND ${CMAKE_COMMAND} -E make_directory "${IMHEX_BUNDLE_PATH}/Contents/MacOS/plugins")
@@ -269,7 +269,7 @@ macro(createPackage)
         install(FILES $<TARGET_FILE:main> DESTINATION "${IMHEX_BUNDLE_PATH}")
 
         # Update library references to make the bundle portable
-        postprocess_bundle(imhex main)
+        postprocess_bundle(imhex_all main)
 
         # Enforce DragNDrop packaging.
         set(CPACK_GENERATOR "DragNDrop")

dist/Arch/PKGBUILD

@@ -1,4 +1,4 @@
-# Maintainer: iTrooz_ <itrooz at protonmail dot com>
+# Maintainer: iTrooz_ <hey at itrooz dot fr>
 # Contributor: Morten Linderud <foxboron@archlinux.org>
 
 pkgname=imhex-bin

lib/external/imgui/source/TextEditor.cpp

@@ -314,7 +314,7 @@ TextEditor::Coordinates TextEditor::FindWordStart(const Coordinates &aFrom) cons
     while (cindex > 0 && isspace(line[cindex].mChar))
         --cindex;
 
-    auto cstart = (PaletteIndex)line[cindex].mColorIndex;
+    auto cstart = line[cindex].mChar;
     while (cindex > 0) {
         auto c = line[cindex].mChar;
         if ((c & 0xC0) != 0x80)    // not UTF code sequence 10xxxxxx
@@ -323,8 +323,15 @@ TextEditor::Coordinates TextEditor::FindWordStart(const Coordinates &aFrom) cons
                 cindex++;
                 break;
             }
-            if (cstart != (PaletteIndex)line[size_t(cindex - 1)].mColorIndex)
+
+            if (isalnum(cstart)) {
+                if (!isalnum(c)) {
+                    cindex++;
+                    break;
+                }
+            } else {
                 break;
+            }
         }
         --cindex;
     }
@@ -632,10 +639,24 @@ void TextEditor::HandleKeyboardInputs() {
             MoveEnd(shift);
         else if (!IsReadOnly() && !ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Delete)))
             Delete();
+        else if (!IsReadOnly() && ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Delete))) {
+            auto wordStart = GetCursorPosition();
+            MoveRight();
+            auto wordEnd = FindWordEnd(GetCursorPosition());
+            SetSelection(wordStart, wordEnd);
+            Backspace();
+        }
         else if (!IsReadOnly() && !ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Backspace)))
             Backspace();
+        else if (!IsReadOnly() && ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Backspace))) {
+            auto wordEnd = GetCursorPosition();
+            MoveLeft();
+            auto wordStart = FindWordStart(GetCursorPosition());
+            SetSelection(wordStart, wordEnd);
+            Backspace();
+        }
         else if (!ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Insert)))
-            mOverwrite ^= true;
+            mOverwrite = !mOverwrite;
         else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Insert)))
             Copy();
         else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_C)))

lib/libimhex/source/helpers/stacktrace.cpp

@@ -94,75 +94,82 @@
 
     }
 
-#elif defined(HEX_HAS_EXECINFO) && __has_include(BACKTRACE_HEADER)
+#elif defined(HEX_HAS_EXECINFO)
 
-    #include BACKTRACE_HEADER
-    #include <llvm/Demangle/Demangle.h>
-    #include <hex/helpers/logger.hpp>
-    #include <hex/helpers/utils.hpp>
+    #if __has_include(BACKTRACE_HEADER)
 
-    namespace hex::stacktrace {
+        #include BACKTRACE_HEADER
+        #include <llvm/Demangle/Demangle.h>
+        #include <hex/helpers/logger.hpp>
+        #include <hex/helpers/utils.hpp>
 
-        void initialize() {
+        namespace hex::stacktrace {
 
-        }
-
-        std::vector<StackFrame> getStackTrace() {
-            static std::vector<StackFrame> result;
-
-            std::array<void*, 128> addresses;
-            auto count = backtrace(addresses.data(), addresses.size());
-            auto functions = backtrace_symbols(addresses.data(), count);
-
-            for (i32 i = 0; i < count; i++)
-                result.push_back(StackFrame { "", functions[i], 0 });
-
-            return result;
-        }
-
-    }
-
-#elif defined(HEX_HAS_BACKTRACE) && __has_include(BACKTRACE_HEADER)
-
-    #include BACKTRACE_HEADER
-    #include <llvm/Demangle/Demangle.h>
-    #include <hex/helpers/logger.hpp>
-    #include <hex/helpers/utils.hpp>
-
-    namespace hex::stacktrace {
-
-        static struct backtrace_state *s_backtraceState;
-
-
-        void initialize() {
-            if (auto executablePath = fs::getExecutablePath(); executablePath.has_value()) {
-                static std::string path = executablePath->string();
-                s_backtraceState = backtrace_create_state(path.c_str(), 1, [](void *, const char *msg, int) { log::error("{}", msg); }, nullptr);
-            }
-        }
-
-        std::vector<StackFrame> getStackTrace() {
-            static std::vector<StackFrame> result;
-
-            result.clear();
-            if (s_backtraceState != nullptr) {
-                backtrace_full(s_backtraceState, 0, [](void *, uintptr_t, const char *fileName, int lineNumber, const char *function) -> int {
-                    if (fileName == nullptr)
-                        fileName = "??";
-                    if (function == nullptr)
-                        function = "??";
-
-                    result.push_back(StackFrame { std::fs::path(fileName).filename().string(), llvm::demangle(function), u32(lineNumber) });
-
-                    return 0;
-                }, nullptr, nullptr);
+            void initialize() {
 
             }
 
-            return result;
+            std::vector<StackFrame> getStackTrace() {
+                static std::vector<StackFrame> result;
+
+                std::array<void*, 128> addresses;
+                auto count = backtrace(addresses.data(), addresses.size());
+                auto functions = backtrace_symbols(addresses.data(), count);
+
+                for (i32 i = 0; i < count; i++)
+                    result.push_back(StackFrame { "", functions[i], 0 });
+
+                return result;
+            }
+
+        }
+    #endif
+
+#elif defined(HEX_HAS_BACKTRACE)
+
+    #if __has_include(BACKTRACE_HEADER)
+
+        #include BACKTRACE_HEADER
+        #include <llvm/Demangle/Demangle.h>
+        #include <hex/helpers/logger.hpp>
+        #include <hex/helpers/utils.hpp>
+
+        namespace hex::stacktrace {
+
+            static struct backtrace_state *s_backtraceState;
+
+
+            void initialize() {
+                if (auto executablePath = fs::getExecutablePath(); executablePath.has_value()) {
+                    static std::string path = executablePath->string();
+                    s_backtraceState = backtrace_create_state(path.c_str(), 1, [](void *, const char *msg, int) { log::error("{}", msg); }, nullptr);
+                }
+            }
+
+            std::vector<StackFrame> getStackTrace() {
+                static std::vector<StackFrame> result;
+
+                result.clear();
+                if (s_backtraceState != nullptr) {
+                    backtrace_full(s_backtraceState, 0, [](void *, uintptr_t, const char *fileName, int lineNumber, const char *function) -> int {
+                        if (fileName == nullptr)
+                            fileName = "??";
+                        if (function == nullptr)
+                            function = "??";
+
+                        result.push_back(StackFrame { std::fs::path(fileName).filename().string(), llvm::demangle(function), u32(lineNumber) });
+
+                        return 0;
+                    }, nullptr, nullptr);
+
+                }
+
+                return result;
+            }
+
         }
 
-    }
+    #endif
 
 #else
 

plugins/builtin/source/content/views/view_pattern_editor.cpp

@@ -334,9 +334,7 @@ namespace hex::plugin::builtin {
                     ImGui::TableNextColumn();
 
                     if (ImGui::IconButton(ICON_VS_ADD, ImGui::GetStyleColorVec4(ImGuiCol_Text))) {
-                        iter++;
-                        envVars.insert(iter, { envVarCounter++, "", i128(0), PlData::EnvVarType::Integer });
-                        iter--;
+                        envVars.insert(std::next(iter), { envVarCounter++, "", i128(0), PlData::EnvVarType::Integer });
                     }
 
                     ImGui::SameLine();

plugins/builtin/source/content/welcome_screen.cpp

@@ -548,7 +548,6 @@ namespace hex::plugin::builtin {
             }
         });
 
-
         constexpr static auto CrashBackupFileName = "crash_backup.hexproj";
         for (const auto &path : fs::getDefaultPaths(fs::ImHexPath::Config)) {
             if (auto filePath = std::fs::path(path) / CrashBackupFileName; fs::exists(filePath)) {
@@ -558,7 +557,7 @@ namespace hex::plugin::builtin {
         }
 
         auto tipsData = romfs::get("tips.json");
-        if(tipsData.valid()){
+        if(s_safetyBackupPath.empty() && tipsData.valid()){
             auto tipsCategories = nlohmann::json::parse(tipsData.string());
 
             auto now = std::chrono::system_clock::now();

plugins/builtin/source/ui/pattern_drawer.cpp

@@ -256,7 +256,6 @@ namespace hex::plugin::builtin::ui {
         ImGui::TableNextRow();
         createLeafNode(pattern);
         ImGui::TableNextColumn();
-
         makeSelectable(pattern);
         drawCommentTooltip(pattern);
         ImGui::SameLine();
@@ -287,16 +286,16 @@ namespace hex::plugin::builtin::ui {
             ImGui::TableNextRow();
             ImGui::TableNextColumn();
             open = createTreeNode(pattern);
-            ImGui::TableNextColumn();
+            ImGui::SameLine(0, 0);
             makeSelectable(pattern);
             drawCommentTooltip(pattern);
+            ImGui::TableNextColumn();
             drawColorColumn(pattern);
             drawOffsetColumn(pattern);
             drawSizeColumn(pattern);
             drawTypenameColumn(pattern, "bitfield");
 
             drawVisualizerButton(pattern, static_cast<pl::ptrn::Iteratable&>(pattern));
-            ImGui::SameLine();
             ImGui::TextFormatted("{}", pattern.getFormattedValue());
         }
 
@@ -434,9 +433,10 @@ namespace hex::plugin::builtin::ui {
             ImGui::TableNextRow();
             ImGui::TableNextColumn();
             open = createTreeNode(pattern);
-            ImGui::TableNextColumn();
+            ImGui::SameLine(0, 0);
             makeSelectable(pattern);
             drawCommentTooltip(pattern);
+            ImGui::TableNextColumn();
             drawColorColumn(pattern);
             drawOffsetColumn(pattern);
             drawSizeColumn(pattern);
@@ -505,9 +505,10 @@ namespace hex::plugin::builtin::ui {
             ImGui::TableNextRow();
             ImGui::TableNextColumn();
             open = createTreeNode(pattern);
-            ImGui::TableNextColumn();
+            ImGui::SameLine(0, 0);
             makeSelectable(pattern);
             drawCommentTooltip(pattern);
+            ImGui::TableNextColumn();
             if (pattern.isSealed())
                 drawColorColumn(pattern);
             else
@@ -532,7 +533,6 @@ namespace hex::plugin::builtin::ui {
                 }
             } else {
                 drawVisualizerButton(pattern, static_cast<pl::ptrn::Iteratable&>(pattern));
-                ImGui::SameLine();
                 ImGui::TextFormatted("{}", pattern.getFormattedValue());
             }
 
@@ -558,9 +558,10 @@ namespace hex::plugin::builtin::ui {
             ImGui::TableNextRow();
             ImGui::TableNextColumn();
             open = createTreeNode(pattern);
-            ImGui::TableNextColumn();
+            ImGui::SameLine(0, 0);
             makeSelectable(pattern);
             drawCommentTooltip(pattern);
+            ImGui::TableNextColumn();
             if (pattern.isSealed())
                 drawColorColumn(pattern);
             else
@@ -585,7 +586,6 @@ namespace hex::plugin::builtin::ui {
                 }
             } else {
                 drawVisualizerButton(pattern, static_cast<pl::ptrn::Iteratable&>(pattern));
-                ImGui::SameLine();
                 ImGui::TextFormatted("{}", pattern.getFormattedValue());
             }
         }
@@ -654,9 +654,10 @@ namespace hex::plugin::builtin::ui {
             ImGui::TableNextRow();
             ImGui::TableNextColumn();
             open = createTreeNode(pattern);
-            ImGui::TableNextColumn();
+            ImGui::SameLine(0, 0);
             makeSelectable(pattern);
             drawCommentTooltip(pattern);
+            ImGui::TableNextColumn();
 
             if (pattern.isSealed())
                 drawColorColumn(pattern);
@@ -676,7 +677,6 @@ namespace hex::plugin::builtin::ui {
             ImGui::TableNextColumn();
 
             drawVisualizerButton(pattern, iteratable);
-            ImGui::SameLine();
             ImGui::TextFormatted("{}", pattern.getFormattedValue());
         }
 
@@ -801,7 +801,7 @@ namespace hex::plugin::builtin::ui {
     static bool beginPatternTable(const std::vector<std::shared_ptr<pl::ptrn::Pattern>> &patterns, std::vector<pl::ptrn::Pattern*> &sortedPatterns, float height) {
         if (ImGui::BeginTable("##Patterntable", 6, ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable | ImGuiTableFlags_Sortable | ImGuiTableFlags_Hideable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_RowBg | ImGuiTableFlags_ScrollY, ImVec2(0, height))) {
             ImGui::TableSetupScrollFreeze(0, 1);
-            ImGui::TableSetupColumn("hex.builtin.pattern_drawer.var_name"_lang, ImGuiTableColumnFlags_PreferSortAscending, 0, ImGui::GetID("name"));
+            ImGui::TableSetupColumn("hex.builtin.pattern_drawer.var_name"_lang, ImGuiTableColumnFlags_PreferSortAscending | ImGuiTableColumnFlags_NoHide, 0, ImGui::GetID("name"));
             ImGui::TableSetupColumn("hex.builtin.pattern_drawer.color"_lang,    ImGuiTableColumnFlags_PreferSortAscending, 0, ImGui::GetID("color"));
             ImGui::TableSetupColumn("hex.builtin.pattern_drawer.offset"_lang,   ImGuiTableColumnFlags_PreferSortAscending | ImGuiTableColumnFlags_DefaultSort, 0, ImGui::GetID("offset"));
             ImGui::TableSetupColumn("hex.builtin.pattern_drawer.size"_lang,     ImGuiTableColumnFlags_PreferSortAscending, 0, ImGui::GetID("size"));