Add partial config UI, add more architectures

.gdbinit

@@ -6,12 +6,4 @@ skip -rfu ^__gnu_debug::
 skip -rfu ^ImGui::
 
 # Trigger breakpoint when execution reaches triggerSafeShutdown()
-break triggerSafeShutdown
-break __glibcxx_assert_fail
-
-# Print backtrace after execution jumped to an invalid address
-define fixbt
-    set $pc = *(void **)$rsp
-    set $rsp = $rsp + 8
-    bt
-end
+break triggerSafeShutdown

.gitattributes

@@ -1,4 +1 @@
-lib/external/** linguist-vendored
-
-dist/*.sh eol=lf
-dist/**/*Dockerfile eol=lf
+lib/external/** linguist-vendored

.github/codecov.yml

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

.github/workflows/build_web.yml

@@ -0,0 +1,79 @@
+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: build-web-cache
+    
+    - 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/" | while read line; do
+          echo "::warning title=Invalid file permissions automatically fixed::$line"
+        done
+
+    - 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/nightly_release.yml

@@ -1,117 +0,0 @@
-permissions:
-  contents: write
-
-name: Nightly Release
-
-on:
-  schedule:
-    - cron: '0 0 * * *'
-  workflow_dispatch:
-
-jobs:
-  nightly-release:
-    runs-on: ubuntu-24.04
-    name: Update Nightly Release
-
-    steps:
-      - name: 🧰 Checkout
-        uses: actions/checkout@v4
-        with:
-          path: ImHex
-          fetch-depth: 0
-          fetch-tags: true
-
-      - name: 🌃 Check for new commits
-        run: |
-          if [ -z "$(git log nightly..HEAD --oneline)" ]; then
-            echo "No new commits since last nightly. Exiting."
-            exit 0
-          fi
-
-      - name: 📜 Set version variable
-        run: |
-          project_version=`cat ImHex/VERSION`          
-          echo "IMHEX_VERSION=$project_version" >> $GITHUB_ENV
-
-      - name: ⬇️ Download artifacts from latest workflow
-        uses: dawidd6/action-download-artifact@v6
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          workflow: build.yml
-          branch: ${{ github.event.release.target_commitish }}
-          workflow_conclusion: success
-          skip_unpack: true
-
-      - name: 🗜️ Unzip files when needed
-        run: |
-          set -x
-          for zipfile in ./*.zip
-          do
-              if [ `zipinfo -1 "$zipfile" | wc -l` -eq 1 ];
-              then
-                echo "unzipping $zipfile"
-                unzip "$zipfile"
-                rm "$zipfile"
-              else
-                echo "keeping $zipfile zipped"
-              fi
-          done
-
-      - name: 🟩 Rename artifacts when needed
-        run: |
-          mv "Windows Portable x86_64.zip" imhex-${{ env.IMHEX_VERSION }}-Windows-Portable-x86_64.zip
-          mv "Windows Portable arm64.zip" imhex-${{ env.IMHEX_VERSION }}-Windows-Portable-arm64.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
-          mv ./*_amd64.snap $(echo ./*_amd64.snap | sed 's/_amd64\.snap$/-x86_64.snap/' | sed 's/_/-/1')
-          mv ./*_arm64.snap $(echo ./*_arm64.snap | sed 's/_arm64\.snap$/-arm64.snap/' | sed 's/_/-/1')
-          rm artifact.tar || true
-
-      - name: 📖 Generate Release Notes
-        id: release_notes
-        continue-on-error: true
-        run: |
-          cd ImHex
-          echo "## Nightly ${GITHUB_SHA::7} Changelog" > changelog.md
-          git fetch --tags --recurse-submodules=no
-          git log nightly..HEAD --oneline --no-merges --pretty=format:'* %s' >> changelog.md
-
-      - name: 📦 Update Pre-Release
-        run: |
-          set -e
-          
-          cd ImHex
-          
-          # Move nightly tag to latest commit
-          git tag -f nightly HEAD
-          git push origin nightly --force
-
-          # Auth for GitHub CLI
-          echo "${{ github.token }}" | gh auth login --with-token
-
-          # Delete existing assets
-          for asset in $(gh release view nightly --json assets --jq '.assets[].name'); do
-            gh release delete-asset nightly "$asset" --yes
-          done
-
-          # Update release notes
-          gh release edit nightly --notes-file changelog.md
-
-          # Upload new assets
-          gh release upload nightly ../*.* --clobber
-
-      - name: ⬆️ Publish x86_64 Snap package
-        uses: snapcore/action-publish@v1
-        env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
-        with:
-          snap: imhex-${{ env.IMHEX_VERSION }}-x86_64.snap
-          release: edge
-
-      - name: ⬆️ Publish arm64 Snap package
-        uses: snapcore/action-publish@v1
-        env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
-        with:
-          snap: imhex-${{ env.IMHEX_VERSION }}-arm64.snap
-          release: edge

.github/workflows/release.yml

@@ -10,12 +10,12 @@ on:
 
 jobs:
   release-update-repos:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     name: Release Update Repos
 
     steps:
       - name: 🧰 Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           path: ImHex
 
@@ -52,23 +52,13 @@ 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-24.04
+    runs-on: ubuntu-latest
     name: Release Upload Artifacts
 
     steps:
       - name: 🧰 Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           path: ImHex
           submodules: recursive
@@ -90,9 +80,9 @@ jobs:
         run: tar --exclude-vcs -czvf Full.Sources.tar.gz ImHex
 
       - name: ⬇️ Download artifacts from latest workflow
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v2
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          github_token: ${{secrets.GITHUB_TOKEN}}
           workflow: build.yml
           branch: ${{ github.event.release.target_commitish }}
           workflow_conclusion: success
@@ -116,15 +106,10 @@ jobs:
       - name: 🟩 Rename artifacts when needed
         run: |
           mv "Windows Portable x86_64.zip" imhex-${{ env.IMHEX_VERSION }}-Windows-Portable-x86_64.zip
-          mv "Windows Portable arm64.zip" imhex-${{ env.IMHEX_VERSION }}-Windows-Portable-arm64.zip
           mv "Windows Portable NoGPU x86_64.zip" imhex-${{ env.IMHEX_VERSION }}-Windows-Portable-NoGPU-x86_64.zip
-          mv ./*_amd64.snap $(echo ./*_amd64.snap | sed 's/_amd64\.snap$/-x86_64.snap/' | sed 's/_/-/1')
-          mv ./*_arm64.snap $(echo ./*_arm64.snap | sed 's/_arm64\.snap$/-arm64.snap/' | sed 's/_/-/1')
-          mv "ImHex Web.zip" imhex-${{ env.IMHEX_VERSION }}-Web.zip
-          rm artifact.tar || true
 
       - name: ⬆️ Upload everything to release
-        uses: softprops/action-gh-release@4634c16e79c963813287e889244c50009e7f0981
+        uses: softprops/action-gh-release@v1
         with:
           files: '*'
 
@@ -152,7 +137,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,ecdsa,ed25519
+          ssh_keyscan_types: rsa,dsa,ecdsa,ed25519
 
   release-update-winget:
     name: Release update winget package
@@ -169,6 +154,7 @@ jobs:
           WINGET_GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
         if: "${{ env.WINGET_GITHUB_TOKEN != '' }}"
         run: |
+          set -x
           $tagname = $env:GITHUB_REF.Replace("refs/tags/", "")
           $version = $tagname.Replace("v", "")
           $url = "https://github.com/WerWolv/ImHex/releases/download/${tagname}/imhex-${version}-Windows-x86_64.msi"
@@ -176,31 +162,3 @@ jobs:
           if ($version -notmatch "-") {
             .\wingetcreate.exe submit .\manifests\w\WerWolv\ImHex\${version}\ --token $env:WINGET_GITHUB_TOKEN
           }
-
-  release-update-snapstore:
-    name: Release update snapstore package
-    needs: release-upload-artifacts
-    runs-on: ubuntu-20.04
-    steps:
-      - name: ⬇️ Download artifacts
-        run: |
-          tagname=${GITHUB_REF#refs/tags/}
-          version=${tagname#v}
-          wget https://github.com/WerWolv/ImHex/releases/download/${tagname}/imhex-${version}-x86_64.snap
-          wget https://github.com/WerWolv/ImHex/releases/download/${tagname}/imhex-${version}-arm64.snap
-
-      - name: ⬆️ Publish x86_64 Snap package
-        uses: snapcore/action-publish@v1
-        env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
-        with:
-          snap: imhex-${{ env.IMHEX_VERSION }}-x86_64.snap
-          release: stable
-
-      - name: ⬆️ Publish arm64 Snap package
-        uses: snapcore/action-publish@v1
-        env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
-        with:
-          snap: imhex-${{ env.IMHEX_VERSION }}-arm64.snap
-          release: stable

.github/workflows/stale_issues.yml

@@ -1,31 +0,0 @@
-name: Close inactive issues
-on:
-  schedule:
-    - cron: "30 1 * * 0"
-  workflow_dispatch:
-
-jobs:
-  close-issues:
-    if: false # Disabled for now until I actually have time to take care of all these 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,21 +2,15 @@ name: "Unit Tests"
 
 on:
   push:
-    branches:
-      - 'master'
-      - 'releases/**'
-      - 'tests/**'
-      - 'feature/**'
+    branches: [ master ]
   pull_request:
-    branches:
-      - 'master'
-      - 'releases/**'
+    branches: [ master ]
   workflow_dispatch:
 
 jobs:
   tests:
     name: 🧪 Unit Tests
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     permissions:
       actions: read
       contents: read
@@ -24,17 +18,25 @@ jobs:
 
     steps:
     - name: 🧰 Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         submodules: recursive
 
     - name: 📜 Setup ccache
-      uses: hendrikmuhs/ccache-action@v1
+      uses: hendrikmuhs/ccache-action@v1.2
       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
@@ -45,60 +47,17 @@ jobs:
         set -x
         mkdir -p build
         cd build
-        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                                                                                                 \
+        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                                                                      \
           ..
-        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
+        make -j4 unit_tests
 
     - 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,22 +1,11 @@
-/.vscode/
-/.idea/
-/.kdev4/
-/.vs/
-.venv/
+.vscode/
+.idea/
 
-/cmake-build-*/
-/build*/
-/local/
-/venv/
-/.cache/
-/install/
-/out/
+cmake-build-*/
+build*/
+venv/
 
 *.mgc
-*.kdev4
 imgui.ini
 .DS_Store
-CMakeUserPresets.json
-Brewfile.lock.json
-
-vcpkg.json
+./CMakeUserPresets.json

.gitmodules

@@ -8,7 +8,7 @@
 	ignore = dirty
 [submodule "lib/third_party/xdgpp"]
 	path = lib/third_party/xdgpp
-	url = https://github.com/WerWolv/xdgpp
+	url = https://git.sr.ht/~danyspin97/xdgpp
 	ignore = dirty
 [submodule "lib/third_party/fmt"]
 	path = lib/third_party/fmt
@@ -22,14 +22,6 @@
 	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
@@ -41,12 +33,3 @@
 	path = lib/external/libwolv
 	url = https://github.com/WerWolv/libwolv
 
-[submodule "lib/third_party/HashLibPlus"]
-	path = lib/third_party/HashLibPlus
-    url = https://github.com/WerWolv/HashLibPlus
-[submodule "lib/external/disassembler"]
-	path = lib/external/disassembler
-	url = https://github.com/WerWolv/Disassembler
-[submodule "lib/third_party/md4c"]
-	path = lib/third_party/md4c
-	url = https://github.com/mity/md4c

CMakeLists.txt

@@ -1,100 +1,69 @@
-cmake_minimum_required(VERSION 3.25)
+cmake_minimum_required(VERSION 3.20)
 
 # Options
-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_BUILD_HARDENING            "Enable hardening flags for build"                                                      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"                                                            ON )
-option(IMHEX_ENABLE_PLUGIN_TESTS        "Enable building plugin tests"                                                          ON )
-option(IMHEX_ENABLE_IMGUI_TEST_ENGINE   "Enable the ImGui Test Engine"                                                          OFF)
-option(IMHEX_ENABLE_PRECOMPILED_HEADERS "Enable precompiled headers"                                                            OFF)
-option(IMHEX_COMPRESS_DEBUG_INFO        "Compress debug information"                                                            ON )
-option(IMHEX_ENABLE_CXX_MODULES         "Enable C++20 Module compilation. Testing only!"                                        OFF)
-option(IMHEX_ENABLE_CPPCHECK            "Enable cppcheck static analysis"                                                       OFF)
-option(IMHEX_BUNDLE_PLUGIN_SDK          "Enable bundling of Plugin SDK into install package"                                    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")
+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)
 
 # Basic compiler and cmake configurations
 set(CMAKE_CXX_STANDARD 23)
-set(CMAKE_CXX_SCAN_FOR_MODULES ${IMHEX_ENABLE_CXX_MODULES})
 set(CMAKE_INCLUDE_DIRECTORIES_BEFORE ON)
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(IMHEX_BASE_FOLDER ${CMAKE_CURRENT_SOURCE_DIR})
+set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules")
 include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
 
 # Setup project
-loadVersion(IMHEX_VERSION IMHEX_VERSION_PLAIN)
+loadVersion(IMHEX_VERSION)
 setVariableInParent(IMHEX_VERSION ${IMHEX_VERSION})
-
 configureCMake()
 project(imhex
-        LANGUAGES       C CXX
-        VERSION         ${IMHEX_VERSION_PLAIN}
-        DESCRIPTION     "The ImHex Hex Editor"
-        HOMEPAGE_URL    "https://imhex.werwolv.net"
+        LANGUAGES C CXX VERSION ${IMHEX_VERSION}
+        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()
 detectBadClone()
 verifyCompiler()
 
-detectBundledPlugins()
+# List plugin names here. Project name must match folder name
+set(PLUGINS
+    builtin
+    windows
+    script_loader
+)
 
 # Add various defines
 detectOS()
+detectArch()
 addDefines()
-
-# Configure packaging and install targets
 configurePackingResources()
 setUninstallTarget()
 addBundledLibraries()
 
+# Add ImHex sources
+add_custom_target(imhex_all ALL)
+
 add_subdirectory(lib/libimhex)
 add_subdirectory(main)
-addPluginDirectories()
-add_subdirectory(lib/trace)
 
 # Add unit tests
-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 ()
+enable_testing()
+add_subdirectory(tests EXCLUDE_FROM_ALL)
 
-# Configure more resources that will be added to the install package
-if (IMHEX_BUNDLE_PLUGIN_SDK)
-    generateSDKDirectory()
-endif()
-
-# Handle package generation
+# Configure packaging
 createPackage()
-
-# Accommodate IDEs with FOLDER support
-tweakTargetsForIDESupport()
+generatePDBs()

CMakePresets.json

@@ -28,46 +28,7 @@
       "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",
-        "VCPKG_MANIFEST_DIR": "${sourceDir}/dist"
-      }
-    },
-  {
-      "name": "vs2022-x86",
-      "displayName": "Visual Studio 2022 x86",
-      "generator": "Visual Studio 17 2022",
-      "binaryDir": "${sourceDir}/build/${presetName}",
-      "cacheVariables": {
-          "CMAKE_BUILD_TYPE": "Debug",
-          "CMAKE_GENERATOR_PLATFORM": "Win32",
-          "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
-          "VCPKG_MANIFEST_DIR": "${sourceDir}/dist"
-      }
-  }
+    }
   ],
   "buildPresets": [
     {

CONTRIBUTING.md

@@ -10,7 +10,9 @@ This document is a guide for developers who want to contribute to ImHex in any w
 
 If you'd like to add new features, the best way to start is by joining our Discord and telling us about your idea. We can then discuss the best way to implement it and how it should be integrated into ImHex or if it should be done in a separate plugin.
 
-There are standalone plugin templates that use ImHex as a submodule. You can find them located in the README's [Plugin Development](README.md#plugin-development) section.
+There are standalone plugin templates that use ImHex as a submodule. You can find them here:
+- https://github.com/WerWolv/ImHex-Cpp-Plugin-Template
+- https://github.com/WerWolv/ImHex-Rust-Plugin-Template
 
 ### Adding a new language
 
@@ -30,18 +32,18 @@ ImHex is written in C++ and usually uses the latest compiler and standard librar
 ### Structure
 
 - `main`: Contains the main application code
-    - Important to understand here is that the main ImHex application is basically just an empty shell.
+    - Important to understand here is that the main ImHex application is basically just an empty shell. 
     - All it does is create a Window and a OpenGL context using GLFW, load all available plugins, properly configure ImGui and render it to the screen.
     - Everything else is done inside of plugins. ImHex comes with a few plugins by default, most notably the `builtin` plugin which contains the majority of the application code.
     - In most cases, this code doesn't need to be modified. Most features should be self-contained inside a plugin.
 - `lib`
     - `libimhex`: Contains all helper utilities as well as various APIs for plugins to interact with ImHex.
         - The library's main purpose is for Dependency Inversion. The ImHex main application as well as libimhex do not know about the existence of plugins at build time. Plugins and the main application instead link against libimhex and use it as a common API to interact with each other.
-        - Since libimhex itself doesn't know about the existence of plugins, it cannot depend on any of them. This includes localizations and things that get registered by plugins after launch.
+        - Since libimhex is a doesn't know about the existence of plugins, it cannot depend on any of them. This includes localizations and things that get registered by plugins after launch.
         - Even if the builtin plugin is technically always available, it is still a plugin and should be treated that way.
         - All important APIs can be found in the `hex/api` include directory and are documented in the respective header file.
     - `external`: All libraries that need custom patches or aren't typically available in package managers go into here.
-        - If you'd like to add new features to the Pattern language, please make a PR to https://github.com/WerWolv/PatternLanguage instead. ImHex usually depends on the latest commit of the master branch of this repo.
+        - If you'd like to add new features to the Pattern language, please make a PR to https://github.com/WerWolv/PatternLanguage instead. ImHex usually depends on the latest commit of the master branch of this repo. 
 - `plugins`
     - `builtin`: The builtin plugin. Contains the majority of the application code.
         - It's the heart of ImHex's functionality. It contains most of the default views, providers, etc. so if you want to add new functionality to ImHex, this is the place to start.

INSTALL.md

@@ -32,13 +32,6 @@ To install the Flatpak, make sure you have the Flathub repository added to your
 
 ```bash
 flatpak install flathub net.werwolv.ImHex
-# or install the file directly
-flatpak install ./imhex-*.flatpak
-```
-
-#### Snap
-```bash
-snap install ./imhex-*.snap
 ```
 
 #### Ubuntu DEB Package

PRIVACY.md

@@ -1,8 +0,0 @@
-# Privacy Policy
-
-ImHex collects **anonymous** user statistics based on the user's preferences which are set on first launch and can be opted in or out at any moment through the settings interface.
-These statistics contain basic system information such as: ImHex Version, System Architecture, OS, OS Version or Linux Distro version of the GPU in use. This information is linked to a randomly generated ID which cannot be used to identify a specific user.
-
-Additionally, we allow uploading of anonymized crash log files in case of an error. These are never uploaded automatically but only after explicit consent by the user. This decision is not saved so logs can be uploaded on a per-error basis.
-
-Information collected may be analyzed by members of our development team and will never be shared with third parties outside of the team. We may occasionally share general usage statistics publically in a summarized manner (For example a graph stating 70% of users are using a specific OS). We will never share information about individual users, even if they are anonymous.

README.md

@@ -1,30 +1,42 @@
 <a href="https://imhex.werwolv.net">
   <h1 align="center">
     <picture>
-      <img height="300px" style="margin: 0; padding: 0" src="./resources/dist/common/logo/ImHexLogoSVGBG.svg">
+      <source media="(prefers-color-scheme: dark)" srcset="./resources/projects/logo_text_light.svg">
+      <img height="100px" src="./resources/projects/logo_text_dark.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 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>
+  <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>
 </p>
 
 <p align="center">
-  <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>
+  <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>
 </p>
 
 ## Supporting
@@ -32,273 +44,93 @@
 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://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://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>
+![Hex editor, patterns and data information](https://user-images.githubusercontent.com/10835354/139717326-8044769d-527b-4d88-8adf-2d4ecafdca1f.png)
+![Bookmarks, disassembler and data processor](https://user-images.githubusercontent.com/10835354/139717323-1f8c9d52-f7eb-4f43-9f11-097ac728ed6c.png)
 
 ## Features
 
-<details>
-  <summary><strong>Featureful hex view</strong></summary>
-
+- Featureful hex view
   - Byte patching
   - Patch management
-  - Infinite Undo/Redo
-  - "Copy bytes as..."
+  - Copy bytes as feature
     - Bytes
     - Hex string
     - C, C++, C#, Rust, Python, Java & JavaScript array
     - ASCII-Art hex view
     - HTML self-contained div
-  - Simple string and hex search
-  - Goto from start, end and current cursor position
+  - String and hex search
   - Colorful highlighting
-    - Configurable foreground highlighting rules
-    - Background highlighting using patterns, find results and bookmarks
-  - Displaying data as a list of many different types
-    - Hexadecimal integers (8, 16, 32, 64 bit)
-    - Signed and unsigned decimal integers (8, 16, 32, 64 bit)
-    - Floats (16, 32, 64 bit)
-    - RGBA8 Colors
-    - HexII
-    - Binary
-  - Decoding data as ASCII and custom encodings
-    - Built-in support for UTF-8, UTF-16, ShiftJIS, most Windows encodings and many more
-  - Paged data view
-</details>
-<details>
-  <summary><strong>Custom C++-like pattern language for parsing highlighting a file's content</strong></summary>
-  
-  - Automatic loading based on MIME types and magic values
-  - Arrays, pointers, structs, unions, enums, bitfields, namespaces, little and big endian support, conditionals and much more!
+  - Goto from start, end and current cursor position
+- Custom C++-like pattern language for parsing highlighting a file's content
+  - Automatic loading based on MIME type
+  - arrays, pointers, structs, unions, enums, bitfields, namespaces, little and big endian support, conditionals and much more!
   - Useful error messages, syntax highlighting and error marking
-  - Support for visualizing many different types of data
-    - Images
-    - Audio
-    - 3D Models
-    - Coordinates
-    - Time stamps
-</details>
-<details>
-  <summary><strong>Theming support</strong></summary>
-
-  - Doesn't burn out your retinas when used in late-night sessions
-    - Dark mode by default, but a light mode is available as well
-  - Customizable colors and styles for all UI elements through shareable theme files
-  - Support for custom fonts
-</details>
-<details>
-  <summary><strong>Importing and Exporting data</strong></summary>
-  
+- Doesn't burn out your retinas when used in late-night sessions
+  - Dark mode by default, but a light mode is available as well
+- Data importing
   - Base64 files
   - IPS and IPS32 patches
-  - Markdown reports
-  - Binary arrays for various programming languages
-</details>
-<details>
-  <summary><strong>Data Inspector</strong></summary>
-
-  - 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
-    - ASCII, Wide and UTF-8 characters and strings
-    - time32_t, time64_t, DOS date and time
-    - GUIDs
-    - RGBA8 and RGB65 Colors
-  - Copying and modifying bytes through the inspector
-  - Adding new data types through the pattern language
-  - Support for hiding rows that aren't used
-</details>
-<details>
-  <summary><strong>Node-based data pre-processor</strong></summary>
-
-  - Modify, decrypt and decode data before it's being displayed in the hex editor
-  - Modify data without touching the underlying source
-  - Support for adding custom nodes
-</details>
-<details>
-  <summary><strong>Loading data from many different data sources</strong></summary>
-
-  - Local Files
-    - Support for huge files with fast and efficient loading
-  - Raw Disks
-    - Loading data from raw disks and partitions
-  - GDB Server
-    - Access the RAM of a running process or embedded devices through GDB
-  - Intel Hex and Motorola SREC data
-  - Base64 encoded data
-  - UDP Packets
-    - Support for displaying raw data received over UDP
-  - Process Memory
-    - Inspect the entire address space of a running process
-  - Remote Files over SSH with SFTP
-    - Support for loading files from remote servers using SSH and SFTP
-</details>
-<details>
-  <summary><strong>Data searching</strong></summary>
-  
-  - Support for searching the entire file or only a selection
-  - String extraction
-    - Option to specify minimum length and character set (lower case, upper case, digits, symbols)
-    - Option to specify encoding (ASCII, UTF-8, UTF-16 big and little endian)
-  - Sequence search
-    - Search for a sequence of bytes or characters
-    - Option to ignore character case
-  - Regex search
-    - Search for strings using regular expressions
-  - Binary Pattern
-    - Search for sequences of bytes with optional wildcards
-  - Numeric Value search
-    - Search for signed/unsigned integers and floats
-    - Search for ranges of values
-    - Option to specify size and endianness
-    - Option to ignore unaligned values
-</details>
-<details>
-  <summary><strong>Data hashing support</strong></summary>
-
-  - Many different algorithms available
-    - CRC8, CRC16 and CRC32 with custom initial values and polynomials
-      - Many default polynomials available
-    - MD5
-    - SHA-1, SHA-224, SHA-256, SHA-384, SHA-512
-    - Adler32
-    - AP
-    - BKDR
-    - Bernstein, Bernstein1
-    - DEK, DJB, ELF, FNV1, FNV1a, JS, PJW, RS, SDBM
-    - OneAtTime, Rotating, ShiftAndXor, SuperFast
-    - Murmur2_32, MurmurHash3_x86_32, MurmurHash3_x86_128, MurmurHash3_x64_128
-    - SipHash64, SipHash128
-    - XXHash32, XXHash64
-    - Tiger, Tiger2
-    - Blake2B, Blake2S
-  - Hashing of specific regions of the loaded data
-  - Hashing of arbitrary strings
-</details>
-<details>
-  <summary><strong>Diffing support</strong></summary>
-
-  - Compare data of different data sources
-  - Difference highlighting
-  - Table view of differences
-</details>
-<details>
-  <summary><strong>Integrated disassembler</strong></summary>
-  
-  - Support for all architectures supported by Capstone
-    - ARM32 (ARM, Thumb, Cortex-M, AArch32)
-    - ARM64
-    - MIPS (MIPS32, MIPS64, MIPS32R6, Micro)
-    - x86 (16-bit, 32-bit, 64-bit)
-    - PowerPC (32-bit, 64-bit)
-    - SPARC
-    - IBM SystemZ
-    - xCORE
-    - M68K
-    - TMS320C64X
-    - M680X
-    - Ethereum
-    - RISC-V
-    - WebAssembly
-    - MOS65XX
-    - Berkeley Packet Filter
-  - Support for writing custom disassemblers for your own architectures
-</details>
-<details>
-  <summary><strong>Bookmarks</strong></summary>
-
-  - Support for bookmarks with custom names and colors
-  - Highlighting of bookmarked region in the hex editor
-  - Jump to bookmarks
-  - Open content of bookmark in a new tab
-  - Add comments to bookmarks
-</details>
-<details>
-  <summary><strong>Featureful data analyzer and visualizer</strong></summary>
-
+- Data exporting
+  - IPS and IPS32 patches
+- Data inspector allowing interpretation of data as many different types (little and big endian)
+- Huge file support with fast and efficient loading
+- String search
+  - Copying of strings
+  - Copying of demangled strings
+- File hashing support
+  - CRC16 and CRC32 with custom initial values and polynomials
+  - MD4, MD5
+  - SHA-1, SHA-224, SHA-256, SHA-384, SHA-512
+- Disassembler supporting many architectures (frontend for Capstone)
+  - ARM32 (ARM, Thumb, Cortex-M, AArch32)
+  - ARM64
+  - MIPS (MIPS32, MIPS64, MIPS32R6, Micro)
+  - x86 (16-bit, 32-bit, 64-bit)
+  - PowerPC (32-bit, 64-bit)
+  - SPARC
+  - IBM SystemZ
+  - xCORE
+  - M68K
+  - TMS320C64X
+  - M680X
+  - Ethereum
+  - RISC-V
+  - WebAssembly
+  - MOS65XX
+  - Berkeley Packet Filter
+- Bookmarks
+  - Region highlighting
+  - Comments
+- Data Analyzer
   - File magic-based file parser and MIME type database
-  - Byte type distribution graph
+  - Byte distribution graph
   - Entropy graph
   - Highest and average entropy
   - Encrypted / Compressed file detection
-  - Digram and Layered distribution graphs
-</details>
-<details>
-  <summary><strong>YARA Rule support</strong></summary>
-
-  - Scan a file for vulnerabilities with official yara rules
-  - Highlight matches in the hex editor
-  - Jump to matches
-  - Apply multiple rules at once
-</details>
-<details>
-  <summary><strong>Helpful tools</strong></summary>
-
-  - Itanium, MSVC, Rust and D-Lang demangler based on LLVM
+- Built-in Content Store
+  - Download all files found in the database directly from within ImHex
+- Yara Rules support
+  - Quickly scan a file for vulnerabilities with official yara rules
+- Helpful tools
+  - Itanium and MSVC demangler
   - ASCII table
   - Regex replacer
   - Mathematical expression evaluator (Calculator)
-  - Graphing calculator
-  - Hexadecimal Color picker with support for many different formats
+  - Hexadecimal Color picker
   - Base converter
-  - Byte swapper
   - UNIX Permissions calculator
   - Wikipedia term definition finder
   - File utilities
     - File splitter
     - File combiner
     - File shredder
-  - IEEE754 Float visualizer
-  - Division by invariant multiplication calculator
-  - TCP Client/Server
-  - Euclidean algorithm calculator
-  - HTTP Requests
-</details>
-<details>
-  <summary><strong>Built-in Content updater</strong></summary>
-
-  - Download all files found in the database directly from within ImHex
-    - Pattern files for decoding various file formats
-    - Libraries for the pattern language
-    - Magic files for file type detection
-    - Custom data processor nodes
-    - Custom encodings
-    - Custom themes
-    - Yara rules
-</details>
-<details>
-  <summary><strong>Modern Interface</strong></summary>
-
-  - Support for multiple workspaces
-  - Support for custom layouts
-  - Detachable windows
-</details>
-<details>
-  <summary><strong>Easy to get started</strong></summary>
-
-  - Support for many different languages
-  - Simplified mode for beginners
-  - Extensive documentation
-  - Many example files available on [the Database](https://github.com/WerWolv/ImHex-Patterns)
-  - Achievements guiding you through the features of ImHex
-  - Interactive tutorials
-</details>
 
 ## Pattern Language
 
@@ -316,34 +148,22 @@ For format patterns, libraries, magic and constant files, check out the [ImHex-P
 
 ## Requirements
 
-To use ImHex, the following minimal system requirements need to be met.
-
-> [!IMPORTANT]
-> 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.
-> ImHex will usually run fine with integrated GPUs as well but certain Intel HD GPU drivers on Windows are known to cause graphical artifacts.
+To use ImHex, the following minimal system requirements need to be met:
 
 - **OS**: 
   - **Windows**: Windows 7 or higher (Windows 10/11 recommended)
-  - **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 due to GitHub not having any macOS 12 or lower CI runners available.
-    - 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, Flatpak and Snap releases.
-    - Ubuntu and Debian
-    - Fedora
-    - RHEL/AlmaLinux
+  - **macOS**: macOS 11 (Big Sur) or higher, 
+  - **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
     - Arch Linux
-    - Basically any other distro will work as well when compiling ImHex from sources.
-  - **FreeBSD**: Tested on FreeBSD 14.3
-    - Other versions will most likely work too but are untested
-- **CPU**: Officially supported are x86, AMD64 and ARM64, though any Little Endian CPU should work.
+- **CPU**: x86_64 (64 Bit)
 - **GPU**: OpenGL 3.0 or higher 
-  - Integrated Intel HD iGPUs are supported, however certain drivers are known to cause various graphical artifacts, especially on Windows. Use at your own risk.
+  - Intel HD drivers are really buggy and often cause graphic artifacts
   - In case you don't have a GPU available, there are software rendered releases available for Windows and macOS
-- **RAM**: ~50MiB, more is required for more complex analysis
-- **Storage**: ~100MiB
+- **RAM**: 256MB, more may be required for more complicated analysis
+- **Storage**: 100MB
 
 ## Installing
 
@@ -352,14 +172,11 @@ 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. 
-Windows and Linux releases are being built using latest available GCC.
-MacOS releases are being built using latest available LLVM Clang.
+On macOS, Clang is also required to compile some ObjC code.
+All releases are being built using latest available GCC.
 
-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.
-> All dependencies that aren't bundled, can be installed using the dependency installer scripts found in the `/dist` folder.
+Many dependencies are bundled into the repository using submodules so make sure to clone it using the `--recurse-submodules` option.
+All dependencies that aren't bundled, can be installed using the dependency installer scripts found in the `/dist` folder.
 
 For more information, check out the [Compiling](/dist/compiling) guide.
 
@@ -368,45 +185,31 @@ See [Contributing](/CONTRIBUTING.md)
 
 ## Plugin development
 
-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)
+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)
 
 
 ## Credits
 
 ### Contributors
 
-- [AxCut](https://github.com/paxcut) for a gigantic amount of contributions to the Pattern Text Editor and tons of other parts of ImHex
-- [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
+- [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 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 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 vitaut for their [libfmt](https://github.com/fmtlib/fmt) library which makes formatting and logging so much better
 - Thanks to rxi for [microtar](https://github.com/rxi/microtar) used for extracting downloaded store assets 
-- 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 btzy for [nativefiledialog-extended](https://github.com/btzy/nativefiledialog-extended)
+- Thanks to danyspin97 for [xdgpp](https://sr.ht/~danyspin97/xdgpp)
 - 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.38.0.WIP
+1.31.0

cmake/ide_helpers.cmake

@@ -1,149 +0,0 @@
-
-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

@@ -1,8 +0,0 @@
-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,14 +11,6 @@ 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)
@@ -57,16 +49,13 @@ endif()
 set(CoreClrEmbed_ROOT_PATH "${CORECLR_RUNTIME_ROOT_PATH}")
 
 
-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()
+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()
 endif()
 
 set(CORECLR_HOST_BASE_PATH "${CORECLR_RUNTIME_ROOT_PATH}/packs/Microsoft.NETCore.App.Host.${CORECLR_ARCH}/${CORECLR_RUNTIME_VERSION_FULL}")
@@ -89,5 +78,4 @@ 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

@@ -1,139 +0,0 @@
-#.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

@@ -1,60 +0,0 @@
-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

@@ -1,18 +0,0 @@
-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

@@ -1,4 +0,0 @@
-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

@@ -1,45 +0,0 @@
-# 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/Findlibssh2.cmake

@@ -1,15 +0,0 @@
-find_path(LIBSSH2_INCLUDE_DIR libssh2.h)
-
-find_library(LIBSSH2_LIBRARY NAMES ssh2 libssh2)
-
-if(LIBSSH2_INCLUDE_DIR)
-    file(STRINGS "${LIBSSH2_INCLUDE_DIR}/libssh2.h" libssh2_version_str REGEX "^#define[\t ]+LIBSSH2_VERSION[\t ]+\"(.*)\"")
-    string(REGEX REPLACE "^.*\"([^\"]+)\"" "\\1"  LIBSSH2_VERSION "${libssh2_version_str}")
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LibSSH2
-        REQUIRED_VARS LIBSSH2_LIBRARY LIBSSH2_INCLUDE_DIR
-        VERSION_VAR LIBSSH2_VERSION)
-
-mark_as_advanced(LIBSSH2_INCLUDE_DIR LIBSSH2_LIBRARY)

cmake/modules/FindmbedTLS.cmake

@@ -40,12 +40,7 @@ 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})
-
-    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()
+    SET(MBEDTLS_LIBRARIES "-L${MBEDTLS_LIBRARY_DIR} -l${MBEDTLS_LIBRARY_FILE} -l${MBEDX509_LIBRARY_FILE} -l${MBEDCRYPTO_LIBRARY_FILE}")
 
     IF(NOT MBEDTLS_FIND_QUIETLY)
         MESSAGE(STATUS "Found mbedTLS:")
@@ -60,9 +55,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(
@@ -72,4 +67,4 @@ MARK_AS_ADVANCED(
         MBEDTLS_LIBRARY
         MBEDX509_LIBRARY
         MBEDCRYPTO_LIBRARY
-)
+)

cmake/modules/ImHexPlugin.cmake

@@ -1,16 +1,10 @@
 macro(add_imhex_plugin)
-    setSDKPaths()
     # Parse arguments
-    set(options LIBRARY_PLUGIN)
-    set(oneValueArgs NAME IMHEX_VERSION)
-    set(multiValueArgs SOURCES INCLUDES LIBRARIES FEATURES)
+    set(options "")
+    set(oneValueArgs NAME)
+    set(multiValueArgs SOURCES INCLUDES LIBRARIES)
     cmake_parse_arguments(IMHEX_PLUGIN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-    if (IMHEX_PLUGIN_IMHEX_VERSION)
-        message(STATUS "Compiling plugin ${IMHEX_PLUGIN_NAME} for ImHex Version ${IMHEX_PLUGIN_IMHEX_VERSION}")
-        set(IMHEX_VERSION_STRING "${IMHEX_PLUGIN_IMHEX_VERSION}")
-    endif()
-
     if (IMHEX_STATIC_LINK_PLUGINS)
         set(IMHEX_PLUGIN_LIBRARY_TYPE STATIC)
 
@@ -18,162 +12,52 @@ macro(add_imhex_plugin)
 
         configure_file(${CMAKE_SOURCE_DIR}/dist/web/plugin-bundle.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/plugin-bundle.cpp @ONLY)
         target_sources(main PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/plugin-bundle.cpp)
-        set(IMHEX_PLUGIN_SUFFIX ".hexplug")
     else()
-        if (IMHEX_PLUGIN_LIBRARY_PLUGIN)
-            set(IMHEX_PLUGIN_LIBRARY_TYPE SHARED)
-            set(IMHEX_PLUGIN_SUFFIX ".hexpluglib")
-        else()
-            set(IMHEX_PLUGIN_LIBRARY_TYPE MODULE)
-            set(IMHEX_PLUGIN_SUFFIX ".hexplug")
-        endif()
-    endif()
-
-    if (IMHEX_PLUGIN_LIBRARY_PLUGIN)
-        install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION "${SDK_PATH}/lib/plugins/${IMHEX_PLUGIN_NAME}")
+        set(IMHEX_PLUGIN_LIBRARY_TYPE MODULE)
     endif()
 
     # Define new project for plugin
     project(${IMHEX_PLUGIN_NAME})
 
-    if (IMHEX_PLUGIN_IMPORTED)
-        add_library(${IMHEX_PLUGIN_NAME} SHARED IMPORTED GLOBAL)
+    # Create a new shared library for the plugin source code
+    add_library(${IMHEX_PLUGIN_NAME} ${IMHEX_PLUGIN_LIBRARY_TYPE} ${IMHEX_PLUGIN_SOURCES})
 
-        if (WIN32)
-            set_target_properties(${IMHEX_PLUGIN_NAME} PROPERTIES
-                    IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/${IMHEX_PLUGIN_NAME}${IMHEX_PLUGIN_SUFFIX}"
-                    IMPORTED_IMPLIB "${CMAKE_CURRENT_SOURCE_DIR}/../lib${IMHEX_PLUGIN_NAME}.dll.a"
-                    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include/include")
-        elseif (APPLE)
-            set_target_properties(${IMHEX_PLUGIN_NAME} PROPERTIES
-                    IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/../../../../MacOS/plugins/${IMHEX_PLUGIN_NAME}${IMHEX_PLUGIN_SUFFIX}"
-                    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include/include")
-        else()
-            set_target_properties(${IMHEX_PLUGIN_NAME} PROPERTIES
-                    IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/${IMHEX_PLUGIN_NAME}${IMHEX_PLUGIN_SUFFIX}"
-                    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include/include")
-        endif()
-    else()
-        # Create a new shared library for the plugin source code
-        add_library(${IMHEX_PLUGIN_NAME} ${IMHEX_PLUGIN_LIBRARY_TYPE} ${IMHEX_PLUGIN_SOURCES})
+    # Add include directories and link libraries
+    target_include_directories(${IMHEX_PLUGIN_NAME} PUBLIC ${IMHEX_PLUGIN_INCLUDES})
+    target_link_libraries(${IMHEX_PLUGIN_NAME} PRIVATE libimhex ${FMT_LIBRARIES} ${IMHEX_PLUGIN_LIBRARIES})
 
-        # Add include directories and link libraries
-        target_include_directories(${IMHEX_PLUGIN_NAME} PUBLIC ${IMHEX_PLUGIN_INCLUDES})
-        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)
+    # Add IMHEX_PROJECT_NAME and IMHEX_VERSION define
+    target_compile_definitions(${IMHEX_PLUGIN_NAME} PRIVATE IMHEX_PROJECT_NAME="${IMHEX_PLUGIN_NAME}")
+    target_compile_definitions(${IMHEX_PLUGIN_NAME} PRIVATE IMHEX_VERSION="${IMHEX_VERSION_STRING}")
+    target_compile_definitions(${IMHEX_PLUGIN_NAME} PRIVATE IMHEX_PLUGIN_NAME=${IMHEX_PLUGIN_NAME})
 
-        precompileHeaders(${IMHEX_PLUGIN_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/include")
+    # Enable required compiler flags
+    set_target_properties(${IMHEX_PLUGIN_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+    enableUnityBuild(${IMHEX_PLUGIN_NAME})
+    setupCompilerFlags(${IMHEX_PLUGIN_NAME})
 
-        # Add IMHEX_PROJECT_NAME and IMHEX_VERSION define
-        target_compile_definitions(${IMHEX_PLUGIN_NAME} PRIVATE IMHEX_PROJECT_NAME="${IMHEX_PLUGIN_NAME}")
-        target_compile_definitions(${IMHEX_PLUGIN_NAME} PRIVATE IMHEX_VERSION="${IMHEX_VERSION_STRING}")
-        target_compile_definitions(${IMHEX_PLUGIN_NAME} PRIVATE IMHEX_PLUGIN_NAME=${IMHEX_PLUGIN_NAME})
+    # Configure build properties
+    set_target_properties(${IMHEX_PLUGIN_NAME}
+            PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins
+            CXX_STANDARD 23
+            PREFIX ""
+            SUFFIX ".hexplug"
+    )
 
-        # Enable required compiler flags
-        enableUnityBuild(${IMHEX_PLUGIN_NAME})
-        setupCompilerFlags(${IMHEX_PLUGIN_NAME})
-        addCppCheck(${IMHEX_PLUGIN_NAME})
+    # 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})
 
-        # Configure build properties
-        set_target_properties(${IMHEX_PLUGIN_NAME}
-                PROPERTIES
-                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)
-        target_link_libraries(${IMHEX_PLUGIN_NAME} PRIVATE ${LIBROMFS_LIBRARY})
-
-        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)
-            add_dependencies(imhex_all ${IMHEX_PLUGIN_NAME})
-        endif()
-
-        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;@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()
-    endif()
+    # Add the new plugin to the main dependency list so it gets built by default
+    add_dependencies(imhex_all ${IMHEX_PLUGIN_NAME})
 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)
-endmacro()
-
-macro (enable_plugin_feature feature)
-    string(TOUPPER ${feature} feature)
-    if (NOT (feature IN_LIST IMHEX_PLUGIN_FEATURES))
-        message(FATAL_ERROR "Feature ${feature} is not enabled for plugin ${IMHEX_PLUGIN_NAME}")
-    endif()
-
-    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,11 +14,12 @@ 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)
-
-		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})
+		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}"
+		)
 	endfunction()
 	return()
 endif()
@@ -34,27 +35,26 @@ 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 extra_libs "${BUNDLE_PATH}/Contents/MacOS/plugins/*.hexplug")
 
 
 # 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" "${BUNDLE_PATH}/Contents/Frameworks")
+set(extra_dirs "/usr/local/lib" "/lib" "/usr/lib" ${EXTRA_BUNDLE_LIBRARY_PATHS})
 message(STATUS "Fixing up application bundle: ${extra_dirs}")
 
 # BundleUtilities is overly verbose, so disable most of its messages
-#function(message)
-#	if(NOT ARGV MATCHES "^STATUS;")
-#		_message(${ARGV})
-#	endif()
-#endfunction()
+function(message)
+	if(NOT ARGV MATCHES "^STATUS;")
+		_message(${ARGV})
+	endif()
+endfunction()
 
 include(BundleUtilities)
 set(BU_CHMOD_BUNDLE_ITEMS ON)
-
-fixup_bundle("${BUNDLE_PATH}" "${plugins}" "${extra_dirs}")
+fixup_bundle("${BUNDLE_PATH}" "${extra_libs}" "${extra_dirs}")
 
 if (CODE_SIGN_CERTIFICATE_ID)
 	# Hack around Apple Silicon signing bugs by copying the real app, signing it and moving it back.
@@ -66,13 +66,4 @@ if (CODE_SIGN_CERTIFICATE_ID)
 endif()
 
 # Add a necessary rpath to the imhex binary
-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 ()
+get_bundle_main_executable("${BUNDLE_PATH}" IMHEX_EXECUTABLE)

cmake/sdk/CMakeLists.txt

@@ -1,73 +0,0 @@
-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)
-include(ImHexPlugin)
-
-function(add_subdirectory_if_exists folder)
-    if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${folder}/CMakeLists.txt")
-        add_subdirectory("${folder}" EXCLUDE_FROM_ALL)
-    endif()
-endfunction()
-
-set(IMHEX_EXTERNAL_PLUGIN_BUILD ON PARENT_SCOPE)
-set(IMHEX_EXTERNAL_PLUGIN_BUILD ON)
-add_custom_target(imhex_all)
-
-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)
-
-set(LIBPL_ENABLE_CLI OFF CACHE BOOL "" FORCE)
-add_subdirectory(lib/external/pattern_language EXCLUDE_FROM_ALL)
-
-set(IMHEX_PLUGIN_IMPORTED ON)
-
-add_subdirectory(lib/libimhex)
-add_subdirectory(lib/trace)
-add_subdirectory(lib/fonts)
-add_subdirectory(lib/ui)
-
-set(IMHEX_PLUGIN_IMPORTED OFF)
-
-if (WIN32)
-    set_target_properties(libimhex PROPERTIES
-            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")
-    set_target_properties(tracing PROPERTIES
-            IMPORTED_IMPLIB "${CMAKE_CURRENT_SOURCE_DIR}/lib/libtracing.a"
-            INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/lib/trace/include")
-elseif (APPLE)
-    file(GLOB LIBIMHEX_DYLIB "${CMAKE_CURRENT_SOURCE_DIR}/../../Frameworks/libimhex.*.dylib")
-    set_target_properties(libimhex PROPERTIES
-            IMPORTED_LOCATION "${LIBIMHEX_DYLIB}"
-            INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/lib/libimhex/include")
-    set_target_properties(tracing PROPERTIES
-            IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/../libtracing.a"
-            INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/lib/trace/include")
-else()
-    set_target_properties(libimhex PROPERTIES
-            IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/../libimhex.so"
-            INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/lib/libimhex/include")
-    set_target_properties(tracing PROPERTIES
-            IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/../libtracing.a"
-            INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/lib/trace/include")
-endif()

cmake/sdk/template/CMakeLists.txt

@@ -1,60 +0,0 @@
-# ImHex Plugin Template
-# =====================
-
-# This is the official CMake template for making your own ImHex plugins
-# To use this template, copy the file into its own directory and modify it to your needs
-# For the most part, this is a regular CMake project with some extra functions provided by the ImHex SDK
-#
-# [NOTE FOR NON-C++ PLUGINS]
-# The template is laid out for a C++ plugin, however you can write your plugin in any language you want
-# and just make the plugin statically link against your code. The only thing that's required is a .cpp file with
-# the IMHEX_PLUGIN_SETUP() macro used in it. This macro is used to setup the plugin and register it with ImHex
-#
-# [CMAKE FUNCTIONS]
-# add_imhex_plugin(): Registers a new plugin
-#   NAME:           The name of the plugin
-#   IMHEX_VERSION:  The ImHex version this plugin is compatible with. If unset, the plugin will be loaded on all versions (this may not work though)
-#   SOURCES:        Source files of the plugin
-#   INCLUDES:       Include directories of the plugin
-#   LIBRARIES:      Libraries to link against
-#   FEATURES:       Optional features that can be enabled or disabled
-#   LIBRARY_PLUGIN: If set, turns this plugin into a library plugin. Library plugins can be linked against by other plugins
-#
-# add_romfs_resource(filePath romfsPath): Adds a file to the romfs of the plugin
-# The RomFS is a virtual filesystem whose files can be accessed by the plugin using the functions in the `romfs::` namespace
-# This function is used to add a single file to the romfs. You can however also simply create a `romfs` directory in your plugin directory and place your files and folders in there
-#   filePath:   The path to the file on the disk
-#   romfsPath:  The path to the file in the romfs
-#
-# enable_plugin_feature(feature): Enables a plugin feature
-# Features are optional parts of the plugin that may or may not be available depending on build settings
-# When a feature is enabled, `IMHEX_FEATURE_ENABLED(feature)` will be defined to true. Otherwise, it will be defined to false
-# Use the `IMHEX_PLUGIN_FEATURES` macro in the main plugin file to define names to each feature and have them be listed in the plugin list
-#   feature:    The name of the feature to enable
-
-cmake_minimum_required(VERSION 3.20)
-project(ImHexPlugin)
-
-# Include the ImHex SDK
-# For this to work, you need to set the IMHEX_SDK_PATH environment variable to the path of the ImHex SDK
-#
-# On Windows, the SDK is next to the ImHex executable
-# On Linux, the SDK is usually in /usr/share/imhex/sdk but this may vary depending on your distribution
-# On MacOS, the SDK is located inside of the ImHex.app bundle under ImHex.app/Contents/Resources/sdk
-if (NOT EXISTS $ENV{IMHEX_SDK_PATH})
-    message(FATAL_ERROR "The IMHEX_SDK_PATH environment variable is not set")
-endif()
-add_subdirectory($ENV{IMHEX_SDK_PATH} ImHexSDK)
-
-# Register the plugin
-# This will configure everything you need to make your plugin work
-# Modify the arguments to your needs. Right now it defines a plugin called `example_plugin`
-# with a single source file called `example_plugin.cpp` in the `source` directory
-# By default you have access to the libimhex library to interact with ImHex
-# as well as libwolv, libromfs, libfmt and ImGui, but you can link against any libraries you want
-add_imhex_plugin(
-    NAME
-        example_plugin
-    SOURCES
-        source/example_plugin.cpp
-)

cmake/sdk/template/source/example_plugin.cpp

@@ -1,11 +0,0 @@
-#include <hex/plugin.hpp>
-
-// Browse through the headers in lib/libimhex/include/hex/api/ to see what you can do with the API.
-// Most important ones are the things under imhex_api and content_registry
-
-// This is the main entry point of your plugin. The code in the body of this construct will be executed
-// when ImHex starts up and loads the plugin.
-// The strings in the header are used to display information about the plugin in the UI.
-IMHEX_PLUGIN_SETUP("Example Plugin", "Author", "Description") {
-    // Put your init code here
-}

dist/AppImage/AppImageBuilder.yml

@@ -1,146 +0,0 @@
-# appimage-builder recipe see https://appimage-builder.readthedocs.io for details
-version: 1
-AppDir:
-  path: .AppDir
-  app_info:
-    id: imhex
-    name: ImHex
-    icon: imhex
-    version: "{{VERSION}}"
-    exec: usr/bin/imhex
-    exec_args: $@
-  apt:
-    arch:
-    - all
-    - "{{ARCHITECTURE_PACKAGE}}"
-    allow_unauthenticated: true
-    sources:
-    - 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:
-    - libgdk-pixbuf2.0-0
-    - libgdk-pixbuf2.0-common
-    - shared-mime-info
-    - librsvg2-common
-    - libbz2-1.0
-    - libcap2
-    - libdbus-1-3
-    - libfontconfig1
-    - libgpg-error0
-    - liblzma5
-    - libnss-mdns
-    - libpcre3
-    - libselinux1
-    - libtinfo6
-    - libmd4c-dev
-    - libmd4c-html0-dev
-  files:
-    include:
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libLLVM-13.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libOpenGL.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libX11.so.6"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libXau.so.6"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libXcomposite.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libXcursor.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libXdamage.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libXdmcp.so.6"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libXext.so.6"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libXfixes.so.3"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libXi.so.6"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libXinerama.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libXrandr.so.2"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libXrender.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libXxf86vm.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libatk-1.0.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libatk-bridge-2.0.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libatspi.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libblkid.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libbrotlicommon.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libbrotlidec.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libbsd.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libcairo-gobject.so.2"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libcairo.so.2"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libcurl-gnutls.so.4"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libdatrie.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libedit.so.2"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libelf.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libepoxy.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libffi.so.8"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libfontconfig.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libfreetype.so.6"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libfribidi.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libgcrypt.so.20"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libgdk-3.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libgdk_pixbuf-2.0.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libgio-2.0.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libglfw.so.3"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libglib-2.0.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libgmodule-2.0.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libgmp.so.10"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libgnutls.so.30"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libgobject-2.0.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libgraphite2.so.3"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libharfbuzz.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libhogweed.so.6"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libicudata.so.70"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libicuuc.so.70"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libidn2.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libjpeg.so.8"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/liblber-2.5.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libldap-2.5.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/liblz4.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libmagic.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libmbedcrypto.so.7"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libmbedtls.so.14"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libmbedx509.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libmd.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libmount.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libnettle.so.8"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libp11-kit.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libpango-1.0.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libpangocairo-1.0.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libpangoft2-1.0.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libpcre2-8.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libpixman-1.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libpng16.so.16"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libsasl2.so.2"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libsensors.so.5"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libstdc++.so.6"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libsystemd.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libtasn1.so.6"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libthai.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libunistring.so.2"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libuuid.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libvulkan.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libwayland-client.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libwayland-cursor.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libwayland-egl.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libxcb-dri2.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libxcb-dri3.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libxcb-present.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libxcb-sync.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libxkbcommon.so.0"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libxml2.so.2"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libxshmfence.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libzstd.so.1"
-    - "/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/libmd4c.so"
-    exclude:
-    - usr/share/man
-    - usr/share/doc/*/README.*
-    - usr/share/doc/*/changelog.*
-    - usr/share/doc/*/NEWS.*
-    - usr/share/doc/*/TODO.*
-
-  runtime:
-    env:
-      APPDIR_LIBRARY_PATH: '$APPDIR/usr/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu:$APPDIR/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu:$APPDIR/usr/lib:$APPDIR/usr/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders'
-      GTK_EXE_PREFIX: $APPDIR/usr
-      GTK_DATA_PREFIX: $APPDIR
-      XDG_DATA_DIRS: '/usr/local/share:/usr/share:$APPDIR/usr/share:$XDG_DATA_DIRS:$APPDIR/usr/local/share:$APPDIR/usr/local/lib:$APPDIR/usr/local/share'
-      XDG_CONFIG_DIRS: '$XDG_CONFIG_DIRS:$APPDIR/usr/local/share'
-
-AppImage:
-  arch: "{{ARCHITECTURE_APPIMAGE_BUILDER}}"
-  comp: zstd
-  update-information: gh-releases-zsync|WerWolv|ImHex|latest|imhex-*-{{ARCHITECTURE_FILE_NAME}}.AppImage.zsync
-  file_name: imhex-{{VERSION}}-{{ARCHITECTURE_FILE_NAME}}.AppImage

dist/AppImageBuilder.yml

@@ -0,0 +1,137 @@
+# appimage-builder recipe see https://appimage-builder.readthedocs.io for details
+version: 1
+AppDir:
+  path: .AppDir
+  app_info:
+    id: imhex
+    name: ImHex
+    icon: imhex
+    version: "{{VERSION}}"
+    exec: usr/bin/imhex
+    exec_args: $@
+  apt:
+    arch:
+    - amd64
+    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
+    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
+  files:
+    include:
+    - /lib/x86_64-linux-gnu/libLLVM-13.so.1
+    - /lib/x86_64-linux-gnu/libOpenGL.so.0
+    - /lib/x86_64-linux-gnu/libX11.so.6
+    - /lib/x86_64-linux-gnu/libXau.so.6
+    - /lib/x86_64-linux-gnu/libXcomposite.so.1
+    - /lib/x86_64-linux-gnu/libXcursor.so.1
+    - /lib/x86_64-linux-gnu/libXdamage.so.1
+    - /lib/x86_64-linux-gnu/libXdmcp.so.6
+    - /lib/x86_64-linux-gnu/libXext.so.6
+    - /lib/x86_64-linux-gnu/libXfixes.so.3
+    - /lib/x86_64-linux-gnu/libXi.so.6
+    - /lib/x86_64-linux-gnu/libXinerama.so.1
+    - /lib/x86_64-linux-gnu/libXrandr.so.2
+    - /lib/x86_64-linux-gnu/libXrender.so.1
+    - /lib/x86_64-linux-gnu/libXxf86vm.so.1
+    - /lib/x86_64-linux-gnu/libatk-1.0.so.0
+    - /lib/x86_64-linux-gnu/libatk-bridge-2.0.so.0
+    - /lib/x86_64-linux-gnu/libatspi.so.0
+    - /lib/x86_64-linux-gnu/libblkid.so.1
+    - /lib/x86_64-linux-gnu/libbrotlicommon.so.1
+    - /lib/x86_64-linux-gnu/libbrotlidec.so.1
+    - /lib/x86_64-linux-gnu/libbsd.so.0
+    - /lib/x86_64-linux-gnu/libcairo-gobject.so.2
+    - /lib/x86_64-linux-gnu/libcairo.so.2
+    - /lib/x86_64-linux-gnu/libcurl-gnutls.so.4
+    - /lib/x86_64-linux-gnu/libdatrie.so.1
+    - /lib/x86_64-linux-gnu/libedit.so.2
+    - /lib/x86_64-linux-gnu/libelf.so.1
+    - /lib/x86_64-linux-gnu/libepoxy.so.0
+    - /lib/x86_64-linux-gnu/libffi.so.8
+    - /lib/x86_64-linux-gnu/libfontconfig.so.1
+    - /lib/x86_64-linux-gnu/libfreetype.so.6
+    - /lib/x86_64-linux-gnu/libfribidi.so.0
+    - /lib/x86_64-linux-gnu/libgcrypt.so.20
+    - /lib/x86_64-linux-gnu/libgdk-3.so.0
+    - /lib/x86_64-linux-gnu/libgdk_pixbuf-2.0.so.0
+    - /lib/x86_64-linux-gnu/libgio-2.0.so.0
+    - /lib/x86_64-linux-gnu/libglfw.so.3
+    - /lib/x86_64-linux-gnu/libglib-2.0.so.0
+    - /lib/x86_64-linux-gnu/libgmodule-2.0.so.0
+    - /lib/x86_64-linux-gnu/libgmp.so.10
+    - /lib/x86_64-linux-gnu/libgnutls.so.30
+    - /lib/x86_64-linux-gnu/libgobject-2.0.so.0
+    - /lib/x86_64-linux-gnu/libgraphite2.so.3
+    - /lib/x86_64-linux-gnu/libharfbuzz.so.0
+    - /lib/x86_64-linux-gnu/libhogweed.so.6
+    - /lib/x86_64-linux-gnu/libicudata.so.70
+    - /lib/x86_64-linux-gnu/libicuuc.so.70
+    - /lib/x86_64-linux-gnu/libidn2.so.0
+    - /lib/x86_64-linux-gnu/libjpeg.so.8
+    - /lib/x86_64-linux-gnu/liblber-2.5.so.0
+    - /lib/x86_64-linux-gnu/libldap-2.5.so.0
+    - /lib/x86_64-linux-gnu/liblz4.so.1
+    - /lib/x86_64-linux-gnu/libmagic.so.1
+    - /lib/x86_64-linux-gnu/libmbedcrypto.so.7
+    - /lib/x86_64-linux-gnu/libmbedtls.so.14
+    - /lib/x86_64-linux-gnu/libmbedx509.so.1
+    - /lib/x86_64-linux-gnu/libmd.so.0
+    - /lib/x86_64-linux-gnu/libmount.so.1
+    - /lib/x86_64-linux-gnu/libnettle.so.8
+    - /lib/x86_64-linux-gnu/libp11-kit.so.0
+    - /lib/x86_64-linux-gnu/libpango-1.0.so.0
+    - /lib/x86_64-linux-gnu/libpangocairo-1.0.so.0
+    - /lib/x86_64-linux-gnu/libpangoft2-1.0.so.0
+    - /lib/x86_64-linux-gnu/libpcre2-8.so.0
+    - /lib/x86_64-linux-gnu/libpixman-1.so.0
+    - /lib/x86_64-linux-gnu/libpng16.so.16
+    - /lib/x86_64-linux-gnu/libsasl2.so.2
+    - /lib/x86_64-linux-gnu/libsensors.so.5
+    - /lib/x86_64-linux-gnu/libstdc++.so.6
+    - /lib/x86_64-linux-gnu/libsystemd.so.0
+    - /lib/x86_64-linux-gnu/libtasn1.so.6
+    - /lib/x86_64-linux-gnu/libthai.so.0
+    - /lib/x86_64-linux-gnu/libunistring.so.2
+    - /lib/x86_64-linux-gnu/libuuid.so.1
+    - /lib/x86_64-linux-gnu/libvulkan.so.1
+    - /lib/x86_64-linux-gnu/libwayland-client.so.0
+    - /lib/x86_64-linux-gnu/libwayland-cursor.so.0
+    - /lib/x86_64-linux-gnu/libwayland-egl.so.1
+    - /lib/x86_64-linux-gnu/libxcb-dri2.so.0
+    - /lib/x86_64-linux-gnu/libxcb-dri3.so.0
+    - /lib/x86_64-linux-gnu/libxcb-present.so.0
+    - /lib/x86_64-linux-gnu/libxcb-sync.so.1
+    - /lib/x86_64-linux-gnu/libxkbcommon.so.0
+    - /lib/x86_64-linux-gnu/libxml2.so.2
+    - /lib/x86_64-linux-gnu/libxshmfence.so.1
+    - /lib/x86_64-linux-gnu/libzstd.so.1
+    exclude:
+    - usr/share/man
+    - usr/share/doc/*/README.*
+    - usr/share/doc/*/changelog.*
+    - 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

dist/Arch/PKGBUILD

@@ -8,8 +8,8 @@ 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 fontconfig freetype2 libglvnd dbus gtk3 curl fmt yara zlib bzip2 xz zstd libssh2)
-makedepends=(git nlohmann-json)
+depends=(glfw mbedtls freetype2 libglvnd dbus gtk3 curl fmt yara nlohmann-json)
+makedepends=(git)
 provides=(imhex)
 conflicts=(imhex)
 source=("$url/releases/download/v$pkgver/imhex-$pkgver-ArchLinux-x86_64.pkg.tar.zst")
@@ -17,14 +17,13 @@ md5sums=(SKIP)
 
 package() {
     install -Dm755 "$srcdir/usr/bin/imhex" "$pkgdir/usr/bin/imhex"
-    install -Dm755 "$srcdir/usr/bin/imhex-updater" "$pkgdir/usr/bin/imhex-updater"
     install -Dm644 "$srcdir/usr/lib/libimhex.so.$pkgver" "$pkgdir/usr/lib/libimhex.so.$pkgver"
 
-    for plugin in "$srcdir/usr/lib/imhex/plugins/"*.hexplug*; do
+    for plugin in "$srcdir/usr/lib/imhex/plugins/"*.hexplug; do
         install -Dm644 "$plugin" "$pkgdir/usr/lib/imhex/plugins/${plugin##*/}"
     done
 
     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,mime} "$pkgdir/usr/share"
+    cp -r "$srcdir/usr/share/"{applications,licenses,pixmaps} "$pkgdir/usr/share"
 }

dist/Brewfile

@@ -6,12 +6,7 @@ brew "freetype2"
 brew "libmagic"
 brew "pkg-config"
 brew "curl"
+brew "gcc@12"
 brew "llvm"
 brew "glfw"
-brew "ninja"
-brew "zlib"
-brew "xz"
-brew "bzip2"
-brew "zstd"
-brew "libssh2"
-brew "md4c"
+brew "ninja"

dist/DEBIAN/control.in

@@ -4,7 +4,7 @@ Section: editors
 Priority: optional
 Architecture: amd64
 License: GNU GPL-2
-Depends: libfontconfig1, libglfw3 | libglfw3-wayland, libmagic1, libmbedtls14, libfreetype6, libopengl0, libdbus-1-3, xdg-desktop-portal, libssh2-1, md4c
+Depends: libglfw3, 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/Dockerfile

@@ -13,13 +13,10 @@ RUN pacman -S --needed --noconfirm      \
     glfw-x11                            \
     file                                \
     mbedtls                             \
-    fontconfig                          \
     freetype2                           \
     curl                                \
     dbus                                \
-    xdg-desktop-portal                  \
-    libssh2                             \
-    md4c
+    xdg-desktop-portal
 
 # Clone ImHex
 RUN git clone https://github.com/WerWolv/ImHex --recurse-submodules /root/ImHex

dist/ImHex-9999.ebuild

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

dist/appimage/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:24.10 as build
+FROM ubuntu:22.04 as build
 
 # Used to invalidate layer cache but not mount cache
 # See https://github.com/moby/moby/issues/41715#issuecomment-733976493
@@ -14,13 +14,24 @@ apt update
 # general deps
 apt install -y ccache git wget
 # appimage tools deps
-apt install -y python3-pip python3-venv python3-setuptools desktop-file-utils libgdk-pixbuf2.0-dev fuse ninja-build
+apt install -y python3-pip 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
@@ -30,24 +41,19 @@ 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
-
-# Ubuntu sh doesnt support string substitution
-SHELL ["bash", "-c"]
-
+SHELL ["bash", "-c"] # Ubuntu sh doesnt support string substitution
 RUN <<EOF
 # Prepare ImHex build
 set -xe
 
-CC=gcc-14 CXX=g++-14 cmake -G "Ninja"                  \
+CC=gcc-12 CXX=g++-12 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}                          \
@@ -66,23 +72,11 @@ ccache -s
 EOF
 
 RUN <<EOF
-# Download appimage-builder
+# Package ImHex as AppImage
 set -xe
 
-mkdir -p /cache/bin
-wget -nc https://github.com/AppImage/appimagetool/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@e995e8e
-
-# Package ImHex as AppImage
 export VERSION=$(cat /imhex/VERSION)
-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
+appimage-builder --recipe /imhex/dist/AppImageBuilder.yml
 EOF
 
 FROM scratch

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             | Target |
-|--------------|-----------------------------|--------|
-| MacOS M1     | dist/macOS/arm64.Dockerfile | -      |
-| AppImage     | dist/appimage/Dockerfile    | -      |
-| Web version  | dist/web/Dockerfile         | raw    |
+| Wanted build | Dockerfile path             |
+|--------------|-----------------------------|
+| MacOS M1     | dist/macOS/arm64.Dockerfile |
+| AppImage     | dist/appimage/Dockerfile    |
+| Web version  | dist/web/Dockerfile         |
 
 We'll explain this command in the next section
 
@@ -43,7 +43,6 @@ 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 specify arguments to the build (like -DKEY=VALUE in CMake)
+- `--build-arg <key>=<value>` is to allow to 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,12 +9,17 @@ On Linux, ImHex is built through regular GCC (or optionally Clang).
 cd ImHex
 mkdir -p build
 cd build
-CC=gcc-14 CXX=g++-14                          \
-cmake -G "Ninja"                              \
+CC=gcc-12 CXX=g++-12 cmake                    \
     -DCMAKE_BUILD_TYPE=Release                \
-    -DCMAKE_INSTALL_PREFIX="/usr"             \
+    -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   \
     ..
-ninja install
+make -j 4 install
 ```
 
 All paths follow the XDG Base Directories standard, and can thus be modified

dist/compiling/macos.md

@@ -3,20 +3,29 @@
 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/macOS/Brewfile`
+2. Install all the dependencies using `brew bundle --no-lock --file dist/Brewfile`
 3. Build ImHex itself using the following commands:
 ```sh
 cd ImHex
 mkdir -p build
 cd build
-CC=$(brew --prefix llvm)/bin/clang        \
-CXX=$(brew --prefix llvm)/bin/clang++     \
+CC=$(brew --prefix gcc@12)/bin/gcc-12     \
+CXX=$(brew --prefix gcc@12)/bin/g++-12    \
 OBJC=$(brew --prefix llvm)/bin/clang      \
 OBJCXX=$(brew --prefix llvm)/bin/clang++  \
-cmake -G "Ninja"                          \
+PKG_CONFIG_PATH="$(brew --prefix openssl)/lib/pkgconfig":"$(brew --prefix)/lib/pkgconfig" \
+MACOSX_DEPLOYMENT_TARGET="10.15"          \
+cmake                                     \
   -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 \
   ..
-ninja install
+make -j4 package
 ```
+
+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="./install"      \
+  -DCMAKE_INSTALL_PREFIX="$PWD/install"   \
   -DIMHEX_USE_DEFAULT_BUILD_SETTINGS=ON   \
   ..
 ninja install

dist/cppcheck.supp

@@ -1,20 +0,0 @@
-missingIncludeSystem
-constParameter
-unusedFunction
-preprocessorErrorDirective
-checkersReport
-noExplicitConstructor
-unmatchedSuppression
-useInitializationList
-useStlAlgorithm
-knownConditionTrueFalse
-internalAstError
-unsignedPositive
-variableScope
-unusedPrivateFunction
-constParameterCallback
-
-*:*/lib/third_party/*
-*:*/external/pattern_language/external/*
-*:*/external/disassembler/external/*
-*:*/lib/libimhex/source/ui/imgui_imhex_extensions.cpp

dist/flatpak/net.werwolv.ImHex.yaml

@@ -1,138 +0,0 @@
-app-id: net.werwolv.ImHex
-runtime: org.freedesktop.Platform
-runtime-version: '24.08'
-sdk: org.freedesktop.Sdk
-command: imhex
-rename-desktop-file: imhex.desktop
-
-finish-args:
-  - --share=ipc
-  - --share=network
-  - --socket=wayland
-  - --socket=fallback-x11
-  - --filesystem=host
-  - --device=dri
-
-modules:
-  - name: glfw
-    buildsystem: cmake-ninja
-    builddir: true
-    config-opts:
-      - -DBUILD_SHARED_LIBS=ON
-      - -DGLFW_BUILD_EXAMPLES=OFF
-      - -DGLFW_BUILD_TESTS=OFF
-      - -DGLFW_BUILD_DOCS=OFF
-    sources:
-      - type: archive
-        url: https://github.com/glfw/glfw/releases/download/3.4/glfw-3.4.zip
-        sha256: b5ec004b2712fd08e8861dc271428f048775200a2df719ccf575143ba749a3e9
-    cleanup:
-      - /include
-      - /lib/pkgconfig
-      - /lib/pkgconfig
-      - /lib64/pkgconfig
-      - /lib/cmake
-      - /lib64/cmake
-
-  - name: mbedtls
-    buildsystem: cmake-ninja
-    config-opts:
-      - -DCMAKE_C_FLAGS=-fPIC
-      - -DENABLE_TESTING=OFF
-      - -DENABLE_PROGRAMS=OFF
-    sources:
-      - type: archive
-        url: https://github.com/ARMmbed/mbedtls/archive/refs/tags/v3.4.0.tar.gz
-        sha256: 1b899f355022e8d02c4d313196a0a16af86c5a692456fa99d302915b8cf0320a
-    cleanup:
-      - /include
-      - /lib/pkgconfig
-      - /lib64/pkgconfig
-      - /lib/cmake
-      - /lib64/cmake
-
-  - name: fmt
-    buildsystem: cmake-ninja
-    config-opts:
-      - -DBUILD_SHARED_LIBS=ON
-      - -DFMT_TEST=OFF
-    sources:
-      - type: archive
-        url: https://github.com/fmtlib/fmt/releases/download/10.0.0/fmt-10.0.0.zip
-        sha256: 4943cb165f3f587f26da834d3056ee8733c397e024145ca7d2a8a96bb71ac281
-    cleanup:
-      - /include
-      - /lib/pkgconfig
-      - /lib64/pkgconfig
-      - /lib/cmake
-      - /lib64/cmake
-
-  - name: yara
-    buildsystem: autotools
-    sources:
-      - type: git
-        url: https://github.com/VirusTotal/yara.git
-        tag: v4.3.1
-        commit: a6f6ce1d6d74a03c396660db25765f2a794d9e30
-    cleanup:
-      - /include
-      - /lib/pkgconfig
-      - /lib64/pkgconfig
-      - /lib/cmake
-      - /lib64/cmake
-
-  - name: libssh2
-    buildsystem: cmake-ninja
-    config-opts:
-      - -DBUILD_SHARED_LIBS=ON
-      - -DENABLE_ZLIB_COMPRESSION=OFF
-      - -DENABLE_MANUAL=OFF
-      - -DENABLE_EXAMPLES=OFF
-      - -DENABLE_TESTING=OFF
-    sources:
-      - type: git
-        url: https://github.com/libssh2/libssh2.git
-        tag: libssh2-1.11.1
-    cleanup:
-      - /include
-      - /lib/pkgconfig
-      - /lib64/pkgconfig
-      - /lib/cmake
-      - /lib64/cmake
-
-  - name: md4c
-    buildsystem: cmake-ninja
-    config-opts:
-      - -DBUILD_SHARED_LIBS=ON
-      - -DMD4C_BUILD_TESTS=OFF
-      - -DMD4C_BUILD_EXAMPLES=OFF
-      - -DMD4C_BUILD_DOCS=OFF
-    sources:
-      - type: git
-        url: https://github.com/mity/md4c.git
-        tag: release-0.5.2
-
-  - name: imhex
-    buildsystem: cmake-ninja
-    builddir: true
-    config-opts:
-      - -DUSE_SYSTEM_CURL=ON
-      - -DUSE_SYSTEM_FMT=ON
-      - -DUSE_SYSTEM_YARA=ON
-      - -DIMHEX_OFFLINE_BUILD=ON
-      - -DCMAKE_INSTALL_LIBDIR=lib
-      - -DCMAKE_INSTALL_RPATH='$ORIGIN/../lib:$ORIGIN/../lib64'
-    sources:
-      - type: dir
-        path: ../..
-      - type: git
-        url: https://github.com/WerWolv/ImHex-Patterns.git
-        tag: master
-        dest: ImHex-Patterns
-        x-checker-data:
-          type: git
-          tag-pattern: ^ImHex-v([\d.]+)$
-    post-install:
-      - mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps
-      - cp ${FLATPAK_DEST}/share/pixmaps/imhex.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/${FLATPAK_ID}.svg
-      - desktop-file-edit --set-key="Icon" --set-value="${FLATPAK_ID}" "${FLATPAK_DEST}/share/applications/imhex.desktop"

dist/fonts/move_private_use_area.py

@@ -1,69 +0,0 @@
-from fontTools.ttLib import TTFont
-from fontTools.ttLib.tables._c_m_a_p import CmapSubtable
-import argparse
-
-# Default PUAs
-SOURCE_PUA_START = 0xEA00
-SOURCE_PUA_END = 0x100F2
-TARGET_PUA_START = 0xF0000
-
-def move_pua_glyphs(input_font_path, output_font_path):
-    font = TTFont(input_font_path)
-
-    cmap_table = font['cmap']
-    glyph_set = font.getGlyphSet()
-
-    # Track moved glyphs
-    moved = 0
-    new_mapping = {}
-
-    # Collect original mappings in the PUA
-    for cmap in cmap_table.tables:
-        if cmap.isUnicode():
-            for codepoint, glyph_name in cmap.cmap.items():
-                if SOURCE_PUA_START <= codepoint <= SOURCE_PUA_END:
-                    offset = codepoint - SOURCE_PUA_START
-                    new_codepoint = TARGET_PUA_START + offset
-                    new_mapping[new_codepoint] = glyph_name
-                    moved += 1
-
-    if moved == 0:
-        print("No glyphs found in the source Private Use Area.")
-        return
-
-    # Remove old PUA entries from existing cmap subtables
-    for cmap in cmap_table.tables:
-        if cmap.isUnicode():
-            cmap.cmap = {
-                cp: gn for cp, gn in cmap.cmap.items()
-                if not (SOURCE_PUA_START <= cp <= SOURCE_PUA_END)
-            }
-
-    # Create or update a format 12 cmap subtable
-    found_format12 = False
-    for cmap in cmap_table.tables:
-        if cmap.format == 12 and cmap.platformID == 3 and cmap.platEncID in (10, 1):
-            cmap.cmap.update(new_mapping)
-            found_format12 = True
-            break
-
-    if not found_format12:
-        # Create a new format 12 subtable
-        cmap12 = CmapSubtable.newSubtable(12)
-        cmap12.platformID = 3
-        cmap12.platEncID = 10  # UCS-4
-        cmap12.language = 0
-        cmap12.cmap = new_mapping
-        cmap_table.tables.append(cmap12)
-
-    print(f"Moved {moved} glyphs from U+{SOURCE_PUA_START:X}–U+{SOURCE_PUA_END:X} to U+{TARGET_PUA_START:X}+")
-    font.save(output_font_path)
-    print(f"Saved modified font to {output_font_path}")
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="Move PUA glyphs in a TTF file to another Unicode range.")
-    parser.add_argument("input", help="Input TTF file path")
-    parser.add_argument("output", help="Output TTF file path")
-
-    args = parser.parse_args()
-    move_pua_glyphs(args.input, args.output)

dist/fonts/ttf_to_header_file.py

@@ -1,60 +0,0 @@
-import argparse
-from fontTools.ttLib import TTFont
-import os
-
-def unicode_to_utf8_escape(codepoint):
-    return ''.join([f'\\x{b:02x}' for b in chr(codepoint).encode('utf-8')])
-
-def format_macro_name(prefix, glyph_name):
-    # Convert names like 'repo-forked' -> 'ICON_VS_REPO_FORKED'
-    return "ICON_" + prefix + "_" + glyph_name.upper().replace('-', '_')
-
-def generate_font_header(font_path, output_path, font_macro_name, font_file_macro):
-    font = TTFont(font_path)
-
-    # Use cmap to get Unicode to glyph mapping
-    codepoint_to_names = {}
-    for table in font["cmap"].tables:
-        if table.isUnicode():
-            for codepoint, glyph_name in table.cmap.items():
-                codepoint_to_names.setdefault(codepoint, []).append(glyph_name)
-
-    if not codepoint_to_names:
-        print("No Unicode-mapped glyphs found in the font.")
-        return
-
-    # Remove any glyph that is lower than 0xFF
-    codepoint_to_names = {cp: names for cp, names in codepoint_to_names.items() if cp >= 0xFF}
-
-    min_cp = min(codepoint_to_names)
-    max_cp = max(codepoint_to_names)
-
-    with open(output_path, "w", encoding="utf-8") as out:
-        out.write("#pragma once\n\n")
-        out.write(f'#define FONT_ICON_FILE_NAME_{font_macro_name} "{font_file_macro}"\n\n')
-        out.write(f"#define ICON_MIN_{font_macro_name} 0x{min_cp:04x}\n")
-        out.write(f"#define ICON_MAX_16_{font_macro_name} 0x{max_cp:04x}\n")
-        out.write(f"#define ICON_MAX_{font_macro_name} 0x{max_cp:04x}\n")
-
-        written = set()
-        for codepoint in sorted(codepoint_to_names):
-            utf8 = unicode_to_utf8_escape(codepoint)
-            comment = f"// U+{codepoint:04X}"
-            glyph_names = sorted(set(codepoint_to_names[codepoint]))
-            for i, glyph_name in enumerate(glyph_names):
-                macro = format_macro_name(font_macro_name, glyph_name)
-                if macro in written:
-                    continue
-                out.write(f"#define {macro} \"{utf8}\"\t{comment}\n")
-                written.add(macro)
-
-    print(f"Header generated at {output_path}")
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="Generate C header file from TTF glyphs.")
-    parser.add_argument("font", help="Input .ttf font file")
-    parser.add_argument("output", help="Output .h file")
-    parser.add_argument("macro_name", help="Macro prefix")
-    args = parser.parse_args()
-
-    generate_font_header(args.font, args.output, args.macro_name, os.path.basename(args.font))

dist/gen_release_notes.py

@@ -1,54 +0,0 @@
-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:
-        if commit == "":
-            continue
-
-        try:
-            category, commit_name = commit.split(":", 1)
-
-            if category not in sorted_commits:
-                sorted_commits[category] = []
-            sorted_commits[category].append(commit_name)
-        except:
-            print(f"Failed to parse commit: {commit}")
-
-    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

@@ -1,25 +1,17 @@
 #!/usr/bin/env sh
 
 pacman -S $@ --needed \
-  cmake         \
-  gcc           \
-  lld           \
-  glfw          \
-  fontconfig    \
-  file          \
-  mbedtls       \
-  freetype2     \
-  dbus          \
-  gtk3          \
-  curl          \
-  fmt           \
-  yara          \
+  cmake     \
+  gcc       \
+  lld       \
+  glfw      \
+  file      \
+  mbedtls   \
+  freetype2 \
+  dbus      \
+  gtk3      \
+  curl      \
+  fmt       \
+  yara      \
   nlohmann-json \
-  ninja         \
-  zlib          \
-  bzip2         \
-  xz            \
-  zstd          \
-  lz4           \
-  libssh2       \
-  md4c
+  ninja

dist/get_deps_debian.sh

@@ -8,8 +8,8 @@ fi
 
 apt install -y \
   build-essential       \
-  gcc-14                \
-  g++-14                \
+  gcc-12                \
+  g++-12                \
   lld                   \
   ${PKGCONF:-}          \
   cmake                 \
@@ -18,17 +18,8 @@ apt install -y \
   libglm-dev            \
   libmagic-dev          \
   libmbedtls-dev        \
-  libfontconfig-dev     \
   libfreetype-dev       \
   libdbus-1-dev         \
   libcurl4-gnutls-dev   \
   libgtk-3-dev          \
-  ninja-build           \
-  zlib1g-dev            \
-  libbz2-dev            \
-  liblzma-dev           \
-  libzstd-dev           \
-  liblz4-dev            \
-  libssh2-1-dev         \
-  libmd4c-dev           \
-  libmd4c-html0-dev
+  ninja-build

dist/get_deps_fedora.sh

@@ -4,7 +4,6 @@ dnf install -y      \
   cmake             \
   dbus-devel        \
   file-devel        \
-  fontconfig-devel  \
   freetype-devel    \
   libcurl-devel     \
   gcc-c++           \
@@ -13,10 +12,4 @@ dnf install -y      \
   glfw-devel        \
   lld               \
   mbedtls-devel     \
-  gtk3-devel        \
-  libzstd-devel     \
-  zlib-devel        \
-  bzip2-devel       \
-  xz-devel          \
-  lz4-devel         \
-  libssh2-devel
+  gtk3-devel

dist/get_deps_msys2.sh

@@ -1,23 +1,15 @@
 #!/usr/bin/env sh
 
-pacman -S --needed --noconfirm pactoys unzip git
-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             \
-  libssh2-wincng:p  \
-  md4c:p
+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

dist/get_deps_tumbleweed.sh

@@ -1,23 +0,0 @@
-#!/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          \
-  libssh2-devel    \
-  md4c-devel

dist/imhex.desktop

@@ -1,5 +1,4 @@
 [Desktop Entry]
-Version=1.0
 Name=ImHex
 Comment=ImHex Hex Editor
 GenericName=Hex Editor
@@ -9,10 +8,3 @@ 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

@@ -1,8 +0,0 @@
-<?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,203 +1,104 @@
-#!/usr/bin/env python3
 from pathlib import Path
-import argparse
+import sys
 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():
-    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")
+    if len(sys.argv) < 3:
+        print(f"Usage: {Path(sys.argv[0]).name} <check|translate|update|create> <lang folder path> <language>")
         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
+    command = sys.argv[1]
+    if command not in ["check", "translate", "update", "create"]:
+        print(f"Unknown command: {command}")
+        return 1
 
-        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)
+    print(f"Using langtool in {command} mode")
 
-        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)
+    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)
 
         if command == "create" and lang != "":
-            lang_file_path = lang_folder / Path(lang + ".json")
+            lang_file_path = lang_folder_path / Path(lang + ".json")
             if lang_file_path.exists():
-                continue
+                print(f"Error: Language file {lang_file_path} already exists")
+                return 1
 
-            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}'")
+            print(f"Creating new language file '{lang_file_path.name}'")
 
             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": {}
                 }
                 json.dump(new_lang_data, new_lang_file, indent=4, ensure_ascii=False)
 
