git: Fix invalid renaming logic

Fixes #2538

.clang-tidy

@@ -65,4 +65,5 @@ readability-*,
 -readability-redundant-access-specifiers,
 -readability-function-cognitive-complexity,
 -readability-identifier-naming,
--readability-qualified-auto'
+*-include-cleaner,
+-readability-qualified-auto'

.dockerignore

@@ -0,0 +1,5 @@
+cmake-build-*/
+build*/
+
+local/
+**/Dockerfile

.gdbinit

@@ -6,4 +6,12 @@ skip -rfu ^__gnu_debug::
 skip -rfu ^ImGui::
 
 # Trigger breakpoint when execution reaches triggerSafeShutdown()
-break 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

.gitattributes

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

.github/codecov.yml

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

.github/workflows/analysis.yml

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

.github/workflows/build_web.yml

@@ -1,79 +0,0 @@
-name: Build for the web
-
-on:
-  push:
-    branches: ["*"]
-  pull_request:
-  workflow_dispatch:
-
-env:
-  BUILD_TYPE: Release
-
-permissions:
-  pages: write
-  id-token: write
-  actions: write
-
-jobs:
-
-  build:
-    runs-on: ubuntu-22.04
-    name: 🌍 WebAssembly
-    steps:
-    - name: 🧰 Checkout
-      uses: actions/checkout@v3
-      with:
-        submodules: recursive
-    
-    - name: 📁 Restore docker /cache
-      uses: actions/cache@v3
-      with:
-        path: cache
-        key: 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

@@ -0,0 +1,128 @@
+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
+        id: check_commits
+        run: |
+          cd ImHex
+          git config --global --add safe.directory $(pwd)
+          if [ -z "$(git log nightly..HEAD --oneline)" ]; then
+            echo "No new commits since last nightly. Exiting."
+            echo "::set-output name=should_run::false"
+          else
+            echo "::set-output name=should_run::true"
+          fi
+
+      - name: 📜 Set version variable
+        if: ${{ steps.check_commits.outputs.should_run == 'true' }}
+        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
+        if: ${{ steps.check_commits.outputs.should_run == 'true' }}
+        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
+        if: ${{ steps.check_commits.outputs.should_run == 'true' }}
+        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
+          rm artifact.tar || true
+
+      - name: 📖 Generate Release Notes
+        if: ${{ steps.check_commits.outputs.should_run == 'true' }}
+        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..origin/master --oneline --no-merges --pretty=format:'* %s' >> changelog.md
+
+      - name: 📦 Update Pre-Release
+        if: ${{ steps.check_commits.outputs.should_run == 'true' }}
+        run: |
+          set -e
+          
+          cd ImHex
+          
+          # Move nightly tag to latest commit
+          git tag -f nightly origin/master
+          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
+        if: ${{ steps.check_commits.outputs.should_run == 'true' }}
+        continue-on-error: true
+        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
+        if: ${{ steps.check_commits.outputs.should_run == 'true' }}
+        continue-on-error: true
+        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,17 +10,18 @@ on:
 
 jobs:
   release-update-repos:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     name: Release Update Repos
 
     steps:
       - name: 🧰 Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: ImHex
 
       - name: 📜 Verify version and set version variable
         run: |
+          set -x
           project_version=`cat ImHex/VERSION`
           tag_version="${{github.event.release.tag_name}}"
           tag_version="${tag_version:1}"
@@ -51,19 +52,30 @@ jobs:
           repo: ImHex-Patterns
           token: ${{ secrets.RELEASE_TOKEN }}
 
+      - name: 🎫 Create imhex-download-sdk release
+        uses: ncipollo/release-action@v1
+        env:
+          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        if: "${{ env.RELEASE_TOKEN != '' }}"
+        with:
+          tag: v${{ env.IMHEX_VERSION }}
+          repo: imhex-download-sdk
+          token: ${{ secrets.RELEASE_TOKEN }}
+
   release-upload-artifacts:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     name: Release Upload Artifacts
 
     steps:
       - name: 🧰 Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: ImHex
           submodules: recursive
 
       - name: 📜 Verify version and set version variable
         run: |
+          set -x
           project_version=`cat ImHex/VERSION`
           tag_version="${{github.event.release.tag_name}}"
           tag_version="${tag_version:1}"
@@ -78,16 +90,17 @@ jobs:
         run: tar --exclude-vcs -czvf Full.Sources.tar.gz ImHex
 
       - name: ⬇️ Download artifacts from latest workflow
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v6
         with:
-          github_token: ${{secrets.GITHUB_TOKEN}}
+          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: |	
+        run: |
+          set -x
           for zipfile in ./*.zip
           do
               if [ `zipinfo -1 "$zipfile" | wc -l` -eq 1 ];
@@ -103,15 +116,19 @@ 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 "ImHex Web.zip" imhex-${{ env.IMHEX_VERSION }}-Web.zip
+          rm artifact.tar || true
 
       - name: ⬆️ Upload everything to release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@4634c16e79c963813287e889244c50009e7f0981
         with:
           files: '*'
 
       - name: ✒️ Prepare PKGBUILD
         run: |
+          set -x
           cp ImHex/dist/Arch/PKGBUILD .
           
           hash=`md5sum imhex-${{ env.IMHEX_VERSION }}-ArchLinux-x86_64.pkg.tar.zst | cut -d ' ' -f 1`
@@ -133,7 +150,7 @@ jobs:
           commit_email: itrooz@protonmail.com
           ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
           commit_message: Bump to version ${{ env.IMHEX_VERSION }}
-          ssh_keyscan_types: rsa,dsa,ecdsa,ed25519
+          ssh_keyscan_types: rsa,ecdsa,ed25519
 
   release-update-winget:
     name: Release update winget package
@@ -157,3 +174,33 @@ 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-24.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
+        continue-on-error: true
+        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
+        continue-on-error: true
+        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

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

.gitignore

@@ -1,11 +1,24 @@
-.vscode/
-.idea/
+/.vscode/
+/.idea/
+/.kdev4/
+/.vs/
+.venv/
 
-cmake-build-*/
-build*/
-venv/
+/cmake-build-*/
+/build*/
+/local/
+/venv/
+/.cache/
+/install/
+/out/
+
+/dist/ImHex.run.xml
 
 *.mgc
+*.kdev4
 imgui.ini
 .DS_Store
-./CMakeUserPresets.json
+CMakeUserPresets.json
+Brewfile.lock.json
+
+vcpkg.json

.gitmodules

@@ -1,27 +1,31 @@
-[submodule "lib/external/nativefiledialog"]
-	path = lib/external/nativefiledialog
+[submodule "lib/third_party/nativefiledialog"]
+	path = lib/third_party/nativefiledialog
 	url = https://github.com/btzy/nativefiledialog-extended
 	ignore = dirty
-[submodule "lib/external/yara/yara"]
-	path = lib/external/yara/yara
+[submodule "lib/third_party/yara/yara"]
+	path = lib/third_party/yara/yara
 	url = https://github.com/VirusTotal/yara
 	ignore = dirty
-[submodule "lib/external/xdgpp"]
-	path = lib/external/xdgpp
-	url = https://git.sr.ht/~danyspin97/xdgpp
+[submodule "lib/third_party/xdgpp"]
+	path = lib/third_party/xdgpp
+	url = https://github.com/WerWolv/xdgpp
 	ignore = dirty
-[submodule "lib/external/fmt"]
-	path = lib/external/fmt
+[submodule "lib/third_party/fmt"]
+	path = lib/third_party/fmt
 	url = https://github.com/fmtlib/fmt
 	ignore = dirty
-[submodule "lib/external/capstone"]
-	path = lib/external/capstone
+[submodule "lib/third_party/capstone"]
+	path = lib/third_party/capstone
 	url = https://github.com/capstone-engine/capstone
 	ignore = dirty
-[submodule "lib/external/jthread/jthread"]
-    path = lib/external/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
@@ -33,3 +37,12 @@
 	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,67 +1,100 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.25)
 
 # Options
