build: Bumped version to 1.37.0

The pattern editor was resetting the flag that marked text changes on
every frame, but resolving a text change may take more than one frame,
so instead I created a function that allows the resetting of the text
changed boolean from view pattern editor.

Currently, when a pattern is evaluated the pattern editor will lose
focus regardless of how evaluation was triggered. This is specially
annoying when using f5 or auto-evaluate. Now whenever a pattern is
evaluated, focus is given to the pattern editor when evaluation ends.

JumptoLine didn't work for empty lines.

Co-authored-by: Nik <werwolv98@gmail.com>

.github/codecov.yml

@@ -0,0 +1,5 @@
+comment: false
+ignore:
+  - "lib/third_party" # Third party libraries should be ignored
+  - "lib/external" # Our own libraries should be checked in their own repositories
+  - "tests" # https://about.codecov.io/blog/should-i-include-test-files-in-code-coverage-calculations/

.github/workflows/analysis.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   codeql:
     name: 🐛 CodeQL
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       actions: read
       contents: read
@@ -16,7 +16,7 @@ jobs:
 
     steps:
     - name: 🧰 Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -26,14 +26,14 @@ jobs:
         languages: 'cpp'
 
     - name: 📜 Setup ccache
-      uses: hendrikmuhs/ccache-action@v1.2
+      uses: hendrikmuhs/ccache-action@v1
       with:
         key: ${{ runner.os }}-analysis-build-${{ github.run_id }}
         restore-keys: ${{ runner.os }}-analysis-build
         max-size: 50M
 
     - name: 📜 Restore CMakeCache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           build/CMakeCache.txt
@@ -49,7 +49,7 @@ jobs:
         set -x
         mkdir -p build
         cd build
-        CC=gcc-12 CXX=g++-12 cmake              \
+        CC=gcc-14 CXX=g++-14 cmake              \
           -DCMAKE_BUILD_TYPE=$BUILD_TYPE        \
           -DCMAKE_INSTALL_PREFIX="$PWD/install" \
           -DCMAKE_C_COMPILER_LAUNCHER=ccache    \
@@ -57,8 +57,9 @@ jobs:
           -DCMAKE_C_FLAGS="-fuse-ld=lld"        \
           -DCMAKE_CXX_FLAGS="-fuse-ld=lld"      \
           -DIMHEX_PATTERNS_PULL_MASTER=ON       \
+          -G Ninja                              \
           ..
-        make -j 4 install
+        ninja install
 
     - name: 🗯️ Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

.github/workflows/build_web.yml

@@ -1,77 +0,0 @@
-name: Build for the web
-
-on:
-  push:
-    branches: ["*"]
-  pull_request:
-  workflow_dispatch:
-
-env:
-  BUILD_TYPE: Release
-
-permissions:
-  pages: write
-  id-token: write
-  actions: write
-
-jobs:
-
-  build:
-    runs-on: ubuntu-22.04
-    name: 🌍 WebAssembly
-    steps:
-    - name: 🧰 Checkout
-      uses: actions/checkout@v3
-      with:
-        submodules: recursive
-    
-    - name: 📁 Restore docker /cache
-      uses: actions/cache@v3
-      with:
-        path: cache
-        key: web-cmakecache-${{ hashFiles('**/CMakeLists.txt') }}
-    
-    - name: 🐳 Inject /cache into docker
-      uses: reproducible-containers/buildkit-cache-dance@v2.1.2
-      with:
-        cache-source: cache
-        cache-target: /cache
-
-    - name: 🛠️ Build using docker
-      run: |
-        docker buildx build . -f dist/web/Dockerfile --progress=plain --build-arg 'JOBS=4' --output out
-
-    - name: 🔨 Fix permissions
-      run: |
-        chmod -c -R +rX "out/"
-
-    - name: ⬆️ Upload artifacts
-      uses: actions/upload-pages-artifact@v2
-      with:
-        path: out/
-
-      # See https://github.com/actions/cache/issues/342#issuecomment-1711054115
-    - name: 🗑️ Delete old cache
-      continue-on-error: true
-      env:
-        GH_TOKEN: ${{ github.token }}
-      run: |
-          gh extension install actions/gh-actions-cache
-          gh actions-cache delete "build-web-cache" --confirm
-  
-
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-      
-    name: 📃 Deploy to GitHub Pages
-    runs-on: ubuntu-latest
-
-    if: ${{ github.ref == 'refs/heads/master' && github.event.repository.fork == false }}
-    needs: build
-
-    steps:
-      - name: 🌍 Deploy
-        id: deployment
-        uses: actions/deploy-pages@v2

.github/workflows/release.yml

@@ -10,12 +10,12 @@ on:
 
 jobs:
   release-update-repos:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     name: Release Update Repos
 
     steps:
       - name: 🧰 Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: ImHex
 
@@ -52,13 +52,23 @@ jobs:
           repo: ImHex-Patterns
           token: ${{ secrets.RELEASE_TOKEN }}
 
+      - name: 🎫 Create imhex-download-sdk release
+        uses: ncipollo/release-action@v1
+        env:
+          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        if: "${{ env.RELEASE_TOKEN != '' }}"
+        with:
+          tag: v${{ env.IMHEX_VERSION }}
+          repo: imhex-download-sdk
+          token: ${{ secrets.RELEASE_TOKEN }}
+
   release-upload-artifacts:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     name: Release Upload Artifacts
 
     steps:
       - name: 🧰 Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: ImHex
           submodules: recursive
@@ -80,7 +90,7 @@ jobs:
         run: tar --exclude-vcs -czvf Full.Sources.tar.gz ImHex
 
       - name: ⬇️ Download artifacts from latest workflow
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v6
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           workflow: build.yml
@@ -107,9 +117,10 @@ jobs:
         run: |
           mv "Windows Portable x86_64.zip" imhex-${{ env.IMHEX_VERSION }}-Windows-Portable-x86_64.zip
           mv "Windows Portable NoGPU x86_64.zip" imhex-${{ env.IMHEX_VERSION }}-Windows-Portable-NoGPU-x86_64.zip
+          mv "ImHex Web.zip" imhex-${{ env.IMHEX_VERSION }}-web.zip
 
       - name: ⬆️ Upload everything to release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@4634c16e79c963813287e889244c50009e7f0981
         with:
           files: '*'
 
@@ -137,7 +148,7 @@ jobs:
           commit_email: itrooz@protonmail.com
           ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
           commit_message: Bump to version ${{ env.IMHEX_VERSION }}
-          ssh_keyscan_types: rsa,dsa,ecdsa,ed25519
+          ssh_keyscan_types: rsa,ecdsa,ed25519
 
   release-update-winget:
     name: Release update winget package

.github/workflows/stale_issues.yml

@@ -0,0 +1,30 @@
+name: Close inactive issues
+on:
+  schedule:
+    - cron: "30 1 * * 0"
+  workflow_dispatch:
+
+jobs:
+  close-issues:
+    runs-on: ubuntu-24.04
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v5
+        with:
+          operations-per-run: '200'
+          ascending: true
+          days-before-issue-stale: 334
+          days-before-issue-close: 30
+          stale-issue-label: "stale"
+          stale-issue-message: |
+              This issue is marked stale as it has been open for 11 months without activity. 
+              Please try the latest ImHex version. (Avaiable here:  https://imhex.download/ for release and https://imhex.download/#nightly for development version)
+              If the issue persists on the latest version, please make a comment on this issue again
+
+              Without response, this issue will be closed in one month.
+          close-issue-message: ""
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tests.yml

@@ -2,15 +2,21 @@ name: "Unit Tests"
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - 'master'
+      - 'releases/**'
+      - 'tests/**'
+      - 'feature/**'
   pull_request:
-    branches: [ master ]
+    branches:
+      - 'master'
+      - 'releases/**'
   workflow_dispatch:
 
 jobs:
   tests:
     name: 🧪 Unit Tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       actions: read
       contents: read
@@ -18,25 +24,17 @@ jobs:
 
     steps:
     - name: 🧰 Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 
     - name: 📜 Setup ccache
-      uses: hendrikmuhs/ccache-action@v1.2
+      uses: hendrikmuhs/ccache-action@v1
       with:
         key: ${{ runner.os }}-tests-build-${{ github.run_id }}
         restore-keys: ${{ runner.os }}-tests-build
         max-size: 50M
 
-
-    - name: 📜 Restore CMakeCache
-      uses: actions/cache@v3
-      with:
-        path: |
-          build/CMakeCache.txt
-        key: ${{ runner.os }}-tests-build-${{ hashFiles('**/CMakeLists.txt') }}
-
     - name: ⬇️ Install dependencies
       run: |
         sudo apt update
@@ -47,17 +45,60 @@ jobs:
         set -x
         mkdir -p build
         cd build
-        CC=gcc-12 CXX=g++-12 cmake                                                                      \
-          -DCMAKE_BUILD_TYPE=Debug                                                                      \
-          -DCMAKE_C_COMPILER_LAUNCHER=ccache                                                            \
-          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache                                                          \
-          -DCMAKE_C_FLAGS="-fuse-ld=lld -fsanitize=address,leak,undefined -fno-sanitize-recover=all"    \
-          -DCMAKE_CXX_FLAGS="-fuse-ld=lld -fsanitize=address,leak,undefined -fno-sanitize-recover=all"  \
-          -DIMHEX_OFFLINE_BUILD=ON                                                                      \
+        CC=gcc-14 CXX=g++-14 cmake                                                                                 \
+          -DCMAKE_BUILD_TYPE=Debug                                                                                 \
+          -DIMHEX_ENABLE_UNIT_TESTS=ON                                                                             \
+          -DIMHEX_ENABLE_PLUGIN_TESTS=ON                                                                           \
+          -DCMAKE_C_COMPILER_LAUNCHER=ccache                                                                       \
+          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache                                                                     \
+          -DCMAKE_C_FLAGS="-fuse-ld=lld -fsanitize=address,leak,undefined -fno-sanitize-recover=all --coverage"    \
+          -DCMAKE_CXX_FLAGS="-fuse-ld=lld -fsanitize=address,leak,undefined -fno-sanitize-recover=all --coverage"  \
+          -DIMHEX_OFFLINE_BUILD=ON                                                                                 \
+          -G Ninja                                                                                                 \
           ..
-        make -j4 unit_tests
+        ninja unit_tests
+        ninja imhex_all
+
+    - name: 🧪 Perform plcli Integration Tests
+      run: |
+        cd lib/external/pattern_language
+        python tests/integration/integration.py ../../../build/imhex --pl
 
     - name: 🧪 Perform Unit Tests
       run: |
         cd build
         ctest --output-on-failure
+
+    # Generate report from all gcov .gcda files
+    #- name: 🧪 Generate coverage report
+    #  run: |
+    #    sudo apt install python3-pip python3-venv
+    #    python3 -m venv venv
+    #    . venv/bin/activate
+    #    pip3 install gcovr
+    #    cd build
+    #    gcovr --gcov-executable /usr/bin/gcov-14 --exclude '.*/yara_rules/' --exclude '.*/third_party/' --exclude '.*/external/' --root .. --xml coverage_report.xml --verbose --gcov-ignore-errors all
+    #
+    #- name: Upload coverage reports to Codecov
+    #  env:
+    #      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+    #  if: ${{ env.CODECOV_TOKEN }}
+    #  uses: codecov/codecov-action@v4
+    #  with:
+    #    fail_ci_if_error: true
+    #    token: ${{ secrets.CODECOV_TOKEN }}
+    #    file: build/coverage_report.xml
+
+  langs:
+    name: 🧪 Langs
+    runs-on: ubuntu-22.04
+
+    steps:
+    - name: 🧰 Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - name: Check langs
+      run:
+        python3 tests/check_langs.py

.gitignore

@@ -1,13 +1,19 @@
 .vscode/
 .idea/
+.kdev4/
 
 cmake-build-*/
 build*/
 local/
 venv/
+.cache/
 
 *.mgc
+*.kdev4
 imgui.ini
 .DS_Store
-./CMakeUserPresets.json
-Brewfile.lock.json
+CMakeUserPresets.json
+Brewfile.lock.json
+
+.vs/
+vcpkg.json

.gitmodules

@@ -8,7 +8,7 @@
 	ignore = dirty
 [submodule "lib/third_party/xdgpp"]
 	path = lib/third_party/xdgpp
-	url = https://git.sr.ht/~danyspin97/xdgpp
+	url = https://github.com/WerWolv/xdgpp
 	ignore = dirty
 [submodule "lib/third_party/fmt"]
 	path = lib/third_party/fmt
@@ -22,6 +22,14 @@
 	path = lib/third_party/jthread/jthread
     url = https://github.com/josuttis/jthread
     ignore = dirty
+[submodule "lib/third_party/edlib"]
+	path = lib/third_party/edlib
+	url = https://github.com/Martinsos/edlib
+	ignore = dirty
+[submodule "lib/third_party/lunasvg"]
+	path = lib/third_party/lunasvg
+	url = https://github.com/sammycage/lunasvg
+	ignore = dirty
 
 [submodule "lib/external/libromfs"]
 	path = lib/external/libromfs
@@ -35,4 +43,7 @@
 
 [submodule "lib/third_party/HashLibPlus"]
 	path = lib/third_party/HashLibPlus
-	url = https://github.com/WerWolv/HashLibPlus
+    url = https://github.com/WerWolv/HashLibPlus
+[submodule "lib/external/disassembler"]
+	path = lib/external/disassembler
+	url = https://github.com/WerWolv/Disassembler

CMakeLists.txt

@@ -1,38 +1,55 @@
 cmake_minimum_required(VERSION 3.20)
 
 # Options
-option(IMHEX_PLUGINS_IN_SHARE "Put the plugins in share/imhex/plugins instead of lib[..]/imhex/plugins" OFF)
-option(IMHEX_STRIP_RELEASE "Strip the release builds" ON)
-option(IMHEX_OFFLINE_BUILD "Enable offline build" OFF)
-option(IMHEX_IGNORE_BAD_CLONE "Disable the bad clone prevention checks" OFF)
-option(IMHEX_PATTERNS_PULL_MASTER "Download latest files from master branch of the ImHex-Patterns repo" OFF)
-option(IMHEX_IGNORE_BAD_COMPILER "Allow compiling with an unsupported compiler" OFF)
-option(IMHEX_USE_GTK_FILE_PICKER "Use GTK file picker instead of xdg-desktop-portals" OFF)
-option(IMHEX_DISABLE_STACKTRACE "Disables support for printing stack traces" OFF)
-option(IMHEX_BUNDLE_DOTNET "Bundle .NET runtime" ON)
-option(IMHEX_ENABLE_LTO "Enables Link Time Optimizations if possible" OFF)
-option(IMHEX_USE_DEFAULT_BUILD_SETTINGS "Use default build settings" OFF)
-option(IMHEX_STRICT_WARNINGS "Enable most available warnings and treat them as errors" ON)
-option(IMHEX_STATIC_LINK_PLUGINS "Statically link all plugins into the main executable" OFF)
-option(IMHEX_GENERATE_PACKAGE "Specify if a native package should be built. Only usable on Windows and MacOS" OFF)
-option(IMHEX_ENABLE_UNITY_BUILD "Enables building ImHex as a unity build." OFF)
+option(IMHEX_PLUGINS_IN_SHARE           "Put the plugins in share/imhex/plugins instead of lib[..]/imhex/plugins (Linux only)"  OFF)
+option(IMHEX_STRIP_RELEASE              "Strip the release builds"                                                              ON )
+option(IMHEX_OFFLINE_BUILD              "Enable offline build"                                                                  OFF)
+option(IMHEX_IGNORE_BAD_CLONE           "Disable the bad clone prevention checks"                                               OFF)
+option(IMHEX_PATTERNS_PULL_MASTER       "Download latest files from master branch of the ImHex-Patterns repo"                   OFF)
+option(IMHEX_IGNORE_BAD_COMPILER        "Allow compiling with an unsupported compiler"                                          OFF)
+option(IMHEX_USE_GTK_FILE_PICKER        "Use GTK file picker instead of xdg-desktop-portals (Linux only)"                       OFF)
+option(IMHEX_DISABLE_STACKTRACE         "Disables support for printing stack traces"                                            OFF)
+option(IMHEX_BUNDLE_DOTNET              "Bundle .NET runtime"                                                                   ON )
+option(IMHEX_ENABLE_LTO                 "Enables Link Time Optimizations if possible"                                           OFF)
+option(IMHEX_USE_DEFAULT_BUILD_SETTINGS "Use default build settings"                                                            OFF)
+option(IMHEX_STRICT_WARNINGS            "Enable most available warnings and treat them as errors"                               ON )
+option(IMHEX_STATIC_LINK_PLUGINS        "Statically link all plugins into the main executable"                                  OFF)
+option(IMHEX_GENERATE_PACKAGE           "Specify if a native package should be built. (Windows and MacOS only)"                 OFF)
+option(IMHEX_ENABLE_UNITY_BUILD         "Enables building ImHex as a unity build."                                              OFF)
+option(IMHEX_GENERATE_PDBS              "Enable generating PDB files in non-debug builds (Windows only)"                        OFF)
+option(IMHEX_REPLACE_DWARF_WITH_PDB     "Remove DWARF information from binaries when generating PDBS (Windows only)"            OFF)
+option(IMHEX_ENABLE_STD_ASSERTS         "Enable debug asserts in the C++ std library. (Breaks Plugin ABI!)"                     OFF)
+option(IMHEX_ENABLE_UNIT_TESTS          "Enable building unit tests"                                                            OFF)
+option(IMHEX_ENABLE_PRECOMPILED_HEADERS "Enable precompiled headers"                                                            OFF)
+option(IMHEX_COMPRESS_DEBUG_INFO        "Compress debug information"                                                            ON )
+
+set(IMHEX_BASE_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}")
+set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules")
+
+# Optional IDE support
+include("${IMHEX_BASE_FOLDER}/cmake/ide_helpers.cmake")
 
 # Basic compiler and cmake configurations
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_INCLUDE_DIRECTORIES_BEFORE ON)
-set(IMHEX_BASE_FOLDER ${CMAKE_CURRENT_SOURCE_DIR})
-set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules")
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
 
 # Setup project
-loadVersion(IMHEX_VERSION)
+loadVersion(IMHEX_VERSION IMHEX_VERSION_PLAIN)
 setVariableInParent(IMHEX_VERSION ${IMHEX_VERSION})
+
 configureCMake()
 project(imhex
-        LANGUAGES C CXX VERSION ${IMHEX_VERSION}
-        DESCRIPTION "The ImHex Hex Editor"
-        HOMEPAGE_URL "https://imhex.werwolv.net"
+        LANGUAGES       C CXX
+        VERSION         ${IMHEX_VERSION_PLAIN}
+        DESCRIPTION     "The ImHex Hex Editor"
+        HOMEPAGE_URL    "https://imhex.werwolv.net"
 )
+configureProject()
+
+# Add ImHex sources
+add_custom_target(imhex_all ALL)
 
 # Make sure project is configured correctly
 setDefaultBuiltTypeIfUnset()
@@ -50,17 +67,24 @@ configurePackingResources()
 setUninstallTarget()
 addBundledLibraries()
 
-# Add ImHex sources
-add_custom_target(imhex_all ALL)
-
 add_subdirectory(lib/libimhex)
 add_subdirectory(main)
+addPluginDirectories()
 
 # Add unit tests
-enable_testing()
-add_subdirectory(tests EXCLUDE_FROM_ALL)
+if (IMHEX_ENABLE_UNIT_TESTS)
+    if (NOT TARGET unit_tests)
+        enable_testing()
+        add_custom_target(unit_tests)
+        add_subdirectory(tests EXCLUDE_FROM_ALL)
+    endif ()
+endif ()
 
 # Configure more resources that will be added to the install package
+generateSDKDirectory()
+
+# Handle package generation
 createPackage()
-generatePDBs()
-generateSDKDirectory()
+
+# Accommodate IDEs with FOLDER support
+tweakTargetsForIDESupport()

CMakePresets.json

@@ -28,6 +28,32 @@
       "displayName": "x86_64 Build",
       "description": "x86_64 build",
       "inherits": [ "base" ]
+    },
+    {
+      "name": "xcode",
+      "inherits": [ "base" ],
+      
+      "displayName": "Xcode",
+      "description": "Xcode with external compiler override",
+      "generator": "Xcode",
+      
+      "cacheVariables": {
+        "CMAKE_C_COMPILER": "clang",
+
+        "CMAKE_CXX_COMPILER": "clang++",
+        "CMAKE_CXX_FLAGS": "-fexperimental-library -Wno-shorten-64-to-32 -Wno-deprecated-declarations",
+
+        "IMHEX_IDE_HELPERS_OVERRIDE_XCODE_COMPILER": "ON"
+      }
+    },
+    {
+      "name": "vs2022",
+      "displayName": "Visual Studio 2022",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/build/${presetName}",
+      "cacheVariables": {
+        "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+      }
     }
   ],
   "buildPresets": [

INSTALL.md

@@ -27,6 +27,11 @@ chmod +x imhex-*.AppImage
 ./imhex-*.AppImage
 ```
 
+If you're experiencing glib / libgtk assertion failures, you might need to setup your `XDG_DATA_DIRS` env var correctly. In this case, run the following command before executing the AppImage. (See issue [ImHex/#2038](https://github.com/WerWolv/ImHex/issues/2038))
+```bash
+export XDG_DATA_DIRS="/usr/local/share:/usr/share"
+```
+
 #### Flatpak
 To install the Flatpak, make sure you have the Flathub repository added to your system. Then simply run the following command:
 

README.md

@@ -1,42 +1,30 @@
 <a href="https://imhex.werwolv.net">
   <h1 align="center">
     <picture>
-      <source media="(prefers-color-scheme: dark)" srcset="./resources/projects/logo_text_light.svg">
-      <img height="100px" src="./resources/projects/logo_text_dark.svg">
+      <img height="300px" style="margin: 0; padding: 0" src="./resources/dist/common/logo/ImHexLogoSVGBG.svg">
     </picture>
   </h1>
 </a>
 
-<p align="center">A Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM.</p>
-
 <p align="center">
-  <a title="'Build' workflow Status" href="https://github.com/WerWolv/ImHex/actions?query=workflow%3ABuild">
-    <img alt="'Build' workflow Status" src="https://img.shields.io/github/actions/workflow/status/WerWolv/ImHex/build.yml?longCache=true&style=for-the-badge&label=Build&logoColor=fff&logo=GitHub%20Actions&branch=master">
-  </a>
-  <a title="Discord Server" href="https://discord.gg/X63jZ36xBY">
-    <img alt="Discord Server" src="https://img.shields.io/discord/789833418631675954?label=Discord&logo=Discord&logoColor=fff&style=for-the-badge">
-  </a>
-  <a title="Total Downloads" href="https://github.com/WerWolv/ImHex/releases/latest">
-    <img alt="Total Downloads" src="https://img.shields.io/github/downloads/WerWolv/ImHex/total?longCache=true&style=for-the-badge&label=Downloads&logoColor=fff&logo=GitHub">
-  </a>
-  <a title="Code Quality" href="https://www.codefactor.io/repository/github/werwolv/imhex">
-    <img alt="Code Quality" src="https://img.shields.io/codefactor/grade/github/WerWolv/ImHex?longCache=true&style=for-the-badge&label=Code%20Quality&logoColor=fff&logo=CodeFactor&branch=master">
-  </a>
-  <a title="Translation" href="https://weblate.werwolv.net/projects/imhex/">
-    <img alt="Translation" src="https://img.shields.io/weblate/progress/imhex?logo=weblate&logoColor=%23FFFFFF&server=https%3A%2F%2Fweblate.werwolv.net&style=for-the-badge">
-  </a>
-  <a title="Documentation" href="https://imhex.werwolv.net/docs">
-    <img alt="Documentation" src="https://img.shields.io/badge/Docs-Available-brightgreen?logo=gitbook&logoColor=%23FFFFFF&style=for-the-badge">
-  </a>
-  <a title="Plugins" href="https://github.com/WerWolv/ImHex/blob/master/PLUGINS.md">
-    <img alt="Plugins" src="https://img.shields.io/badge/Plugins-Supported-brightgreen?logo=stackedit&logoColor=%23FFFFFF&style=for-the-badge">
-  </a>
+    A Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM.
+    <br>
+    <a href="https://itinerarium.github.io/phoneme-synthesis/?w=/'ˈɪmhɛks/"><strong>/ˈɪmhɛks/</strong></a>
+</p>
+<p align="center">
+  <a title="'Build' workflow Status" href="https://github.com/WerWolv/ImHex/actions?query=workflow%3ABuild"><img alt="'Build' workflow Status" src="https://img.shields.io/github/actions/workflow/status/WerWolv/ImHex/build.yml?longCache=true&style=for-the-badge&label=Build&logoColor=fff&logo=GitHub%20Actions&branch=master"></a>
+  <a title="Discord Server" href="https://discord.gg/X63jZ36xBY"><img alt="Discord Server" src="https://img.shields.io/discord/789833418631675954?label=Discord&logo=Discord&logoColor=fff&style=for-the-badge"></a>
+  <a title="Total Downloads" href="https://github.com/WerWolv/ImHex/releases/latest"><img alt="Total Downloads" src="https://img.shields.io/github/downloads/WerWolv/ImHex/total?longCache=true&style=for-the-badge&label=Downloads&logoColor=fff&logo=GitHub"></a>
+  <a title="Code Quality" href="https://www.codefactor.io/repository/github/werwolv/imhex"><img alt="Code Quality" src="https://img.shields.io/codefactor/grade/github/WerWolv/ImHex?longCache=true&style=for-the-badge&label=Code%20Quality&logoColor=fff&logo=CodeFactor&branch=master"></a>
+  <a title="Translation" href="https://weblate.werwolv.net/projects/imhex/"><img alt="Translation" src="https://img.shields.io/weblate/progress/imhex?logo=weblate&logoColor=%23FFFFFF&server=https%3A%2F%2Fweblate.werwolv.net&style=for-the-badge"></a>
+  <a title="Plugins" href="https://github.com/WerWolv/ImHex/blob/master/PLUGINS.md"><img alt="Plugins" src="https://img.shields.io/badge/Plugins-Supported-brightgreen?logo=stackedit&logoColor=%23FFFFFF&style=for-the-badge"></a>
 </p>
 
 <p align="center">
-  <a title="Use the Web version of ImHex right in your browser!" href="https://web.imhex.werwolv.net">
-    <img alt="Use the Web version of ImHex right in your browser!" src="resources/dist/common/try_online_banner.png">
-  </a>
+  <a title="Download the latest version of ImHex" href="https://imhex.download"><img alt="Download the latest version of ImHex!" src="resources/dist/common/get_release_banner.png"></a>
+  <a title="Download the latest nightly pre-release version of ImHex" href="https://imhex.download/#nightly"><img alt="Download the latest nightly pre-release version of ImHex" src="resources/dist/common/get_nightly_banner.png"></a>
+  <a title="Use the Web version of ImHex right in your browser!" href="https://web.imhex.werwolv.net"><img alt="Use the Web version of ImHex right in your browser!" src="resources/dist/common/try_online_banner.png"></a>
+  <a title="Read the documentation of ImHex!" href="https://docs.werwolv.net"><img alt="Read the documentation of ImHex!" src="resources/dist/common/read_docs_banner.png"></a>
 </p>
 
 ## Supporting
@@ -44,22 +32,21 @@
 If you like my work, please consider supporting me on GitHub Sponsors, Patreon or PayPal. Thanks a lot!
 
 <p align="center">
-<a href="https://github.com/sponsors/WerWolv"><img src="https://werwolv.net/assets/github_banner.png" alt="GitHub donate button" /> </a>
-<a href="https://www.patreon.com/werwolv"><img src="https://c5.patreon.com/external/logo/become_a_patron_button.png" alt="Patreon donate button" /> </a>
-<a href="https://werwolv.net/donate"><img src="https://werwolv.net/assets/paypal_banner.png" alt="PayPal donate button" /> </a>
+<a href="https://github.com/sponsors/WerWolv"><img src="https://werwolv.net/assets/github_banner.png" alt="GitHub donate button" /></a>
+<a href="https://www.patreon.com/werwolv"><img src="https://c5.patreon.com/external/logo/become_a_patron_button.png" alt="Patreon donate button" /></a>
+<a href="https://werwolv.net/donate"><img src="https://werwolv.net/assets/paypal_banner.png" alt="PayPal donate button" /></a>
 </p>
 
 ## Screenshots
-
-![Hex editor, patterns and data information](https://private-user-images.githubusercontent.com/10835354/290512928-ae20c3ce-4c02-4579-9471-640f43fd6bad.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTEiLCJleHAiOjE3MDMyNDk0NTksIm5iZiI6MTcwMzI0OTE1OSwicGF0aCI6Ii8xMDgzNTM1NC8yOTA1MTI5MjgtYWUyMGMzY2UtNGMwMi00NTc5LTk0NzEtNjQwZjQzZmQ2YmFkLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFJV05KWUFYNENTVkVINTNBJTJGMjAyMzEyMjIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjMxMjIyVDEyNDU1OVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTFmN2RhYmNlYWVjYzI0YWQxNjE0YjI1NDNjMTQ2MGFlODhkMmYzMTVkY2Y3MzNlYzUzYTM3N2IwNWE4OGY2YTAmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.RbVnFXxuJS0xUoWbdgqCHtd-BopaFCyDypAfgkzGezU)
-![Bookmarks, disassembler and data processor](https://user-images.githubusercontent.com/10835354/139717323-1f8c9d52-f7eb-4f43-9f11-097ac728ed6c.png)
+![Hex editor, patterns and data information](https://github.com/user-attachments/assets/902a7c4c-410d-490f-999e-14c856fec027)
+![Bookmarks, data information, find view and data processor](https://github.com/user-attachments/assets/58eefa1f-31c9-4bb8-a1c1-8cdd8ddbd29f)
 
 <details>
 <summary><strong>More Screenshots</strong></summary>
 
-![Data Processor decrypting some data and displaying it as an image](https://private-user-images.githubusercontent.com/10835354/290514353-d7f53f91-09e9-46c4-a720-e979c1c4e820.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTEiLCJleHAiOjE3MDMyNDk0NTksIm5iZiI6MTcwMzI0OTE1OSwicGF0aCI6Ii8xMDgzNTM1NC8yOTA1MTQzNTMtZDdmNTNmOTEtMDllOS00NmM0LWE3MjAtZTk3OWMxYzRlODIwLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFJV05KWUFYNENTVkVINTNBJTJGMjAyMzEyMjIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjMxMjIyVDEyNDU1OVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWE4OGIxNjg0NDcyMWVkYTMzOTAzMTAxMmJlNjE2ZjVkMTVmNzhlMDU1ZWNhODQyZjNjYTgzMzgzYjYyODVlNzQmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.Y4VAVgSPBZI3Q1gDehPuoC98pQXVe-z9FUWhvDAV-1g)
-![STL Parser written in the Pattern Language visualizing a 3D model](https://private-user-images.githubusercontent.com/10835354/290517253-426d83c5-f6b7-4b69-aa87-05e48ab73e24.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTEiLCJleHAiOjE3MDMyNDk0NTksIm5iZiI6MTcwMzI0OTE1OSwicGF0aCI6Ii8xMDgzNTM1NC8yOTA1MTcyNTMtNDI2ZDgzYzUtZjZiNy00YjY5LWFhODctMDVlNDhhYjczZTI0LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFJV05KWUFYNENTVkVINTNBJTJGMjAyMzEyMjIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjMxMjIyVDEyNDU1OVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWJlMmJmZDYzOTgyZGYxOWQ5MmJhMTMyMzA2YWE3YmU0ODJlY2MwYmQxM2RlODc1MTgwYTQ5ZGYxMWNkY2JlNjAmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.lsJSbAnAWZNXm_bteUWZUM96Nd4qKhk3H3WZtjsFQB4)
-![Data Information view displaying various stats about the file](https://private-user-images.githubusercontent.com/10835354/290517882-1601cd05-e50b-41f7-8272-cb9af9e6fb81.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTEiLCJleHAiOjE3MDMyNDk0NTksIm5iZiI6MTcwMzI0OTE1OSwicGF0aCI6Ii8xMDgzNTM1NC8yOTA1MTc4ODItMTYwMWNkMDUtZTUwYi00MWY3LTgyNzItY2I5YWY5ZTZmYjgxLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFJV05KWUFYNENTVkVINTNBJTJGMjAyMzEyMjIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjMxMjIyVDEyNDU1OVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWRlZjNmNDA4NThlZjFmOTdmYWVlNGIxODQ3MDdmZDkzZGM4ZDEwOWZmNWRiMmM3NjNlODFiMTQ5ZTFhZTRlOTMmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.AWm3GajW2KkNMT7AWhhCYca18UbXqZCS3-8RG4YN_ng)
+![Data Processor decrypting some data and displaying it as an image](https://github.com/WerWolv/ImHex/assets/10835354/d0623081-3094-4840-a8a8-647b38724db8)
+![STL Parser written in the Pattern Language visualizing a 3D model](https://github.com/WerWolv/ImHex/assets/10835354/62cbcd18-1c3f-4dd6-a877-2bf2bf4bb2a5)
+![Data Information view displaying various stats about the file](https://github.com/WerWolv/ImHex/assets/10835354/d4706c01-c258-45c9-80b8-fe7a10d5a1de)
 
 </details>
 
@@ -124,7 +111,7 @@ If you like my work, please consider supporting me on GitHub Sponsors, Patreon o
 <details>
   <summary><strong>Data Inspector</strong></summary>
 
-  - Interpreting data as many different types with endianess, decimal, hexadecimal and octal support and bit inversion
+  - Interpreting data as many different types with endianness, decimal, hexadecimal and octal support and bit inversion
     - Unsigned and signed integers (8, 16, 24, 32, 48, 64 bit)
     - Floats (16, 32, 64 bit)
     - Signed and Unsigned LEB128
@@ -173,7 +160,7 @@ If you like my work, please consider supporting me on GitHub Sponsors, Patreon o
   - Numeric Value search
     - Search for signed/unsigned integers and floats
     - Search for ranges of values
-    - Option to specify size and endianess
+    - Option to specify size and endianness
     - Option to ignore unaligned values
 </details>
 <details>
@@ -327,22 +314,26 @@ To use ImHex, the following minimal system requirements need to be met.
 > ImHex requires a GPU with OpenGL 3.0 support in general.
 > There are releases available (with the `-NoGPU` suffix) that are software rendered and don't require a GPU, however these can be a lot slower than the GPU accelerated versions.
 > 
-> If possible at all, make ImHex use the dedicated GPU on your system instead of the integrated one (especially Intel HD GPUs are known to cause issues).
+> If possible at all, make ImHex use the dedicated GPU on your system instead of the integrated one.
+> ImHex will usually run fine with integrated GPUs as well but certain Intel HD GPU drivers on Windows are known to cause graphical artifacts.
 
 - **OS**: 
   - **Windows**: Windows 7 or higher (Windows 10/11 recommended)
-  - **macOS**: macOS 11 (Big Sur) or higher, 
+  - **macOS**: macOS 13 (Ventura) or higher, 
+    - Lower versions should still work too, but you'll need to compile ImHex yourself. The release binaries will NOT work.
+    - The macOS build is not signed and will require you to manually allow them in the Security & Privacy settings.
   - **Linux**: "Modern" Linux. The following distributions have official releases available. Other distros are supported through the AppImage and Flatpak releases.
-    - Ubuntu 22.04/23.04
-    - Fedora 36/37
-    - RHEL/AlmaLinux 9
+    - Ubuntu and Debian
+    - Fedora
+    - RHEL/AlmaLinux
     - Arch Linux
-- **CPU**: x86_64 (64 Bit)
+    - Basically any other distro will work as well when compiling ImHex from sources.
+- **CPU**: Officially supported are x86_64 and ARM64, though any Little Endian 64 bit CPU should work.
 - **GPU**: OpenGL 3.0 or higher 
-  - Intel HD drivers are really buggy and often cause graphic artifacts
+  - Integrated Intel HD iGPUs are supported, however certain drivers are known to cause various graphical artifacts, especially on Windows. Use at your own risk.
   - In case you don't have a GPU available, there are software rendered releases available for Windows and macOS
-- **RAM**: 256MB, more may be required for more complicated analysis
-- **Storage**: 100MB
+- **RAM**: ~150MiB, more is required for more complex analysis
+- **Storage**: 150MiB
 
 ## Installing
 
@@ -351,8 +342,10 @@ Information on how to install ImHex can be found in the [Install](/INSTALL.md) g
 ## Compiling
 
 To compile ImHex on any platform, GCC (or Clang) is required with a version that supports C++23 or higher. 
-On macOS, Clang is also required to compile some ObjC code.
-All releases are being built using latest available GCC.
+Windows and Linux releases are being built using latest available GCC.
+MacOS releases are being built using latest available LLVM Clang.
+
+Important to note is, the MSVC and AppleClang compilers are both **NOT** supported since they're both generally severely outdated and lack features GCC and LLVM Clang have.
 
 > [!NOTE]
 > Many dependencies are bundled into the repository using submodules so make sure to clone it using the `--recurse-submodules` option.
@@ -365,31 +358,44 @@ See [Contributing](/CONTRIBUTING.md)
 
 ## Plugin development
 
-To develop plugins for ImHex, use one of the following two templates projects to get started. You then have access to the entirety of libimhex as well as the ImHex API and the Content Registry to interact with ImHex or to add new content.
-- [C++ Plugin Template](https://github.com/WerWolv/ImHex-Cpp-Plugin-Template)
-- [Rust Plugin Template](https://github.com/WerWolv/ImHex-Rust-Plugin-Template)
+To develop plugins for ImHex, use the following template project to get started. You then have access to the entirety of libimhex as well as the ImHex API and the Content Registry to interact with ImHex or to add new content.
+- [ImHex Plugin Template](https://github.com/WerWolv/ImHex-Plugin-Template)
 
 
 ## Credits
 
 ### Contributors
 
+- [iTrooz](https://github.com/iTrooz) for getting ImHex onto the Web as well as hundreds of contributions in every part of the project
+- [jumanji144](https://github.com/jumanji144) for huge contributions to the Pattern Language and ImHex's infrastructure
 - [Mary](https://github.com/marysaka) for her immense help porting ImHex to MacOS and help during development
 - [Roblabla](https://github.com/Roblabla) for adding MSI Installer support to ImHex
-- [jam1garner](https://github.com/jam1garner) and [raytwo](https://github.com/raytwo) for their help with adding Rust support to plugins
 - [Mailaender](https://github.com/Mailaender) for getting ImHex onto Flathub
-- [iTrooz](https://github.com/iTrooz) for many improvements and new features to Imhex
 - Everybody else who has reported issues on Discord or GitHub that I had great conversations with :)
 
 ### Dependencies
 
 - Thanks a lot to ocornut for their amazing [Dear ImGui](https://github.com/ocornut/imgui) which is used for building the entire interface
-  - Thanks to ocornut as well for their hex editor view used as base for this project.
-  - Thanks to BalazsJako for their incredible [ImGuiColorTextEdit](https://github.com/BalazsJako/ImGuiColorTextEdit) used for the pattern language syntax highlighting
-- Thanks to nlohmann for their [json](https://github.com/nlohmann/json) library used for project files
-- Thanks to aquynh for [capstone](https://github.com/aquynh/capstone) which is the base of the disassembly window
+  - Thanks to epezent for [ImPlot](https://github.com/epezent/implot) used to plot data in various places
+  - Thanks to Nelarius for [ImNodes](https://github.com/Nelarius/imnodes) used as base for the data processor 
+  - Thanks to BalazsJako for [ImGuiColorTextEdit](https://github.com/BalazsJako/ImGuiColorTextEdit) used for the pattern language syntax highlighting
+- Thanks to nlohmann for their [json](https://github.com/nlohmann/json) library used for configuration files
 - Thanks to vitaut for their [libfmt](https://github.com/fmtlib/fmt) library which makes formatting and logging so much better
+- Thanks to btzy for [nativefiledialog-extended](https://github.com/btzy/nativefiledialog-extended) and their great support, used for handling file dialogs on all platforms
+- Thanks to danyspin97 for [xdgpp](https://sr.ht/~danyspin97/xdgpp) used to handle folder paths on Linux
+- Thanks to aquynh for [capstone](https://github.com/aquynh/capstone) which is the base of the disassembly window
 - Thanks to rxi for [microtar](https://github.com/rxi/microtar) used for extracting downloaded store assets 
-- Thanks to btzy for [nativefiledialog-extended](https://github.com/btzy/nativefiledialog-extended)
-- Thanks to danyspin97 for [xdgpp](https://sr.ht/~danyspin97/xdgpp)
+- Thanks to VirusTotal for [Yara](https://github.com/VirusTotal/yara) used by the Yara plugin
+- Thanks to Martinsos for [edlib](https://github.com/Martinsos/edlib) used for sequence searching in the diffing view
+- Thanks to ron4fun for [HashLibPlus](https://github.com/ron4fun/HashLibPlus) which implements every hashing algorithm under the sun
+- Thanks to mackron for [miniaudio](https://github.com/mackron/miniaudio) used to play audio files
 - Thanks to all other groups and organizations whose libraries are used in ImHex
+
+### License
+
+The biggest part of ImHex is under the GPLv2-only license. 
+Notable exceptions to this are the following parts which are under the LGPLv2.1 license:
+- **/lib/libimhex**: The library that allows Plugins to interact with ImHex.
+- **/plugins/ui**: The UI plugin library that contains some common UI elements that can be used by other plugins
+
+The reason for this is to allow for proprietary plugins to be developed for ImHex.

VERSION

@@ -1 +1 @@
-1.32.2
+1.37.0

cmake/build_helpers.cmake

@@ -1,3 +1,73 @@
+# Some libraries we use set the BUILD_SHARED_LIBS variable to ON, which causes CMake to
+# display a warning about options being set using set() instead of option().
+# Explicitly set the policy to NEW to suppress the warning.
+set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
+
+set(CMAKE_POLICY_DEFAULT_CMP0063 NEW)
+
+if (POLICY CMP0177)
+    set(CMAKE_POLICY_DEFAULT_CMP0177 OLD)
+    cmake_policy(SET CMP0177 OLD)
+endif()
+
+function(getTarget target type)
+    get_target_property(IMPORTED_TARGET ${target} IMPORTED)
+    if (IMPORTED_TARGET)
+        set(${type} INTERFACE PARENT_SCOPE)
+    else()
+        set(${type} PRIVATE PARENT_SCOPE)
+    endif()
+endfunction()
+
+function(addCFlag)
+    if (ARGC EQUAL 1)
+        add_compile_options($<$<COMPILE_LANGUAGE:C>:${ARGV0}>)
+    elseif (ARGC EQUAL 2)
+        getTarget(${ARGV1} TYPE)
+        target_compile_options(${ARGV1} ${TYPE} $<$<COMPILE_LANGUAGE:C>:${ARGV0}>)
+    endif()
+endfunction()
+
+function(addCXXFlag)
+    if (ARGC EQUAL 1)
+        add_compile_options($<$<COMPILE_LANGUAGE:CXX>:${ARGV0}>)
+    elseif (ARGC EQUAL 2)
+        getTarget(${ARGV1} TYPE)
+        target_compile_options(${ARGV1} ${TYPE} $<$<COMPILE_LANGUAGE:CXX>:${ARGV0}>)
+    endif()
+endfunction()
+
+function(addObjCFlag)
+    if (ARGC EQUAL 1)
+        add_compile_options($<$<COMPILE_LANGUAGE:OBJC>:${ARGV0}>)
+    elseif (ARGC EQUAL 2)
+        getTarget(${ARGV1} TYPE)
+        target_compile_options(${ARGV1} ${TYPE} $<$<COMPILE_LANGUAGE:OBJC>:${ARGV0}>)
+    endif()
+endfunction()
+
+function(addLinkerFlag)
+    if (ARGC EQUAL 1)
+        add_link_options(${ARGV0})
+    elseif (ARGC EQUAL 2)
+        getTarget(${ARGV1} TYPE)
+        target_link_options(${ARGV1} ${TYPE} ${ARGV0})
+    endif()
+endfunction()
+
+function(addCCXXFlag)
+    addCFlag(${ARGV0} ${ARGV1})
+    addCXXFlag(${ARGV0} ${ARGV1})
+endfunction()
+
+function(addCommonFlag)
+    addCFlag(${ARGV0} ${ARGV1})
+    addCXXFlag(${ARGV0} ${ARGV1})
+    addObjCFlag(${ARGV0} ${ARGV1})
+endfunction()
+
+set(CMAKE_WARN_DEPRECATED OFF CACHE BOOL "Disable deprecated warnings" FORCE)
+
 include(FetchContent)
 
 if(IMHEX_STRIP_RELEASE)
@@ -22,7 +92,7 @@ macro(addDefines)
         add_compile_definitions(NDEBUG)
     elseif (CMAKE_BUILD_TYPE STREQUAL "Debug")
         set(IMHEX_VERSION_STRING ${IMHEX_VERSION_STRING}-Debug)
-        add_compile_definitions(DEBUG _GLIBCXX_DEBUG _GLIBCXX_VERBOSE)
+        add_compile_definitions(DEBUG)
     elseif (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
         set(IMHEX_VERSION_STRING ${IMHEX_VERSION_STRING})
         add_compile_definitions(NDEBUG)
@@ -31,6 +101,10 @@ macro(addDefines)
         add_compile_definitions(NDEBUG)
     endif ()
 
+    if (IMHEX_ENABLE_STD_ASSERTS)
+        add_compile_definitions(_GLIBCXX_DEBUG _GLIBCXX_VERBOSE)
+    endif()
+
     if (IMHEX_STATIC_LINK_PLUGINS)
         add_compile_definitions(IMHEX_STATIC_LINK_PLUGINS)
     endif ()
@@ -42,6 +116,9 @@ function(addDefineToSource SOURCE DEFINE)
             APPEND
             PROPERTY COMPILE_DEFINITIONS "${DEFINE}"
     )
+
+    # Disable precompiled headers for this file
+    set_source_files_properties(${SOURCE} PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
 endfunction()
 
 # Detect current OS / System
@@ -51,6 +128,10 @@ macro(detectOS)
         set(CMAKE_INSTALL_BINDIR ".")
         set(CMAKE_INSTALL_LIBDIR ".")
         set(PLUGINS_INSTALL_LOCATION "plugins")
+        add_compile_definitions(WIN32_LEAN_AND_MEAN)
+        add_compile_definitions(NOMINMAX)
+        add_compile_definitions(UNICODE)
+        add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
     elseif (APPLE)
         add_compile_definitions(OS_MACOS)
         set(CMAKE_INSTALL_BINDIR ".")
@@ -62,6 +143,9 @@ macro(detectOS)
         add_compile_definitions(OS_WEB)
     elseif (UNIX AND NOT APPLE)
         add_compile_definitions(OS_LINUX)
+        if (BSD AND BSD STREQUAL "FreeBSD")
+            add_compile_definitions(OS_FREEBSD)
+        endif()
         include(GNUInstallDirs)
 
         if(IMHEX_PLUGINS_IN_SHARE)
@@ -81,6 +165,8 @@ macro(detectOS)
 endmacro()
 
 macro(configurePackingResources)
+    set(LIBRARY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
     if (WIN32)
         if (NOT (CMAKE_BUILD_TYPE STREQUAL "Debug"))
             set(APPLICATION_TYPE WIN32)
@@ -96,7 +182,7 @@ macro(configurePackingResources)
             set(CPACK_WIX_PRODUCT_ICON "${PROJECT_SOURCE_DIR}/resources/dist/windows/icon.ico")
             set(CPACK_WIX_UI_BANNER "${PROJECT_SOURCE_DIR}/resources/dist/windows/wix_banner.png")
             set(CPACK_WIX_UI_DIALOG "${PROJECT_SOURCE_DIR}/resources/dist/windows/wix_dialog.png")
-            set(CPACK_WIX_CULTURES "en-US;de-DE;ja-JP;it-IT;pt-BR;zh-CN;zh-TW")
+            set(CPACK_WIX_CULTURES "en-US;de-DE;ja-JP;it-IT;pt-BR;zh-CN;zh-TW;ru-RU")
             set(CPACK_PACKAGE_INSTALL_DIRECTORY "ImHex")
             set_property(INSTALL "$<TARGET_FILE_NAME:main>"
                     PROPERTY CPACK_START_MENU_SHORTCUTS "ImHex"
@@ -116,7 +202,8 @@ macro(configurePackingResources)
             set(MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/resources/dist/macos/Info.plist.in")
             set(MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
             set(MACOSX_BUNDLE_GUI_IDENTIFIER "net.WerWolv.ImHex")
-            set(MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_VERSION}-${IMHEX_COMMIT_HASH_SHORT}")
+            string(SUBSTRING "${IMHEX_COMMIT_HASH_LONG}" 0 7 COMMIT_HASH_SHORT)
+            set(MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_VERSION}-${COMMIT_HASH_SHORT}")
             set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
 
             string(TIMESTAMP CURR_YEAR "%Y")
@@ -133,21 +220,17 @@ macro(configurePackingResources)
     endif()
 endmacro()
 
-macro(createPackage)
-    set(LIBRARY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-
+macro(addPluginDirectories)
     file(MAKE_DIRECTORY "plugins")
     foreach (plugin IN LISTS PLUGINS)
         add_subdirectory("plugins/${plugin}")
         if (TARGET ${plugin})
-            set_target_properties(${plugin} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins)
-            set_target_properties(${plugin} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins)
+            set_target_properties(${plugin} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${IMHEX_MAIN_OUTPUT_DIRECTORY}/plugins")
+            set_target_properties(${plugin} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${IMHEX_MAIN_OUTPUT_DIRECTORY}/plugins")
 
             if (APPLE)
                 if (IMHEX_GENERATE_PACKAGE)
                     set_target_properties(${plugin} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PLUGINS_INSTALL_LOCATION})
-                else ()
-                    set_target_properties(${plugin} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins)
                 endif ()
             else ()
                 if (WIN32)
@@ -166,9 +249,9 @@ macro(createPackage)
             add_dependencies(imhex_all ${plugin})
         endif ()
     endforeach()
+endmacro()
 
-    set_target_properties(libimhex PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-
+macro(createPackage)
     if (WIN32)
         # Install binaries directly in the prefix, usually C:\Program Files\ImHex.
         set(CMAKE_INSTALL_BINDIR ".")
@@ -205,7 +288,6 @@ macro(createPackage)
         endforeach()
         ]])
 
-        install(FILES "$<TARGET_FILE:libimhex>" DESTINATION "${CMAKE_INSTALL_LIBDIR}" PERMISSIONS ${LIBRARY_PERMISSIONS})
         downloadImHexPatternsFiles("./")
     elseif(UNIX AND NOT APPLE)
 
@@ -215,8 +297,8 @@ macro(createPackage)
 
         install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION ${CMAKE_INSTALL_PREFIX}/share/licenses/imhex)
         install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dist/imhex.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
-        install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/icon.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME imhex.png)
-        install(FILES "$<TARGET_FILE:libimhex>" DESTINATION "${CMAKE_INSTALL_LIBDIR}" PERMISSIONS ${LIBRARY_PERMISSIONS})
+        install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dist/imhex.mime.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mime/packages RENAME imhex.xml)
+        install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/icon.svg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME imhex.svg)
         downloadImHexPatternsFiles("./share/imhex")
 
         # install AppStream file
@@ -230,6 +312,7 @@ macro(createPackage)
 
     if (APPLE)
         if (IMHEX_GENERATE_PACKAGE)
+            set(EXTRA_BUNDLE_LIBRARY_PATHS ${EXTRA_BUNDLE_LIBRARY_PATHS} "${IMHEX_SYSTEM_LIBRARY_PATH}")
             include(PostprocessBundle)
 
             set_target_properties(libimhex PROPERTIES SOVERSION ${IMHEX_VERSION})
@@ -237,14 +320,14 @@ macro(createPackage)
             set_property(TARGET main PROPERTY MACOSX_BUNDLE_INFO_PLIST ${MACOSX_BUNDLE_INFO_PLIST})
 
             # Fix rpath
-            add_custom_command(TARGET imhex_all POST_BUILD COMMAND ${CMAKE_INSTALL_NAME_TOOL} -add_rpath "@executable_path/../Frameworks/" $<TARGET_FILE:main>)
+            install(CODE "execute_process(COMMAND ${CMAKE_INSTALL_NAME_TOOL} -add_rpath \"@executable_path/../Frameworks/\" $<TARGET_FILE:main>)")
 
             add_custom_target(build-time-make-plugins-directory ALL COMMAND ${CMAKE_COMMAND} -E make_directory "${IMHEX_BUNDLE_PATH}/Contents/MacOS/plugins")
             add_custom_target(build-time-make-resources-directory ALL COMMAND ${CMAKE_COMMAND} -E make_directory "${IMHEX_BUNDLE_PATH}/Contents/Resources")
 
-            downloadImHexPatternsFiles("${IMHEX_BUNDLE_PATH}/Contents/MacOS")
+            downloadImHexPatternsFiles("${CMAKE_INSTALL_PREFIX}/${BUNDLE_NAME}/Contents/MacOS")
 
-            install(FILES ${IMHEX_ICON} DESTINATION "${IMHEX_BUNDLE_PATH}/Contents/Resources")
+            install(FILES ${IMHEX_ICON} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BUNDLE_NAME}/Contents/Resources")
             install(TARGETS main BUNDLE DESTINATION ".")
 
             # Update library references to make the bundle portable
@@ -254,13 +337,19 @@ macro(createPackage)
             set(CPACK_GENERATOR "DragNDrop")
 
             set(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/resources/dist/macos/AppIcon.icns")
-            set(CPACK_BUNDLE_PLIST "${CMAKE_BINARY_DIR}/${BUNDLE_NAME}/Contents/Info.plist")
+            set(CPACK_BUNDLE_PLIST "${CMAKE_INSTALL_PREFIX}/${BUNDLE_NAME}/Contents/Info.plist")
 
-            # Sign the bundle
-            find_program(CODESIGN_PATH codesign)
-            if (CODESIGN_PATH)
-                add_custom_command(TARGET imhex_all POST_BUILD COMMAND ${CODESIGN_PATH} --force --deep --sign - ${CMAKE_BINARY_DIR}/${BUNDLE_NAME})
+            if (IMHEX_RESIGN_BUNDLE)
+                find_program(CODESIGN_PATH codesign)
+                if (CODESIGN_PATH)
+                    install(CODE "message(STATUS \"Signing bundle '${CMAKE_INSTALL_PREFIX}/${BUNDLE_NAME}'...\")")
+                    install(CODE "execute_process(COMMAND ${CODESIGN_PATH} --force --deep --entitlements ${CMAKE_SOURCE_DIR}/resources/macos/Entitlements.plist --sign - ${CMAKE_INSTALL_PREFIX}/${BUNDLE_NAME} COMMAND_ERROR_IS_FATAL ANY)")
+                endif()
             endif()
+
+            install(CODE [[ message(STATUS "MacOS Bundle finalized. DO NOT TOUCH IT ANYMORE! ANY MODIFICATIONS WILL BREAK IT FROM NOW ON!") ]])
+        else()
+            downloadImHexPatternsFiles("${IMHEX_MAIN_OUTPUT_DIRECTORY}")
         endif()
     else()
         install(TARGETS main RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -292,8 +381,7 @@ endfunction()
 macro(configureCMake)
     message(STATUS "Configuring ImHex v${IMHEX_VERSION}")
 
-    # Enable C and C++ languages
-    enable_language(C CXX)
+    set(CMAKE_POSITION_INDEPENDENT_CODE ON CACHE BOOL "Enable position independent code for all targets" FORCE)
 
     # Configure use of recommended build tools
     if (IMHEX_USE_DEFAULT_BUILD_SETTINGS)
@@ -326,8 +414,11 @@ macro(configureCMake)
 
         if (LD_LLD_PATH)
             set(CMAKE_LINKER ${LD_LLD_PATH})
-            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-ld=lld")
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=lld")
+
+            if (NOT XCODE AND NOT MSVC)
+                set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -fuse-ld=lld)
+                set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -fuse-ld=lld)
+            endif()
         else ()
             message(WARNING "lld not found, using default linker!")
         endif ()
@@ -351,13 +442,20 @@ macro(configureCMake)
             message(WARNING "LTO is not supported: ${output_error}")
         endif ()
     endif ()
-
-    # Some libraries we use set the BUILD_SHARED_LIBS variable to ON, which causes CMake to
-    # display a warning about options being set using set() instead of option().
-    # Explicitly set the policy to NEW to suppress the warning.
-    set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 endmacro()
 
+function(configureProject)
+    # Enable C and C++ languages
+    enable_language(C CXX)
+
+    if (XCODE)
+        # Support Xcode's multi configuration paradigm by placing built artifacts into separate directories
+        set(IMHEX_MAIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Configs/$<CONFIG>" PARENT_SCOPE)
+    else()
+        set(IMHEX_MAIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" PARENT_SCOPE)
+    endif()
+endfunction()
+
 macro(setDefaultBuiltTypeIfUnset)
     if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
         set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Using RelWithDebInfo build type as it was left unset" FORCE)
@@ -365,12 +463,14 @@ macro(setDefaultBuiltTypeIfUnset)
     endif()
 endmacro()
 
-function(loadVersion version)
+function(loadVersion version plain_version)
     set(VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/VERSION")
     set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${VERSION_FILE})
     file(READ "${VERSION_FILE}" read_version)
     string(STRIP ${read_version} read_version)
+    string(REPLACE ".WIP" "" read_version_plain ${read_version})
     set(${version} ${read_version} PARENT_SCOPE)
+    set(${plain_version} ${read_version_plain} PARENT_SCOPE)
 endfunction()
 
 function(detectBadClone)
@@ -397,6 +497,8 @@ function(verifyCompiler)
         message(FATAL_ERROR "ImHex requires GCC 12.0.0 or newer. Please use the latest GCC version.")
     elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "17.0.0")
         message(FATAL_ERROR "ImHex requires Clang 17.0.0 or newer. Please use the latest Clang version.")
+    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        
     elseif (NOT (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
         message(FATAL_ERROR "ImHex can only be compiled with GCC or Clang. ${CMAKE_CXX_COMPILER_ID} is not supported.")
     endif()
@@ -460,56 +562,170 @@ function(downloadImHexPatternsFiles dest)
         message(STATUS "Finished downloading ImHex-Patterns")
 
     else ()
+        set(imhex_patterns_SOURCE_DIR "")
+
         # Maybe patterns are cloned to a subdirectory
-        set(imhex_patterns_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ImHex-Patterns")
+        if (NOT EXISTS ${imhex_patterns_SOURCE_DIR})
+            set(imhex_patterns_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ImHex-Patterns")
+        endif()
+
+        # Or a sibling directory
+        if (NOT EXISTS ${imhex_patterns_SOURCE_DIR})
+            set(imhex_patterns_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../ImHex-Patterns")
+        endif()
     endif ()
 
-    if (EXISTS ${imhex_patterns_SOURCE_DIR})
+    if (NOT EXISTS ${imhex_patterns_SOURCE_DIR})
+        message(WARNING "Failed to locate ImHex-Patterns repository, some resources will be missing during install!")
+    elseif(XCODE)
+        # The Xcode build has multiple configurations, which each need a copy of these files
+        file(GLOB_RECURSE sourceFilePaths LIST_DIRECTORIES NO CONFIGURE_DEPENDS RELATIVE "${imhex_patterns_SOURCE_DIR}"
+            "${imhex_patterns_SOURCE_DIR}/constants/*"
+            "${imhex_patterns_SOURCE_DIR}/encodings/*"
+            "${imhex_patterns_SOURCE_DIR}/includes/*"
+            "${imhex_patterns_SOURCE_DIR}/patterns/*"
+            "${imhex_patterns_SOURCE_DIR}/magic/*"
+            "${imhex_patterns_SOURCE_DIR}/nodes/*"
+        )
+        list(FILTER sourceFilePaths EXCLUDE REGEX "_schema.json$")
+
+        foreach(relativePath IN LISTS sourceFilePaths)
+            file(GENERATE OUTPUT "${dest}/${relativePath}" INPUT "${imhex_patterns_SOURCE_DIR}/${relativePath}")
+        endforeach()
+    else()
         set(PATTERNS_FOLDERS_TO_INSTALL constants encodings includes patterns magic nodes)
         foreach (FOLDER ${PATTERNS_FOLDERS_TO_INSTALL})
-            install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION ${dest} PATTERN "**/_schema.json" EXCLUDE)
+            install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION "${dest}" PATTERN "**/_schema.json" EXCLUDE)
         endforeach ()
     endif ()
 
 endfunction()
 
+# Compress debug info. See https://github.com/WerWolv/ImHex/issues/1714 for relevant problem
+macro(setupDebugCompressionFlag)
+    include(CheckCXXCompilerFlag)
+    include(CheckLinkerFlag)
+
+    check_cxx_compiler_flag(-gz=zstd ZSTD_AVAILABLE_COMPILER)
+    check_linker_flag(CXX -gz=zstd ZSTD_AVAILABLE_LINKER)
+    check_cxx_compiler_flag(-gz COMPRESS_AVAILABLE_COMPILER)
+    check_linker_flag(CXX -gz COMPRESS_AVAILABLE_LINKER)
+
+    if (NOT DEBUG_COMPRESSION_FLAG) # Cache variable
+        if (ZSTD_AVAILABLE_COMPILER AND ZSTD_AVAILABLE_LINKER)
+            message("Using Zstd compression for debug info because both compiler and linker support it")
+            set(DEBUG_COMPRESSION_FLAG "-gz=zstd" CACHE STRING "Cache to use for debug info compression")
+        elseif (COMPRESS_AVAILABLE_COMPILER AND COMPRESS_AVAILABLE_LINKER)
+            message("Using default compression for debug info because both compiler and linker support it")
+            set(DEBUG_COMPRESSION_FLAG "-gz" CACHE STRING "Cache to use for debug info compression")
+        else()
+            set(DEBUG_COMPRESSION_FLAG "" CACHE STRING "Cache to use for debug info compression")
+        endif()
+    endif()
+
+    addCommonFlag(${DEBUG_COMPRESSION_FLAG})
+endmacro()
+
 macro(setupCompilerFlags target)
-    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+    if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+        addCommonFlag("/W4" ${target})
+        addCommonFlag("/wd4127" ${target}) # conditional expression is constant
+        addCommonFlag("/wd4242" ${target}) # 'identifier': conversion from 'type1' to 'type2', possible loss of data
+        addCommonFlag("/wd4244" ${target}) # 'conversion': conversion from 'type1' to 'type2', possible loss of data
+        addCommonFlag("/wd4267" ${target}) # 'var': conversion from 'size_t' to 'type', possible loss of data
+        addCommonFlag("/wd4305" ${target}) # truncation from 'double' to 'float'
+        addCommonFlag("/wd4996" ${target}) # 'function': was declared deprecated
+
+        if (IMHEX_STRICT_WARNINGS)
+            addCommonFlag("/WX" ${target})
+        endif()
+    elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+        addCommonFlag("-Wall" ${target})
+        addCommonFlag("-Wextra" ${target})
+        addCommonFlag("-Wpedantic" ${target})
 
         # Define strict compilation flags
         if (IMHEX_STRICT_WARNINGS)
-            set(IMHEX_COMMON_FLAGS "${IMHEX_COMMON_FLAGS} -Wall -Wextra -Wpedantic -Werror")
+             addCommonFlag("-Werror" ${target})
         endif()
 
         if (UNIX AND NOT APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-            set(IMHEX_COMMON_FLAGS "${IMHEX_COMMON_FLAGS} -rdynamic")
+            addCommonFlag("-rdynamic" ${target})
         endif()
 
-        set(IMHEX_CXX_FLAGS "-fexceptions -frtti")
+        addCXXFlag("-fexceptions" ${target})
+        addCXXFlag("-frtti" ${target})
 
         # Disable some warnings
-        set(IMHEX_C_CXX_FLAGS "-Wno-unknown-warning-option -Wno-array-bounds -Wno-deprecated-declarations")
+        addCCXXFlag("-Wno-array-bounds" ${target})
+        addCCXXFlag("-Wno-deprecated-declarations" ${target})
+        addCCXXFlag("-Wno-unknown-pragmas" ${target})
 
-        if (IMHEX_ENABLE_UNITY_BUILD AND WIN32)
-            set(IMHEX_COMMON_FLAGS "${IMHEX_COMMON_FLAGS} -Wa,-mbig-obj")
+        # Enable hardening flags
+        addCommonFlag("-U_FORTIFY_SOURCE" ${target})
+        addCommonFlag("-D_FORTIFY_SOURCE=3" ${target})
+
+        if (NOT EMSCRIPTEN)
+            addCommonFlag("-fstack-protector-strong" ${target})
+        endif()
+    endif()
+
+    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+        if (WIN32)
+            addLinkerFlag("-Wa,mbig-obj" ${target})
         endif ()
     endif()
 
+    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND APPLE)
+        execute_process(COMMAND brew --prefix llvm OUTPUT_VARIABLE LLVM_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
+        set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -L${LLVM_PREFIX}/lib/c++")
+        set(CMAKE_SHARED_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -L${LLVM_PREFIX}/lib/c++")
+        addCCXXFlag("-Wno-unknown-warning-option" ${target})
+
+        if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+            add_compile_definitions(_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG)
+        else()
+            add_compile_definitions(_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE)
+        endif()
+    endif()
+
+    if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+        addCommonFlag("/bigobj" ${target})
+        addCFlag("/std:clatest" ${target})
+        addCXXFlag("/std:c++latest" ${target})
+    endif()
+
     # Disable some warnings for gcc
-    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-        set(IMHEX_C_CXX_FLAGS "${IMHEX_C_CXX_FLAGS} -Wno-restrict -Wno-stringop-overread -Wno-stringop-overflow -Wno-dangling-reference")
+    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+        addCCXXFlag("-Wno-restrict" ${target})
+        addCCXXFlag("-Wno-stringop-overread" ${target})
+        addCCXXFlag("-Wno-stringop-overflow" ${target})
+        addCCXXFlag("-Wno-dangling-reference" ${target})
     endif()
 
     # Define emscripten-specific disabled warnings
     if (EMSCRIPTEN)
-        set(IMHEX_C_CXX_FLAGS "${IMHEX_C_CXX_FLAGS} -pthread -Wno-dollar-in-identifier-extension -Wno-pthreads-mem-growth")
+        addCCXXFlag("-pthread" ${target})
+        addCCXXFlag("-Wno-dollar-in-identifier-extension" ${target})
+        addCCXXFlag("-Wno-pthreads-mem-growth" ${target})
     endif ()
 
-    # Set actual CMake flags
-    set_target_properties(${target} PROPERTIES COMPILE_FLAGS "${IMHEX_COMMON_FLAGS} ${IMHEX_C_CXX_FLAGS}")
-    set(CMAKE_C_FLAGS    "${CMAKE_C_FLAGS}    ${IMHEX_COMMON_FLAGS} ${IMHEX_C_CXX_FLAGS}")
-    set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS}  ${IMHEX_COMMON_FLAGS} ${IMHEX_C_CXX_FLAGS}  ${IMHEX_CXX_FLAGS}")
-    set(CMAKE_OBJC_FLAGS "${CMAKE_OBJC_FLAGS} ${IMHEX_COMMON_FLAGS}")
+    if (IMHEX_COMPRESS_DEBUG_INFO)
+        setupDebugCompressionFlag()
+    endif()
+
+    # Only generate minimal debug information for stacktraces in RelWithDebInfo builds
+    if (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+        if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+            addCCXXFlag("-g1" ${target})
+        endif()
+
+        if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+            # Add flags for debug info in inline functions
+            addCCXXFlag("-gstatement-frontiers" ${target})
+            addCCXXFlag("-ginline-points" ${target})
+        endif()
+    endif()
 endmacro()
 
 # uninstall target
@@ -526,8 +742,6 @@ macro(setUninstallTarget)
 endmacro()
 
 macro(addBundledLibraries)
-    find_package(PkgConfig REQUIRED)
-
     set(EXTERNAL_LIBS_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/lib/external")
     set(THIRD_PARTY_LIBS_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/lib/third_party")
 
@@ -535,28 +749,18 @@ macro(addBundledLibraries)
     add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/imgui)
 
     add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/microtar EXCLUDE_FROM_ALL)
-    set_target_properties(microtar PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
     add_subdirectory(${EXTERNAL_LIBS_FOLDER}/libwolv EXCLUDE_FROM_ALL)
-    set_property(TARGET libwolv-types       PROPERTY POSITION_INDEPENDENT_CODE ON)
-    set_property(TARGET libwolv-utils       PROPERTY POSITION_INDEPENDENT_CODE ON)
-    set_property(TARGET libwolv-io          PROPERTY POSITION_INDEPENDENT_CODE ON)
-    set_property(TARGET libwolv-hash        PROPERTY POSITION_INDEPENDENT_CODE ON)
-    set_property(TARGET libwolv-containers  PROPERTY POSITION_INDEPENDENT_CODE ON)
-    set_property(TARGET libwolv-net         PROPERTY POSITION_INDEPENDENT_CODE ON)
-    set_property(TARGET libwolv-math_eval   PROPERTY POSITION_INDEPENDENT_CODE ON)
 
     set(XDGPP_INCLUDE_DIRS "${THIRD_PARTY_LIBS_FOLDER}/xdgpp")
     set(FPHSA_NAME_MISMATCHED ON CACHE BOOL "")
 
-    find_package(PkgConfig REQUIRED)
-
     if(NOT USE_SYSTEM_FMT)
+        set(FMT_INSTALL OFF CACHE BOOL "Disable install targets for libfmt" FORCE)
         add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/fmt EXCLUDE_FROM_ALL)
-        set_target_properties(fmt PROPERTIES POSITION_INDEPENDENT_CODE ON)
         set(FMT_LIBRARIES fmt::fmt-header-only)
     else()
-        find_package(fmt 8.0.0 REQUIRED)
+        find_package(fmt REQUIRED)
         set(FMT_LIBRARIES fmt::fmt)
     endif()
 
@@ -568,13 +772,11 @@ macro(addBundledLibraries)
 
     if (NOT EMSCRIPTEN)
         # curl
-        find_package(PkgConfig REQUIRED)
-        pkg_check_modules(LIBCURL REQUIRED IMPORTED_TARGET libcurl>=7.60.0)
+        find_package(CURL REQUIRED)
 
         # nfd
         if (NOT USE_SYSTEM_NFD)
             add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/nativefiledialog EXCLUDE_FROM_ALL)
-            set_target_properties(nfd PROPERTIES POSITION_INDEPENDENT_CODE ON)
             set(NFD_LIBRARIES nfd)
         else()
             find_package(nfd)
@@ -590,9 +792,16 @@ macro(addBundledLibraries)
         set(NLOHMANN_JSON_LIBRARIES nlohmann_json::nlohmann_json)
     endif()
 
+    if (NOT USE_SYSTEM_LUNASVG)
+        add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/lunasvg EXCLUDE_FROM_ALL)
+        set(LUNASVG_LIBRARIES lunasvg)
+    else()
+        find_package(LunaSVG REQUIRED)
+        set(LUNASVG_LIBRARIES lunasvg)
+    endif()
+
     if (NOT USE_SYSTEM_LLVM)
         add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/llvm-demangle EXCLUDE_FROM_ALL)
-        set_target_properties(LLVMDemangle PROPERTIES POSITION_INDEPENDENT_CODE ON)
     else()
         find_package(LLVM REQUIRED Demangle)
     endif()
@@ -609,18 +818,45 @@ macro(addBundledLibraries)
         set(JTHREAD_LIBRARIES jthread)
     endif()
 
-    set(LIBPL_BUILD_CLI_AS_EXECUTABLE OFF)
+    if (USE_SYSTEM_BOOST)
+        find_package(Boost REQUIRED)
+        set(BOOST_LIBRARIES Boost::regex)
+    else()
+        add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/boost ${CMAKE_CURRENT_BINARY_DIR}/boost EXCLUDE_FROM_ALL)
+        set(BOOST_LIBRARIES boost::regex)
+    endif()
+
+    set(LIBPL_BUILD_CLI_AS_EXECUTABLE OFF CACHE BOOL "" FORCE)
+    set(LIBPL_ENABLE_PRECOMPILED_HEADERS ${IMHEX_ENABLE_PRECOMPILED_HEADERS} CACHE BOOL "" FORCE)
+
+    set(LIBPL_SHARED_LIBRARY OFF CACHE BOOL "" FORCE)
+
     add_subdirectory(${EXTERNAL_LIBS_FOLDER}/pattern_language EXCLUDE_FROM_ALL)
-    set_target_properties(libpl PROPERTIES POSITION_INDEPENDENT_CODE ON)
+    add_subdirectory(${EXTERNAL_LIBS_FOLDER}/disassembler EXCLUDE_FROM_ALL)
+
+    if (LIBPL_SHARED_LIBRARY)
+        install(
+            TARGETS
+                libpl
+            DESTINATION
+                "${CMAKE_INSTALL_LIBDIR}"
+            PERMISSIONS
+                OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+        )
+    endif()
+
+    if (WIN32)
+        set_target_properties(
+                libpl
+                PROPERTIES
+                    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+                    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+        )
+    endif()
+    enableUnityBuild(libpl)
 
     find_package(mbedTLS 3.4.0 REQUIRED)
-
-    pkg_search_module(MAGIC libmagic>=5.39)
-    if(NOT MAGIC_FOUND)
-        find_library(MAGIC 5.39 magic REQUIRED)
-    else()
-        set(MAGIC_INCLUDE_DIRS ${MAGIC_INCLUDEDIR})
-    endif()
+    find_package(Magic 5.39 REQUIRED)
 
     if (NOT IMHEX_DISABLE_STACKTRACE)
         if (WIN32)
@@ -631,20 +867,20 @@ macro(addBundledLibraries)
             if (${Backtrace_FOUND})
                 message(STATUS "Backtrace enabled! Header: ${Backtrace_HEADER}")
 
-                if (Backtrace_HEADER STREQUAL "execinfo.h")
+                if (Backtrace_HEADER STREQUAL "backtrace.h")
                     set(LIBBACKTRACE_LIBRARIES ${Backtrace_LIBRARY})
                     set(LIBBACKTRACE_INCLUDE_DIRS ${Backtrace_INCLUDE_DIR})
-                    add_compile_definitions(BACKTRACE_HEADER=\"${Backtrace_HEADER}\")
-                    add_compile_definitions(HEX_HAS_EXECINFO)
-                elseif (Backtrace_HEADER STREQUAL "backtrace.h")
-                    set(LIBBACKTRACE_LIBRARIES ${Backtrace_LIBRARY})
-                    set(LIBBACKTRACE_INCLUDE_DIRS ${Backtrace_INCLUDE_DIR})
-                    add_compile_definitions(BACKTRACE_HEADER=\"${Backtrace_HEADER}\")
+                    add_compile_definitions(BACKTRACE_HEADER=<${Backtrace_HEADER}>)
                     add_compile_definitions(HEX_HAS_BACKTRACE)
-                endif ()
+                elseif (Backtrace_HEADER STREQUAL "execinfo.h")
+                    set(LIBBACKTRACE_LIBRARIES ${Backtrace_LIBRARY})
+                    set(LIBBACKTRACE_INCLUDE_DIRS ${Backtrace_INCLUDE_DIR})
+                    add_compile_definitions(BACKTRACE_HEADER=<${Backtrace_HEADER}>)
+                    add_compile_definitions(HEX_HAS_EXECINFO)
+                endif()
             endif()
-        endif ()
-    endif ()
+        endif()
+    endif()
 endmacro()
 
 function(enableUnityBuild TARGET)
@@ -653,77 +889,61 @@ function(enableUnityBuild TARGET)
     endif ()
 endfunction()
 
-function(generatePDBs)
-    if (NOT WIN32 OR CMAKE_BUILD_TYPE STREQUAL "Debug")
-        return()
-    endif ()
-
-    include(FetchContent)
-    FetchContent_Declare(
-            cv2pdb
-            URL "https://github.com/rainers/cv2pdb/releases/download/v0.52/cv2pdb-0.52.zip"
-            DOWNLOAD_EXTRACT_TIMESTAMP ON
-    )
-    FetchContent_Populate(cv2pdb)
-
-    set(PDBS_TO_GENERATE main main-forwarder libimhex ${PLUGINS})
-    add_custom_target(pdbs)
-    foreach (PDB ${PDBS_TO_GENERATE})
-        if (PDB STREQUAL "main")
-            set(GENERATED_PDB imhex)
-        elseif (PDB STREQUAL "main-forwarder")
-            set(GENERATED_PDB imhex-gui)
-        elseif (PDB STREQUAL "libimhex")
-            set(GENERATED_PDB libimhex)
-        else ()
-            set(GENERATED_PDB plugins/${PDB})
-        endif ()
-
-        add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${GENERATED_PDB}.pdb
-                WORKING_DIRECTORY ${cv2pdb_SOURCE_DIR}
-                COMMAND
-                (
-                    ${CMAKE_COMMAND} -E remove -f ${CMAKE_BINARY_DIR}/${GENERATED_PDB}.pdb &&
-                    ${cv2pdb_SOURCE_DIR}/cv2pdb64.exe
-                    $<TARGET_FILE:${PDB}>
-                ) || (exit 0)
-                DEPENDS $<TARGET_FILE:${PDB}>
-                COMMAND_EXPAND_LISTS)
-
-        target_sources(imhex_all PRIVATE ${CMAKE_BINARY_DIR}/${GENERATED_PDB}.pdb)
-        install(FILES ${CMAKE_BINARY_DIR}/${GENERATED_PDB}.pdb DESTINATION ".")
-    endforeach ()
+function(setSDKPaths)
+    if (WIN32)
+        set(SDK_PATH "./sdk" PARENT_SCOPE)
+    elseif (APPLE)
+        set(SDK_PATH "${CMAKE_INSTALL_PREFIX}/${BUNDLE_NAME}/Contents/Resources/sdk" PARENT_SCOPE)
+    else()
+        set(SDK_PATH "share/imhex/sdk" PARENT_SCOPE)
+    endif()
 
+    set(SDK_BUILD_PATH "${CMAKE_BINARY_DIR}/sdk" PARENT_SCOPE)
 endfunction()
 
 function(generateSDKDirectory)
-    if (WIN32)
-        set(SDK_PATH "./sdk")
-    elseif (APPLE)
-        set(SDK_PATH "${BUNDLE_NAME}/Contents/Resources/sdk")
-    else()
-        set(SDK_PATH "share/imhex/sdk")
-    endif()
-
-    install(DIRECTORY ${CMAKE_SOURCE_DIR}/lib/libimhex DESTINATION "${SDK_PATH}/lib")
+    setSDKPaths()
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/lib/libimhex DESTINATION "${SDK_PATH}/lib" PATTERN "**/source/*" EXCLUDE)
     install(DIRECTORY ${CMAKE_SOURCE_DIR}/lib/external DESTINATION "${SDK_PATH}/lib")
-    install(DIRECTORY ${CMAKE_SOURCE_DIR}/lib/third_party/imgui DESTINATION "${SDK_PATH}/lib/third_party")
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/lib/third_party/imgui DESTINATION "${SDK_PATH}/lib/third_party" PATTERN "**/source/*" EXCLUDE)
     if (NOT USE_SYSTEM_FMT)
         install(DIRECTORY ${CMAKE_SOURCE_DIR}/lib/third_party/fmt DESTINATION "${SDK_PATH}/lib/third_party")
     endif()
     if (NOT USE_SYSTEM_NLOHMANN_JSON)
         install(DIRECTORY ${CMAKE_SOURCE_DIR}/lib/third_party/nlohmann_json DESTINATION "${SDK_PATH}/lib/third_party")
     endif()
+    if (NOT USE_SYSTEM_BOOST)
+        install(DIRECTORY ${CMAKE_SOURCE_DIR}/lib/third_party/boost DESTINATION "${SDK_PATH}/lib/third_party")
+    endif()
 
-    install(FILES ${CMAKE_SOURCE_DIR}/cmake/modules/ImHexPlugin.cmake DESTINATION "${SDK_PATH}/cmake/modules")
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/modules DESTINATION "${SDK_PATH}/cmake")
     install(FILES ${CMAKE_SOURCE_DIR}/cmake/build_helpers.cmake DESTINATION "${SDK_PATH}/cmake")
     install(DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/sdk/ DESTINATION "${SDK_PATH}")
     install(TARGETS libimhex ARCHIVE DESTINATION "${SDK_PATH}/lib")
-    install(TARGETS libimhex RUNTIME DESTINATION "${SDK_PATH}/lib")
-    install(TARGETS libimhex LIBRARY DESTINATION "${SDK_PATH}/lib")
+
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/plugins/ui DESTINATION "${SDK_PATH}/lib" PATTERN "**/source/*" EXCLUDE)
+    install(TARGETS ui ARCHIVE DESTINATION "${SDK_PATH}/lib")
+
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/plugins/fonts DESTINATION "${SDK_PATH}/lib" PATTERN "**/source/*" EXCLUDE)
+    install(TARGETS fonts ARCHIVE DESTINATION "${SDK_PATH}/lib")
 endfunction()
 
 function(addIncludesFromLibrary target library)
     get_target_property(library_include_dirs ${library} INTERFACE_INCLUDE_DIRECTORIES)
     target_include_directories(${target} PRIVATE ${library_include_dirs})
-endfunction()
+endfunction()
+
+function(precompileHeaders target includeFolder)
+    if (NOT IMHEX_ENABLE_PRECOMPILED_HEADERS)
+        return()
+    endif()
+
+    file(GLOB_RECURSE TARGET_INCLUDES "${includeFolder}/**/*.hpp")
+    set(SYSTEM_INCLUDES "<algorithm>;<array>;<atomic>;<chrono>;<cmath>;<cstddef>;<cstdint>;<cstdio>;<cstdlib>;<cstring>;<exception>;<filesystem>;<functional>;<iterator>;<limits>;<list>;<map>;<memory>;<optional>;<ranges>;<set>;<stdexcept>;<string>;<string_view>;<thread>;<tuple>;<type_traits>;<unordered_map>;<unordered_set>;<utility>;<variant>;<vector>")
+    set(INCLUDES "${SYSTEM_INCLUDES};${TARGET_INCLUDES}")
+    string(REPLACE ">" "$<ANGLE-R>" INCLUDES "${INCLUDES}")
+    target_precompile_headers(${target}
+            PUBLIC
+            "$<$<COMPILE_LANGUAGE:CXX>:${INCLUDES}>"
+    )
+endfunction()

cmake/ide_helpers.cmake

@@ -0,0 +1,149 @@
+
+option(IMHEX_IDE_HELPERS_OVERRIDE_XCODE_COMPILER "Enable choice of compiler for Xcode builds, despite CMake's best efforts" OFF)
+option(IMHEX_IDE_HELPERS_INTRUSIVE_IDE_TWEAKS    "Enable intrusive CMake tweaks to better support IDEs with folder support" OFF)
+
+# The CMake infrastructure silently ignores the CMAKE_<>_COMPILER settings when
+#  using the `Xcode` generator. 
+#
+# A particularly nasty (and potentially only) way of getting around this is to 
+#  temporarily lie about the generator being used, while CMake determines and
+#  locks in the compiler to use.
+#
+# Needless to say, this is hacky and fragile. Use at your own risk!
+if (IMHEX_IDE_HELPERS_OVERRIDE_XCODE_COMPILER AND CMAKE_GENERATOR STREQUAL "Xcode")
+    set(CMAKE_GENERATOR "Unknown")
+    enable_language(C CXX)
+    
+    set(CMAKE_GENERATOR "Xcode")
+
+    set(CMAKE_XCODE_ATTRIBUTE_CC  "${CMAKE_C_COMPILER}")
+    set(CMAKE_XCODE_ATTRIBUTE_CXX "${CMAKE_CXX_COMPILER}")
+
+    if (CLANG)
+        set(CMAKE_XCODE_ATTRIBUTE_LD         "${CMAKE_C_COMPILER}")
+        set(CMAKE_XCODE_ATTRIBUTE_LDPLUSPLUS "${CMAKE_CXX_COMPILER}")
+    endif()
+
+    # By default Xcode passes a `-index-store-path=<...>` parameter to the compiler
+    #  during builds to build code completion indexes. This is not supported by
+    #  anything other than AppleClang
+    set(CMAKE_XCODE_ATTRIBUTE_COMPILER_INDEX_STORE_ENABLE "NO")
+endif()
+
+# Generate a launch/build scheme for all targets
+set(CMAKE_XCODE_GENERATE_SCHEME YES)
+
+# Utility function that helps avoid messing with non-standard targets
+macro(returnIfTargetIsNonTweakable target)
+    get_target_property(targetIsAliased ${target} ALIASED_TARGET)
+    get_target_property(targetIsImported ${target} IMPORTED)
+
+    if (targetIsAliased OR targetIsImported)
+        return()
+    endif()
+
+    get_target_property(targetType ${target} TYPE)
+    if (targetType MATCHES "INTERFACE_LIBRARY|UNKNOWN_LIBRARY")
+        return()
+    endif()
+endmacro()
+
+# Targets usually don't specify their private headers, nor group their source files
+#  which results in very spotty coverage by IDEs with folders support
+#
+# Unfortunately, CMake does not have a `target_source_group` like construct yet, therefore 
+#  we have to play by the limitations of `source_group`. 
+#
+# A particularly problematic part is that the function must be called within the directoryies
+#  scope for the grouping to take effect.
+#
+# See: https://discourse.cmake.org/t/topic/7388
+function(tweakTargetForIDESupport target)
+    returnIfTargetIsNonTweakable(${target})
+
+    # Don't assume directory structure of third parties
+    get_target_property(targetSourceDir ${target} SOURCE_DIR)
+    if (targetSourceDir MATCHES "third_party")
+        return()
+    endif()
+
+    # Add headers to target
+    get_target_property(targetSourceDir ${target} SOURCE_DIR)
+    if (targetSourceDir)
+        file(GLOB_RECURSE targetPrivateHeaders CONFIGURE_DEPENDS "${targetSourceDir}/include/*.hpp")
+
+        target_sources(${target} PRIVATE "${targetPrivateHeaders}")
+    endif()
+
+    # Organize target sources into directory tree
+    get_target_property(sources ${target} SOURCES)
+    foreach(file IN LISTS sources)
+        get_filename_component(path "${file}" ABSOLUTE)
+
+        if (NOT path MATCHES "^${targetSourceDir}")
+            continue()
+        endif()
+
+        source_group(TREE "${targetSourceDir}" PREFIX "Source Tree" FILES "${file}")
+    endforeach()
+endfunction()
+
+if (IMHEX_IDE_HELPERS_INTRUSIVE_IDE_TWEAKS)
+    # See tweakTargetForIDESupport for rationale
+
+    function(add_library target)
+        _add_library(${target} ${ARGN})
+
+        tweakTargetForIDESupport(${target})
+    endfunction()
+
+    function(add_executable target)
+        _add_executable(${target} ${ARGN})
+
+        tweakTargetForIDESupport(${target})
+    endfunction()
+endif()
+
+# Adjust target's FOLDER property, which is an IDE only preference
+function(_tweakTarget target path)
+    get_target_property(targetType ${target} TYPE)
+
+    if (TARGET generator-${target})
+        set_target_properties(generator-${target} PROPERTIES FOLDER "romfs/${target}")
+    endif()
+    if (TARGET romfs_file_packer-${target})
+        set_target_properties(romfs_file_packer-${target} PROPERTIES FOLDER "romfs/${target}")
+    endif()
+    if (TARGET libromfs-${target})
+        set_target_properties(libromfs-${target} PROPERTIES FOLDER "romfs/${target}")
+    endif()
+
+    if (${targetType} MATCHES "EXECUTABLE|LIBRARY")
+        set_target_properties(${target} PROPERTIES FOLDER "${path}")
+    endif()
+endfunction()
+
+macro(_tweakTargetsRecursive dir)
+    get_property(subdirectories DIRECTORY ${dir} PROPERTY SUBDIRECTORIES)
+    foreach(subdir IN LISTS subdirectories)
+        _tweakTargetsRecursive("${subdir}")
+    endforeach()
+
+    if(${dir} STREQUAL ${CMAKE_SOURCE_DIR})
+        return()
+    endif()
+
+    get_property(targets DIRECTORY "${dir}" PROPERTY BUILDSYSTEM_TARGETS)
+    file(RELATIVE_PATH rdir ${CMAKE_SOURCE_DIR} "${dir}/..")
+
+    foreach(target ${targets})
+        _tweakTarget(${target} "${rdir}")
+    endforeach()
+endmacro()
+
+# Tweak all targets this CMake build is aware about
+function(tweakTargetsForIDESupport)
+    set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+    _tweakTargetsRecursive("${CMAKE_SOURCE_DIR}")
+endfunction()

cmake/modules/FindCapstone.cmake

@@ -0,0 +1,8 @@
+find_path(CAPSTONE_INCLUDE_DIR capstone.h PATH_SUFFIXES capstone)
+find_library(CAPSTONE_LIBRARY NAMES capstone)
+
+include(FindPackageHandleStandardArgs)
+
+find_package_handle_standard_args(Capstone DEFAULT_MSG CAPSTONE_LIBRARY CAPSTONE_INCLUDE_DIR)
+
+mark_as_advanced(CAPSTONE_INCLUDE_DIR CAPSTONE_LIBRARY)

cmake/modules/FindCoreClrEmbed.cmake

@@ -11,6 +11,14 @@ if (UNIX)
         set(CORECLR_SUBARCH "arm64")
     endif()
 endif()
+if (APPLE)
+    if (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
+        set(CORECLR_ARCH "osx-arm64")
+        set(CORECLR_SUBARCH "arm64")
+    else()
+        set(CORECLR_ARCH "osx-x64")
+    endif()
+endif()
 
 if (NOT DOTNET_EXECUTABLE)
     set(DOTNET_EXECUTABLE dotnet)
@@ -49,13 +57,16 @@ endif()
 set(CoreClrEmbed_ROOT_PATH "${CORECLR_RUNTIME_ROOT_PATH}")
 
 
-file(GLOB _CORECLR_HOST_ARCH_PATH "${CORECLR_RUNTIME_ROOT_PATH}/packs/Microsoft.NETCore.App.Host.*-${CORECLR_SUBARCH}")
-if (_CORECLR_HOST_ARCH_PATH)
-    get_filename_component(_CORECLR_HOST_ARCH_FILENAME ${_CORECLR_HOST_ARCH_PATH} NAME)
-    string(REPLACE "Microsoft.NETCore.App.Host." "" _CORECLR_COMPUTED_ARCH "${_CORECLR_HOST_ARCH_FILENAME}")
-    if (_CORECLR_COMPUTED_ARCH)
-        set(CORECLR_ARCH "${_CORECLR_COMPUTED_ARCH}")
-    endif()
+file(GLOB _CORECLR_HOST_ARCH_PATH_LIST "${CORECLR_RUNTIME_ROOT_PATH}/packs/Microsoft.NETCore.App.Host.*-${CORECLR_SUBARCH}")
+if (_CORECLR_HOST_ARCH_PATH_LIST)
+    foreach(_CORECLR_HOST_ARCH_PATH ${_CORECLR_HOST_ARCH_PATH_LIST})
+        get_filename_component(_CORECLR_HOST_ARCH_FILENAME ${_CORECLR_HOST_ARCH_PATH} NAME)
+        string(REPLACE "Microsoft.NETCore.App.Host." "" _CORECLR_COMPUTED_ARCH "${_CORECLR_HOST_ARCH_FILENAME}")
+        if (_CORECLR_COMPUTED_ARCH)
+            set(CORECLR_ARCH "${_CORECLR_COMPUTED_ARCH}")
+            break()
+        endif()
+    endforeach()
 endif()
 
 set(CORECLR_HOST_BASE_PATH "${CORECLR_RUNTIME_ROOT_PATH}/packs/Microsoft.NETCore.App.Host.${CORECLR_ARCH}/${CORECLR_RUNTIME_VERSION_FULL}")
@@ -78,4 +89,5 @@ if (CoreClrEmbed_INCLUDE_DIR AND CoreClrEmbed_LIBRARY)
     set(CoreClrEmbed_LIBRARIES "${CoreClrEmbed_LIBRARY}" CACHE STRING "CoreClrEmbed libraries" FORCE)
     set(CoreClrEmbed_SHARED_LIBRARIES "${CoreClrEmbed_SHARED_LIBRARY}" CACHE STRING "CoreClrEmbed shared libraries" FORCE)
     set(CoreClrEmbed_INCLUDE_DIRS "${CoreClrEmbed_INCLUDE_DIR}" CACHE STRING "CoreClrEmbed include directories" FORCE)
+    set(CoreClrEmbed_VERSION "${CORECLR_RUNTIME_VERSION_FULL}" CACHE STRING "CoreClrEmbed version" FORCE)
 endif()

cmake/modules/FindGLFW.cmake

@@ -0,0 +1,139 @@
+#.rst:
+# Find GLFW
+# ---------
+#
+# Finds the GLFW library using its cmake config if that exists, otherwise
+# falls back to finding it manually. This module defines:
+#
+#  GLFW_FOUND               - True if GLFW library is found
+#  GLFW::GLFW               - GLFW imported target
+#
+# Additionally, in case the config was not found, these variables are defined
+# for internal usage:
+#
+#  GLFW_LIBRARY             - GLFW library
+#  GLFW_DLL_DEBUG           - GLFW debug DLL on Windows, if found
+#  GLFW_DLL_RELEASE         - GLFW release DLL on Windows, if found
+#  GLFW_INCLUDE_DIR         - Root include dir
+#
+
+#
+#   This file is part of Magnum.
+#
+#   Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
+#               2020, 2021, 2022 Vladimír Vondruš <mosra@centrum.cz>
+#   Copyright © 2016 Jonathan Hale <squareys@googlemail.com>
+#
+#   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.
+#
+
+# GLFW installs cmake package config files which handles dependencies in case
+# GLFW is built statically. Try to find first, quietly, so it doesn't print
+# loud messages when it's not found, since that's okay. If the glfw target
+# already exists, it means we're using it through a CMake subproject -- don't
+# attempt to find the package in that case.
+if(NOT TARGET glfw)
+    find_package(glfw3 CONFIG QUIET)
+endif()
+
+# If either a glfw config file was found or we have a subproject, point
+# GLFW::GLFW to that and exit -- nothing else to do here.
+if(TARGET glfw)
+    if(NOT TARGET GLFW::GLFW)
+        # Aliases of (global) targets are only supported in CMake 3.11, so we
+        # work around it by this. This is easier than fetching all possible
+        # properties (which are impossible to track of) and then attempting to
+        # rebuild them into a new target.
+        add_library(GLFW::GLFW INTERFACE IMPORTED)
+        set_target_properties(GLFW::GLFW PROPERTIES INTERFACE_LINK_LIBRARIES glfw)
+    endif()
+
+    # Just to make FPHSA print some meaningful location, nothing else
+    get_target_property(_GLFW_INTERFACE_INCLUDE_DIRECTORIES glfw INTERFACE_INCLUDE_DIRECTORIES)
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args("GLFW" DEFAULT_MSG
+            _GLFW_INTERFACE_INCLUDE_DIRECTORIES)
+
+    if(CORRADE_TARGET_WINDOWS)
+        # .dll is in LOCATION, .lib is in IMPLIB. Yay, useful!
+        get_target_property(GLFW_DLL_DEBUG glfw IMPORTED_LOCATION_DEBUG)
+        get_target_property(GLFW_DLL_RELEASE glfw IMPORTED_LOCATION_RELEASE)
+    endif()
+
+    return()
+endif()
+
+if(CORRADE_TARGET_WINDOWS)
+    if(MSVC)
+        if(MSVC_VERSION VERSION_LESS 1910)
+            set(_GLFW_LIBRARY_PATH_SUFFIX lib-vc2015)
+        elseif(MSVC_VERSION VERSION_LESS 1920)
+            set(_GLFW_LIBRARY_PATH_SUFFIX lib-vc2017)
+        elseif(MSVC_VERSION VERSION_LESS 1930)
+            set(_GLFW_LIBRARY_PATH_SUFFIX lib-vc2019)
+        elseif(MSVC_VERSION VERSION_LESS 1940)
+            set(_GLFW_LIBRARY_PATH_SUFFIX lib-vc2022)
+        else()
+            message(FATAL_ERROR "Unsupported MSVC version")
+        endif()
+    elseif(MINGW)
+        set(_GLFW_LIBRARY_PATH_SUFFIX lib-mingw-w64)
+    else()
+        message(FATAL_ERROR "Unsupported compiler")
+    endif()
+endif()
+
+# In case no config file was found, try manually finding the library. Prefer
+# the glfw3dll as it's a dynamic library.
+find_library(GLFW_LIBRARY
+        NAMES glfw glfw3dll glfw3
+        PATH_SUFFIXES ${_GLFW_LIBRARY_PATH_SUFFIX})
+
+if(CORRADE_TARGET_WINDOWS AND GLFW_LIBRARY MATCHES "glfw3dll.(lib|a)$")
+    # TODO: debug?
+    find_file(GLFW_DLL_RELEASE
+            NAMES glfw3.dll
+            PATH_SUFFIXES ${_GLFW_LIBRARY_PATH_SUFFIX})
+endif()
+
+# Include dir
+find_path(GLFW_INCLUDE_DIR
+        NAMES GLFW/glfw3.h)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args("GLFW" DEFAULT_MSG
+        GLFW_LIBRARY
+        GLFW_INCLUDE_DIR)
+
+if(NOT TARGET GLFW::GLFW)
+    add_library(GLFW::GLFW UNKNOWN IMPORTED)
+
+    # Work around BUGGY framework support on macOS
+    # https://cmake.org/Bug/view.php?id=14105
+    if(CORRADE_TARGET_APPLE AND GLFW_LIBRARY MATCHES "\\.framework$")
+        set_property(TARGET GLFW::GLFW PROPERTY IMPORTED_LOCATION ${GLFW_LIBRARY}/GLFW)
+    else()
+        set_property(TARGET GLFW::GLFW PROPERTY IMPORTED_LOCATION ${GLFW_LIBRARY})
+    endif()
+
+    set_property(TARGET GLFW::GLFW PROPERTY
+            INTERFACE_INCLUDE_DIRECTORIES ${GLFW_INCLUDE_DIR})
+endif()
+
+mark_as_advanced(GLFW_LIBRARY GLFW_INCLUDE_DIR)

cmake/modules/FindLZ4.cmake

@@ -0,0 +1,60 @@
+find_path(LZ4_INCLUDE_DIR
+        NAMES lz4.h
+        HINTS "${LZ4_INCLUDEDIR}" "${LZ4_HINTS}/include"
+        PATHS
+        /usr/local/include
+        /usr/include
+)
+
+find_library(LZ4_LIBRARY
+        NAMES lz4 liblz4
+        HINTS "${LZ4_LIBDIR}" "${LZ4_HINTS}/lib"
+        PATHS
+        /usr/local/lib
+        /usr/lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args( LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR )
+
+if( LZ4_FOUND )
+    include( CheckIncludeFile )
+    include( CMakePushCheckState )
+
+    set( LZ4_INCLUDE_DIRS ${LZ4_INCLUDE_DIR} )
+    set( LZ4_LIBRARIES ${LZ4_LIBRARY} )
+
+    cmake_push_check_state()
+    set( CMAKE_REQUIRED_INCLUDES ${LZ4_INCLUDE_DIRS} )
+    check_include_file( lz4frame.h HAVE_LZ4FRAME_H )
+    cmake_pop_check_state()
+
+    if (WIN32)
+        set ( LZ4_DLL_DIR "${LZ4_HINTS}/bin"
+                CACHE PATH "Path to LZ4 DLL"
+        )
+        file( GLOB _lz4_dll RELATIVE "${LZ4_DLL_DIR}"
+                "${LZ4_DLL_DIR}/lz4*.dll"
+        )
+        set ( LZ4_DLL ${_lz4_dll}
+                # We're storing filenames only. Should we use STRING instead?
+                CACHE FILEPATH "LZ4 DLL file name"
+        )
+        file( GLOB _lz4_pdb RELATIVE "${LZ4_DLL_DIR}"
+                "${LZ4_DLL_DIR}/lz4*.pdb"
+        )
+        set ( LZ4_PDB ${_lz4_pdb}
+                CACHE FILEPATH "LZ4 PDB file name"
+        )
+        mark_as_advanced( LZ4_DLL_DIR LZ4_DLL LZ4_PDB )
+    endif()
+else()
+    set( LZ4_INCLUDE_DIRS )
+    set( LZ4_LIBRARIES )
+endif()
+
+mark_as_advanced( LZ4_LIBRARIES LZ4_INCLUDE_DIRS )
+
+add_library( LZ4::lz4 INTERFACE IMPORTED )
+set_property( TARGET LZ4::lz4 PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${LZ4_INCLUDE_DIRS} )
+set_property( TARGET LZ4::lz4 PROPERTY INTERFACE_LINK_LIBRARIES ${LZ4_LIBRARIES} )

cmake/modules/FindMagic.cmake

@@ -0,0 +1,18 @@
+find_path(LIBMAGIC_INCLUDE_DIR magic.h)
+
+find_library(LIBMAGIC_LIBRARY NAMES magic)
+
+if (LIBMAGIC_INCLUDE_DIR AND LIBMAGIC_LIBRARY)
+    set(LIBMAGIC_FOUND TRUE)
+endif (LIBMAGIC_INCLUDE_DIR AND LIBMAGIC_LIBRARY)
+
+find_package_handle_standard_args("libmagic" DEFAULT_MSG
+        LIBMAGIC_LIBRARY
+        LIBMAGIC_INCLUDE_DIR
+)
+
+mark_as_advanced(
+        LIBMAGIC_INCLUDE_DIR
+        LIBMAGIC_LIBRARY
+        LIBMAGIC_FOUND
+)

cmake/modules/FindYara.cmake

@@ -0,0 +1,4 @@
+find_library(YARA_LIBRARIES NAMES yara)
+find_file(yara.h YARA_INCLUDE_DIRS)
+
+mark_as_advanced(YARA_LIBRARIES YARA_INCLUDE_DIRS)

cmake/modules/FindZSTD.cmake

@@ -0,0 +1,45 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# - Try to find Facebook zstd library
+# This will define
+# ZSTD_FOUND
+# ZSTD_INCLUDE_DIR
+# ZSTD_LIBRARY
+#
+
+find_path(ZSTD_INCLUDE_DIR NAMES zstd.h)
+
+find_library(ZSTD_LIBRARY_DEBUG NAMES zstdd zstd_staticd)
+find_library(ZSTD_LIBRARY_RELEASE NAMES zstd zstd_static)
+
+include(SelectLibraryConfigurations)
+SELECT_LIBRARY_CONFIGURATIONS(ZSTD)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+        ZSTD DEFAULT_MSG
+        ZSTD_LIBRARY ZSTD_INCLUDE_DIR
+)
+
+if (ZSTD_FOUND)
+    message(STATUS "Found Zstd: ${ZSTD_LIBRARY}")
+endif()
+
+mark_as_advanced(ZSTD_INCLUDE_DIR ZSTD_LIBRARY)
+
+add_library(ZSTD::zstd INTERFACE IMPORTED)
+set_property(TARGET ZSTD::zstd PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${ZSTD_INCLUDE_DIR})
+set_property(TARGET ZSTD::zstd PROPERTY INTERFACE_LINK_LIBRARIES ${ZSTD_LIBRARY})

cmake/modules/FindmbedTLS.cmake

@@ -40,7 +40,12 @@ IF(MBEDTLS_FOUND)
     STRING(REGEX REPLACE "^lib" "" MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY_FILE})
     STRING(REGEX REPLACE "^lib" "" MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY_FILE})
     STRING(REGEX REPLACE "^lib" "" MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY_FILE})
-    SET(MBEDTLS_LIBRARIES "-L${MBEDTLS_LIBRARY_DIR} -l${MBEDTLS_LIBRARY_FILE} -l${MBEDX509_LIBRARY_FILE} -l${MBEDCRYPTO_LIBRARY_FILE}")
+
+    if (MSVC)
+        SET(MBEDTLS_LIBRARIES ${MBEDTLS_LIBRARY_FILE}.lib ${MBEDX509_LIBRARY_FILE}.lib ${MBEDCRYPTO_LIBRARY_FILE}.lib)
+    else()
+        SET(MBEDTLS_LIBRARIES "-L${MBEDTLS_LIBRARY_DIR} -l${MBEDTLS_LIBRARY_FILE} -l${MBEDX509_LIBRARY_FILE} -l${MBEDCRYPTO_LIBRARY_FILE}")
+    endif()
 
     IF(NOT MBEDTLS_FIND_QUIETLY)
         MESSAGE(STATUS "Found mbedTLS:")
@@ -55,9 +60,9 @@ IF(MBEDTLS_FOUND)
         MESSAGE(STATUS "  Crypto: ${MBEDCRYPTO_LIBRARY}")
     ENDIF(NOT MBEDTLS_FIND_QUIETLY)
 ELSE(MBEDTLS_FOUND)
-    IF(MBEDTLS_FIND_REQUIRED)
+    IF(mbedTLS_FIND_REQUIRED)
         MESSAGE(FATAL_ERROR "Could not find mbedTLS")
-    ENDIF(MBEDTLS_FIND_REQUIRED)
+    ENDIF(mbedTLS_FIND_REQUIRED)
 ENDIF(MBEDTLS_FOUND)
 
 MARK_AS_ADVANCED(
@@ -67,4 +72,4 @@ MARK_AS_ADVANCED(
         MBEDTLS_LIBRARY
         MBEDX509_LIBRARY
         MBEDCRYPTO_LIBRARY
-)
+)

cmake/modules/ImHexPlugin.cmake

@@ -1,4 +1,5 @@
 macro(add_imhex_plugin)
+    setSDKPaths()
     # Parse arguments
     set(options LIBRARY_PLUGIN)
     set(oneValueArgs NAME IMHEX_VERSION)
@@ -28,6 +29,10 @@ macro(add_imhex_plugin)
         endif()
     endif()
 
+    if (IMHEX_PLUGIN_LIBRARY_PLUGIN)
+        install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION "${SDK_PATH}/lib/plugins/${IMHEX_PLUGIN_NAME}")
+    endif()
+
     # Define new project for plugin
     project(${IMHEX_PLUGIN_NAME})
 
@@ -36,8 +41,12 @@ macro(add_imhex_plugin)
 
     # Add include directories and link libraries
     target_include_directories(${IMHEX_PLUGIN_NAME} PUBLIC ${IMHEX_PLUGIN_INCLUDES})
-    target_link_libraries(${IMHEX_PLUGIN_NAME} PRIVATE libimhex ${IMHEX_PLUGIN_LIBRARIES} ${FMT_LIBRARIES} imgui_all_includes libwolv)
+    target_link_libraries(${IMHEX_PLUGIN_NAME} PUBLIC ${IMHEX_PLUGIN_LIBRARIES})
+    target_link_libraries(${IMHEX_PLUGIN_NAME} PRIVATE libimhex ${FMT_LIBRARIES} imgui_all_includes libwolv)
     addIncludesFromLibrary(${IMHEX_PLUGIN_NAME} libpl)
+    addIncludesFromLibrary(${IMHEX_PLUGIN_NAME} libpl-gen)
+
+    precompileHeaders(${IMHEX_PLUGIN_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/include")
 
     # Add IMHEX_PROJECT_NAME and IMHEX_VERSION define
     target_compile_definitions(${IMHEX_PLUGIN_NAME} PRIVATE IMHEX_PROJECT_NAME="${IMHEX_PLUGIN_NAME}")
@@ -45,30 +54,50 @@ macro(add_imhex_plugin)
     target_compile_definitions(${IMHEX_PLUGIN_NAME} PRIVATE IMHEX_PLUGIN_NAME=${IMHEX_PLUGIN_NAME})
 
     # Enable required compiler flags
-    set_target_properties(${IMHEX_PLUGIN_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
     enableUnityBuild(${IMHEX_PLUGIN_NAME})
     setupCompilerFlags(${IMHEX_PLUGIN_NAME})
 
     # Configure build properties
     set_target_properties(${IMHEX_PLUGIN_NAME}
             PROPERTIES
-            RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins
+            RUNTIME_OUTPUT_DIRECTORY "${IMHEX_MAIN_OUTPUT_DIRECTORY}/plugins"
             CXX_STANDARD 23
             PREFIX ""
             SUFFIX ${IMHEX_PLUGIN_SUFFIX}
     )
 
+    # Set rpath of plugin libraries to the plugins folder
+    if (WIN32)
+        if (IMHEX_PLUGIN_LIBRARY_PLUGIN)
+            set_target_properties(${IMHEX_PLUGIN_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+        endif()
+    elseif (APPLE)
+        set_target_properties(${IMHEX_PLUGIN_NAME} PROPERTIES BUILD_RPATH "@executable_path/../Frameworks;@executable_path/plugins")
+    endif()
+
     # Setup a romfs for the plugin
     list(APPEND LIBROMFS_RESOURCE_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/romfs)
     set(LIBROMFS_PROJECT_NAME ${IMHEX_PLUGIN_NAME})
     add_subdirectory(${IMHEX_BASE_FOLDER}/lib/external/libromfs ${CMAKE_CURRENT_BINARY_DIR}/libromfs)
-    set_target_properties(${LIBROMFS_LIBRARY} PROPERTIES POSITION_INDEPENDENT_CODE ON)
     target_link_libraries(${IMHEX_PLUGIN_NAME} PRIVATE ${LIBROMFS_LIBRARY})
 
-    foreach(feature ${IMHEX_PLUGIN_FEATURES})
-        string(TOUPPER ${feature} feature)
-        add_definitions(-DIMHEX_PLUGIN_${IMHEX_PLUGIN_NAME}_FEATURE_${feature}=0)
-    endforeach()
+    set(FEATURE_DEFINE_CONTENT)
+
+    if (IMHEX_PLUGIN_FEATURES)
+        list(LENGTH IMHEX_PLUGIN_FEATURES IMHEX_FEATURE_COUNT)
+        math(EXPR IMHEX_FEATURE_COUNT "${IMHEX_FEATURE_COUNT} - 1" OUTPUT_FORMAT DECIMAL)
+        foreach(index RANGE 0 ${IMHEX_FEATURE_COUNT} 2)
+            list(SUBLIST IMHEX_PLUGIN_FEATURES ${index} 2 IMHEX_PLUGIN_FEATURE)
+            list(GET IMHEX_PLUGIN_FEATURE 0 feature_define)
+            list(GET IMHEX_PLUGIN_FEATURE 1 feature_description)
+
+            string(TOUPPER ${feature_define} feature_define)
+            add_definitions(-DIMHEX_PLUGIN_${IMHEX_PLUGIN_NAME}_FEATURE_${feature_define}=0)
+            set(FEATURE_DEFINE_CONTENT "${FEATURE_DEFINE_CONTENT}{ \"${feature_description}\", IMHEX_FEATURE_ENABLED(${feature_define}) },")
+        endforeach()
+    endif()
+
+    target_compile_options(${IMHEX_PLUGIN_NAME} PRIVATE -DIMHEX_PLUGIN_FEATURES_CONTENT=${FEATURE_DEFINE_CONTENT})
 
     # Add the new plugin to the main dependency list so it gets built by default
     if (TARGET imhex_all)
@@ -77,15 +106,43 @@ macro(add_imhex_plugin)
 
     if (IMHEX_EXTERNAL_PLUGIN_BUILD)
         install(TARGETS ${IMHEX_PLUGIN_NAME} DESTINATION ".")
+    endif()
 
-        # Fix rpath
-        if (APPLE)
-            set_target_properties(${IMHEX_PLUGIN_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks")
+    # Fix rpath
+    if (APPLE)
+        set_target_properties(
+                ${IMHEX_PLUGIN_NAME}
+                PROPERTIES
+                    INSTALL_RPATH "@executable_path/../Frameworks;@executable_path/plugins"
+        )
+    elseif (UNIX)
+        set(PLUGIN_RPATH "")
+        list(APPEND PLUGIN_RPATH "$ORIGIN")
+
+        if (IMHEX_PLUGIN_ADD_INSTALL_PREFIX_TO_RPATH)
+            list(APPEND PLUGIN_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
         endif()
+
+        set_target_properties(
+                ${IMHEX_PLUGIN_NAME}
+                PROPERTIES
+                    INSTALL_RPATH_USE_ORIGIN ON
+                    INSTALL_RPATH "${PLUGIN_RPATH}"
+        )
+    endif()
+
+    if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/tests/CMakeLists.txt AND IMHEX_ENABLE_UNIT_TESTS AND IMHEX_ENABLE_PLUGIN_TESTS)
+        add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tests)
+        target_link_libraries(${IMHEX_PLUGIN_NAME} PUBLIC ${IMHEX_PLUGIN_NAME}_tests)
+        target_compile_definitions(${IMHEX_PLUGIN_NAME}_tests PRIVATE IMHEX_PROJECT_NAME="${IMHEX_PLUGIN_NAME}-tests")
     endif()
 endmacro()
 
 macro(add_romfs_resource input output)
+    if (NOT EXISTS ${input})
+        message(WARNING "Resource file ${input} does not exist")
+    endif()
+
     configure_file(${input} ${CMAKE_CURRENT_BINARY_DIR}/romfs/${output} COPYONLY)
 
     list(APPEND LIBROMFS_RESOURCE_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/romfs)
@@ -99,4 +156,4 @@ macro (enable_plugin_feature feature)
 
     remove_definitions(-DIMHEX_PLUGIN_${IMHEX_PLUGIN_NAME}_FEATURE_${feature}=0)
     add_definitions(-DIMHEX_PLUGIN_${IMHEX_PLUGIN_NAME}_FEATURE_${feature}=1)
-endmacro()
+endmacro()

cmake/modules/PostprocessBundle.cmake

@@ -14,12 +14,11 @@ if(CMAKE_GENERATOR)
 	# Being called as include(PostprocessBundle), so define a helper function.
 	set(_POSTPROCESS_BUNDLE_MODULE_LOCATION "${CMAKE_CURRENT_LIST_FILE}")
 	function(postprocess_bundle out_target in_target)
-		add_custom_command(TARGET ${out_target} POST_BUILD
-			COMMAND ${CMAKE_COMMAND} -DBUNDLE_PATH="$<TARGET_FILE_DIR:${in_target}>/../.."
-				-DCODE_SIGN_CERTIFICATE_ID="${CODE_SIGN_CERTIFICATE_ID}"
-				-DEXTRA_BUNDLE_LIBRARY_PATHS="${EXTRA_BUNDLE_LIBRARY_PATHS}"
-				-P "${_POSTPROCESS_BUNDLE_MODULE_LOCATION}"
-		)
+
+		install(CODE "set(BUNDLE_PATH ${CMAKE_INSTALL_PREFIX}/${BUNDLE_NAME})")
+		install(CODE "set(CODE_SIGN_CERTIFICATE_ID ${CODE_SIGN_CERTIFICATE_ID})")
+		install(CODE "set(EXTRA_BUNDLE_LIBRARY_PATHS ${EXTRA_BUNDLE_LIBRARY_PATHS})")
+		install(SCRIPT ${_POSTPROCESS_BUNDLE_MODULE_LOCATION})
 	endfunction()
 	return()
 endif()
@@ -36,14 +35,13 @@ message(STATUS "Fixing up application bundle: ${BUNDLE_PATH}")
 
 # Make sure to fix up any included ImHex plugin.
 file(GLOB_RECURSE plugins "${BUNDLE_PATH}/Contents/MacOS/plugins/*.hexplug")
-file(GLOB_RECURSE plugin_libs "${BUNDLE_PATH}/Contents/MacOS/plugins/*.hexpluglib")
 
 
 # BundleUtilities doesn't support DYLD_FALLBACK_LIBRARY_PATH behavior, which
 # makes it sometimes break on libraries that do weird things with @rpath. Specify
 # equivalent search directories until https://gitlab.kitware.com/cmake/cmake/issues/16625
 # is fixed and in our minimum CMake version.
-set(extra_dirs "/usr/local/lib" "/lib" "/usr/lib" ${EXTRA_BUNDLE_LIBRARY_PATHS} "${BUNDLE_PATH}/Contents/MacOS/plugins")
+set(extra_dirs "/usr/local/lib" "/lib" "/usr/lib" ${EXTRA_BUNDLE_LIBRARY_PATHS} "${BUNDLE_PATH}/Contents/MacOS/plugins" "${BUNDLE_PATH}/Contents/Frameworks")
 message(STATUS "Fixing up application bundle: ${extra_dirs}")
 
 # BundleUtilities is overly verbose, so disable most of its messages
@@ -55,7 +53,8 @@ message(STATUS "Fixing up application bundle: ${extra_dirs}")
 
 include(BundleUtilities)
 set(BU_CHMOD_BUNDLE_ITEMS ON)
-fixup_bundle("${BUNDLE_PATH}" "${plugins};${plugin_libs}" "${extra_dirs}")
+
+fixup_bundle("${BUNDLE_PATH}" "${plugins}" "${extra_dirs}")
 
 if (CODE_SIGN_CERTIFICATE_ID)
 	# Hack around Apple Silicon signing bugs by copying the real app, signing it and moving it back.
@@ -67,4 +66,13 @@ if (CODE_SIGN_CERTIFICATE_ID)
 endif()
 
 # Add a necessary rpath to the imhex binary
-get_bundle_main_executable("${BUNDLE_PATH}" IMHEX_EXECUTABLE)
+get_bundle_main_executable("${BUNDLE_PATH}" IMHEX_EXECUTABLE)
+
+file(GLOB_RECURSE plugin_libs "${BUNDLE_PATH}/Contents/MacOS/*.hexpluglib")
+foreach(plugin_lib ${plugin_libs})
+	get_filename_component(plugin_lib_name ${plugin_lib} NAME)
+	set(plugin_lib_dest "${BUNDLE_PATH}/Contents/MacOS/plugins/${plugin_lib_name}")
+
+	configure_file(${plugin_lib} "${plugin_lib_dest}" COPYONLY)
+	message(STATUS "Copying plugin library: ${plugin_lib} to ${plugin_lib_dest}")
+endforeach ()

cmake/sdk/CMakeLists.txt

@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.20)
 project(ImHexSDK)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+set(CMAKE_POSITION_INDEPENDENT_CODE ON CACHE BOOL "" FORCE)
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/build_helpers.cmake")
 
 set(IMHEX_BASE_FOLDER ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
@@ -22,8 +23,15 @@ add_subdirectory(lib/third_party/imgui EXCLUDE_FROM_ALL)
 set(FMT_INSTALL OFF CACHE BOOL "" FORCE)
 add_subdirectory_if_exists(lib/third_party/fmt)
 set(FMT_LIBRARIES fmt::fmt-header-only PARENT_SCOPE)
+set(FMT_LIBRARIES fmt::fmt-header-only)
 
 add_subdirectory_if_exists(lib/third_party/nlohmann_json)
+set(NLOHMANN_JSON_LIBRARIES nlohmann_json PARENT_SCOPE)
+set(NLOHMANN_JSON_LIBRARIES nlohmann_json)
+
+add_subdirectory_if_exists(lib/third_party/boost)
+set(BOOST_LIBRARIES boost::regex PARENT_SCOPE)
+set(BOOST_LIBRARIES boost::regex)
 
 add_subdirectory(lib/external/libwolv EXCLUDE_FROM_ALL)
 
@@ -34,15 +42,16 @@ add_subdirectory(lib/libimhex)
 
 if (WIN32)
     set_target_properties(libimhex PROPERTIES
-            IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/lib/libimhex.dll"
+            IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/../libimhex.dll"
             IMPORTED_IMPLIB "${CMAKE_CURRENT_SOURCE_DIR}/lib/liblibimhex.dll.a"
             INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/lib/libimhex/include")
 elseif (APPLE)
+    file(GLOB LIBIMHEX_DYLIB "${CMAKE_CURRENT_SOURCE_DIR}/../../Frameworks/libimhex.*.dylib")
     set_target_properties(libimhex PROPERTIES
-            IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/lib/libimhex.dylib"
+            IMPORTED_LOCATION "${LIBIMHEX_DYLIB}"
             INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/lib/libimhex/include")
 else()
     set_target_properties(libimhex PROPERTIES
-            IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/lib/libimhex.so"
+            IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/../libimhex.so"
             INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/lib/libimhex/include")
 endif()

dist/AppImage/AppImageBuilder.yml

@@ -11,31 +11,23 @@ AppDir:
     exec_args: $@
   apt:
     arch:
-    - amd64
+    - "{{ARCHITECTURE_PACKAGE}}"
     allow_unauthenticated: true
     sources:
-    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ jammy main restricted
-    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ jammy-updates main restricted
-    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ jammy universe
-    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ jammy-updates universe
-    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ jammy multiverse
-    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ jammy-updates multiverse
-    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ jammy-backports main restricted
-        universe multiverse
-    - sourceline: deb http://security.ubuntu.com/ubuntu jammy-security main restricted
-    - sourceline: deb http://security.ubuntu.com/ubuntu jammy-security universe
-    - sourceline: deb http://security.ubuntu.com/ubuntu jammy-security multiverse
+    - sourceline: 'deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ oracular main restricted universe multiverse'
+    - sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ oracular main restricted universe multiverse'
     include:
     - librsvg2-common
-    - libbz2-1.0:amd64
-    - libcap2:amd64
-    - libdbus-1-3:amd64
-    - libgpg-error0:amd64
-    - liblzma5:amd64
-    - libnss-mdns:amd64
-    - libpcre3:amd64
-    - libselinux1:amd64
-    - libtinfo6:amd64
+    - libbz2-1.0
+    - libcap2
+    - libdbus-1-3
+    - libfontconfig1
+    - libgpg-error0
+    - liblzma5
+    - libnss-mdns
+    - libpcre3
+    - libselinux1
+    - libtinfo6
   files:
     include:
     - /lib/x86_64-linux-gnu/libLLVM-13.so.1
@@ -132,6 +124,6 @@ AppDir:
     - usr/share/doc/*/NEWS.*
     - usr/share/doc/*/TODO.*
 AppImage:
-  arch: x86_64
-  update-information: gh-releases-zsync|WerWolv|ImHex|latest|imhex-*-x86_64.AppImage.zsync
-  file_name: imhex-{{VERSION}}-x86_64.AppImage
+  arch: "{{ARCHITECTURE_APPIMAGE_BUILDER}}"
+  update-information: gh-releases-zsync|WerWolv|ImHex|latest|imhex-*-{{ARCHITECTURE_FILE_NAME}}.AppImage.zsync
+  file_name: imhex-{{VERSION}}-{{ARCHITECTURE_FILE_NAME}}.AppImage

dist/AppImage/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04 as build
+FROM ubuntu:24.10 as build
 
 # Used to invalidate layer cache but not mount cache
 # See https://github.com/moby/moby/issues/41715#issuecomment-733976493
@@ -14,24 +14,13 @@ apt update
 # general deps
 apt install -y ccache git wget
 # appimage tools deps
-apt install -y python3-pip python3-setuptools desktop-file-utils libgdk-pixbuf2.0-dev fuse ninja-build
+apt install -y python3-pip python3-venv python3-setuptools desktop-file-utils libgdk-pixbuf2.0-dev fuse ninja-build
 apt install -y squashfs-tools zsync
 
 # imhex deps
 /tmp/get_deps_debian.sh
 EOF
 
-RUN --mount=type=cache,target=/cache <<EOF
-# Download appimage-builder
-set -xe
-
-mkdir -p /cache/bin
-wget -nc https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O /cache/bin/appimagetool || true
-chmod +x /cache/bin/appimagetool
-
-pip3 install git+https://github.com/AppImageCrafters/appimage-builder@f38699e
-EOF
-
 ENV PATH="/cache/bin/:${PATH}"
 
 # Copy Imhex source
@@ -41,19 +30,24 @@ ARG LTO=ON
 ARG BUILD_TYPE=RelWithDebInfo
 ARG GIT_COMMIT_HASH
 ARG GIT_BRANCH
+ARG ARCHITECTURE_PACKAGE
+ARG ARCHITECTURE_FILE_NAME
+ARG ARCHITECTURE_APPIMAGE_BUILDER
 WORKDIR /build
-SHELL ["bash", "-c"] # Ubuntu sh doesnt support string substitution
+
+# Ubuntu sh doesnt support string substitution
+SHELL ["bash", "-c"]
+
 RUN <<EOF
 # Prepare ImHex build
 set -xe
 
-CC=gcc-12 CXX=g++-12 cmake -G "Ninja"                  \
+CC=gcc-14 CXX=g++-14 cmake -G "Ninja"                  \
     -DCMAKE_BUILD_TYPE=${BUILD_TYPE}                   \
     -DCMAKE_INSTALL_PREFIX="/usr"                      \
     -DCMAKE_C_COMPILER_LAUNCHER=ccache                 \
     -DCMAKE_CXX_COMPILER_LAUNCHER=ccache               \
     -DIMHEX_PATTERNS_PULL_MASTER=ON                    \
-    -DIMHEX_COMMIT_HASH_SHORT="${GIT_COMMIT_HASH::7}"  \
     -DIMHEX_COMMIT_HASH_LONG="${GIT_COMMIT_HASH}"      \
     -DIMHEX_COMMIT_BRANCH="${GIT_BRANCH}"              \
     -DIMHEX_ENABLE_LTO=${LTO}                          \
@@ -72,11 +66,23 @@ ccache -s
 EOF
 
 RUN <<EOF
-# Package ImHex as AppImage
+# Download appimage-builder
 set -xe
 
+mkdir -p /cache/bin
+wget -nc https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O /cache/bin/appimagetool || true
+chmod +x /cache/bin/appimagetool
+
+python3 -m venv venv
+. venv/bin/activate
+pip3 install git+https://github.com/AppImageCrafters/appimage-builder@f38699e
+
+# Package ImHex as AppImage
 export VERSION=$(cat /imhex/VERSION)
-appimage-builder --recipe /imhex/dist/AppImageBuilder.yml
+export ARCHITECTURE_PACKAGE=${ARCHITECTURE_PACKAGE}
+export ARCHITECTURE_FILE_NAME=${ARCHITECTURE_FILE_NAME}
+export ARCHITECTURE_APPIMAGE_BUILDER=${ARCHITECTURE_APPIMAGE_BUILDER}
+appimage-builder --recipe /imhex/dist/AppImage/AppImageBuilder.yml
 EOF
 
 FROM scratch

dist/Arch/Dockerfile

@@ -13,6 +13,7 @@ RUN pacman -S --needed --noconfirm      \
     glfw-x11                            \
     file                                \
     mbedtls                             \
+    fontconfig                          \
     freetype2                           \
     curl                                \
     dbus                                \

dist/Arch/PKGBUILD

@@ -8,7 +8,7 @@ pkgdesc="A Hex Editor for Reverse Engineers, Programmers and people who value th
 arch=("x86_64")
 url="https://github.com/WerWolv/ImHex"
 license=('GPL2')
-depends=(glfw mbedtls freetype2 libglvnd dbus gtk3 curl fmt yara nlohmann-json zlib bzip2 xz zstd)
+depends=(glfw mbedtls fontconfig freetype2 libglvnd dbus gtk3 curl fmt yara nlohmann-json zlib bzip2 xz zstd)
 makedepends=(git)
 provides=(imhex)
 conflicts=(imhex)
@@ -26,5 +26,5 @@ package() {
 
     install -d "$pkgdir/usr/share/imhex"
     cp -r "$srcdir/usr/share/imhex/"{constants,encodings,includes,magic,patterns} "$pkgdir/usr/share/imhex"
-    cp -r "$srcdir/usr/share/"{applications,licenses,pixmaps} "$pkgdir/usr/share"
+    cp -r "$srcdir/usr/share/"{applications,licenses,pixmaps,mime} "$pkgdir/usr/share"
 }

dist/DEBIAN/control.in

@@ -4,7 +4,7 @@ Section: editors
 Priority: optional
 Architecture: amd64
 License: GNU GPL-2
-Depends: libglfw3 | libglfw3-wayland, libmagic1, libmbedtls14, libfreetype6, libopengl0, libdbus-1-3, xdg-desktop-portal
+Depends: libfontconfig1, libglfw3 | libglfw3-wayland, libmagic1, libmbedtls14, libfreetype6, libopengl0, libdbus-1-3, xdg-desktop-portal
 Maintainer: WerWolv <hey@werwolv.net>
 Description: ImHex Hex Editor
  A Hex Editor for Reverse Engineers, Programmers and

dist/ImHex-9999.ebuild

@@ -20,13 +20,14 @@ DEPEND=""
 RDEPEND="${DEPEND}
 		media-libs/glfw
 		sys-apps/file
-		dev-libs/mbedtls
+		net-libs/mbedtls
 		dev-cpp/nlohmann_json
-		dbus
-		xdg-desktop-portal
+		sys-apps/dbus
+		sys-apps/xdg-desktop-portal
 		sys-libs/zlib
-        app-arch/bzip2
-        app-arch/lzma
-        app-arch/zstd
+		app-arch/bzip2
+		app-arch/lzma
+		app-arch/zstd
+		app-arch/lz4
 		"
 BDEPEND="${DEPEND}"

dist/compiling/docker.md

@@ -18,11 +18,11 @@ docker buildx build . -f <DOCKERFILE_PATH> --progress plain --build-arg 'JOBS=4'
 
 where `<DOCKERFILE_PATH>` should be replaced by the wanted Dockerfile base d on the build you want to do:
 
-| Wanted build | Dockerfile path             |
-|--------------|-----------------------------|
-| MacOS M1     | dist/macOS/arm64.Dockerfile |
-| AppImage     | dist/appimage/Dockerfile    |
-| Web version  | dist/web/Dockerfile         |
+| Wanted build | Dockerfile path             | Target |
+|--------------|-----------------------------|--------|
+| MacOS M1     | dist/macOS/arm64.Dockerfile | -      |
+| AppImage     | dist/appimage/Dockerfile    | -      |
+| Web version  | dist/web/Dockerfile         | raw    |
 
 We'll explain this command in the next section
 
@@ -43,6 +43,7 @@ In the command saw earlier:
 - `.` is the base folder that the Dockerfile will be allowed to see
 - `-f <path>` is to specify the Dockerfile path
 - `--progress plain` is to allow you to see the output of instructions
-- `--build-arg <key>=<value>` is to allow to to specify arguments to the build (like -DKEY=VALUE in CMake)
+- `--build-arg <key>=<value>` is to allow to specify arguments to the build (like -DKEY=VALUE in CMake)
 - `--build-context key=<folder>` is to specify folders other than the base folder that the Dockerfile is allowed to see
 - `--output <path>` is the path to write the output package to. If not specified, Docker will create an image as the output (probably not what you want)
+- `--target <target>` specifies which docker target to build

dist/compiling/linux.md

@@ -9,17 +9,12 @@ On Linux, ImHex is built through regular GCC (or optionally Clang).
 cd ImHex
 mkdir -p build
 cd build
-CC=gcc-12 CXX=g++-12 cmake                    \
+CC=gcc-12 CXX=g++-12                          \
+cmake -G "Ninja"                              \
     -DCMAKE_BUILD_TYPE=Release                \
-    -DCMAKE_INSTALL_PREFIX="/usr" 	          \
-    -DCMAKE_C_COMPILER_LAUNCHER=ccache        \
-    -DCMAKE_CXX_COMPILER_LAUNCHER=ccache      \
-    -DCMAKE_C_FLAGS="-fuse-ld=lld"            \
-    -DCMAKE_CXX_FLAGS="-fuse-ld=lld"          \
-    -DCMAKE_OBJC_COMPILER_LAUNCHER=ccache     \
-    -DCMAKE_OBJCXX_COMPILER_LAUNCHER=ccache   \
+    -DCMAKE_INSTALL_PREFIX="/usr"             \
     ..
-make -j 4 install
+ninja install
 ```
 
 All paths follow the XDG Base Directories standard, and can thus be modified

dist/compiling/macos.md

@@ -3,29 +3,20 @@
 On macOS, ImHex is built through regular GCC and LLVM clang.
 
 1. Clone the repo using `git clone https://github.com/WerWolv/ImHex --recurse-submodules`
-2. Install all the dependencies using `brew bundle --no-lock --file dist/Brewfile`
+2. Install all the dependencies using `brew bundle --no-lock --file dist/macOS/Brewfile`
 3. Build ImHex itself using the following commands:
 ```sh
 cd ImHex
 mkdir -p build
 cd build
-CC=$(brew --prefix gcc@12)/bin/gcc-12     \
-CXX=$(brew --prefix gcc@12)/bin/g++-12    \
+CC=$(brew --prefix llvm)/bin/clang        \
+CXX=$(brew --prefix llvm)/bin/clang++     \
 OBJC=$(brew --prefix llvm)/bin/clang      \
 OBJCXX=$(brew --prefix llvm)/bin/clang++  \
-PKG_CONFIG_PATH="$(brew --prefix openssl)/lib/pkgconfig":"$(brew --prefix)/lib/pkgconfig" \
-MACOSX_DEPLOYMENT_TARGET="10.15"          \
-cmake                                     \
+cmake -G "Ninja"                          \
   -DCMAKE_BUILD_TYPE=Release              \
+  -DCMAKE_INSTALL_PREFIX="./install"      \
   -DIMHEX_GENERATE_PACKAGE=ON             \
-  -DCMAKE_C_COMPILER_LAUNCHER=ccache      \
-  -DCMAKE_CXX_COMPILER_LAUNCHER=ccache    \
-  -DCMAKE_OBJC_COMPILER_LAUNCHER=ccache   \
-  -DCMAKE_OBJCXX_COMPILER_LAUNCHER=ccache \
   ..
-make -j4 package
+ninja install
 ```
-
-If the build fails while trying to find the macOS libraries, make sure you have
-Xcode installed with `xcode-select --install`. Homebrew will also help get the
-most recent SDK installed and configured with `brew doctor`.

dist/compiling/windows.md

@@ -14,7 +14,7 @@ mkdir build
 cd build
 cmake -G "Ninja"                          \
   -DCMAKE_BUILD_TYPE=Release              \
-  -DCMAKE_INSTALL_PREFIX="$PWD/install"   \
+  -DCMAKE_INSTALL_PREFIX="./install"      \
   -DIMHEX_USE_DEFAULT_BUILD_SETTINGS=ON   \
   ..
 ninja install

dist/gen_release_notes.py

@@ -0,0 +1,48 @@
+import subprocess
+import sys
+
+def get_commits(branch: str, start_tag: str, end_tag: str) -> list[str]:
+    try:
+        commits_raw = subprocess.check_output([ "git", "--no-pager", "log", branch, "--no-color", "--pretty=oneline", "--abbrev-commit", f"{start_tag}..{end_tag}"], stderr=subprocess.DEVNULL).decode("UTF-8").split("\n")
+    except:
+        return []
+
+    commits = []
+    for line in commits_raw:
+        commits.append(line[9:])
+
+    return commits
+
+def main(args: list) -> int:
+    if len(args) != 2:
+        print(f"Usage: {args[0]} prev_minor")
+        return 1
+    
+    last_minor_version = f"v1.{args[1]}"
+
+    master_commits = get_commits("master", f"{last_minor_version}.0", "master")
+
+    for i in range(1, 100):
+        branch_commits = get_commits(f"releases/{last_minor_version}.X", f"{last_minor_version}.0", f"{last_minor_version}.{i}")
+
+        if len(branch_commits) == 0:
+            break
+
+        master_commits = [commit for commit in master_commits if commit not in branch_commits]
+
+    sorted_commits = {}
+    for commit in master_commits:
+        category, commit_name = commit.split(":", 1)
+
+        if category not in sorted_commits:
+            sorted_commits[category] = []
+        sorted_commits[category].append(commit_name)
+
+    for category in sorted_commits:
+        print(f"## {category}\n")
+        for commit in sorted_commits[category]:
+            print(f"- {commit}")
+        print(f"\n")
+
+if __name__ == "__main__":
+    exit(main(sys.argv))

dist/get_deps_archlinux.sh

@@ -5,6 +5,7 @@ pacman -S $@ --needed \
   gcc           \
   lld           \
   glfw          \
+  fontconfig    \
   file          \
   mbedtls       \
   freetype2     \
@@ -18,4 +19,5 @@ pacman -S $@ --needed \
   zlib          \
   bzip2         \
   xz            \
-  zstd
+  zstd          \
+  lz4

dist/get_deps_debian.sh

@@ -8,8 +8,8 @@ fi
 
 apt install -y \
   build-essential       \
-  gcc-12                \
-  g++-12                \
+  gcc-14                \
+  g++-14                \
   lld                   \
   ${PKGCONF:-}          \
   cmake                 \
@@ -18,6 +18,7 @@ apt install -y \
   libglm-dev            \
   libmagic-dev          \
   libmbedtls-dev        \
+  libfontconfig-dev     \
   libfreetype-dev       \
   libdbus-1-dev         \
   libcurl4-gnutls-dev   \
@@ -26,4 +27,5 @@ apt install -y \
   zlib1g-dev            \
   libbz2-dev            \
   liblzma-dev           \
-  libzstd-dev
+  libzstd-dev           \
+  liblz4-dev

dist/get_deps_fedora.sh

@@ -4,6 +4,7 @@ dnf install -y      \
   cmake             \
   dbus-devel        \
   file-devel        \
+  fontconfig-devel  \
   freetype-devel    \
   libcurl-devel     \
   gcc-c++           \
@@ -16,4 +17,5 @@ dnf install -y      \
   libzstd-devel     \
   zlib-devel        \
   bzip2-devel       \
-  xz-devel
+  xz-devel          \
+  lz4-devel

dist/get_deps_msys2.sh

@@ -1,19 +1,21 @@
 #!/usr/bin/env sh
 
-pacman -S --needed --noconfirm  \
-  mingw-w64-x86_64-gcc          \
-  mingw-w64-x86_64-lld          \
-  mingw-w64-x86_64-cmake        \
-  mingw-w64-x86_64-ccache       \
-  mingw-w64-x86_64-glfw         \
-  mingw-w64-x86_64-file         \
-  mingw-w64-x86_64-curl-winssl  \
-  mingw-w64-x86_64-mbedtls      \
-  mingw-w64-x86_64-freetype     \
-  mingw-w64-x86_64-dlfcn        \
-  mingw-w64-x86_64-ninja        \
-  mingw-w64-x86_64-capstone     \
-  mingw-w64-x86_64-zlib         \
-  mingw-w64-x86_64-bzip2        \
-  mingw-w64-x86_64-xz           \
-  mingw-w64-x86_64-zstd
+pacman -S --needed --noconfirm pactoys unzip
+pacboy -S --needed --noconfirm  \
+  gcc:p          \
+  lld:p          \
+  cmake:p        \
+  ccache:p       \
+  glfw:p         \
+  file:p         \
+  curl-winssl:p  \
+  mbedtls:p      \
+  freetype:p     \
+  dlfcn:p        \
+  ninja:p        \
+  capstone:p     \
+  zlib:p         \
+  bzip2:p        \
+  xz:p           \
+  zstd:p         \
+  lz4:p

dist/get_deps_tumbleweed.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env sh
+
+zypper install     \
+  cmake            \
+  ninja            \
+  gcc14            \
+  gcc14-c++        \
+  fontconfig-devel \
+  freetype2-devel  \
+  libcurl-devel    \
+  dbus-1-devel     \
+  file-devel       \
+  Mesa-libGL-devel \
+  libglfw-devel    \
+  mbedtls-devel    \
+  gtk3-devel       \
+  libzstd-devel    \
+  zlib-devel       \
+  bzip3-devel      \
+  xz-devel         \
+  lz4-dev

dist/imhex.desktop

@@ -1,4 +1,5 @@
 [Desktop Entry]
+Version=1.0
 Name=ImHex
 Comment=ImHex Hex Editor
 GenericName=Hex Editor
@@ -8,3 +9,10 @@ Type=Application
 StartupNotify=true
 Categories=Development;IDE;
 StartupWMClass=imhex
+Keywords=static-analysis;reverse-engineering;disassembler;disassembly;hacking;forensics;hex-editor;cybersecurity;security;binary-analysis;
+MimeType=application/vnd.imhex.proj;
+Actions=NewFile;
+
+[Desktop Action NewFile]
+Exec=imhex --new
+Name=Create New File

dist/imhex.mime.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+    <mime-type type="application/vnd.imhex.proj">
+        <comment>ImHex Project</comment>
+        <glob pattern="*.hexproj"/>
+    </mime-type>
+</mime-info>

dist/langtool.py

@@ -1,104 +1,214 @@
+#!/usr/bin/env python3
 from pathlib import Path
-import sys
+import argparse
 import json
 
+# This fixes a CJK full-width character input issue
+#  which makes left halves of deleted characters displayed on screen
+# pylint: disable=unused-import
+import re
+import readline
+
 DEFAULT_LANG = "en_US"
+DEFAULT_LANG_PATH = "plugins/*/romfs/lang/"
 INVALID_TRANSLATION = ""
 
 
-def handle_missing_key(command, lang_data, key, value):
-    if command == "check":
-        print(f"Error: Translation {lang_data['code']} is missing translation for key '{key}'")
-        exit(2)
-    elif command == "translate" or command == "create":
-        print(f"Key \033[1m'{key}': '{value}'\033[0m is missing in translation '{lang_data['code']}'")
-        new_value = input("Enter translation: ")
-        lang_data["translations"][key] = new_value
-    elif command == "update":
-        lang_data["translations"][key] = INVALID_TRANSLATION
-
-
 def main():
-    if len(sys.argv) < 3:
-        print(f"Usage: {Path(sys.argv[0]).name} <check|translate|update|create> <lang folder path> <language>")
+    parser = argparse.ArgumentParser(
+        prog="langtool",
+        description="ImHex translate tool",
+    )
+    parser.add_argument(
+        "command",
+        choices=[
+            "check",
+            "translate",
+            "update",
+            "create",
+            "retranslate",
+            "untranslate",
+            "fmtzh",
+        ],
+    )
+    parser.add_argument(
+        "-c", "--langdir", default=DEFAULT_LANG_PATH, help="Language folder glob"
+    )
+    parser.add_argument("-l", "--lang", default="", help="Language to translate")
+    parser.add_argument(
+        "-r", "--reflang", default="", help="Language for reference when translating"
+    )
+    parser.add_argument(
+        "-k", "--keys", help="Keys to re-translate (only in re/untranslate mode)"
+    )
+    args = parser.parse_args()
+
+    command = args.command
+    lang = args.lang
+
+    print(f"Running in {command} mode")
+    lang_files_glob = f"{lang}.json" if lang != "" else "*.json"
+
+    lang_folders = set(Path(".").glob(args.langdir))
+    if len(lang_folders) == 0:
+        print(f"Error: {args.langdir} matches nothing")
         return 1
 
-    command = sys.argv[1]
-    if command not in ["check", "translate", "update", "create"]:
-        print(f"Unknown command: {command}")
-        return 1
+    for lang_folder in lang_folders:
+        if not lang_folder.is_dir():
+            print(f"Error: {lang_folder} is not a folder")
+            return 1
 
-    print(f"Using langtool in {command} mode")
+        default_lang_data = {}
+        default_lang_path = lang_folder / Path(DEFAULT_LANG + ".json")
+        if not default_lang_path.exists():
+            print(
+                f"Error: Default language file {default_lang_path} does not exist in {lang_folder}"
+            )
+            return 1
+        with default_lang_path.open("r", encoding="utf-8") as file:
+            default_lang_data = json.load(file)
 
-    lang_folder_path = Path(sys.argv[2])
-    if not lang_folder_path.exists():
-        print(f"Error: {lang_folder_path} does not exist")
-        return 1
-
-    if not lang_folder_path.is_dir():
-        print(f"Error: {lang_folder_path} is not a folder")
-        return 1
-
-    lang = sys.argv[3] if len(sys.argv) > 3 else ""
-
-    print(f"Processing language files in {lang_folder_path}...")
-
-    default_lang_file_path = lang_folder_path / Path(DEFAULT_LANG + ".json")
-    if not default_lang_file_path.exists():
-        print(f"Error: Default language file {default_lang_file_path} does not exist")
-        return 1
-
-    print(f"Using file '{default_lang_file_path.name}' as template language file")
-
-    with default_lang_file_path.open("r", encoding="utf-8") as default_lang_file:
-        default_lang_data = json.load(default_lang_file)
+        reference_lang_data = None
+        reference_lang_path = lang_folder / Path(args.reflang + ".json")
+        if reference_lang_path.exists():
+            with reference_lang_path.open("r", encoding="utf-8") as file:
+                reference_lang_data = json.load(file)
 
         if command == "create" and lang != "":
-            lang_file_path = lang_folder_path / Path(lang + ".json")
+            lang_file_path = lang_folder / Path(lang + ".json")
             if lang_file_path.exists():
-                print(f"Error: Language file {lang_file_path} already exists")
-                return 1
+                continue
 
-            print(f"Creating new language file '{lang_file_path.name}'")
+            exist_lang_data = None
+            for lang_folder1 in lang_folders:
+                lang_file_path1 = lang_folder1 / Path(lang + ".json")
+                if lang_file_path1.exists():
+                    with lang_file_path1.open("r", encoding="utf-8") as file:
+                        exist_lang_data = json.load(file)
+                    break
+
+            print(f"Creating new language file '{lang_file_path}'")
 
             with lang_file_path.open("w", encoding="utf-8") as new_lang_file:
                 new_lang_data = {
                     "code": lang,
-                    "language": input("Enter language: "),
-                    "country": input("Enter country: "),
-                    "translations": {}
+                    "language": (
+                        exist_lang_data["language"]
+                        if exist_lang_data
+                        else input("Enter language name: ")
+                    ),
+                    "country": (
+                        exist_lang_data["country"]
+                        if exist_lang_data
+                        else input("Enter country name: ")
+                    ),
+                    "translations": {},
                 }
                 json.dump(new_lang_data, new_lang_file, indent=4, ensure_ascii=False)
 
-        for additional_lang_file_path in lang_folder_path.glob("*.json"):
-            if not lang == "" and not additional_lang_file_path.stem == lang:
+        lang_files = set(lang_folder.glob(lang_files_glob))
+        if len(lang_files) == 0:
+            print(f"Warn: Language file for '{lang}' does not exist in '{lang_folder}'")
+        for lang_file_path in lang_files:
+            if (
+                lang_file_path.stem == f"{DEFAULT_LANG}.json"
+                or lang_file_path.stem == f"{args.reflang}.json"
+            ):
                 continue
 
-            if additional_lang_file_path.name.startswith(DEFAULT_LANG):
-                continue
+            print(f"\nProcessing '{lang_file_path}'")
+            if not (command == "update" or command == "create"):
+                print("\n----------------------------\n")
 
-            print(f"\nProcessing file '{additional_lang_file_path.name}'\n----------------------------\n")
-
-            with additional_lang_file_path.open("r+", encoding="utf-8") as additional_lang_file:
-                additional_lang_data = json.load(additional_lang_file)
+            with lang_file_path.open("r+", encoding="utf-8") as target_lang_file:
+                lang_data = json.load(target_lang_file)
 
                 for key, value in default_lang_data["translations"].items():
-                    if key not in additional_lang_data["translations"] or additional_lang_data["translations"][key] == INVALID_TRANSLATION:
-                        handle_missing_key(command, additional_lang_data, key, value)
+                    has_translation = (
+                        key in lang_data["translations"]
+                        and lang_data["translations"][key] != INVALID_TRANSLATION
+                    )
+                    if (
+                        has_translation
+                        and not (
+                            (command == "retranslate" or command == "untranslate")
+                            and re.compile(args.keys).fullmatch(key)
+                        )
+                        and not command == "fmtzh"
+                    ):
+                        continue
+                    if command == "check":
+                        print(
+                            f"Error: Translation {lang_data['code']} is missing translation for key '{key}'"
+                        )
+                    elif (
+                        command == "translate"
+                        or command == "retranslate"
+                        or command == "untranslate"
+                    ):
+                        if command == "untranslate" and not has_translation:
+                            continue
+                        reference_tranlsation = (
+                            " '%s'" % reference_lang_data["translations"][key]
+                            if (
+                                reference_lang_data
+                                and key in reference_lang_data["translations"]
+                            )
+                            else ""
+                        )
+                        print(
+                            f"\033[1m'{key}' '{value}'{reference_tranlsation}\033[0m => {lang_data['language']}",
+                            end="",
+                        )
+                        if has_translation:
+                            translation = lang_data["translations"][key]
+                            print(f" <= \033[1m'{translation}'\033[0m")
+                        print()  # for a new line
+                        if command == "untranslate":
+                            lang_data["translations"][key] = INVALID_TRANSLATION
+                            continue
+                        try:
+                            new_value = input("=> ")
+                            lang_data["translations"][key] = new_value
+                        except KeyboardInterrupt:
+                            break
+                    elif command == "update" or command == "create":
+                        lang_data["translations"][key] = INVALID_TRANSLATION
+                    elif command == "fmtzh":
+                        if has_translation:
+                            lang_data["translations"][key] = fmtzh(
+                                lang_data["translations"][key]
+                            )
 
                 keys_to_remove = []
-                for key, value in additional_lang_data["translations"].items():
+                for key, value in lang_data["translations"].items():
                     if key not in default_lang_data["translations"]:
                         keys_to_remove.append(key)
-
                 for key in keys_to_remove:
-                    additional_lang_data["translations"].pop(key)
-                    print(f"Removed unused key '{key}' from translation '{additional_lang_data['code']}'")
+                    lang_data["translations"].pop(key)
+                    print(
+                        f"Removed unused key '{key}' from translation '{lang_data['code']}'"
+                    )
 
-                additional_lang_file.seek(0)
-                additional_lang_file.truncate()
-                json.dump(additional_lang_data, additional_lang_file, indent=4, sort_keys=True, ensure_ascii=False)
+                target_lang_file.seek(0)
+                target_lang_file.truncate()
+                json.dump(
+                    lang_data,
+                    target_lang_file,
+                    indent=4,
+                    sort_keys=True,
+                    ensure_ascii=False,
+                )
 
 
-if __name__ == '__main__':
+def fmtzh(text: str) -> str:
+    text = re.sub(r"(\.{3}|\.{6})", "……", text)
+    text = text.replace("!", "！")
+    text = re.sub(r"([^\.\na-zA-Z\d])\.$", "\1。", text, flags=re.M)
+    text = text.replace("?", "？")
+    return text
+
+
+if __name__ == "__main__":
     exit(main())

dist/macOS/Brewfile

@@ -6,7 +6,6 @@ brew "freetype2"
 brew "libmagic"
 brew "pkg-config"
 brew "curl"
-brew "gcc@12"
 brew "llvm"
 brew "glfw"
 brew "ninja"

dist/macOS/arm64.Dockerfile

@@ -1,10 +1,21 @@
 # This base image is also known as "crosscompile". See arm64.crosscompile.Dockerfile
-FROM ghcr.io/itrooz/macos-crosscompile:clang17-nosdk as build
+FROM ghcr.io/itrooz/macos-crosscompile:clang19-nosdk as build
 
-ENV MACOSX_DEPLOYMENT_TARGET 12.1
+ENV MACOSX_DEPLOYMENT_TARGET 13.0
 
 # -- DOWNLOADING STUFF
 
+# Update vcpkg
+RUN <<EOF
+cp /vcpkg/triplets/community/arm-osx-mytriplet.cmake /tmp/arm-osx-mytriplet.cmake
+git -C /vcpkg clean -ffdx
+git -C /vcpkg checkout origin/master
+git -C /vcpkg reset --hard
+git -C /vcpkg pull
+/vcpkg/bootstrap-vcpkg.sh
+cp /tmp/arm-osx-mytriplet.cmake /vcpkg/triplets/community/arm-osx-mytriplet.cmake
+EOF
+
 ## Install make
 RUN --mount=type=cache,target=/var/lib/apt/lists/ apt update && apt install -y make
 
@@ -35,9 +46,9 @@ EOF
 
 ## Download libmagic
 ### Clone libmagic
-RUN git clone https://github.com/file/file /mnt/file
+RUN git clone --depth 1 --branch FILE5_46 https://github.com/file/file /mnt/file
 ### Download libmagic dependencies
-RUN --mount=type=cache,target=/var/lib/apt/lists/ apt install -y libtool autoconf
+RUN --mount=type=cache,target=/var/lib/apt/lists/ apt update && apt install -y libtool autoconf
 
 # -- DOWNLOADING + BUILDING STUFF
 
@@ -118,7 +129,7 @@ if [ "$CUSTOM_GLFW" ]; then
     cd /mnt/glfw
     mkdir build
     cd build
-    CC=o64-gcc CXX=o64-g++ cmake -G "Ninja"             \
+    CC=o64-clang CXX=o64-clang++ cmake -G "Ninja"       \
           -DCMAKE_BUILD_TYPE=$BUILD_TYPE                \
           -DBUILD_SHARED_LIBS=ON                        \
           -DCMAKE_C_COMPILER_LAUNCHER=ccache            \
@@ -126,7 +137,7 @@ if [ "$CUSTOM_GLFW" ]; then
           -DCMAKE_OBJC_COMPILER_LAUNCHER=ccache         \
           -DCMAKE_OBJCXX_COMPILER_LAUNCHER=ccache       \
           -DCMAKE_INSTALL_PREFIX=/vcpkg/installed/arm-osx-mytriplet \
-          -DVCPKG_TARGET_TRIPLET=arm-osx-mytriplet -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=/osxcross/target/toolchain.cmake -DCMAKE_OSX_SYSROOT=/osxcross/target/SDK/MacOSX14.0.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \
+          -DVCPKG_TARGET_TRIPLET=arm-osx-mytriplet -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=/osxcross/target/toolchain.cmake -DCMAKE_OSX_SYSROOT=/osxcross/target/SDK/MacOSX14.0.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=13.0 \
         ..
     ninja -j $JOBS install
 
@@ -148,7 +159,7 @@ RUN --mount=type=cache,target=/cache --mount=type=cache,target=/mnt/ImHex/build/
         `# ccache flags` \
         -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_OBJC_COMPILER_LAUNCHER=ccache -DCMAKE_OBJCXX_COMPILER_LAUNCHER=ccache \
         `# MacOS cross-compiling flags` \
-        -DVCPKG_TARGET_TRIPLET=arm-osx-mytriplet -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=/osxcross/target/toolchain.cmake -DCMAKE_OSX_SYSROOT=/osxcross/target/SDK/MacOSX14.0.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \
+        -DVCPKG_TARGET_TRIPLET=arm-osx-mytriplet -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=/osxcross/target/toolchain.cmake -DCMAKE_OSX_SYSROOT=/osxcross/target/SDK/MacOSX14.0.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=13.0 \
         `# Override compilers for code generators` \
         -DNATIVE_CMAKE_C_COMPILER=/usr/bin/clang -DNATIVE_CMAKE_CXX_COMPILER=/usr/bin/clang++ \
         `# Normal ImHex flags` \
@@ -170,4 +181,4 @@ EOF
 
 
 FROM scratch
-COPY --from=build /mnt/ImHex/build/install/imhex.app ImHex.app
+COPY --from=build /mnt/ImHex/build/install/imhex.app imhex.app

dist/macOS/arm64.crosscompile.Dockerfile

@@ -1,4 +1,4 @@
-# This image is is provided for reference, but a (probably more up to date) image should be available at https://github.com/iTrooz/macos-crosscompile
+# This image is provided for reference, but a (probably more up to date) image should be available at https://github.com/iTrooz/macos-crosscompile
 FROM ubuntu:22.04
 
 ENV PATH                $PATH:/osxcross/target/bin
@@ -68,19 +68,6 @@ RUN --mount=type=cache,target=/cache <<EOF
     
     ccache -s
 EOF
-# Not needed, because we don't use gcc for cross-compiling anymore
-# ## Install dependencies for gcc-13
-# RUN apt install -y gcc g++ zlib1g-dev libmpc-dev libmpfr-dev libgmp-dev
-# ## Build cross-compiler gcc-13
-# RUN --mount=type=cache,target=/cache <<EOF
-#     set -xe
-#     ccache -zs
-
-#     cd /osxcross
-#     UNATTENDED=1 CC=/usr/lib/ccache/gcc CXX=/usr/lib/ccache/g++ GCC_VERSION=13.2.0 ./build_gcc.sh
-
-#     ccache -s
-# EOF
 
 ARG DELETE_SDK=1
 RUN <<EOF

dist/rpm/imhex.spec

@@ -1,5 +1,7 @@
+%define source_date_epoch_from_changelog 0
+
 Name:           imhex
-Version:        1.26.2
+Version:        VERSION
 Release:        0%{?dist}
 Summary:        A hex editor for reverse engineers and programmers
 
@@ -14,6 +16,7 @@ BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
 BuildRequires:  dbus-devel
 BuildRequires:  file-devel
+BuildRequires:  fontconfig-devel
 BuildRequires:  freetype-devel
 BuildRequires:  fmt-devel
 BuildRequires:  gcc-c++
@@ -26,13 +29,13 @@ BuildRequires:  llvm-devel
 BuildRequires:  mbedtls-devel
 BuildRequires:  yara-devel
 BuildRequires:  nativefiledialog-extended-devel
-BuildRequires:  dotnet-sdk-7.0
+BuildRequires:  dotnet-sdk-8.0
 BuildRequires:  libzstd-devel
 BuildRequires:  zlib-devel
 BuildRequires:  bzip2-devel
 BuildRequires:  xz-devel
 %if 0%{?rhel}
-BuildRequires:  gcc-toolset-12
+BuildRequires:  gcc-toolset-14
 %endif
 
 Provides:       bundled(gnulib)
@@ -40,7 +43,6 @@ Provides:       bundled(capstone) = 5.0-rc2
 Provides:       bundled(imgui)
 Provides:       bundled(libromfs)
 Provides:       bundled(microtar)
-Provides:       bundled(libpl)
 Provides:       bundled(xdgpp)
 
 # ftbfs on these arches.  armv7hl might compile when capstone 5.x
@@ -69,9 +71,9 @@ rm -rf lib/third_party/{fmt,nlohmann_json,yara}
 
 %build
 %if 0%{?rhel}
-. /opt/rh/gcc-toolset-12/enable
+. /opt/rh/gcc-toolset-14/enable
 %set_build_flags
-CXXFLAGS+=" -std=gnu++2b"
+CXXFLAGS+=" -std=gnu++23"
 %endif
 %cmake \
  -D CMAKE_BUILD_TYPE=Release             \
@@ -92,14 +94,10 @@ CXXFLAGS+=" -std=gnu++2b"
 
 %check
 %if 0%{?rhel}
-. /opt/rh/gcc-toolset-12/enable
+. /opt/rh/gcc-toolset-14/enable
 %set_build_flags
-CXXFLAGS+=" -std=gnu++2b"
+CXXFLAGS+=" -std=gnu++23"
 %endif
-# build binaries required for tests
-%cmake_build --target unit_tests
-%ctest --exclude-regex '(Helpers/StoreAPI|Helpers/TipsAPI|Helpers/ContentAPI)'
-# Helpers/*API exclude tests that require network access
 
 
 %install
@@ -125,11 +123,11 @@ cp -a lib/third_party/xdgpp/LICENSE                                  %{buildroot
 %doc README.md
 %{_bindir}/imhex
 %{_bindir}/imhex-updater
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/pixmaps/%{name}.svg
 %{_datadir}/applications/%{name}.desktop
+%{_datadir}/mime/packages/%{name}.xml
 %{_libdir}/libimhex.so*
 %{_libdir}/%{name}/
-%{_metainfodir}/net.werwolv.%{name}.metainfo.xml
-
-
-%changelog
+%{_libdir}/*.hexpluglib
+/usr/lib/debug/%{_libdir}/*.debug
+%{_metainfodir}/net.werwolv.%{name}.metainfo.xml

dist/vcpkg.json

@@ -0,0 +1,16 @@
+{
+    "name": "vcpkg",
+    "version": "1.0.0",
+    "builtin-baseline": "7e21420f775f72ae938bdeb5e6068f722088f06a",
+    "dependencies": [
+        "libmagic",
+        "freetype",
+        "mbedtls",
+        "zlib",
+        "bzip2",
+        "liblzma",
+        "zstd",
+        "glfw3",
+        "curl"
+    ]
+}

dist/web/Dockerfile

@@ -1,11 +1,11 @@
-FROM emscripten/emsdk:latest as build
+FROM emscripten/emsdk:3.1.51 AS build
 
 # Used to invalidate layer cache but not mount cache
 # See https://github.com/moby/moby/issues/41715#issuecomment-733976493
 ARG UNIQUEKEY 1
 
 RUN apt update
-RUN apt install -y git ccache autoconf automake libtool cmake pkg-config
+RUN apt install -y git ccache autoconf automake libtool cmake pkg-config ninja-build
 
 RUN <<EOF
 # Install vcpkg
@@ -13,6 +13,7 @@ RUN <<EOF
 set -xe
 
 git clone https://github.com/microsoft/vcpkg /vcpkg
+git -C /vcpkg pull
 /vcpkg/bootstrap-vcpkg.sh
 sed -i 's/vcpkg_install_make(${EXTRA_ARGS})/vcpkg_install_make(${EXTRA_ARGS} SUBPATH src)/g' /vcpkg/ports/libmagic/portfile.cmake
 EOF
@@ -27,7 +28,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
 ' >> /emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake
 EOF
 
-ENV VCPKG_DEFAULT_BINARY_CACHE /cache/vcpkg
+ENV VCPKG_DEFAULT_BINARY_CACHE=/cache/vcpkg
 RUN --mount=type=cache,target=/cache <<EOF
 # Install dependencies with vcpkg
 set -xe
@@ -45,7 +46,7 @@ EOF
 
 # Build ImHex
 ARG JOBS=4
-ENV CCACHE_DIR /cache/ccache
+ENV CCACHE_DIR=/cache/ccache
 
 RUN mkdir /build
 WORKDIR /build
@@ -56,27 +57,35 @@ set -xe
 ccache -zs
 
 cmake /imhex                                                                                            \
+    -G "Ninja"                                                                                          \
     -DIMHEX_OFFLINE_BUILD=ON                                                                            \
     -DIMHEX_STATIC_LINK_PLUGINS=ON                                                                      \
     -DIMHEX_EXCLUDE_PLUGINS="script_loader"                                                             \
+    -DIMHEX_COMPRESS_DEBUG_INFO=OFF                                                                     \
     -DNATIVE_CMAKE_C_COMPILER=gcc                                                                       \
     -DNATIVE_CMAKE_CXX_COMPILER=g++                                                                     \
     -DCMAKE_C_COMPILER_LAUNCHER=ccache                                                                  \
     -DCMAKE_CXX_COMPILER_LAUNCHER=ccache                                                                \
     -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake                                      \
     -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake \
+    -DLIBROMFS_COMPRESS_RESOURCES=OFF                                                                   \
     -DCMAKE_BUILD_TYPE=Release
 
-make -j $JOBS
+ninja -j $JOBS
 
 cp /imhex/dist/web/source/* /build
 ccache -s
 EOF
 
-FROM scratch
+# Create a file dedicated to store wasm size, because I know no way to get the wasm content length if the web server uses compression
+# See https://stackoverflow.com/questions/41701849/cannot-modify-accept-encoding-with-fetch https://github.com/AnthumChris/fetch-progress-indicators/issues/13
+RUN du -b /build/imhex.wasm | cut -f1 > imhex.wasm.size
+
+FROM scratch AS raw
 COPY --from=build [             \
     # ImHex                     \
     "/build/imhex.wasm",        \
+    "/build/imhex.wasm.size",   \
     "/build/imhex.js",          \
     "/build/imhex.worker.js",   \
                                 \
@@ -86,11 +95,14 @@ COPY --from=build [             \
     "/build/wasm-config.js",    \
     "/build/enable-threads.js", \
     "/build/favicon.ico",       \
-    "/build/icon.png",          \
+    "/build/icon.svg",          \
     "/build/manifest.json",     \
     "/build/robots.txt",        \
     "/build/sitemap.xml",       \
                                 \
     # Destination               \
     "./"                        \
-]
+]
+
+FROM nginx
+COPY --from=raw . /usr/share/nginx/html

dist/web/compose.yml

@@ -0,0 +1,10 @@
+# docker compose -f dist/web/compose.yml up --build
+version: '3'
+services:
+  imhex_web:
+    image: imhex_web:latest
+    build:
+      context: ../../ # ImHex folder
+      dockerfile: ./dist/web/Dockerfile
+    ports:
+      - 8080:80

dist/web/plugin-bundle.cpp.in

@@ -2,10 +2,12 @@
 
 extern "C" void forceLinkPlugin_@IMHEX_PLUGIN_NAME@();
 
+namespace {
 struct StaticLoad {
     StaticLoad() {
         forceLinkPlugin_@IMHEX_PLUGIN_NAME@();
     }
 };
+}
 
-static StaticLoad staticLoad;
+static StaticLoad staticLoad;

dist/web/source/icon.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" version="1">
+ <rect style="opacity:0.2" width="55" height="10" x="5" y="-60" rx="1.41" transform="rotate(90)"/>
+ <rect style="fill:#2b50a1" width="55" height="10" x="4" y="-60" rx="1.41" transform="rotate(90)"/>
+ <rect style="fill:#2b50a1" width="55" height="10" x="4" y="-14" rx="1.41" transform="rotate(90)"/>
+ <rect style="fill:#2b50a1" width="55" height="10" x="4" y="-33" rx="1.41" transform="rotate(90)"/>
+ <path style="opacity:0.2" d="M 5.3808594,5 C 4.6158118,5 4,5.6158118 4,6.3808594 V 13.619141 C 4,14.384188 4.6158118,15 5.3808594,15 H 31.619141 C 32.384188,15 33,14.384188 33,13.619141 V 6.3808594 C 33,5.6158118 32.384188,5 31.619141,5 Z M 40.400391,5 C 39.624791,5 39,5.6247906 39,6.4003906 V 13.599609 C 39,14.375209 39.624791,15 40.400391,15 H 58.599609 C 59.375209,15 60,14.375209 60,13.599609 V 6.4003906 C 60,5.6247906 59.375209,5 58.599609,5 Z M 5.3808594,50 C 4.6158118,50 4,50.615812 4,51.380859 v 7.238282 C 4,59.384188 4.6158118,60 5.3808594,60 H 31.619141 C 32.384188,60 33,59.384188 33,58.619141 V 51.380859 C 33,50.615812 32.384188,50 31.619141,50 Z"/>
+ <rect style="fill:#3a6be0" width="29" height="10" x="4" y="4" rx="1.381"/>
+ <rect style="fill:#3a6be0" width="21" height="10" x="39" y="4" rx="1.4"/>
+ <rect style="fill:#3a6be0" width="29" height="10" x="4" y="49" rx="1.381"/>
+ <path style="fill:#ffffff;opacity:0.1" d="M 5.3808594 4 C 4.6158118 4 4 4.6158118 4 5.3808594 L 4 6.3808594 C 4 5.6158118 4.6158118 5 5.3808594 5 L 31.619141 5 C 32.384188 5 33 5.6158118 33 6.3808594 L 33 5.3808594 C 33 4.6158118 32.384188 4 31.619141 4 L 5.3808594 4 z M 40.400391 4 C 39.624791 4 39 4.6247906 39 5.4003906 L 39 6.4003906 C 39 5.6247906 39.624791 5 40.400391 5 L 58.599609 5 C 59.375209 5 60 5.6247906 60 6.4003906 L 60 5.4003906 C 60 4.6247906 59.375209 4 58.599609 4 L 40.400391 4 z M 5.3808594 49 C 4.6158118 49 4 49.615812 4 50.380859 L 4 51.380859 C 4 50.615812 4.6158118 50 5.3808594 50 L 31.619141 50 C 32.384188 50 33 50.615812 33 51.380859 L 33 50.380859 C 33 49.615812 32.384188 49 31.619141 49 L 5.3808594 49 z"/>
+</svg>

dist/web/source/index.html

@@ -11,7 +11,7 @@
     <meta name="title" content="ImHex">
     <meta name="description" content="Free and extremely powerful Online Hex Editor for your Web Browser. ImHex is a free and open source Hex Editor for Reverse Engineers and Developers and Data Analysts.">
     <link rel="icon" type="image/x-icon" href="favicon.ico">
-    <link rel="apple-touch-icon" href="icon.png">
+    <link rel="apple-touch-icon" href="icon.svg">
 
     <!-- Open Graph / Facebook -->
     <meta property="og:type" content="website">
@@ -38,7 +38,7 @@
             "founder": "WerWolv",
             "slogan": "A Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM.",
             "url": "https://imhex.werwolv.net",
-            "logo": "https://imhex.werwolv.net/assets/logos/logo.png"
+            "logo": "https://imhex.werwolv.net/assets/logos/logo.svg"
         }
     </script>
 
@@ -61,37 +61,44 @@
     <link rel="stylesheet" href="style.css">
 </head>
 <body>
-    <div id="loading" class="centered">
-        <img src="https://raw.githubusercontent.com/WerWolv/ImHex/master/plugins/builtin/romfs/assets/dark/banner.png" id="logo" alt="ImHex Logo">
-        <h1>A Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM.</h1>
-        <h2>Available both natively and on the web</h2>
-        <h5>ImHex runs directly in your web browser with the help of Emscripten and WebAssembly.</h5>
+<div id="loading" class="centered">
+    <img src="https://raw.githubusercontent.com/WerWolv/ImHex/master/plugins/builtin/romfs/assets/dark/banner.svg" id="logo" alt="ImHex Logo">
+    <h1>A Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM.</h1>
+    <h2>Available both natively and on the web</h2>
+    <h5>ImHex runs directly in your web browser with the help of Emscripten and WebAssembly.</h5>
 
-        <div style="height: 50%">
-            <div style="height: 30%"> </div>
-            <h2 id="not_working">
-                Not loading in your Browser? <a href="https://imhex.werwolv.net">Try the native version</a>
-            </h2>
-            <div style="height: 50%"></div>
-        </div>
-
-        <div class="loading_ripple">
-            <div class="lds-ripple"><div></div><div></div></div>
-        </div>
-
-        <div style="height: 10%">
-        </div>
-
-        <div class="footer">
-            <a href="https://imhex.werwolv.net">Homepage</a>
-            <p>Made with ♥️ by the ImHex Team</p>
-            <a href="https://github.com/WerWolv/ImHex">GitHub</a>
+    <div style="height: 50%">
+        <div style="height: 30%"> </div>
+        <h2 id="not_working">
+            Not loading in your Browser? <a href="https://imhex.werwolv.net">Try the native version</a>
+        </h2>
+        <div class="progress-bar-container">
+            <div class="progress progress-moved">
+                <div class="progress-bar" id="progress-bar-content">
+                </div>
+            </div>
         </div>
     </div>
 
-    <canvas class="emscripten" id="canvas" oncontextmenu="event.preventDefault()"></canvas>
 
-    <script src="wasm-config.js"></script>
-    <script async src="imhex.js"></script>
+
+    <div class="loading_ripple">
+        <div class="lds-ripple"><div></div><div></div></div>
+    </div>
+
+    <div style="height: 10%">
+    </div>
+
+    <div class="footer">
+        <a href="https://imhex.werwolv.net">Homepage</a>
+        <p>Made with ♥️ by the ImHex Team</p>
+        <a href="https://github.com/WerWolv/ImHex">GitHub</a>
+    </div>
+</div>
+
+<canvas class="emscripten" id="canvas" oncontextmenu="event.preventDefault()"></canvas>
+
+<script src="wasm-config.js"></script>
+<script async src="imhex.js"></script>
 </body>
 </html>

dist/web/source/manifest.json

@@ -10,8 +10,8 @@
     ],
     "icons": [
         {
-            "src": "icon.png",
-            "type": "image/png",
+            "src": "icon.svg",
+            "type": "image/svg",
             "sizes": "640x640"
         }
     ],

dist/web/source/sitemap.xml

@@ -5,10 +5,63 @@
       xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9
             http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
 
-<url>
-  <loc>https://web.imhex.werwolv.net/</loc>
-  <lastmod>2023-12-07T22:53:06+00:00</lastmod>
-</url>
+  <url>
+    <loc>https://web.imhex.werwolv.net/</loc>
+    <lastmod>2024-01-02T11:44:00+00:00</lastmod>
+    <priority>1.00</priority>
+  </url>
+  <url>
+    <title>English</title>
+    <loc>https://web.imhex.werwolv.net?lang=en-US</loc>
+    <lastmod>2024-01-02T11:44:00+00:00</lastmod>
+    <priority>1.00</priority>
+  </url>
+  <url>
+    <title>Deutsch</title>
+    <loc>https://web.imhex.werwolv.net?lang=de-DE</loc>
+    <lastmod>2024-01-02T11:44:00+00:00</lastmod>
+    <priority>1.00</priority>
+  </url>
+  <url>
+    <title>Português</title>
+    <loc>https://web.imhex.werwolv.net?lang=pt-BR</loc>
+    <lastmod>2024-01-02T11:44:00+00:00</lastmod>
+  </url>
+  <url>
+    <title>中国</title>
+    <loc>https://web.imhex.werwolv.net?lang=zh-CN</loc>
+    <lastmod>2024-01-02T11:44:00+00:00</lastmod>
+  </url>
+  <url>
+    <title>國語</title>
+    <loc>https://web.imhex.werwolv.net?lang=zh-TW</loc>
+    <lastmod>2024-01-02T11:44:00+00:00</lastmod>
+  </url>
+  <url>
+    <title>日本語</title>
+    <loc>https://web.imhex.werwolv.net?lang=ja-JP</loc>
+    <lastmod>2024-01-02T11:44:00+00:00</lastmod>
+  </url>
+  <url>
+    <title>한국어</title>
+    <loc>https://web.imhex.werwolv.net?lang=ko-KR</loc>
+    <lastmod>2024-01-02T11:44:00+00:00</lastmod>
+  </url>
+  <url>
+    <title>Español</title>
+    <loc>https://web.imhex.werwolv.net?lang=es-ES</loc>
+    <lastmod>2024-01-02T11:44:00+00:00</lastmod>
+  </url>
+  <url>
+    <title>Italiano</title>
+    <loc>https://web.imhex.werwolv.net?lang=it-IT</loc>
+    <lastmod>2024-01-02T11:44:00+00:00</lastmod>
+  </url>
+  <url>
+    <title>Русский</title>
+    <loc>https://web.imhex.werwolv.net?lang=ru-RU</loc>
+    <lastmod>2024-01-02T11:44:00+00:00</lastmod>
+  </url>
 
 
 </urlset>

dist/web/source/style.css

@@ -17,6 +17,7 @@ body {
     margin-right: auto;
     display: none;
     border: 0 none;
+    image-rendering: smooth;
 }
 
 h1, h2, h5 {
@@ -132,4 +133,56 @@ a:hover {
         height: 72px;
         opacity: 0;
     }
+}
+
+
+:root {
+    --progress: 0%;
+}
+
+.progress-bar-container {
+    margin: 100px auto;
+    width: 600px;
+    text-align: center;
+}
+
+.progress {
+    padding: 6px;
+    border-radius: 30px;
+    background: rgba(0, 0, 0, 0.25);
+    box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.25),
+    0 1px rgba(255, 255, 255, 0.08);
+}
+
+.progress-bar {
+    color: rgba(240, 240, 240, 0.9);
+    height: 18px;
+    border-radius: 30px;
+    font-size: 13px;
+    font-family: monospace;
+    font-weight: bold;
+    text-wrap: avoid;
+    white-space: nowrap;
+    overflow: hidden;
+    background-image: linear-gradient(
+            to bottom,
+            rgba(255, 255, 255, 0.2),
+            rgba(255, 255, 255, 0.0)
+    );
+}
+
+.progress-moved .progress-bar {
+    width: var(--progress);
+    background-color: #3864cb;
+}
+
+#logo {
+    height: 25%;
+    margin-top: 50px;
+}
+
+.canvas-fixed {
+    position: absolute;
+    top: 0;
+    left: 0;
 }

dist/web/source/wasm-config.js

@@ -1,3 +1,67 @@
+let wasmSize = null;
+// See comment in dist/web/Dockerfile about imhex.wasm.size
+fetch("imhex.wasm.size").then(async (resp) => {
+    wasmSize = parseInt((await resp.text()).trim());
+    console.log(`Real WASM binary size is ${wasmSize} bytes`);
+});
+
+// Monkeypatch WebAssembly to have a progress bar
+// inspired from: https://github.com/WordPress/wordpress-playground/pull/46 (but had to be modified)
+function monkeyPatch(progressFun) {
+    const _instantiateStreaming = WebAssembly.instantiateStreaming;
+    WebAssembly.instantiateStreaming = (response, ...args) => {
+        // Do not collect wasm content length here see above
+        const file = response.url.substring(
+            new URL(response.url).origin.length + 1
+        );
+        const reportingResponse = new Response(
+            new ReadableStream(
+                {
+                    async start(controller) {
+                        const reader = response.clone().body.getReader();
+                        let loaded = 0;
+                        for (; ;) {
+                            const { done, value } = await reader.read();
+                            if (done) {
+                                if(wasmSize) progressFun(file, wasmSize);
+                                break;
+                            }
+                            loaded += value.byteLength;
+                            progressFun(file, loaded);
+                            controller.enqueue(value);
+                        }
+                        controller.close();
+                    }
+                },
+                {
+                    status: response.status,
+                    statusText: response.statusText
+                }
+            )
+        );
+        for (const pair of response.headers.entries()) {
+            reportingResponse.headers.set(pair[0], pair[1]);
+        }
+
+        return _instantiateStreaming(reportingResponse, ...args);
+    }
+}
+monkeyPatch((file, done) =>  {
+    if (!wasmSize) return;
+    if (done > wasmSize) {
+        console.warn(`Downloaded binary size ${done} is larger than expected WASM size ${wasmSize}`);
+        return;
+    }
+
+    const percent  = ((done / wasmSize) * 100).toFixed(0);
+    const mibNow   = (done / 1024**2).toFixed(1);
+    const mibTotal = (wasmSize / 1024**2).toFixed(1);
+
+    let root = document.querySelector(':root');
+    root.style.setProperty("--progress", `${percent}%`)
+    document.getElementById("progress-bar-content").innerHTML = `${percent}%  [${mibNow} MiB / ${mibTotal} MiB]`;
+});
+
 function glfwSetCursorCustom(wnd, shape) {
     let body = document.getElementsByTagName("body")[0]
     switch (shape) {
@@ -36,7 +100,77 @@ var notWorkingTimer = setTimeout(() => {
 
 var Module = {
     preRun:  [],
-    postRun: [],
+    postRun: function() {
+        // Patch the emscripten GLFW module to send mouse and touch events in the right order
+        // For ImGui interactions to correctly work with touch input, MousePos events need
+        // to be processed first and then MouseButton events in the next frame. By default,
+        // GLFW does the exact opposite, which causes buttons to require two taps to register
+        // and windows get "stuck" to the cursor when dragged or resized
+        GLFW.onMousemove = event => {
+            if (event.type === "touchmove") {
+                event.preventDefault();
+                let primaryChanged = false;
+                for (let i of event.changedTouches) {
+                    if (GLFW.primaryTouchId === i.identifier) {
+                        Browser.setMouseCoords(i.pageX, i.pageY);
+                        primaryChanged = true;
+                        break;
+                    }
+                }
+                if (!primaryChanged) {
+                    return;
+                }
+            } else {
+                Browser.calculateMouseEvent(event);
+            }
+        };
+
+        GLFW.onMouseButtonChanged = (event, status) => {
+            if (!GLFW.active) return;
+            if (event.target != Module["canvas"]) return;
+            const isTouchType = event.type === "touchstart" || event.type === "touchend" || event.type === "touchcancel";
+            let eventButton = 0;
+            if (isTouchType) {
+                event.preventDefault();
+                let primaryChanged = false;
+                if (GLFW.primaryTouchId === null && event.type === "touchstart" && event.targetTouches.length > 0) {
+                    const chosenTouch = event.targetTouches[0];
+                    GLFW.primaryTouchId = chosenTouch.identifier;
+                    Browser.setMouseCoords(chosenTouch.pageX, chosenTouch.pageY);
+                    primaryChanged = true;
+                } else if (event.type === "touchend" || event.type === "touchcancel") {
+                    for (let i of event.changedTouches) {
+                        if (GLFW.primaryTouchId === i.identifier) {
+                            GLFW.primaryTouchId = null;
+                            primaryChanged = true;
+                            break;
+                        }
+                    }
+                }
+                if (!primaryChanged) {
+                    return;
+                }
+            } else {
+                Browser.calculateMouseEvent(event);
+                eventButton = GLFW.DOMToGLFWMouseButton(event);
+            }
+            if (status == 1) {
+                GLFW.active.buttons |= (1 << eventButton);
+                try {
+                    event.target.setCapture();
+                } catch (e) {}
+            } else {
+                GLFW.active.buttons &= ~(1 << eventButton);
+            }
+
+            if (GLFW.active.cursorPosFunc) {
+                getWasmTableEntry(GLFW.active.cursorPosFunc)(GLFW.active.id, Browser.mouseX, Browser.mouseY);
+            }
+            if (GLFW.active.mouseButtonFunc) {
+                getWasmTableEntry(GLFW.active.mouseButtonFunc)(GLFW.active.id, eventButton, status, GLFW.getModBits(GLFW.active));
+            }
+        };
+    },
     onRuntimeInitialized: function() {
         // Triggered when the wasm module is loaded and ready to use.
         document.getElementById("loading").style.display = "none"
@@ -47,36 +181,91 @@ var Module = {
     print:   (function() { })(),
     printErr: function(text) {  },
     canvas: (function() {
-        let canvas = document.getElementById('canvas');
-        // As a default initial behavior, pop up an alert when webgl context is lost. To make your
-        // application robust, you may want to override this behavior before shipping!
-        // See http://www.khronos.org/registry/webgl/specs/latest/1.0/#5.15.2
-        canvas.addEventListener("webglcontextlost", function(e) { alert('WebGL context lost. You will need to reload the page.'); e.preventDefault(); }, false);
+        const canvas = document.getElementById('canvas');
+        canvas.addEventListener("webglcontextlost", function(e) {
+            alert('WebGL context lost, please reload the page');
+            e.preventDefault();
+        }, false);
 
-        return canvas;
+        // Turn long touches into right-clicks
+        let timer = null;
+        canvas.addEventListener('touchstart', event => {
+            timer = setTimeout(() => {
+                let eventArgs = {
+                    bubbles: true,
+                    cancelable: true,
+                    view: window,
+                    screenX: event.touches[0].screenX,
+                    screenY: event.touches[0].screenY,
+                    clientX: event.touches[0].clientX,
+                    clientY: event.touches[0].clientY,
+                    button: 2,
+                    buttons: 2,
+                    relatedTarget: event.target,
+                    region: event.region
+                }
+
+                canvas.dispatchEvent(new MouseEvent('mousedown', eventArgs));
+                canvas.dispatchEvent(new MouseEvent('mouseup', eventArgs));
+            }, 400);
+        });
+
+        canvas.addEventListener('touchend', event => {
+            if (timer) {
+                clearTimeout(timer);
+                timer = null;
+            }
+        });
+
+        if (typeof WebGL2RenderingContext !== 'undefined') {
+            let gl = canvas.getContext('webgl2', { stencil: true });
+            if (!gl) {
+                console.error('WebGL 2 not available, falling back to WebGL');
+                gl = canvas.getContext('webgl', { stencil: true });
+            }
+            if (!gl) {
+                alert('WebGL not available with stencil buffer');
+            }
+            return canvas;
+        } else {
+            alert('WebGL 2 not supported by this browser');
+        }
     })(),
     setStatus: function(text) { },
     totalDependencies: 0,
-    monitorRunDependencies: function(left) { },
+    monitorRunDependencies: function(left) {
+    },
     instantiateWasm: function(imports, successCallback) {
         imports.env.glfwSetCursor = glfwSetCursorCustom
         imports.env.glfwCreateStandardCursor = glfwCreateStandardCursorCustom
-        instantiateAsync(wasmBinary, wasmBinaryFile, imports, (result) => successCallback(result.instance, result.module));
-    }
+        instantiateAsync(wasmBinary, wasmBinaryFile, imports, (result) => {
+            successCallback(result.instance, result.module)
+        });
+    },
+    arguments: []
 };
 
+// Handle passing arguments to the wasm module
+const queryString = window.location.search;
+const urlParams = new URLSearchParams(queryString);
+if (urlParams.has("lang")) {
+    Module["arguments"].push("--language");
+    Module["arguments"].push(urlParams.get("lang"));
+}
 
 window.addEventListener('resize', js_resizeCanvas, false);
 function js_resizeCanvas() {
     let canvas = document.getElementById('canvas');
+
+    canvas.top    = document.documentElement.clientTop;
+    canvas.left   = document.documentElement.clientLeft;
     canvas.width  = Math.min(document.documentElement.clientWidth, window.innerWidth || 0);
     canvas.height = Math.min(document.documentElement.clientHeight, window.innerHeight || 0);
+}
 
-    canvas.classList.add("canvas_full_screen")
-
-    if (GLFW.active && GLFW.active.windowPosFunc) {
-        getWasmTableEntry(GLFW.active.windowPosFunc)(GLFW.active.id, GLFW.active.x, GLFW.active.y);
+// Prevent some default browser shortcuts from preventing ImHex ones to work
+document.addEventListener('keydown', e => {
+    if (e.ctrlKey) {
+        if (e.which == 83) e.preventDefault();
     }
-
-    GLFW.onWindowSizeChanged();
-}
+})

lib/libimhex/CMakeLists.txt

@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.16)
 project(libimhex)
 
 set(CMAKE_CXX_STANDARD 23)
-set(CMAKE_SHARED_LIBRARY_PREFIX "")
 
 set(LIBIMHEX_SOURCES
         source/api/imhex_api.cpp
@@ -37,6 +36,12 @@ set(LIBIMHEX_SOURCES
         source/helpers/logger.cpp
         source/helpers/tar.cpp
         source/helpers/debugging.cpp
+        source/helpers/default_paths.cpp
+        source/helpers/imgui_hooks.cpp
+        source/helpers/semantic_version.cpp
+        source/helpers/keys.cpp
+
+        source/test/tests.cpp
 
         source/providers/provider.cpp
         source/providers/memory_provider.cpp
@@ -46,6 +51,7 @@ set(LIBIMHEX_SOURCES
         source/ui/view.cpp
         source/ui/popup.cpp
         source/ui/toast.cpp
+        source/ui/banner.cpp
 
         source/subcommands/subcommands.cpp
 )
@@ -60,7 +66,10 @@ if (APPLE)
         endif ()
     endif ()
 
-    set(LIBIMHEX_SOURCES ${LIBIMHEX_SOURCES} source/helpers/utils_macos.m)
+    set(LIBIMHEX_SOURCES ${LIBIMHEX_SOURCES}
+            source/helpers/utils_macos.m
+            source/helpers/macos_menu.m
+    )
 endif ()
 
 if (IMHEX_EXTERNAL_PLUGIN_BUILD)
@@ -77,43 +86,9 @@ else()
     target_compile_definitions(libimhex PRIVATE IMHEX_PROJECT_NAME="${PROJECT_NAME}")
 endif()
 
-set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
-enableUnityBuild(libimhex)
-setupCompilerFlags(libimhex)
 
-include(GenerateExportHeader)
-generate_export_header(libimhex)
-
-target_include_directories(libimhex ${LIBIMHEX_LIBRARY_TYPE} include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIR} ${MAGIC_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${LIBBACKTRACE_INCLUDE_DIRS})
-target_link_directories(libimhex ${LIBIMHEX_LIBRARY_TYPE} ${MBEDTLS_LIBRARY_DIR} ${MAGIC_LIBRARY_DIRS})
-
-if (NOT EMSCRIPTEN)
-    # curl is only used in non-emscripten builds
-    target_include_directories(libimhex ${LIBIMHEX_LIBRARY_TYPE}  ${CURL_INCLUDE_DIRS})
-    target_link_libraries(libimhex ${LIBIMHEX_LIBRARY_TYPE} ${LIBCURL_LIBRARIES})
-endif()
-
-
-if (NOT IMHEX_EXTERNAL_PLUGIN_BUILD)
-    if (WIN32)
-        set_target_properties(libimhex PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
-        target_link_options(libimhex PRIVATE -Wl,--export-all-symbols)
-    elseif (APPLE)
-        find_library(FOUNDATION NAMES Foundation)
-        target_link_libraries(libimhex PUBLIC ${FOUNDATION})
-    endif ()
-
-    target_link_libraries(libimhex PRIVATE microtar libpl plcli libpl-gen libwolv ${NFD_LIBRARIES} magic dl ${NLOHMANN_JSON_LIBRARIES} ${MBEDTLS_LIBRARIES} ${LIBBACKTRACE_LIBRARIES} ${JTHREAD_LIBRARIES})
-    target_link_libraries(libimhex PUBLIC ${IMGUI_LIBRARIES})
-endif()
-
-target_link_libraries(libimhex ${LIBIMHEX_LIBRARY_TYPE} ${NLOHMANN_JSON_LIBRARIES} imgui_all_includes ${FMT_LIBRARIES})
-
-set_property(TARGET libimhex PROPERTY INTERPROCEDURAL_OPTIMIZATION FALSE)
-
-if (DEFINED IMHEX_COMMIT_HASH_LONG AND DEFINED IMHEX_COMMIT_HASH_SHORT AND DEFINED IMHEX_COMMIT_BRANCH)
+if (DEFINED IMHEX_COMMIT_HASH_LONG AND DEFINED IMHEX_COMMIT_BRANCH)
     set(GIT_COMMIT_HASH_LONG "${IMHEX_COMMIT_HASH_LONG}")
-    set(GIT_COMMIT_HASH_SHORT "${IMHEX_COMMIT_HASH_SHORT}")
     set(GIT_BRANCH "${IMHEX_COMMIT_BRANCH}")
 else()
     # Get the current working branch
@@ -126,16 +101,6 @@ else()
             ERROR_QUIET
     )
 
-    # Get the latest abbreviated commit hash of the working branch
-    execute_process(
-            COMMAND git log -1 --format=%h --abbrev=7
-            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-            OUTPUT_VARIABLE GIT_COMMIT_HASH_SHORT
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-            RESULT_VARIABLE RESULT_HASH_SHORT
-            ERROR_QUIET
-    )
-
     execute_process(
             COMMAND git log -1 --format=%H
             WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -146,12 +111,61 @@ else()
     )
 endif ()
 
-if ((NOT GIT_COMMIT_HASH_SHORT STREQUAL "") AND (NOT GIT_COMMIT_HASH_LONG STREQUAL "") AND (NOT GIT_BRANCH STREQUAL ""))
-    addDefineToSource(source/api/imhex_api.cpp "GIT_COMMIT_HASH_SHORT=\"${GIT_COMMIT_HASH_SHORT}\"")
+if (GIT_COMMIT_HASH_LONG STREQUAL "" OR GIT_BRANCH STREQUAL "")
+    message(WARNING "Failed to to determine commit hash/branch")
+else()
     addDefineToSource(source/api/imhex_api.cpp "GIT_COMMIT_HASH_LONG=\"${GIT_COMMIT_HASH_LONG}\"")
     addDefineToSource(source/api/imhex_api.cpp "GIT_BRANCH=\"${GIT_BRANCH}\"")
 endif ()
 
 addDefineToSource(source/api/imhex_api.cpp "IMHEX_VERSION=\"${IMHEX_VERSION_STRING}\"")
 
-add_dependencies(imhex_all libimhex)
+enableUnityBuild(libimhex)
+setupCompilerFlags(libimhex)
+
+include(GenerateExportHeader)
+generate_export_header(libimhex)
+
+target_include_directories(libimhex ${LIBIMHEX_LIBRARY_TYPE} include ${XDGPP_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS})
+
+if (NOT IMHEX_EXTERNAL_PLUGIN_BUILD)
+    if (WIN32)
+        set_target_properties(libimhex PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+        if (NOT MSVC)
+            target_link_options(libimhex PRIVATE -Wl,--export-all-symbols)
+        endif()
+        target_link_libraries(libimhex PRIVATE Netapi32.lib)
+        target_compile_definitions(libimhex PRIVATE EXPORT_SYMBOLS=1)
+    elseif (APPLE)
+        find_library(FOUNDATION NAMES Foundation)
+        target_link_libraries(libimhex PUBLIC ${FOUNDATION})
+    endif ()
+
+    target_link_libraries(libimhex PRIVATE libpl microtar ${NFD_LIBRARIES} magic)
+    target_link_libraries(libimhex PUBLIC libwolv libpl_includes libpl-gen ${IMGUI_LIBRARIES} ${JTHREAD_LIBRARIES})
+
+    if (NOT WIN32)
+        target_link_libraries(libimhex PRIVATE dl)
+    endif()
+
+    if (NOT EMSCRIPTEN)
+        # curl is only used in non-emscripten builds
+        target_link_libraries(libimhex ${LIBIMHEX_LIBRARY_TYPE} CURL::libcurl)
+    endif()
+
+    target_include_directories(libimhex ${LIBIMHEX_LIBRARY_TYPE} ${MBEDTLS_INCLUDE_DIR} ${LIBBACKTRACE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS})
+    target_link_libraries(libimhex ${LIBIMHEX_LIBRARY_TYPE} ${MBEDTLS_LIBRARIES})
+    target_link_directories(libimhex ${LIBIMHEX_LIBRARY_TYPE} ${MBEDTLS_LIBRARY_DIR} ${MAGIC_LIBRARY_DIRS})
+
+    precompileHeaders(libimhex "${CMAKE_CURRENT_SOURCE_DIR}/include")
+endif()
+
+target_link_libraries(libimhex ${LIBIMHEX_LIBRARY_TYPE} ${NLOHMANN_JSON_LIBRARIES} imgui_all_includes ${FMT_LIBRARIES} ${LUNASVG_LIBRARIES} ${BOOST_LIBRARIES})
+
+set_property(TARGET libimhex PROPERTY INTERPROCEDURAL_OPTIMIZATION FALSE)
+
+add_dependencies(imhex_all libimhex)
+
+install(FILES "$<TARGET_FILE:libimhex>" DESTINATION "${CMAKE_INSTALL_LIBDIR}" PERMISSIONS ${LIBRARY_PERMISSIONS})
+set_target_properties(libimhex PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+set_target_properties(libimhex PROPERTIES PREFIX "")

lib/libimhex/LICENSE

@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!

lib/libimhex/include/hex.hpp

@@ -1,4 +1,3 @@
 #pragma once
 
 #include <hex/helpers/types.hpp>
-#include <hex/helpers/intrinsics.hpp>

lib/libimhex/include/hex/api/achievement_manager.hpp

@@ -14,6 +14,7 @@
 #include <imgui.h>
 #include <hex/ui/imgui_imhex_extensions.h>
 #include <hex/api/localization_manager.hpp>
+#include <hex/helpers/auto_reset.hpp>
 
 namespace hex {
 
@@ -151,7 +152,7 @@ namespace hex {
             if (m_icon.isValid())
                 return m_icon;
 
-            m_icon = ImGuiExt::Texture(m_iconData.data(), m_iconData.size(), ImGuiExt::Texture::Filter::Linear);
+            m_icon = ImGuiExt::Texture::fromImage(m_iconData.data(), m_iconData.size(), ImGuiExt::Texture::Filter::Linear);
 
             return m_icon;
         }
@@ -295,6 +296,7 @@ namespace hex {
     };
 
     class AchievementManager {
+        static bool s_initialized;
     public:
         AchievementManager() = delete;
 
@@ -331,18 +333,7 @@ namespace hex {
         static Achievement& addAchievement(auto && ... args) {
             auto newAchievement = std::make_unique<T>(std::forward<decltype(args)>(args)...);
 
-            const auto &category = newAchievement->getUnlocalizedCategory();
-            const auto &name = newAchievement->getUnlocalizedName();
-
-            auto [categoryIter, categoryInserted] = getAchievements().insert({ category, std::unordered_map<std::string, std::unique_ptr<Achievement>>{} });
-            auto &[categoryKey, achievements] = *categoryIter;
-
-            auto [achievementIter, achievementInserted] = achievements.insert({ name, std::move(newAchievement) });
-            auto &[achievementKey, achievement] = *achievementIter;
-
-            achievementAdded();
-
-            return *achievement;
+            return addAchievementImpl(std::move(newAchievement));
         }
 
         /**
@@ -371,7 +362,7 @@ namespace hex {
          * @brief Returns all registered achievements
          * @return All achievements
          */
-        static std::unordered_map<std::string, std::unordered_map<std::string, std::unique_ptr<Achievement>>>& getAchievements();
+        static const std::unordered_map<UnlocalizedString, std::unordered_map<UnlocalizedString, std::unique_ptr<Achievement>>>& getAchievements();
 
         /**
          * @brief Returns all achievement start nodes
@@ -379,14 +370,14 @@ namespace hex {
          * @param rebuild Whether to rebuild the list of start nodes
          * @return All achievement start nodes
          */
-        static std::unordered_map<std::string, std::vector<AchievementNode*>>& getAchievementStartNodes(bool rebuild = true);
+        static const std::unordered_map<UnlocalizedString, std::vector<AchievementNode*>>& getAchievementStartNodes(bool rebuild = true);
 
         /**
          * @brief Returns all achievement nodes
          * @param rebuild Whether to rebuild the list of nodes
          * @return All achievement nodes
          */
-        static std::unordered_map<std::string, std::list<AchievementNode>>& getAchievementNodes(bool rebuild = true);
+        static const std::unordered_map<UnlocalizedString, std::list<AchievementNode>>& getAchievementNodes(bool rebuild = true);
 
         /**
          * @brief Loads the progress of all achievements from the achievements save file
@@ -398,11 +389,6 @@ namespace hex {
          */
         static void storeProgress();
 
-        /**
-         * @brief Removes all registered achievements from the tree
-         */
-        static void clear();
-
         /**
          * @brief Removes all temporary achievements from the tree
          */
@@ -416,6 +402,8 @@ namespace hex {
 
     private:
         static void achievementAdded();
+
+        static Achievement& addAchievementImpl(std::unique_ptr<Achievement> &&newAchievement);
     };
 
-}
+}

lib/libimhex/include/hex/api/event_manager.hpp

@@ -2,42 +2,35 @@
 
 #include <hex.hpp>
 
+#include <algorithm>
+#include <functional>
 #include <list>
+#include <mutex>
 #include <map>
 #include <string_view>
-#include <functional>
 
 #include <hex/api/imhex_api.hpp>
-#include <hex/helpers/fs.hpp>
 #include <hex/helpers/logger.hpp>
 
 #include <wolv/types/type_name.hpp>
 
-#define EVENT_DEF_IMPL(event_name, event_name_string, should_log, ...)                                                                          \
-    struct event_name final : public hex::impl::Event<__VA_ARGS__> {                                                                            \
-        constexpr static auto Id = [] { return hex::impl::EventId(event_name_string); }();                                                      \
-        constexpr static auto ShouldLog = (should_log);                                                                                         \
-        explicit event_name(Callback func) noexcept : Event(std::move(func)) { }                                                                \
-                                                                                                                                                \
-        static EventManager::EventList::iterator subscribe(Event::Callback function) { return EventManager::subscribe<event_name>(function); }  \
-        static void subscribe(void *token, Event::Callback function) { EventManager::subscribe<event_name>(token, function); }                  \
-        static void unsubscribe(const EventManager::EventList::iterator &token) noexcept { EventManager::unsubscribe(token); }                  \
-        static void unsubscribe(void *token) noexcept { EventManager::unsubscribe<event_name>(token); }                                         \
-        static void post(auto &&...args) noexcept { EventManager::post<event_name>(std::forward<decltype(args)>(args)...); }                    \
-    };
+#define EVENT_DEF_IMPL(event_name, event_name_string, should_log, ...)                                                                                      \
+    struct event_name final : public hex::impl::Event<__VA_ARGS__> {                                                                                        \
+        constexpr static auto Id = [] { return hex::impl::EventId(event_name_string); }();                                                                  \
+        constexpr static auto ShouldLog = (should_log);                                                                                                     \
+        explicit event_name(Callback func) noexcept : Event(std::move(func)) { }                                                                            \
+                                                                                                                                                            \
+        static EventManager::EventList::iterator subscribe(Event::Callback function) { return EventManager::subscribe<event_name>(std::move(function)); }   \
+        static void subscribe(void *token, Event::Callback function) { EventManager::subscribe<event_name>(token, std::move(function)); }                   \
+        static void unsubscribe(const EventManager::EventList::iterator &token) noexcept { EventManager::unsubscribe(token); }                              \
+        static void unsubscribe(void *token) noexcept { EventManager::unsubscribe<event_name>(token); }                                                     \
+        static void post(auto &&...args) { EventManager::post<event_name>(std::forward<decltype(args)>(args)...); }                                         \
+    }
 
 #define EVENT_DEF(event_name, ...)          EVENT_DEF_IMPL(event_name, #event_name, true, __VA_ARGS__)
 #define EVENT_DEF_NO_LOG(event_name, ...)   EVENT_DEF_IMPL(event_name, #event_name, false, __VA_ARGS__)
 
 
-/* Forward declarations */
-struct GLFWwindow;
-namespace hex {
-    class Achievement;
-    class View;
-}
-
-
 namespace hex {
 
     namespace impl {
@@ -46,7 +39,7 @@ namespace hex {
         public:
             explicit constexpr EventId(const char *eventName) {
                 m_hash = 0x811C'9DC5;
-                for (auto c : std::string_view(eventName)) {
+                for (const char c : std::string_view(eventName)) {
                     m_hash = (m_hash >> 5) | (m_hash << 27);
                     m_hash ^= c;
                 }
@@ -56,12 +49,17 @@ namespace hex {
                 return m_hash == other.m_hash;
             }
 
+            constexpr auto operator<=>(const EventId &other) const {
+                return m_hash <=> other.m_hash;
+            }
+
         private:
             u32 m_hash;
         };
 
         struct EventBase {
             EventBase() noexcept = default;
+            virtual ~EventBase() = default;
         };
 
         template<typename... Params>
@@ -70,8 +68,14 @@ namespace hex {
 
             explicit Event(Callback func) noexcept : m_func(std::move(func)) { }
 
-            void operator()(Params... params) const noexcept {
-                m_func(params...);
+            template<typename E>
+            void call(Params... params) const {
+                try {
+                    m_func(params...);
+                } catch (const std::exception &e) {
+                    log::error("An exception occurred while handling event {}: {}", wolv::type::getTypeName<E>(), e.what());
+                    throw;
+                }
             }
 
         private:
@@ -86,11 +90,12 @@ namespace hex {
 
     /**
      * @brief The EventManager allows subscribing to and posting events to different parts of the program.
-     * To create a new event, use the EVENT_DEF macro. This will create a new event type with the given name and parameters
+     * To create a new event, use the EVENT_DEF macro. This will create a new event type with the given name and parameters.
+     * Events should be created in an `events_*.hpp` category file under the `events` folder, and never directly here.
      */
     class EventManager {
     public:
-        using EventList = std::list<std::pair<impl::EventId, std::unique_ptr<impl::EventBase>>>;
+        using EventList = std::multimap<impl::EventId, std::unique_ptr<impl::EventBase>>;
 
         /**
          * @brief Subscribes to an event
@@ -103,7 +108,7 @@ namespace hex {
             std::scoped_lock lock(getEventMutex());
 
             auto &events = getEvents();
-            return events.insert(events.end(), std::make_pair(E::Id, std::make_unique<E>(function)));
+            return events.insert({ E::Id, std::make_unique<E>(function) });
         }
 
         /**
@@ -116,15 +121,9 @@ namespace hex {
         static void subscribe(void *token, typename E::Callback function) {
             std::scoped_lock lock(getEventMutex());
 
-            if (getTokenStore().contains(token)) {
-                auto&& [begin, end] = getTokenStore().equal_range(token);
-                auto eventRegistered = std::any_of(begin, end, [&](auto &item) {
-                    return item.second->first == E::Id;
-                });
-                if (eventRegistered) {
-                    log::fatal("The token '{}' has already registered the same event ('{}')", token, wolv::type::getTypeName<E>());
-                    return;
-                }
+            if (isAlreadyRegistered(token, E::Id)) {
+                log::fatal("The token '{}' has already registered the same event ('{}')", token, wolv::type::getTypeName<E>());
+                return;
             }
 
             getTokenStore().insert({ token, subscribe<E>(function) });
@@ -149,16 +148,7 @@ namespace hex {
         static void unsubscribe(void *token) noexcept {
             std::scoped_lock lock(getEventMutex());
 
-            auto &tokenStore = getTokenStore();
-            auto iter = std::find_if(tokenStore.begin(), tokenStore.end(), [&](auto &item) {
-                return item.first == token && item.second->first == E::Id;
-            });
-
-            if (iter != tokenStore.end()) {
-                getEvents().remove(*iter->second);
-                tokenStore.erase(iter);
-            }
-
+            unsubscribe(token, E::Id);
         }
 
         /**
@@ -167,21 +157,17 @@ namespace hex {
          * @param args Arguments to pass to the event
          */
         template<impl::EventType E>
-        static void post(auto &&...args) noexcept {
+        static void post(auto && ...args) {
             std::scoped_lock lock(getEventMutex());
 
-            for (const auto &[id, event] : getEvents()) {
-                if (id == E::Id) {
-                    try {
-                        (*static_cast<E *const>(event.get()))(std::forward<decltype(args)>(args)...);
-                    } catch (const std::exception &e) {
-                        log::error("Event '{}' threw {}: {}", wolv::type::getTypeName<decltype(e)>(), wolv::type::getTypeName<E>(), e.what());
-                    }
-                }
+            auto [begin, end] = getEvents().equal_range(E::Id);
+            for (auto it = begin; it != end; ++it) {
+                const auto &[id, event] = *it;
+                (*static_cast<E *const>(event.get())).template call<E>(std::forward<decltype(args)>(args)...);
             }
 
             #if defined (DEBUG)
-                if (E::ShouldLog)
+                if constexpr (E::ShouldLog)
                     log::debug("Event posted: '{}'", wolv::type::getTypeName<E>());
             #endif
         }
@@ -200,103 +186,9 @@ namespace hex {
         static std::multimap<void *, EventList::iterator>& getTokenStore();
         static EventList& getEvents();
         static std::recursive_mutex& getEventMutex();
+
+        static bool isAlreadyRegistered(void *token, impl::EventId id);
+        static void unsubscribe(void *token, impl::EventId id);
     };
 
-    /* Default Events */
-    
-    /**
-     * @brief Called when Imhex finished startup, and will enter the main window rendering loop
-     */
-    EVENT_DEF(EventImHexStartupFinished);
-
-    EVENT_DEF(EventFileLoaded, std::fs::path);
-    EVENT_DEF(EventDataChanged);
-    EVENT_DEF(EventHighlightingChanged);
-    EVENT_DEF(EventWindowClosing, GLFWwindow *);
-    EVENT_DEF(EventRegionSelected, ImHexApi::HexEditor::ProviderRegion);
-    EVENT_DEF(EventSettingsChanged);
-    EVENT_DEF(EventAbnormalTermination, int);
-    EVENT_DEF(EventThemeChanged);
-    EVENT_DEF(EventOSThemeChanged);
-
-    /**
-     * @brief Called when the provider is created.
-     * This event is responsible for (optionally) initializing the provider and calling EventProviderOpened
-     * (although the event can also be called manually without problem)
-     */
-    EVENT_DEF(EventProviderCreated, prv::Provider *);
-    EVENT_DEF(EventProviderChanged, prv::Provider *, prv::Provider *);
-
-    /**
-     * @brief Called as a continuation of EventProviderCreated
-     * this event is normally called immediately after EventProviderCreated successfully initialized the provider.
-     * If no initialization (Provider::skipLoadInterface() has been set), this event should be called manually
-     * If skipLoadInterface failed, this event is not called
-     * 
-     * @note this is not related to Provider::open()
-     */
-    EVENT_DEF(EventProviderOpened,  prv::Provider *);
-    EVENT_DEF(EventProviderClosing, prv::Provider *, bool *);
-    EVENT_DEF(EventProviderClosed,  prv::Provider *);
-    EVENT_DEF(EventProviderDeleted, prv::Provider *);
-    EVENT_DEF(EventProviderSaved,   prv::Provider *);
-    EVENT_DEF(EventWindowInitialized);
-    EVENT_DEF(EventBookmarkCreated, ImHexApi::Bookmarks::Entry&);
-    EVENT_DEF(EventPatchCreated, u64, u8, u8);
-    EVENT_DEF(EventPatternEvaluating);
-    EVENT_DEF(EventPatternExecuted, const std::string&);
-    EVENT_DEF(EventPatternEditorChanged, const std::string&);
-    EVENT_DEF(EventStoreContentDownloaded, const std::fs::path&);
-    EVENT_DEF(EventStoreContentRemoved, const std::fs::path&);
-    EVENT_DEF(EventImHexClosing);
-    EVENT_DEF(EventAchievementUnlocked, const Achievement&);
-    EVENT_DEF(EventSearchBoxClicked, u32);
-    EVENT_DEF(EventViewOpened, View*);
-
-    EVENT_DEF(EventProviderDataModified, prv::Provider *, u64, u64, const u8*);
-    EVENT_DEF(EventProviderDataInserted, prv::Provider *, u64, u64);
-    EVENT_DEF(EventProviderDataRemoved, prv::Provider *, u64, u64);
-
-    /**
-     * @brief Called when a project has been loaded
-     */
-    EVENT_DEF(EventProjectOpened);
-
-    EVENT_DEF_NO_LOG(EventFrameBegin);
-    EVENT_DEF_NO_LOG(EventFrameEnd);
-    EVENT_DEF_NO_LOG(EventSetTaskBarIconState, u32, u32, u32);
-
-    EVENT_DEF(RequestAddInitTask, std::string, bool, std::function<bool()>);
-    EVENT_DEF(RequestAddExitTask, std::string, std::function<bool()>);
-    EVENT_DEF(RequestOpenWindow, std::string);
-    EVENT_DEF(RequestSelectionChange, Region);
-    EVENT_DEF(RequestAddBookmark, Region, std::string, std::string, color_t, u64*);
-    EVENT_DEF(RequestRemoveBookmark, u64);
-    EVENT_DEF(RequestSetPatternLanguageCode, std::string);
-    EVENT_DEF(RequestRunPatternCode);
-    EVENT_DEF(RequestLoadPatternLanguageFile, std::fs::path);
-    EVENT_DEF(RequestSavePatternLanguageFile, std::fs::path);
-    EVENT_DEF(RequestUpdateWindowTitle);
-    EVENT_DEF(RequestCloseImHex, bool);
-    EVENT_DEF(RequestRestartImHex);
-    EVENT_DEF(RequestOpenFile, std::fs::path);
-    EVENT_DEF(RequestChangeTheme, std::string);
-    EVENT_DEF(RequestOpenPopup, std::string);
-
-    /**
-     * @brief Creates a provider from it's unlocalized name, and add it to the provider list
-    */
-    EVENT_DEF(RequestCreateProvider, std::string, bool, bool, hex::prv::Provider **);
-    EVENT_DEF(RequestInitThemeHandlers);
-
-    /**
-     * @brief Send an event to the main Imhex instance
-     */
-    EVENT_DEF(SendMessageToMainInstance, const std::string, const std::vector<u8>&);
-
-    /**
-     * Move the data from all PerProvider instances from one provider to another.
-     * The 'from' provider should not have any per provider data after this, and should be immediately deleted
-    */
-    EVENT_DEF(MovePerProviderData, prv::Provider *, prv::Provider *);
 }

lib/libimhex/include/hex/api/events/events_gui.hpp

@@ -0,0 +1,120 @@
+#pragma once
+
+#include <hex/api/event_manager.hpp>
+
+/* Forward declarations */
+struct GLFWwindow;
+namespace hex { class View; }
+
+/* GUI events definitions */
+namespace hex {
+
+    /**
+     * @brief Signals a newly opened window
+     *
+     * This event is sent when the window has just been opened and docked by the Window manager.
+     *
+     * FIXME: In the event that a newly created window is already docked, this will not be sent.
+     *
+     * FIXME: This is currently only used for the introduction tutorial.
+     *  If the event's only purpose is this, maybe rename it?
+     *
+     * @param view the new view reference
+     */
+    EVENT_DEF(EventViewOpened, View*);
+
+    /**
+     * @brief Signals a change in the DPI scale.
+     *
+     * This event is called once at startup to signal native scale definition (by passing the same value twice).
+     * On Windows OS, this event can also be posted if the window DPI has been changed.
+     *
+     * @param oldScale the old scale
+     * @param newScale the current scale that's now in use
+     */
+    EVENT_DEF(EventDPIChanged, float, float);
+
+    /**
+     * @brief Signals the focus of the ImHex main window.
+     *
+     * This is directly tied as a GLFW window focus callback, and will be called accordingly when GLFW detects
+     * a change in focus.
+     *
+     * @param isFocused true if the window is focused
+     */
+    EVENT_DEF(EventWindowFocused, bool);
+
+    /**
+     * @brief Signals a window being closed.
+     *
+     * Allows reactive clean up of running tasks, and prevents ImHex from closing
+     * by displaying an exit confirmation popup.
+     *
+     * @param window The window reference
+     */
+    EVENT_DEF(EventWindowClosing, GLFWwindow*);
+
+    /**
+     * @brief Informs that the main window is initialized
+     *
+     * On Windows OS, it is used to initialize system theme, if ImHex's theme is following it.
+     *
+     * FIXME: Change event name to reflect Theme detection, if it's only used for that purpose?
+     */
+    EVENT_DEF(EventWindowInitialized);
+
+    /**
+     * @brief Informs that the main window is deinitializing
+     *
+     * Allows for lifecycle cleanup before ImHex shutdown.
+     *
+     * @param window The window reference
+     */
+    EVENT_DEF(EventWindowDeinitializing, GLFWwindow*);
+
+    /**
+     * @brief Signals a theme change in the host OS
+     *
+     * Allows ImHex to react to OS theme changes dynamically during execution.
+     */
+    EVENT_DEF(EventOSThemeChanged);
+
+}
+
+/* silent (no-logging) GUI events definitions */
+namespace hex {
+
+    /**
+     * @brief Signals the start of a new ImGui frame
+     */
+    EVENT_DEF_NO_LOG(EventFrameBegin);
+
+    /**
+     * @brief Signals the end of an ImGui frame
+     */
+    EVENT_DEF_NO_LOG(EventFrameEnd);
+
+    /**
+     * @brief Windows OS: Sets the taskbar icon state
+     *
+     * This event is used on Windows OS to display progress through the taskbar icon (the famous "green loading bar"
+     * in the taskbar).
+     *
+     * @param progressState the progress state (converted from the TaskProgressState enum)
+     * @param progressType the type of progress (converted from the TaskProgressType enum)
+     * @param percentage actual progress percentage (expected from 0 to 100)
+     *
+     * @see hex::ImHexApi::System::TaskProgressState
+     * @see hex::ImHexApi::System::TaskProgressType
+     */
+    EVENT_DEF_NO_LOG(EventSetTaskBarIconState, u32, u32, u32);
+
+    /**
+     * @brief Informs of an ImGui element being rendered
+     *
+     * @param elementId the element's ID
+     * @param boundingBox the bounding box (composed of 4 floats)
+     */
+    EVENT_DEF_NO_LOG(EventImGuiElementRendered, ImGuiID, const std::array<float, 4>&);
+
+}

lib/libimhex/include/hex/api/events/events_interaction.hpp

@@ -0,0 +1,158 @@
+#pragma once
+
+#include <hex/api/event_manager.hpp>
+#include <hex/helpers/patches.hpp>
+
+/* Forward declarations */
+namespace hex { class Achievement; }
+
+/* Interaction events definitions */
+namespace hex {
+
+    /**
+     * @brief Signals a file was loaded
+     *
+     * FIXME: this event is unused and should be scrapped.
+     *
+     * @param path the loaded file's path
+     */
+    EVENT_DEF(EventFileLoaded, std::fs::path);
+
+    /**
+     * @brief Signals a change in the current data
+     *
+     * Enables provider reaction to data change, especially the data inspector.
+     *
+     * This is caused by the following:
+     * - an explicit provider reload, requested by the user (Ctrl+R)
+     * - any user action that results in the creation of an "undo" stack action (generally a data modification)
+     *
+     * @param provider the Provider subject to the data change
+     */
+    EVENT_DEF(EventDataChanged, prv::Provider *);
+
+    /**
+     * @brief Signals a change in highlighting
+     *
+     * The event's only purpose is for the Hex editor to clear highlights when receiving this event.
+     */
+    EVENT_DEF(EventHighlightingChanged);
+
+    /**
+     * @brief Informs of a provider region being selected
+     *
+     * This is very generally used to signal user actions that select a specific region within the provider.
+     * It is also used to pass on regions when the provider changes.
+     *
+     * @param providerRegion the provider-aware region being selected
+     */
+    EVENT_DEF(EventRegionSelected, ImHexApi::HexEditor::ProviderRegion);
+
+    /**
+     * @brief Signals a theme change
+     *
+     * On Windows OS, this is used to reflect the theme color onto the window frame.
+     */
+    EVENT_DEF(EventThemeChanged);
+
+    /**
+     * @brief Signals that a bookmark was created
+     *
+     * For now, this event's only purpose is to unlock an achievement.
+     *
+     * @param entry the new bookmark
+     */
+    EVENT_DEF(EventBookmarkCreated, ImHexApi::Bookmarks::Entry&);
+
+    /**
+     * @brief Called upon creation of an IPS patch.
+     * As for now, the event only serves a purpose for the achievement unlock.
+     *
+     * @param data the pointer to the patch content's start
+     * @param size the patch data size
+     * @param kind the patch's kind
+     */
+    EVENT_DEF(EventPatchCreated, const u8*, u64, const PatchKind);
+
+    /**
+     * @brief Signals the beginning of evaluation of the current pattern
+     *
+     * This allows resetting the drawer view for the pattern data while we wait for the execution completion.
+     */
+    EVENT_DEF(EventPatternEvaluating);
+
+    /**
+     * @brief Signals the completion of the pattern evaluation
+     *
+     * This causes another reset in the drawer view, to refresh the table displayed to the user.
+     *
+     * @param code the execution's status code
+     */
+    EVENT_DEF(EventPatternExecuted, const std::string&);
+
+    /**
+     * @brief Denotes when pattern editor has changed
+     *
+     * FIXME: this event is unused and should be scrapped.
+     */
+    EVENT_DEF(EventPatternEditorChanged, const std::string&);
+
+    /**
+     * @brief Signals that a Content Store item was downloaded
+     *
+     * FIXME: this event is unused and should be scrapped.
+     *
+     * @param path the item's path on the filesystem
+     */
+    EVENT_DEF(EventStoreContentDownloaded, const std::fs::path&);
+
+    /**
+     * @brief Signals the removal of a Content Store item
+     *
+     * Note: at the time of the event firing, the item has already been removed from the filesystem.
+     *
+     * FIXME: this event is unused and should be scrapped.
+     *
+     * @param path the item's old file path where it used to be in the filesystem
+     */
+    EVENT_DEF(EventStoreContentRemoved, const std::fs::path&);
+
+    /**
+     * @brief Signals the unlocking of an achievement
+     *
+     * This is used by the achievement manager to refresh the achievement display, as well as store progress to
+     * the appropriate storage file.
+     *
+     * @param achievement the achievement that was unlocked
+     */
+    EVENT_DEF(EventAchievementUnlocked, const Achievement&);
+
+    /**
+     * @brief Signals a click on the search box
+     *
+     * As there are different behaviours depending on the click (left or right) done by the user,
+     * this allows the consequences of said click to be registered in their own components.
+     *
+     * @param button the ImGuiMouseButton's value
+     */
+    EVENT_DEF(EventSearchBoxClicked, u32);
+
+    /**
+     * @brief Updates on whether a file is being dragged into ImHex
+     *
+     * Allows ImGUi to display a file dragging information on screen when a file is being dragged.
+     *
+     * @param isFileDragged true if a file is being dragged
+     */
+    EVENT_DEF(EventFileDragged, bool);
+
+    /**
+     * @brief Triggers loading when a file is dropped
+     *
+     * The event fires when a file is dropped into ImHex, which passes it to file handlers to load it.
+     *
+     * @param path the dropped file's path
+     */
+    EVENT_DEF(EventFileDropped, std::fs::path);
+
+}

lib/libimhex/include/hex/api/events/events_lifecycle.hpp

@@ -0,0 +1,78 @@
+#pragma once
+
+#include <hex/api/event_manager.hpp>
+
+/* Lifecycle events definitions */
+namespace hex {
+
+    /**
+     * @brief Called when Imhex finished startup, and will enter the main window rendering loop
+     */
+    EVENT_DEF(EventImHexStartupFinished);
+
+    /**
+     * @brief Called when ImHex is closing, to trigger the last shutdown hooks
+     *
+     * This is the last event to fire before complete graceful shutdown.
+     */
+    EVENT_DEF(EventImHexClosing);
+
+    /**
+     * @brief Signals that it's ImHex first launch ever
+     *
+     * This event allows for the launch of the ImHex tutorial (also called Out of Box experience).
+     */
+    EVENT_DEF(EventFirstLaunch);
+
+    /**
+     * FIXME: this event is unused and should be scrapped.
+     */
+    EVENT_DEF(EventAnySettingChanged);
+
+    /**
+     * @brief Ensures correct plugin cleanup on crash
+     *
+     * This event is fired when catching an unexpected error that cannot be recovered and
+     * which forces Imhex to close immediately.
+     *
+     * Subscribing to this event ensures that the plugin can correctly clean up any mission-critical tasks
+     * before forceful shutdown.
+     *
+     * @param signal the POSIX signal code
+     */
+    EVENT_DEF(EventAbnormalTermination, int);
+
+    /**
+     * @brief Informs of the ImHex versions (and difference, if any)
+     *
+     * Called on every startup to inform subscribers of the two versions picked up:
+     * - the version of the previous launch, gathered from the settings file
+     * - the current version, gathered directly from C++ code
+     *
+     * In most cases, and unless ImHex was updated, the two parameters will be the same.
+     *
+     * FIXME: Maybe rename the event to signal a startup information, instead of the misleading
+     *  title that the event could be fired when ImHex detects that it was updated since last launch?
+     *
+     * @param previousLaunchVersion ImHex's version during the previous launch
+     * @param currentVersion ImHex's current version for this startup
+     */
+    EVENT_DEF(EventImHexUpdated, SemanticVersion, SemanticVersion);
+
+    /**
+     * @brief Called when ImHex managed to catch an error in a general try/catch to prevent/recover from a crash
+    */
+    EVENT_DEF(EventCrashRecovered, const std::exception &);
+
+    /**
+     * @brief Called when a project has been loaded
+     */
+    EVENT_DEF(EventProjectOpened);
+
+    /**
+     * @brief Called when a native message was received from another ImHex instance
+     * @param rawData Raw bytes received from other instance
+     */
+    EVENT_DEF(EventNativeMessageReceived, std::vector<u8>);
+
+}

lib/libimhex/include/hex/api/events/events_provider.hpp

@@ -0,0 +1,113 @@
+#pragma once
+
+#include <hex.hpp>
+#include <hex/api/event_manager.hpp>
+
+/* Provider events definitions */
+namespace hex {
+    /**
+     * @brief Called when the provider is created.
+     * This event is responsible for (optionally) initializing the provider and calling EventProviderOpened
+     * (although the event can also be called manually without problem)
+     */
+    EVENT_DEF(EventProviderCreated, prv::Provider *);
+
+    /**
+     * @brief Called as a continuation of EventProviderCreated
+     * this event is normally called immediately after EventProviderCreated successfully initialized the provider.
+     * If no initialization (Provider::skipLoadInterface() has been set), this event should be called manually
+     * If skipLoadInterface failed, this event is not called
+     *
+     * @note this is not related to Provider::open()
+     */
+    EVENT_DEF(EventProviderOpened,  prv::Provider *);
+
+    /**
+     * @brief Signals a change in provider (in-place)
+     *
+     * Note: if the provider was deleted, the new ("current") provider will be `nullptr`
+     *
+     * @param oldProvider the old provider
+     * @param currentProvider the current provider
+     */
+    EVENT_DEF(EventProviderChanged, prv::Provider *, prv::Provider *);
+
+    /**
+     * @brief Signals that a provider was saved
+     *
+     * @param provider the saved provider
+     */
+    EVENT_DEF(EventProviderSaved,   prv::Provider *);
+
+    /**
+     * @brief Signals a provider is closing
+     *
+     * FIXME: as for now, this behaves as a request more than an event. Also, the boolean is always set to true,
+     *  and serves no purpose. This should be moved into the Provider requests section and declared accordingly.
+     *
+     * @param provider the closing provider
+     * @param shouldClose whether the provider should close
+     */
+    EVENT_DEF(EventProviderClosing, prv::Provider *, bool *);
+
+    /**
+     * @brief Signals that a provider was closed
+     *
+     * As this is a closure information broadcast, the provider should generally not be accessed, as it could
+     * result in problems.
+     *
+     * @param provider the now-closed provider
+     */
+    EVENT_DEF(EventProviderClosed,  prv::Provider *);
+
+    /**
+     * @brief Signals that a provider is being deleted
+     *
+     * Provider's data should not be accessed.
+     *
+     * @param provider the provider
+     */
+    EVENT_DEF(EventProviderDeleted, prv::Provider *);
+
+}
+
+/* Provider data events definitions */
+namespace hex {
+
+    /**
+     * @brief Signals the dirtying of a provider
+     *
+     * Any data modification that occurs in a provider dirties it, until its state is either saved or restored.
+     * This event signals that fact to subscribers so additional code can be executed for certain cases.
+     */
+    EVENT_DEF(EventProviderDirtied, prv::Provider *);
+
+    /**
+     * @brief Signals an insertion of new data into a provider
+     *
+     * @param provider the provider
+     * @param offset the start of the insertion
+     * @param size the new data's size
+     */
+    EVENT_DEF(EventProviderDataInserted, prv::Provider *, u64, u64);
+
+    /**
+     * @brief Signals a modification in the provider's data
+     *
+     * @param provider the provider
+     * @param offset the data modification's offset (start address)
+     * @param size the buffer's size
+     * @param buffer the modified data written at this address
+     */
+    EVENT_DEF(EventProviderDataModified, prv::Provider *, u64, u64, const u8*);
+
+    /**
+     * @brief Signals a removal of some of the provider's data
+     *
+     * @param provider the provider
+     * @param offset the deletion offset (start address)
+     * @param size the deleted data's size
+     */
+    EVENT_DEF(EventProviderDataRemoved, prv::Provider *, u64, u64);
+
+}

lib/libimhex/include/hex/api/events/requests_gui.hpp

@@ -0,0 +1,37 @@
+#pragma once
+
+#include <hex/api/event_manager.hpp>
+
+/* GUI requests definitions */
+namespace hex {
+
+    /**
+     * @brief Requests the opening of a new window.
+     *
+     * @param name the window's name
+     */
+    EVENT_DEF(RequestOpenWindow, std::string);
+
+    /**
+     * @brief Centralized request to update ImHex's main window title
+     *
+     * This request can be called to make ImHex refresh its main window title, taking into account a new project
+     * or file opened/closed.
+     */
+    EVENT_DEF(RequestUpdateWindowTitle);
+
+    /**
+     * @brief Requests a theme type (light or dark) change
+     *
+     * @param themeType either `Light` or `Dark`
+     */
+    EVENT_DEF(RequestChangeTheme, std::string);
+
+    /**
+     * @brief Requests the opening of a popup
+     *
+     * @param name the popup's name
+     */
+    EVENT_DEF(RequestOpenPopup, std::string);
+
+}

lib/libimhex/include/hex/api/events/requests_interaction.hpp

@@ -0,0 +1,116 @@
+#pragma once
+
+#include <hex.hpp>
+#include <hex/api/event_manager.hpp>
+
+/* Forward declarations */
+namespace pl::ptrn { class Pattern; }
+
+/* Interaction requests definitions */
+namespace hex {
+
+    /**
+     * @brief Requests a selection change in the Hex editor
+     *
+     * This request is handled by the Hex editor, which proceeds to check if the selection is valid.
+     * If it is invalid, the Hex editor fires the `EventRegionSelected` event with nullptr region info.
+     *
+     * @param region the region that should be selected
+     */
+    EVENT_DEF(RequestHexEditorSelectionChange, ImHexApi::HexEditor::ProviderRegion);
+
+    /**
+     * @brief Requests the Pattern editor to move selection
+     *
+     * Requests the Pattern editor to move the cursor's position to reflect the user's click or movement.
+     *
+     * @param line the target line
+     * @param column the target column
+     */
+    EVENT_DEF(RequestPatternEditorSelectionChange, u32, u32);
+
+    /**
+     * @brief Requests a jump to a given pattern
+     *
+     * This request is fired by the Hex editor when the user asks to jump to the pattern.
+     * It is then caught and reflected by the Pattern data component.
+     *
+     * @param pattern the pattern to jump to
+     */
+    EVENT_DEF(RequestJumpToPattern, const pl::ptrn::Pattern*);
+
+    /**
+     * @brief Requests to add a bookmark
+     *
+     * @param region the region to be bookmarked
+     * @param name the bookmark's name
+     * @param comment a comment
+     * @param color the color
+     * @param id the bookmark's unique ID
+     */
+    EVENT_DEF(RequestAddBookmark, Region, std::string, std::string, color_t, u64*);
+
+    /**
+     * @brief Requests a bookmark removal
+     *
+     * @param id the bookmark's unique ID
+     */
+    EVENT_DEF(RequestRemoveBookmark, u64);
+
+    /**
+     * @brief Request the Pattern editor to set its code
+     *
+     * This request allows the rest of ImHex to interface with the Pattern editor component, by setting its code.
+     * This allows for `.hexpat` file loading, and more.
+     *
+     * @param code the code's string
+     */
+    EVENT_DEF(RequestSetPatternLanguageCode, std::string);
+
+    /**
+     * @brief Requests the Pattern editor to run the current code
+     *
+     * This is only ever used in the introduction tutorial.
+     *
+     * FIXME: the name is misleading, as for now this activates the pattern's auto-evaluation rather than a
+     *  one-off execution
+     */
+    EVENT_DEF(RequestRunPatternCode);
+
+    /**
+     * @brief Request to load a pattern language file
+     *
+     * FIXME: this request is unused, as now another component is responsible for pattern file loading.
+     *  This request should be scrapped.
+     *
+     * @param path the pattern file's path
+     */
+    EVENT_DEF(RequestLoadPatternLanguageFile, std::fs::path);
+
+    /**
+     * @brief Request to save a pattern language file
+     *
+     * FIXME: this request is unused, as now another component is responsible for pattern file saving.
+     *  This request should be scrapped.
+     *
+     * @param path the pattern file's path
+     */
+    EVENT_DEF(RequestSavePatternLanguageFile, std::fs::path);
+
+    /**
+     * @brief Requests ImHex to open and process a file
+     *
+     * @param path the file's path
+     */
+    EVENT_DEF(RequestOpenFile, std::fs::path);
+
+    /**
+     * @brief Adds a virtual file in the Pattern editor
+     *
+     * @param path the file's path
+     * @param data the file's data
+     * @param region the impacted region
+     */
+    EVENT_DEF(RequestAddVirtualFile, std::fs::path, std::vector<u8>, Region);
+
+}

lib/libimhex/include/hex/api/events/requests_lifecycle.hpp

@@ -0,0 +1,84 @@
+#pragma once
+
+#include <hex.hpp>
+#include <hex/api/event_manager.hpp>
+
+/* Lifecycle requests definitions */
+namespace hex {
+
+    /**
+     * @brief Emit a request to add an initialization task to the list
+     *
+     * These tasks will be executed at startup.
+     *
+     * @param name Name of the init task
+     * @param isAsync Whether the task is asynchronous (true if yes)
+     * @param callbackFunction The function to call to execute the task
+     */
+    EVENT_DEF(RequestAddInitTask, std::string, bool, std::function<bool()>);
+
+    /**
+     * @brief Emit a request to add an exit task to the list
+     *
+     * These tasks will be executed during the exit phase.
+     *
+     * FIXME: request is unused and should be scrapped.
+     *
+     * @param name Name of the exit task
+     * @param callbackFunction The function to call to execute the task
+     */
+    EVENT_DEF(RequestAddExitTask, std::string, std::function<bool()>);
+
+    /**
+     * @brief Requests ImHex's graceful shutdown
+     *
+     * If there are no questions (bool set to true), ImHex closes immediately.
+     * If set to false, there is a procedure run to prompt a confirmation to the user.
+     *
+     * @param noQuestions true if no questions
+     */
+    EVENT_DEF(RequestCloseImHex, bool);
+
+    /**
+     * @brief Requests ImHex's restart
+     *
+     * This event is necessary for ImHex to restart in the main loop for native and web platforms,
+     * as ImHex cannot simply close and re-open.
+     *
+     * This event serves no purpose on Linux, Windows and macOS platforms.
+     */
+    EVENT_DEF(RequestRestartImHex);
+
+    /**
+     * @brief Requests the initialization of theme handlers
+     *
+     * This is called during ImGui bootstrapping, and should not be called at any other time.
+     */
+    EVENT_DEF(RequestInitThemeHandlers);
+
+    /**
+     * @brief Requests version and first-startup checks
+     *
+     * This request is called during ImHex's startup, and allows ImHex to check if it was updated since last launch.
+     * It also ensures newcomers (that open ImHex for the first time) are greeted with the tutorial.
+     *
+     * FIXME: the name is misleading, as this request does not effectively start any migration. It only executes
+     *  checks about ImHex's version. The name should be changed to reflect this behaviour.
+     */
+    EVENT_DEF(RequestStartMigration);
+
+    /**
+     * @brief Send a subcommand to the main Imhex instance
+     *
+     * This request is called to send a subcommand to the main ImHex instance.
+     * This subcommand will then be executed by a handler when ImHex finishing initializing
+     * (`EventImHexStartupFinished`).
+     *
+     * FIXME: change the name so that it is prefixed with "Request" like every other request.
+     *
+     * @param name the subcommand's name
+     * @param data the subcommand's data
+     */
+    EVENT_DEF(SendMessageToMainInstance, const std::string, const std::vector<u8>&);
+
+}

lib/libimhex/include/hex/api/events/requests_provider.hpp

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <hex/api/event_manager.hpp>
+
+/* Provider requests definitions */
+namespace hex {
+
+    /**
+     * @brief Creates a provider from its unlocalized name, and add it to the provider list
+    */
+    EVENT_DEF(RequestCreateProvider, std::string, bool, bool, hex::prv::Provider **);
+
+    /**
+     * @brief Move the data from all PerProvider instances from one provider to another
+     *
+     * The 'from' provider should not have any per provider data after this, and should be immediately deleted
+     *
+     * FIXME: rename with the "Request" prefix to apply standard naming convention.
+    */
+    EVENT_DEF(MovePerProviderData, prv::Provider *, prv::Provider *);
+
+}

lib/libimhex/include/hex/api/imhex_api.hpp

@@ -2,22 +2,30 @@
 
 #include <hex.hpp>
 #include <hex/api/localization_manager.hpp>
+#include <hex/helpers/semantic_version.hpp>
+#include <hex/helpers/fs.hpp>
 
+#include <functional>
 #include <optional>
 #include <span>
 #include <string>
 #include <vector>
 #include <map>
-
-#include <wolv/io/fs.hpp>
+#include <set>
+#include <memory>
 
 using ImGuiID = unsigned int;
 struct ImVec2;
 struct ImFontAtlas;
 struct ImFont;
+struct GLFWwindow;
 
 namespace hex {
 
+    namespace impl {
+        class AutoResetBase;
+    }
+
     namespace prv {
         class Provider;
     }
@@ -34,8 +42,8 @@ namespace hex {
                 Highlighting() = default;
                 Highlighting(Region region, color_t color);
 
-                [[nodiscard]] const Region &getRegion() const { return m_region; }
-                [[nodiscard]] const color_t &getColor() const { return m_color; }
+                [[nodiscard]] const Region& getRegion() const { return m_region; }
+                [[nodiscard]] const color_t& getColor() const { return m_color; }
 
             private:
                 Region m_region = {};
@@ -47,9 +55,9 @@ namespace hex {
                 Tooltip() = default;
                 Tooltip(Region region, std::string value, color_t color);
 
-                [[nodiscard]] const Region &getRegion() const { return m_region; }
-                [[nodiscard]] const color_t &getColor() const { return m_color; }
-                [[nodiscard]] const std::string &getValue() const { return m_value; }
+                [[nodiscard]] const Region& getRegion() const { return m_region; }
+                [[nodiscard]] const color_t& getColor() const { return m_color; }
+                [[nodiscard]] const std::string& getValue() const { return m_value; }
 
             private:
                 Region m_region = {};
@@ -68,15 +76,18 @@ namespace hex {
             namespace impl {
 
                 using HighlightingFunction = std::function<std::optional<color_t>(u64, const u8*, size_t, bool)>;
+                using HoveringFunction = std::function<std::set<Region>(const prv::Provider *, u64, size_t)>;
 
-                std::map<u32, Highlighting> &getBackgroundHighlights();
-                std::map<u32, HighlightingFunction> &getBackgroundHighlightingFunctions();
-                std::map<u32, Highlighting> &getForegroundHighlights();
-                std::map<u32, HighlightingFunction> &getForegroundHighlightingFunctions();
-                std::map<u32, Tooltip> &getTooltips();
-                std::map<u32, TooltipFunction> &getTooltipFunctions();
+                const std::map<u32, Highlighting>& getBackgroundHighlights();
+                const std::map<u32, HighlightingFunction>& getBackgroundHighlightingFunctions();
+                const std::map<u32, Highlighting>& getForegroundHighlights();
+                const std::map<u32, HighlightingFunction>& getForegroundHighlightingFunctions();
+                const std::map<u32, HoveringFunction>& getHoveringFunctions();
+                const std::map<u32, Tooltip>& getTooltips();
+                const std::map<u32, TooltipFunction>& getTooltipFunctions();
 
                 void setCurrentSelection(const std::optional<ProviderRegion> &region);
+                void setHoveredRegion(const prv::Provider *provider, const Region &region);
             }
 
             /**
@@ -165,6 +176,19 @@ namespace hex {
              */
             void removeForegroundHighlightingProvider(u32 id);
 
+            /**
+             * @brief Adds a hovering provider to the Hex Editor using a callback function
+             * @param function Function that draws the highlighting based on the hovered region
+             * @return Unique ID used to remove the highlighting again later
+             */
+            u32 addHoverHighlightProvider(const impl::HoveringFunction &function);
+
+            /**
+             * @brief Removes a hovering color highlighting from the Hex Editor
+             * @param id The ID of the highlighting to remove
+             */
+            void removeHoverHighlightProvider(u32 id);
+
             /**
              * @brief Checks if there's a valid selection in the Hex Editor right now
              */
@@ -202,6 +226,20 @@ namespace hex {
              */
             void setSelection(u64 address, size_t size, prv::Provider *provider = nullptr);
 
+            /**
+             * @brief Adds a virtual file to the list in the Hex Editor
+             * @param path The path of the file
+             * @param data The data of the file
+             * @param region The location of the file in the Hex Editor if available
+             */
+            void addVirtualFile(const std::fs::path &path, std::vector<u8> data, Region region = Region::Invalid());
+
+            /**
+             * @brief Gets the currently hovered cell region in the Hex Editor
+             * @return
+             */
+            const std::optional<Region>& getHoveredRegion(const prv::Provider *provider);
+
         }
 
         /* Functions to interact with Bookmarks */
@@ -256,7 +294,7 @@ namespace hex {
             namespace impl {
 
                 void resetClosingProvider();
-                const std::vector<prv::Provider*>& getClosingProviders();
+                std::set<prv::Provider*> getClosingProviders();
 
             }
 
@@ -270,13 +308,19 @@ namespace hex {
              * @brief Gets a list of all currently loaded data providers
              * @return The currently loaded data providers
              */
-            const std::vector<prv::Provider *> &getProviders();
+            std::vector<prv::Provider*> getProviders();
 
             /**
              * @brief Sets the currently selected data provider
              * @param index Index of the provider to select
              */
-            void setCurrentProvider(u32 index);
+            void setCurrentProvider(i64 index);
+
+            /**
+             * @brief Sets the currently selected data provider
+             * @param provider The provider to select
+             */
+            void setCurrentProvider(NonNull<prv::Provider*> provider);
 
             /**
              * @brief Gets the index of the currently selected data provider
@@ -314,7 +358,7 @@ namespace hex {
              * @param skipLoadInterface Whether to skip the provider's loading interface (see property documentation)
              * @param select Whether to select the provider after adding it
              */
-            void add(prv::Provider *provider, bool skipLoadInterface = false, bool select = true);
+            void add(std::unique_ptr<prv::Provider> &&provider, bool skipLoadInterface = false, bool select = true);
 
             /**
              * @brief Creates a new provider and adds it to the list of providers
@@ -323,7 +367,7 @@ namespace hex {
              */
             template<std::derived_from<prv::Provider> T>
             void add(auto &&...args) {
-                add(new T(std::forward<decltype(args)>(args)...));
+                add(std::make_unique<T>(std::forward<decltype(args)>(args)...));
             }
 
             /**
@@ -339,42 +383,29 @@ namespace hex {
              * @param skipLoadInterface Whether to skip the provider's loading interface (see property documentation)
              * @param select Whether to select the provider after adding it
              */
-            prv::Provider* createProvider(const UnlocalizedString &unlocalizedName, bool skipLoadInterface = false, bool select = true);
+            prv::Provider* createProvider(
+                const UnlocalizedString &unlocalizedName,
+                bool skipLoadInterface = false,
+                bool select = true
+            );
 
         }
 
         /* Functions to interact with various ImHex system settings */
         namespace System {
 
-            bool isMainInstance();
-
-            namespace impl {
-                void setMainInstanceStatus(bool status);
-
-                void setMainWindowPosition(i32 x, i32 y);
-                void setMainWindowSize(u32 width, u32 height);
-                void setMainDockSpaceId(ImGuiID id);
-
-                void setGlobalScale(float scale);
-                void setNativeScale(float scale);
-
-                void setBorderlessWindowMode(bool enabled);
-
-                void setGPUVendor(const std::string &vendor);
-
-                void setPortableVersion(bool enabled);
-
-                void addInitArgument(const std::string &key, const std::string &value = { });
-
-                void setLastFrameTime(double time);
-            }
-
             struct ProgramArguments {
                 int argc;
                 char **argv;
                 char **envp;
             };
 
+            struct InitialWindowProperties {
+                i32 x, y;
+                u32 width, height;
+                bool maximized;
+            };
+
             enum class TaskProgressState {
                 Reset,
                 Progress,
@@ -387,6 +418,38 @@ namespace hex {
                 Error
             };
 
+            namespace impl {
+
+                void setMainInstanceStatus(bool status);
+
+                void setMainWindowPosition(i32 x, i32 y);
+                void setMainWindowSize(u32 width, u32 height);
+                void setMainDockSpaceId(ImGuiID id);
+                void setMainWindowHandle(GLFWwindow *window);
+
+                void setGlobalScale(float scale);
+                void setNativeScale(float scale);
+
+                void setBorderlessWindowMode(bool enabled);
+                void setMultiWindowMode(bool enabled);
+                void setInitialWindowProperties(InitialWindowProperties properties);
+
+                void setGPUVendor(const std::string &vendor);
+                void setGLRenderer(const std::string &renderer);
+
+                void addInitArgument(const std::string &key, const std::string &value = { });
+
+                void setLastFrameTime(double time);
+
+                bool isWindowResizable();
+
+                void addAutoResetObject(hex::impl::AutoResetBase *object);
+                void removeAutoResetObject(hex::impl::AutoResetBase *object);
+
+                void cleanup();
+
+            }
+
             /**
              * @brief Closes ImHex
              * @param noQuestions Whether to skip asking the user for confirmation
@@ -432,6 +495,7 @@ namespace hex {
              */
             float getNativeScale();
 
+            float getBackingScaleFactor();
 
             /**
              * @brief Gets the current main window position
@@ -451,6 +515,11 @@ namespace hex {
              */
             ImGuiID getMainDockSpaceId();
 
+            /**
+             * @brief Gets the main window's GLFW window handle
+             * @return GLFW window handle
+             */
+            GLFWwindow* getMainWindowHandle();
 
             /**
              * @brief Checks if borderless window mode is enabled currently
@@ -458,11 +527,24 @@ namespace hex {
              */
             bool isBorderlessWindowModeEnabled();
 
+            /**
+             * @brief Checks if multi-window mode is enabled currently
+             * @return Whether multi-window mode is enabled
+             */
+            bool isMutliWindowModeEnabled();
+
             /**
              * @brief Gets the init arguments passed to ImHex from the splash screen
              * @return Init arguments
              */
-            std::map<std::string, std::string> &getInitArguments();
+            const std::map<std::string, std::string>& getInitArguments();
+
+            /**
+             * @brief Gets a init arguments passed to ImHex from the splash screen
+             * @param key The key of the init argument
+             * @return Init argument
+            */
+            std::string getInitArgument(const std::string &key);
 
             /**
              * @brief Sets if ImHex should follow the system theme
@@ -481,7 +563,7 @@ namespace hex {
              * @brief Gets the currently set additional folder paths
              * @return The currently set additional folder paths
              */
-            std::vector<std::filesystem::path> &getAdditionalFolderPaths();
+            const std::vector<std::filesystem::path>& getAdditionalFolderPaths();
 
             /**
              * @brief Sets the additional folder paths
@@ -494,7 +576,21 @@ namespace hex {
              * @brief Gets the current GPU vendor
              * @return The current GPU vendor
              */
-            const std::string &getGPUVendor();
+            const std::string& getGPUVendor();
+
+            /**
+             * @brief Gets the current GPU vendor
+             * @return The current GPU vendor
+             */
+            const std::string& getGLRenderer();
+
+            /**
+             * @brief Checks if ImHex is being run in a "Corporate Environment"
+             * This function simply checks for common telltale signs such as if the machine is joined a
+             * domain. It's not super accurate, but it's still useful for statistics
+             * @return True if it is
+             */
+            bool isCorporateEnvironment();
 
             /**
              * @brief Checks if ImHex is running in portable mode
@@ -520,11 +616,21 @@ namespace hex {
              */
             std::string getArchitecture();
 
+
+            struct LinuxDistro {
+                std::string name;
+                std::string version;
+            };
+            /**
+             * @brief Gets information related to the Linux distribution, if running on Linux
+             */
+            std::optional<LinuxDistro> getLinuxDistro();
+
             /**
              * @brief Gets the current ImHex version
              * @return ImHex version
              */
-            std::string getImHexVersion(bool withBuildType = true);
+            SemanticVersion getImHexVersion();
 
             /**
              * @brief Gets the current git commit hash
@@ -545,6 +651,12 @@ namespace hex {
              */
             bool isDebugBuild();
 
+            /**
+             * @brief Checks if this version of ImHex is a nightly build
+             * @return True if this version is a nightly, false if it's a release
+             */
+            bool isNightlyBuild();
+
             enum class UpdateType {
                 Stable,
                 Nightly
@@ -557,9 +669,51 @@ namespace hex {
              */
             bool updateImHex(UpdateType updateType);
 
+            /**
+             * @brief Add a new startup task that will be run while ImHex's splash screen is shown
+             * @param name Name to be shown in the UI
+             * @param async Whether to run the task asynchronously
+             * @param function The function to run
+             */
             void addStartupTask(const std::string &name, bool async, const std::function<bool()> &function);
 
+            /**
+             * @brief Gets the time the previous frame took
+             * @return Previous frame time
+             */
             double getLastFrameTime();
+
+            /**
+             * @brief Sets the window resizable
+             * @param resizable Whether the window should be resizable
+             */
+            void setWindowResizable(bool resizable);
+
+            /**
+             * @brief Checks if this window is the main instance of ImHex
+             * @return True if this is the main instance, false if another instance is already running
+             */
+            bool isMainInstance();
+
+            /**
+             * @brief Gets the initial window properties
+             * @return Initial window properties
+             */
+            std::optional<InitialWindowProperties> getInitialWindowProperties();
+
+            /**
+             * @brief Gets the module handle of libimhex
+             * @return Module handle
+             */
+            void* getLibImHexModuleHandle();
+
+            /**
+             * Adds a new migration routine that will be executed when upgrading from a lower version than specified in migrationVersion
+             * @param migrationVersion Upgrade point version
+             * @param function Function to run
+             */
+            void addMigrationRoutine(SemanticVersion migrationVersion, std::function<void()> function);
+
         }
 
         /**
@@ -569,11 +723,12 @@ namespace hex {
         namespace Messaging {
             
             namespace impl {
+
                 using MessagingHandler = std::function<void(const std::vector<u8> &)>;
 
-                std::map<std::string, MessagingHandler> &getHandlers();
-
+                const std::map<std::string, MessagingHandler>& getHandlers();
                 void runHandler(const std::string &eventName, const std::vector<u8> &args);
+
             }
 
             /**
@@ -593,17 +748,15 @@ namespace hex {
                 std::vector<GlyphRange> glyphRanges;
                 Offset offset;
                 u32 flags;
+                std::optional<u32> defaultSize;
             };
 
             namespace impl {
 
-                std::vector<Font>& getFonts();
+                const std::vector<Font>& getFonts();
 
-                void setCustomFontPath(const std::fs::path &path);
-                void setFontSize(float size);
-                void setFontAtlas(ImFontAtlas *fontAtlas);
+                std::map<UnlocalizedString, ImFont*>& getFontDefinitions();
 
-                void setFonts(ImFont *bold, ImFont *italic);
             }
 
             GlyphRange glyph(const char *glyph);
@@ -611,31 +764,13 @@ namespace hex {
             GlyphRange range(const char *glyphBegin, const char *glyphEnd);
             GlyphRange range(u32 codepointBegin, u32 codepointEnd);
 
-            void loadFont(const std::fs::path &path, const std::vector<GlyphRange> &glyphRanges = {}, Offset offset = {}, u32 flags = 0);
-            void loadFont(const std::string &name, const std::span<const u8> &data, const std::vector<GlyphRange> &glyphRanges = {}, Offset offset = {}, u32 flags = 0);
+            void loadFont(const std::fs::path &path, const std::vector<GlyphRange> &glyphRanges = {}, Offset offset = {}, u32 flags = 0, std::optional<u32> defaultSize = std::nullopt);
+            void loadFont(const std::string &name, const std::span<const u8> &data, const std::vector<GlyphRange> &glyphRanges = {}, Offset offset = {}, u32 flags = 0, std::optional<u32> defaultSize = std::nullopt);
 
             constexpr static float DefaultFontSize = 13.0;
 
-            ImFont* Bold();
-            ImFont* Italic();
-
-            /**
-             * @brief Gets the current custom font path
-             * @return The current custom font path
-             */
-            std::filesystem::path &getCustomFontPath();
-
-            /**
-             * @brief Gets the current font size
-             * @return The current font size
-             */
-            float getFontSize();
-
-            /**
-             * @brief Gets the current font atlas
-             * @return Current font atlas
-             */
-            ImFontAtlas* getFontAtlas();
+            void registerFont(const UnlocalizedString &fontName);
+            ImFont* getFont(const UnlocalizedString &fontName);
 
         }
 

lib/libimhex/include/hex/api/layout_manager.hpp

@@ -4,6 +4,8 @@
 
 #include <string>
 
+struct ImGuiTextBuffer;
+
 namespace hex {
 
     class LayoutManager {
@@ -13,6 +15,9 @@ namespace hex {
             std::fs::path path;
         };
 
+        using LoadCallback = std::function<void(std::string_view)>;
+        using StoreCallback = std::function<void(ImGuiTextBuffer *)>;
+
         /**
          * @brief Save the current layout
          * @param name Name of the layout
@@ -41,7 +46,13 @@ namespace hex {
          * @brief Get a list of all layouts
          * @return List of all added layouts
          */
-        static std::vector<Layout> getLayouts();
+        static const std::vector<Layout> &getLayouts();
+
+        /**
+         * @brief Removes the layout with the given name
+         * @param name Name of the layout
+         */
+        static void removeLayout(const std::string &name);
 
         /**
          * @brief Handles loading of layouts if needed
@@ -76,6 +87,12 @@ namespace hex {
          */
         static void closeAllViews();
 
+        static void registerLoadCallback(const LoadCallback &callback);
+        static void registerStoreCallback(const StoreCallback &callback);
+
+        static void onStore(ImGuiTextBuffer *buffer);
+        static void onLoad(std::string_view line);
+
     private:
         LayoutManager() = default;
     };

lib/libimhex/include/hex/api/localization_manager.hpp

@@ -1,10 +1,14 @@
 #pragma once
 
+#include <hex.hpp>
+
 #include <map>
 #include <string>
 #include <string_view>
+#include <vector>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
+#include <wolv/types/static_string.hpp>
 
 namespace hex {
 
@@ -21,23 +25,30 @@ namespace hex {
         };
 
         namespace impl {
+
             void setFallbackLanguage(const std::string &language);
             void resetLanguageStrings();
+
         }
 
-        void loadLanguage(const std::string &language);
+        void loadLanguage(std::string language);
+        std::string getLocalizedString(const std::string &unlocalizedString, const std::string &language = "");
 
         [[nodiscard]] const std::map<std::string, std::string> &getSupportedLanguages();
         [[nodiscard]] const std::string &getFallbackLanguage();
         [[nodiscard]] const std::string &getSelectedLanguage();
+
     }
 
     struct UnlocalizedString;
 
+    class LangConst;
+
     class Lang {
     public:
         explicit Lang(const char *unlocalizedString);
         explicit Lang(const std::string &unlocalizedString);
+        explicit(false) Lang(const LangConst &localizedString);
         explicit Lang(const UnlocalizedString &unlocalizedString);
         explicit Lang(std::string_view unlocalizedString);
 
@@ -45,31 +56,54 @@ namespace hex {
         [[nodiscard]] operator std::string_view() const;
         [[nodiscard]] operator const char *() const;
 
-        [[nodiscard]] const std::string &get() const;
+        const char* get() const;
 
     private:
+        std::size_t m_entryHash;
         std::string m_unlocalizedString;
     };
 
-    [[nodiscard]] std::string operator+(const std::string &&left, const Lang &&right);
-    [[nodiscard]] std::string operator+(const Lang &&left, const std::string &&right);
-    [[nodiscard]] std::string operator+(const std::string_view &&left, const Lang &&right);
-    [[nodiscard]] std::string operator+(const Lang &&left, const std::string_view &&right);
-    [[nodiscard]] std::string operator+(const char *left, const Lang &&right);
-    [[nodiscard]] std::string operator+(const Lang &&left, const char *right);
-    [[nodiscard]] std::string operator+(const Lang &&left, const Lang &&right);
+    class LangConst {
+    public:
+        [[nodiscard]] operator std::string() const;
+        [[nodiscard]] operator std::string_view() const;
+        [[nodiscard]] operator const char *() const;
 
-    [[nodiscard]] inline Lang operator""_lang(const char *string, size_t) {
-        return Lang(string);
-    }
+        const char* get() const;
 
+        constexpr static size_t hash(std::string_view string) {
+            constexpr u64 p = 131;
+            constexpr u64 m = std::numeric_limits<std::uint32_t>::max() - 4;
+            u64 total = 0;
+            u64 currentMultiplier = 1;
+
+            for (char c : string) {
+                total = (total + currentMultiplier * c) % m;
+                currentMultiplier = (currentMultiplier * p) % m;
+            }
+
+            return total;
+        }
+
+    private:
+        constexpr explicit LangConst(std::size_t hash, const char *unlocalizedString) : m_entryHash(hash), m_unlocalizedString(unlocalizedString) {}
+
+        template<wolv::type::StaticString>
+        friend consteval LangConst operator""_lang();
+        friend class Lang;
+
+    private:
+        std::size_t m_entryHash;
+        const char *m_unlocalizedString = nullptr;
+    };
 
     struct UnlocalizedString {
     public:
         UnlocalizedString() = default;
-        UnlocalizedString(auto && arg) : m_unlocalizedString(std::forward<decltype(arg)>(arg)) {
-            static_assert(!std::same_as<std::remove_cvref_t<decltype(arg)>, Lang>, "Expected a unlocalized name, got a localized one!");
-        }
+
+        UnlocalizedString(const std::string &string) : m_unlocalizedString(string) { }
+        UnlocalizedString(const char *string) : m_unlocalizedString(string) { }
+        UnlocalizedString(const Lang& arg) = delete;
 
         [[nodiscard]] operator std::string() const {
             return m_unlocalizedString;
@@ -100,12 +134,24 @@ namespace hex {
         std::string m_unlocalizedString;
     };
 
+    template<wolv::type::StaticString String>
+    [[nodiscard]] consteval LangConst operator""_lang() {
+        return LangConst(LangConst::hash(String.value.data()), String.value.data());
+    }
+
+    // {fmt} formatter for hex::Lang and hex::LangConst
+    inline auto format_as(const hex::Lang &entry) {
+        return entry.get();
+    }
+    inline auto format_as(const hex::LangConst &entry) {
+        return entry.get();
+    }
+
 }
 
 template<>
-struct fmt::formatter<hex::Lang> : fmt::formatter<std::string_view> {
-    template<typename FormatContext>
-    auto format(const hex::Lang &entry, FormatContext &ctx) {
-        return fmt::formatter<std::string_view>::format(entry.get(), ctx);
+struct std::hash<hex::UnlocalizedString> {
+    std::size_t operator()(const hex::UnlocalizedString &string) const noexcept {
+        return std::hash<std::string>{}(string.get());
     }
 };

lib/libimhex/include/hex/api/plugin_manager.hpp

@@ -1,20 +1,31 @@
 #pragma once
 
 #include <functional>
+#include <list>
 #include <span>
 #include <string>
 
 #include <wolv/io/fs.hpp>
+
 #include <hex/helpers/logger.hpp>
+#include <hex/helpers/auto_reset.hpp>
 
 struct ImGuiContext;
 
 namespace hex {
 
     struct SubCommand {
-        std::string commandKey;
-        std::string commandDesc;
+        enum class Type : u8 {
+            Option,
+            SubCommand
+        };
+
+        std::string commandLong;
+        std::string commandShort;
+
+        std::string commandDescription;
         std::function<void(const std::vector<std::string>&)> callback;
+        Type type = Type::Option;
     };
 
     struct Feature {
@@ -26,22 +37,23 @@ namespace hex {
         using InitializePluginFunc     = void (*)();
         using InitializeLibraryFunc    = void (*)();
         using GetPluginNameFunc        = const char *(*)();
+        using GetLibraryNameFunc       = const char *(*)();
         using GetPluginAuthorFunc      = const char *(*)();
         using GetPluginDescriptionFunc = const char *(*)();
         using GetCompatibleVersionFunc = const char *(*)();
         using SetImGuiContextFunc      = void (*)(ImGuiContext *);
-        using IsBuiltinPluginFunc      = bool (*)();
         using GetSubCommandsFunc       = void* (*)();
         using GetFeaturesFunc          = void* (*)();
 
         InitializePluginFunc        initializePluginFunction        = nullptr;
         InitializeLibraryFunc       initializeLibraryFunction       = nullptr;
         GetPluginNameFunc           getPluginNameFunction           = nullptr;
+        GetLibraryNameFunc          getLibraryNameFunction          = nullptr;
         GetPluginAuthorFunc         getPluginAuthorFunction         = nullptr;
         GetPluginDescriptionFunc    getPluginDescriptionFunction    = nullptr;
         GetCompatibleVersionFunc    getCompatibleVersionFunction    = nullptr;
         SetImGuiContextFunc         setImGuiContextFunction         = nullptr;
-        IsBuiltinPluginFunc         isBuiltinPluginFunction         = nullptr;
+        SetImGuiContextFunc         setImGuiContextLibraryFunction  = nullptr;
         GetSubCommandsFunc          getSubCommandsFunction          = nullptr;
         GetFeaturesFunc             getFeaturesFunction             = nullptr;
     };
@@ -49,7 +61,7 @@ namespace hex {
     class Plugin {
     public:
         explicit Plugin(const std::fs::path &path);
-        explicit Plugin(const PluginFunctions &functions);
+        explicit Plugin(const std::string &name, const PluginFunctions &functions);
 
         Plugin(const Plugin &) = delete;
         Plugin(Plugin &&other) noexcept;
@@ -64,7 +76,6 @@ namespace hex {
         [[nodiscard]] std::string getPluginDescription() const;
         [[nodiscard]] std::string getCompatibleVersion() const;
         void setImGuiContext(ImGuiContext *ctx) const;
-        [[nodiscard]] bool isBuiltinPlugin() const;
 
         [[nodiscard]] const std::fs::path &getPath() const;
 
@@ -76,11 +87,14 @@ namespace hex {
 
         [[nodiscard]] bool isLibraryPlugin() const;
 
+        [[nodiscard]] bool wasAddedManually() const;
+
     private:
         uintptr_t m_handle = 0;
         std::fs::path m_path;
 
         mutable bool m_initialized = false;
+        bool m_addedManually = false;
 
         PluginFunctions m_functions = {};
 
@@ -96,14 +110,31 @@ namespace hex {
     public:
         PluginManager() = delete;
 
+        static bool load();
         static bool load(const std::fs::path &pluginFolder);
+
+        static bool loadLibraries();
+        static bool loadLibraries(const std::fs::path &libraryFolder);
+
         static void unload();
         static void reload();
+        static void initializeNewPlugins();
+        static void addLoadPath(const std::fs::path &path);
 
-        static void addPlugin(PluginFunctions functions);
+        static void addPlugin(const std::string &name, PluginFunctions functions);
 
-        static std::vector<Plugin> &getPlugins();
-        static std::vector<std::fs::path> &getPluginPaths();
+        static Plugin* getPlugin(const std::string &name);
+        static const std::list<Plugin>& getPlugins();
+        static const std::vector<std::fs::path>& getPluginPaths();
+        static const std::vector<std::fs::path>& getPluginLoadPaths();
+
+        static bool isPluginLoaded(const std::fs::path &path);
+
+    private:
+        static std::list<Plugin>& getPluginsMutable();
+
+        static AutoReset<std::vector<std::fs::path>> s_pluginPaths, s_pluginLoadPaths;
+        static AutoReset<std::vector<uintptr_t>> s_loadedLibraries;
     };
 
 }

lib/libimhex/include/hex/api/project_file_manager.hpp

@@ -93,30 +93,26 @@ namespace hex {
          *
          * @param handler The handler to register
          */
-        static void registerHandler(const Handler &handler) {
-            getHandlers().push_back(handler);
-        }
+        static void registerHandler(const Handler &handler);
 
         /**
          * @brief Register a handler for storing and loading per-provider data from a project file
          *
          * @param handler The handler to register
          */
-        static void registerPerProviderHandler(const ProviderHandler &handler) {
-            getProviderHandlers().push_back(handler);
-        }
+        static void registerPerProviderHandler(const ProviderHandler &handler);
 
         /**
          * @brief Get the list of registered handlers
          * @return List of registered handlers
          */
-        static std::vector<Handler>& getHandlers();
+        static const std::vector<Handler>& getHandlers();
 
         /**
          * @brief Get the list of registered per-provider handlers
          * @return List of registered per-provider handlers
          */
-        static std::vector<ProviderHandler>& getProviderHandlers();
+        static const std::vector<ProviderHandler>& getProviderHandlers();
 
     private:
         ProjectFile() = default;

lib/libimhex/include/hex/api/shortcut_manager.hpp

@@ -2,142 +2,31 @@
 
 #include <hex.hpp>
 #include <hex/api/localization_manager.hpp>
+#include <hex/helpers/keys.hpp>
 
 #include <functional>
-#include <memory>
 #include <optional>
 #include <set>
 #include <string>
 
-#include <GLFW/glfw3.h>
-
 struct ImGuiWindow;
 
+struct KeyEquivalent {
+    bool valid;
+    bool ctrl, opt, cmd, shift;
+    int key;
+};
+
 namespace hex {
 
     class View;
 
-    enum class Keys {
-        Space          = GLFW_KEY_SPACE,
-        Apostrophe     = GLFW_KEY_APOSTROPHE,
-        Comma          = GLFW_KEY_COMMA,
-        Minus          = GLFW_KEY_MINUS,
-        Period         = GLFW_KEY_PERIOD,
-        Slash          = GLFW_KEY_SLASH,
-        Num0           = GLFW_KEY_0,
-        Num1           = GLFW_KEY_1,
-        Num2           = GLFW_KEY_2,
-        Num3           = GLFW_KEY_3,
-        Num4           = GLFW_KEY_4,
-        Num5           = GLFW_KEY_5,
-        Num6           = GLFW_KEY_6,
-        Num7           = GLFW_KEY_7,
-        Num8           = GLFW_KEY_8,
-        Num9           = GLFW_KEY_9,
-        Semicolon      = GLFW_KEY_SEMICOLON,
-        Equals         = GLFW_KEY_EQUAL,
-        A              = GLFW_KEY_A,
-        B              = GLFW_KEY_B,
-        C              = GLFW_KEY_C,
-        D              = GLFW_KEY_D,
-        E              = GLFW_KEY_E,
-        F              = GLFW_KEY_F,
-        G              = GLFW_KEY_G,
-        H              = GLFW_KEY_H,
-        I              = GLFW_KEY_I,
-        J              = GLFW_KEY_J,
-        K              = GLFW_KEY_K,
-        L              = GLFW_KEY_L,
-        M              = GLFW_KEY_M,
-        N              = GLFW_KEY_N,
-        O              = GLFW_KEY_O,
-        P              = GLFW_KEY_P,
-        Q              = GLFW_KEY_Q,
-        R              = GLFW_KEY_R,
-        S              = GLFW_KEY_S,
-        T              = GLFW_KEY_T,
-        U              = GLFW_KEY_U,
-        V              = GLFW_KEY_V,
-        W              = GLFW_KEY_W,
-        X              = GLFW_KEY_X,
-        Y              = GLFW_KEY_Y,
-        Z              = GLFW_KEY_Z,
-        LeftBracket    = GLFW_KEY_LEFT_BRACKET,
-        Backslash      = GLFW_KEY_BACKSLASH,
-        RightBracket   = GLFW_KEY_RIGHT_BRACKET,
-        GraveAccent    = GLFW_KEY_GRAVE_ACCENT,
-        World1         = GLFW_KEY_WORLD_1,
-        World2         = GLFW_KEY_WORLD_2,
-        Escape         = GLFW_KEY_ESCAPE,
-        Enter          = GLFW_KEY_ENTER,
-        Tab            = GLFW_KEY_TAB,
-        Backspace      = GLFW_KEY_BACKSPACE,
-        Insert         = GLFW_KEY_INSERT,
-        Delete         = GLFW_KEY_DELETE,
-        Right          = GLFW_KEY_RIGHT,
-        Left           = GLFW_KEY_LEFT,
-        Down           = GLFW_KEY_DOWN,
-        Up             = GLFW_KEY_UP,
-        PageUp         = GLFW_KEY_PAGE_UP,
-        PageDown       = GLFW_KEY_PAGE_DOWN,
-        Home           = GLFW_KEY_HOME,
-        End            = GLFW_KEY_END,
-        CapsLock       = GLFW_KEY_CAPS_LOCK,
-        ScrollLock     = GLFW_KEY_SCROLL_LOCK,
-        NumLock        = GLFW_KEY_NUM_LOCK,
-        PrintScreen    = GLFW_KEY_PRINT_SCREEN,
-        Pause          = GLFW_KEY_PAUSE,
-        F1             = GLFW_KEY_F1,
-        F2             = GLFW_KEY_F2,
-        F3             = GLFW_KEY_F3,
-        F4             = GLFW_KEY_F4,
-        F5             = GLFW_KEY_F5,
-        F6             = GLFW_KEY_F6,
-        F7             = GLFW_KEY_F7,
-        F8             = GLFW_KEY_F8,
-        F9             = GLFW_KEY_F9,
-        F10            = GLFW_KEY_F10,
-        F11            = GLFW_KEY_F11,
-        F12            = GLFW_KEY_F12,
-        F13            = GLFW_KEY_F13,
-        F14            = GLFW_KEY_F14,
-        F15            = GLFW_KEY_F15,
-        F16            = GLFW_KEY_F16,
-        F17            = GLFW_KEY_F17,
-        F18            = GLFW_KEY_F18,
-        F19            = GLFW_KEY_F19,
-        F20            = GLFW_KEY_F20,
-        F21            = GLFW_KEY_F21,
-        F22            = GLFW_KEY_F22,
-        F23            = GLFW_KEY_F23,
-        F24            = GLFW_KEY_F24,
-        F25            = GLFW_KEY_F25,
-        KeyPad0        = GLFW_KEY_KP_0,
-        KeyPad1        = GLFW_KEY_KP_1,
-        KeyPad2        = GLFW_KEY_KP_2,
-        KeyPad3        = GLFW_KEY_KP_3,
-        KeyPad4        = GLFW_KEY_KP_4,
-        KeyPad5        = GLFW_KEY_KP_5,
-        KeyPad6        = GLFW_KEY_KP_6,
-        KeyPad7        = GLFW_KEY_KP_7,
-        KeyPad8        = GLFW_KEY_KP_8,
-        KeyPad9        = GLFW_KEY_KP_9,
-        KeyPadDecimal  = GLFW_KEY_KP_DECIMAL,
-        KeyPadDivide   = GLFW_KEY_KP_DIVIDE,
-        KeyPadMultiply = GLFW_KEY_KP_MULTIPLY,
-        KeyPadSubtract = GLFW_KEY_KP_SUBTRACT,
-        KeyPadAdd      = GLFW_KEY_KP_ADD,
-        KeyPadEnter    = GLFW_KEY_KP_ENTER,
-        KeyPadEqual    = GLFW_KEY_KP_EQUAL,
-        Menu           = GLFW_KEY_MENU,
-    };
-
-
     class Key {
     public:
         constexpr Key() = default;
         constexpr Key(Keys key) : m_key(static_cast<u32>(key)) { }
 
+        bool operator==(const Key &) const = default;
         auto operator<=>(const Key &) const = default;
 
         [[nodiscard]] constexpr u32 getKeyCode() const { return m_key; }
@@ -152,224 +41,32 @@ namespace hex {
     constexpr static auto SUPER             = Key(static_cast<Keys>(0x0800'0000));
     constexpr static auto CurrentView       = Key(static_cast<Keys>(0x1000'0000));
     constexpr static auto AllowWhileTyping  = Key(static_cast<Keys>(0x2000'0000));
-
-    #if defined (OS_MACOS)
-        constexpr static auto CTRLCMD = SUPER;
-    #else
-        constexpr static auto CTRLCMD = CTRL;
-    #endif
+    constexpr static auto CTRLCMD           = Key(static_cast<Keys>(0x4000'0000));
 
     class Shortcut {
     public:
         Shortcut() = default;
-        Shortcut(Keys key) : m_keys({ key }) { }
-        explicit Shortcut(std::set<Key> keys) : m_keys(std::move(keys)) { }
+        Shortcut(Keys key);
+        explicit Shortcut(std::set<Key> keys);
         Shortcut(const Shortcut &other) = default;
         Shortcut(Shortcut &&) noexcept = default;
 
-        Shortcut& operator=(const Shortcut &other) = default;
+        constexpr static auto None = Keys(0);
 
+        Shortcut& operator=(const Shortcut &other) = default;
         Shortcut& operator=(Shortcut &&) noexcept = default;
 
-        constexpr static inline auto None = Keys(0);
+        Shortcut operator+(const Key &other) const;
+        Shortcut &operator+=(const Key &other);
+        bool operator<(const Shortcut &other) const;
+        bool operator==(const Shortcut &other) const;
 
-        Shortcut operator+(const Key &other) const {
-            Shortcut result = *this;
-            result.m_keys.insert(other);
-
-            return result;
-        }
-
-        Shortcut &operator+=(const Key &other) {
-            m_keys.insert(other);
-
-            return *this;
-        }
-
-        bool operator<(const Shortcut &other) const {
-            return m_keys < other.m_keys;
-        }
-
-        bool operator==(const Shortcut &other) const {
-            auto thisKeys = m_keys;
-            auto otherKeys = other.m_keys;
-
-            thisKeys.erase(CurrentView);
-            thisKeys.erase(AllowWhileTyping);
-            otherKeys.erase(CurrentView);
-            otherKeys.erase(AllowWhileTyping);
-
-            return thisKeys == otherKeys;
-        }
-
-        bool isLocal() const {
-            return m_keys.contains(CurrentView);
-        }
-
-        std::string toString() const {
-            std::string result;
-
-            #if defined(OS_MACOS)
-                constexpr static auto CTRL_NAME    = "CTRL";
-                constexpr static auto ALT_NAME     = "OPT";
-                constexpr static auto SHIFT_NAME   = "SHIFT";
-                constexpr static auto SUPER_NAME   = "CMD";
-            #else
-                constexpr static auto CTRL_NAME    = "CTRL";
-                constexpr static auto ALT_NAME     = "ALT";
-                constexpr static auto SHIFT_NAME   = "SHIFT";
-                constexpr static auto SUPER_NAME   = "SUPER";
-            #endif
-
-            constexpr static auto Concatination = " + ";
-
-            auto keys = m_keys;
-            if (keys.erase(CTRL) > 0) {
-                result += CTRL_NAME;
-                result += Concatination;
-            }
-            if (keys.erase(ALT) > 0) {
-                result += ALT_NAME;
-                result += Concatination;
-            }
-            if (keys.erase(SHIFT) > 0) {
-                result += SHIFT_NAME;
-                result += Concatination;
-            }
-            if (keys.erase(SUPER) > 0) {
-                result += SUPER_NAME;
-                result += Concatination;
-            }
-            keys.erase(CurrentView);
-
-            for (const auto &key : keys) {
-                switch (Keys(key.getKeyCode())) {
-                    case Keys::Space:           result += "SPACE";          break;
-                    case Keys::Apostrophe:      result += "'";              break;
-                    case Keys::Comma:           result += ",";              break;
-                    case Keys::Minus:           result += "-";              break;
-                    case Keys::Period:          result += ".";              break;
-                    case Keys::Slash:           result += "/";              break;
-                    case Keys::Num0:            result += "0";              break;
-                    case Keys::Num1:            result += "1";              break;
-                    case Keys::Num2:            result += "2";              break;
-                    case Keys::Num3:            result += "3";              break;
-                    case Keys::Num4:            result += "4";              break;
-                    case Keys::Num5:            result += "5";              break;
-                    case Keys::Num6:            result += "6";              break;
-                    case Keys::Num7:            result += "7";              break;
-                    case Keys::Num8:            result += "8";              break;
-                    case Keys::Num9:            result += "9";              break;
-                    case Keys::Semicolon:       result += ";";              break;
-                    case Keys::Equals:          result += "=";              break;
-                    case Keys::A:               result += "A";              break;
-                    case Keys::B:               result += "B";              break;
-                    case Keys::C:               result += "C";              break;
-                    case Keys::D:               result += "D";              break;
-                    case Keys::E:               result += "E";              break;
-                    case Keys::F:               result += "F";              break;
-                    case Keys::G:               result += "G";              break;
-                    case Keys::H:               result += "H";              break;
-                    case Keys::I:               result += "I";              break;
-                    case Keys::J:               result += "J";              break;
-                    case Keys::K:               result += "K";              break;
-                    case Keys::L:               result += "L";              break;
-                    case Keys::M:               result += "M";              break;
-                    case Keys::N:               result += "N";              break;
-                    case Keys::O:               result += "O";              break;
-                    case Keys::P:               result += "P";              break;
-                    case Keys::Q:               result += "Q";              break;
-                    case Keys::R:               result += "R";              break;
-                    case Keys::S:               result += "S";              break;
-                    case Keys::T:               result += "T";              break;
-                    case Keys::U:               result += "U";              break;
-                    case Keys::V:               result += "V";              break;
-                    case Keys::W:               result += "W";              break;
-                    case Keys::X:               result += "X";              break;
-                    case Keys::Y:               result += "Y";              break;
-                    case Keys::Z:               result += "Z";              break;
-                    case Keys::LeftBracket:     result += "[";              break;
-                    case Keys::Backslash:       result += "\\";             break;
-                    case Keys::RightBracket:    result += "]";              break;
-                    case Keys::GraveAccent:     result += "`";              break;
-                    case Keys::World1:          result += "WORLD1";         break;
-                    case Keys::World2:          result += "WORLD2";         break;
-                    case Keys::Escape:          result += "ESC";            break;
-                    case Keys::Enter:           result += "ENTER";          break;
-                    case Keys::Tab:             result += "TAB";            break;
-                    case Keys::Backspace:       result += "BACKSPACE";      break;
-                    case Keys::Insert:          result += "INSERT";         break;
-                    case Keys::Delete:          result += "DELETE";         break;
-                    case Keys::Right:           result += "RIGHT";          break;
-                    case Keys::Left:            result += "LEFT";           break;
-                    case Keys::Down:            result += "DOWN";           break;
-                    case Keys::Up:              result += "UP";             break;
-                    case Keys::PageUp:          result += "PAGEUP";         break;
-                    case Keys::PageDown:        result += "PAGEDOWN";       break;
-                    case Keys::Home:            result += "HOME";           break;
-                    case Keys::End:             result += "END";            break;
-                    case Keys::CapsLock:        result += "CAPSLOCK";       break;
-                    case Keys::ScrollLock:      result += "SCROLLLOCK";     break;
-                    case Keys::NumLock:         result += "NUMLOCK";        break;
-                    case Keys::PrintScreen:     result += "PRINTSCREEN";    break;
-                    case Keys::Pause:           result += "PAUSE";          break;
-                    case Keys::F1:              result += "F1";             break;
-                    case Keys::F2:              result += "F2";             break;
-                    case Keys::F3:              result += "F3";             break;
-                    case Keys::F4:              result += "F4";             break;
-                    case Keys::F5:              result += "F5";             break;
-                    case Keys::F6:              result += "F6";             break;
-                    case Keys::F7:              result += "F7";             break;
-                    case Keys::F8:              result += "F8";             break;
-                    case Keys::F9:              result += "F9";             break;
-                    case Keys::F10:             result += "F10";            break;
-                    case Keys::F11:             result += "F11";            break;
-                    case Keys::F12:             result += "F12";            break;
-                    case Keys::F13:             result += "F13";            break;
-                    case Keys::F14:             result += "F14";            break;
-                    case Keys::F15:             result += "F15";            break;
-                    case Keys::F16:             result += "F16";            break;
-                    case Keys::F17:             result += "F17";            break;
-                    case Keys::F18:             result += "F18";            break;
-                    case Keys::F19:             result += "F19";            break;
-                    case Keys::F20:             result += "F20";            break;
-                    case Keys::F21:             result += "F21";            break;
-                    case Keys::F22:             result += "F22";            break;
-                    case Keys::F23:             result += "F23";            break;
-                    case Keys::F24:             result += "F24";            break;
-                    case Keys::F25:             result += "F25";            break;
-                    case Keys::KeyPad0:         result += "KP0";            break;
-                    case Keys::KeyPad1:         result += "KP1";            break;
-                    case Keys::KeyPad2:         result += "KP2";            break;
-                    case Keys::KeyPad3:         result += "KP3";            break;
-                    case Keys::KeyPad4:         result += "KP4";            break;
-                    case Keys::KeyPad5:         result += "KP5";            break;
-                    case Keys::KeyPad6:         result += "KP6";            break;
-                    case Keys::KeyPad7:         result += "KP7";            break;
-                    case Keys::KeyPad8:         result += "KP8";            break;
-                    case Keys::KeyPad9:         result += "KP9";            break;
-                    case Keys::KeyPadDecimal:   result += "KPDECIMAL";      break;
-                    case Keys::KeyPadDivide:    result += "KPDIVIDE";       break;
-                    case Keys::KeyPadMultiply:  result += "KPMULTIPLY";     break;
-                    case Keys::KeyPadSubtract:  result += "KPSUBTRACT";     break;
-                    case Keys::KeyPadAdd:       result += "KPADD";          break;
-                    case Keys::KeyPadEnter:     result += "KPENTER";        break;
-                    case Keys::KeyPadEqual:     result += "KPEQUAL";        break;
-                    case Keys::Menu:            result += "MENU";           break;
-                    default:
-                        continue;
-                }
-
-                result += " + ";
-            }
-
-            if (result.ends_with(" + "))
-                result = result.substr(0, result.size() - 3);
-
-            return result;
-        }
-
-        const std::set<Key>& getKeys() const { return m_keys; }
+        bool isLocal() const;
+        std::string toString() const;
+        KeyEquivalent toKeyEquivalent() const;
+        const std::set<Key>& getKeys() const;
+        bool has(Key key) const;
+        bool matches(const Shortcut &other) const;
 
     private:
         friend Shortcut operator+(const Key &lhs, const Key &rhs);
@@ -377,12 +74,7 @@ namespace hex {
         std::set<Key> m_keys;
     };
 
-    inline Shortcut operator+(const Key &lhs, const Key &rhs) {
-        Shortcut result;
-        result.m_keys = { lhs, rhs };
-
-        return result;
-    }
+    Shortcut operator+(const Key &lhs, const Key &rhs);
 
     /**
      * @brief The ShortcutManager handles global and view-specific shortcuts.
@@ -391,10 +83,12 @@ namespace hex {
     class ShortcutManager {
     public:
         using Callback = std::function<void()>;
+        using EnabledCallback = std::function<bool()>;
         struct ShortcutEntry {
             Shortcut shortcut;
-            UnlocalizedString unlocalizedName;
+            std::vector<UnlocalizedString> unlocalizedName;
             Callback callback;
+            EnabledCallback enabledCallback;
         };
 
         /**
@@ -402,8 +96,10 @@ namespace hex {
          * @param shortcut The shortcut to add.
          * @param unlocalizedName The unlocalized name of the shortcut
          * @param callback The callback to call when the shortcut is triggered.
+         * @param enabledCallback Callback that's called to check if this shortcut is enabled
          */
-        static void addGlobalShortcut(const Shortcut &shortcut, const UnlocalizedString &unlocalizedName, const Callback &callback);
+        static void addGlobalShortcut(const Shortcut &shortcut, const std::vector<UnlocalizedString> &unlocalizedName, const Callback &callback, const EnabledCallback &enabledCallback = []{ return true; });
+        static void addGlobalShortcut(const Shortcut &shortcut, const UnlocalizedString &unlocalizedName, const Callback &callback, const EnabledCallback &enabledCallback = []{ return true; });
 
         /**
          * @brief Add a view-specific shortcut. View-specific shortcuts can only be triggered when the specified view is focused.
@@ -411,8 +107,10 @@ namespace hex {
          * @param shortcut The shortcut to add.
          * @param unlocalizedName The unlocalized name of the shortcut
          * @param callback The callback to call when the shortcut is triggered.
+         * @param enabledCallback Callback that's called to check if this shortcut is enabled
          */
-        static void addShortcut(View *view, const Shortcut &shortcut, const UnlocalizedString &unlocalizedName, const Callback &callback);
+        static void addShortcut(View *view, const Shortcut &shortcut, const std::vector<UnlocalizedString> &unlocalizedName, const Callback &callback, const EnabledCallback &enabledCallback = []{ return true; });
+        static void addShortcut(View *view, const Shortcut &shortcut, const UnlocalizedString &unlocalizedName, const Callback &callback, const EnabledCallback &enabledCallback = []{ return true; });
 
 
         /**
@@ -425,7 +123,7 @@ namespace hex {
          * @param focused Whether the current view is focused
          * @param keyCode The key code of the key that was pressed
          */
-        static void process(const std::unique_ptr<View> &currentView, bool ctrl, bool alt, bool shift, bool super, bool focused, u32 keyCode);
+        static void process(const View *currentView, bool ctrl, bool alt, bool shift, bool super, bool focused, u32 keyCode);
 
         /**
          * @brief Process a key event. This should be called from the main loop.
@@ -437,6 +135,14 @@ namespace hex {
          */
         static void processGlobals(bool ctrl, bool alt, bool shift, bool super, u32 keyCode);
 
+        /**
+         * @brief Runs the callback of a shortcut as if it was pressed on the keyboard
+         * @param shortcut Shortcut to run
+         * @param view View the shortcut belongs to or nullptr to run a global shortcut
+         * @return True if a callback was executed, false if not
+         */
+        static bool runShortcut(const Shortcut &shortcut, const View *view = nullptr);
+
         /**
          * @brief Clear all shortcuts
          */
@@ -445,12 +151,17 @@ namespace hex {
         static void resumeShortcuts();
         static void pauseShortcuts();
 
+        static void enableMacOSMode();
+
+        [[nodiscard]] static std::optional<UnlocalizedString> getLastActivatedMenu();
+        static void resetLastActivatedMenu();
+
         [[nodiscard]] static std::optional<Shortcut> getPreviousShortcut();
 
         [[nodiscard]] static std::vector<ShortcutEntry> getGlobalShortcuts();
         [[nodiscard]] static std::vector<ShortcutEntry> getViewShortcuts(const View *view);
 
-        [[nodiscard]] static bool updateShortcut(const Shortcut &oldShortcut, const Shortcut &newShortcut, View *view = nullptr);
+        [[nodiscard]] static bool updateShortcut(const Shortcut &oldShortcut, Shortcut newShortcut, View *view = nullptr);
     };
 
 }

lib/libimhex/include/hex/api/task_manager.hpp

@@ -9,6 +9,7 @@
 #include <memory>
 #include <list>
 #include <condition_variable>
+#include <source_location>
 
 namespace hex {
 
@@ -21,7 +22,7 @@ namespace hex {
     class Task {
     public:
         Task() = default;
-        Task(UnlocalizedString unlocalizedName, u64 maxValue, bool background, std::function<void(Task &)> function);
+        Task(const UnlocalizedString &unlocalizedName, u64 maxValue, bool background, bool blocking, std::function<void(Task &)> function);
 
         Task(const Task&) = delete;
         Task(Task &&other) noexcept;
@@ -31,7 +32,9 @@ namespace hex {
          * @brief Updates the current process value of the task
          * @param value Current value
          */
-        void update(u64 value = 0);
+        void update(u64 value);
+        void update() const;
+        void increment();
 
         /**
          * @brief Sets the maximum value of the task
@@ -54,6 +57,7 @@ namespace hex {
         void setInterruptCallback(std::function<void()> callback);
 
         [[nodiscard]] bool isBackgroundTask() const;
+        [[nodiscard]] bool isBlocking() const;
         [[nodiscard]] bool isFinished() const;
         [[nodiscard]] bool hadException() const;
         [[nodiscard]] bool wasInterrupted() const;
@@ -81,6 +85,7 @@ namespace hex {
 
         std::atomic<bool> m_shouldInterrupt = false;
         std::atomic<bool> m_background = true;
+        std::atomic<bool> m_blocking = false;
 
         std::atomic<bool> m_interrupted = false;
         std::atomic<bool> m_finished = false;
@@ -127,20 +132,55 @@ namespace hex {
 
         /**
          * @brief Creates a new asynchronous task that gets displayed in the Task Manager in the footer
-         * @param name Name of the task
+         * @param unlocalizedName Name of the task
          * @param maxValue Maximum value of the task
          * @param function Function to be executed
          * @return A TaskHolder holding a weak reference to the task
          */
-        static TaskHolder createTask(std::string name, u64 maxValue, std::function<void(Task &)> function);
+        static TaskHolder createTask(const UnlocalizedString &unlocalizedName, u64 maxValue, std::function<void(Task &)> function);
+
+        /**
+        * @brief Creates a new asynchronous task that gets displayed in the Task Manager in the footer
+        * @param unlocalizedName Name of the task
+        * @param maxValue Maximum value of the task
+        * @param function Function to be executed
+        * @return A TaskHolder holding a weak reference to the task
+        */
+        static TaskHolder createTask(const UnlocalizedString &unlocalizedName, u64 maxValue, std::function<void()> function);
 
         /**
          * @brief Creates a new asynchronous task that does not get displayed in the Task Manager
-         * @param name Name of the task
+         * @param unlocalizedName Name of the task
          * @param function Function to be executed
          * @return A TaskHolder holding a weak reference to the task
          */
-        static TaskHolder createBackgroundTask(std::string name, std::function<void(Task &)> function);
+        static TaskHolder createBackgroundTask(const UnlocalizedString &unlocalizedName, std::function<void(Task &)> function);
+
+        /**
+         * @brief Creates a new asynchronous task that does not get displayed in the Task Manager
+         * @param unlocalizedName Name of the task
+         * @param function Function to be executed
+         * @return A TaskHolder holding a weak reference to the task
+         */
+        static TaskHolder createBackgroundTask(const UnlocalizedString &unlocalizedName, std::function<void()> function);
+
+        /**
+         * @brief Creates a new asynchronous task that shows a blocking modal window
+         * @param unlocalizedName Name of the task
+         * @param maxValue Maximum value of the task
+         * @param function Function to be executed
+         * @return A TaskHolder holding a weak reference to the task
+         */
+        static TaskHolder createBlockingTask(const UnlocalizedString &unlocalizedName, u64 maxValue, std::function<void(Task &)> function);
+
+        /**
+        * @brief Creates a new asynchronous task that shows a blocking modal window
+        * @param unlocalizedName Name of the task
+        * @param maxValue Maximum value of the task
+        * @param function Function to be executed
+        * @return A TaskHolder holding a weak reference to the task
+        */
+        static TaskHolder createBlockingTask(const UnlocalizedString &unlocalizedName, u64 maxValue, std::function<void()> function);
 
         /**
          * @brief Creates a new synchronous task that will execute the given function at the start of the next frame
@@ -148,22 +188,47 @@ namespace hex {
          */
         static void doLater(const std::function<void()> &function);
 
+        /**
+         * @brief Creates a new synchronous task that will execute the given function at the start of the next frame
+         * @param function Function to be executed
+         * @param location Source location of the function call. This is used to make sure repeated calls to the function at the same location are only executed once
+         */
+        static void doLaterOnce(const std::function<void()> &function, std::source_location location = std::source_location::current());
+
         /**
          * @brief Creates a callback that will be executed when all tasks are finished
          * @param function Function to be executed
          */
         static void runWhenTasksFinished(const std::function<void()> &function);
 
+        /**
+         * @brief Sets the name of the current thread
+         * @param name Name of the thread
+         */
+        static void setCurrentThreadName(const std::string &name);
+
+        /**
+         * @brief Gets the name of the current thread
+         * @return Name of the thread
+         */
+        static std::string getCurrentThreadName();
+
+        /**
+         * @brief Cleans up finished tasks
+         */
         static void collectGarbage();
 
+        static Task& getCurrentTask();
+
         static size_t getRunningTaskCount();
         static size_t getRunningBackgroundTaskCount();
+        static size_t getRunningBlockingTaskCount();
 
-        static std::list<std::shared_ptr<Task>> &getRunningTasks();
+        static const std::list<std::shared_ptr<Task>>& getRunningTasks();
         static void runDeferredCalls();
 
     private:
-        static TaskHolder createTask(std::string name, u64 maxValue, bool background, std::function<void(Task &)> function);
+        static TaskHolder createTask(const UnlocalizedString &unlocalizedName, u64 maxValue, bool background, bool blocking, std::function<void(Task &)> function);
     };
 
 }

lib/libimhex/include/hex/api/theme_manager.hpp

@@ -56,6 +56,7 @@ namespace hex {
          */
         static void addStyleHandler(const std::string &name, const StyleMap &styleMap);
 
+        static void reapplyCurrentTheme();
 
         static std::vector<std::string> getThemeNames();
         static const std::string &getImageTheme();
@@ -66,6 +67,7 @@ namespace hex {
 
         static void reset();
 
+        static void setAccentColor(const ImColor &color);
 
     public:
         struct ThemeHandler {
@@ -78,8 +80,9 @@ namespace hex {
             StyleMap styleMap;
         };
 
-        static std::map<std::string, ThemeHandler>& getThemeHandlers();
-        static std::map<std::string, StyleHandler>& getStyleHandlers();
+        static const std::map<std::string, ThemeHandler>& getThemeHandlers();
+        static const std::map<std::string, StyleHandler>& getStyleHandlers();
+
 
     private:
         ThemeManager() = default;

lib/libimhex/include/hex/api/tutorial_manager.hpp

@@ -119,6 +119,8 @@ namespace hex {
             decltype(m_steps)::iterator m_currentStep, m_latestStep;
         };
 
+        static void init();
+
         /**
          * @brief Gets a list of all tutorials
          * @return List of all tutorials
@@ -145,6 +147,13 @@ namespace hex {
          */
         static void startTutorial(const UnlocalizedString &unlocalizedName);
 
+        static void startHelpHover();
+        static void addInteractiveHelpText(std::initializer_list<std::variant<Lang, std::string, int>> &&ids, UnlocalizedString unlocalizedString);
+        static void addInteractiveHelpLink(std::initializer_list<std::variant<Lang, std::string, int>> &&ids, std::string link);
+
+        static void setLastItemInteractiveHelpPopup(std::function<void()> callback);
+        static void setLastItemInteractiveHelpLink(std::string link);
+
 
         /**
          * @brief Draws the tutorial

lib/libimhex/include/hex/api/workspace_manager.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <wolv/io/fs.hpp>
+#include <hex/helpers/auto_reset.hpp>
 
 #include <map>
 #include <string>
@@ -12,26 +13,27 @@ namespace hex {
         struct Workspace {
             std::string layout;
             std::fs::path path;
+            bool builtin;
         };
 
         static void createWorkspace(const std::string &name, const std::string &layout = "");
         static void switchWorkspace(const std::string &name);
 
         static void importFromFile(const std::fs::path &path);
-        static bool exportToFile(std::fs::path path = {}, std::string workspaceName = {});
+        static bool exportToFile(std::fs::path path = {}, std::string workspaceName = {}, bool builtin = false);
 
-        static const auto& getWorkspaces() { return s_workspaces; }
-        static const auto& getCurrentWorkspace() { return s_currentWorkspace; }
+        static void removeWorkspace(const std::string &name);
+
+        static const std::map<std::string, Workspace>& getWorkspaces();
+        static const std::map<std::string, Workspace>::iterator& getCurrentWorkspace();
 
         static void reset();
+        static void reload();
 
         static void process();
 
     private:
         WorkspaceManager() = default;
-
-        static std::map<std::string, Workspace> s_workspaces;
-        static decltype(s_workspaces)::iterator s_currentWorkspace, s_previousWorkspace;
     };
 
 }

lib/libimhex/include/hex/data_processor/node.hpp

@@ -3,7 +3,6 @@
 #include <hex.hpp>
 #include <hex/api/localization_manager.hpp>
 
-#include <hex/helpers/intrinsics.hpp>
 #include <hex/data_processor/attribute.hpp>
 
 #include <set>
@@ -12,6 +11,7 @@
 
 #include <nlohmann/json_fwd.hpp>
 #include <imgui.h>
+#include <hex/providers/provider_data.hpp>
 
 namespace hex::prv {
     class Provider;
@@ -42,11 +42,12 @@ namespace hex::dp {
             m_overlay = overlay;
         }
 
-        virtual void drawNode() { }
+        void draw();
         virtual void process() = 0;
+        virtual void reset() { }
 
-        virtual void store(nlohmann::json &j) const { hex::unused(j); }
-        virtual void load(const nlohmann::json &j) { hex::unused(j); }
+        virtual void store(nlohmann::json &j) const { std::ignore = j; }
+        virtual void load(const nlohmann::json &j) { std::ignore = j; }
 
         struct NodeError {
             Node *node;
@@ -80,6 +81,11 @@ namespace hex::dp {
         void setIntegerOnOutput(u32 index, i128 integer);
         void setFloatOnOutput(u32 index, double floatingPoint);
 
+        static void interrupt();
+
+    protected:
+        virtual void drawNode() { }
+
     private:
         int m_id;
         UnlocalizedString m_unlocalizedTitle, m_unlocalizedName;
@@ -90,45 +96,16 @@ namespace hex::dp {
 
         static int s_idCounter;
 
-        Attribute& getAttribute(u32 index) {
-            if (index >= this->getAttributes().size())
-                throw std::runtime_error("Attribute index out of bounds!");
-
-            return this->getAttributes()[index];
-        }
-
-        Attribute *getConnectedInputAttribute(u32 index) {
-            const auto &connectedAttribute = this->getAttribute(index).getConnectedAttributes();
-
-            if (connectedAttribute.empty())
-                return nullptr;
-
-            return connectedAttribute.begin()->second;
-        }
-
-        void markInputProcessed(u32 index) {
-            const auto &[iter, inserted] = m_processedInputs.insert(index);
-            if (!inserted)
-                throwNodeError("Recursion detected!");
-        }
-
-        void unmarkInputProcessed(u32 index) {
-            m_processedInputs.erase(index);
-        }
+        Attribute& getAttribute(u32 index);
+        Attribute *getConnectedInputAttribute(u32 index);
+        void markInputProcessed(u32 index);
+        void unmarkInputProcessed(u32 index);
 
     protected:
-        [[noreturn]] void throwNodeError(const std::string &message) {
-            throw NodeError { this, message };
-        }
+        [[noreturn]] void throwNodeError(const std::string &message);
 
         void setOverlayData(u64 address, const std::vector<u8> &data);
-
-        void setAttributes(std::vector<Attribute> attributes) {
-            m_attributes = std::move(attributes);
-
-            for (auto &attr : m_attributes)
-                attr.setParentNode(this);
-        }
+        void setAttributes(std::vector<Attribute> attributes);
     };
 
 }

lib/libimhex/include/hex/helpers/auto_reset.hpp

@@ -0,0 +1,102 @@
+#pragma once
+
+#include <hex/api/imhex_api.hpp>
+
+namespace hex {
+
+    namespace impl {
+
+        class AutoResetBase {
+        public:
+            virtual ~AutoResetBase() = default;
+            virtual void reset() = 0;
+        };
+
+    }
+
+    template<typename T>
+    class AutoReset : public impl::AutoResetBase {
+    public:
+        using Type = T;
+
+        AutoReset() {
+            ImHexApi::System::impl::addAutoResetObject(this);
+        }
+
+        AutoReset(const T &value) : AutoReset() {
+            m_value = value;
+            m_valid = true;
+        }
+
+        AutoReset(T &&value) noexcept : AutoReset() {
+            m_value = std::move(value);
+            m_valid = true;
+        }
+
+        ~AutoReset() {
+            ImHexApi::System::impl::removeAutoResetObject(this);
+        }
+
+        T* operator->() {
+            return &m_value;
+        }
+
+        const T* operator->() const {
+            return &m_value;
+        }
+
+        T& operator*() {
+            return m_value;
+        }
+
+        const T& operator*() const {
+            return m_value;
+        }
+
+        operator T&() {
+            return m_value;
+        }
+
+        operator const T&() const {
+            return m_value;
+        }
+
+        T& operator=(const T &value) {
+            m_value = value;
+            m_valid = true;
+            return m_value;
+        }
+
+        T& operator=(T &&value) noexcept {
+            m_value = std::move(value);
+            m_valid = true;
+            return m_value;
+        }
+
+        bool isValid() const {
+            return m_valid;
+        }
+
+    private:
+        friend void ImHexApi::System::impl::cleanup();
+
+        void reset() override {
+            if constexpr (requires { m_value.reset(); }) {
+                m_value.reset();
+            } else if constexpr (requires { m_value.clear(); }) {
+                m_value.clear();
+            } else if constexpr (requires(T t) { t = nullptr; }) {
+                m_value = nullptr;
+            } else {
+                m_value = { };
+            }
+
+            m_valid = false;
+        }
+
+    private:
+        bool m_valid = true;
+        T m_value;
+    };
+
+}

lib/libimhex/include/hex/helpers/crypto.hpp

@@ -2,10 +2,15 @@
 
 #include <hex.hpp>
 
+#include <wolv/utils/expected.hpp>
+
 #include <array>
 #include <string>
 #include <vector>
 
+#define CRYPTO_ERROR_INVALID_KEY_LENGTH (-1)
+#define CRYPTO_ERROR_INVALID_MODE (-2)
+
 namespace hex::prv {
     class Provider;
 }
@@ -60,5 +65,5 @@ namespace hex::crypt {
         Key256Bits = 2
     };
 
-    std::vector<u8> aesDecrypt(AESMode mode, KeyLength keyLength, const std::vector<u8> &key, std::array<u8, 8> nonce, std::array<u8, 8> iv, const std::vector<u8> &input);
+    wolv::util::Expected<std::vector<u8>, int> aesDecrypt(AESMode mode, KeyLength keyLength, const std::vector<u8> &key, std::array<u8, 8> nonce, std::array<u8, 8> iv, const std::vector<u8> &input);
 }

lib/libimhex/include/hex/helpers/debugging.hpp

@@ -44,4 +44,7 @@ namespace hex::dbg {
         }
     }
 
+    bool debugModeEnabled();
+    void setDebugModeEnabled(bool enabled);
+
 }

lib/libimhex/include/hex/helpers/default_paths.hpp

@@ -0,0 +1,114 @@
+#pragma once
+
+#include <hex/helpers/fs.hpp>
+
+#include <array>
+#include <vector>
+
+namespace hex::paths {
+
+    namespace impl {
+
+        class DefaultPath {
+        protected:
+            constexpr DefaultPath() = default;
+            virtual ~DefaultPath() = default;
+
+        public:
+            DefaultPath(const DefaultPath&) = delete;
+            DefaultPath(DefaultPath&&) = delete;
+            DefaultPath& operator=(const DefaultPath&) = delete;
+            DefaultPath& operator=(DefaultPath&&) = delete;
+
+            virtual std::vector<std::fs::path> all() const = 0;
+            virtual std::vector<std::fs::path> read() const;
+            virtual std::vector<std::fs::path> write() const;
+        };
+
+        class ConfigPath : public DefaultPath {
+        public:
+            explicit ConfigPath(std::fs::path postfix) : m_postfix(std::move(postfix)) {}
+
+            std::vector<std::fs::path> all() const override;
+
+        private:
+            std::fs::path m_postfix;
+        };
+
+        class DataPath : public DefaultPath {
+        public:
+            explicit DataPath(std::fs::path postfix) : m_postfix(std::move(postfix)) {}
+
+            std::vector<std::fs::path> all() const override;
+            std::vector<std::fs::path> write() const override;
+
+        private:
+            std::fs::path m_postfix;
+        };
+
+        class PluginPath : public DefaultPath {
+        public:
+            explicit PluginPath(std::fs::path postfix) : m_postfix(std::move(postfix)) {}
+
+            std::vector<std::fs::path> all() const override;
+
+        private:
+            std::fs::path m_postfix;
+        };
+
+    }
+
+    std::vector<std::fs::path> getDataPaths(bool includeSystemFolders);
+    std::vector<std::fs::path> getConfigPaths(bool includeSystemFolders);
+
+    const static inline impl::ConfigPath Config("config");
+    const static inline impl::ConfigPath Recent("recent");
+
+    const static inline impl::PluginPath Libraries("lib");
+    const static inline impl::PluginPath Plugins("plugins");
+
+    const static inline impl::DataPath Patterns("patterns");
+    const static inline impl::DataPath PatternsInclude("includes");
+    const static inline impl::DataPath Magic("magic");
+    const static inline impl::DataPath Yara("yara");
+    const static inline impl::DataPath YaraAdvancedAnalysis("yara/advanced_analysis");
+    const static inline impl::DataPath Backups("backups");
+    const static inline impl::DataPath Resources("resources");
+    const static inline impl::DataPath Constants("constants");
+    const static inline impl::DataPath Encodings("encodings");
+    const static inline impl::DataPath Logs("logs");
+    const static inline impl::DataPath Scripts("scripts");
+    const static inline impl::DataPath Inspectors("scripts/inspectors");
+    const static inline impl::DataPath Themes("themes");
+    const static inline impl::DataPath Nodes("scripts/nodes");
+    const static inline impl::DataPath Layouts("layouts");
+    const static inline impl::DataPath Workspaces("workspaces");
+    const static inline impl::DataPath Disassemblers("disassemblers");
+
+    constexpr static inline std::array<const impl::DefaultPath*, 21> All = {
+        &Config,
+        &Recent,
+
+        &Libraries,
+        &Plugins,
+
+        &Patterns,
+        &PatternsInclude,
+        &Magic,
+        &Yara,
+        &YaraAdvancedAnalysis,
+        &Backups,
+        &Resources,
+        &Constants,
+        &Encodings,
+        &Logs,
+        &Scripts,
+        &Inspectors,
+        &Themes,
+        &Nodes,
+        &Layouts,
+        &Workspaces,
+        &Disassemblers
+    };
+
+}

lib/libimhex/include/hex/helpers/encoding_file.hpp

@@ -28,8 +28,9 @@ namespace hex {
         EncodingFile& operator=(EncodingFile &&other) noexcept;
 
         [[nodiscard]] std::pair<std::string_view, size_t> getEncodingFor(std::span<u8> buffer) const;
-        [[nodiscard]] size_t getEncodingLengthFor(std::span<u8> buffer) const;
-        [[nodiscard]] size_t getLongestSequence() const { return m_longestSequence; }
+        [[nodiscard]] u64 getEncodingLengthFor(std::span<u8> buffer) const;
+        [[nodiscard]] u64 getShortestSequence() const { return m_shortestSequence; }
+        [[nodiscard]] u64 getLongestSequence()  const { return m_longestSequence;  }
 
         [[nodiscard]] bool valid() const { return m_valid; }
 
@@ -45,7 +46,9 @@ namespace hex {
         std::string m_name;
         std::string m_tableContent;
         std::unique_ptr<std::map<size_t, std::map<std::vector<u8>, std::string>>> m_mapping;
-        size_t m_longestSequence = 0;
+
+        u64 m_shortestSequence = std::numeric_limits<u64>::max();
+        u64 m_longestSequence  = std::numeric_limits<u64>::min();
     };
 
 }

lib/libimhex/include/hex/helpers/fmt.hpp

@@ -1,7 +1,9 @@
 #pragma once
 
 #include <string_view>
-#include <fmt/format.h>
+#include <fmt/core.h>
+#include <fmt/ranges.h>
+#include <fmt/ostream.h>
 
 namespace hex {
 

lib/libimhex/include/hex/helpers/fs.hpp

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <hex.hpp>
-
 #include <string>
 #include <vector>
 #include <filesystem>
@@ -31,35 +29,7 @@ namespace hex::fs {
     void openFolderExternal(const std::fs::path &dirPath);
     void openFolderWithSelectionExternal(const std::fs::path &selectedFilePath);
 
-    enum class ImHexPath : u32 {
-        Patterns = 0,
-        PatternsInclude,
-        Magic,
-        Plugins,
-        Yara,
-        Config,
-        Backups,
-        Resources,
-        Constants,
-        Encodings,
-        Logs,
-        Recent,
-        Scripts,
-        Inspectors,
-        Themes,
-        Libraries,
-        Nodes,
-        Layouts,
-        Workspaces,
-
-        END
-    };
 
     bool isPathWritable(const std::fs::path &path);
 
-    std::vector<std::fs::path> getDefaultPaths(ImHexPath path, bool listNonExisting = false);
-
-    // Temporarily expose these for the migration function
-    std::vector<std::fs::path> getDataPaths();
-    std::vector<std::fs::path> appendPath(std::vector<std::fs::path> paths, const std::fs::path &folder);
 }

lib/libimhex/include/hex/helpers/http_requests.hpp

@@ -12,10 +12,6 @@
 
 #if defined(OS_WEB)
     #include <emscripten/fetch.h>
-
-    using curl_off_t = long;
-#else
-    #include <curl/curl.h>
 #endif
 
 typedef void CURL;
@@ -121,18 +117,18 @@ namespace hex {
 
         static std::string urlDecode(const std::string &input);
 
-    protected:
-        void setDefaultConfig();
+        void setProgress(float progress) { m_progress = progress; }
+        bool isCanceled() const { return m_canceled; }
+
+        static size_t writeToVector(void *contents, size_t size, size_t nmemb, void *userdata);
+        static size_t writeToFile(void *contents, size_t size, size_t nmemb, void *userdata);
 
         template<typename T>
         Result<T> executeImpl(std::vector<u8> &data);
 
-        static size_t writeToVector(void *contents, size_t size, size_t nmemb, void *userdata);
-        static size_t writeToFile(void *contents, size_t size, size_t nmemb, void *userdata);
-        static int progressCallback(void *contents, curl_off_t dlTotal, curl_off_t dlNow, curl_off_t ulTotal, curl_off_t ulNow);
-
     private:
         static void checkProxyErrors();
+        void setDefaultConfig();
 
     private:
         #if defined(OS_WEB)

lib/libimhex/include/hex/helpers/http_requests_emscripten.hpp

@@ -1,72 +1,79 @@
 #pragma once
 
-#include <future>
+#if defined(OS_WEB)
 
-#include <emscripten/fetch.h>
+    #include <future>
 
-namespace hex {
-    template<typename T>
-    std::future<HttpRequest::Result<T>> HttpRequest::downloadFile(const std::fs::path &path) {
-        return std::async(std::launch::async, [this, path] {
-            std::vector<u8> response;
+    #include <emscripten/fetch.h>
 
-            // Execute the request
-            auto result = this->executeImpl<T>(response);
+    namespace hex {
+        template<typename T>
+        std::future<HttpRequest::Result<T>> HttpRequest::downloadFile(const std::fs::path &path) {
+            return std::async(std::launch::async, [this, path] {
+                std::vector<u8> response;
 
-            // Write the result to the file
-            wolv::io::File file(path, wolv::io::File::Mode::Create);
-            file.writeBuffer(reinterpret_cast<const u8*>(result.getData().data()), result.getData().size());
+                // Execute the request
+                auto result = this->executeImpl<T>(response);
 
-            return result;
-        });
-    }
+                // Write the result to the file
+                wolv::io::File file(path, wolv::io::File::Mode::Create);
+                file.writeBuffer(reinterpret_cast<const u8*>(result.getData().data()), result.getData().size());
 
-    template<typename T>
-    std::future<HttpRequest::Result<T>> HttpRequest::uploadFile(const std::fs::path &path, const std::string &mimeName) {
-        hex::unused(path, mimeName);
-        throw std::logic_error("Not implemented");
-    }
-
-    template<typename T>
-    std::future<HttpRequest::Result<T>> HttpRequest::uploadFile(std::vector<u8> data, const std::string &mimeName, const std::fs::path &fileName) {
-        hex::unused(data, mimeName, fileName);
-        throw std::logic_error("Not implemented");
-    }
-
-    template<typename T>
-    std::future<HttpRequest::Result<T>> HttpRequest::execute() {
-        return std::async(std::launch::async, [this] {
-            std::vector<u8> responseData;
-            
-            return this->executeImpl<T>(responseData);
-        });
-    }
-
-    template<typename T>
-    HttpRequest::Result<T> HttpRequest::executeImpl(std::vector<u8> &data) {
-        strcpy(m_attr.requestMethod, m_method.c_str());
-        m_attr.attributes = EMSCRIPTEN_FETCH_SYNCHRONOUS | EMSCRIPTEN_FETCH_LOAD_TO_MEMORY;
-
-        if (!m_body.empty()) {
-            m_attr.requestData = m_body.c_str();
-            m_attr.requestDataSize = m_body.size();
+                return result;
+            });
         }
 
-        std::vector<const char*> headers;
-        for (auto it = m_headers.begin(); it != m_headers.end(); it++) {
-            headers.push_back(it->first.c_str());
-            headers.push_back(it->second.c_str());
+        template<typename T>
+        std::future<HttpRequest::Result<T>> HttpRequest::uploadFile(const std::fs::path &path, const std::string &mimeName) {
+            std::ignore = path;
+            std::ignore = mimeName;
+            throw std::logic_error("Not implemented");
         }
-        headers.push_back(nullptr);
-        m_attr.requestHeaders = headers.data();
 
-        // Send request
-        emscripten_fetch_t* fetch = emscripten_fetch(&m_attr, m_url.c_str());
+        template<typename T>
+        std::future<HttpRequest::Result<T>> HttpRequest::uploadFile(std::vector<u8> data, const std::string &mimeName, const std::fs::path &fileName) {
+            std::ignore = data;
+            std::ignore = mimeName;
+            std::ignore = fileName;
+            throw std::logic_error("Not implemented");
+        }
 
-        data.resize(fetch->numBytes);
-        std::copy(fetch->data, fetch->data + fetch->numBytes, data.begin());
+        template<typename T>
+        std::future<HttpRequest::Result<T>> HttpRequest::execute() {
+            return std::async(std::launch::async, [this] {
+                std::vector<u8> responseData;
+
+                return this->executeImpl<T>(responseData);
+            });
+        }
+
+        template<typename T>
+        HttpRequest::Result<T> HttpRequest::executeImpl(std::vector<u8> &data) {
+            strcpy(m_attr.requestMethod, m_method.c_str());
+            m_attr.attributes = EMSCRIPTEN_FETCH_SYNCHRONOUS | EMSCRIPTEN_FETCH_LOAD_TO_MEMORY;
+
+            if (!m_body.empty()) {
+                m_attr.requestData = m_body.c_str();
+                m_attr.requestDataSize = m_body.size();
+            }
+
+            std::vector<const char*> headers;
+            for (auto it = m_headers.begin(); it != m_headers.end(); it++) {
+                headers.push_back(it->first.c_str());
+                headers.push_back(it->second.c_str());
+            }
+            headers.push_back(nullptr);
+            m_attr.requestHeaders = headers.data();
+
+            // Send request
+            emscripten_fetch_t* fetch = emscripten_fetch(&m_attr, m_url.c_str());
+
+            data.resize(fetch->numBytes);
+            std::copy(fetch->data, fetch->data + fetch->numBytes, data.begin());
+
+            return Result<T>(fetch->status, { data.begin(), data.end() });
+        }
 
-        return Result<T>(fetch->status, { data.begin(), data.end() });
     }
 
-}
+#endif