-        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"
-            ):
+        for additional_lang_file_path in lang_folder_path.glob("*.json"):
+            if not lang == "" and not additional_lang_file_path.stem == lang:
                 continue
 
-            print(f"\nProcessing '{lang_file_path}'")
-            if not (command == "update" or command == "create"):
-                print("\n----------------------------\n")
+            if additional_lang_file_path.name.startswith(DEFAULT_LANG):
+                continue
 
-            with lang_file_path.open("r+", encoding="utf-8") as target_lang_file:
-                lang_data = json.load(target_lang_file)
+            print(f"\nProcessing file '{additional_lang_file_path.name}'\n----------------------------\n")
 
-                for key, value in default_lang_data.items():
-                    has_translation = (
-                        key in lang_data
-                        and lang_data[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_file_path} 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[key]
-                            if (
-                                reference_lang_data
-                                and key in reference_lang_data
-                            )
-                            else ""
-                        )
-                        print(
-                            f"\033[1m'{key}' '{value}'{reference_tranlsation}\033[0m => ",
-                            end="",
-                        )
-                        if has_translation:
-                            translation = lang_data[key]
-                            print(f" <= \033[1m'{translation}'\033[0m")
-                        print()  # for a new line
-                        if command == "untranslate":
-                            lang_data[key] = INVALID_TRANSLATION
-                            continue
-                        try:
-                            new_value = input("=> ")
-                            lang_data[key] = new_value
-                        except KeyboardInterrupt:
-                            break
-                    elif command == "update" or command == "create":
-                        lang_data[key] = INVALID_TRANSLATION
-                    elif command == "fmtzh":
-                        if has_translation:
-                            lang_data[key] = fmtzh(
-                                lang_data[key]
-                            )
+            with additional_lang_file_path.open("r+", encoding="utf-8") as additional_lang_file:
+                additional_lang_data = json.load(additional_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)
 
                 keys_to_remove = []
-                for key, value in lang_data.items():
-                    if key not in default_lang_data:
+                for key, value in additional_lang_data["translations"].items():
+                    if key not in default_lang_data["translations"]:
                         keys_to_remove.append(key)
+
                 for key in keys_to_remove:
-                    lang_data.pop(key)
-                    print(
-                        f"Removed unused key '{key}' from translation '{lang_file_path}'"
-                    )
+                    additional_lang_data["translations"].pop(key)
+                    print(f"Removed unused key '{key}' from translation '{additional_lang_data['code']}'")
 
-                target_lang_file.seek(0)
-                target_lang_file.truncate()
-                json.dump(
-                    lang_data,
-                    target_lang_file,
-                    indent=4,
-                    sort_keys=True,
-                    ensure_ascii=False,
-                )
+                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)
 
 
-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__":
+if __name__ == '__main__':
     exit(main())

dist/macOS/arm64.Dockerfile

@@ -1,21 +1,10 @@
 # This base image is also known as "crosscompile". See arm64.crosscompile.Dockerfile
-FROM ghcr.io/werwolv/macos-crosscompile:clang20-nosdk as build
+FROM ghcr.io/itrooz/macos-crosscompile:clang17-nosdk as build
 
-ENV MACOSX_DEPLOYMENT_TARGET 13.0
+ENV MACOSX_DEPLOYMENT_TARGET 12.1
 
 # -- 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
 
@@ -46,9 +35,9 @@ EOF
 
 ## Download libmagic
 ### Clone libmagic
-RUN git clone --depth 1 --branch FILE5_46 https://github.com/file/file /mnt/file
+RUN git clone https://github.com/file/file /mnt/file
 ### Download libmagic dependencies
-RUN --mount=type=cache,target=/var/lib/apt/lists/ apt update && apt install -y libtool autoconf
+RUN --mount=type=cache,target=/var/lib/apt/lists/ apt install -y libtool autoconf
 
 # -- DOWNLOADING + BUILDING STUFF
 
@@ -63,12 +52,6 @@ vcpkg install --triplet=arm-osx-mytriplet curl
 vcpkg install --triplet=arm-osx-mytriplet mbedtls
 vcpkg install --triplet=arm-osx-mytriplet freetype
 vcpkg install --triplet=arm-osx-mytriplet josuttis-jthread
-vcpkg install --triplet=arm-osx-mytriplet zlib
-vcpkg install --triplet=arm-osx-mytriplet bzip2
-vcpkg install --triplet=arm-osx-mytriplet liblzma
-vcpkg install --triplet=arm-osx-mytriplet zstd
-vcpkg install --triplet=arm-osx-mytriplet openssl
-vcpkg install --triplet=arm-osx-mytriplet libssh2
 EOF
 
 ## Install glfw3 dep
@@ -119,9 +102,6 @@ if [ "$CUSTOM_GLFW" ]; then
 fi
 EOF
 
-RUN mkdir -p /vcpkg/installed/arm-osx-mytriplet/lib/pkgconfig
-RUN mkdir -p /osxcross/target/macports/pkgs/vcpkg/installed/arm-osx-mytriplet/lib/pkgconfig
-
 ## Build glfw
 RUN --mount=type=cache,target=/cache <<EOF
 set -xe
@@ -131,7 +111,7 @@ if [ "$CUSTOM_GLFW" ]; then
     cd /mnt/glfw
     mkdir build
     cd build
-    CC=o64-clang CXX=o64-clang++ cmake -G "Ninja"       \
+    CC=o64-gcc CXX=o64-g++ cmake -G "Ninja"             \
           -DCMAKE_BUILD_TYPE=$BUILD_TYPE                \
           -DBUILD_SHARED_LIBS=ON                        \
           -DCMAKE_C_COMPILER_LAUNCHER=ccache            \
@@ -139,7 +119,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=13.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=14.0 \
         ..
     ninja -j $JOBS install
 
@@ -161,14 +141,13 @@ 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=13.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=14.0 \
         `# Override compilers for code generators` \
         -DNATIVE_CMAKE_C_COMPILER=/usr/bin/clang -DNATIVE_CMAKE_CXX_COMPILER=/usr/bin/clang++ \
         `# Normal ImHex flags` \
         -DIMHEX_GENERATE_PACKAGE=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
         `# other flags` \
         -DIMHEX_STRICT_WARNINGS=OFF \
-        -DCMAKE_INSTALL_PREFIX=/mnt/ImHex/build/install \
         -B build
 ## Build ImHex
 RUN --mount=type=cache,target=/cache --mount=type=cache,target=/mnt/ImHex/build/_deps <<EOF
@@ -176,11 +155,11 @@ RUN --mount=type=cache,target=/cache --mount=type=cache,target=/mnt/ImHex/build/
     set -xe
 
     cd /mnt/ImHex
-    cmake --build build --parallel $JOBS --target install
+    cmake --build build --parallel $JOBS
 
     ccache -s
 EOF
 
 
 FROM scratch
-COPY --from=build /mnt/ImHex/build/install/imhex.app imhex.app
+COPY --from=build /mnt/ImHex/build/imhex.app imhex.app

dist/macOS/arm64.crosscompile.Dockerfile

@@ -1,4 +1,4 @@
-# This image 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 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,6 +68,19 @@ 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/msys2/PKGBUILD

@@ -16,13 +16,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-file"
              "${MINGW_PACKAGE_PREFIX}-mbedtls"
              "${MINGW_PACKAGE_PREFIX}-polly"
-             "${MINGW_PACKAGE_PREFIX}-freetype"
-             "${MINGW_PACKAGE_PREFIX}-zlib"
-             "${MINGW_PACKAGE_PREFIX}-bzip2"
-             "${MINGW_PACKAGE_PREFIX}-xz"
-             "${MINGW_PACKAGE_PREFIX}-zstd"
-             "${MINGW_PACKAGE_PREFIX}-libssh2-wincng"
-             "${MINGW_PACKAGE_PREFIX}-md4c")
+             "${MINGW_PACKAGE_PREFIX}-freetype")
 
 source=()
 sha256sums=()

dist/net.werwolv.ImHex.metainfo.xml

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-    <id>net.werwolv.ImHex</id>
-    <name>ImHex</name>
-    <summary>Modern REing Hex Editor</summary>
-    <description>
-        <p>
-            ImHex is a modern Hex Editor for Reverse Engineers, Developers, Malware Analysists and Hackers who value
-            their retinas when working at 3 AM once again.
-        </p>
-        <p>
-            Features:
-        </p>
-        <ul>
-            <li>Featureful hex view</li>
-            <li>Custom C++-like pattern language for parsing and highlighting a file's content</li>
-            <li>Data importing and exporting</li>
-            <li>Data inspector allowing interpretation of data as many different types</li>
-            <li>Huge file support with fast and efficient loading</li>
-            <li>Strings search</li>
-            <li>File hashing support</li>
-            <li>Disassembler supporting many different architectures: ARM, x86, PowerPC, MIPS, and more</li>
-            <li>Bookmarks</li>
-            <li>Data analyzer</li>
-            <li>
-                Helpful tools such as an Itanium and MSVC demangler, ASCII table, Regex
-                replacer, mathematical expression evaluator (calculator), hexadecimal
-                color picker and many more
-            </li>
-            <li>Doesn't burn out your retinas when used in late-night sessions</li>
-        </ul>
-    </description>
-    <metadata_license>CC0-1.0</metadata_license>
-    <project_license>GPL-2.0-only</project_license>
-    <developer id="net.werwolv">
-        <name>WerWolv</name>
-    </developer>
-    <url type="homepage">https://imhex.werwolv.net</url>
-    <url type="bugtracker">https://github.com/WerWolv/ImHex/issues</url>
-    <url type="help">https://docs.werwolv.net/imhex</url>
-    <url type="donation">https://www.patreon.com/werwolv</url>
-    <url type="contact">https://imhex.werwolv.net/discord</url>
-    <url type="vcs-browser">https://github.com/WerWolv/ImHex</url>
-    <url type="contribute">https://github.com/WerWolv/ImHex/blob/master/CONTRIBUTING.md</url>
-    <launchable type="desktop-id">imhex.desktop</launchable>
-    <screenshots>
-        <screenshot type="default" width="1920" height="1017">
-            <image type="source">https://raw.githubusercontent.com/flathub/net.werwolv.ImHex/master/screenshots/screenshot1.png</image>
-            <caption>Using a pattern to parse and highlight different sections of an ELF executable file</caption>
-        </screenshot>
-        <screenshot type="default" width="1920" height="1017">
-            <image type="source">https://raw.githubusercontent.com/flathub/net.werwolv.ImHex/master/screenshots/screenshot2.png</image>
-            <caption>Managing bookmarks, diffing two files and decrypting a region of data using the data preprocessor</caption>
-        </screenshot>
-    </screenshots>
-    <content_rating type="oars-1.1"/>
-    <branding>
-        <color type="primary" scheme_preference="light">#babec9</color>
-        <color type="primary" scheme_preference="dark">#0f0f0f</color>
-    </branding>
-    <releases>
-        <release version="1.0.0" date="2025-01-01">
-            <description></description>
-        </release>
-    </releases>
-    <update_contact>hey@werwolv.net</update_contact>
-</component>

dist/net.werwolv.ImHex.yaml

@@ -0,0 +1,61 @@
+app-id: net.werwolv.ImHex
+runtime: org.freedesktop.Platform
+runtime-version: '20.08'
+default-branch: stable
+sdk: org.freedesktop.Sdk
+command: imhex
+
+finish-args:
+  - --share=ipc
+  - --socket=x11
+  - --filesystem=host
+  - --device=all
+
+modules:
+  - name: libiconv
+    sources:
+      - type: archive
+        url: https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz
+        sha256: e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04
+
+  - name: glfw
+    buildsystem: cmake-ninja
+    builddir: true
+    config-opts:
+      - -DCMAKE_BUILD_TYPE=RelWithDebInfo
+      - -DBUILD_SHARED_LIBS:BOOL=ON
+    sources:
+      - type: archive
+        url: https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.zip
+        sha256: 08a33a512f29d7dbf78eab39bd7858576adcc95228c9efe8e4bc5f0f3261efc7
+    cleanup:
+      - /include
+      - /lib/pkgconfig
+
+  - name: mbedtls
+    buildsystem: cmake-ninja
+    config-opts:
+      - -DCMAKE_C_FLAGS=-fPIC
+    sources:
+      - type: archive
+        url: https://github.com/ARMmbed/mbedtls/archive/refs/tags/v2.27.0.tar.gz
+        sha256: 2a07856e541f0e5f6eaee4f78018c52f25bd244ed76f9020dea54a8b02cac6ea
+
+  - name: nlohmann-json
+    buildsystem: cmake-ninja
+    builddir: true
+    config-opts:
+      - -DCMAKE_BUILD_TYPE=RelWithDebInfo
+      - -DBUILD_TESTING=OFF
+
+    sources:
+      - type: archive
+        url: https://github.com/nlohmann/json/archive/v3.9.1.tar.gz
+        sha256: 4cf0df69731494668bdd6460ed8cb269b68de9c19ad8c27abc24cd72605b2d5b
+
+  - name: imhex
+    buildsystem: cmake
+
+    sources:
+      - type: git
+        url: https://github.com/WerWolv/ImHex.git

dist/net.werwolv.imhex.metainfo.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+    <id>imhex</id>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>GPL-2.0</project_license>
+    <name>ImHex</name>
+    <developer_name>WerWolv</developer_name>
+    <update_contact>hey@werwolv.net</update_contact>
+    <summary>A Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM</summary>
+    <description>
+        <p>ImHex is a feature-rich Hex Editor aimed towards Reverse Engineers working with foreign data formats, malware, executables and raw memory. 
+Besides all the features a common Hex Editor has, ImHex also features a custom scripting language used to declare and dissect data structures, support for running YARA rules, a node-based graphical data pre-processor and support for various data sources such as files, raw disks or GDB Servers.</p>
+    </description>
+    <launchable type="desktop-id">imhex.desktop</launchable>
+    <url type="homepage">https://imhex.werwolv.net</url>
+    <screenshots>
+        <screenshot type="default">
+            <image>https://user-images.githubusercontent.com/10835354/139717326-8044769d-527b-4d88-8adf-2d4ecafdca1f.png</image>
+        </screenshot>
+        <screenshot>
+            <image>https://user-images.githubusercontent.com/10835354/139717323-1f8c9d52-f7eb-4f43-9f11-097ac728ed6c.png</image>
+        </screenshot>
+    </screenshots>
+
+    <provides>
+        <id>imhex.desktop</id>
+    </provides>
+
+    <categories>
+        <category>Development</category>
+    </categories>
+
+
+</component>

dist/rpm/imhex.spec

@@ -1,12 +1,10 @@
-%define source_date_epoch_from_changelog 0
-
 Name:           imhex
-Version:        VERSION
+Version:        1.26.2
 Release:        0%{?dist}
 Summary:        A hex editor for reverse engineers and programmers
 
 License:        GPL-2.0-only AND Zlib AND MIT AND Apache-2.0
-# imhex is gplv2.  capstone is custom.
+# imhex is gplv2.  capstone is custom.  nativefiledialog is Zlib.
 # see license dir for full breakdown
 URL:            https://imhex.werwolv.net/
 # We need the archive with deps bundled
@@ -24,41 +22,29 @@ BuildRequires:  libglvnd-devel
 BuildRequires:  glfw-devel
 BuildRequires:  json-devel
 BuildRequires:  libcurl-devel
-BuildRequires:  libarchive-devel
-BuildRequires:  libzstd-devel
-BuildRequires:  zlib-devel
-BuildRequires:  bzip2-devel
-BuildRequires:  xz-devel
 BuildRequires:  llvm-devel
 BuildRequires:  mbedtls-devel
 BuildRequires:  yara-devel
 BuildRequires:  nativefiledialog-extended-devel
-BuildRequires:  lz4-devel
-BuildRequires:  libssh2-devel
-%if 0%{?rhel} == 9
-BuildRequires:  gcc-toolset-14
+BuildRequires:  dotnet-sdk-7.0
+%if 0%{?rhel}
+BuildRequires:  gcc-toolset-12
 %endif
-%if 0%{?fedora} || 0%{?rhel} > 9
-BuildRequires:  capstone-devel
-%endif
-BuildRequires:  lunasvg-devel
-
 
 Provides:       bundled(gnulib)
-%if 0%{?rhel} == 10
-Provides:       bundled(capstone) = 5.0.1
-%endif
-Provides:       bundled(imgui) = 1.90.8
+Provides:       bundled(capstone) = 5.0-rc2
+Provides:       bundled(imgui)
 Provides:       bundled(libromfs)
 Provides:       bundled(microtar)
-Provides:       bundled(libpl) = %{version}
+Provides:       bundled(libpl)
 Provides:       bundled(xdgpp)
-# working on packaging this, bundling for now as to now delay updates
-Provides:       bundled(miniaudio) = 0.11.11
 
+# ftbfs on these arches.  armv7hl might compile when capstone 5.x
+# is released upstream and we can build against it
 # [7:02 PM] WerWolv: We're not supporting 32 bit anyways soooo
 # [11:38 AM] WerWolv: Officially supported are x86_64 and aarch64
-ExclusiveArch:  x86_64 %{arm64}
+ExclusiveArch:  x86_64 %{arm64} ppc64le
+
 
 %description
 ImHex is a Hex Editor, a tool to display, decode and analyze binary data to
@@ -72,31 +58,14 @@ displayed, a disassembler, diffing support, bookmarks and much much more. At the
 same time ImHex is completely free and open source under the GPLv2 language.
 
 
-%package devel
-Summary:        Development files for %{name}
-License:        GPL-2.0-only
-%description devel
-%{summary}
-
-
 %prep
-%autosetup -n ImHex -p1
+%autosetup -n ImHex
 # remove bundled libs we aren't using
-rm -rf lib/third_party/{curl,fmt,llvm,nlohmann_json,yara}
-%if 0%{?fedora} || 0%{?rhel} > 9
-rm -rf lib/third_party/capstone
-%endif
-
-# rhel 9 doesn't support all of the new appstream metainfo tags
-%if 0%{?rhel} && 0%{?rhel} < 10
-sed -i -e '/url type="vcs-browser"/d' \
-	-e '/url type="contribute"/d' \
-	dist/net.werwolv.ImHex.metainfo.xml
-%endif
+rm -rf lib/third_party/{fmt,nlohmann_json,yara}
 
 %build
-%if 0%{?rhel} == 9
-. /opt/rh/gcc-toolset-14/enable
+%if 0%{?rhel}
+. /opt/rh/gcc-toolset-12/enable
 %set_build_flags
 CXXFLAGS+=" -std=gnu++2b"
 %endif
@@ -106,27 +75,23 @@ CXXFLAGS+=" -std=gnu++2b"
  -D IMHEX_OFFLINE_BUILD=ON               \
  -D USE_SYSTEM_NLOHMANN_JSON=ON          \
  -D USE_SYSTEM_FMT=ON                    \
- -D USE_SYSTEM_CURL=ON                   \
- -D USE_SYSTEM_LLVM=ON                   \
- -D USE_SYSTEM_MD4C=OFF                  \
-%if 0%{?fedora} || 0%{?rhel} > 9
- -D USE_SYSTEM_CAPSTONE=ON               \
-%endif
- -D USE_SYSTEM_LUNASVG=ON                \
  -D USE_SYSTEM_YARA=ON                   \
  -D USE_SYSTEM_NFD=ON                    \
- -D IMHEX_ENABLE_UNIT_TESTS=ON           \
-%if 0%{?rhel}
- -D IMHEX_BUILD_HARDENING=OFF
-%endif
-# disable built-in build hardening because it is already
-# done in rhel buildroots.  adding the flags again from
-# upstream generates build errors
+ -D IMHEX_USE_GTK_FILE_PICKER=ON         \
+ -D IMHEX_BUNDLE_DOTNET=OFF              \
+# when capstone >= 5.x is released we should be able to build against \
+# system libs of it \
+# -D USE_SYSTEM_CAPSTONE=ON
 
 %cmake_build
 
 
 %check
+%if 0%{?rhel}
+. /opt/rh/gcc-toolset-12/enable
+%set_build_flags
+CXXFLAGS+=" -std=gnu++2b"
+%endif
 # build binaries required for tests
 %cmake_build --target unit_tests
 %ctest --exclude-regex '(Helpers/StoreAPI|Helpers/TipsAPI|Helpers/ContentAPI)'
@@ -138,16 +103,15 @@ CXXFLAGS+=" -std=gnu++2b"
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 # this is a symlink for the old appdata name that we don't need
-rm -f %{buildroot}%{_metainfodir}/net.werwolv.ImHex.appdata.xml
+rm -f %{buildroot}%{_metainfodir}/net.werwolv.%{name}.appdata.xml
 
 # AppData
-appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/net.werwolv.ImHex.metainfo.xml
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/net.werwolv.%{name}.metainfo.xml
 
 # install licenses
-%if 0%{?rhel} == 9
+cp -a lib/third_party/nativefiledialog/LICENSE                       %{buildroot}%{_datadir}/licenses/%{name}/nativefiledialog-LICENSE
 cp -a lib/third_party/capstone/LICENSE.TXT                           %{buildroot}%{_datadir}/licenses/%{name}/capstone-LICENSE
 cp -a lib/third_party/capstone/suite/regress/LICENSE                 %{buildroot}%{_datadir}/licenses/%{name}/capstone-regress-LICENSE
-%endif
 cp -a lib/third_party/microtar/LICENSE                               %{buildroot}%{_datadir}/licenses/%{name}/microtar-LICENSE
 cp -a lib/third_party/xdgpp/LICENSE                                  %{buildroot}%{_datadir}/licenses/%{name}/xdgpp-LICENSE
 
@@ -156,15 +120,11 @@ cp -a lib/third_party/xdgpp/LICENSE                                  %{buildroot
 %license %{_datadir}/licenses/%{name}/
 %doc README.md
 %{_bindir}/imhex
-%{_datadir}/pixmaps/%{name}.*
+%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/%{name}.desktop
-%{_libdir}/libimhex.so.*
+%{_libdir}/libimhex.so*
 %{_libdir}/%{name}/
-%{_metainfodir}/net.werwolv.ImHex.metainfo.xml
-%exclude %{_bindir}/imhex-updater
-%{_datadir}/mime/packages/%{name}.xml
+%{_metainfodir}/net.werwolv.%{name}.metainfo.xml
 
 
-%files devel
-%{_libdir}/libimhex.so
-%{_datadir}/%{name}/sdk/
+%changelog

dist/snap/snapcraft.yaml

@@ -1,90 +0,0 @@
-name: imhex
-title: ImHex
-base: core24
-version: ${IMHEX_VERSION}
-summary: Hex editor for reverse engineering
-description: ImHex is a hex editor for reverse engineering, reverse engineering, and analyzing binary files. It provides a powerful and flexible interface for working with binary data, including features like pattern matching, scripting, and a customizable user interface.
-grade: stable
-confinement: classic
-contact: https://github.com/WerWolv/ImHex/discussions
-issues: https://github.com/WerWolv/ImHex/issues
-source-code: https://github.com/WerWolv/ImHex
-website: https://imhex.werwolv.net
-donation: https://github.com/sponsors/WerWolv
-license: GPL-2.0-only
-icon: resources/icon.svg
-adopt-info: imhex
-
-platforms:
-  amd64:
-  arm64:
-
-apps:
-  imhex:
-    command: usr/local/bin/imhex
-    desktop: usr/local/share/applications/imhex.desktop
-    environment:
-      LD_LIBRARY_PATH: '$SNAP/usr/local/lib:$SNAP/usr/local/lib/imhex:$SNAP/usr/lib/x86_64-linux-gnu:$SNAP/usr/lib/aarch64-linux-gnu:$LD_LIBRARY_PATH'
-      XDG_DATA_DIRS: '$XDG_DATA_DIRS:$SNAP/usr/local/share:$SNAP/usr/local/lib:$SNAP/usr/local/share'
-      XDG_CONFIG_DIRS: '$XDG_CONFIG_DIRS:$SNAP/usr/local/share'
-      XDG_DATA_HOME: '$XDG_DATA_HOME:$SNAP_DATA'
-
-parts:
-  imhex:
-    plugin: cmake
-    source: .
-    build-environment:
-      - CC: /usr/bin/gcc-14
-      - CXX: /usr/bin/g++-14
-    cmake-parameters:
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DCMAKE_C_COMPILER_LAUNCHER=${CCACHE}
-      - -DCMAKE_CXX_COMPILER_LAUNCHER=${CCACHE}
-    cmake-generator: Ninja
-    build-packages:
-      - cmake
-      - ninja-build
-      - gcc-14
-      - g++-14
-      - git
-      - pkg-config
-      - libglfw3-dev
-      - libmagic-dev
-      - libmbedtls-dev
-      - libfontconfig-dev
-      - libfreetype-dev
-      - libdbus-1-dev
-      - libcurl4-gnutls-dev
-      - libgtk-3-dev
-      - zlib1g-dev
-      - libbz2-dev
-      - liblzma-dev
-      - libzstd-dev
-      - liblz4-dev
-      - libssh2-1-dev
-      - libmd4c-dev
-      - libmd4c-html0-dev
-    stage-packages:
-      - libglfw3
-      - libmagic1
-      - libmbedtls14
-      - libfontconfig1
-      - libfreetype6
-      - libdbus-1-3
-      - libcurl4-gnutls-dev
-      - libgtk-3-0
-      - zlib1g
-      - libbz2-1.0
-      - liblzma5
-      - libzstd1
-      - liblz4-1
-      - libssh2-1
-    prime:
-      - -usr/include/*
-      - -usr/local/include/*
-      - -usr/lib/**/*.a
-      - -usr/local/lib/**/*.a
-      - -usr/lib/**/*.la
-      - -usr/local/lib/**/*.la
-      - -usr/share/doc/*
-      - -usr/share/man/*

dist/vcpkg.json

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

dist/web/Dockerfile

@@ -1,11 +1,11 @@
-FROM emscripten/emsdk:4.0.8 AS build
+FROM emscripten/emsdk:latest 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 pkg-config ninja-build
+RUN apt install -y git ccache autoconf automake libtool cmake pkg-config
 
 RUN <<EOF
 # Install vcpkg
@@ -13,7 +13,6 @@ 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
@@ -28,7 +27,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
@@ -38,15 +37,11 @@ mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
 /vcpkg/vcpkg install --triplet=wasm32-emscripten libmagic
 /vcpkg/vcpkg install --triplet=wasm32-emscripten freetype
 /vcpkg/vcpkg install --triplet=wasm32-emscripten mbedtls
-/vcpkg/vcpkg install --triplet=wasm32-emscripten zlib
-/vcpkg/vcpkg install --triplet=wasm32-emscripten bzip2
-/vcpkg/vcpkg install --triplet=wasm32-emscripten liblzma
-/vcpkg/vcpkg install --triplet=wasm32-emscripten zstd
 EOF
 
 # Build ImHex
 ARG JOBS=4
-ENV CCACHE_DIR=/cache/ccache
+ENV CCACHE_DIR /cache/ccache
 
 RUN mkdir /build
 WORKDIR /build
@@ -56,38 +51,29 @@ RUN --mount=type=cache,target=/cache \
 set -xe
 ccache -zs
 
-/vcpkg/downloads/tools/cmake-*/cmake-*/bin/cmake /imhex                                                                                            \
-    -G "Ninja"                                                                                          \
+cmake /imhex                                                                                            \
     -DIMHEX_OFFLINE_BUILD=ON                                                                            \
     -DIMHEX_STATIC_LINK_PLUGINS=ON                                                                      \
-    -DIMHEX_EXCLUDE_PLUGINS="script_loader;remote"                                                      \
-    -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                                                                   \
-    -DIMHEX_ENABLE_PLUGIN_TESTS=OFF                                                                     \
     -DCMAKE_BUILD_TYPE=Release
 
-ninja -j $JOBS
+make -j $JOBS
 
 cp /imhex/dist/web/source/* /build
 ccache -s
 EOF
 
-# 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
+FROM scratch
 COPY --from=build [             \
     # ImHex                     \
     "/build/imhex.wasm",        \
-    "/build/imhex.wasm.size",   \
     "/build/imhex.js",          \
+    "/build/imhex.worker.js",   \
                                 \
     # Static files              \
     "/build/index.html",        \
@@ -95,14 +81,9 @@ COPY --from=build [             \
     "/build/wasm-config.js",    \
     "/build/enable-threads.js", \
     "/build/favicon.ico",       \
-    "/build/icon.svg",          \
+    "/build/icon.png",          \
     "/build/manifest.json",     \
-    "/build/robots.txt",        \
-    "/build/sitemap.xml",       \
                                 \
     # Destination               \
     "./"                        \
-]
-
-FROM nginx
-COPY --from=raw . /usr/share/nginx/html
+]

dist/web/compose.yml

@@ -1,10 +0,0 @@
-# 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,12 +2,10 @@
 
 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

@@ -1,11 +0,0 @@
-<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

@@ -1,22 +1,23 @@
 <!doctype html>
 <html lang="en-us">
 <head>
-    <title>ImHex Web - Free Online Hex Editor for Reverse Engineers</title>
-
-    <link rel="manifest" href="manifest.json">
+    <link rel="manifest" href="manifest.json" />
+    <meta charset="utf-8">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
     <!-- Primary Meta Tags -->
+    <title>ImHex Web - Online Hex Editor</title>
     <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.">
+    <meta name="description" content="A Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM.">
     <link rel="icon" type="image/x-icon" href="favicon.ico">
-    <link rel="apple-touch-icon" href="icon.svg">
 
     <!-- Open Graph / Facebook -->
     <meta property="og:type" content="website">
     <meta property="og:url" content="https://imhex.werwolv.net/">
     <meta property="og:title" content="ImHex Web - Online Hex Editor">
+    <meta property="og:description">
+    <meta name="description" content="A Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM.">
     <meta property="og:image" content="https://imhex.werwolv.net/assets/splash_wasm.png">
 
     <!-- Twitter -->
@@ -27,7 +28,9 @@
           content="A Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM.">
     <meta property="twitter:image" content="https://imhex.werwolv.net/assets/splash_wasm.png">
 
-    <link rel="stylesheet" type="text/css" href="style.css">
+    <meta name="viewport" content="width=device-width">
+
+    <link rel="stylesheet" type="text/css" href="style.css" />
 
     <script type="application/ld+json">
         {
@@ -38,7 +41,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.svg"
+            "logo": "https://imhex.werwolv.net/assets/logos/logo.png"
         }
     </script>
 
@@ -57,48 +60,15 @@
         }
     </script>
 
+    <title>ImHex Web</title>
     <script src="enable-threads.js"></script>
     <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.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>
+    <p id="loading_text">ImHex is loading...</p>
+    <canvas class="emscripten" id="canvas" oncontextmenu="event.preventDefault()"></canvas>
 
-    <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>
-
-
-
-    <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>
+    <script type="text/javascript" src="wasm-config.js"></script>
+    <script async type="text/javascript" src="imhex.js"></script>
 </body>
 </html>

dist/web/source/manifest.json

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

dist/web/source/robots.txt

@@ -1,4 +0,0 @@
-User-agent: *
-Allow: /
-
-Sitemap: https://imhex.werwolv.net/sitemap.xml

dist/web/source/sitemap.xml

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<urlset
-      xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      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>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

@@ -1,6 +1,6 @@
 html, body {
     height: 100%;
-    margin: 0;
+    margin: 0px;
     user-select: none;
 }
 
@@ -16,173 +16,21 @@ body {
     margin-left: auto;
     margin-right: auto;
     display: none;
-    border: 0 none;
-    image-rendering: smooth;
+    border: 0px none;
 }
 
-h1, h2, h5 {
-    color: #F0F0F0;
-    font-size: 20px;
-    font-family: monospace;
-    width: 100%;
-    text-align: center;
-    margin-top: 60px;
-    margin-bottom: 10px;
-}
-
-h2 {
-    margin-top: 15px;
-    font-size: 17px;
-}
-
-h5 {
-    margin-top: 0;
-    font-size: 17px;
-}
-
-#not_working {
-    opacity: 0;
-}
-
-#not_working.visible {
-    opacity: 1;
-    transition: opacity 2s ease;
-}
-
-a {
-    color: #7893ff;
-    text-decoration: none;
-}
-
-a:hover {
-    text-shadow: #3a4677 0 0 10px;
-}
-
-.footer {
-    width: 100%;
-    height: 20px;
-    position: absolute;
-    bottom: 0;
-    text-align: center;
-    color: #F0F0F0;
-    background-color: #0A0A0A;
-    padding: 10px;
-    font-family: monospace;
-    font-size: 15px;
-
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    flex-direction: row;
-    gap: 10%;
-}
-
-.centered {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-
+.canvas_full_screen {
     width: 100%;
     height: 100%;
-}
-
-
-.lds-ripple {
-    display: inline-block;
-    position: relative;
-    width: 80px;
-    height: 80px;
-}
-.lds-ripple div {
-    position: absolute;
-    border: 4px solid #fff;
-    opacity: 1;
-    border-radius: 50%;
-    animation: lds-ripple 1s cubic-bezier(0, 0.2, 0.8, 1) infinite;
-}
-.lds-ripple div:nth-child(2) {
-    animation-delay: -0.5s;
-}
-@keyframes lds-ripple {
-    0% {
-        top: 36px;
-        left: 36px;
-        width: 0;
-        height: 0;
-        opacity: 0;
-    }
-    4.9% {
-        top: 36px;
-        left: 36px;
-        width: 0;
-        height: 0;
-        opacity: 0;
-    }
-    5% {
-        top: 36px;
-        left: 36px;
-        width: 0;
-        height: 0;
-        opacity: 1;
-    }
-    100% {
-        top: 0;
-        left: 0;
-        width: 72px;
-        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;
+}
+
+#loading_text {
+    color: #F0F0F0;
+    font-size: 30px;
+    font-family: monospace;
+    width: 100%;
+    text-align: center;
 }

dist/web/source/wasm-config.js

@@ -1,68 +1,3 @@
-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 = async (responsePromise, ...args) => {
-        // Do not collect wasm content length here see above
-        let response = await responsePromise
-        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) {
@@ -95,181 +30,41 @@ function glfwCreateStandardCursorCustom(shape) {
     return shape
 }
 
-var notWorkingTimer = setTimeout(() => {
-    document.getElementById("not_working").classList.add("visible")
-}, 5000);
-
 var Module = {
     preRun:  [],
-    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));
-            }
-        };
-    },
+    postRun: [],
     onRuntimeInitialized: function() {
         // Triggered when the wasm module is loaded and ready to use.
-        document.getElementById("loading").style.display = "none"
+        document.getElementById("loading_text").style.display = "none"
         document.getElementById("canvas").style.display = "initial"
-
-        clearTimeout(notWorkingTimer);
     },
     print:   (function() { })(),
-    printErr: function(text) {  },
+    printErr: function(text) { },
     canvas: (function() {
-        const canvas = document.getElementById('canvas');
-        canvas.addEventListener("webglcontextlost", function(e) {
-            alert('WebGL context lost, please reload the page');
-            e.preventDefault();
-        }, false);
+        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);
 
-        // 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');
-        }
+        return canvas;
     })(),
     setStatus: function(text) { },
     totalDependencies: 0,
-    monitorRunDependencies: function(left) {
-    },
-    instantiateWasm: async function(imports, successCallback) {
+    monitorRunDependencies: function(left) { },
+    instantiateWasm: function(imports, successCallback) {
         imports.env.glfwSetCursor = glfwSetCursorCustom
         imports.env.glfwCreateStandardCursor = glfwCreateStandardCursorCustom
-        let result = await instantiateAsync(null, findWasmBinary(), imports);
-        successCallback(result.instance, result.module)
-    },
-    arguments: []
+        instantiateAsync(wasmBinary, wasmBinaryFile, imports, (result) => successCallback(result.instance, result.module));
+    }
 };
 
-// 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"));
-} else if (urlParams.has("save-editor")) {
-    Module["arguments"].push("--save-editor");
-    Module["arguments"].push("gist");
-    Module["arguments"].push(urlParams.get("save-editor"));
-}
 
 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);
-}
 
-// Prevent some default browser shortcuts from preventing ImHex ones to work
-document.addEventListener('keydown', e => {
-    if (e.ctrlKey) {
-        if (e.which == 83) e.preventDefault();
-    }
-})
+    canvas.classList.add("canvas_full_screen")
+}

lib/libimhex/CMakeLists.txt

@@ -2,6 +2,7 @@ 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
@@ -13,10 +14,8 @@ set(LIBIMHEX_SOURCES
         source/api/project_file_manager.cpp
         source/api/theme_manager.cpp
         source/api/layout_manager.cpp
-        source/api/workspace_manager.cpp
         source/api/achievement_manager.cpp
         source/api/localization_manager.cpp
-        source/api/tutorial_manager.cpp
 
         source/data_processor/attribute.cpp
         source/data_processor/link.cpp
@@ -34,75 +33,74 @@ set(LIBIMHEX_SOURCES
         source/helpers/patches.cpp
         source/helpers/encoding_file.cpp
         source/helpers/logger.cpp
+        source/helpers/stacktrace.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/helpers/udp_server.cpp
-        source/helpers/scaling.cpp
-
-        source/test/tests.cpp
 
         source/providers/provider.cpp
-        source/providers/cached_provider.cpp
-        source/providers/memory_provider.cpp
         source/providers/undo/stack.cpp
 
         source/ui/imgui_imhex_extensions.cpp
         source/ui/view.cpp
         source/ui/popup.cpp
-        source/ui/toast.cpp
-        source/ui/banner.cpp
 
         source/subcommands/subcommands.cpp
 )
 
 if (APPLE)
-    set(OSX_SDK_PATH  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.sdk)
+    set(OSX_11_0_SDK_PATH  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk)
     if (NOT CMAKE_OSX_SYSROOT)
-        if (IS_DIRECTORY ${OSX_SDK_PATH})
-            set(CMAKE_OSX_SYSROOT ${OSX_SDK_PATH})
+        if (IS_DIRECTORY ${OSX_11_0_SDK_PATH})
+            set(CMAKE_OSX_SYSROOT ${OSX_11_0_SDK_PATH})
         else ()
-            message(WARNING "CMAKE_OSX_SYSROOT not set and macOS SDK not found! Using default one.")
+            message(WARNING "CMAKE_OSX_SYSROOT not set and macOS 10.9 SDK not found! Using default one.")
         endif ()
     endif ()
 
-    set(LIBIMHEX_SOURCES ${LIBIMHEX_SOURCES}
-            source/helpers/utils_macos.m
-            source/helpers/macos_menu.m
-    )
+    set(LIBIMHEX_SOURCES ${LIBIMHEX_SOURCES} source/helpers/utils_macos.m)
 endif ()
 
-if (IMHEX_EXTERNAL_PLUGIN_BUILD)
-    add_library(libimhex IMPORTED SHARED GLOBAL)
-    set(LIBIMHEX_LIBRARY_TYPE INTERFACE)
+add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+
+if (IMHEX_STATIC_LINK_PLUGINS)
+    add_library(libimhex STATIC ${LIBIMHEX_SOURCES})
 else()
-    if (IMHEX_STATIC_LINK_PLUGINS)
-        add_library(libimhex STATIC ${LIBIMHEX_SOURCES})
-    else()
-        add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
-    endif()
-
-    if (IMHEX_ENABLE_CXX_MODULES)
-        target_sources(libimhex
-                PUBLIC
-                FILE_SET cxx_modules TYPE CXX_MODULES
-                FILES
-                include/hex.cppm
-        )
-    endif()
-
-    set(LIBIMHEX_LIBRARY_TYPE PUBLIC)
-    target_compile_definitions(libimhex PRIVATE IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+    add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
 endif()
 
-addCppCheck(libimhex)
+set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+enableUnityBuild(libimhex)
+setupCompilerFlags(libimhex)
+
+include(GenerateExportHeader)
+generate_export_header(libimhex)
+
+target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIR} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS} ${LIBBACKTRACE_INCLUDE_DIRS})
+target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+
+if (NOT EMSCRIPTEN)
+    # curl is only used in non-emscripten builds
+    target_include_directories(libimhex PUBLIC  ${CURL_INCLUDE_DIRS})
+    target_link_libraries(libimhex PUBLIC ${LIBCURL_LIBRARIES})
+endif()
 
 
-if (DEFINED IMHEX_COMMIT_HASH_LONG AND DEFINED IMHEX_COMMIT_BRANCH)
+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 ${FMT_LIBRARIES})
+target_link_libraries(libimhex PUBLIC dl ${IMGUI_LIBRARIES} ${NFD_LIBRARIES} magic ${CAPSTONE_LIBRARIES} LLVMDemangle microtar ${NLOHMANN_JSON_LIBRARIES} ${YARA_LIBRARIES} ${MBEDTLS_LIBRARIES} ${LIBBACKTRACE_LIBRARIES} plcli libpl libpl-gen ${MINIAUDIO_LIBRARIES} ${JTHREAD_LIBRARIES} wolv::utils wolv::io wolv::hash wolv::net wolv::containers wolv::math_eval)
+
+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)
     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
@@ -112,7 +110,15 @@ else()
             OUTPUT_VARIABLE GIT_BRANCH
             OUTPUT_STRIP_TRAILING_WHITESPACE
             RESULT_VARIABLE RESULT_BRANCH
-            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
     )
 
     execute_process(
@@ -121,73 +127,15 @@ else()
             OUTPUT_VARIABLE GIT_COMMIT_HASH_LONG
             OUTPUT_STRIP_TRAILING_WHITESPACE
             RESULT_VARIABLE RESULT_HASH_LONG
-            ERROR_QUIET
     )
 endif ()
 
-if (GIT_COMMIT_HASH_LONG STREQUAL "" OR GIT_BRANCH STREQUAL "")
-    message(WARNING "Failed to to determine commit hash/branch")
-else()
+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}\"")
     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}\"")
 
-string(TIMESTAMP IMHEX_BUILD_DATE UTC)
-addDefineToSource(source/api/imhex_api.cpp "IMHEX_BUILD_DATE=\"${IMHEX_BUILD_DATE}\"")
-
-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)
-        find_library(USERNOTIFICATIONS NAMES UserNotifications)
-        target_link_libraries(libimhex PUBLIC ${FOUNDATION} ${USERNOTIFICATIONS})
-    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 (IMHEX_ENABLE_IMGUI_TEST_ENGINE)
-        target_link_libraries(libimhex PUBLIC imgui_test_engine)
-    endif()
-
-    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} tracing)
-
-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 "")
+add_dependencies(imhex_all libimhex)

lib/libimhex/LICENSE

@@ -1,502 +0,0 @@
-                  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.cppm

@@ -1,58 +0,0 @@
-module;
-
-#include <cmath>
-#include <map>
-#include <string>
-#include <string_view>
-#include <vector>
-#include <exception>
-#include <algorithm>
-#include <locale>
-#include <array>
-#include <filesystem>
-#include <functional>
-#include <memory>
-#include <list>
-#include <atomic>
-#include <ranges>
-#include <fstream>
-#include <thread>
-#include <future>
-
-#include <fmt/format.h>
-#include <nlohmann/json.hpp>
-#include <wolv/io/file.hpp>
-
-#include <imgui.h>
-#include <imgui_internal.h>
-#include <hex/ui/imgui_imhex_extensions.h>
-
-#include <hex/helpers/auto_reset.hpp>
-#include <hex/api/event_manager.hpp>
-#include <hex/providers/provider.hpp>
-#include <hex/providers/provider_data.hpp>
-#include <hex/data_processor/node.hpp>
-#include <hex/data_processor/link.hpp>
-#include <hex/data_processor/attribute.hpp>
-#include <pl/pattern_language.hpp>
-
-export module hex;
-
-#define HEX_MODULE_EXPORT
-
-#include <hex/api/imhex_api/bookmarks.hpp>
-#include <hex/api/imhex_api/hex_editor.hpp>
-#include <hex/api/imhex_api/fonts.hpp>
-#include <hex/api/imhex_api/messaging.hpp>
-#include <hex/api/imhex_api/provider.hpp>
-#include <hex/api/imhex_api/system.hpp>
-
-#include <hex/api/task_manager.hpp>
-#include <hex/api/achievement_manager.hpp>
-#include <hex/api/layout_manager.hpp>
-#include <hex/api/localization_manager.hpp>
-#include <hex/api/plugin_manager.hpp>
-#include <hex/api/shortcut_manager.hpp>
-#include <hex/api/theme_manager.hpp>
-#include <hex/api/tutorial_manager.hpp>
-#include <hex/api/workspace_manager.hpp>

lib/libimhex/include/hex.hpp

@@ -1,9 +1,4 @@
 #pragma once
 
 #include <hex/helpers/types.hpp>
-
-#if defined(HEX_MODULE_EXPORT)
-    #define EXPORT_MODULE export
-#else
-    #define EXPORT_MODULE
-#endif
+#include <hex/helpers/intrinsics.hpp>

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

@@ -13,31 +13,29 @@
 
 #include <imgui.h>
 #include <hex/ui/imgui_imhex_extensions.h>
-#include <hex/api/localization_manager.hpp>
-#include <hex/helpers/auto_reset.hpp>
 
-EXPORT_MODULE namespace hex {
+namespace hex {
 
     class AchievementManager;
 
     class Achievement {
     public:
-        explicit Achievement(UnlocalizedString unlocalizedCategory, UnlocalizedString unlocalizedName) : m_unlocalizedCategory(std::move(unlocalizedCategory)), m_unlocalizedName(std::move(unlocalizedName)) { }
+        explicit Achievement(std::string unlocalizedCategory, std::string unlocalizedName) : m_unlocalizedCategory(std::move(unlocalizedCategory)), m_unlocalizedName(std::move(unlocalizedName)) { }
 
         /**
          * @brief Returns the unlocalized name of the achievement
          * @return Unlocalized name of the achievement
          */
-        [[nodiscard]] const UnlocalizedString &getUnlocalizedName() const {
-            return m_unlocalizedName;
+        [[nodiscard]] const std::string &getUnlocalizedName() const {
+            return this->m_unlocalizedName;
         }
 
         /**
          * @brief Returns the unlocalized category of the achievement
          * @return Unlocalized category of the achievement
          */
-        [[nodiscard]] const UnlocalizedString &getUnlocalizedCategory() const {
-            return m_unlocalizedCategory;
+        [[nodiscard]] const std::string &getUnlocalizedCategory() const {
+            return this->m_unlocalizedCategory;
         }
 
         /**
@@ -45,7 +43,7 @@ EXPORT_MODULE namespace hex {
          * @return Whether the achievement is unlocked
          */
         [[nodiscard]] bool isUnlocked() const {
-            return m_progress == m_maxProgress;
+            return this->m_progress == this->m_maxProgress;
         }
 
         /**
@@ -54,7 +52,7 @@ EXPORT_MODULE namespace hex {
          * @return Reference to the achievement
          */
         Achievement& setDescription(std::string description) {
-            m_unlocalizedDescription = std::move(description);
+            this->m_unlocalizedDescription = std::move(description);
 
             return *this;
         }
@@ -65,7 +63,7 @@ EXPORT_MODULE namespace hex {
          * @return Reference to the achievement
          */
         Achievement& addRequirement(std::string requirement) {
-            m_requirements.emplace_back(std::move(requirement));
+            this->m_requirements.emplace_back(std::move(requirement));
 
             return *this;
         }
@@ -76,7 +74,7 @@ EXPORT_MODULE namespace hex {
          * @return Reference to the achievement
          */
         Achievement& addVisibilityRequirement(std::string requirement) {
-            m_visibilityRequirements.emplace_back(std::move(requirement));
+            this->m_visibilityRequirements.emplace_back(std::move(requirement));
 
             return *this;
         }
@@ -86,7 +84,7 @@ EXPORT_MODULE namespace hex {
          * @return Reference to the achievement
          */
         Achievement& setBlacked() {
-            m_blacked = true;
+            this->m_blacked = true;
 
             return *this;
         }
@@ -96,7 +94,7 @@ EXPORT_MODULE namespace hex {
          * @return Reference to the achievement
          */
         Achievement& setInvisible() {
-            m_invisible = true;
+            this->m_invisible = true;
 
             return *this;
         }
@@ -106,7 +104,7 @@ EXPORT_MODULE namespace hex {
          * @return Whether the achievement is blacked
          */
         [[nodiscard]] bool isBlacked() const {
-            return m_blacked;
+            return this->m_blacked;
         }
 
         /**
@@ -114,7 +112,7 @@ EXPORT_MODULE namespace hex {
          * @return Whether the achievement is invisible
          */
         [[nodiscard]] bool isInvisible() const {
-            return m_invisible;
+            return this->m_invisible;
         }
 
         /**
@@ -122,7 +120,7 @@ EXPORT_MODULE namespace hex {
          * @return List of requirements of the achievement
          */
         [[nodiscard]] const std::vector<std::string> &getRequirements() const {
-            return m_requirements;
+            return this->m_requirements;
         }
 
         /**
@@ -130,15 +128,15 @@ EXPORT_MODULE namespace hex {
          * @return List of visibility requirements of the achievement
          */
         [[nodiscard]] const std::vector<std::string> &getVisibilityRequirements() const {
-            return m_visibilityRequirements;
+            return this->m_visibilityRequirements;
         }
 
         /**
          * @brief Returns the unlocalized description of the achievement
          * @return Unlocalized description of the achievement
          */
-        [[nodiscard]] const UnlocalizedString &getUnlocalizedDescription() const {
-            return m_unlocalizedDescription;
+        [[nodiscard]] const std::string &getUnlocalizedDescription() const {
+            return this->m_unlocalizedDescription;
         }
 
         /**
@@ -146,15 +144,15 @@ EXPORT_MODULE namespace hex {
          * @return Icon of the achievement
          */
         [[nodiscard]] const ImGuiExt::Texture &getIcon() const {
-            if (m_iconData.empty())
+            if (this->m_iconData.empty())
+                return this->m_icon;
+
+            if (this->m_icon.isValid())
                 return m_icon;
 
-            if (m_icon.isValid())
-                return m_icon;
+            this->m_icon = ImGuiExt::Texture(this->m_iconData.data(), this->m_iconData.size());
 
-            m_icon = ImGuiExt::Texture::fromImage(m_iconData.data(), m_iconData.size(), ImGuiExt::Texture::Filter::Linear);
-
-            return m_icon;
+            return this->m_icon;
         }
 
         /**
@@ -163,9 +161,9 @@ EXPORT_MODULE namespace hex {
          * @return Reference to the achievement
          */
         Achievement& setIcon(std::span<const std::byte> data) {
-            m_iconData.reserve(data.size());
+            this->m_iconData.reserve(data.size());
             for (auto &byte : data)
-                m_iconData.emplace_back(static_cast<u8>(byte));
+                this->m_iconData.emplace_back(static_cast<u8>(byte));
 
             return *this;
         }
@@ -176,7 +174,7 @@ EXPORT_MODULE namespace hex {
          * @return Reference to the achievement
          */
         Achievement& setIcon(std::span<const u8> data) {
-            m_iconData.assign(data.begin(), data.end());
+            this->m_iconData.assign(data.begin(), data.end());
 
             return *this;
         }
@@ -187,7 +185,7 @@ EXPORT_MODULE namespace hex {
          * @return Reference to the achievement
          */
         Achievement& setIcon(std::vector<u8> data) {
-            m_iconData = std::move(data);
+            this->m_iconData = std::move(data);
 
             return *this;
         }
@@ -198,9 +196,9 @@ EXPORT_MODULE namespace hex {
          * @return Reference to the achievement
          */
         Achievement& setIcon(const std::vector<std::byte> &data) {
-            m_iconData.reserve(data.size());
+            this->m_iconData.reserve(data.size());
             for (auto &byte : data)
-                m_iconData.emplace_back(static_cast<u8>(byte));
+                this->m_iconData.emplace_back(static_cast<u8>(byte));
 
             return *this;
         }
@@ -211,7 +209,7 @@ EXPORT_MODULE namespace hex {
          * @return Reference to the achievement
          */
         Achievement& setRequiredProgress(u32 progress) {
-            m_maxProgress = progress;
+            this->m_maxProgress = progress;
 
             return *this;
         }
@@ -221,7 +219,7 @@ EXPORT_MODULE namespace hex {
          * @return Required progress to unlock the achievement
          */
         [[nodiscard]] u32 getRequiredProgress() const {
-            return m_maxProgress;
+            return this->m_maxProgress;
         }
 
         /**
@@ -229,7 +227,7 @@ EXPORT_MODULE namespace hex {
          * @return Current progress of the achievement
          */
         [[nodiscard]] u32 getProgress() const {
-            return m_progress;
+            return this->m_progress;
         }
 
         /**
@@ -237,7 +235,7 @@ EXPORT_MODULE namespace hex {
          * @param callback Callback to call when the achievement is clicked
          */
         void setClickCallback(const std::function<void(Achievement &)> &callback) {
-            m_clickCallback = callback;
+            this->m_clickCallback = callback;
         }
 
         /**
@@ -245,7 +243,7 @@ EXPORT_MODULE namespace hex {
          * @return Callback to call when the achievement is clicked
          */
         [[nodiscard]] const std::function<void(Achievement &)> &getClickCallback() const {
-            return m_clickCallback;
+            return this->m_clickCallback;
         }
 
         /**
@@ -253,7 +251,7 @@ EXPORT_MODULE namespace hex {
          * @return Whether the achievement is temporary
          */
         [[nodiscard]] bool isTemporary() const {
-            return m_temporary;
+            return this->m_temporary;
         }
 
         /**
@@ -262,21 +260,21 @@ EXPORT_MODULE namespace hex {
          */
         void setUnlocked(bool unlocked) {
             if (unlocked) {
-                if (m_progress < m_maxProgress)
-                    m_progress++;
+                if (this->m_progress < this->m_maxProgress)
+                    this->m_progress++;
             } else {
-                m_progress = 0;
+                this->m_progress = 0;
             }
         }
 
     protected:
         void setProgress(u32 progress) {
-            m_progress = progress;
+            this->m_progress = progress;
         }
 
     private:
-        UnlocalizedString m_unlocalizedCategory, m_unlocalizedName;
-        UnlocalizedString m_unlocalizedDescription;
+        std::string m_unlocalizedCategory, m_unlocalizedName;
+        std::string m_unlocalizedDescription;
 
         bool m_blacked = false;
         bool m_invisible = false;
@@ -296,7 +294,6 @@ EXPORT_MODULE namespace hex {
     };
 
     class AchievementManager {
-        static bool s_initialized;
     public:
         AchievementManager() = delete;
 
@@ -311,15 +308,11 @@ EXPORT_MODULE namespace hex {
             }
 
             [[nodiscard]] bool isUnlockable() const {
-                return std::ranges::all_of(this->parents, [](const auto &parent) {
-                    return parent->achievement->isUnlocked();
-                });
+                return std::all_of(this->parents.begin(), this->parents.end(), [](auto &parent) { return parent->achievement->isUnlocked(); });
             }
 
             [[nodiscard]] bool isVisible() const {
-                return std::ranges::all_of(this->visibilityParents, [](const auto &parent) {
-                    return parent->achievement->isUnlocked();
-                });
+                return std::all_of(this->visibilityParents.begin(), this->visibilityParents.end(), [](auto &parent) { return parent->achievement->isUnlocked(); });
             }
 
             [[nodiscard]] bool isUnlocked() const {
@@ -337,7 +330,18 @@ EXPORT_MODULE namespace hex {
         static Achievement& addAchievement(auto && ... args) {
             auto newAchievement = std::make_unique<T>(std::forward<decltype(args)>(args)...);
 
-            return addAchievementImpl(std::move(newAchievement));
+            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;
         }
 
         /**
@@ -360,13 +364,13 @@ EXPORT_MODULE namespace hex {
          * @param unlocalizedCategory Unlocalized category of the achievement
          * @param unlocalizedName Unlocalized name of the achievement
          */
-        static void unlockAchievement(const UnlocalizedString &unlocalizedCategory, const UnlocalizedString &unlocalizedName);
+        static void unlockAchievement(const std::string &unlocalizedCategory, const std::string &unlocalizedName);
 
         /**
          * @brief Returns all registered achievements
          * @return All achievements
          */
-        static const std::unordered_map<UnlocalizedString, std::unordered_map<UnlocalizedString, std::unique_ptr<Achievement>>>& getAchievements();
+        static std::unordered_map<std::string, std::unordered_map<std::string, std::unique_ptr<Achievement>>>& getAchievements();
 
         /**
          * @brief Returns all achievement start nodes
@@ -374,14 +378,14 @@ EXPORT_MODULE namespace hex {
          * @param rebuild Whether to rebuild the list of start nodes
          * @return All achievement start nodes
          */
-        static const std::unordered_map<UnlocalizedString, std::vector<AchievementNode*>>& getAchievementStartNodes(bool rebuild = true);
+        static std::unordered_map<std::string, 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 const std::unordered_map<UnlocalizedString, std::list<AchievementNode>>& getAchievementNodes(bool rebuild = true);
+        static std::unordered_map<std::string, std::list<AchievementNode>>& getAchievementNodes(bool rebuild = true);
 
         /**
          * @brief Loads the progress of all achievements from the achievements save file
@@ -393,6 +397,11 @@ EXPORT_MODULE namespace hex {
          */
         static void storeProgress();
 
+        /**
+         * @brief Removes all registered achievements from the tree
+         */
+        static void clear();
+
         /**
          * @brief Removes all temporary achievements from the tree
          */
@@ -406,8 +415,6 @@ EXPORT_MODULE namespace hex {
 
     private:
         static void achievementAdded();
-
-        static Achievement& addAchievementImpl(std::unique_ptr<Achievement> &&newAchievement);
     };
 
-}
+}

lib/libimhex/include/hex/api/content_registry/background_services.hpp

@@ -1,22 +0,0 @@
-#pragma once
-
-#include <hex.hpp>
-
-#include <functional>
-#include <hex/api/localization_manager.hpp>
-
-EXPORT_MODULE namespace hex {
-
-    /* Background Service Registry. Allows adding new background services */
-    namespace ContentRegistry::BackgroundServices {
-
-        namespace impl {
-            using Callback = std::function<void()>;
-
-            void stopServices();
-        }
-
-        void registerService(const UnlocalizedString &unlocalizedString, const impl::Callback &callback);
-    }
-
-}

lib/libimhex/include/hex/api/content_registry/command_palette.hpp

@@ -1,104 +0,0 @@
-#pragma once
-
-#include <hex.hpp>
-
-#include <hex/api/localization_manager.hpp>
-
-#include <string>
-#include <functional>
-#include <optional>
-#include <vector>
-
-EXPORT_MODULE namespace hex {
-
-    /* Command Palette Command Registry. Allows adding of new commands to the command palette */
-    namespace ContentRegistry::CommandPalette {
-
-        enum class Type : u32 {
-            SymbolCommand,
-            KeywordCommand
-        };
-
-        namespace impl {
-
-            using QueryResultCallback = std::function<void(std::string)>;
-
-            struct QueryResult {
-                std::string name;
-                QueryResultCallback callback;
-            };
-
-            using ContentDisplayCallback = std::function<void()>;
-            using DisplayCallback = std::function<std::string(std::string)>;
-            using ExecuteCallback = std::function<std::optional<std::string>(std::string)>;
-            using QueryCallback   = std::function<std::vector<QueryResult>(std::string)>;
-
-            struct Entry {
-                Type type;
-                std::string command;
-                UnlocalizedString unlocalizedDescription;
-                DisplayCallback displayCallback;
-                ExecuteCallback executeCallback;
-            };
-
-            struct Handler {
-                Type type;
-                std::string command;
-                QueryCallback queryCallback;
-                DisplayCallback displayCallback;
-            };
-
-            struct ContentDisplay {
-                bool showSearchBox;
-                ContentDisplayCallback callback;
-            };
-
-            const std::vector<Entry>& getEntries();
-            const std::vector<Handler>& getHandlers();
-
-            std::optional<ContentDisplay>& getDisplayedContent();
-
-        }
-
-        /**
-         * @brief Adds a new command to the command palette
-         * @param type The type of the command
-         * @param command The command to add
-         * @param unlocalizedDescription The description of the command
-         * @param displayCallback The callback that will be called when the command is displayed in the command palette
-         * @param executeCallback The callback that will be called when the command is executed
-         */
-        void add(
-            Type type,
-            const std::string &command,
-            const UnlocalizedString &unlocalizedDescription,
-            const impl::DisplayCallback &displayCallback,
-            const impl::ExecuteCallback &executeCallback = [](auto) { return std::nullopt; });
-
-        /**
-         * @brief Adds a new command handler to the command palette
-         * @param type The type of the command
-         * @param command The command to add
-         * @param queryCallback The callback that will be called when the command palette wants to load the name and callback items
-         * @param displayCallback The callback that will be called when the command is displayed in the command palette
-         */
-        void addHandler(
-            Type type,
-            const std::string &command,
-            const impl::QueryCallback &queryCallback,
-            const impl::DisplayCallback &displayCallback);
-
-        /**
-         * @brief Specify UI content that will be displayed inside the command palette
-         * @param displayCallback Display callback that will be called to display the content
-         */
-        void setDisplayedContent(const impl::ContentDisplayCallback &displayCallback);
-
-        /**
-         * @brief Opens the command palette window, displaying a user defined interface
-         * @param displayCallback Display callback that will be called to display the content
-         */
-        void openWithContent(const impl::ContentDisplayCallback &displayCallback);
-    }
-
-}

lib/libimhex/include/hex/api/content_registry/communication_interface.hpp

@@ -1,25 +0,0 @@
-#pragma once
-
-#include <hex.hpp>
-
-#include <nlohmann/json_fwd.hpp>
-
-#include <map>
-#include <string>
-
-EXPORT_MODULE namespace hex {
-
-    /* Network Communication Interface Registry. Allows adding new communication interface endpoints */
-    namespace ContentRegistry::CommunicationInterface {
-
-        namespace impl {
-            using NetworkCallback = std::function<nlohmann::json(const nlohmann::json &)>;
-
-            const std::map<std::string, NetworkCallback>& getNetworkEndpoints();
-        }
-
-        void registerNetworkEndpoint(const std::string &endpoint, const impl::NetworkCallback &callback);
-
-    }
-
-}

lib/libimhex/include/hex/api/content_registry/data_formatter.hpp

@@ -1,72 +0,0 @@
-#pragma once
-
-#include <hex.hpp>
-
-#include <hex/api/localization_manager.hpp>
-
-#include <string>
-#include <functional>
-#include <vector>
-
-EXPORT_MODULE namespace hex {
-
-    #if !defined(HEX_MODULE_EXPORT)
-        namespace prv { class Provider; }
-    #endif
-
-    /* Data Formatter Registry. Allows adding formatters that are used in the Copy-As menu for example */
-    namespace ContentRegistry::DataFormatter {
-
-        namespace impl {
-
-            using Callback = std::function<std::string(prv::Provider *provider, u64 address, size_t size, bool preview)>;
-            struct ExportMenuEntry {
-                UnlocalizedString unlocalizedName;
-                Callback callback;
-            };
-
-            struct FindOccurrence {
-                Region region;
-                enum class DecodeType { ASCII, UTF8, Binary, UTF16, Unsigned, Signed, Float, Double } decodeType;
-                std::endian endian = std::endian::native;
-                bool selected;
-            };
-
-            using FindExporterCallback = std::function<std::vector<u8>(const std::vector<FindOccurrence>&, std::function<std::string(FindOccurrence)>)>;
-            struct FindExporterEntry {
-                UnlocalizedString unlocalizedName;
-                std::string fileExtension;
-                FindExporterCallback callback;
-            };
-
-            /**
-             * @brief Retrieves a list of all registered data formatters used by the 'File -> Export' menu
-             */
-            const std::vector<ExportMenuEntry>& getExportMenuEntries();
-
-            /**
-             * @brief Retrieves a list of all registered data formatters used in the Results section of the 'Find' view
-             */
-            const std::vector<FindExporterEntry>& getFindExporterEntries();
-
-        }
-
-
-        /**
-         * @brief Adds a new data formatter
-         * @param unlocalizedName The unlocalized name of the formatter
-         * @param callback The function to call to format the data
-         */
-        void addExportMenuEntry(const UnlocalizedString &unlocalizedName, const impl::Callback &callback);
-
-        /**
-         * @brief Adds a new data exporter for Find results
-         * @param unlocalizedName The unlocalized name of the formatter
-         * @param fileExtension The file extension to use for the exported file
-         * @param callback The function to call to format the data
-         */
-        void addFindExportFormatter(const UnlocalizedString &unlocalizedName, const std::string &fileExtension, const impl::FindExporterCallback &callback);
-
-    }
-
-}

lib/libimhex/include/hex/api/content_registry/data_information.hpp

@@ -1,81 +0,0 @@
-#pragma once
-
-#include <hex.hpp>
-
-#include <hex/api/task_manager.hpp>
-#include <hex/api/localization_manager.hpp>
-
-#include <nlohmann/json_fwd.hpp>
-
-#include <atomic>
-#include <functional>
-#include <memory>
-#include <vector>
-
-EXPORT_MODULE namespace hex {
-
-    #if !defined(HEX_MODULE_EXPORT)
-        namespace prv { class Provider; }
-    #endif
-
-    /* Data Information Registry. Allows adding new analyzers to the data information view */
-    namespace ContentRegistry::DataInformation {
-
-        class InformationSection {
-        public:
-            InformationSection(const UnlocalizedString &unlocalizedName, const UnlocalizedString &unlocalizedDescription = "", bool hasSettings = false)
-                : m_unlocalizedName(unlocalizedName), m_unlocalizedDescription(unlocalizedDescription),
-                  m_hasSettings(hasSettings) { }
-            virtual ~InformationSection() = default;
-
-            [[nodiscard]] const UnlocalizedString& getUnlocalizedName() const { return m_unlocalizedName; }
-            [[nodiscard]] const UnlocalizedString& getUnlocalizedDescription() const { return m_unlocalizedDescription; }
-
-            virtual void process(Task &task, prv::Provider *provider, Region region) = 0;
-            virtual void reset() = 0;
-
-            virtual void drawSettings() { }
-            virtual void drawContent() = 0;
-
-            [[nodiscard]] bool isValid() const { return m_valid; }
-            void markValid(bool valid = true) { m_valid = valid; }
-
-            [[nodiscard]] bool isEnabled() const { return m_enabled; }
-            void setEnabled(bool enabled) { m_enabled = enabled; }
-
-            [[nodiscard]] bool isAnalyzing() const { return m_analyzing; }
-            void setAnalyzing(bool analyzing) { m_analyzing = analyzing; }
-
-            virtual void load(const nlohmann::json &data);
-            [[nodiscard]] virtual nlohmann::json store();
-
-            [[nodiscard]] bool hasSettings() const { return m_hasSettings; }
-
-        private:
-            UnlocalizedString m_unlocalizedName, m_unlocalizedDescription;
-            bool m_hasSettings;
-
-            std::atomic<bool> m_analyzing = false;
-            std::atomic<bool> m_valid     = false;
-            std::atomic<bool> m_enabled   = true;
-        };
-
-        namespace impl {
-
-            using CreateCallback = std::function<std::unique_ptr<InformationSection>()>;
-
-            const std::vector<CreateCallback>& getInformationSectionConstructors();
-            void addInformationSectionCreator(const CreateCallback &callback);
-
-        }
-
-        template<typename T>
-        void addInformationSection(auto && ...args) {
-            impl::addInformationSectionCreator([args...] {
-                return std::make_unique<T>(std::forward<decltype(args)>(args)...);
-            });
-        }
-
-    }
-
-}

lib/libimhex/include/hex/api/content_registry/data_inspector.hpp

@@ -1,80 +0,0 @@
-#pragma once
-
-#include <hex.hpp>
-
-#include <hex/api/localization_manager.hpp>
-
-#include <functional>
-#include <optional>
-#include <string>
-#include <vector>
-
-EXPORT_MODULE namespace hex {
-
-    /* Data Inspector Registry. Allows adding of new types to the data inspector */
-    namespace ContentRegistry::DataInspector {
-
-        enum class NumberDisplayStyle : u8 {
-            Decimal,
-            Hexadecimal,
-            Octal
-        };
-
-        namespace impl {
-
-            using DisplayFunction   = std::function<std::string()>;
-            using EditingFunction   = std::function<std::vector<u8>(std::string, std::endian)>;
-            using GeneratorFunction = std::function<DisplayFunction(const std::vector<u8> &, std::endian, NumberDisplayStyle)>;
-
-            struct Entry {
-                UnlocalizedString unlocalizedName;
-                size_t requiredSize;
-                size_t maxSize;
-                GeneratorFunction generatorFunction;
-                std::optional<EditingFunction> editingFunction;
-            };
-
-            const std::vector<Entry>& getEntries();
-
-        }
-
-        /**
-         * @brief Adds a new entry to the data inspector
-         * @param unlocalizedName The unlocalized name of the entry
-         * @param requiredSize The minimum required number of bytes available for the entry to appear
-         * @param displayGeneratorFunction The function that will be called to generate the display function
-         * @param editingFunction The function that will be called to edit the data
-         */
-        void add(
-            const UnlocalizedString &unlocalizedName,
-            size_t requiredSize,
-            impl::GeneratorFunction displayGeneratorFunction,
-            std::optional<impl::EditingFunction> editingFunction = std::nullopt
-        );
-
-        /**
-         * @brief Adds a new entry to the data inspector
-         * @param unlocalizedName The unlocalized name of the entry
-         * @param requiredSize The minimum required number of bytes available for the entry to appear
-         * @param maxSize The maximum number of bytes to read from the data
-         * @param displayGeneratorFunction The function that will be called to generate the display function
-         * @param editingFunction The function that will be called to edit the data
-         */
-        void add(
-            const UnlocalizedString &unlocalizedName,
-            size_t requiredSize,
-            size_t maxSize,
-            impl::GeneratorFunction displayGeneratorFunction,
-            std::optional<impl::EditingFunction> editingFunction = std::nullopt
-        );
-
-        /**
-         * @brief Allows adding new menu items to data inspector row context menus. Call this function inside the
-         * draw function of the data inspector row definition.
-         * @param function Callback that will draw menu items
-         */
-        void drawMenuItems(const std::function<void()> &function);
-
-    }
-
-}

lib/libimhex/include/hex/api/content_registry/data_processor.hpp

@@ -1,64 +0,0 @@
-#pragma once
-
-#include <hex.hpp>
-
-#include <hex/api/localization_manager.hpp>
-
-#include <functional>
-#include <memory>
-#include <vector>
-
-EXPORT_MODULE namespace hex {
-
-    #if !defined(HEX_MODULE_EXPORT)
-        namespace dp { class Node; }
-    #endif
-
-    /* Data Processor Node Registry. Allows adding new processor nodes to be used in the data processor */
-    namespace ContentRegistry::DataProcessor {
-
-        namespace impl {
-
-            using CreatorFunction = std::function<std::unique_ptr<dp::Node>()>;
-
-            struct Entry {
-                UnlocalizedString unlocalizedCategory;
-                UnlocalizedString unlocalizedName;
-                CreatorFunction creatorFunction;
-            };
-
-            void add(const Entry &entry);
-
-            const std::vector<Entry>& getEntries();
-        }
-
-
-        /**
-         * @brief Adds a new node to the data processor
-         * @tparam T The custom node class that extends dp::Node
-         * @tparam Args Arguments types
-         * @param unlocalizedCategory The unlocalized category name of the node
-         * @param unlocalizedName The unlocalized name of the node
-         * @param args Arguments passed to the constructor of the node
-         */
-        template<std::derived_from<dp::Node> T, typename... Args>
-        void add(const UnlocalizedString &unlocalizedCategory, const UnlocalizedString &unlocalizedName, Args &&...args) {
-            add(impl::Entry {
-                unlocalizedCategory,
-                unlocalizedName,
-                [unlocalizedName, ...args = std::forward<Args>(args)]() mutable {
-                    auto node = std::make_unique<T>(std::forward<Args>(args)...);
-                    node->setUnlocalizedName(unlocalizedName);
-                    return node;
-                }
-            });
-        }
-
-        /**
-         * @brief Adds a separator to the data processor right click menu
-         */
-        void addSeparator();
-
-    }
-
-}

lib/libimhex/include/hex/api/content_registry/diffing.hpp

@@ -1,68 +0,0 @@
-#pragma once
-
-#include <hex.hpp>
-
-#include <hex/api/localization_manager.hpp>
-#include <wolv/container/interval_tree.hpp>
-
-#include <vector>
-#include <memory>
-
-
-EXPORT_MODULE namespace hex {
-
-    #if !defined(HEX_MODULE_EXPORT)
-        namespace prv { class Provider; }
-    #endif
-
-    /* Diffing Registry. Allows adding new diffing algorithms */
-    namespace ContentRegistry::Diffing {
-
-        enum class DifferenceType : u8 {
-            Match       = 0,
-            Insertion   = 1,
-            Deletion    = 2,
-            Mismatch    = 3
-        };
-
-        using DiffTree = wolv::container::IntervalTree<DifferenceType>;
-
-        class Algorithm {
-        public:
-            explicit Algorithm(UnlocalizedString unlocalizedName, UnlocalizedString unlocalizedDescription)
-                : m_unlocalizedName(std::move(unlocalizedName)),
-                  m_unlocalizedDescription(std::move(unlocalizedDescription)) { }
-
-            virtual ~Algorithm() = default;
-
-            virtual std::vector<DiffTree> analyze(prv::Provider *providerA, prv::Provider *providerB) const = 0;
-            virtual void drawSettings() { }
-
-            const UnlocalizedString& getUnlocalizedName() const { return m_unlocalizedName; }
-            const UnlocalizedString& getUnlocalizedDescription() const { return m_unlocalizedDescription; }
-
-        private:
-            UnlocalizedString m_unlocalizedName, m_unlocalizedDescription;
-        };
-
-        namespace impl {
-
-            const std::vector<std::unique_ptr<Algorithm>>& getAlgorithms();
-
-            void addAlgorithm(std::unique_ptr<Algorithm> &&hash);
-
-        }
-
-        /**
-         * @brief Adds a new hash
-         * @tparam T The hash type that extends hex::Hash
-         * @param args The arguments to pass to the constructor of the hash
-         */
-        template<typename T, typename ... Args>
-        void addAlgorithm(Args && ... args) {
-            impl::addAlgorithm(std::make_unique<T>(std::forward<Args>(args)...));
-        }
-
-    }
-
-}

lib/libimhex/include/hex/api/content_registry/disassemblers.hpp

@@ -1,64 +0,0 @@
-#pragma once
-
-#include <hex.hpp>
-
-#include <hex/api/localization_manager.hpp>
-
-#include <string>
-#include <map>
-#include <memory>
-#include <functional>
-#include <optional>
-#include <span>
-
-EXPORT_MODULE namespace hex {
-
-    /* Disassembler Registry. Allows adding new disassembler architectures */
-    namespace ContentRegistry::Disassemblers {
-
-        struct Instruction {
-            u64 address;
-            u64 offset;
-            size_t size;
-            std::string bytes;
-            std::string mnemonic;
-            std::string operators;
-        };
-
-        class Architecture {
-        public:
-            explicit Architecture(std::string name) : m_name(std::move(name)) {}
-            virtual ~Architecture() = default;
-
-            virtual bool start() = 0;
-            virtual void end() = 0;
-
-            virtual std::optional<Instruction> disassemble(u64 imageBaseAddress, u64 instructionLoadAddress, u64 instructionDataAddress, std::span<const u8> code) = 0;
-            virtual void drawSettings() = 0;
-
-            [[nodiscard]] const std::string& getName() const { return m_name; }
-
-        private:
-            std::string m_name;
-        };
-
-        namespace impl {
-
-            using CreatorFunction = std::function<std::unique_ptr<Architecture>()>;
-
-            void addArchitectureCreator(CreatorFunction function);
-
-            const std::map<std::string, CreatorFunction>& getArchitectures();
-
-        }
-
-        template<std::derived_from<Architecture> T>
-        void add(auto && ...args) {
-            impl::addArchitectureCreator([...args = std::move(args)] {
-                return std::make_unique<T>(args...);
-            });
-        }
-
-    }
-
-}