-option(IMHEX_PLUGINS_IN_SHARE "Put the plugins in share/imhex/plugins instead of lib[..]/imhex/plugins" OFF)
-option(IMHEX_STRIP_RELEASE "Strip the release builds" ON)
-option(IMHEX_OFFLINE_BUILD "Enable offline build" OFF)
-option(IMHEX_IGNORE_BAD_CLONE "Disable the bad clone prevention checks" OFF)
-option(IMHEX_PATTERNS_PULL_MASTER "Download latest files from master branch of the ImHex-Patterns repo" OFF)
-option(IMHEX_IGNORE_BAD_COMPILER "Allow compiling with an unsupported compiler" OFF)
-option(IMHEX_USE_GTK_FILE_PICKER "Use GTK file picker instead of xdg-desktop-portals" OFF)
-option(IMHEX_DISABLE_STACKTRACE "Disables support for printing stack traces" OFF)
-option(IMHEX_BUNDLE_DOTNET "Bundle .NET runtime" ON)
-option(IMHEX_ENABLE_LTO "Enables Link Time Optimizations if possible" OFF)
-option(IMHEX_USE_DEFAULT_BUILD_SETTINGS "Use default build settings" OFF)
-option(IMHEX_STRICT_WARNINGS "Enable most available warnings and treat them as errors" ON)
-option(IMHEX_STATIC_LINK_PLUGINS "Statically link all plugins into the main executable" OFF)
+option(IMHEX_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")
 
 # 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(IMHEX_BASE_FOLDER ${CMAKE_CURRENT_SOURCE_DIR})
-set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules")
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
 
 # Setup project
-loadVersion(IMHEX_VERSION)
+loadVersion(IMHEX_VERSION IMHEX_VERSION_PLAIN)
 setVariableInParent(IMHEX_VERSION ${IMHEX_VERSION})
+
 configureCMake()
-project(imhex
-        LANGUAGES C CXX VERSION ${IMHEX_VERSION}
-        DESCRIPTION "The ImHex Hex Editor"
-        HOMEPAGE_URL "https://imhex.werwolv.net"
+project(ImHex
+        LANGUAGES       C CXX
+        VERSION         ${IMHEX_VERSION_PLAIN}
+        DESCRIPTION     "The ImHex Hex Editor"
+        HOMEPAGE_URL    "https://imhex.werwolv.net"
 )
+configureProject()
+
+# Add ImHex sources
+add_custom_target(imhex_all ALL)
 
 # Make sure project is configured correctly
 setDefaultBuiltTypeIfUnset()
 detectBadClone()
 verifyCompiler()
 
-# List plugin names here. Project name must match folder name
-set(PLUGINS
-    builtin
-    windows
-    script_loader
-)
+detectBundledPlugins()
 
 # 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
-enable_testing()
-add_subdirectory(tests EXCLUDE_FROM_ALL)
+if (IMHEX_ENABLE_UNIT_TESTS)
+    if (NOT TARGET unit_tests)
+        enable_testing()
+        add_custom_target(unit_tests)
+        add_subdirectory(tests EXCLUDE_FROM_ALL)
+    endif ()
+endif ()
 
-# Configure packaging
+# Configure more resources that will be added to the install package
+if (IMHEX_BUNDLE_PLUGIN_SDK)
+    generateSDKDirectory()
+endif()
+
+# Handle package generation
 createPackage()
-generatePDBs()
+
+# Accommodate IDEs with FOLDER support
+tweakTargetsForIDESupport()

CMakePresets.json

@@ -28,7 +28,47 @@
       "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": "Ninja",
+      "binaryDir": "${sourceDir}/build/${presetName}",
+      "cacheVariables": {
+          "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
+          "VCPKG_MANIFEST_DIR": "${sourceDir}/dist"
+      },
+      "environment": {
+          "VSCMD_ARG_TGT_ARCH": "x86"
+      }
+  }
   ],
   "buildPresets": [
     {

CONTRIBUTING.md

@@ -10,9 +10,7 @@ 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 here:
-- https://github.com/WerWolv/ImHex-Cpp-Plugin-Template
-- https://github.com/WerWolv/ImHex-Rust-Plugin-Template
+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.
 
 ### Adding a new language
 
@@ -32,18 +30,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 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.
+        - 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.
         - 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,6 +32,13 @@ 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

@@ -0,0 +1,8 @@
+# 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,42 +1,30 @@
 <a href="https://imhex.werwolv.net">
   <h1 align="center">
     <picture>
-      <source media="(prefers-color-scheme: dark)" srcset="./resources/projects/logo_text_light.svg">
-      <img height="100px" src="./resources/projects/logo_text_dark.svg">
+      <img height="300px" style="margin: 0; padding: 0" src="./resources/dist/common/logo/ImHexLogoSVGBG.svg">
     </picture>
   </h1>
 </a>
 
-<p align="center">A Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM.</p>
-
 <p align="center">
-  <a title="'Build' workflow Status" href="https://github.com/WerWolv/ImHex/actions?query=workflow%3ABuild">
-    <img alt="'Build' workflow Status" src="https://img.shields.io/github/actions/workflow/status/WerWolv/ImHex/build.yml?longCache=true&style=for-the-badge&label=Build&logoColor=fff&logo=GitHub%20Actions&branch=master">
-  </a>
-  <a title="Discord Server" href="https://discord.gg/X63jZ36xBY">
-    <img alt="Discord Server" src="https://img.shields.io/discord/789833418631675954?label=Discord&logo=Discord&logoColor=fff&style=for-the-badge">
-  </a>
-  <a title="Total Downloads" href="https://github.com/WerWolv/ImHex/releases/latest">
-    <img alt="Total Downloads" src="https://img.shields.io/github/downloads/WerWolv/ImHex/total?longCache=true&style=for-the-badge&label=Downloads&logoColor=fff&logo=GitHub">
-  </a>
-  <a title="Code Quality" href="https://www.codefactor.io/repository/github/werwolv/imhex">
-    <img alt="Code Quality" src="https://img.shields.io/codefactor/grade/github/WerWolv/ImHex?longCache=true&style=for-the-badge&label=Code%20Quality&logoColor=fff&logo=CodeFactor&branch=master">
-  </a>
-  <a title="Translation" href="https://weblate.werwolv.net/projects/imhex/">
-    <img alt="Translation" src="https://img.shields.io/weblate/progress/imhex?logo=weblate&logoColor=%23FFFFFF&server=https%3A%2F%2Fweblate.werwolv.net&style=for-the-badge">
-  </a>
-  <a title="Documentation" href="https://imhex.werwolv.net/docs">
-    <img alt="Documentation" src="https://img.shields.io/badge/Docs-Available-brightgreen?logo=gitbook&logoColor=%23FFFFFF&style=for-the-badge">
-  </a>
-  <a title="Plugins" href="https://github.com/WerWolv/ImHex/blob/master/PLUGINS.md">
-    <img alt="Plugins" src="https://img.shields.io/badge/Plugins-Supported-brightgreen?logo=stackedit&logoColor=%23FFFFFF&style=for-the-badge">
-  </a>
+    A Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM.
+    <br>
+    <a href="https://itinerarium.github.io/phoneme-synthesis/?w=/'ˈɪmhɛks/"><strong>/ˈɪmhɛks/</strong></a>
+</p>
+<p align="center">
+  <a title="'Build' workflow Status" href="https://github.com/WerWolv/ImHex/actions?query=workflow%3ABuild"><img alt="'Build' workflow Status" src="https://img.shields.io/github/actions/workflow/status/WerWolv/ImHex/build.yml?longCache=true&style=for-the-badge&label=Build&logoColor=fff&logo=GitHub%20Actions&branch=master"></a>
+  <a title="Discord Server" href="https://discord.gg/X63jZ36xBY"><img alt="Discord Server" src="https://img.shields.io/discord/789833418631675954?label=Discord&logo=Discord&logoColor=fff&style=for-the-badge"></a>
+  <a title="Total Downloads" href="https://github.com/WerWolv/ImHex/releases/latest"><img alt="Total Downloads" src="https://img.shields.io/github/downloads/WerWolv/ImHex/total?longCache=true&style=for-the-badge&label=Downloads&logoColor=fff&logo=GitHub"></a>
+  <a title="Code Quality" href="https://www.codefactor.io/repository/github/werwolv/imhex"><img alt="Code Quality" src="https://img.shields.io/codefactor/grade/github/WerWolv/ImHex?longCache=true&style=for-the-badge&label=Code%20Quality&logoColor=fff&logo=CodeFactor&branch=master"></a>
+  <a title="Translation" href="https://weblate.werwolv.net/projects/imhex/"><img alt="Translation" src="https://img.shields.io/weblate/progress/imhex?logo=weblate&logoColor=%23FFFFFF&server=https%3A%2F%2Fweblate.werwolv.net&style=for-the-badge"></a>
+  <a title="Plugins" href="https://github.com/WerWolv/ImHex/blob/master/PLUGINS.md"><img alt="Plugins" src="https://img.shields.io/badge/Plugins-Supported-brightgreen?logo=stackedit&logoColor=%23FFFFFF&style=for-the-badge"></a>
 </p>
 
 <p align="center">
-  <a title="Use the Web version of ImHex right in your browser!" href="https://web.imhex.werwolv.net">
-    <img alt="Use the Web version of ImHex right in your browser!" src="resources/dist/common/try_online_banner.png">
-  </a>
+  <a title="Download the latest version of ImHex" href="https://imhex.download"><img alt="Download the latest version of ImHex!" src="resources/dist/common/get_release_banner.png"></a>
+  <a title="Download the latest nightly pre-release version of ImHex" href="https://imhex.download/#nightly"><img alt="Download the latest nightly pre-release version of ImHex" src="resources/dist/common/get_nightly_banner.png"></a>
+  <a title="Use the Web version of ImHex right in your browser!" href="https://web.imhex.werwolv.net"><img alt="Use the Web version of ImHex right in your browser!" src="resources/dist/common/try_online_banner.png"></a>
+  <a title="Read the documentation of ImHex!" href="https://docs.werwolv.net"><img alt="Read the documentation of ImHex!" src="resources/dist/common/read_docs_banner.png"></a>
 </p>
 
 ## Supporting
@@ -44,93 +32,282 @@
 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
+### Notable Sponsors
+|                                                                                                     |                                                                                   |
+|:---------------------------------------------------------------------------------------------------:|-----------------------------------------------------------------------------------|
+| [![JetBrains logo](https://avatars.githubusercontent.com/u/878437?s=48)](https://www.jetbrains.com) | JetBrains, providing us with free All Products Pack licenses for development      |
+|   [![SignPath logo](https://avatars.githubusercontent.com/u/34448643?s=48)](https://signpath.io/)   | SignPath, providing us with free Code Signing Certificates for our Windows builds |
+|     [![AWS logo](https://avatars.githubusercontent.com/u/2232217?s=48)](https://aws.amazon.com)     | Amazon, providing us with free AWS Cloud Credits for our CI                       |
 
-![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)
+Would you like to appear here as well? Contact us at [imhex@werwolv.net](mailto:imhex@werwolv.net)!
+
+## 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>
 
 ## Features
 
-- Featureful hex view
+<details>
+  <summary><strong>Featureful hex view</strong></summary>
+
   - Byte patching
   - Patch management
-  - Copy bytes as feature
+  - Infinite Undo/Redo
+  - "Copy bytes as..."
     - Bytes
     - Hex string
     - C, C++, C#, Rust, Python, Java & JavaScript array
     - ASCII-Art hex view
     - HTML self-contained div
-  - String and hex search
-  - Colorful highlighting
+  - Simple string and hex search
   - 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!
+  - 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!
   - Useful error messages, syntax highlighting and error marking
-- 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
+  - 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>
+  
   - Base64 files
   - IPS and IPS32 patches
-- 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
+  - 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>
+
   - File magic-based file parser and MIME type database
-  - Byte distribution graph
+  - Byte type distribution graph
   - Entropy graph
   - Highest and average entropy
   - Encrypted / Compressed file detection
-- 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
+  - 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
   - ASCII table
   - Regex replacer
   - Mathematical expression evaluator (Calculator)
-  - Hexadecimal Color picker
+  - Graphing calculator
+  - Hexadecimal Color picker with support for many different formats
   - 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
 
@@ -148,22 +325,34 @@ 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:
+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.
 
 - **OS**: 
   - **Windows**: Windows 7 or higher (Windows 10/11 recommended)
-  - **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
+  - **macOS**: macOS 15 (Sequoia) 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 15 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
     - Arch Linux
-- **CPU**: x86_64 (64 Bit)
+    - 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.
 - **GPU**: OpenGL 3.0 or higher 
-  - Intel HD drivers are really buggy and often cause graphic artifacts
+  - Integrated Intel HD iGPUs are supported, however certain drivers are known to cause various graphical artifacts, especially on Windows. Use at your own risk.
   - In case you don't have a GPU available, there are software rendered releases available for Windows and macOS
-- **RAM**: 256MB, more may be required for more complicated analysis
-- **Storage**: 100MB
+- **RAM**: ~50MiB, more is required for more complex analysis
+- **Storage**: ~100MiB
 
 ## Installing
 
@@ -172,44 +361,87 @@ Information on how to install ImHex can be found in the [Install](/INSTALL.md) g
 ## Compiling
 
 To compile ImHex on any platform, GCC (or Clang) is required with a version that supports C++23 or higher. 
-On macOS, Clang is also required to compile some ObjC code.
-All releases are being built using latest available GCC.
+Windows and Linux releases are being built using latest available GCC.
+MacOS releases are being built using latest available LLVM Clang.
 
-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.
+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.
 
 For more information, check out the [Compiling](/dist/compiling) guide.
 
 ## Contributing
 See [Contributing](/CONTRIBUTING.md)
 
-## Plugin development
 
-To develop plugins for ImHex, use one of the following two templates projects to get started. You then have access to the entirety of libimhex as well as the ImHex API and the Content Registry to interact with ImHex or to add new content.
-- [C++ Plugin Template](https://github.com/WerWolv/ImHex-Cpp-Plugin-Template)
-- [Rust Plugin Template](https://github.com/WerWolv/ImHex-Rust-Plugin-Template)
+## 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.
+To build a plugin, you will need to use our SDK
+
+### Getting the SDK locally
+You can build the SDK by compiling ImHex like this:
+- `cmake -G Ninja -DIMHEX_BUNDLE_PLUGIN_SDK=ON -B build`
+- `cd build`
+- `DESTDIR=install ninja install`
+The SDK will then be available at `install/usr/local/share/imhex/sdk`. You will need to set the variable `IMHEX_SDK_PATH` to that (absolute) path.
+
+### Getting the SDK in a Github Actions CI
+You can use [this action](https://github.com/WerWolv/imhex-download-sdk) to automatically download the SDK to your Github Runner
+- [ImHex Plugin Template](https://github.com/WerWolv/ImHex-Plugin-Template)
 
 
 ## Credits
 
 ### Contributors
 
-- [Mary](https://github.com/marysaka) for her immense help porting ImHex to MacOS and help during development
+- [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
 - [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 related to release packaging and the GitHub Action runners.
 - Everybody else who has reported issues on Discord or GitHub that I had great conversations with :)
 
 ### Dependencies
 
 - Thanks a lot to ocornut for their amazing [Dear ImGui](https://github.com/ocornut/imgui) which is used for building the entire interface
-  - Thanks to ocornut as well for their hex editor view used as base for this project.
-  - Thanks to BalazsJako for their incredible [ImGuiColorTextEdit](https://github.com/BalazsJako/ImGuiColorTextEdit) used for the pattern language syntax highlighting
-- Thanks to nlohmann for their [json](https://github.com/nlohmann/json) library used for project files
-- Thanks to aquynh for [capstone](https://github.com/aquynh/capstone) which is the base of the disassembly window
+  - Thanks to epezent for [ImPlot](https://github.com/epezent/implot) used to plot data in various places
+  - Thanks to Nelarius for [ImNodes](https://github.com/Nelarius/imnodes) used as base for the data processor 
+  - Thanks to BalazsJako for [ImGuiColorTextEdit](https://github.com/BalazsJako/ImGuiColorTextEdit) used for the pattern language syntax highlighting
+- Thanks to nlohmann for their [json](https://github.com/nlohmann/json) library used for configuration files
 - Thanks to vitaut for their [libfmt](https://github.com/fmtlib/fmt) library which makes formatting and logging so much better
+- Thanks to btzy for [nativefiledialog-extended](https://github.com/btzy/nativefiledialog-extended) and their great support, used for handling file dialogs on all platforms
+- Thanks to danyspin97 for [xdgpp](https://sr.ht/~danyspin97/xdgpp) used to handle folder paths on Linux
+- Thanks to aquynh for [capstone](https://github.com/aquynh/capstone) which is the base of the disassembly window
 - Thanks to rxi for [microtar](https://github.com/rxi/microtar) used for extracting downloaded store assets 
-- Thanks to btzy for [nativefiledialog-extended](https://github.com/btzy/nativefiledialog-extended)
-- Thanks to danyspin97 for [xdgpp](https://sr.ht/~danyspin97/xdgpp)
+- Thanks to VirusTotal for [Yara](https://github.com/VirusTotal/yara) used by the Yara plugin
+- Thanks to Martinsos for [edlib](https://github.com/Martinsos/edlib) used for sequence searching in the diffing view
+- Thanks to ron4fun for [HashLibPlus](https://github.com/ron4fun/HashLibPlus) which implements every hashing algorithm under the sun
+- Thanks to mackron for [miniaudio](https://github.com/mackron/miniaudio) used to play audio files
 - Thanks to all other groups and organizations whose libraries are used in ImHex
+
+### License
+
+The biggest part of ImHex is under the GPLv2-only license. 
+Notable exceptions to this are the following parts which are under the LGPLv2.1 license:
+- **/lib/libimhex**: The library that allows Plugins to interact with ImHex.
+- **/plugins/ui**: The UI plugin library that contains some common UI elements that can be used by other plugins
+
+The reason for this is to allow for proprietary plugins to be developed for ImHex.
+
+### Code Signing Policy
+
+Free code signing provided by [SignPath.io](https://about.signpath.io/),
+certificate by [SignPath Foundation](https://signpath.org/).
+
+This program will not transfer any information to other networked systems
+unless specifically requested by the user or the person installing or
+operating it.
+
+#### People with direct push access
+- [WerWolv](https://github.com/WerWolv)
+- [iTrooz](https://github.com/iTrooz)
+- [jumanji144](https://github.com/jumanji144)
+- [AxCut](https://github.com/paxcut)

SECURITY.md

@@ -7,4 +7,4 @@ If you built ImHex yourself and experience issues that are not present in the ve
 
 ## Reporting a Vulnerability
 
-Any critical vulnerabilities can be reported through Discord @WerWolv#1337
+Any critical vulnerabilities can be reported through Discord (@werwolv).

VERSION

@@ -1 +1 @@
-1.31.0
+1.38.0

cmake/ide_helpers.cmake

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

cmake/modules/FindCapstone.cmake

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

cmake/modules/FindCoreClrEmbed.cmake

@@ -11,12 +11,20 @@ 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)
 endif ()
 
-set(CORECLR_VERSION "7.0")
+set(CORECLR_VERSION "8.0")
 
 execute_process(COMMAND ${DOTNET_EXECUTABLE} "--list-runtimes" OUTPUT_VARIABLE CORECLR_LIST_RUNTIMES_OUTPUT OUTPUT_STRIP_TRAILING_WHITESPACE)
 if (CORECLR_LIST_RUNTIMES_OUTPUT STREQUAL "")
@@ -49,13 +57,16 @@ endif()
 set(CoreClrEmbed_ROOT_PATH "${CORECLR_RUNTIME_ROOT_PATH}")
 
 
-file(GLOB _CORECLR_HOST_ARCH_PATH "${CORECLR_RUNTIME_ROOT_PATH}/packs/Microsoft.NETCore.App.Host.*-${CORECLR_SUBARCH}")
-if (_CORECLR_HOST_ARCH_PATH)
-    get_filename_component(_CORECLR_HOST_ARCH_FILENAME ${_CORECLR_HOST_ARCH_PATH} NAME)
-    string(REPLACE "Microsoft.NETCore.App.Host." "" _CORECLR_COMPUTED_ARCH "${_CORECLR_HOST_ARCH_FILENAME}")
-    if (_CORECLR_COMPUTED_ARCH)
-        set(CORECLR_ARCH "${_CORECLR_COMPUTED_ARCH}")
-    endif()
+file(GLOB _CORECLR_HOST_ARCH_PATH_LIST "${CORECLR_RUNTIME_ROOT_PATH}/packs/Microsoft.NETCore.App.Host.*-${CORECLR_SUBARCH}")
+if (_CORECLR_HOST_ARCH_PATH_LIST)
+    foreach(_CORECLR_HOST_ARCH_PATH ${_CORECLR_HOST_ARCH_PATH_LIST})
+        get_filename_component(_CORECLR_HOST_ARCH_FILENAME ${_CORECLR_HOST_ARCH_PATH} NAME)
+        string(REPLACE "Microsoft.NETCore.App.Host." "" _CORECLR_COMPUTED_ARCH "${_CORECLR_HOST_ARCH_FILENAME}")
+        if (_CORECLR_COMPUTED_ARCH)
+            set(CORECLR_ARCH "${_CORECLR_COMPUTED_ARCH}")
+            break()
+        endif()
+    endforeach()
 endif()
 
 set(CORECLR_HOST_BASE_PATH "${CORECLR_RUNTIME_ROOT_PATH}/packs/Microsoft.NETCore.App.Host.${CORECLR_ARCH}/${CORECLR_RUNTIME_VERSION_FULL}")
@@ -75,7 +86,8 @@ find_file(CoreClrEmbed_SHARED_LIBRARY nethost.dll nethost.so libnethost.so netho
 
 if (CoreClrEmbed_INCLUDE_DIR AND CoreClrEmbed_LIBRARY)
     set(CoreClrEmbed_FOUND TRUE)
-    set(CoreClrEmbed_LIBRARIES "${CoreClrEmbed_LIBRARY}")
-    set(CoreClrEmbed_SHARED_LIBRARIES "${CoreClrEmbed_SHARED_LIBRARY}")
-    set(CoreClrEmbed_INCLUDE_DIRS "${CoreClrEmbed_INCLUDE_DIR}")
+    set(CoreClrEmbed_LIBRARIES "${CoreClrEmbed_LIBRARY}" CACHE STRING "CoreClrEmbed libraries" FORCE)
+    set(CoreClrEmbed_SHARED_LIBRARIES "${CoreClrEmbed_SHARED_LIBRARY}" CACHE STRING "CoreClrEmbed shared libraries" FORCE)
+    set(CoreClrEmbed_INCLUDE_DIRS "${CoreClrEmbed_INCLUDE_DIR}" CACHE STRING "CoreClrEmbed include directories" FORCE)
+    set(CoreClrEmbed_VERSION "${CORECLR_RUNTIME_VERSION_FULL}" CACHE STRING "CoreClrEmbed version" FORCE)
 endif()

cmake/modules/FindGLFW.cmake

@@ -0,0 +1,139 @@
+#.rst:
+# Find GLFW
+# ---------
+#
+# Finds the GLFW library using its cmake config if that exists, otherwise
+# falls back to finding it manually. This module defines:
+#
+#  GLFW_FOUND               - True if GLFW library is found
+#  GLFW::GLFW               - GLFW imported target
+#
+# Additionally, in case the config was not found, these variables are defined
+# for internal usage:
+#
+#  GLFW_LIBRARY             - GLFW library
+#  GLFW_DLL_DEBUG           - GLFW debug DLL on Windows, if found
+#  GLFW_DLL_RELEASE         - GLFW release DLL on Windows, if found
+#  GLFW_INCLUDE_DIR         - Root include dir
+#
+
+#
+#   This file is part of Magnum.
+#
+#   Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
+#               2020, 2021, 2022 Vladimír Vondruš <mosra@centrum.cz>
+#   Copyright © 2016 Jonathan Hale <squareys@googlemail.com>
+#
+#   Permission is hereby granted, free of charge, to any person obtaining a
+#   copy of this software and associated documentation files (the "Software"),
+#   to deal in the Software without restriction, including without limitation
+#   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+#   and/or sell copies of the Software, and to permit persons to whom the
+#   Software is furnished to do so, subject to the following conditions:
+#
+#   The above copyright notice and this permission notice shall be included
+#   in all copies or substantial portions of the Software.
+#
+#   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+#   THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+#   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+#   DEALINGS IN THE SOFTWARE.
+#
+
+# GLFW installs cmake package config files which handles dependencies in case
+# GLFW is built statically. Try to find first, quietly, so it doesn't print
+# loud messages when it's not found, since that's okay. If the glfw target
+# already exists, it means we're using it through a CMake subproject -- don't
+# attempt to find the package in that case.
+if(NOT TARGET glfw)
+    find_package(glfw3 CONFIG QUIET)
+endif()
+
+# If either a glfw config file was found or we have a subproject, point
+# GLFW::GLFW to that and exit -- nothing else to do here.
+if(TARGET glfw)
+    if(NOT TARGET GLFW::GLFW)
+        # Aliases of (global) targets are only supported in CMake 3.11, so we
+        # work around it by this. This is easier than fetching all possible
+        # properties (which are impossible to track of) and then attempting to
+        # rebuild them into a new target.
+        add_library(GLFW::GLFW INTERFACE IMPORTED)
+        set_target_properties(GLFW::GLFW PROPERTIES INTERFACE_LINK_LIBRARIES glfw)
+    endif()
+
+    # Just to make FPHSA print some meaningful location, nothing else
+    get_target_property(_GLFW_INTERFACE_INCLUDE_DIRECTORIES glfw INTERFACE_INCLUDE_DIRECTORIES)
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args("GLFW" DEFAULT_MSG
+            _GLFW_INTERFACE_INCLUDE_DIRECTORIES)
+
+    if(CORRADE_TARGET_WINDOWS)
+        # .dll is in LOCATION, .lib is in IMPLIB. Yay, useful!
+        get_target_property(GLFW_DLL_DEBUG glfw IMPORTED_LOCATION_DEBUG)
+        get_target_property(GLFW_DLL_RELEASE glfw IMPORTED_LOCATION_RELEASE)
+    endif()
+
+    return()
+endif()
+
+if(CORRADE_TARGET_WINDOWS)
+    if(MSVC)
+        if(MSVC_VERSION VERSION_LESS 1910)
+            set(_GLFW_LIBRARY_PATH_SUFFIX lib-vc2015)
+        elseif(MSVC_VERSION VERSION_LESS 1920)
+            set(_GLFW_LIBRARY_PATH_SUFFIX lib-vc2017)
+        elseif(MSVC_VERSION VERSION_LESS 1930)
+            set(_GLFW_LIBRARY_PATH_SUFFIX lib-vc2019)
+        elseif(MSVC_VERSION VERSION_LESS 1940)
+            set(_GLFW_LIBRARY_PATH_SUFFIX lib-vc2022)
+        else()
+            message(FATAL_ERROR "Unsupported MSVC version")
+        endif()
+    elseif(MINGW)
+        set(_GLFW_LIBRARY_PATH_SUFFIX lib-mingw-w64)
+    else()
+        message(FATAL_ERROR "Unsupported compiler")
+    endif()
+endif()
+
+# In case no config file was found, try manually finding the library. Prefer
+# the glfw3dll as it's a dynamic library.
+find_library(GLFW_LIBRARY
+        NAMES glfw glfw3dll glfw3
+        PATH_SUFFIXES ${_GLFW_LIBRARY_PATH_SUFFIX})
+
+if(CORRADE_TARGET_WINDOWS AND GLFW_LIBRARY MATCHES "glfw3dll.(lib|a)$")
+    # TODO: debug?
+    find_file(GLFW_DLL_RELEASE
+            NAMES glfw3.dll
+            PATH_SUFFIXES ${_GLFW_LIBRARY_PATH_SUFFIX})
+endif()
+
+# Include dir
+find_path(GLFW_INCLUDE_DIR
+        NAMES GLFW/glfw3.h)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args("GLFW" DEFAULT_MSG
+        GLFW_LIBRARY
+        GLFW_INCLUDE_DIR)
+
+if(NOT TARGET GLFW::GLFW)
+    add_library(GLFW::GLFW UNKNOWN IMPORTED)
+
+    # Work around BUGGY framework support on macOS
+    # https://cmake.org/Bug/view.php?id=14105
+    if(CORRADE_TARGET_APPLE AND GLFW_LIBRARY MATCHES "\\.framework$")
+        set_property(TARGET GLFW::GLFW PROPERTY IMPORTED_LOCATION ${GLFW_LIBRARY}/GLFW)
+    else()
+        set_property(TARGET GLFW::GLFW PROPERTY IMPORTED_LOCATION ${GLFW_LIBRARY})
+    endif()
+
+    set_property(TARGET GLFW::GLFW PROPERTY
+            INTERFACE_INCLUDE_DIRECTORIES ${GLFW_INCLUDE_DIR})
+endif()
+
+mark_as_advanced(GLFW_LIBRARY GLFW_INCLUDE_DIR)

cmake/modules/FindLZ4.cmake

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

cmake/modules/FindMagic.cmake

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

cmake/modules/FindYara.cmake

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

cmake/modules/FindZSTD.cmake

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

cmake/modules/Findlibssh2.cmake

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

@@ -26,8 +26,9 @@ SET(MBEDTLS_FIND_QUIETLY TRUE)
 FIND_LIBRARY(MBEDTLS_LIBRARY NAMES mbedtls libmbedtls libmbedx509)
 FIND_LIBRARY(MBEDX509_LIBRARY NAMES mbedx509 libmbedx509)
 FIND_LIBRARY(MBEDCRYPTO_LIBRARY NAMES mbedcrypto libmbedcrypto)
+FIND_LIBRARY(TFPSACRYPTO_LIBRARY NAMES libtfpsacrypto tfpsacrypto)
 
-IF(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARY AND MBEDX509_LIBRARY AND MBEDCRYPTO_LIBRARY)
+IF(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARY AND MBEDX509_LIBRARY AND (MBEDCRYPTO_LIBRARY OR TFPSACRYPTO_LIBRARY))
     SET(MBEDTLS_FOUND TRUE)
 ENDIF()
 
@@ -37,10 +38,25 @@ IF(MBEDTLS_FOUND)
     GET_FILENAME_COMPONENT(MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY} NAME_WE)
     GET_FILENAME_COMPONENT(MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY} NAME_WE)
     GET_FILENAME_COMPONENT(MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY} NAME_WE)
+    GET_FILENAME_COMPONENT(TFPSACRYPTO_LIBRARY_FILE ${TFPSACRYPTO_LIBRARY} NAME_WE)
     STRING(REGEX REPLACE "^lib" "" MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY_FILE})
     STRING(REGEX REPLACE "^lib" "" MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY_FILE})
     STRING(REGEX REPLACE "^lib" "" MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY_FILE})
-    SET(MBEDTLS_LIBRARIES "-L${MBEDTLS_LIBRARY_DIR} -l${MBEDTLS_LIBRARY_FILE} -l${MBEDX509_LIBRARY_FILE} -l${MBEDCRYPTO_LIBRARY_FILE}")
+    STRING(REGEX REPLACE "^lib" "" TFPSACRYPTO_LIBRARY_FILE ${TFPSACRYPTO_LIBRARY_FILE})
+
+    if (TFPSACRYPTO_LIBRARY)
+        SET(MBEDTLS_CRYPTO_LIBRARY_FILE ${TFPSACRYPTO_LIBRARY_FILE})
+    elseif (MBEDCRYPTO_LIBRARY)
+        SET(MBEDTLS_CRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY_FILE})
+    else ()
+        MESSAGE(FATAL_ERROR "Could not find mbedTLS Crypto library")
+    endif()
+
+    if (MSVC)
+        SET(MBEDTLS_LIBRARIES ${MBEDTLS_LIBRARY_FILE}.lib ${MBEDX509_LIBRARY_FILE}.lib ${MBEDTLS_CRYPTO_LIBRARY_FILE}.lib)
+    else()
+        SET(MBEDTLS_LIBRARIES "-L${MBEDTLS_LIBRARY_DIR} -l${MBEDTLS_LIBRARY_FILE} -l${MBEDX509_LIBRARY_FILE} -l${MBEDTLS_CRYPTO_LIBRARY_FILE}")
+    endif()
 
     IF(NOT MBEDTLS_FIND_QUIETLY)
         MESSAGE(STATUS "Found mbedTLS:")
@@ -55,9 +71,9 @@ IF(MBEDTLS_FOUND)
         MESSAGE(STATUS "  Crypto: ${MBEDCRYPTO_LIBRARY}")
     ENDIF(NOT MBEDTLS_FIND_QUIETLY)
 ELSE(MBEDTLS_FOUND)
-    IF(MBEDTLS_FIND_REQUIRED)
+    IF(mbedTLS_FIND_REQUIRED)
         MESSAGE(FATAL_ERROR "Could not find mbedTLS")
-    ENDIF(MBEDTLS_FIND_REQUIRED)
+    ENDIF(mbedTLS_FIND_REQUIRED)
 ENDIF(MBEDTLS_FOUND)
 
 MARK_AS_ADVANCED(
@@ -67,4 +83,4 @@ MARK_AS_ADVANCED(
         MBEDTLS_LIBRARY
         MBEDX509_LIBRARY
         MBEDCRYPTO_LIBRARY
-)
+)

cmake/modules/ImHexPlugin.cmake

@@ -1,10 +1,16 @@
 macro(add_imhex_plugin)
+    setSDKPaths()
     # Parse arguments
-    set(options "")
-    set(oneValueArgs NAME)
-    set(multiValueArgs SOURCES INCLUDES LIBRARIES)
+    set(options LIBRARY_PLUGIN)
+    set(oneValueArgs NAME IMHEX_VERSION)
+    set(multiValueArgs SOURCES INCLUDES LIBRARIES FEATURES)
     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)
 
@@ -12,51 +18,162 @@ 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()
-        set(IMHEX_PLUGIN_LIBRARY_TYPE SHARED)
+        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}")
     endif()
 
     # Define new project for plugin
     project(${IMHEX_PLUGIN_NAME})
 
-    # Create a new shared library for the plugin source code
-    add_library(${IMHEX_PLUGIN_NAME} ${IMHEX_PLUGIN_LIBRARY_TYPE} ${IMHEX_PLUGIN_SOURCES})
+    if (IMHEX_PLUGIN_IMPORTED)
+        add_library(${IMHEX_PLUGIN_NAME} SHARED IMPORTED GLOBAL)
 
-    # 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})
+        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 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})
+        # 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)
 
-    # Enable required compiler flags
-    set_target_properties(${IMHEX_PLUGIN_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
-    setupCompilerFlags(${IMHEX_PLUGIN_NAME})
+        precompileHeaders(${IMHEX_PLUGIN_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/include")
 
-    # Configure build properties
-    set_target_properties(${IMHEX_PLUGIN_NAME}
-            PROPERTIES
-            RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins
-            CXX_STANDARD 23
-            PREFIX ""
-            SUFFIX ".hexplug"
-    )
+        # 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})
 
-    # 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})
+        # Enable required compiler flags
+        enableUnityBuild(${IMHEX_PLUGIN_NAME})
+        setupCompilerFlags(${IMHEX_PLUGIN_NAME})
+        addCppCheck(${IMHEX_PLUGIN_NAME})
 
-    # Add the new plugin to the main dependency list so it gets built by default
-    add_dependencies(imhex_all ${IMHEX_PLUGIN_NAME})
+        # 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()
 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()
+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()

cmake/modules/PostprocessBundle.cmake

@@ -14,41 +14,47 @@ if(CMAKE_GENERATOR)
 	# Being called as include(PostprocessBundle), so define a helper function.
 	set(_POSTPROCESS_BUNDLE_MODULE_LOCATION "${CMAKE_CURRENT_LIST_FILE}")
 	function(postprocess_bundle out_target in_target)
-		add_custom_command(TARGET ${out_target} POST_BUILD
-			COMMAND ${CMAKE_COMMAND} -DBUNDLE_PATH="$<TARGET_FILE_DIR:${in_target}>/../.."
-				-DCODE_SIGN_CERTIFICATE_ID="${CODE_SIGN_CERTIFICATE_ID}"
-				-DEXTRA_BUNDLE_LIBRARY_PATHS="${EXTRA_BUNDLE_LIBRARY_PATHS}"
-				-P "${_POSTPROCESS_BUNDLE_MODULE_LOCATION}"
-		)
+
+		install(CODE "set(BUNDLE_PATH ${CMAKE_INSTALL_PREFIX}/${BUNDLE_NAME})")
+		install(CODE "set(CODE_SIGN_CERTIFICATE_ID ${CODE_SIGN_CERTIFICATE_ID})")
+		install(CODE "set(EXTRA_BUNDLE_LIBRARY_PATHS ${EXTRA_BUNDLE_LIBRARY_PATHS})")
+		install(SCRIPT ${_POSTPROCESS_BUNDLE_MODULE_LOCATION})
 	endfunction()
 	return()
 endif()
 
+# IMHEX PATCH BEGIN
+# The function defined above doesn't keep in mind that if we are cross-compiling to MacOS, APPLE must be 1,
+# so we force it here (where else would this script be run anyway ? This seems to be MacOS-specific code)
+SET(APPLE 1)
+# IMHEX PATCHE END
+
 get_filename_component(BUNDLE_PATH "${BUNDLE_PATH}" ABSOLUTE)
 message(STATUS "Fixing up application bundle: ${BUNDLE_PATH}")
 
 
 # Make sure to fix up any included ImHex plugin.
-file(GLOB_RECURSE extra_libs "${BUNDLE_PATH}/Contents/MacOS/plugins/*.hexplug")
+file(GLOB_RECURSE plugins "${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})
+set(extra_dirs "/usr/local/lib" "/lib" "/usr/lib" ${EXTRA_BUNDLE_LIBRARY_PATHS} "${BUNDLE_PATH}/Contents/MacOS/plugins" "${BUNDLE_PATH}/Contents/Frameworks")
 message(STATUS "Fixing up application bundle: ${extra_dirs}")
 
 # BundleUtilities is overly verbose, so disable most of its messages
-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}" "${extra_libs}" "${extra_dirs}")
+
+fixup_bundle("${BUNDLE_PATH}" "${plugins}" "${extra_dirs}")
 
 if (CODE_SIGN_CERTIFICATE_ID)
 	# Hack around Apple Silicon signing bugs by copying the real app, signing it and moving it back.
@@ -60,4 +66,13 @@ if (CODE_SIGN_CERTIFICATE_ID)
 endif()
 
 # Add a necessary rpath to the imhex binary
-get_bundle_main_executable("${BUNDLE_PATH}" IMHEX_EXECUTABLE)
+get_bundle_main_executable("${BUNDLE_PATH}" IMHEX_EXECUTABLE)
+
+file(GLOB_RECURSE plugin_libs "${BUNDLE_PATH}/Contents/MacOS/*.hexpluglib")
+foreach(plugin_lib ${plugin_libs})
+	get_filename_component(plugin_lib_name ${plugin_lib} NAME)
+	set(plugin_lib_dest "${BUNDLE_PATH}/Contents/MacOS/plugins/${plugin_lib_name}")
+
+	configure_file(${plugin_lib} "${plugin_lib_dest}" COPYONLY)
+	message(STATUS "Copying plugin library: ${plugin_lib} to ${plugin_lib_dest}")
+endforeach ()

cmake/sdk/CMakeLists.txt

@@ -0,0 +1,73 @@
+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}/../../../lib/libimhex.so"
+            INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/lib/libimhex/include")
+    set_target_properties(tracing PROPERTIES
+            IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/lib/libtracing.a"
+            INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/lib/trace/include")
+endif()

cmake/sdk/template/CMakeLists.txt

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

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

@@ -0,0 +1,146 @@
+# 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/ noble main restricted universe multiverse'
+    - sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ noble 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/AppImage/Dockerfile

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

dist/AppImageBuilder.yml

@@ -1,137 +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:
-    - 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/Dockerfile

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

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 freetype2 libglvnd dbus gtk3 curl fmt yara nlohmann-json)
-makedepends=(git)
+depends=(glfw mbedtls fontconfig freetype2 libglvnd dbus gtk3 curl fmt yara zlib bzip2 xz zstd libssh2)
+makedepends=(git nlohmann-json)
 provides=(imhex)
 conflicts=(imhex)
 source=("$url/releases/download/v$pkgver/imhex-$pkgver-ArchLinux-x86_64.pkg.tar.zst")
@@ -17,13 +17,14 @@ 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} "$pkgdir/usr/share"
+    cp -r "$srcdir/usr/share/"{applications,licenses,pixmaps,mime} "$pkgdir/usr/share"
 }

dist/DEBIAN/control.in

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

dist/ImHex-9999.ebuild

@@ -20,9 +20,17 @@ DEPEND=""
 RDEPEND="${DEPEND}
 		media-libs/glfw
 		sys-apps/file
-		dev-libs/mbedtls
-		dev-cpp/nlohmann_json
-		dbus
-		xdg-desktop-portal
+		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-cpp/nlohmann_json
 		"
-BDEPEND="${DEPEND}"

dist/ImHex.run.xml

@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ImHex" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" WORKING_DIR="file://$CMakeCurrentBuildDir$" PASS_PARENT_ENVS_2="true" PROJECT_NAME="ImHex" TARGET_NAME="imhex_all" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="ImHex" RUN_TARGET_NAME="main">
+    <envs>
+      <env name="NO_DEBUG_BANNER" value="1" />
+    </envs>
+    <method v="2">
+      <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+  <configuration default="false" name="CMake Debug" type="CMakeListConfigurationType" factoryName="CMakeListConfigurationFactory">
+      <method v="2" />
+  </configuration>
+</component>

dist/cli/imhex.bat

@@ -0,0 +1,3 @@
+@echo off
+
+start "" "%~dp0..\imhex.exe" %*

dist/cli/imhex.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+script_path=$(readlink -f "$0")
+script_dir=$(dirname "${script_path}")
+"${script_dir}/../imhex" "$@" > /dev/null 2>&1 &

dist/compiling/docker.md

@@ -0,0 +1,49 @@
+For a TLDR of commands see [How to build](#How-to-build)
+
+# Introduction
+
+The original CI we used (vanilla Github Actions) was great for specifying what steps to execute to build packages. It could even do some custom steps with reusable actions. But it had problem: no local reproducibility. This meant that:
+- We couldn't test code properly locally, we were dependent on GitHub to do it
+- If something was wrong and we had to debug the build script, it was *long and painful* because we had to wait for Github runners to finish builds, and couldn't quickly iterate
+
+To solve this, we are now trying to move the CI build script to docker containers (so using Dockerfiles)
+
+# How to build
+
+Commands are available in the [CI](../../.github/workflows/build.yml) and you should prefer copying them from there.
+But here is a general command that should work for every build we have:
+```
+docker buildx build . -f <DOCKERFILE_PATH> --progress plain --build-arg 'JOBS=4' --build-arg 'BUILD_TYPE=Debug' --build-context imhex=$(pwd) --output local
+```
+
+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    |
+
+We'll explain this command in the next section
+
+# Useful knowledge about Docker builds
+
+Docker-based builds work with a Dockerfile. You run the Dockerfile, it builds the package.
+
+We are using a base environment (often given to us by dockerhub) (e.g. ubuntu:22.04) which is really just a root filesystem, and we then run shell commands in that env, just like a shell script
+
+Docker-based builds have two kind of caches used:
+- layer cache, which mean that if a layer (instruction) hasn't been changed, and previous layers haven't changed, it will not be run again
+    - a `COPY` layer will be invalidated if one of the file copied has changed
+- mount cache, which are per-instructions mounts that will be cached and restored in the next run. Mounts on different folders will not collide
+
+Docker cache tends to grow very quickly when constantly making changes in the Dockerfile and rebuilding (a.k.a debugging what's going on), you can clear it with something like `docker system prune -a`
+
+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-context key=<folder>` is to specify folders other than the base folder that the Dockerfile is allowed to see
+- `--output <path>` is the path to write the output package to. If not specified, Docker will create an image as the output (probably not what you want)
+- `--target <target>` specifies which docker target to build

dist/compiling/linux.md

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

dist/compiling/macos.md

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

dist/compiling/windows.md

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

dist/cppcheck.supp

@@ -0,0 +1,20 @@
+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/flake.nix

@@ -0,0 +1,54 @@
+{
+  description = "ImHex";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  };
+
+  outputs = { self, nixpkgs }:
+    let
+      supportedSystems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" ];
+      forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system);
+    in {
+      devShells = forAllSystems (system:
+        let
+          pkgs = import nixpkgs { inherit system; };
+        in
+          {
+            default = pkgs.mkShell {
+              buildInputs = [
+                pkgs.cmake
+                pkgs.clang
+                pkgs.lld
+
+                pkgs.nghttp3
+                pkgs.pkg-config
+                pkgs.glfw
+                pkgs.fontconfig
+                pkgs.file
+                pkgs.mbedtls
+                pkgs.freetype
+                pkgs.dbus
+                pkgs.gtk3
+                pkgs.curl
+                pkgs.fmt
+                pkgs.yara
+                pkgs.nlohmann_json
+                pkgs.ninja
+                pkgs.zlib
+                pkgs.bzip2
+                pkgs.xz
+                pkgs.zstd
+                pkgs.lz4
+                pkgs.libssh2
+                pkgs.md4c
+              ];
+
+              shellHook = ''
+                export CC=${pkgs.clang}/bin/clang
+                export CXX=${pkgs.clang}/bin/clang++
+              '';
+            };
+          });
+    };
+}

dist/flatpak/net.werwolv.ImHex.yaml

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

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

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

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

dist/get_deps_debian.sh

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

dist/get_deps_fedora.sh

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

dist/get_deps_msys2.sh

@@ -1,15 +1,23 @@
 #!/usr/bin/env sh
 
-pacman -S --needed --noconfirm  \
-  mingw-w64-x86_64-gcc          \
-  mingw-w64-x86_64-lld          \
-  mingw-w64-x86_64-cmake        \
-  mingw-w64-x86_64-ccache       \
-  mingw-w64-x86_64-glfw         \
-  mingw-w64-x86_64-file         \
-  mingw-w64-x86_64-curl-winssl  \
-  mingw-w64-x86_64-mbedtls      \
-  mingw-w64-x86_64-freetype     \
-  mingw-w64-x86_64-dlfcn        \
-  mingw-w64-x86_64-ninja        \
-  mingw-w64-x86_64-capstone
+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

dist/get_deps_tumbleweed.sh

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

dist/imhex.mime.xml

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

dist/langtool.py

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

dist/macOS/Brewfile

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

dist/macOS/arm64.Dockerfile

@@ -0,0 +1,187 @@
+# This base image is also known as "crosscompile". See arm64.crosscompile.Dockerfile
+FROM ghcr.io/werwolv/macos-crosscompile:4c4af2d1a6a102fab93cc9cd660280c2ec9d72af as build
+
+ENV MACOSX_DEPLOYMENT_TARGET 13.0
+
+# -- DOWNLOADING STUFF
+
+# Update vcpkg
+RUN <<EOF
+cp /vcpkg/triplets/community/arm-osx-mytriplet.cmake /tmp/arm-osx-mytriplet.cmake
+git -C /vcpkg clean -ffdx
+git -C /vcpkg checkout origin/master
+git -C /vcpkg reset --hard
+git -C /vcpkg pull
+/vcpkg/bootstrap-vcpkg.sh
+cp /tmp/arm-osx-mytriplet.cmake /vcpkg/triplets/community/arm-osx-mytriplet.cmake
+EOF
+
+## Install make
+RUN --mount=type=cache,target=/var/lib/apt/lists/ apt update && apt install -y make cmake
+
+## fix environment
+### add install_name_tool for cmake command that won't have the right env set (see PostprocessBundle.cmake function postprocess_bundle())
+RUN cp /osxcross/build/cctools-port/cctools/misc/install_name_tool /usr/bin/install_name_tool
+### a cmake thing wants 'otool' and not '' apparently
+RUN cp /osxcross/target/bin/aarch64-apple-darwin24-otool /usr/bin/otool
+
+## Clone glfw
+RUN <<EOF
+set -xe
+if [ "$CUSTOM_GLFW" ]; then
+    git clone https://github.com/glfw/glfw /mnt/glfw
+fi
+EOF
+
+RUN --mount=type=cache,target=/cache <<EOF
+## Download SDK is missing (it may have been removed from the image)
+set -xe
+if [ ! -d /osxcross/target/SDK/MacOSX15.0.sdk ]; then
+    wget https://github.com/joseluisq/macosx-sdks/releases/download/15.0/MacOSX15.0.sdk.tar.xz -O /cache/MacOSX15.0.sdk.tar.xz -nc || true
+    mkdir -p /osxcross/target/SDK
+    tar -C /osxcross/target/SDK -xf /cache/MacOSX15.0.sdk.tar.xz
+fi
+EOF
+
+
+## Download libmagic
+### Clone libmagic
+RUN git clone --depth 1 --branch FILE5_46 https://github.com/file/file /mnt/file
+### Download libmagic dependencies
+RUN --mount=type=cache,target=/var/lib/apt/lists/ apt update && apt install -y libtool autoconf
+
+# -- DOWNLOADING + BUILDING STUFF
+
+ENV VCPKG_DEFAULT_BINARY_CACHE /cache/vcpkg
+RUN --mount=type=cache,target=/cache <<EOF
+## Install dependencies with vcpkg
+set -xe
+
+mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
+
+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
+ARG CUSTOM_GLFW
+RUN --mount=type=cache,target=/cache <<EOF
+set -xe
+if [ "$CUSTOM_GLFW" ]; then
+    echo "Flag confirmation: using custom GLFW for software rendering"
+else
+    echo "Flag confirmation: using system GLFW"
+    vcpkg install --triplet=arm-osx-mytriplet glfw3
+fi
+EOF
+
+# -- BUILDING STUFF
+ARG JOBS 1
+ARG BUILD_TYPE Debug
+
+## Build libmagic
+RUN --mount=type=cache,target=/cache <<EOF
+    ccache -zs
+    set -xe
+    
+    cd /mnt/file
+    autoreconf -is
+
+    # when cross-compiling, libmagic needs to have an the same version installed in the system.
+    # So we install it normally first
+    ./configure --prefix /usr
+    make -j $JOBS install
+
+    # Now, we cross-compile it and install it in the libraries folder
+    CC=/osxcross/target/bin/aarch64-apple-darwin24-clang CXX=/osxcross/target/bin/aarch64-apple-darwin24-clang++ ./configure --prefix /vcpkg/installed/arm-osx-mytriplet --host $OSXCROSS_HOST
+    make -j $JOBS
+    make install
+
+    ccache -s
+    
+EOF
+
+## Patch glfw
+COPY --from=imhex /dist/macOS/0001-glfw-SW.patch /tmp
+RUN <<EOF
+set -xe
+if [ "$CUSTOM_GLFW" ]; then
+    cd /mnt/glfw
+    git apply /tmp/0001-glfw-SW.patch
+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
+if [ "$CUSTOM_GLFW" ]; then
+    ccache -zs
+
+    cd /mnt/glfw
+    mkdir build
+    cd build
+    CC=o64-clang CXX=o64-clang++ cmake -G "Ninja"       \
+          -DCMAKE_BUILD_TYPE=$BUILD_TYPE                \
+          -DBUILD_SHARED_LIBS=ON                        \
+          -DCMAKE_C_COMPILER_LAUNCHER=ccache            \
+          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache          \
+          -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.3 \
+        ..
+    ninja -j $JOBS install
+
+    ccache -s
+fi
+EOF
+
+# Build ImHex
+## Copy ImHex
+COPY --from=imhex / /mnt/ImHex
+## Patch ImHex with hacks
+# COPY toolchain.cmake.2 /osxcross/target/toolchain.cmake
+# Configure ImHex build
+RUN --mount=type=cache,target=/cache --mount=type=cache,target=/mnt/ImHex/build/_deps \
+    cd /mnt/ImHex && \
+    # compilers
+    CC=o64-clang CXX=o64-clang++ OBJC=/osxcross/target/bin/aarch64-apple-darwin24-clang OBJCXX=/osxcross/target/bin/aarch64-apple-darwin24-clang++ \
+        cmake -G "Ninja" \
+        `# 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.3 \
+        `# 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 \
+        -DIMHEX_PATTERNS_PULL_MASTER=ON \
+        -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
+    ccache -zs
+    set -xe
+
+    cd /mnt/ImHex
+    cmake --build build --parallel $JOBS --target install
+
+    ccache -s
+EOF
+
+
+FROM scratch
+COPY --from=build /mnt/ImHex/build/install/imhex.app imhex.app

dist/macOS/arm64.crosscompile.Dockerfile

@@ -0,0 +1,83 @@
+# This image is provided for reference, but a (probably more up to date) image should be available at https://github.com/iTrooz/macos-crosscompile
+FROM ubuntu:22.04
+
+ENV PATH                $PATH:/osxcross/target/bin
+ENV LD_LIBRARY_PATH     /osxcross/target/lib
+ENV OSXCROSS_SDK        /osxcross/target/SDK/MacOSX14.0.sdk
+ENV OSXCROSS_TARGET     darwin24
+ENV OSXCROSS_TARGET_DIR /osxcross/target
+ENV OSXCROSS_HOST       aarch64-apple-darwin24
+
+# -- DOWNLOADING STUFF
+
+# Install common stuff
+RUN --mount=type=cache,target=/var/lib/apt/lists/ export DEBIAN_FRONTEND=noninteractive &&\
+    export TZ=Etc/UTC &&\
+    dpkg --add-architecture i386 &&\
+    apt update &&\
+    apt -y install lsb-release build-essential python3 python3-pip git wget zip unzip pkg-config curl ninja-build software-properties-common gnupg libssl-dev ccache
+
+# Install clang 17
+RUN --mount=type=cache,target=/var/lib/apt/lists/ wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 17 &&\
+    ln -s /usr/bin/clang-17 /usr/bin/clang &&\
+    ln -s /usr/bin/clang++-17 /usr/bin/clang++
+
+# Install vcpkg
+RUN cd / &&\
+    git clone --depth 1 https://github.com/Microsoft/vcpkg.git vcpkg &&\
+    cd /vcpkg &&\
+    ./bootstrap-vcpkg.sh -disableMetrics &&\
+    ln -s /vcpkg/vcpkg /usr/bin/ &&\
+    vcpkg install vcpkg-cmake &&\
+    ln -s /vcpkg/downloads/tools/cmake-*/cmake-*/bin/cmake /usr/bin/
+
+RUN --mount=type=cache,target=/cache <<EOF
+## Clone osxcross
+set -xe
+git clone https://github.com/tpoechtrager/osxcross /cache/osxcross || true
+cd /cache/osxcross
+git pull
+cp -r /cache/osxcross /osxcross
+EOF
+
+RUN --mount=type=cache,target=/cache <<EOF
+## Download SDK
+set -xe
+wget https://github.com/joseluisq/macosx-sdks/releases/download/14.0/MacOSX14.0.sdk.tar.xz -O /cache/MacOSX14.0.sdk.tar.xz -nc || true
+cp /cache/MacOSX14.0.sdk.tar.xz /osxcross/tarballs
+EOF
+
+# Init stuff
+## setup ccache dir
+ENV CCACHE_DIR /cache/ccache
+
+# Install triplet file
+COPY arm-osx-mytriplet.cmake /vcpkg/triplets/community
+
+# -- BUILDING STUFF
+ARG JOBS 1
+
+# Install osxcross
+## Build cross-compiler clang-17
+RUN --mount=type=cache,target=/cache <<EOF
+    set -xe
+    ccache -zs
+    
+    cd /osxcross
+    UNATTENDED=1 CC=/usr/lib/ccache/clang-17 CXX=/usr/lib/ccache/clang++-17 ./build.sh
+    
+    ccache -s
+EOF
+
+ARG DELETE_SDK=1
+RUN <<EOF
+# Conditionally delete the SDK from the image
+set -xe
+ 
+if [ "$DELETE_SDK" ]; then
+    rm -r /osxcross/target/SDK
+    echo "Deleted the SDK from the image"
+else
+    echo "NOT deleting the SDK from the image"
+fi
+EOF

dist/macOS/macos_arm_toolchain.cmake

@@ -1,4 +0,0 @@
-set(CMAKE_SYSTEM_NAME Darwin)
-set(CMAKE_SYSTEM_PROCESSOR arm64)
-set(CMAKE_OSX_ARCHITECTURES arm64 CACHE INTERNAL "" FORCE)
-SET(CMAKE_OSX_SYSROOT macosx CACHE INTERNAL "" FORCE)

dist/msys2/PKGBUILD

@@ -16,7 +16,13 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-file"
              "${MINGW_PACKAGE_PREFIX}-mbedtls"
              "${MINGW_PACKAGE_PREFIX}-polly"
-             "${MINGW_PACKAGE_PREFIX}-freetype")
+             "${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")
 
 source=()
 sha256sums=()

dist/net.werwolv.ImHex.metainfo.xml

@@ -0,0 +1,71 @@
+<?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://github.com/sponsors/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>
+    <recommends>
+        <control>keyboard</control>
+        <control>pointing</control>
+    </recommends>
+</component>

dist/net.werwolv.ImHex.yaml

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

@@ -1,34 +0,0 @@
-<?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,10 +1,12 @@
+%define source_date_epoch_from_changelog 0
+
 Name:           imhex
-Version:        1.26.2
+Version:        VERSION
 Release:        0%{?dist}
 Summary:        A hex editor for reverse engineers and programmers
 
 License:        GPL-2.0-only AND Zlib AND MIT AND Apache-2.0
-# imhex is gplv2.  capstone is custom.  nativefiledialog is Zlib.
+# imhex is gplv2.  capstone is custom.
 # see license dir for full breakdown
 URL:            https://imhex.werwolv.net/
 # We need the archive with deps bundled
@@ -22,29 +24,41 @@ 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:  dotnet-sdk-7.0
-%if 0%{?rhel}
-BuildRequires:  gcc-toolset-12
+BuildRequires:  lz4-devel
+BuildRequires:  libssh2-devel
+%if 0%{?rhel} == 9
+BuildRequires:  gcc-toolset-14
 %endif
+%if 0%{?fedora} || 0%{?rhel} > 9
+BuildRequires:  capstone-devel
+%endif
+BuildRequires:  lunasvg-devel
+
 
 Provides:       bundled(gnulib)
-Provides:       bundled(capstone) = 5.0-rc2
-Provides:       bundled(imgui)
+%if 0%{?rhel} == 10
+Provides:       bundled(capstone) = 5.0.1
+%endif
+Provides:       bundled(imgui) = 1.90.8
 Provides:       bundled(libromfs)
 Provides:       bundled(microtar)
-Provides:       bundled(libpl)
+Provides:       bundled(libpl) = %{version}
 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} ppc64le
-
+ExclusiveArch:  x86_64 %{arm64}
 
 %description
 ImHex is a Hex Editor, a tool to display, decode and analyze binary data to
@@ -58,14 +72,31 @@ 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
+%autosetup -n ImHex -p1
 # remove bundled libs we aren't using
-rm -rf lib/external/{curl,fmt,llvm,nlohmann_json,yara}
+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
 
 %build
-%if 0%{?rhel}
-. /opt/rh/gcc-toolset-12/enable
+%if 0%{?rhel} == 9
+. /opt/rh/gcc-toolset-14/enable
 %set_build_flags
 CXXFLAGS+=" -std=gnu++2b"
 %endif
@@ -75,23 +106,27 @@ 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_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
+ -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
 
 %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)'
@@ -103,28 +138,33 @@ 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.%{name}.appdata.xml
+rm -f %{buildroot}%{_metainfodir}/net.werwolv.ImHex.appdata.xml
 
 # AppData
-appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/net.werwolv.%{name}.metainfo.xml
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/net.werwolv.ImHex.metainfo.xml
 
 # install licenses
-cp -a lib/external/nativefiledialog/LICENSE                       %{buildroot}%{_datadir}/licenses/%{name}/nativefiledialog-LICENSE
-cp -a lib/external/capstone/LICENSE.TXT                           %{buildroot}%{_datadir}/licenses/%{name}/capstone-LICENSE
-cp -a lib/external/capstone/suite/regress/LICENSE                 %{buildroot}%{_datadir}/licenses/%{name}/capstone-regress-LICENSE
-cp -a lib/external/microtar/LICENSE                               %{buildroot}%{_datadir}/licenses/%{name}/microtar-LICENSE
-cp -a lib/external/xdgpp/LICENSE                                  %{buildroot}%{_datadir}/licenses/%{name}/xdgpp-LICENSE
+%if 0%{?rhel} == 9
+cp -a lib/third_party/capstone/LICENSES/LICENSE.TXT                  %{buildroot}%{_datadir}/licenses/%{name}/capstone-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
 
 
 %files
 %license %{_datadir}/licenses/%{name}/
 %doc README.md
 %{_bindir}/imhex
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/imhex/imhex
+%{_datadir}/pixmaps/%{name}.*
 %{_datadir}/applications/%{name}.desktop
-%{_libdir}/libimhex.so*
+%{_libdir}/libimhex.so.*
 %{_libdir}/%{name}/
-%{_metainfodir}/net.werwolv.%{name}.metainfo.xml
+%{_metainfodir}/net.werwolv.ImHex.metainfo.xml
+%exclude %{_bindir}/imhex-updater
+%{_datadir}/mime/packages/%{name}.xml
 
 
-%changelog
+%files devel
+%{_libdir}/libimhex.so
+%{_datadir}/%{name}/sdk/

dist/snap/snapcraft.yaml

@@ -0,0 +1,91 @@
+name: imhex
+title: ImHex
+base: core24
+version: ${IMHEX_VERSION_STRING}
+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}
+      - -DIMHEX_PATTERNS_PULL_MASTER=ON
+    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

@@ -0,0 +1,18 @@
+{
+    "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:latest as build
+FROM emscripten/emsdk:4.0.21 AS build
 
 # Used to invalidate layer cache but not mount cache
 # See https://github.com/moby/moby/issues/41715#issuecomment-733976493
 ARG UNIQUEKEY 1
 
 RUN apt update
-RUN apt install -y git ccache autoconf automake libtool cmake pkg-config
+RUN apt install -y git ccache autoconf automake libtool pkg-config ninja-build
 
 RUN <<EOF
 # Install vcpkg
@@ -13,6 +13,7 @@ RUN <<EOF
 set -xe
 
 git clone https://github.com/microsoft/vcpkg /vcpkg
+git -C /vcpkg pull
 /vcpkg/bootstrap-vcpkg.sh
 sed -i 's/vcpkg_install_make(${EXTRA_ARGS})/vcpkg_install_make(${EXTRA_ARGS} SUBPATH src)/g' /vcpkg/ports/libmagic/portfile.cmake
 EOF
@@ -27,7 +28,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
 ' >> /emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake
 EOF
 
-ENV VCPKG_DEFAULT_BINARY_CACHE /cache/vcpkg
+ENV VCPKG_DEFAULT_BINARY_CACHE=/cache/vcpkg
 RUN --mount=type=cache,target=/cache <<EOF
 # Install dependencies with vcpkg
 set -xe
@@ -37,11 +38,15 @@ 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
@@ -51,29 +56,38 @@ RUN --mount=type=cache,target=/cache \
 set -xe
 ccache -zs
 
-cmake /imhex                                                                                            \
+/vcpkg/downloads/tools/cmake-*/cmake-*/bin/cmake /imhex                                                                                            \
+    -G "Ninja"                                                                                          \
     -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
 
-make -j $JOBS
+ninja -j $JOBS
 
 cp /imhex/dist/web/source/* /build
 ccache -s
 EOF
 
-FROM scratch
+# Create a file dedicated to store wasm size, because I know no way to get the wasm content length if the web server uses compression
+# See https://stackoverflow.com/questions/41701849/cannot-modify-accept-encoding-with-fetch https://github.com/AnthumChris/fetch-progress-indicators/issues/13
+RUN du -b /build/imhex.wasm | cut -f1 > imhex.wasm.size
+
+FROM scratch AS raw
 COPY --from=build [             \
     # ImHex                     \
     "/build/imhex.wasm",        \
+    "/build/imhex.wasm.size",   \
     "/build/imhex.js",          \
-    "/build/imhex.worker.js",   \
                                 \
     # Static files              \
     "/build/index.html",        \
@@ -81,9 +95,14 @@ COPY --from=build [             \
     "/build/wasm-config.js",    \
     "/build/enable-threads.js", \
     "/build/favicon.ico",       \
-    "/build/icon.png",          \
+    "/build/icon.svg",          \
     "/build/manifest.json",     \
+    "/build/robots.txt",        \
+    "/build/sitemap.xml",       \
                                 \
     # Destination               \
     "./"                        \
-]
+]
+
+FROM nginx
+COPY --from=raw . /usr/share/nginx/html

dist/web/compose.yml

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

dist/web/plugin-bundle.cpp.in

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

dist/web/source/icon.svg

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

dist/web/source/index.html

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

dist/web/source/manifest.json

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

dist/web/source/robots.txt

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

dist/web/source/sitemap.xml

@@ -0,0 +1,67 @@
+<?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: 0px;
+    margin: 0;
     user-select: none;
 }
 
@@ -16,21 +16,173 @@ body {
     margin-left: auto;
     margin-right: auto;
     display: none;
-    border: 0px none;
+    border: 0 none;
+    image-rendering: smooth;
 }
 
-.canvas_full_screen {
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    top: 0;
-    left: 0;
-}
-
-#loading_text {
+h1, h2, h5 {
     color: #F0F0F0;
-    font-size: 30px;
+    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;
+
+    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;
 }

dist/web/source/wasm-config.js

@@ -1,3 +1,68 @@
+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) {
@@ -30,41 +95,181 @@ function glfwCreateStandardCursorCustom(shape) {
     return shape
 }
 
+var notWorkingTimer = setTimeout(() => {
+    document.getElementById("not_working").classList.add("visible")
+}, 5000);
+
 var Module = {
     preRun:  [],
-    postRun: [],
+    postRun: function() {
+        // Patch the emscripten GLFW module to send mouse and touch events in the right order
+        // For ImGui interactions to correctly work with touch input, MousePos events need
+        // to be processed first and then MouseButton events in the next frame. By default,
+        // GLFW does the exact opposite, which causes buttons to require two taps to register
+        // and windows get "stuck" to the cursor when dragged or resized
+        GLFW.onMousemove = event => {
+            if (event.type === "touchmove") {
+                event.preventDefault();
+                let primaryChanged = false;
+                for (let i of event.changedTouches) {
+                    if (GLFW.primaryTouchId === i.identifier) {
+                        Browser.setMouseCoords(i.pageX, i.pageY);
+                        primaryChanged = true;
+                        break;
+                    }
+                }
+                if (!primaryChanged) {
+                    return;
+                }
+            } else {
+                Browser.calculateMouseEvent(event);
+            }
+        };
+
+        GLFW.onMouseButtonChanged = (event, status) => {
+            if (!GLFW.active) return;
+            if (event.target != Module["canvas"]) return;
+            const isTouchType = event.type === "touchstart" || event.type === "touchend" || event.type === "touchcancel";
+            let eventButton = 0;
+            if (isTouchType) {
+                event.preventDefault();
+                let primaryChanged = false;
+                if (GLFW.primaryTouchId === null && event.type === "touchstart" && event.targetTouches.length > 0) {
+                    const chosenTouch = event.targetTouches[0];
+                    GLFW.primaryTouchId = chosenTouch.identifier;
+                    Browser.setMouseCoords(chosenTouch.pageX, chosenTouch.pageY);
+                    primaryChanged = true;
+                } else if (event.type === "touchend" || event.type === "touchcancel") {
+                    for (let i of event.changedTouches) {
+                        if (GLFW.primaryTouchId === i.identifier) {
+                            GLFW.primaryTouchId = null;
+                            primaryChanged = true;
+                            break;
+                        }
+                    }
+                }
+                if (!primaryChanged) {
+                    return;
+                }
+            } else {
+                Browser.calculateMouseEvent(event);
+                eventButton = GLFW.DOMToGLFWMouseButton(event);
+            }
+            if (status == 1) {
+                GLFW.active.buttons |= (1 << eventButton);
+                try {
+                    event.target.setCapture();
+                } catch (e) {}
+            } else {
+                GLFW.active.buttons &= ~(1 << eventButton);
+            }
+
+            if (GLFW.active.cursorPosFunc) {
+                getWasmTableEntry(GLFW.active.cursorPosFunc)(GLFW.active.id, Browser.mouseX, Browser.mouseY);
+            }
+            if (GLFW.active.mouseButtonFunc) {
+                getWasmTableEntry(GLFW.active.mouseButtonFunc)(GLFW.active.id, eventButton, status, GLFW.getModBits(GLFW.active));
+            }
+        };
+    },
     onRuntimeInitialized: function() {
         // Triggered when the wasm module is loaded and ready to use.
-        document.getElementById("loading_text").style.display = "none"
+        document.getElementById("loading").style.display = "none"
         document.getElementById("canvas").style.display = "initial"
+
+        clearTimeout(notWorkingTimer);
     },
     print:   (function() { })(),
-    printErr: function(text) { },
+    printErr: function(text) {  },
     canvas: (function() {
-        let canvas = document.getElementById('canvas');
-        // As a default initial behavior, pop up an alert when webgl context is lost. To make your
-        // application robust, you may want to override this behavior before shipping!
-        // See http://www.khronos.org/registry/webgl/specs/latest/1.0/#5.15.2
-        canvas.addEventListener("webglcontextlost", function(e) { alert('WebGL context lost. You will need to reload the page.'); e.preventDefault(); }, false);
+        const canvas = document.getElementById('canvas');
+        canvas.addEventListener("webglcontextlost", function(e) {
+            alert('WebGL context lost, please reload the page');
+            e.preventDefault();
+        }, false);
 
-        return canvas;
+        // Turn long touches into right-clicks
+        let timer = null;
+        canvas.addEventListener('touchstart', event => {
+            timer = setTimeout(() => {
+                let eventArgs = {
+                    bubbles: true,
+                    cancelable: true,
+                    view: window,
+                    screenX: event.touches[0].screenX,
+                    screenY: event.touches[0].screenY,
+                    clientX: event.touches[0].clientX,
+                    clientY: event.touches[0].clientY,
+                    button: 2,
+                    buttons: 2,
+                    relatedTarget: event.target,
+                    region: event.region
+                }
+
+                canvas.dispatchEvent(new MouseEvent('mousedown', eventArgs));
+                canvas.dispatchEvent(new MouseEvent('mouseup', eventArgs));
+            }, 400);
+        });
+
+        canvas.addEventListener('touchend', event => {
+            if (timer) {
+                clearTimeout(timer);
+                timer = null;
+            }
+        });
+
+        if (typeof WebGL2RenderingContext !== 'undefined') {
+            let gl = canvas.getContext('webgl2', { stencil: true });
+            if (!gl) {
+                console.error('WebGL 2 not available, falling back to WebGL');
+                gl = canvas.getContext('webgl', { stencil: true });
+            }
+            if (!gl) {
+                alert('WebGL not available with stencil buffer');
+            }
+            return canvas;
+        } else {
+            alert('WebGL 2 not supported by this browser');
+        }
     })(),
     setStatus: function(text) { },
     totalDependencies: 0,
-    monitorRunDependencies: function(left) { },
-    instantiateWasm: function(imports, successCallback) {
+    monitorRunDependencies: function(left) {
+    },
+    instantiateWasm: async function(imports, successCallback) {
         imports.env.glfwSetCursor = glfwSetCursorCustom
         imports.env.glfwCreateStandardCursor = glfwCreateStandardCursorCustom
-        instantiateAsync(wasmBinary, wasmBinaryFile, imports, (result) => successCallback(result.instance, result.module));
-    }
+        let result = await instantiateAsync(null, findWasmBinary(), imports);
+        successCallback(result.instance, result.module)
+    },
+    arguments: []
 };
 
+// Handle passing arguments to the wasm module
+const queryString = window.location.search;
+const urlParams = new URLSearchParams(queryString);
+if (urlParams.has("lang")) {
+    Module["arguments"].push("--language");
+    Module["arguments"].push(urlParams.get("lang"));
+} 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);
+}
 
-    canvas.classList.add("canvas_full_screen")
-}
+// Prevent some default browser shortcuts from preventing ImHex ones to work
+document.addEventListener('keydown', e => {
+    if (e.ctrlKey) {
+        if (e.which == 83) e.preventDefault();
+    }
+})

lib/external/imgui/CMakeLists.txt

@@ -1,40 +0,0 @@
-cmake_minimum_required(VERSION 3.16)
-project(imgui)
-
-set(CMAKE_CXX_STANDARD 17)
-
-find_package(PkgConfig REQUIRED)
-find_package(Freetype REQUIRED)
-find_package(OpenGL REQUIRED)
-pkg_search_module(GLFW REQUIRED glfw3)
-
-add_library(imgui OBJECT
-        source/imgui.cpp
-        source/imgui_demo.cpp
-        source/imgui_draw.cpp
-        include/misc/freetype/imgui_freetype.cpp # TODO move source and includes in the same directory
-        source/imgui_impl_glfw.cpp
-        source/imgui_impl_opengl3.cpp
-        source/imgui_tables.cpp
-        source/imgui_widgets.cpp
-
-        source/TextEditor.cpp
-
-        source/imnodes.cpp
-
-        source/implot.cpp
-        source/implot_items.cpp
-        source/implot_demo.cpp
-
-        source/fonts/fontawesome_font.c
-        source/fonts/codicons_font.c
-        source/fonts/unifont_font.c
-)
-
-target_compile_definitions(imgui PUBLIC IMGUI_IMPL_OPENGL_LOADER_GLAD)
-target_compile_definitions(imgui PUBLIC IMGUI_USER_CONFIG="imgui_config.h")
-target_compile_options(imgui PRIVATE -Wno-unknown-warning-option)
-
-target_include_directories(imgui PUBLIC include ${FREETYPE_INCLUDE_DIRS} ${GLFW_INCLUDE_DIRS} ${OpenGL_INCLUDE_DIRS})
-target_link_directories(imgui PUBLIC ${GLFW_LIBRARY_DIRS} ${OpenGL_LIBRARY_DIRS})
-target_link_libraries(imgui PUBLIC Freetype::Freetype ${GLFW_LIBRARIES} ${OPENGL_LIBRARIES})

lib/external/imgui/include/TextEditor.h

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

lib/external/imgui/include/fonts/codicons_font.h

@@ -1,475 +0,0 @@
-// Generated by https://github.com/juliettef/IconFontCppHeaders script GenerateIconFontCppHeaders.py for languages C and C++
-// from https://raw.githubusercontent.com/microsoft/vscode-codicons/main/dist/codicon.css
-// for use with https://github.com/microsoft/vscode-codicons/raw/main/dist/codicon.ttf
-#pragma once
-
-#define FONT_ICON_FILE_NAME_VS "codicon.ttf"
-
-extern const unsigned int codicons_compressed_size;
-extern const unsigned int codicons_compressed_data[52184/4];
-
-#define ICON_MIN_VS 0xea60
-#define ICON_MAX_VS 0xebdd
-#define ICON_VS_ADD "\xee\xa9\xa0"	// U+ea60
-#define ICON_VS_PLUS "\xee\xa9\xa0"	// U+ea60
-#define ICON_VS_GIST_NEW "\xee\xa9\xa0"	// U+ea60
-#define ICON_VS_REPO_CREATE "\xee\xa9\xa0"	// U+ea60
-#define ICON_VS_LIGHTBULB "\xee\xa9\xa1"	// U+ea61
-#define ICON_VS_LIGHT_BULB "\xee\xa9\xa1"	// U+ea61
-#define ICON_VS_REPO "\xee\xa9\xa2"	// U+ea62
-#define ICON_VS_REPO_DELETE "\xee\xa9\xa2"	// U+ea62
-#define ICON_VS_GIST_FORK "\xee\xa9\xa3"	// U+ea63
-#define ICON_VS_REPO_FORKED "\xee\xa9\xa3"	// U+ea63
-#define ICON_VS_GIT_PULL_REQUEST "\xee\xa9\xa4"	// U+ea64
-#define ICON_VS_GIT_PULL_REQUEST_ABANDONED "\xee\xa9\xa4"	// U+ea64
-#define ICON_VS_RECORD_KEYS "\xee\xa9\xa5"	// U+ea65
-#define ICON_VS_KEYBOARD "\xee\xa9\xa5"	// U+ea65
-#define ICON_VS_TAG "\xee\xa9\xa6"	// U+ea66
-#define ICON_VS_TAG_ADD "\xee\xa9\xa6"	// U+ea66
-#define ICON_VS_TAG_REMOVE "\xee\xa9\xa6"	// U+ea66
-#define ICON_VS_PERSON "\xee\xa9\xa7"	// U+ea67
-#define ICON_VS_PERSON_FOLLOW "\xee\xa9\xa7"	// U+ea67
-#define ICON_VS_PERSON_OUTLINE "\xee\xa9\xa7"	// U+ea67
-#define ICON_VS_PERSON_FILLED "\xee\xa9\xa7"	// U+ea67
-#define ICON_VS_GIT_BRANCH "\xee\xa9\xa8"	// U+ea68
-#define ICON_VS_GIT_BRANCH_CREATE "\xee\xa9\xa8"	// U+ea68
-#define ICON_VS_GIT_BRANCH_DELETE "\xee\xa9\xa8"	// U+ea68
-#define ICON_VS_SOURCE_CONTROL "\xee\xa9\xa8"	// U+ea68
-#define ICON_VS_MIRROR "\xee\xa9\xa9"	// U+ea69
-#define ICON_VS_MIRROR_PUBLIC "\xee\xa9\xa9"	// U+ea69
-#define ICON_VS_STAR "\xee\xa9\xaa"	// U+ea6a
-#define ICON_VS_STAR_ADD "\xee\xa9\xaa"	// U+ea6a
-#define ICON_VS_STAR_DELETE "\xee\xa9\xaa"	// U+ea6a
-#define ICON_VS_STAR_EMPTY "\xee\xa9\xaa"	// U+ea6a
-#define ICON_VS_COMMENT "\xee\xa9\xab"	// U+ea6b
-#define ICON_VS_COMMENT_ADD "\xee\xa9\xab"	// U+ea6b
-#define ICON_VS_ALERT "\xee\xa9\xac"	// U+ea6c
-#define ICON_VS_WARNING "\xee\xa9\xac"	// U+ea6c
-#define ICON_VS_SEARCH "\xee\xa9\xad"	// U+ea6d
-#define ICON_VS_SEARCH_SAVE "\xee\xa9\xad"	// U+ea6d
-#define ICON_VS_LOG_OUT "\xee\xa9\xae"	// U+ea6e
-#define ICON_VS_SIGN_OUT "\xee\xa9\xae"	// U+ea6e
-#define ICON_VS_LOG_IN "\xee\xa9\xaf"	// U+ea6f
-#define ICON_VS_SIGN_IN "\xee\xa9\xaf"	// U+ea6f
-#define ICON_VS_EYE "\xee\xa9\xb0"	// U+ea70
-#define ICON_VS_EYE_UNWATCH "\xee\xa9\xb0"	// U+ea70
-#define ICON_VS_EYE_WATCH "\xee\xa9\xb0"	// U+ea70
-#define ICON_VS_CIRCLE_FILLED "\xee\xa9\xb1"	// U+ea71
-#define ICON_VS_PRIMITIVE_DOT "\xee\xa9\xb1"	// U+ea71
-#define ICON_VS_CLOSE_DIRTY "\xee\xa9\xb1"	// U+ea71
-#define ICON_VS_DEBUG_BREAKPOINT "\xee\xa9\xb1"	// U+ea71
-#define ICON_VS_DEBUG_BREAKPOINT_DISABLED "\xee\xa9\xb1"	// U+ea71
-#define ICON_VS_DEBUG_HINT "\xee\xa9\xb1"	// U+ea71
-#define ICON_VS_PRIMITIVE_SQUARE "\xee\xa9\xb2"	// U+ea72
-#define ICON_VS_EDIT "\xee\xa9\xb3"	// U+ea73
-#define ICON_VS_PENCIL "\xee\xa9\xb3"	// U+ea73
-#define ICON_VS_INFO "\xee\xa9\xb4"	// U+ea74
-#define ICON_VS_ISSUE_OPENED "\xee\xa9\xb4"	// U+ea74
-#define ICON_VS_GIST_PRIVATE "\xee\xa9\xb5"	// U+ea75
-#define ICON_VS_GIT_FORK_PRIVATE "\xee\xa9\xb5"	// U+ea75
-#define ICON_VS_LOCK "\xee\xa9\xb5"	// U+ea75
-#define ICON_VS_MIRROR_PRIVATE "\xee\xa9\xb5"	// U+ea75
-#define ICON_VS_CLOSE "\xee\xa9\xb6"	// U+ea76
-#define ICON_VS_REMOVE_CLOSE "\xee\xa9\xb6"	// U+ea76
-#define ICON_VS_X "\xee\xa9\xb6"	// U+ea76
-#define ICON_VS_REPO_SYNC "\xee\xa9\xb7"	// U+ea77
-#define ICON_VS_SYNC "\xee\xa9\xb7"	// U+ea77
-#define ICON_VS_CLONE "\xee\xa9\xb8"	// U+ea78
-#define ICON_VS_DESKTOP_DOWNLOAD "\xee\xa9\xb8"	// U+ea78
-#define ICON_VS_BEAKER "\xee\xa9\xb9"	// U+ea79
-#define ICON_VS_MICROSCOPE "\xee\xa9\xb9"	// U+ea79
-#define ICON_VS_VM "\xee\xa9\xba"	// U+ea7a
-#define ICON_VS_DEVICE_DESKTOP "\xee\xa9\xba"	// U+ea7a
-#define ICON_VS_FILE "\xee\xa9\xbb"	// U+ea7b
-#define ICON_VS_FILE_TEXT "\xee\xa9\xbb"	// U+ea7b
-#define ICON_VS_MORE "\xee\xa9\xbc"	// U+ea7c
-#define ICON_VS_ELLIPSIS "\xee\xa9\xbc"	// U+ea7c
-#define ICON_VS_KEBAB_HORIZONTAL "\xee\xa9\xbc"	// U+ea7c
-#define ICON_VS_MAIL_REPLY "\xee\xa9\xbd"	// U+ea7d
-#define ICON_VS_REPLY "\xee\xa9\xbd"	// U+ea7d
-#define ICON_VS_ORGANIZATION "\xee\xa9\xbe"	// U+ea7e
-#define ICON_VS_ORGANIZATION_FILLED "\xee\xa9\xbe"	// U+ea7e
-#define ICON_VS_ORGANIZATION_OUTLINE "\xee\xa9\xbe"	// U+ea7e
-#define ICON_VS_NEW_FILE "\xee\xa9\xbf"	// U+ea7f
-#define ICON_VS_FILE_ADD "\xee\xa9\xbf"	// U+ea7f
-#define ICON_VS_NEW_FOLDER "\xee\xaa\x80"	// U+ea80
-#define ICON_VS_FILE_DIRECTORY_CREATE "\xee\xaa\x80"	// U+ea80
-#define ICON_VS_TRASH "\xee\xaa\x81"	// U+ea81
-#define ICON_VS_TRASHCAN "\xee\xaa\x81"	// U+ea81
-#define ICON_VS_HISTORY "\xee\xaa\x82"	// U+ea82
-#define ICON_VS_CLOCK "\xee\xaa\x82"	// U+ea82
-#define ICON_VS_FOLDER "\xee\xaa\x83"	// U+ea83
-#define ICON_VS_FILE_DIRECTORY "\xee\xaa\x83"	// U+ea83
-#define ICON_VS_SYMBOL_FOLDER "\xee\xaa\x83"	// U+ea83
-#define ICON_VS_LOGO_GITHUB "\xee\xaa\x84"	// U+ea84
-#define ICON_VS_MARK_GITHUB "\xee\xaa\x84"	// U+ea84
-#define ICON_VS_GITHUB "\xee\xaa\x84"	// U+ea84
-#define ICON_VS_TERMINAL "\xee\xaa\x85"	// U+ea85
-#define ICON_VS_CONSOLE "\xee\xaa\x85"	// U+ea85
-#define ICON_VS_REPL "\xee\xaa\x85"	// U+ea85
-#define ICON_VS_ZAP "\xee\xaa\x86"	// U+ea86
-#define ICON_VS_SYMBOL_EVENT "\xee\xaa\x86"	// U+ea86
-#define ICON_VS_ERROR "\xee\xaa\x87"	// U+ea87
-#define ICON_VS_STOP "\xee\xaa\x87"	// U+ea87
-#define ICON_VS_VARIABLE "\xee\xaa\x88"	// U+ea88
-#define ICON_VS_SYMBOL_VARIABLE "\xee\xaa\x88"	// U+ea88
-#define ICON_VS_ARRAY "\xee\xaa\x8a"	// U+ea8a
-#define ICON_VS_SYMBOL_ARRAY "\xee\xaa\x8a"	// U+ea8a
-#define ICON_VS_SYMBOL_MODULE "\xee\xaa\x8b"	// U+ea8b
-#define ICON_VS_SYMBOL_PACKAGE "\xee\xaa\x8b"	// U+ea8b
-#define ICON_VS_SYMBOL_NAMESPACE "\xee\xaa\x8b"	// U+ea8b
-#define ICON_VS_SYMBOL_OBJECT "\xee\xaa\x8b"	// U+ea8b
-#define ICON_VS_SYMBOL_METHOD "\xee\xaa\x8c"	// U+ea8c
-#define ICON_VS_SYMBOL_FUNCTION "\xee\xaa\x8c"	// U+ea8c
-#define ICON_VS_SYMBOL_CONSTRUCTOR "\xee\xaa\x8c"	// U+ea8c
-#define ICON_VS_SYMBOL_BOOLEAN "\xee\xaa\x8f"	// U+ea8f
-#define ICON_VS_SYMBOL_NULL "\xee\xaa\x8f"	// U+ea8f
-#define ICON_VS_SYMBOL_NUMERIC "\xee\xaa\x90"	// U+ea90
-#define ICON_VS_SYMBOL_NUMBER "\xee\xaa\x90"	// U+ea90
-#define ICON_VS_SYMBOL_STRUCTURE "\xee\xaa\x91"	// U+ea91
-#define ICON_VS_SYMBOL_STRUCT "\xee\xaa\x91"	// U+ea91
-#define ICON_VS_SYMBOL_PARAMETER "\xee\xaa\x92"	// U+ea92
-#define ICON_VS_SYMBOL_TYPE_PARAMETER "\xee\xaa\x92"	// U+ea92
-#define ICON_VS_SYMBOL_KEY "\xee\xaa\x93"	// U+ea93
-#define ICON_VS_SYMBOL_TEXT "\xee\xaa\x93"	// U+ea93
-#define ICON_VS_SYMBOL_REFERENCE "\xee\xaa\x94"	// U+ea94
-#define ICON_VS_GO_TO_FILE "\xee\xaa\x94"	// U+ea94
-#define ICON_VS_SYMBOL_ENUM "\xee\xaa\x95"	// U+ea95
-#define ICON_VS_SYMBOL_VALUE "\xee\xaa\x95"	// U+ea95
-#define ICON_VS_SYMBOL_RULER "\xee\xaa\x96"	// U+ea96
-#define ICON_VS_SYMBOL_UNIT "\xee\xaa\x96"	// U+ea96
-#define ICON_VS_ACTIVATE_BREAKPOINTS "\xee\xaa\x97"	// U+ea97
-#define ICON_VS_ARCHIVE "\xee\xaa\x98"	// U+ea98
-#define ICON_VS_ARROW_BOTH "\xee\xaa\x99"	// U+ea99
-#define ICON_VS_ARROW_DOWN "\xee\xaa\x9a"	// U+ea9a
-#define ICON_VS_ARROW_LEFT "\xee\xaa\x9b"	// U+ea9b
-#define ICON_VS_ARROW_RIGHT "\xee\xaa\x9c"	// U+ea9c
-#define ICON_VS_ARROW_SMALL_DOWN "\xee\xaa\x9d"	// U+ea9d
-#define ICON_VS_ARROW_SMALL_LEFT "\xee\xaa\x9e"	// U+ea9e
-#define ICON_VS_ARROW_SMALL_RIGHT "\xee\xaa\x9f"	// U+ea9f
-#define ICON_VS_ARROW_SMALL_UP "\xee\xaa\xa0"	// U+eaa0
-#define ICON_VS_ARROW_UP "\xee\xaa\xa1"	// U+eaa1
-#define ICON_VS_BELL "\xee\xaa\xa2"	// U+eaa2
-#define ICON_VS_BOLD "\xee\xaa\xa3"	// U+eaa3
-#define ICON_VS_BOOK "\xee\xaa\xa4"	// U+eaa4
-#define ICON_VS_BOOKMARK "\xee\xaa\xa5"	// U+eaa5
-#define ICON_VS_DEBUG_BREAKPOINT_CONDITIONAL_UNVERIFIED "\xee\xaa\xa6"	// U+eaa6
-#define ICON_VS_DEBUG_BREAKPOINT_CONDITIONAL "\xee\xaa\xa7"	// U+eaa7
-#define ICON_VS_DEBUG_BREAKPOINT_CONDITIONAL_DISABLED "\xee\xaa\xa7"	// U+eaa7
-#define ICON_VS_DEBUG_BREAKPOINT_DATA_UNVERIFIED "\xee\xaa\xa8"	// U+eaa8
-#define ICON_VS_DEBUG_BREAKPOINT_DATA "\xee\xaa\xa9"	// U+eaa9
-#define ICON_VS_DEBUG_BREAKPOINT_DATA_DISABLED "\xee\xaa\xa9"	// U+eaa9
-#define ICON_VS_DEBUG_BREAKPOINT_LOG_UNVERIFIED "\xee\xaa\xaa"	// U+eaaa
-#define ICON_VS_DEBUG_BREAKPOINT_LOG "\xee\xaa\xab"	// U+eaab
-#define ICON_VS_DEBUG_BREAKPOINT_LOG_DISABLED "\xee\xaa\xab"	// U+eaab
-#define ICON_VS_BRIEFCASE "\xee\xaa\xac"	// U+eaac
-#define ICON_VS_BROADCAST "\xee\xaa\xad"	// U+eaad
-#define ICON_VS_BROWSER "\xee\xaa\xae"	// U+eaae
-#define ICON_VS_BUG "\xee\xaa\xaf"	// U+eaaf
-#define ICON_VS_CALENDAR "\xee\xaa\xb0"	// U+eab0
-#define ICON_VS_CASE_SENSITIVE "\xee\xaa\xb1"	// U+eab1
-#define ICON_VS_CHECK "\xee\xaa\xb2"	// U+eab2
-#define ICON_VS_CHECKLIST "\xee\xaa\xb3"	// U+eab3
-#define ICON_VS_CHEVRON_DOWN "\xee\xaa\xb4"	// U+eab4
-#define ICON_VS_CHEVRON_LEFT "\xee\xaa\xb5"	// U+eab5
-#define ICON_VS_CHEVRON_RIGHT "\xee\xaa\xb6"	// U+eab6
-#define ICON_VS_CHEVRON_UP "\xee\xaa\xb7"	// U+eab7
-#define ICON_VS_CHROME_CLOSE "\xee\xaa\xb8"	// U+eab8
-#define ICON_VS_CHROME_MAXIMIZE "\xee\xaa\xb9"	// U+eab9
-#define ICON_VS_CHROME_MINIMIZE "\xee\xaa\xba"	// U+eaba
-#define ICON_VS_CHROME_RESTORE "\xee\xaa\xbb"	// U+eabb
-#define ICON_VS_CIRCLE_OUTLINE "\xee\xaa\xbc"	// U+eabc
-#define ICON_VS_DEBUG_BREAKPOINT_UNVERIFIED "\xee\xaa\xbc"	// U+eabc
-#define ICON_VS_CIRCLE_SLASH "\xee\xaa\xbd"	// U+eabd
-#define ICON_VS_CIRCUIT_BOARD "\xee\xaa\xbe"	// U+eabe
-#define ICON_VS_CLEAR_ALL "\xee\xaa\xbf"	// U+eabf
-#define ICON_VS_CLIPPY "\xee\xab\x80"	// U+eac0
-#define ICON_VS_CLOSE_ALL "\xee\xab\x81"	// U+eac1
-#define ICON_VS_CLOUD_DOWNLOAD "\xee\xab\x82"	// U+eac2
-#define ICON_VS_CLOUD_UPLOAD "\xee\xab\x83"	// U+eac3
-#define ICON_VS_CODE "\xee\xab\x84"	// U+eac4
-#define ICON_VS_COLLAPSE_ALL "\xee\xab\x85"	// U+eac5
-#define ICON_VS_COLOR_MODE "\xee\xab\x86"	// U+eac6
-#define ICON_VS_COMMENT_DISCUSSION "\xee\xab\x87"	// U+eac7
-#define ICON_VS_CREDIT_CARD "\xee\xab\x89"	// U+eac9
-#define ICON_VS_DASH "\xee\xab\x8c"	// U+eacc
-#define ICON_VS_DASHBOARD "\xee\xab\x8d"	// U+eacd
-#define ICON_VS_DATABASE "\xee\xab\x8e"	// U+eace
-#define ICON_VS_DEBUG_CONTINUE "\xee\xab\x8f"	// U+eacf
-#define ICON_VS_DEBUG_DISCONNECT "\xee\xab\x90"	// U+ead0
-#define ICON_VS_DEBUG_PAUSE "\xee\xab\x91"	// U+ead1
-#define ICON_VS_DEBUG_RESTART "\xee\xab\x92"	// U+ead2
-#define ICON_VS_DEBUG_START "\xee\xab\x93"	// U+ead3
-#define ICON_VS_DEBUG_STEP_INTO "\xee\xab\x94"	// U+ead4
-#define ICON_VS_DEBUG_STEP_OUT "\xee\xab\x95"	// U+ead5
-#define ICON_VS_DEBUG_STEP_OVER "\xee\xab\x96"	// U+ead6
-#define ICON_VS_DEBUG_STOP "\xee\xab\x97"	// U+ead7
-#define ICON_VS_DEBUG "\xee\xab\x98"	// U+ead8
-#define ICON_VS_DEVICE_CAMERA_VIDEO "\xee\xab\x99"	// U+ead9
-#define ICON_VS_DEVICE_CAMERA "\xee\xab\x9a"	// U+eada
-#define ICON_VS_DEVICE_MOBILE "\xee\xab\x9b"	// U+eadb
-#define ICON_VS_DIFF_ADDED "\xee\xab\x9c"	// U+eadc
-#define ICON_VS_DIFF_IGNORED "\xee\xab\x9d"	// U+eadd
-#define ICON_VS_DIFF_MODIFIED "\xee\xab\x9e"	// U+eade
-#define ICON_VS_DIFF_REMOVED "\xee\xab\x9f"	// U+eadf
-#define ICON_VS_DIFF_RENAMED "\xee\xab\xa0"	// U+eae0
-#define ICON_VS_DIFF "\xee\xab\xa1"	// U+eae1
-#define ICON_VS_DISCARD "\xee\xab\xa2"	// U+eae2
-#define ICON_VS_EDITOR_LAYOUT "\xee\xab\xa3"	// U+eae3
-#define ICON_VS_EMPTY_WINDOW "\xee\xab\xa4"	// U+eae4
-#define ICON_VS_EXCLUDE "\xee\xab\xa5"	// U+eae5
-#define ICON_VS_EXTENSIONS "\xee\xab\xa6"	// U+eae6
-#define ICON_VS_EYE_CLOSED "\xee\xab\xa7"	// U+eae7
-#define ICON_VS_FILE_BINARY "\xee\xab\xa8"	// U+eae8
-#define ICON_VS_FILE_CODE "\xee\xab\xa9"	// U+eae9
-#define ICON_VS_FILE_MEDIA "\xee\xab\xaa"	// U+eaea
-#define ICON_VS_FILE_PDF "\xee\xab\xab"	// U+eaeb
-#define ICON_VS_FILE_SUBMODULE "\xee\xab\xac"	// U+eaec
-#define ICON_VS_FILE_SYMLINK_DIRECTORY "\xee\xab\xad"	// U+eaed
-#define ICON_VS_FILE_SYMLINK_FILE "\xee\xab\xae"	// U+eaee
-#define ICON_VS_FILE_ZIP "\xee\xab\xaf"	// U+eaef
-#define ICON_VS_FILES "\xee\xab\xb0"	// U+eaf0
-#define ICON_VS_FILTER "\xee\xab\xb1"	// U+eaf1
-#define ICON_VS_FLAME "\xee\xab\xb2"	// U+eaf2
-#define ICON_VS_FOLD_DOWN "\xee\xab\xb3"	// U+eaf3
-#define ICON_VS_FOLD_UP "\xee\xab\xb4"	// U+eaf4
-#define ICON_VS_FOLD "\xee\xab\xb5"	// U+eaf5
-#define ICON_VS_FOLDER_ACTIVE "\xee\xab\xb6"	// U+eaf6
-#define ICON_VS_FOLDER_OPENED "\xee\xab\xb7"	// U+eaf7
-#define ICON_VS_GEAR "\xee\xab\xb8"	// U+eaf8
-#define ICON_VS_GIFT "\xee\xab\xb9"	// U+eaf9
-#define ICON_VS_GIST_SECRET "\xee\xab\xba"	// U+eafa
-#define ICON_VS_GIST "\xee\xab\xbb"	// U+eafb
-#define ICON_VS_GIT_COMMIT "\xee\xab\xbc"	// U+eafc
-#define ICON_VS_GIT_COMPARE "\xee\xab\xbd"	// U+eafd
-#define ICON_VS_COMPARE_CHANGES "\xee\xab\xbd"	// U+eafd
-#define ICON_VS_GIT_MERGE "\xee\xab\xbe"	// U+eafe
-#define ICON_VS_GITHUB_ACTION "\xee\xab\xbf"	// U+eaff
-#define ICON_VS_GITHUB_ALT "\xee\xac\x80"	// U+eb00
-#define ICON_VS_GLOBE "\xee\xac\x81"	// U+eb01
-#define ICON_VS_GRABBER "\xee\xac\x82"	// U+eb02
-#define ICON_VS_GRAPH "\xee\xac\x83"	// U+eb03
-#define ICON_VS_GRIPPER "\xee\xac\x84"	// U+eb04
-#define ICON_VS_HEART "\xee\xac\x85"	// U+eb05
-#define ICON_VS_HOME "\xee\xac\x86"	// U+eb06
-#define ICON_VS_HORIZONTAL_RULE "\xee\xac\x87"	// U+eb07
-#define ICON_VS_HUBOT "\xee\xac\x88"	// U+eb08
-#define ICON_VS_INBOX "\xee\xac\x89"	// U+eb09
-#define ICON_VS_ISSUE_REOPENED "\xee\xac\x8b"	// U+eb0b
-#define ICON_VS_ISSUES "\xee\xac\x8c"	// U+eb0c
-#define ICON_VS_ITALIC "\xee\xac\x8d"	// U+eb0d
-#define ICON_VS_JERSEY "\xee\xac\x8e"	// U+eb0e
-#define ICON_VS_JSON "\xee\xac\x8f"	// U+eb0f
-#define ICON_VS_KEBAB_VERTICAL "\xee\xac\x90"	// U+eb10
-#define ICON_VS_KEY "\xee\xac\x91"	// U+eb11
-#define ICON_VS_LAW "\xee\xac\x92"	// U+eb12
-#define ICON_VS_LIGHTBULB_AUTOFIX "\xee\xac\x93"	// U+eb13
-#define ICON_VS_LINK_EXTERNAL "\xee\xac\x94"	// U+eb14
-#define ICON_VS_LINK "\xee\xac\x95"	// U+eb15
-#define ICON_VS_LIST_ORDERED "\xee\xac\x96"	// U+eb16
-#define ICON_VS_LIST_UNORDERED "\xee\xac\x97"	// U+eb17
-#define ICON_VS_LIVE_SHARE "\xee\xac\x98"	// U+eb18
-#define ICON_VS_LOADING "\xee\xac\x99"	// U+eb19
-#define ICON_VS_LOCATION "\xee\xac\x9a"	// U+eb1a
-#define ICON_VS_MAIL_READ "\xee\xac\x9b"	// U+eb1b
-#define ICON_VS_MAIL "\xee\xac\x9c"	// U+eb1c
-#define ICON_VS_MARKDOWN "\xee\xac\x9d"	// U+eb1d
-#define ICON_VS_MEGAPHONE "\xee\xac\x9e"	// U+eb1e
-#define ICON_VS_MENTION "\xee\xac\x9f"	// U+eb1f
-#define ICON_VS_MILESTONE "\xee\xac\xa0"	// U+eb20
-#define ICON_VS_MORTAR_BOARD "\xee\xac\xa1"	// U+eb21
-#define ICON_VS_MOVE "\xee\xac\xa2"	// U+eb22
-#define ICON_VS_MULTIPLE_WINDOWS "\xee\xac\xa3"	// U+eb23
-#define ICON_VS_MUTE "\xee\xac\xa4"	// U+eb24
-#define ICON_VS_NO_NEWLINE "\xee\xac\xa5"	// U+eb25
-#define ICON_VS_NOTE "\xee\xac\xa6"	// U+eb26
-#define ICON_VS_OCTOFACE "\xee\xac\xa7"	// U+eb27
-#define ICON_VS_OPEN_PREVIEW "\xee\xac\xa8"	// U+eb28
-#define ICON_VS_PACKAGE "\xee\xac\xa9"	// U+eb29
-#define ICON_VS_PAINTCAN "\xee\xac\xaa"	// U+eb2a
-#define ICON_VS_PIN "\xee\xac\xab"	// U+eb2b
-#define ICON_VS_PLAY "\xee\xac\xac"	// U+eb2c
-#define ICON_VS_RUN "\xee\xac\xac"	// U+eb2c
-#define ICON_VS_PLUG "\xee\xac\xad"	// U+eb2d
-#define ICON_VS_PRESERVE_CASE "\xee\xac\xae"	// U+eb2e
-#define ICON_VS_PREVIEW "\xee\xac\xaf"	// U+eb2f
-#define ICON_VS_PROJECT "\xee\xac\xb0"	// U+eb30
-#define ICON_VS_PULSE "\xee\xac\xb1"	// U+eb31
-#define ICON_VS_QUESTION "\xee\xac\xb2"	// U+eb32
-#define ICON_VS_QUOTE "\xee\xac\xb3"	// U+eb33
-#define ICON_VS_RADIO_TOWER "\xee\xac\xb4"	// U+eb34
-#define ICON_VS_REACTIONS "\xee\xac\xb5"	// U+eb35
-#define ICON_VS_REFERENCES "\xee\xac\xb6"	// U+eb36
-#define ICON_VS_REFRESH "\xee\xac\xb7"	// U+eb37
-#define ICON_VS_REGEX "\xee\xac\xb8"	// U+eb38
-#define ICON_VS_REMOTE_EXPLORER "\xee\xac\xb9"	// U+eb39
-#define ICON_VS_REMOTE "\xee\xac\xba"	// U+eb3a
-#define ICON_VS_REMOVE "\xee\xac\xbb"	// U+eb3b
-#define ICON_VS_REPLACE_ALL "\xee\xac\xbc"	// U+eb3c
-#define ICON_VS_REPLACE "\xee\xac\xbd"	// U+eb3d
-#define ICON_VS_REPO_CLONE "\xee\xac\xbe"	// U+eb3e
-#define ICON_VS_REPO_FORCE_PUSH "\xee\xac\xbf"	// U+eb3f
-#define ICON_VS_REPO_PULL "\xee\xad\x80"	// U+eb40
-#define ICON_VS_REPO_PUSH "\xee\xad\x81"	// U+eb41
-#define ICON_VS_REPORT "\xee\xad\x82"	// U+eb42
-#define ICON_VS_REQUEST_CHANGES "\xee\xad\x83"	// U+eb43
-#define ICON_VS_ROCKET "\xee\xad\x84"	// U+eb44
-#define ICON_VS_ROOT_FOLDER_OPENED "\xee\xad\x85"	// U+eb45
-#define ICON_VS_ROOT_FOLDER "\xee\xad\x86"	// U+eb46
-#define ICON_VS_RSS "\xee\xad\x87"	// U+eb47
-#define ICON_VS_RUBY "\xee\xad\x88"	// U+eb48
-#define ICON_VS_SAVE_ALL "\xee\xad\x89"	// U+eb49
-#define ICON_VS_SAVE_AS "\xee\xad\x8a"	// U+eb4a
-#define ICON_VS_SAVE "\xee\xad\x8b"	// U+eb4b
-#define ICON_VS_SCREEN_FULL "\xee\xad\x8c"	// U+eb4c
-#define ICON_VS_SCREEN_NORMAL "\xee\xad\x8d"	// U+eb4d
-#define ICON_VS_SEARCH_STOP "\xee\xad\x8e"	// U+eb4e
-#define ICON_VS_SERVER "\xee\xad\x90"	// U+eb50
-#define ICON_VS_SETTINGS_GEAR "\xee\xad\x91"	// U+eb51
-#define ICON_VS_SETTINGS "\xee\xad\x92"	// U+eb52
-#define ICON_VS_SHIELD "\xee\xad\x93"	// U+eb53
-#define ICON_VS_SMILEY "\xee\xad\x94"	// U+eb54
-#define ICON_VS_SORT_PRECEDENCE "\xee\xad\x95"	// U+eb55
-#define ICON_VS_SPLIT_HORIZONTAL "\xee\xad\x96"	// U+eb56
-#define ICON_VS_SPLIT_VERTICAL "\xee\xad\x97"	// U+eb57
-#define ICON_VS_SQUIRREL "\xee\xad\x98"	// U+eb58
-#define ICON_VS_STAR_FULL "\xee\xad\x99"	// U+eb59
-#define ICON_VS_STAR_HALF "\xee\xad\x9a"	// U+eb5a
-#define ICON_VS_SYMBOL_CLASS "\xee\xad\x9b"	// U+eb5b
-#define ICON_VS_SYMBOL_COLOR "\xee\xad\x9c"	// U+eb5c
-#define ICON_VS_SYMBOL_CONSTANT "\xee\xad\x9d"	// U+eb5d
-#define ICON_VS_SYMBOL_ENUM_MEMBER "\xee\xad\x9e"	// U+eb5e
-#define ICON_VS_SYMBOL_FIELD "\xee\xad\x9f"	// U+eb5f
-#define ICON_VS_SYMBOL_FILE "\xee\xad\xa0"	// U+eb60
-#define ICON_VS_SYMBOL_INTERFACE "\xee\xad\xa1"	// U+eb61
-#define ICON_VS_SYMBOL_KEYWORD "\xee\xad\xa2"	// U+eb62
-#define ICON_VS_SYMBOL_MISC "\xee\xad\xa3"	// U+eb63
-#define ICON_VS_SYMBOL_OPERATOR "\xee\xad\xa4"	// U+eb64
-#define ICON_VS_SYMBOL_PROPERTY "\xee\xad\xa5"	// U+eb65
-#define ICON_VS_WRENCH "\xee\xad\xa5"	// U+eb65
-#define ICON_VS_WRENCH_SUBACTION "\xee\xad\xa5"	// U+eb65
-#define ICON_VS_SYMBOL_SNIPPET "\xee\xad\xa6"	// U+eb66
-#define ICON_VS_TASKLIST "\xee\xad\xa7"	// U+eb67
-#define ICON_VS_TELESCOPE "\xee\xad\xa8"	// U+eb68
-#define ICON_VS_TEXT_SIZE "\xee\xad\xa9"	// U+eb69
-#define ICON_VS_THREE_BARS "\xee\xad\xaa"	// U+eb6a
-#define ICON_VS_THUMBSDOWN "\xee\xad\xab"	// U+eb6b
-#define ICON_VS_THUMBSUP "\xee\xad\xac"	// U+eb6c
-#define ICON_VS_TOOLS "\xee\xad\xad"	// U+eb6d
-#define ICON_VS_TRIANGLE_DOWN "\xee\xad\xae"	// U+eb6e
-#define ICON_VS_TRIANGLE_LEFT "\xee\xad\xaf"	// U+eb6f
-#define ICON_VS_TRIANGLE_RIGHT "\xee\xad\xb0"	// U+eb70
-#define ICON_VS_TRIANGLE_UP "\xee\xad\xb1"	// U+eb71
-#define ICON_VS_TWITTER "\xee\xad\xb2"	// U+eb72
-#define ICON_VS_UNFOLD "\xee\xad\xb3"	// U+eb73
-#define ICON_VS_UNLOCK "\xee\xad\xb4"	// U+eb74
-#define ICON_VS_UNMUTE "\xee\xad\xb5"	// U+eb75
-#define ICON_VS_UNVERIFIED "\xee\xad\xb6"	// U+eb76
-#define ICON_VS_VERIFIED "\xee\xad\xb7"	// U+eb77
-#define ICON_VS_VERSIONS "\xee\xad\xb8"	// U+eb78
-#define ICON_VS_VM_ACTIVE "\xee\xad\xb9"	// U+eb79
-#define ICON_VS_VM_OUTLINE "\xee\xad\xba"	// U+eb7a
-#define ICON_VS_VM_RUNNING "\xee\xad\xbb"	// U+eb7b
-#define ICON_VS_WATCH "\xee\xad\xbc"	// U+eb7c
-#define ICON_VS_WHITESPACE "\xee\xad\xbd"	// U+eb7d
-#define ICON_VS_WHOLE_WORD "\xee\xad\xbe"	// U+eb7e
-#define ICON_VS_WINDOW "\xee\xad\xbf"	// U+eb7f
-#define ICON_VS_WORD_WRAP "\xee\xae\x80"	// U+eb80
-#define ICON_VS_ZOOM_IN "\xee\xae\x81"	// U+eb81
-#define ICON_VS_ZOOM_OUT "\xee\xae\x82"	// U+eb82
-#define ICON_VS_LIST_FILTER "\xee\xae\x83"	// U+eb83
-#define ICON_VS_LIST_FLAT "\xee\xae\x84"	// U+eb84
-#define ICON_VS_LIST_SELECTION "\xee\xae\x85"	// U+eb85
-#define ICON_VS_SELECTION "\xee\xae\x85"	// U+eb85
-#define ICON_VS_LIST_TREE "\xee\xae\x86"	// U+eb86
-#define ICON_VS_DEBUG_BREAKPOINT_FUNCTION_UNVERIFIED "\xee\xae\x87"	// U+eb87
-#define ICON_VS_DEBUG_BREAKPOINT_FUNCTION "\xee\xae\x88"	// U+eb88
-#define ICON_VS_DEBUG_BREAKPOINT_FUNCTION_DISABLED "\xee\xae\x88"	// U+eb88
-#define ICON_VS_DEBUG_STACKFRAME_ACTIVE "\xee\xae\x89"	// U+eb89
-#define ICON_VS_DEBUG_STACKFRAME_DOT "\xee\xae\x8a"	// U+eb8a
-#define ICON_VS_DEBUG_STACKFRAME "\xee\xae\x8b"	// U+eb8b
-#define ICON_VS_DEBUG_STACKFRAME_FOCUSED "\xee\xae\x8b"	// U+eb8b
-#define ICON_VS_DEBUG_BREAKPOINT_UNSUPPORTED "\xee\xae\x8c"	// U+eb8c
-#define ICON_VS_SYMBOL_STRING "\xee\xae\x8d"	// U+eb8d
-#define ICON_VS_DEBUG_REVERSE_CONTINUE "\xee\xae\x8e"	// U+eb8e
-#define ICON_VS_DEBUG_STEP_BACK "\xee\xae\x8f"	// U+eb8f
-#define ICON_VS_DEBUG_RESTART_FRAME "\xee\xae\x90"	// U+eb90
-#define ICON_VS_DEBUG_ALT "\xee\xae\x91"	// U+eb91
-#define ICON_VS_CALL_INCOMING "\xee\xae\x92"	// U+eb92
-#define ICON_VS_CALL_OUTGOING "\xee\xae\x93"	// U+eb93
-#define ICON_VS_MENU "\xee\xae\x94"	// U+eb94
-#define ICON_VS_EXPAND_ALL "\xee\xae\x95"	// U+eb95
-#define ICON_VS_FEEDBACK "\xee\xae\x96"	// U+eb96
-#define ICON_VS_GROUP_BY_REF_TYPE "\xee\xae\x97"	// U+eb97
-#define ICON_VS_UNGROUP_BY_REF_TYPE "\xee\xae\x98"	// U+eb98
-#define ICON_VS_ACCOUNT "\xee\xae\x99"	// U+eb99
-#define ICON_VS_BELL_DOT "\xee\xae\x9a"	// U+eb9a
-#define ICON_VS_DEBUG_CONSOLE "\xee\xae\x9b"	// U+eb9b
-#define ICON_VS_LIBRARY "\xee\xae\x9c"	// U+eb9c
-#define ICON_VS_OUTPUT "\xee\xae\x9d"	// U+eb9d
-#define ICON_VS_RUN_ALL "\xee\xae\x9e"	// U+eb9e
-#define ICON_VS_SYNC_IGNORED "\xee\xae\x9f"	// U+eb9f
-#define ICON_VS_PINNED "\xee\xae\xa0"	// U+eba0
-#define ICON_VS_GITHUB_INVERTED "\xee\xae\xa1"	// U+eba1
-#define ICON_VS_SERVER_PROCESS "\xee\xae\xa2"	// U+eba2
-#define ICON_VS_SERVER_ENVIRONMENT "\xee\xae\xa3"	// U+eba3
-#define ICON_VS_PASS "\xee\xae\xa4"	// U+eba4
-#define ICON_VS_ISSUE_CLOSED "\xee\xae\xa4"	// U+eba4
-#define ICON_VS_STOP_CIRCLE "\xee\xae\xa5"	// U+eba5
-#define ICON_VS_PLAY_CIRCLE "\xee\xae\xa6"	// U+eba6
-#define ICON_VS_RECORD "\xee\xae\xa7"	// U+eba7
-#define ICON_VS_DEBUG_ALT_SMALL "\xee\xae\xa8"	// U+eba8
-#define ICON_VS_VM_CONNECT "\xee\xae\xa9"	// U+eba9
-#define ICON_VS_CLOUD "\xee\xae\xaa"	// U+ebaa
-#define ICON_VS_MERGE "\xee\xae\xab"	// U+ebab
-#define ICON_VS_EXPORT "\xee\xae\xac"	// U+ebac
-#define ICON_VS_GRAPH_LEFT "\xee\xae\xad"	// U+ebad
-#define ICON_VS_MAGNET "\xee\xae\xae"	// U+ebae
-#define ICON_VS_NOTEBOOK "\xee\xae\xaf"	// U+ebaf
-#define ICON_VS_REDO "\xee\xae\xb0"	// U+ebb0
-#define ICON_VS_CHECK_ALL "\xee\xae\xb1"	// U+ebb1
-#define ICON_VS_PINNED_DIRTY "\xee\xae\xb2"	// U+ebb2
-#define ICON_VS_PASS_FILLED "\xee\xae\xb3"	// U+ebb3
-#define ICON_VS_CIRCLE_LARGE_FILLED "\xee\xae\xb4"	// U+ebb4
-#define ICON_VS_CIRCLE_LARGE_OUTLINE "\xee\xae\xb5"	// U+ebb5
-#define ICON_VS_COMBINE "\xee\xae\xb6"	// U+ebb6
-#define ICON_VS_GATHER "\xee\xae\xb6"	// U+ebb6
-#define ICON_VS_TABLE "\xee\xae\xb7"	// U+ebb7
-#define ICON_VS_VARIABLE_GROUP "\xee\xae\xb8"	// U+ebb8
-#define ICON_VS_TYPE_HIERARCHY "\xee\xae\xb9"	// U+ebb9
-#define ICON_VS_TYPE_HIERARCHY_SUB "\xee\xae\xba"	// U+ebba
-#define ICON_VS_TYPE_HIERARCHY_SUPER "\xee\xae\xbb"	// U+ebbb
-#define ICON_VS_GIT_PULL_REQUEST_CREATE "\xee\xae\xbc"	// U+ebbc
-#define ICON_VS_RUN_ABOVE "\xee\xae\xbd"	// U+ebbd
-#define ICON_VS_RUN_BELOW "\xee\xae\xbe"	// U+ebbe
-#define ICON_VS_NOTEBOOK_TEMPLATE "\xee\xae\xbf"	// U+ebbf
-#define ICON_VS_DEBUG_RERUN "\xee\xaf\x80"	// U+ebc0
-#define ICON_VS_WORKSPACE_TRUSTED "\xee\xaf\x81"	// U+ebc1
-#define ICON_VS_WORKSPACE_UNTRUSTED "\xee\xaf\x82"	// U+ebc2
-#define ICON_VS_WORKSPACE_UNKNOWN "\xee\xaf\x83"	// U+ebc3
-#define ICON_VS_TERMINAL_CMD "\xee\xaf\x84"	// U+ebc4
-#define ICON_VS_TERMINAL_DEBIAN "\xee\xaf\x85"	// U+ebc5
-#define ICON_VS_TERMINAL_LINUX "\xee\xaf\x86"	// U+ebc6
-#define ICON_VS_TERMINAL_POWERSHELL "\xee\xaf\x87"	// U+ebc7
-#define ICON_VS_TERMINAL_TMUX "\xee\xaf\x88"	// U+ebc8
-#define ICON_VS_TERMINAL_UBUNTU "\xee\xaf\x89"	// U+ebc9
-#define ICON_VS_TERMINAL_BASH "\xee\xaf\x8a"	// U+ebca
-#define ICON_VS_ARROW_SWAP "\xee\xaf\x8b"	// U+ebcb
-#define ICON_VS_COPY "\xee\xaf\x8c"	// U+ebcc
-#define ICON_VS_PERSON_ADD "\xee\xaf\x8d"	// U+ebcd
-#define ICON_VS_FILTER_FILLED "\xee\xaf\x8e"	// U+ebce
-#define ICON_VS_WAND "\xee\xaf\x8f"	// U+ebcf
-#define ICON_VS_DEBUG_LINE_BY_LINE "\xee\xaf\x90"	// U+ebd0
-#define ICON_VS_INSPECT "\xee\xaf\x91"	// U+ebd1
-#define ICON_VS_LAYERS "\xee\xaf\x92"	// U+ebd2
-#define ICON_VS_LAYERS_DOT "\xee\xaf\x93"	// U+ebd3
-#define ICON_VS_LAYERS_ACTIVE "\xee\xaf\x94"	// U+ebd4
-#define ICON_VS_COMPASS "\xee\xaf\x95"	// U+ebd5
-#define ICON_VS_COMPASS_DOT "\xee\xaf\x96"	// U+ebd6
-#define ICON_VS_COMPASS_ACTIVE "\xee\xaf\x97"	// U+ebd7
-#define ICON_VS_AZURE "\xee\xaf\x98"	// U+ebd8
-#define ICON_VS_ISSUE_DRAFT "\xee\xaf\x99"	// U+ebd9
-#define ICON_VS_GIT_PULL_REQUEST_CLOSED "\xee\xaf\x9a"	// U+ebda
-#define ICON_VS_GIT_PULL_REQUEST_DRAFT "\xee\xaf\x9b"	// U+ebdb
-#define ICON_VS_DEBUG_ALL "\xee\xaf\x9c"	// U+ebdc
-#define ICON_VS_DEBUG_COVERAGE "\xee\xaf\x9d"	// U+ebdd

lib/external/imgui/include/fonts/unifont_font.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#define FONT_ICON_FILE_NAME_UNIFONT "unifont.ttf"
-
-extern const unsigned int unifont_compressed_size;
-extern const unsigned int unifont_compressed_data[52184/4];

lib/external/imgui/include/imgui_config.h

@@ -1,9 +0,0 @@
-// ImGui config (check imconfig.h for more information about these definitions)
-#pragma once
-
-#define IMGUI_DEFINE_MATH_OPERATORS
-#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-#define IMGUI_DISABLE_OBSOLETE_KEYIO
-#define IMGUI_ENABLE_FREETYPE
-#define ImDrawIdx unsigned int
-#define IMGUI_DEBUG_TOOL_ITEM_PICKER_EX

lib/external/imgui/include/misc/freetype/imgui_freetype.cpp

@@ -1,799 +0,0 @@
-// dear imgui: FreeType font builder (used as a replacement for the stb_truetype builder)
-// (code)
-
-// Get the latest version at https://github.com/ocornut/imgui/tree/master/misc/freetype
-// Original code by @vuhdo (Aleksei Skriabin). Improvements by @mikesart. Maintained since 2019 by @ocornut.
-
-// CHANGELOG
-// (minor and older changes stripped away, please see git history for details)
-//  2023/01/04: fixed a packing issue which in some occurrences would prevent large amount of glyphs from being packed correctly.
-//  2021/08/23: fixed crash when FT_Render_Glyph() fails to render a glyph and returns NULL.
-//  2021/03/05: added ImGuiFreeTypeBuilderFlags_Bitmap to load bitmap glyphs.
-//  2021/03/02: set 'atlas->TexPixelsUseColors = true' to help some backends with deciding of a prefered texture format.
-//  2021/01/28: added support for color-layered glyphs via ImGuiFreeTypeBuilderFlags_LoadColor (require Freetype 2.10+).
-//  2021/01/26: simplified integration by using '#define IMGUI_ENABLE_FREETYPE'.
-//              renamed ImGuiFreeType::XXX flags to ImGuiFreeTypeBuilderFlags_XXX for consistency with other API. removed ImGuiFreeType::BuildFontAtlas().
-//  2020/06/04: fix for rare case where FT_Get_Char_Index() succeed but FT_Load_Glyph() fails.
-//  2019/02/09: added RasterizerFlags::Monochrome flag to disable font anti-aliasing (combine with ::MonoHinting for best results!)
-//  2019/01/15: added support for imgui allocators + added FreeType only override function SetAllocatorFunctions().
-//  2019/01/10: re-factored to match big update in STB builder. fixed texture height waste. fixed redundant glyphs when merging. support for glyph padding.
-//  2018/06/08: added support for ImFontConfig::GlyphMinAdvanceX, GlyphMaxAdvanceX.
-//  2018/02/04: moved to main imgui repository (away from http://www.github.com/ocornut/imgui_club)
-//  2018/01/22: fix for addition of ImFontAtlas::TexUvscale member.
-//  2017/10/22: minor inconsequential change to match change in master (removed an unnecessary statement).
-//  2017/09/26: fixes for imgui internal changes.
-//  2017/08/26: cleanup, optimizations, support for ImFontConfig::RasterizerFlags, ImFontConfig::RasterizerMultiply.
-//  2017/08/16: imported from https://github.com/Vuhdo/imgui_freetype into http://www.github.com/ocornut/imgui_club, updated for latest changes in ImFontAtlas, minor tweaks.
-
-// About Gamma Correct Blending:
-// - FreeType assumes blending in linear space rather than gamma space.
-// - See https://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#FT_Render_Glyph
-// - For correct results you need to be using sRGB and convert to linear space in the pixel shader output.
-// - The default dear imgui styles will be impacted by this change (alpha values will need tweaking).
-
-// FIXME: cfg.OversampleH, OversampleV are not supported (but perhaps not so necessary with this rasterizer).
-
-#include "imgui_freetype.h"
-#include "imgui_internal.h"     // ImMin,ImMax,ImFontAtlasBuild*,
-#include <stdint.h>
-#include <ft2build.h>
-#include FT_FREETYPE_H          // <freetype/freetype.h>
-#include FT_MODULE_H            // <freetype/ftmodapi.h>
-#include FT_GLYPH_H             // <freetype/ftglyph.h>
-#include FT_SYNTHESIS_H         // <freetype/ftsynth.h>
-
-#ifdef _MSC_VER
-#pragma warning (push)
-#pragma warning (disable: 4505)     // unreferenced local function has been removed (stb stuff)
-#pragma warning (disable: 26812)    // [Static Analyzer] The enum type 'xxx' is unscoped. Prefer 'enum class' over 'enum' (Enum.3).
-#endif
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas"                  // warning: unknown option after '#pragma GCC diagnostic' kind
-#pragma GCC diagnostic ignored "-Wunused-function"          // warning: 'xxxx' defined but not used
-#pragma GCC diagnostic ignored "-Wsubobject-linkage"        // warning: 'xxxx' has a field 'xxxx' whose type uses the anonymous namespace
-#endif
-
-//-------------------------------------------------------------------------
-// Data
-//-------------------------------------------------------------------------
-
-// Default memory allocators
-static void* ImGuiFreeTypeDefaultAllocFunc(size_t size, void* user_data) { IM_UNUSED(user_data); return IM_ALLOC(size); }
-static void  ImGuiFreeTypeDefaultFreeFunc(void* ptr, void* user_data) { IM_UNUSED(user_data); IM_FREE(ptr); }
-
-// Current memory allocators
-static void* (*GImGuiFreeTypeAllocFunc)(size_t size, void* user_data) = ImGuiFreeTypeDefaultAllocFunc;
-static void  (*GImGuiFreeTypeFreeFunc)(void* ptr, void* user_data) = ImGuiFreeTypeDefaultFreeFunc;
-static void* GImGuiFreeTypeAllocatorUserData = nullptr;
-
-//-------------------------------------------------------------------------
-// Code
-//-------------------------------------------------------------------------
-
-namespace
-{
-    // Glyph metrics:
-    // --------------
-    //
-    //                       xmin                     xmax
-    //                        |                         |
-    //                        |<-------- width -------->|
-    //                        |                         |
-    //              |         +-------------------------+----------------- ymax
-    //              |         |    ggggggggg   ggggg    |     ^        ^
-    //              |         |   g:::::::::ggg::::g    |     |        |
-    //              |         |  g:::::::::::::::::g    |     |        |
-    //              |         | g::::::ggggg::::::gg    |     |        |
-    //              |         | g:::::g     g:::::g     |     |        |
-    //    offsetX  -|-------->| g:::::g     g:::::g     |  offsetY     |
-    //              |         | g:::::g     g:::::g     |     |        |
-    //              |         | g::::::g    g:::::g     |     |        |
-    //              |         | g:::::::ggggg:::::g     |     |        |
-    //              |         |  g::::::::::::::::g     |     |      height
-    //              |         |   gg::::::::::::::g     |     |        |
-    //  baseline ---*---------|---- gggggggg::::::g-----*--------      |
-    //            / |         |             g:::::g     |              |
-    //     origin   |         | gggggg      g:::::g     |              |
-    //              |         | g:::::gg   gg:::::g     |              |
-    //              |         |  g::::::ggg:::::::g     |              |
-    //              |         |   gg:::::::::::::g      |              |
-    //              |         |     ggg::::::ggg        |              |
-    //              |         |         gggggg          |              v
-    //              |         +-------------------------+----------------- ymin
-    //              |                                   |
-    //              |------------- advanceX ----------->|
-
-    // A structure that describe a glyph.
-    struct GlyphInfo
-    {
-        int         Width;              // Glyph's width in pixels.
-        int         Height;             // Glyph's height in pixels.
-        FT_Int      OffsetX;            // The distance from the origin ("pen position") to the left of the glyph.
-        FT_Int      OffsetY;            // The distance from the origin to the top of the glyph. This is usually a value < 0.
-        float       AdvanceX;           // The distance from the origin to the origin of the next glyph. This is usually a value > 0.
-        bool        IsColored;          // The glyph is colored
-    };
-
-    // Font parameters and metrics.
-    struct FontInfo
-    {
-        uint32_t    PixelHeight;        // Size this font was generated with.
-        float       Ascender;           // The pixel extents above the baseline in pixels (typically positive).
-        float       Descender;          // The extents below the baseline in pixels (typically negative).
-        float       LineSpacing;        // The baseline-to-baseline distance. Note that it usually is larger than the sum of the ascender and descender taken as absolute values. There is also no guarantee that no glyphs extend above or below subsequent baselines when using this distance. Think of it as a value the designer of the font finds appropriate.
-        float       LineGap;            // The spacing in pixels between one row's descent and the next row's ascent.
-        float       MaxAdvanceWidth;    // This field gives the maximum horizontal cursor advance for all glyphs in the font.
-    };
-
-    // FreeType glyph rasterizer.
-    // NB: No ctor/dtor, explicitly call Init()/Shutdown()
-    struct FreeTypeFont
-    {
-        bool                    InitFont(FT_Library ft_library, const ImFontConfig& cfg, unsigned int extra_user_flags); // Initialize from an external data buffer. Doesn't copy data, and you must ensure it stays valid up to this object lifetime.
-        void                    CloseFont();
-        void                    SetPixelHeight(int pixel_height); // Change font pixel size. All following calls to RasterizeGlyph() will use this size
-        const FT_Glyph_Metrics* LoadGlyph(uint32_t in_codepoint);
-        const FT_Bitmap*        RenderGlyphAndGetInfo(GlyphInfo* out_glyph_info);
-        void                    BlitGlyph(const FT_Bitmap* ft_bitmap, uint32_t* dst, uint32_t dst_pitch, unsigned char* multiply_table = nullptr);
-        ~FreeTypeFont()         { CloseFont(); }
-
-        // [Internals]
-        FontInfo        Info;               // Font descriptor of the current font.
-        FT_Face         Face;
-        unsigned int    UserFlags;          // = ImFontConfig::RasterizerFlags
-        FT_Int32        LoadFlags;
-        FT_Render_Mode  RenderMode;
-    };
-
-    // From SDL_ttf: Handy routines for converting from fixed point
-    #define FT_CEIL(X)  (((X + 63) & -64) / 64)
-
-    bool FreeTypeFont::InitFont(FT_Library ft_library, const ImFontConfig& cfg, unsigned int extra_font_builder_flags)
-    {
-        FT_Error error = FT_New_Memory_Face(ft_library, (uint8_t*)cfg.FontData, (uint32_t)cfg.FontDataSize, (uint32_t)cfg.FontNo, &Face);
-        if (error != 0)
-            return false;
-        error = FT_Select_Charmap(Face, FT_ENCODING_UNICODE);
-        if (error != 0)
-            return false;
-
-        // Convert to FreeType flags (NB: Bold and Oblique are processed separately)
-        UserFlags = cfg.FontBuilderFlags | extra_font_builder_flags;
-
-        LoadFlags = 0;
-        if ((UserFlags & ImGuiFreeTypeBuilderFlags_Bitmap) == 0)
-            LoadFlags |= FT_LOAD_NO_BITMAP;
-
-        if (UserFlags & ImGuiFreeTypeBuilderFlags_NoHinting)
-            LoadFlags |= FT_LOAD_NO_HINTING;
-        if (UserFlags & ImGuiFreeTypeBuilderFlags_NoAutoHint)
-            LoadFlags |= FT_LOAD_NO_AUTOHINT;
-        if (UserFlags & ImGuiFreeTypeBuilderFlags_ForceAutoHint)
-            LoadFlags |= FT_LOAD_FORCE_AUTOHINT;
-        if (UserFlags & ImGuiFreeTypeBuilderFlags_LightHinting)
-            LoadFlags |= FT_LOAD_TARGET_LIGHT;
-        else if (UserFlags & ImGuiFreeTypeBuilderFlags_MonoHinting)
-            LoadFlags |= FT_LOAD_TARGET_MONO;
-        else
-            LoadFlags |= FT_LOAD_TARGET_NORMAL;
-
-        if (UserFlags & ImGuiFreeTypeBuilderFlags_Monochrome)
-            RenderMode = FT_RENDER_MODE_MONO;
-        else
-            RenderMode = FT_RENDER_MODE_NORMAL;
-
-        if (UserFlags & ImGuiFreeTypeBuilderFlags_LoadColor)
-            LoadFlags |= FT_LOAD_COLOR;
-
-        memset(&Info, 0, sizeof(Info));
-        SetPixelHeight((uint32_t)cfg.SizePixels);
-
-        return true;
-    }
-
-    void FreeTypeFont::CloseFont()
-    {
-        if (Face)
-        {
-            FT_Done_Face(Face);
-            Face = nullptr;
-        }
-    }
-
-    void FreeTypeFont::SetPixelHeight(int pixel_height)
-    {
-        // Vuhdo: I'm not sure how to deal with font sizes properly. As far as I understand, currently ImGui assumes that the 'pixel_height'
-        // is a maximum height of an any given glyph, i.e. it's the sum of font's ascender and descender. Seems strange to me.
-        // NB: FT_Set_Pixel_Sizes() doesn't seem to get us the same result.
-        FT_Size_RequestRec req;
-        req.type = (UserFlags & ImGuiFreeTypeBuilderFlags_Bitmap) ? FT_SIZE_REQUEST_TYPE_NOMINAL : FT_SIZE_REQUEST_TYPE_REAL_DIM;
-        req.width = 0;
-        req.height = (uint32_t)pixel_height * 64;
-        req.horiResolution = 0;
-        req.vertResolution = 0;
-        FT_Request_Size(Face, &req);
-
-        // Update font info
-        FT_Size_Metrics metrics = Face->size->metrics;
-        Info.PixelHeight = (uint32_t)pixel_height;
-        Info.Ascender = (float)FT_CEIL(metrics.ascender);
-        Info.Descender = (float)FT_CEIL(metrics.descender);
-        Info.LineSpacing = (float)FT_CEIL(metrics.height);
-        Info.LineGap = (float)FT_CEIL(metrics.height - metrics.ascender + metrics.descender);
-        Info.MaxAdvanceWidth = (float)FT_CEIL(metrics.max_advance);
-    }
-
-    const FT_Glyph_Metrics* FreeTypeFont::LoadGlyph(uint32_t codepoint)
-    {
-        uint32_t glyph_index = FT_Get_Char_Index(Face, codepoint);
-        if (glyph_index == 0)
-            return nullptr;
-
-		// If this crash for you: FreeType 2.11.0 has a crash bug on some bitmap/colored fonts.
-		// - https://gitlab.freedesktop.org/freetype/freetype/-/issues/1076
-		// - https://github.com/ocornut/imgui/issues/4567
-		// - https://github.com/ocornut/imgui/issues/4566
-		// You can use FreeType 2.10, or the patched version of 2.11.0 in VcPkg, or probably any upcoming FreeType version.
-        FT_Error error = FT_Load_Glyph(Face, glyph_index, LoadFlags);
-        if (error)
-            return nullptr;
-
-        // Need an outline for this to work
-        FT_GlyphSlot slot = Face->glyph;
-        IM_ASSERT(slot->format == FT_GLYPH_FORMAT_OUTLINE || slot->format == FT_GLYPH_FORMAT_BITMAP);
-
-        // Apply convenience transform (this is not picking from real "Bold"/"Italic" fonts! Merely applying FreeType helper transform. Oblique == Slanting)
-        if (UserFlags & ImGuiFreeTypeBuilderFlags_Bold)
-            FT_GlyphSlot_Embolden(slot);
-        if (UserFlags & ImGuiFreeTypeBuilderFlags_Oblique)
-        {
-            FT_GlyphSlot_Oblique(slot);
-            //FT_BBox bbox;
-            //FT_Outline_Get_BBox(&slot->outline, &bbox);
-            //slot->metrics.width = bbox.xMax - bbox.xMin;
-            //slot->metrics.height = bbox.yMax - bbox.yMin;
-        }
-
-        return &slot->metrics;
-    }
-
-    const FT_Bitmap* FreeTypeFont::RenderGlyphAndGetInfo(GlyphInfo* out_glyph_info)
-    {
-        FT_GlyphSlot slot = Face->glyph;
-        FT_Error error = FT_Render_Glyph(slot, RenderMode);
-        if (error != 0)
-            return nullptr;
-
-        FT_Bitmap* ft_bitmap = &Face->glyph->bitmap;
-        out_glyph_info->Width = (int)ft_bitmap->width;
-        out_glyph_info->Height = (int)ft_bitmap->rows;
-        out_glyph_info->OffsetX = Face->glyph->bitmap_left;
-        out_glyph_info->OffsetY = -Face->glyph->bitmap_top;
-        out_glyph_info->AdvanceX = (float)FT_CEIL(slot->advance.x);
-        out_glyph_info->IsColored = (ft_bitmap->pixel_mode == FT_PIXEL_MODE_BGRA);
-
-        return ft_bitmap;
-    }
-
-    void FreeTypeFont::BlitGlyph(const FT_Bitmap* ft_bitmap, uint32_t* dst, uint32_t dst_pitch, unsigned char* multiply_table)
-    {
-        IM_ASSERT(ft_bitmap != nullptr);
-        const uint32_t w = ft_bitmap->width;
-        const uint32_t h = ft_bitmap->rows;
-        const uint8_t* src = ft_bitmap->buffer;
-        const uint32_t src_pitch = ft_bitmap->pitch;
-
-        switch (ft_bitmap->pixel_mode)
-        {
-        case FT_PIXEL_MODE_GRAY: // Grayscale image, 1 byte per pixel.
-            {
-                if (multiply_table == nullptr)
-                {
-                    for (uint32_t y = 0; y < h; y++, src += src_pitch, dst += dst_pitch)
-                        for (uint32_t x = 0; x < w; x++)
-                            dst[x] = IM_COL32(255, 255, 255, src[x]);
-                }
-                else
-                {
-                    for (uint32_t y = 0; y < h; y++, src += src_pitch, dst += dst_pitch)
-                        for (uint32_t x = 0; x < w; x++)
-                            dst[x] = IM_COL32(255, 255, 255, multiply_table[src[x]]);
-                }
-                break;
-            }
-        case FT_PIXEL_MODE_MONO: // Monochrome image, 1 bit per pixel. The bits in each byte are ordered from MSB to LSB.
-            {
-                uint8_t color0 = multiply_table ? multiply_table[0] : 0;
-                uint8_t color1 = multiply_table ? multiply_table[255] : 255;
-                for (uint32_t y = 0; y < h; y++, src += src_pitch, dst += dst_pitch)
-                {
-                    uint8_t bits = 0;
-                    const uint8_t* bits_ptr = src;
-                    for (uint32_t x = 0; x < w; x++, bits <<= 1)
-                    {
-                        if ((x & 7) == 0)
-                            bits = *bits_ptr++;
-                        dst[x] = IM_COL32(255, 255, 255, (bits & 0x80) ? color1 : color0);
-                    }
-                }
-                break;
-            }
-        case FT_PIXEL_MODE_BGRA:
-            {
-                // FIXME: Converting pre-multiplied alpha to straight. Doesn't smell good.
-                #define DE_MULTIPLY(color, alpha) (ImU32)(255.0f * (float)color / (float)alpha + 0.5f)
-                if (multiply_table == nullptr)
-                {
-                    for (uint32_t y = 0; y < h; y++, src += src_pitch, dst += dst_pitch)
-                        for (uint32_t x = 0; x < w; x++)
-                        {
-                            uint8_t r = src[x * 4 + 2], g = src[x * 4 + 1], b = src[x * 4], a = src[x * 4 + 3];
-                            dst[x] = IM_COL32(DE_MULTIPLY(r, a), DE_MULTIPLY(g, a), DE_MULTIPLY(b, a), a);
-                        }
-                }
-                else
-                {
-                    for (uint32_t y = 0; y < h; y++, src += src_pitch, dst += dst_pitch)
-                    {
-                        for (uint32_t x = 0; x < w; x++)
-                        {
-                            uint8_t r = src[x * 4 + 2], g = src[x * 4 + 1], b = src[x * 4], a = src[x * 4 + 3];
-                            dst[x] = IM_COL32(multiply_table[DE_MULTIPLY(r, a)], multiply_table[DE_MULTIPLY(g, a)], multiply_table[DE_MULTIPLY(b, a)], multiply_table[a]);
-                        }
-                    }
-                }
-                #undef DE_MULTIPLY
-                break;
-            }
-        default:
-            IM_ASSERT(0 && "FreeTypeFont::BlitGlyph(): Unknown bitmap pixel mode!");
-        }
-    }
-} // namespace
-
-#ifndef STB_RECT_PACK_IMPLEMENTATION                        // in case the user already have an implementation in the _same_ compilation unit (e.g. unity builds)
-#ifndef IMGUI_DISABLE_STB_RECT_PACK_IMPLEMENTATION
-#define STBRP_ASSERT(x)     do { IM_ASSERT(x); } while (0)
-#define STBRP_STATIC
-#define STB_RECT_PACK_IMPLEMENTATION
-#endif
-#ifdef IMGUI_STB_RECT_PACK_FILENAME
-#include IMGUI_STB_RECT_PACK_FILENAME
-#else
-#include "imstb_rectpack.h"
-#endif
-#endif
-
-struct ImFontBuildSrcGlyphFT
-{
-    GlyphInfo           Info;
-    uint32_t            Codepoint;
-    unsigned int*       BitmapData;         // Point within one of the dst_tmp_bitmap_buffers[] array
-
-    ImFontBuildSrcGlyphFT() { memset((void*)this, 0, sizeof(*this)); }
-};
-
-struct ImFontBuildSrcDataFT
-{
-    FreeTypeFont        Font;
-    stbrp_rect*         Rects;              // Rectangle to pack. We first fill in their size and the packer will give us their position.
-    const ImWchar*      SrcRanges;          // Ranges as requested by user (user is allowed to request too much, e.g. 0x0020..0xFFFF)
-    int                 DstIndex;           // Index into atlas->Fonts[] and dst_tmp_array[]
-    int                 GlyphsHighest;      // Highest requested codepoint
-    int                 GlyphsCount;        // Glyph count (excluding missing glyphs and glyphs already set by an earlier source font)
-    ImBitVector         GlyphsSet;          // Glyph bit map (random access, 1-bit per codepoint. This will be a maximum of 8KB)
-    ImVector<ImFontBuildSrcGlyphFT>   GlyphsList;
-};
-
-// Temporary data for one destination ImFont* (multiple source fonts can be merged into one destination ImFont)
-struct ImFontBuildDstDataFT
-{
-    int                 SrcCount;           // Number of source fonts targeting this destination font.
-    int                 GlyphsHighest;
-    int                 GlyphsCount;
-    ImBitVector         GlyphsSet;          // This is used to resolve collision when multiple sources are merged into a same destination font.
-};
-
-bool ImFontAtlasBuildWithFreeTypeEx(FT_Library ft_library, ImFontAtlas* atlas, unsigned int extra_flags)
-{
-    IM_ASSERT(atlas->ConfigData.Size > 0);
-
-    ImFontAtlasBuildInit(atlas);
-
-    // Clear atlas
-    atlas->TexID = (ImTextureID)nullptr;
-    atlas->TexWidth = atlas->TexHeight = 0;
-    atlas->TexUvScale = ImVec2(0.0f, 0.0f);
-    atlas->TexUvWhitePixel = ImVec2(0.0f, 0.0f);
-    atlas->ClearTexData();
-
-    // Temporary storage for building
-    bool src_load_color = false;
-    ImVector<ImFontBuildSrcDataFT> src_tmp_array;
-    ImVector<ImFontBuildDstDataFT> dst_tmp_array;
-    src_tmp_array.resize(atlas->ConfigData.Size);
-    dst_tmp_array.resize(atlas->Fonts.Size);
-    memset((void*)src_tmp_array.Data, 0, (size_t)src_tmp_array.size_in_bytes());
-    memset((void*)dst_tmp_array.Data, 0, (size_t)dst_tmp_array.size_in_bytes());
-
-    // 1. Initialize font loading structure, check font data validity
-    for (int src_i = 0; src_i < atlas->ConfigData.Size; src_i++)
-    {
-        ImFontBuildSrcDataFT& src_tmp = src_tmp_array[src_i];
-        ImFontConfig& cfg = atlas->ConfigData[src_i];
-        FreeTypeFont& font_face = src_tmp.Font;
-        IM_ASSERT(cfg.DstFont && (!cfg.DstFont->IsLoaded() || cfg.DstFont->ContainerAtlas == atlas));
-
-        // Find index from cfg.DstFont (we allow the user to set cfg.DstFont. Also it makes casual debugging nicer than when storing indices)
-        src_tmp.DstIndex = -1;
-        for (int output_i = 0; output_i < atlas->Fonts.Size && src_tmp.DstIndex == -1; output_i++)
-            if (cfg.DstFont == atlas->Fonts[output_i])
-                src_tmp.DstIndex = output_i;
-        IM_ASSERT(src_tmp.DstIndex != -1); // cfg.DstFont not pointing within atlas->Fonts[] array?
-        if (src_tmp.DstIndex == -1)
-            return false;
-
-        // Load font
-        if (!font_face.InitFont(ft_library, cfg, extra_flags))
-            return false;
-
-        // Measure highest codepoints
-        src_load_color |= (cfg.FontBuilderFlags & ImGuiFreeTypeBuilderFlags_LoadColor) != 0;
-        ImFontBuildDstDataFT& dst_tmp = dst_tmp_array[src_tmp.DstIndex];
-        src_tmp.SrcRanges = cfg.GlyphRanges ? cfg.GlyphRanges : atlas->GetGlyphRangesDefault();
-        for (const ImWchar* src_range = src_tmp.SrcRanges; src_range[0] && src_range[1]; src_range += 2)
-        {
-            // Check for valid range. This may also help detect *some* dangling pointers, because a common
-            // user error is to setup ImFontConfig::GlyphRanges with a pointer to data that isn't persistent.
-            IM_ASSERT(src_range[0] <= src_range[1]);
-            src_tmp.GlyphsHighest = ImMax(src_tmp.GlyphsHighest, (int)src_range[1]);
-        }
-        dst_tmp.SrcCount++;
-        dst_tmp.GlyphsHighest = ImMax(dst_tmp.GlyphsHighest, src_tmp.GlyphsHighest);
-    }
-
-    // 2. For every requested codepoint, check for their presence in the font data, and handle redundancy or overlaps between source fonts to avoid unused glyphs.
-    int total_glyphs_count = 0;
-    for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
-    {
-        ImFontBuildSrcDataFT& src_tmp = src_tmp_array[src_i];
-        ImFontBuildDstDataFT& dst_tmp = dst_tmp_array[src_tmp.DstIndex];
-        src_tmp.GlyphsSet.Create(src_tmp.GlyphsHighest + 1);
-        if (dst_tmp.GlyphsSet.Storage.empty())
-            dst_tmp.GlyphsSet.Create(dst_tmp.GlyphsHighest + 1);
-
-        for (const ImWchar* src_range = src_tmp.SrcRanges; src_range[0] && src_range[1]; src_range += 2)
-            for (int codepoint = src_range[0]; codepoint <= (int)src_range[1]; codepoint++)
-            {
-                if (dst_tmp.GlyphsSet.TestBit(codepoint))    // Don't overwrite existing glyphs. We could make this an option (e.g. MergeOverwrite)
-                    continue;
-                uint32_t glyph_index = FT_Get_Char_Index(src_tmp.Font.Face, codepoint); // It is actually in the font? (FIXME-OPT: We are not storing the glyph_index..)
-                if (glyph_index == 0)
-                    continue;
-
-                // Add to avail set/counters
-                src_tmp.GlyphsCount++;
-                dst_tmp.GlyphsCount++;
-                src_tmp.GlyphsSet.SetBit(codepoint);
-                dst_tmp.GlyphsSet.SetBit(codepoint);
-                total_glyphs_count++;
-            }
-    }
-
-    // 3. Unpack our bit map into a flat list (we now have all the Unicode points that we know are requested _and_ available _and_ not overlapping another)
-    for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
-    {
-        ImFontBuildSrcDataFT& src_tmp = src_tmp_array[src_i];
-        src_tmp.GlyphsList.reserve(src_tmp.GlyphsCount);
-
-        IM_ASSERT(sizeof(src_tmp.GlyphsSet.Storage.Data[0]) == sizeof(ImU32));
-        const ImU32* it_begin = src_tmp.GlyphsSet.Storage.begin();
-        const ImU32* it_end = src_tmp.GlyphsSet.Storage.end();
-        for (const ImU32* it = it_begin; it < it_end; it++)
-            if (ImU32 entries_32 = *it)
-                for (ImU32 bit_n = 0; bit_n < 32; bit_n++)
-                    if (entries_32 & ((ImU32)1 << bit_n))
-                    {
-                        ImFontBuildSrcGlyphFT src_glyph;
-                        src_glyph.Codepoint = (ImWchar)(((it - it_begin) << 5) + bit_n);
-                        //src_glyph.GlyphIndex = 0; // FIXME-OPT: We had this info in the previous step and lost it..
-                        src_tmp.GlyphsList.push_back(src_glyph);
-                    }
-        src_tmp.GlyphsSet.Clear();
-        IM_ASSERT(src_tmp.GlyphsList.Size == src_tmp.GlyphsCount);
-    }
-    for (int dst_i = 0; dst_i < dst_tmp_array.Size; dst_i++)
-        dst_tmp_array[dst_i].GlyphsSet.Clear();
-    dst_tmp_array.clear();
-
-    // Allocate packing character data and flag packed characters buffer as non-packed (x0=y0=x1=y1=0)
-    // (We technically don't need to zero-clear buf_rects, but let's do it for the sake of sanity)
-    ImVector<stbrp_rect> buf_rects;
-    buf_rects.resize(total_glyphs_count);
-    memset(buf_rects.Data, 0, (size_t)buf_rects.size_in_bytes());
-
-    // Allocate temporary rasterization data buffers.
-    // We could not find a way to retrieve accurate glyph size without rendering them.
-    // (e.g. slot->metrics->width not always matching bitmap->width, especially considering the Oblique transform)
-    // We allocate in chunks of 256 KB to not waste too much extra memory ahead. Hopefully users of FreeType won't mind the temporary allocations.
-    const int BITMAP_BUFFERS_CHUNK_SIZE = 256 * 1024;
-    int buf_bitmap_current_used_bytes = 0;
-    ImVector<unsigned char*> buf_bitmap_buffers;
-    buf_bitmap_buffers.push_back((unsigned char*)IM_ALLOC(BITMAP_BUFFERS_CHUNK_SIZE));
-
-    // 4. Gather glyphs sizes so we can pack them in our virtual canvas.
-    // 8. Render/rasterize font characters into the texture
-    int total_surface = 0;
-    int buf_rects_out_n = 0;
-    for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
-    {
-        ImFontBuildSrcDataFT& src_tmp = src_tmp_array[src_i];
-        ImFontConfig& cfg = atlas->ConfigData[src_i];
-        if (src_tmp.GlyphsCount == 0)
-            continue;
-
-        src_tmp.Rects = &buf_rects[buf_rects_out_n];
-        buf_rects_out_n += src_tmp.GlyphsCount;
-
-        // Compute multiply table if requested
-        const bool multiply_enabled = (cfg.RasterizerMultiply != 1.0f);
-        unsigned char multiply_table[256];
-        if (multiply_enabled)
-            ImFontAtlasBuildMultiplyCalcLookupTable(multiply_table, cfg.RasterizerMultiply);
-
-        // Gather the sizes of all rectangles we will need to pack
-        const int padding = atlas->TexGlyphPadding;
-        for (int glyph_i = 0; glyph_i < src_tmp.GlyphsList.Size; glyph_i++)
-        {
-            ImFontBuildSrcGlyphFT& src_glyph = src_tmp.GlyphsList[glyph_i];
-
-            const FT_Glyph_Metrics* metrics = src_tmp.Font.LoadGlyph(src_glyph.Codepoint);
-            if (metrics == nullptr)
-                continue;
-
-            // Render glyph into a bitmap (currently held by FreeType)
-            const FT_Bitmap* ft_bitmap = src_tmp.Font.RenderGlyphAndGetInfo(&src_glyph.Info);
-            if (ft_bitmap == nullptr)
-                continue;
-
-            // Allocate new temporary chunk if needed
-            const int bitmap_size_in_bytes = src_glyph.Info.Width * src_glyph.Info.Height * 4;
-            if (buf_bitmap_current_used_bytes + bitmap_size_in_bytes > BITMAP_BUFFERS_CHUNK_SIZE)
-            {
-                buf_bitmap_current_used_bytes = 0;
-                buf_bitmap_buffers.push_back((unsigned char*)IM_ALLOC(BITMAP_BUFFERS_CHUNK_SIZE));
-            }
-            IM_ASSERT(buf_bitmap_current_used_bytes + bitmap_size_in_bytes <= BITMAP_BUFFERS_CHUNK_SIZE); // We could probably allocate custom-sized buffer instead.
-
-            // Blit rasterized pixels to our temporary buffer and keep a pointer to it.
-            src_glyph.BitmapData = (unsigned int*)(buf_bitmap_buffers.back() + buf_bitmap_current_used_bytes);
-            buf_bitmap_current_used_bytes += bitmap_size_in_bytes;
-            src_tmp.Font.BlitGlyph(ft_bitmap, src_glyph.BitmapData, src_glyph.Info.Width, multiply_enabled ? multiply_table : nullptr);
-
-            src_tmp.Rects[glyph_i].w = (stbrp_coord)(src_glyph.Info.Width + padding);
-            src_tmp.Rects[glyph_i].h = (stbrp_coord)(src_glyph.Info.Height + padding);
-            total_surface += src_tmp.Rects[glyph_i].w * src_tmp.Rects[glyph_i].h;
-        }
-    }
-
-    // We need a width for the skyline algorithm, any width!
-    // The exact width doesn't really matter much, but some API/GPU have texture size limitations and increasing width can decrease height.
-    // User can override TexDesiredWidth and TexGlyphPadding if they wish, otherwise we use a simple heuristic to select the width based on expected surface.
-    const int surface_sqrt = (int)ImSqrt((float)total_surface) + 1;
-    atlas->TexHeight = 0;
-    if (atlas->TexDesiredWidth > 0)
-        atlas->TexWidth = atlas->TexDesiredWidth;
-    else
-        atlas->TexWidth = (surface_sqrt >= 4096 * 0.7f) ? 4096 : (surface_sqrt >= 2048 * 0.7f) ? 2048 : (surface_sqrt >= 1024 * 0.7f) ? 1024 : 512;
-
-    // 5. Start packing
-    // Pack our extra data rectangles first, so it will be on the upper-left corner of our texture (UV will have small values).
-    const int TEX_HEIGHT_MAX = 1024 * 32;
-    const int num_nodes_for_packing_algorithm = atlas->TexWidth - atlas->TexGlyphPadding;
-    ImVector<stbrp_node> pack_nodes;
-    pack_nodes.resize(num_nodes_for_packing_algorithm);
-    stbrp_context pack_context;
-    stbrp_init_target(&pack_context, atlas->TexWidth - atlas->TexGlyphPadding, TEX_HEIGHT_MAX - atlas->TexGlyphPadding, pack_nodes.Data, pack_nodes.Size);
-    ImFontAtlasBuildPackCustomRects(atlas, &pack_context);
-
-    // 6. Pack each source font. No rendering yet, we are working with rectangles in an infinitely tall texture at this point.
-    for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
-    {
-        ImFontBuildSrcDataFT& src_tmp = src_tmp_array[src_i];
-        if (src_tmp.GlyphsCount == 0)
-            continue;
-
-        stbrp_pack_rects(&pack_context, src_tmp.Rects, src_tmp.GlyphsCount);
-
-        // Extend texture height and mark missing glyphs as non-packed so we won't render them.
-        // FIXME: We are not handling packing failure here (would happen if we got off TEX_HEIGHT_MAX or if a single if larger than TexWidth?)
-        for (int glyph_i = 0; glyph_i < src_tmp.GlyphsCount; glyph_i++)
-            if (src_tmp.Rects[glyph_i].was_packed)
-                atlas->TexHeight = ImMax(atlas->TexHeight, src_tmp.Rects[glyph_i].y + src_tmp.Rects[glyph_i].h);
-    }
-
-    // 7. Allocate texture
-    atlas->TexHeight = (atlas->Flags & ImFontAtlasFlags_NoPowerOfTwoHeight) ? (atlas->TexHeight + 1) : ImUpperPowerOfTwo(atlas->TexHeight);
-    atlas->TexUvScale = ImVec2(1.0f / atlas->TexWidth, 1.0f / atlas->TexHeight);
-    if (src_load_color)
-    {
-        size_t tex_size = (size_t)atlas->TexWidth * atlas->TexHeight * 4;
-        atlas->TexPixelsRGBA32 = (unsigned int*)IM_ALLOC(tex_size);
-        memset(atlas->TexPixelsRGBA32, 0, tex_size);
-    }
-    else
-    {
-        size_t tex_size = (size_t)atlas->TexWidth * atlas->TexHeight * 1;
-        atlas->TexPixelsAlpha8 = (unsigned char*)IM_ALLOC(tex_size);
-        memset(atlas->TexPixelsAlpha8, 0, tex_size);
-    }
-
-    // 8. Copy rasterized font characters back into the main texture
-    // 9. Setup ImFont and glyphs for runtime
-    bool tex_use_colors = false;
-    for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
-    {
-        ImFontBuildSrcDataFT& src_tmp = src_tmp_array[src_i];
-        // IMHEX PATCH BEGIN
-        // if (src_tmp.GlyphsCount == 0)
-        //     continue;
-        // IMHEX PATCH END
-
-        // When merging fonts with MergeMode=true:
-        // - We can have multiple input fonts writing into a same destination font.
-        // - dst_font->ConfigData is != from cfg which is our source configuration.
-        ImFontConfig& cfg = atlas->ConfigData[src_i];
-        ImFont* dst_font = cfg.DstFont;
-
-        const float ascent = src_tmp.Font.Info.Ascender;
-        const float descent = src_tmp.Font.Info.Descender;
-        ImFontAtlasBuildSetupFont(atlas, dst_font, &cfg, ascent, descent);
-        const float font_off_x = cfg.GlyphOffset.x;
-        const float font_off_y = cfg.GlyphOffset.y + IM_ROUND(dst_font->Ascent);
-
-        const int padding = atlas->TexGlyphPadding;
-        for (int glyph_i = 0; glyph_i < src_tmp.GlyphsCount; glyph_i++)
-        {
-            ImFontBuildSrcGlyphFT& src_glyph = src_tmp.GlyphsList[glyph_i];
-            stbrp_rect& pack_rect = src_tmp.Rects[glyph_i];
-            IM_ASSERT(pack_rect.was_packed);
-            if (pack_rect.w == 0 && pack_rect.h == 0)
-                continue;
-
-            GlyphInfo& info = src_glyph.Info;
-            IM_ASSERT(info.Width + padding <= pack_rect.w);
-            IM_ASSERT(info.Height + padding <= pack_rect.h);
-            const int tx = pack_rect.x + padding;
-            const int ty = pack_rect.y + padding;
-
-            // Register glyph
-            float x0 = info.OffsetX + font_off_x;
-            float y0 = info.OffsetY + font_off_y;
-            float x1 = x0 + info.Width;
-            float y1 = y0 + info.Height;
-            float u0 = (tx) / (float)atlas->TexWidth;
-            float v0 = (ty) / (float)atlas->TexHeight;
-            float u1 = (tx + info.Width) / (float)atlas->TexWidth;
-            float v1 = (ty + info.Height) / (float)atlas->TexHeight;
-            dst_font->AddGlyph(&cfg, (ImWchar)src_glyph.Codepoint, x0, y0, x1, y1, u0, v0, u1, v1, info.AdvanceX);
-
-            ImFontGlyph* dst_glyph = &dst_font->Glyphs.back();
-            IM_ASSERT(dst_glyph->Codepoint == src_glyph.Codepoint);
-            if (src_glyph.Info.IsColored)
-                dst_glyph->Colored = tex_use_colors = true;
-
-            // Blit from temporary buffer to final texture
-            size_t blit_src_stride = (size_t)src_glyph.Info.Width;
-            size_t blit_dst_stride = (size_t)atlas->TexWidth;
-            unsigned int* blit_src = src_glyph.BitmapData;
-            if (atlas->TexPixelsAlpha8 != nullptr)
-            {
-                unsigned char* blit_dst = atlas->TexPixelsAlpha8 + (ty * blit_dst_stride) + tx;
-                for (int y = 0; y < info.Height; y++, blit_dst += blit_dst_stride, blit_src += blit_src_stride)
-                    for (int x = 0; x < info.Width; x++)
-                        blit_dst[x] = (unsigned char)((blit_src[x] >> IM_COL32_A_SHIFT) & 0xFF);
-            }
-            else
-            {
-                unsigned int* blit_dst = atlas->TexPixelsRGBA32 + (ty * blit_dst_stride) + tx;
-                for (int y = 0; y < info.Height; y++, blit_dst += blit_dst_stride, blit_src += blit_src_stride)
-                    for (int x = 0; x < info.Width; x++)
-                        blit_dst[x] = blit_src[x];
-            }
-        }
-
-        src_tmp.Rects = nullptr;
-    }
-    atlas->TexPixelsUseColors = tex_use_colors;
-
-    // Cleanup
-    for (int buf_i = 0; buf_i < buf_bitmap_buffers.Size; buf_i++)
-        IM_FREE(buf_bitmap_buffers[buf_i]);
-    src_tmp_array.clear_destruct();
-
-    ImFontAtlasBuildFinish(atlas);
-
-    return true;
-}
-
-// FreeType memory allocation callbacks
-static void* FreeType_Alloc(FT_Memory /*memory*/, long size)
-{
-    return GImGuiFreeTypeAllocFunc((size_t)size, GImGuiFreeTypeAllocatorUserData);
-}
-
-static void FreeType_Free(FT_Memory /*memory*/, void* block)
-{
-    GImGuiFreeTypeFreeFunc(block, GImGuiFreeTypeAllocatorUserData);
-}
-
-static void* FreeType_Realloc(FT_Memory /*memory*/, long cur_size, long new_size, void* block)
-{
-    // Implement realloc() as we don't ask user to provide it.
-    if (block == nullptr)
-        return GImGuiFreeTypeAllocFunc((size_t)new_size, GImGuiFreeTypeAllocatorUserData);
-
-    if (new_size == 0)
-    {
-        GImGuiFreeTypeFreeFunc(block, GImGuiFreeTypeAllocatorUserData);
-        return nullptr;
-    }
-
-    if (new_size > cur_size)
-    {
-        void* new_block = GImGuiFreeTypeAllocFunc((size_t)new_size, GImGuiFreeTypeAllocatorUserData);
-        memcpy(new_block, block, (size_t)cur_size);
-        GImGuiFreeTypeFreeFunc(block, GImGuiFreeTypeAllocatorUserData);
-        return new_block;
-    }
-
-    return block;
-}
-
-static bool ImFontAtlasBuildWithFreeType(ImFontAtlas* atlas)
-{
-    // FreeType memory management: https://www.freetype.org/freetype2/docs/design/design-4.html
-    FT_MemoryRec_ memory_rec = {};
-    memory_rec.user = nullptr;
-    memory_rec.alloc = &FreeType_Alloc;
-    memory_rec.free = &FreeType_Free;
-    memory_rec.realloc = &FreeType_Realloc;
-
-    // https://www.freetype.org/freetype2/docs/reference/ft2-module_management.html#FT_New_Library
-    FT_Library ft_library;
-    FT_Error error = FT_New_Library(&memory_rec, &ft_library);
-    if (error != 0)
-        return false;
-
-    // If you don't call FT_Add_Default_Modules() the rest of code may work, but FreeType won't use our custom allocator.
-    FT_Add_Default_Modules(ft_library);
-
-    bool ret = ImFontAtlasBuildWithFreeTypeEx(ft_library, atlas, atlas->FontBuilderFlags);
-    FT_Done_Library(ft_library);
-
-    return ret;
-}
-
-const ImFontBuilderIO* ImGuiFreeType::GetBuilderForFreeType()
-{
-    static ImFontBuilderIO io;
-    io.FontBuilder_Build = ImFontAtlasBuildWithFreeType;
-    return &io;
-}
-
-void ImGuiFreeType::SetAllocatorFunctions(void* (*alloc_func)(size_t sz, void* user_data), void (*free_func)(void* ptr, void* user_data), void* user_data)
-{
-    GImGuiFreeTypeAllocFunc = alloc_func;
-    GImGuiFreeTypeFreeFunc = free_func;
-    GImGuiFreeTypeAllocatorUserData = user_data;
-}
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif