Add partial config UI, add more architectures

This PR aims to implement a more complete undo/redo stack that, unlike
the old one, also supports undoing insertions, deletions and resize
operations

.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

@@ -0,0 +1,9 @@
+# Skip all std:: and __gnu_debug:: symbols
+skip -rfu ^std::
+skip -rfu ^__gnu_debug::
+
+# Skip all ImGui:: symbols
+skip -rfu ^ImGui::
+
+# Trigger breakpoint when execution reaches triggerSafeShutdown()
+break triggerSafeShutdown

.github/workflows/analysis.yml

@@ -28,8 +28,8 @@ jobs:
     - name: 📜 Setup ccache
       uses: hendrikmuhs/ccache-action@v1.2
       with:
-        key: ${{ runner.os }}-analysis-${{ secrets.CACHE_VERSION }}-build-${{ github.run_id }}
-        restore-keys: ${{ runner.os }}-analysis-${{ secrets.CACHE_VERSION }}-build
+        key: ${{ runner.os }}-analysis-build-${{ github.run_id }}
+        restore-keys: ${{ runner.os }}-analysis-build
         max-size: 50M
 
     - name: 📜 Restore CMakeCache
@@ -37,7 +37,7 @@ jobs:
       with:
         path: |
           build/CMakeCache.txt
-        key: ${{ runner.os }}-analysis-${{ secrets.CACHE_VERSION }}-build-${{ hashFiles('**/CMakeLists.txt') }}
+        key: ${{ runner.os }}-analysis-build-${{ hashFiles('**/CMakeLists.txt') }}
 
     - name: ⬇️ Install dependencies
       run: |
@@ -46,6 +46,7 @@ jobs:
 
     - name: 🛠️ Build
       run: |
+        set -x
         mkdir -p build
         cd build
         CC=gcc-12 CXX=g++-12 cmake              \

.github/workflows/build.yml

@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  BUILD_TYPE: Release
+  BUILD_TYPE: RelWithDebInfo
 
 jobs:
 
@@ -20,8 +20,6 @@ jobs:
         shell: msys2 {0}
     env:
       CCACHE_DIR:      "${{ github.workspace }}/.ccache"
-      CCACHE_MAXSIZE:  "1000M"
-      CCACHE_COMPRESS: "true"
     steps:
     - name: 🧰 Checkout
       uses: actions/checkout@v3
@@ -32,16 +30,16 @@ jobs:
       uses:  hendrikmuhs/ccache-action@v1.2
       id:    cache-ccache
       with:
-        key: ${{ runner.os }}-${{ secrets.CACHE_VERSION }}-build-${{ github.run_id }}
-        restore-keys: ${{ runner.os }}-${{ secrets.CACHE_VERSION }}-build
-        max-size: 50M
+        key: ${{ runner.os }}-ccache-${{ github.run_id }}
+        restore-keys: ${{ runner.os }}-ccache
+        max-size: 1G
 
     - name: 📜 Restore CMakeCache
       uses:  actions/cache@v3
       with:
         path: |
           build/CMakeCache.txt
-        key: ${{ runner.os }}-${{ secrets.CACHE_VERSION }}-build-${{ hashFiles('**/CMakeLists.txt') }}
+        key: ${{ runner.os }}-cmakecache-${{ hashFiles('**/CMakeLists.txt') }}
 
     - name: 🟦 Install msys2
       uses: msys2/setup-msys2@v2
@@ -51,7 +49,6 @@ jobs:
           gcc:p
           lld:p
           cmake:p
-          make:p
           ccache:p
           glfw:p
           file:p
@@ -59,6 +56,14 @@ jobs:
           freetype:p
           dlfcn:p
           libbacktrace:p
+          ninja:p
+          curl-winssl:p
+          capstone:p
+
+    - name: ⬇️ Install .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '8.0.100'
 
     - name: 📜 Set version variable
       run: |
@@ -67,23 +72,23 @@ jobs:
     # Windows cmake build
     - name: 🛠️ Build
       run: |
+        set -x
         mkdir -p build
         cd build
 
-        cmake -G "MinGW Makefiles"                      \
-          -DCMAKE_BUILD_TYPE=$BUILD_TYPE                \
+        cmake -G "Ninja"                                \
+          -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}        \
           -DCMAKE_INSTALL_PREFIX="$PWD/install"         \
-          -DCREATE_PACKAGE=ON                           \
-          -DCMAKE_C_COMPILER_LAUNCHER=ccache            \
-          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache          \
-          -DCMAKE_C_FLAGS="-fuse-ld=lld"                \
-          -DCMAKE_CXX_FLAGS="-fuse-ld=lld"              \
+          -DIMHEX_GENERATE_PACKAGE=ON                   \
+          -DIMHEX_USE_DEFAULT_BUILD_SETTINGS=ON         \
           -DIMHEX_PATTERNS_PULL_MASTER=ON               \
           -DIMHEX_COMMIT_HASH_SHORT="${GITHUB_SHA::7}"  \
           -DIMHEX_COMMIT_HASH_LONG="${GITHUB_SHA}"      \
           -DIMHEX_COMMIT_BRANCH="${GITHUB_REF##*/}"     \
+          -DUSE_SYSTEM_CAPSTONE=ON                      \
+          -DDOTNET_EXECUTABLE="C:/Program Files/dotnet/dotnet.exe"  \
           ..
-        mingw32-make -j4 install
+        ninja install
         cpack
         mv ImHex-*.msi ../imhex-${{env.IMHEX_VERSION}}-Windows-x86_64.msi
 
@@ -92,6 +97,7 @@ jobs:
     - name: ⬆️ Upload Windows Installer
       uses: actions/upload-artifact@v3
       with:
+        if-no-files-found: error
         name: Windows Installer x86_64
         path: |
           imhex-*.msi
@@ -99,6 +105,7 @@ jobs:
     - name: ⬆️ Upload Portable ZIP
       uses: actions/upload-artifact@v3
       with:
+        if-no-files-found: error
         name: Windows Portable x86_64
         path: |
           build/install/*
@@ -106,6 +113,7 @@ jobs:
     - name: ⬇️ Download Mesa3D for NoGPU version
       shell: bash
       run: |
+        set -x
         echo "NoGPU version Powered by Mesa 3D : https://fdossena.com/?p=mesa%2Findex.frag" > build/install/MESA.md
         curl https://werwolv.net/downloads/mesa/MesaForWindows-x64-latest.7z -L -o mesa.7z
         7z e mesa.7z
@@ -114,15 +122,17 @@ jobs:
     - name: ⬆️ Upload NoGPU Portable ZIP
       uses: actions/upload-artifact@v3
       with:
+        if-no-files-found: error
         name: Windows Portable NoGPU x86_64
         path: |
           build/install/*
 
   # MacOS build
   macos:
-    runs-on: macos-11
+    runs-on: macos-12
 
     strategy:
+      fail-fast: false
       matrix:
         include:
           - suffix: "-NoGPU"
@@ -130,7 +140,7 @@ jobs:
           - suffix: ""
             custom_glfw: false
 
-    name: 🍎 macOS 11.0${{matrix.suffix}}
+    name: 🍎 macOS 12.0${{matrix.suffix}}
 
     steps:
     - name: 🧰 Checkout
@@ -145,19 +155,21 @@ jobs:
     - name: 📜 Setup ccache
       uses: hendrikmuhs/ccache-action@v1.2
       with:
-        key: ${{ runner.os }}-${{ matrix.suffix }}-${{ secrets.CACHE_VERSION }}-build-${{ github.run_id }}
-        restore-keys: ${{ runner.os }}-${{ matrix.suffix }}-${{ secrets.CACHE_VERSION }}-build
-        max-size: 50M
+        key: ${{ runner.os }}${{ matrix.suffix }}-ccache-${{ github.run_id }}
+        restore-keys: ${{ runner.os }}${{ matrix.suffix }}-ccache
+        max-size: 1G
 
     - name: 📜 Restore CMakeCache
       uses: actions/cache@v3
       with:
         path: |
           build/CMakeCache.txt
-        key: ${{ runner.os }}-${{ matrix.suffix }}-${{ secrets.CACHE_VERSION }}-build-${{ hashFiles('**/CMakeLists.txt') }}
+        key: ${{ runner.os }}-${{ matrix.suffix }}-cmakecache-${{ hashFiles('**/CMakeLists.txt') }}
 
     - name: ⬇️ Install dependencies
       run: |
+        set -x
+        brew reinstall python || brew link --overwrite python
         brew bundle --no-lock --file dist/Brewfile
         rm -rf /usr/local/Cellar/capstone
 
@@ -166,37 +178,43 @@ jobs:
       run: |
         brew install glfw
 
+    - name: ⬇️ Install .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '8.0.100'
+
     - name: 🧰 Checkout glfw
       if: ${{matrix.custom_glfw}}
       uses: actions/checkout@v3
       with:
         repository: glfw/glfw
         path: glfw
-
+    
+    # GLFW custom build (to allow software rendering)
     - name: ⬇️ Patch and install custom glfw
       if: ${{matrix.custom_glfw}}
       run: |
+        set -x
         cd glfw
         git apply ../dist/macOS/0001-glfw-SW.patch
 
         mkdir build
         cd build
 
-        cmake                                           \
+        cmake -G "Ninja"                                \
+          -DCMAKE_BUILD_TYPE=${{env.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       \
-          -DIMHEX_COMMIT_HASH_SHORT="${GITHUB_SHA::7}"  \
-          -DIMHEX_COMMIT_HASH_LONG="${GITHUB_SHA}"      \
-          -DIMHEX_COMMIT_BRANCH="${GITHUB_REF##*/}"     \
         ..
-        make -j 4 install
+        ninja install
 
     # MacOS cmake build
     - name: 🛠️ Build
       run: |
+        set -x
         mkdir -p build
         cd build
         CC=$(brew --prefix gcc@12)/bin/gcc-12                                                       \
@@ -204,11 +222,9 @@ jobs:
         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.10"                                                            \
-        cmake                                                                                       \
-          -DCMAKE_BUILD_TYPE=$BUILD_TYPE                                                            \
-          -DCREATE_BUNDLE=ON                                                                        \
-          -DCREATE_PACKAGE=ON                                                                       \
+        cmake -G "Ninja"                                                                            \
+          -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}                                                    \
+          -DIMHEX_GENERATE_PACKAGE=ON                                                               \
           -DCMAKE_C_COMPILER_LAUNCHER=ccache                                                        \
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache                                                      \
           -DCMAKE_OBJC_COMPILER_LAUNCHER=ccache                                                     \
@@ -217,22 +233,78 @@ jobs:
           -DIMHEX_COMMIT_HASH_SHORT="${GITHUB_SHA::7}"                                              \
           -DIMHEX_COMMIT_HASH_LONG="${GITHUB_SHA}"                                                  \
           -DIMHEX_COMMIT_BRANCH="${GITHUB_REF##*/}"                                                 \
-          -DCMAKE_OSX_DEPLOYMENT_TARGET="10.10"                                                     \
           -DCPACK_PACKAGE_FILE_NAME="imhex-${{env.IMHEX_VERSION}}-macOS${{matrix.suffix}}-x86_64"   \
           ..
-        make -j4 package
+        ninja package
 
     - name: ⬆️ Upload DMG
       uses: actions/upload-artifact@v3
       with:
+        if-no-files-found: error
         name: macOS DMG${{matrix.suffix}} x86_64
         path: build/*.dmg
 
+  macos-arm64:
+    runs-on: ubuntu-22.04
+    name: 🍎 macOS 12.1 arm64
+    steps:
+    - name: 🧰 Checkout
+      uses: actions/checkout@v3
+      with:
+        submodules: recursive
+    
+    - name: 📁 Restore docker /cache
+      uses: actions/cache@v3
+      with:
+        path: cache
+        key: build-macos-arm64-cache
+
+    - name: 🐳 Inject /cache into docker
+      uses: reproducible-containers/buildkit-cache-dance@v2.1.2 # Doesn't work with a MacOS runner ?
+      with:
+        cache-source: cache
+        cache-target: /cache
+
+    - name: 🛠️ Build using docker
+      run: |
+        docker buildx build . -f dist/macOS/arm64.Dockerfile --progress=plain --build-arg 'JOBS=4' --build-arg "BUILD_TYPE=$(BUILD_TYPE)" --build-context imhex=$(pwd) --output out
+
+    - name: ⬆️ Upload artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: macOS ZIP arm64
+        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-macos-arm64-cache" --confirm
+  
   # Ubuntu build
   ubuntu:
-    runs-on: ubuntu-22.04
-    name: 🐧 Ubuntu 22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Ubuntu
+            release_num: 22.04
+          - name: Ubuntu
+            release_num: 23.04
+
+    name: 🐧 Ubuntu ${{ matrix.release_num }}
+    runs-on: ubuntu-latest
+
+    container:
+      image: "ubuntu:${{ matrix.release_num }}"
+      options: --privileged
+
     steps:
+      - name: ⬇️ Install setup dependencies
+        run: apt update && apt install -y git curl
 
       - name: 🧰 Checkout
         uses: actions/checkout@v3
@@ -242,39 +314,54 @@ jobs:
       - name: 📜 Setup ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:
-          key: ${{ runner.os }}-${{ secrets.CACHE_VERSION }}-build-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-${{ secrets.CACHE_VERSION }}-build
-          max-size: 50M
+          key: Ubuntu-${{matrix.release_num}}-ccache-${{ github.run_id }}
+          restore-keys: Ubuntu-${{matrix.release_num}}-ccache
+          max-size: 1G
 
       - name: 📜 Restore CMakeCache
         uses: actions/cache@v3
         with:
           path: |
             build/CMakeCache.txt
-          key: ${{ runner.os }}-${{ secrets.CACHE_VERSION }}-build-${{ hashFiles('**/CMakeLists.txt') }}
+          key: Ubuntu-${{matrix.release_num}}-cmakecache-${{ hashFiles('**/CMakeLists.txt') }}
 
       - name: ⬇️ Install dependencies
         run: |
-          sudo apt update
-          sudo bash dist/get_deps_debian.sh
+          apt update
+          bash dist/get_deps_debian.sh
+
+      - name: ⬇️ Install .NET
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '8.0.100'
+
+      - name: 🏔️ Set Environment variables
+        run: |
+          echo COMMIT_SHA_SHORT=$(git rev-parse --short HEAD) >> $GITHUB_ENV
+          echo COMMIT_SHA_LONG=$(git rev-parse HEAD) >> $GITHUB_ENV
+          echo COMMIT_BRANCH=$(git rev-parse --abbrev-ref HEAD) >> $GITHUB_ENV
 
       # Ubuntu cmake build
       - name: 🛠️ Build
         run: |
+          set -x
+          git config --global --add safe.directory '*'
           mkdir -p build
           cd build
-          CC=gcc-12 CXX=g++-12 cmake                      \
-            -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="${GITHUB_SHA::7}"  \
-            -DIMHEX_COMMIT_HASH_LONG="${GITHUB_SHA}"      \
-            -DIMHEX_COMMIT_BRANCH="${GITHUB_REF##*/}"     \
-            -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON       \
+          CC=gcc-12 CXX=g++-12 cmake -G "Ninja"                       \
+            -DCMAKE_BUILD_TYPE=${{env.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="${{ env.COMMIT_SHA_SHORT }}"   \
+            -DIMHEX_COMMIT_HASH_LONG="${{ env.COMMIT_SHA_LONG }}"     \
+            -DIMHEX_COMMIT_BRANCH="${{ env.COMMIT_BRANCH }}"          \
+            -DIMHEX_ENABLE_LTO=ON                                     \
+            -DIMHEX_USE_GTK_FILE_PICKER=ON                            \
+            -DDOTNET_EXECUTABLE="dotnet"                              \
             ..
-          make -j 4 install DESTDIR=DebDir
+          DESTDIR=DebDir ninja install 
 
       - name: 📜 Set version variable
         run: |
@@ -284,12 +371,13 @@ jobs:
         run: |
           cp -r build/DEBIAN build/DebDir
           dpkg-deb -Zgzip --build build/DebDir
-          mv build/DebDir.deb imhex-${{env.IMHEX_VERSION}}-Ubuntu-22.04-x86_64.deb
+          mv build/DebDir.deb imhex-${{env.IMHEX_VERSION}}-Ubuntu-${{ matrix.release_num }}-x86_64.deb
 
       - name: ⬆️ Upload DEB
         uses: actions/upload-artifact@v3
         with:
-          name: Ubuntu 22.04 DEB x86_64
+          if-no-files-found: error
+          name: Ubuntu ${{ matrix.release_num }} DEB x86_64
           path: '*.deb'
 
   # AppImage build
@@ -297,77 +385,43 @@ jobs:
     runs-on: ubuntu-22.04
     name: ⬇️ AppImage
     steps:
-
       - name: 🧰 Checkout
         uses: actions/checkout@v3
         with:
           submodules: recursive
 
-      - name: 📜 Setup ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ${{ runner.os }}-appimage-${{ secrets.CACHE_VERSION }}-build-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-appimage-${{ secrets.CACHE_VERSION }}-build
-          max-size: 50M
-
-      - name: 📜 Restore CMakeCache
+      - name: 📁 Restore docker /cache
         uses: actions/cache@v3
         with:
-          path: |
-            build-appimage/CMakeCache.txt
-          key: ${{ runner.os }}-appimage-${{ secrets.CACHE_VERSION }}-build-${{ hashFiles('**/CMakeLists.txt') }}
+          path: cache
+          key: appimage-ccache-${{ github.run_id }}
+          restore-keys: appimage-cache
+      
+      - name: 🐳 Inject /cache into docker
+        uses: reproducible-containers/buildkit-cache-dance@v2.1.2
+        with:
+          cache-source: cache
+          cache-target: /cache
 
-      - name: ⬇️ Install dependencies
+      - name: 🛠️ Build using docker
         run: |
-          sudo apt update
-          sudo bash dist/get_deps_debian.sh
+          docker buildx build . -f dist/appimage/Dockerfile --progress=plain --build-arg "BUILD_TYPE=$BUILD_TYPE" \
+          --build-arg "GIT_COMMIT_HASH=$GITHUB_SHA" --build-arg "GIT_BRANCH=${GITHUB_REF##*/}" --output out
 
-          sudo apt install -y python3-pip python3-setuptools desktop-file-utils libgdk-pixbuf2.0-dev fuse
-          sudo wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O /usr/local/bin/appimagetool
-          sudo chmod +x /usr/local/bin/appimagetool
-          sudo pip3 install git+https://github.com/iTrooz/appimage-builder@dpkg-package-versions
-
-      - name: 📜 Set version variable
-        run: |
-          echo "IMHEX_VERSION=`cat VERSION`" >> $GITHUB_ENV
-
-      # AppImage cmake build
-      - name: 🛠️ Build
-        run: |
-          mkdir -p build-appimage
-          cd build-appimage
-          CC=gcc-12 CXX=g++-12 cmake                      \
-            -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="${GITHUB_SHA::7}"  \
-            -DIMHEX_COMMIT_HASH_LONG="${GITHUB_SHA}"      \
-            -DIMHEX_COMMIT_BRANCH="${GITHUB_REF##*/}"     \
-            -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON       \
-            -DIMHEX_PLUGINS_IN_SHARE=ON                   \
-            -DIMHEX_USE_BUNDLED_CA=ON                     \
-            ..
-          make -j 4 install DESTDIR=AppDir
-
-      - name: 📦 Bundle AppImage
-        run: |
-          cd build-appimage
-          export VERSION=${{env.IMHEX_VERSION}}
-          appimage-builder --recipe ../dist/AppImageBuilder.yml
 
       - name: ⬆️ Upload AppImage
         uses: actions/upload-artifact@v3
         with:
+          if-no-files-found: error
           name: Linux AppImage x86_64
-          path: 'build-appimage/*.AppImage'
+          path: 'out/*.AppImage'
 
       - name: ⬆️ Upload AppImage zsync
         uses: actions/upload-artifact@v3
         with:
+          if-no-files-found: error
           name: Linux AppImage zsync x86_64
-          path: 'build-appimage/*.AppImage.zsync'
+          path: 'out/*.AppImage.zsync'
 
   # ArchLinux build
   archlinux-build:
@@ -395,31 +449,36 @@ jobs:
         run: |
           dist/get_deps_archlinux.sh --noconfirm
 
+      - name: ⬇️ Install .NET
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '8.0.100'
+
       - name: 📜 Setup ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:
-          key: archlinux-${{ secrets.CACHE_VERSION }}-build-${{ github.run_id }}
-          restore-keys: archlinux-${{ secrets.CACHE_VERSION }}-build
-          max-size: 50M
+          key: archlinux-ccache-${{ github.run_id }}
+          restore-keys: archlinux-ccache
+          max-size: 1G
 
       - name: 📜 Restore CMakeCache
         uses: actions/cache@v3
         with:
           path: |
             build/CMakeCache.txt
-          key: archlinux-${{ secrets.CACHE_VERSION }}-build-${{ hashFiles('**/CMakeLists.txt') }}
+          key: archlinux-cmakecache-${{ hashFiles('**/CMakeLists.txt') }}
 
       # ArchLinux cmake build
       - name: 🛠️ Build
         run: |
+          set -x
           mkdir -p build
           cd build
-          CC=gcc CXX=g++ cmake                          \
-          -DCMAKE_BUILD_TYPE=$BUILD_TYPE                \
+          CC=gcc CXX=g++ cmake -G "Ninja"               \
+          -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}        \
           -DCMAKE_INSTALL_PREFIX="/usr"                 \
           -DCMAKE_C_COMPILER_LAUNCHER=ccache            \
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache          \
-          -DUSE_SYSTEM_CURL=ON                          \
           -DUSE_SYSTEM_FMT=ON                           \
           -DUSE_SYSTEM_YARA=ON                          \
           -DUSE_SYSTEM_NLOHMANN_JSON=ON                 \
@@ -428,9 +487,10 @@ jobs:
           -DIMHEX_COMMIT_HASH_SHORT="${GITHUB_SHA::7}"  \
           -DIMHEX_COMMIT_HASH_LONG="${GITHUB_SHA}"      \
           -DIMHEX_COMMIT_BRANCH="${GITHUB_REF##*/}"     \
-          -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON       \
+          -DIMHEX_ENABLE_LTO=ON                         \
+          -DIMHEX_USE_GTK_FILE_PICKER=ON                \
           ..
-          make -j 4 install DESTDIR=installDir
+          DESTDIR=installDir ninja install 
 
       - name: 📜 Set version variable
         run: |
@@ -444,6 +504,7 @@ jobs:
     # makepkg doesn't want to run as root, so I had to chmod 777 all over
       - name: 📦 Package ArchLinux .pkg.tar.zst
         run: |
+          set -x
           cd build
 
           # the name is a small trick to make makepkg recognize it as the source
@@ -461,6 +522,7 @@ jobs:
       - name: ⬆️ Upload imhex-archlinux.pkg.tar.zst
         uses: actions/upload-artifact@v3
         with:
+          if-no-files-found: error
           name: ArchLinux .pkg.tar.zst x86_64
           path: |
             build/imhex-${{env.IMHEX_VERSION}}-ArchLinux-x86_64.pkg.tar.zst
@@ -468,6 +530,7 @@ jobs:
   # RPM distro builds
   rpm-build:
     strategy:
+      fail-fast: false
       matrix:
         include:
           - name: Fedora
@@ -508,22 +571,28 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /var/cache/dnf
-          key: ${{ matrix.mock_release }}-${{secrets.CACHE_VERSION }}-dnf-${{ github.run_id }}
+          key: ${{ matrix.mock_release }}-dnf-${{ github.run_id }}
           restore-keys: |
-            ${{ matrix.mock_release }}-${{secrets.CACHE_VERSION }}-dnf-
+            ${{ matrix.mock_release }}-dnf-
 
       - name: ⬇️ Update all packages and install dependencies
         run: |
+          set -x
           dnf upgrade --disablerepo="*" --enablerepo="fedora,updates" -y
           dnf install --disablerepo="*" --enablerepo="fedora,updates" -y \
           fedpkg         \
           ccache
 
+      - name: ⬇️ Install .NET
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '8.0.100'
+
       - name: 📜 Setup ccache
         uses: hendrikmuhs/ccache-action@v1.2.5
         with:
-          key: rpm-${{ matrix.mock_release }}-${{ secrets.CACHE_VERSION }}-build-${{ github.run_id }}
-          restore-keys: rpm-${{ matrix.mock_release }}-${{ secrets.CACHE_VERSION }}-build
+          key: ${{ matrix.mock_release }}-rpm-${{ github.run_id }}
+          restore-keys: ${{ matrix.mock_release }}-rpm
           max-size: 1G
 
       - name: 📜 Set version variable
@@ -564,9 +633,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /var/cache/mock
-          key: ${{ matrix.mock_release }}-${{ secrets.CACHE_VERSION }}-mock-${{ github.run_id }}
+          key: ${{ matrix.mock_release }}-mock-${{ github.run_id }}
           restore-keys: |
-            ${{ matrix.mock_release }}-${{ secrets.CACHE_VERSION }}-mock-
+            ${{ matrix.mock_release }}-mock
 
       # Fedora cmake build (in imhex.spec)
       - name: 📦 Build RPM
@@ -581,6 +650,7 @@ jobs:
       - name: ⬆️ Upload RPM
         uses: actions/upload-artifact@v3
         with:
+          if-no-files-found: error
           name: ${{ matrix.name }} ${{ matrix.release_num }} RPM x86_64
           path: |
             imhex-${{env.IMHEX_VERSION}}-${{matrix.name}}-${{matrix.release_num}}-x86_64.rpm

.github/workflows/build_web.yml

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

.github/workflows/release.yml

@@ -21,6 +21,7 @@ jobs:
 
       - 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,26 +52,6 @@ jobs:
           repo: ImHex-Patterns
           token: ${{ secrets.RELEASE_TOKEN }}
 
-      - name: ✉️ Update C++ Plugin Template
-        uses: peter-evans/repository-dispatch@v2
-        env:
-          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-        if: "${{ env.RELEASE_TOKEN != '' }}"
-        with:
-          token: ${{ secrets.RELEASE_TOKEN }}
-          repository: WerWolv/ImHex-Cpp-Plugin-Template
-          event-type: update_submodule
-
-      - name: ✉️ Update Rust Plugin Template
-        uses: peter-evans/repository-dispatch@v2
-        env:
-          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-        if: "${{ env.RELEASE_TOKEN != '' }}"
-        with:
-          token: ${{ secrets.RELEASE_TOKEN }}
-          repository: WerWolv/ImHex-Rust-Plugin-Template
-          event-type: update_submodule
-
   release-upload-artifacts:
     runs-on: ubuntu-latest
     name: Release Upload Artifacts
@@ -84,6 +65,7 @@ jobs:
 
       - 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}"
@@ -107,7 +89,8 @@ jobs:
           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 ];
@@ -132,6 +115,7 @@ jobs:
 
       - 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`
@@ -170,6 +154,7 @@ jobs:
           WINGET_GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
         if: "${{ env.WINGET_GITHUB_TOKEN != '' }}"
         run: |
+          set -x
           $tagname = $env:GITHUB_REF.Replace("refs/tags/", "")
           $version = $tagname.Replace("v", "")
           $url = "https://github.com/WerWolv/ImHex/releases/download/${tagname}/imhex-${version}-Windows-x86_64.msi"

.github/workflows/tests.yml

@@ -25,8 +25,8 @@ jobs:
     - name: 📜 Setup ccache
       uses: hendrikmuhs/ccache-action@v1.2
       with:
-        key: ${{ runner.os }}-tests-${{ secrets.CACHE_VERSION }}-build-${{ github.run_id }}
-        restore-keys: ${{ runner.os }}-tests-${{ secrets.CACHE_VERSION }}-build
+        key: ${{ runner.os }}-tests-build-${{ github.run_id }}
+        restore-keys: ${{ runner.os }}-tests-build
         max-size: 50M
 
 
@@ -35,7 +35,7 @@ jobs:
       with:
         path: |
           build/CMakeCache.txt
-        key: ${{ runner.os }}-tests-${{ secrets.CACHE_VERSION }}-build-${{ hashFiles('**/CMakeLists.txt') }}
+        key: ${{ runner.os }}-tests-build-${{ hashFiles('**/CMakeLists.txt') }}
 
     - name: ⬇️ Install dependencies
       run: |
@@ -44,6 +44,7 @@ jobs:
 
     - name: 🛠️ Build
       run: |
+        set -x
         mkdir -p build
         cd build
         CC=gcc-12 CXX=g++-12 cmake                                                                      \

.gitmodules

@@ -1,34 +1,35 @@
-[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
+[submodule "lib/third_party/xdgpp"]
+	path = lib/third_party/xdgpp
 	url = https://git.sr.ht/~danyspin97/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/curl"]
-	path = lib/external/curl
-	url = https://github.com/curl/curl
-	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/third_party/jthread/jthread"]
+	path = lib/third_party/jthread/jthread
+    url = https://github.com/josuttis/jthread
+    ignore = dirty
+
 [submodule "lib/external/libromfs"]
 	path = lib/external/libromfs
 	url = https://github.com/WerWolv/libromfs
-	ignore = dirty
 [submodule "lib/external/pattern_language"]
 	path = lib/external/pattern_language
 	url = https://github.com/WerWolv/PatternLanguage
 [submodule "lib/external/libwolv"]
 	path = lib/external/libwolv
 	url = https://github.com/WerWolv/libwolv
+

CMakeLists.txt

@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.20)
 
 # Options
-option(IMHEX_USE_BUNDLED_CA "Use the CA bundle in romfs instead of the system one" OFF)
 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)
@@ -10,6 +9,13 @@ option(IMHEX_PATTERNS_PULL_MASTER "Download latest files from master branch of t
 option(IMHEX_IGNORE_BAD_COMPILER "Allow compiling with an unsupported compiler" OFF)
 option(IMHEX_USE_GTK_FILE_PICKER "Use GTK file picker instead of xdg-desktop-portals" OFF)
 option(IMHEX_DISABLE_STACKTRACE "Disables support for printing stack traces" OFF)
+option(IMHEX_BUNDLE_DOTNET "Bundle .NET runtime" ON)
+option(IMHEX_ENABLE_LTO "Enables Link Time Optimizations if possible" OFF)
+option(IMHEX_USE_DEFAULT_BUILD_SETTINGS "Use default build settings" OFF)
+option(IMHEX_STRICT_WARNINGS "Enable most available warnings and treat them as errors" ON)
+option(IMHEX_STATIC_LINK_PLUGINS "Statically link all plugins into the main executable" OFF)
+option(IMHEX_GENERATE_PACKAGE "Specify if a native package should be built. Only usable on Windows and MacOS" OFF)
+option(IMHEX_ENABLE_UNITY_BUILD "Enables building ImHex as a unity build." OFF)
 
 # Basic compiler and cmake configurations
 set(CMAKE_CXX_STANDARD 23)
@@ -21,6 +27,7 @@ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
 # Setup project
 loadVersion(IMHEX_VERSION)
 setVariableInParent(IMHEX_VERSION ${IMHEX_VERSION})
+configureCMake()
 project(imhex
         LANGUAGES C CXX VERSION ${IMHEX_VERSION}
         DESCRIPTION "The ImHex Hex Editor"
@@ -36,6 +43,7 @@ verifyCompiler()
 set(PLUGINS
     builtin
     windows
+    script_loader
 )
 
 # Add various defines
@@ -47,9 +55,10 @@ setUninstallTarget()
 addBundledLibraries()
 
 # Add ImHex sources
+add_custom_target(imhex_all ALL)
+
 add_subdirectory(lib/libimhex)
 add_subdirectory(main)
-add_custom_target(imhex_all ALL DEPENDS main libimhex)
 
 # Add unit tests
 enable_testing()

CMakePresets.json

@@ -17,13 +17,10 @@
         "CMAKE_BUILD_TYPE": "Debug",
         "CMAKE_C_COMPILER": "gcc",
         "CMAKE_CXX_COMPILER": "g++",
-        "CMAKE_C_COMPILER_LAUNCHER": "ccache",
-        "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
-        "CMAKE_C_FLAGS": "-fuse-ld=lld",
-        "CMAKE_CXX_FLAGS": "-fuse-ld=lld",
         "IMHEX_PATTERNS_PULL_MASTER": "ON",
         "CMAKE_INSTALL_PREFIX": "./install",
-        "USE_SYSTEM_CURL": "ON"
+        "USE_SYSTEM_CAPSTONE": "ON",
+        "IMHEX_USE_DEFAULT_BUILD_SETTINGS": "ON"
       }
     },
     {

PLUGINS.md

@@ -9,9 +9,11 @@ To install plugins, simply download the relevant `.hexplug` file and drop it in
 (If you're developing a Plugin on your own, please feel free to add it to this list)
 
 ### Official Plugins
-- [Malcore Plugin](https://github.com/WerWolv/ImHex-Malcore-Plugin)
-  - Direcly upload your files to https://malcore.io for advanced binary analysis.
 - [Extra Hashes Plugin](https://github.com/WerWolv/ImHex-Hashes-Plugin)
   - Adds support for a variety of new hashes to the Hashes view including Blake, Adler32, Murmur and Tiger
+- [Discord RPC Plugin](https://github.com/WerWolv/ImHex-Plugin-DiscordRPC)
+  - Adds support for Discord Rich Presence
 
 ### Third-Party Plugins
+- [Pcap Plugin](https://github.com/Professor-plum/ImHex-Plugin-Pcap)
+  - Adds support for reading packet capture files

README.md

@@ -33,6 +33,12 @@
   </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>
+</p>
+
 ## Supporting
 
 If you like my work, please consider supporting me on GitHub Sponsors, Patreon or PayPal. Thanks a lot!
@@ -120,7 +126,6 @@ If you like my work, please consider supporting me on GitHub Sponsors, Patreon o
   - Hexadecimal Color picker
   - Base converter
   - UNIX Permissions calculator
-  - Anonfiles File upload tool
   - Wikipedia term definition finder
   - File utilities
     - File splitter
@@ -133,7 +138,7 @@ The Pattern Language is the completely custom programming language developed for
 It allows you to define structures and data types in a C-like syntax and then use them to parse and highlight a file's content.
 
 - Source Code: [Link](https://github.com/WerWolv/PatternLanguage/)
-- Documentation: [Link](https://imhex.werwolv.net/docs/)
+- Documentation: [Link](https://docs.werwolv.net/pattern-language/)
 
 ## Database
 
@@ -145,7 +150,14 @@ For format patterns, libraries, magic and constant files, check out the [ImHex-P
 
 To use ImHex, the following minimal system requirements need to be met:
 
-- **OS**: Windows 7 or higher, macOS 10.15 (Catalina) or higher, "Modern" Linux (Ubuntu 22.04, Fedora 36/37, RHEL/AlmaLinux 9, and Arch Linux have official packages, other and older distributions can use the AppImage)
+- **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
+    - Arch Linux
 - **CPU**: x86_64 (64 Bit)
 - **GPU**: OpenGL 3.0 or higher 
   - Intel HD drivers are really buggy and often cause graphic artifacts
@@ -182,11 +194,11 @@ To develop plugins for ImHex, use one of the following two templates projects to
 
 ### Contributors
 
-- [Mary](https://github.com/Thog) for her immense help porting ImHex to MacOS and help during development
+- [Mary](https://github.com/marysaka) for her immense help porting ImHex to MacOS and help during development
 - [Roblabla](https://github.com/Roblabla) for adding MSI Installer support to ImHex
 - [jam1garner](https://github.com/jam1garner) and [raytwo](https://github.com/raytwo) for their help with adding Rust support to plugins
 - [Mailaender](https://github.com/Mailaender) for getting ImHex onto Flathub
-- [iTrooz](https://github.com/iTrooz) for many improvements related to release packaging and the GitHub Action runners.
+- [iTrooz](https://github.com/iTrooz) for many improvements and new features to Imhex
 - Everybody else who has reported issues on Discord or GitHub that I had great conversations with :)
 
 ### Dependencies

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 vulnearabilities can be reported through Discord @WerWolv#1337
+Any critical vulnerabilities can be reported through Discord (@werwolv).

VERSION

@@ -1 +1 @@
-1.30.0
+1.31.0

cmake/build_helpers.cmake

@@ -14,47 +14,6 @@ macro(addDefines)
         message(FATAL_ERROR "IMHEX_VERSION is not defined")
     endif ()
 
-    if (DEFINED IMHEX_COMMIT_HASH_LONG AND DEFINED IMHEX_COMMIT_HASH_SHORT AND DEFINED IMHEX_COMMIT_BRANCH)
-        add_compile_definitions(
-                GIT_COMMIT_HASH_LONG="${IMHEX_COMMIT_HASH_LONG}"
-                GIT_COMMIT_HASH_SHORT="${IMHEX_COMMIT_HASH_SHORT}"
-                GIT_BRANCH="${IMHEX_COMMIT_BRANCH}"
-        )
-    else()
-        # Get the current working branch
-        execute_process(
-                COMMAND git rev-parse --abbrev-ref HEAD
-                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-                OUTPUT_VARIABLE GIT_BRANCH
-                OUTPUT_STRIP_TRAILING_WHITESPACE
-                RESULT_VARIABLE RESULT_BRANCH
-        )
-
-        # Get the latest abbreviated commit hash of the working branch
-        execute_process(
-                COMMAND git log -1 --format=%h --abbrev=7
-                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-                OUTPUT_VARIABLE GIT_COMMIT_HASH_SHORT
-                OUTPUT_STRIP_TRAILING_WHITESPACE
-                RESULT_VARIABLE RESULT_HASH_SHORT
-        )
-
-        execute_process(
-                COMMAND git log -1 --format=%H
-                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-                OUTPUT_VARIABLE GIT_COMMIT_HASH_LONG
-                OUTPUT_STRIP_TRAILING_WHITESPACE
-                RESULT_VARIABLE RESULT_HASH_LONG
-        )
-
-        if (RESULT_BRANCH EQUAL 0 AND RESULT_HASH_LONG EQUAL 0 AND RESULT_HASH_SHORT EQUAL 0)
-            add_compile_definitions(
-                    GIT_COMMIT_HASH_SHORT="${GIT_COMMIT_HASH_SHORT}"
-                    GIT_COMMIT_HASH_LONG="${GIT_COMMIT_HASH_LONG}"
-                    GIT_BRANCH="${GIT_BRANCH}")
-        endif ()
-    endif ()
-
     set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} -DPROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} -DPROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR} -DPROJECT_VERSION_PATCH=${PROJECT_VERSION_PATCH} ")
 
     set(IMHEX_VERSION_STRING ${IMHEX_VERSION})
@@ -65,16 +24,26 @@ macro(addDefines)
         set(IMHEX_VERSION_STRING ${IMHEX_VERSION_STRING}-Debug)
         add_compile_definitions(DEBUG _GLIBCXX_DEBUG _GLIBCXX_VERBOSE)
     elseif (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
-        set(IMHEX_VERSION_STRING ${IMHEX_VERSION_STRING}-RelWithDebInfo)
+        set(IMHEX_VERSION_STRING ${IMHEX_VERSION_STRING})
         add_compile_definitions(NDEBUG)
     elseif (CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
         set(IMHEX_VERSION_STRING ${IMHEX_VERSION_STRING}-MinSizeRel)
         add_compile_definitions(NDEBUG)
     endif ()
 
-    add_compile_definitions(IMHEX_VERSION="${IMHEX_VERSION_STRING}")
+    if (IMHEX_STATIC_LINK_PLUGINS)
+        add_compile_definitions(IMHEX_STATIC_LINK_PLUGINS)
+    endif ()
 endmacro()
 
+function(addDefineToSource SOURCE DEFINE)
+    set_property(
+            SOURCE ${SOURCE}
+            APPEND
+            PROPERTY COMPILE_DEFINITIONS "${DEFINE}"
+    )
+endfunction()
+
 # Detect current OS / System
 macro(detectOS)
     if (WIN32)
@@ -82,10 +51,6 @@ macro(detectOS)
         set(CMAKE_INSTALL_BINDIR ".")
         set(CMAKE_INSTALL_LIBDIR ".")
         set(PLUGINS_INSTALL_LOCATION "plugins")
-
-        if (NOT USE_SYSTEM_CURL)
-            SET(IMHEX_USE_BUNDLED_CA ON)
-        endif ()
     elseif (APPLE)
         add_compile_definitions(OS_MACOS)
         set(CMAKE_INSTALL_BINDIR ".")
@@ -93,6 +58,8 @@ macro(detectOS)
         set(PLUGINS_INSTALL_LOCATION "plugins")
         enable_language(OBJC)
         enable_language(OBJCXX)
+    elseif (EMSCRIPTEN)
+        add_compile_definitions(OS_WEB)
     elseif (UNIX AND NOT APPLE)
         add_compile_definitions(OS_LINUX)
         include(GNUInstallDirs)
@@ -109,10 +76,6 @@ macro(detectOS)
         message(FATAL_ERROR "Unknown / unsupported system!")
     endif()
 
-    if(IMHEX_USE_BUNDLED_CA)
-        add_compile_definitions(IMHEX_USE_BUNDLED_CA)
-    endif()
-
 endmacro()
 
 # Detect 32 vs. 64 bit system
@@ -126,18 +89,14 @@ endmacro()
 
 
 macro(configurePackingResources)
-    option (CREATE_PACKAGE "Create a package with CPack" OFF)
-
-    if (APPLE)
-        option (CREATE_BUNDLE "Create a bundle on macOS" OFF)
-    endif()
-
     if (WIN32)
-        set(APPLICATION_TYPE)
-        set(IMHEX_ICON "${IMHEX_BASE_FOLDER}/resources/resource.rc")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-subsystem,windows")
+        if (NOT (CMAKE_BUILD_TYPE STREQUAL "Debug"))
+            set(APPLICATION_TYPE WIN32)
+        endif ()
 
-        if (CREATE_PACKAGE)
+        set(IMHEX_ICON "${IMHEX_BASE_FOLDER}/resources/resource.rc")
+
+        if (IMHEX_GENERATE_PACKAGE)
             set(CPACK_GENERATOR "WIX")
             set(CPACK_PACKAGE_NAME "ImHex")
             set(CPACK_PACKAGE_VENDOR "WerWolv")
@@ -155,7 +114,7 @@ macro(configurePackingResources)
     elseif (APPLE)
         set (IMHEX_ICON "${IMHEX_BASE_FOLDER}/resources/dist/macos/AppIcon.icns")
 
-        if (CREATE_BUNDLE)
+        if (IMHEX_GENERATE_PACKAGE)
             set(APPLICATION_TYPE MACOSX_BUNDLE)
             set_source_files_properties(${IMHEX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
             set(MACOSX_BUNDLE_ICON_FILE "AppIcon.icns")
@@ -164,16 +123,19 @@ macro(configurePackingResources)
             set(MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/resources/dist/macos/Info.plist.in")
             set(MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
             set(MACOSX_BUNDLE_GUI_IDENTIFIER "net.WerWolv.ImHex")
-            set(MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_VERSION}-${GIT_COMMIT_HASH_SHORT}")
+            set(MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_VERSION}-${IMHEX_COMMIT_HASH_SHORT}")
             set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
 
             string(TIMESTAMP CURR_YEAR "%Y")
             set(MACOSX_BUNDLE_COPYRIGHT "Copyright © 2020 - ${CURR_YEAR} WerWolv. All rights reserved." )
             if ("${CMAKE_GENERATOR}" STREQUAL "Xcode")
-                set (IMHEX_BUNDLE_PATH "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/ImHex.app")
+                set (IMHEX_BUNDLE_PATH "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/imhex.app")
             else ()
-                set (IMHEX_BUNDLE_PATH "${CMAKE_BINARY_DIR}/ImHex.app")
+                set (IMHEX_BUNDLE_PATH "${CMAKE_BINARY_DIR}/imhex.app")
             endif()
+
+            set(PLUGINS_INSTALL_LOCATION "${IMHEX_BUNDLE_PATH}/Contents/MacOS/plugins")
+            set(CMAKE_INSTALL_LIBDIR "${IMHEX_BUNDLE_PATH}/Contents/Frameworks")
         endif()
     endif()
 endmacro()
@@ -197,11 +159,9 @@ macro(createPackage)
 
                 install(FILES "${PLUGIN_LOCATION}/../${plugin}.hexplug" DESTINATION "${PLUGINS_INSTALL_LOCATION}" PERMISSIONS ${LIBRARY_PERMISSIONS})
             else ()
-                if (WIN32)
-                    install(TARGETS ${plugin} RUNTIME DESTINATION ${PLUGINS_INSTALL_LOCATION})
-                elseif (APPLE)
-                    if (CREATE_BUNDLE)
-                        set_target_properties(${plugin} PROPERTIES LIBRARY_OUTPUT_DIRECTORY $<TARGET_FILE_DIR:main>/${PLUGINS_INSTALL_LOCATION})
+                if (APPLE)
+                    if (IMHEX_GENERATE_PACKAGE)
+                        set_target_properties(${plugin} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PLUGINS_INSTALL_LOCATION})
                     else ()
                         set_target_properties(${plugin} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins)
                     endif ()
@@ -270,7 +230,7 @@ macro(createPackage)
 
     endif()
     
-    if (CREATE_BUNDLE)
+    if (IMHEX_GENERATE_PACKAGE AND APPLE)
         include(PostprocessBundle)
         
         set_target_properties(libimhex PROPERTIES SOVERSION ${IMHEX_VERSION})
@@ -295,14 +255,18 @@ macro(createPackage)
 
         # Enforce DragNDrop packaging.
         set(CPACK_GENERATOR "DragNDrop")
+
+        set (CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/resources/dist/macos/AppIcon.icns" )
+        set (CPACK_BUNDLE_PLIST "${CMAKE_BINARY_DIR}/imhex.app/Contents/Info.plist")
     else()
         install(TARGETS main RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+        if(WIN32) # Forwarder is only needed on Windows
+            install(TARGETS main-forwarder BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
+        endif()
     endif()
 
-    if (CREATE_PACKAGE)
+    if (IMHEX_GENERATE_PACKAGE)
         set (CPACK_BUNDLE_NAME "ImHex")
-        set (CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/resources/dist/macos/AppIcon.icns" )
-        set (CPACK_BUNDLE_PLIST "${CMAKE_BINARY_DIR}/ImHex.app/Contents/Info.plist")
 
         include(CPack)
     endif()
@@ -318,10 +282,79 @@ function(JOIN OUTPUT GLUE)
     set(${OUTPUT} "${_TMP_RESULT}" PARENT_SCOPE)
 endfunction()
 
+macro(configureCMake)
+    message(STATUS "Configuring ImHex v${IMHEX_VERSION}")
+
+    # Enable C and C++ languages
+    enable_language(C CXX)
+
+    # Configure use of recommended build tools
+    if (IMHEX_USE_DEFAULT_BUILD_SETTINGS)
+        message(STATUS "Configuring CMake to use recommended build tools...")
+
+        find_program(CCACHE_PATH ccache)
+        find_program(NINJA_PATH ninja)
+        find_program(LD_LLD_PATH ld.lld)
+        find_program(AR_LLVMLIBS_PATH llvm-ar)
+        find_program(RANLIB_LLVMLIBS_PATH llvm-ranlib)
+
+        if (CCACHE_PATH)
+            set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_PATH})
+            set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_PATH})
+        else ()
+            message(WARNING "ccache not found!")
+        endif ()
+
+        if (AR_LLVMLIBS_PATH)
+            set(CMAKE_AR ${AR_LLVMLIBS_PATH})
+        else ()
+            message(WARNING "llvm-ar not found, using default ar!")
+        endif ()
+
+        if (RANLIB_LLVMLIBS_PATH)
+            set(CMAKE_RANLIB ${RANLIB_LLVMLIBS_PATH})
+        else ()
+            message(WARNING "llvm-ranlib not found, using default ranlib!")
+        endif ()
+
+        if (LD_LLD_PATH)
+            set(CMAKE_LINKER ${LD_LLD_PATH})
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-ld=lld")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=lld")
+        else ()
+            message(WARNING "lld not found, using default linker!")
+        endif ()
+
+        if (NINJA_PATH)
+            set(CMAKE_GENERATOR Ninja)
+        else ()
+            message(WARNING "ninja not found, using default generator!")
+        endif ()
+    endif()
+
+    # Enable LTO if desired and supported
+    if (IMHEX_ENABLE_LTO)
+        include(CheckIPOSupported)
+
+        check_ipo_supported(RESULT result OUTPUT output_error)
+        if (result)
+            set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+            message(STATUS "LTO enabled!")
+        else ()
+            message(WARNING "LTO is not supported: ${output_error}")
+        endif ()
+    endif ()
+
+    # Some libraries we use set the BUILD_SHARED_LIBS variable to ON, which causes CMake to
+    # display a warning about options being set using set() instead of option().
+    # Explicitly set the policy to NEW to suppress the warning.
+    set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
+endmacro()
+
 macro(setDefaultBuiltTypeIfUnset)
     if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-        set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Using Release build type as it was left unset" FORCE)
-        set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release")
+        set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Using RelWithDebInfo build type as it was left unset" FORCE)
+        set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "RelWithDebInfo")
     endif()
 endmacro()
 
@@ -338,9 +371,9 @@ function(detectBadClone)
         return()
     endif()
 
-    file (GLOB EXTERNAL_DIRS "lib/external/*")
+    file (GLOB EXTERNAL_DIRS "lib/external/*" "lib/third_party/*")
     foreach (EXTERNAL_DIR ${EXTERNAL_DIRS})
-        file(GLOB RESULT "${EXTERNAL_DIR}/*")
+        file(GLOB_RECURSE RESULT "${EXTERNAL_DIR}/*")
         list(LENGTH RESULT ENTRY_COUNT)
         if(ENTRY_COUNT LESS_EQUAL 1)
             message(FATAL_ERROR "External dependency ${EXTERNAL_DIR} is empty!\nMake sure to correctly clone ImHex using the --recurse-submodules git option or initialize the submodules manually.")
@@ -355,8 +388,8 @@ function(verifyCompiler)
 
     if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "12.0.0")
         message(FATAL_ERROR "ImHex requires GCC 12.0.0 or newer. Please use the latest GCC version.")
-    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "14.0.0")
-        message(FATAL_ERROR "ImHex requires Clang 14.0.0 or newer. Please use the latest Clang version.")
+    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "17.0.0")
+        message(FATAL_ERROR "ImHex requires Clang 17.0.0 or newer. Please use the latest Clang version.")
     elseif (NOT (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
         message(FATAL_ERROR "ImHex can only be compiled with GCC or Clang. ${CMAKE_CXX_COMPILER_ID} is not supported.")
     endif()
@@ -383,7 +416,7 @@ function(downloadImHexPatternsFiles dest)
         FetchContent_Declare(
             imhex_patterns
             GIT_REPOSITORY https://github.com/WerWolv/ImHex-Patterns.git
-            GIT_TAG master
+            GIT_TAG origin/master
         )
 
         message(STATUS "Downloading ImHex-Patterns repo branch ${PATTERNS_BRANCH}...")
@@ -406,16 +439,35 @@ endfunction()
 
 macro(setupCompilerFlags target)
     if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-        set(IMHEX_COMMON_FLAGS "-Wall -Wextra -Wpedantic -Werror")
-        set(IMHEX_C_FLAGS "${IMHEX_COMMON_FLAGS} -Wno-array-bounds")
-        set(IMHEX_CXX_FLAGS "-fexceptions -frtti")
-        if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-            set(IMHEX_C_FLAGS "${IMHEX_C_FLAGS} -Wno-restrict -Wno-stringop-overread -Wno-stringop-overflow -Wno-dangling-reference")
+
+        # Define strict compilation flags
+        if (IMHEX_STRICT_WARNINGS)
+            set(IMHEX_COMMON_FLAGS "${IMHEX_COMMON_FLAGS} -Wall -Wextra -Wpedantic -Werror")
         endif()
+
+        set(IMHEX_CXX_FLAGS "-fexceptions -frtti")
+
+        # Disable some warnings
+        set(IMHEX_C_CXX_FLAGS "-Wno-array-bounds -Wno-deprecated-declarations")
+
+        if (IMHEX_ENABLE_UNITY_BUILD AND WIN32)
+            set(IMHEX_COMMON_FLAGS "${IMHEX_COMMON_FLAGS} -Wa,-mbig-obj")
+        endif ()
     endif()
 
-    set(CMAKE_C_FLAGS    "${CMAKE_C_FLAGS}    ${IMHEX_C_FLAGS}")
-    set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS}  ${IMHEX_CXX_FLAGS}   ${IMHEX_C_FLAGS}")
+    # Disable some warnings for gcc
+    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+        set(IMHEX_C_CXX_FLAGS "${IMHEX_C_CXX_FLAGS} -Wno-restrict -Wno-stringop-overread -Wno-stringop-overflow -Wno-dangling-reference")
+    endif()
+
+    # Define emscripten-specific disabled warnings
+    if (EMSCRIPTEN)
+        set(IMHEX_C_CXX_FLAGS "${IMHEX_C_CXX_FLAGS} -pthread -Wno-dollar-in-identifier-extension -Wno-pthreads-mem-growth")
+    endif ()
+
+    # Set actual CMake flags
+    set(CMAKE_C_FLAGS    "${CMAKE_C_FLAGS}    ${IMHEX_COMMON_FLAGS} ${IMHEX_C_CXX_FLAGS}")
+    set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS}  ${IMHEX_COMMON_FLAGS} ${IMHEX_C_CXX_FLAGS}  ${IMHEX_CXX_FLAGS}")
     set(CMAKE_OBJC_FLAGS "${CMAKE_OBJC_FLAGS} ${IMHEX_COMMON_FLAGS}")
 endmacro()
 
@@ -435,30 +487,31 @@ endmacro()
 macro(addBundledLibraries)
     find_package(PkgConfig REQUIRED)
 
-    set(EXTERN_LIBS_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/lib/external")
+    set(EXTERNAL_LIBS_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/lib/external")
+    set(THIRD_PARTY_LIBS_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/lib/third_party")
 
     set(BUILD_SHARED_LIBS OFF)
-    add_subdirectory(${EXTERN_LIBS_FOLDER}/imgui)
-    set_target_properties(imgui PROPERTIES POSITION_INDEPENDENT_CODE ON)
+    add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/imgui)
 
-    add_subdirectory(${EXTERN_LIBS_FOLDER}/microtar EXCLUDE_FROM_ALL)
+    add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/microtar EXCLUDE_FROM_ALL)
     set_target_properties(microtar PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
-    add_subdirectory(${EXTERN_LIBS_FOLDER}/libwolv EXCLUDE_FROM_ALL)
+    add_subdirectory(${EXTERNAL_LIBS_FOLDER}/libwolv EXCLUDE_FROM_ALL)
     set_property(TARGET libwolv-types PROPERTY POSITION_INDEPENDENT_CODE ON)
     set_property(TARGET libwolv-utils PROPERTY POSITION_INDEPENDENT_CODE ON)
     set_property(TARGET libwolv-io PROPERTY POSITION_INDEPENDENT_CODE ON)
     set_property(TARGET libwolv-hash PROPERTY POSITION_INDEPENDENT_CODE ON)
     set_property(TARGET libwolv-containers PROPERTY POSITION_INDEPENDENT_CODE ON)
     set_property(TARGET libwolv-net PROPERTY POSITION_INDEPENDENT_CODE ON)
+    set_property(TARGET libwolv-math_eval PROPERTY POSITION_INDEPENDENT_CODE ON)
 
-    set(XDGPP_INCLUDE_DIRS "${EXTERN_LIBS_FOLDER}/xdgpp")
-    set(CURL_USE_MBEDTLS ON)
-    set(BUILD_CURL_EXE OFF)
+    set(XDGPP_INCLUDE_DIRS "${THIRD_PARTY_LIBS_FOLDER}/xdgpp")
     set(FPHSA_NAME_MISMATCHED ON CACHE BOOL "")
 
+    find_package(PkgConfig REQUIRED)
+
     if(NOT USE_SYSTEM_FMT)
-        add_subdirectory(${EXTERN_LIBS_FOLDER}/fmt EXCLUDE_FROM_ALL)
+        add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/fmt EXCLUDE_FROM_ALL)
         set_target_properties(fmt PROPERTIES POSITION_INDEPENDENT_CODE ON)
         set(FMT_LIBRARIES fmt::fmt-header-only)
     else()
@@ -472,42 +525,39 @@ macro(addBundledLibraries)
         set(NFD_PORTAL ON CACHE BOOL "Use GTK for Linux file dialogs" FORCE)
     endif ()
 
-    if (NOT USE_SYSTEM_NFD)
-        add_subdirectory(${EXTERN_LIBS_FOLDER}/nativefiledialog EXCLUDE_FROM_ALL)
-        set_target_properties(nfd PROPERTIES POSITION_INDEPENDENT_CODE ON)
-        set(NFD_LIBRARIES nfd)
-    else()
-        find_package(nfd)
-        set(NFD_LIBRARIES nfd)
+    if (NOT EMSCRIPTEN)
+        # curl
+        find_package(PkgConfig REQUIRED)
+        pkg_check_modules(LIBCURL REQUIRED IMPORTED_TARGET libcurl>=7.60.0)
+
+        # nfd
+        if (NOT USE_SYSTEM_NFD)
+            add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/nativefiledialog EXCLUDE_FROM_ALL)
+            set_target_properties(nfd PROPERTIES POSITION_INDEPENDENT_CODE ON)
+            set(NFD_LIBRARIES nfd)
+        else()
+            find_package(nfd)
+            set(NFD_LIBRARIES nfd)
+        endif()
     endif()
 
     if(NOT USE_SYSTEM_NLOHMANN_JSON)
-        add_subdirectory(${EXTERN_LIBS_FOLDER}/nlohmann_json EXCLUDE_FROM_ALL)
+        add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/nlohmann_json EXCLUDE_FROM_ALL)
         set(NLOHMANN_JSON_LIBRARIES nlohmann_json)
     else()
         find_package(nlohmann_json 3.10.2 REQUIRED)
         set(NLOHMANN_JSON_LIBRARIES nlohmann_json::nlohmann_json)
     endif()
 
-    if(NOT USE_SYSTEM_CURL)
-        add_subdirectory(${EXTERN_LIBS_FOLDER}/curl EXCLUDE_FROM_ALL)
-        set_target_properties(libcurl PROPERTIES POSITION_INDEPENDENT_CODE ON)
-        target_compile_options(libcurl PRIVATE -Wno-deprecated-declarations)
-        set(LIBCURL_LIBRARIES libcurl)
-    else()
-        find_package(PkgConfig REQUIRED)
-        pkg_check_modules(LIBCURL REQUIRED IMPORTED_TARGET libcurl>=7.76.1)
-    endif()
-
     if (NOT USE_SYSTEM_LLVM)
-        add_subdirectory(${EXTERN_LIBS_FOLDER}/llvm-demangle EXCLUDE_FROM_ALL)
+        add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/llvm-demangle EXCLUDE_FROM_ALL)
         set_target_properties(LLVMDemangle PROPERTIES POSITION_INDEPENDENT_CODE ON)
     else()
         find_package(LLVM REQUIRED Demangle)
     endif()
 
     if (NOT USE_SYSTEM_YARA)
-        add_subdirectory(${EXTERN_LIBS_FOLDER}/yara EXCLUDE_FROM_ALL)
+        add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/yara EXCLUDE_FROM_ALL)
         set_target_properties(libyara PROPERTIES POSITION_INDEPENDENT_CODE ON)
         set(YARA_LIBRARIES libyara)
     else()
@@ -516,7 +566,7 @@ macro(addBundledLibraries)
     endif()
 
     if (NOT USE_SYSTEM_MINIAUDIO)
-        add_subdirectory(${EXTERN_LIBS_FOLDER}/miniaudio EXCLUDE_FROM_ALL)
+        add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/miniaudio EXCLUDE_FROM_ALL)
         set_target_properties(miniaudio PROPERTIES POSITION_INDEPENDENT_CODE ON)
         set(MINIAUDIO_LIBRARIES miniaudio)
     else()
@@ -524,23 +574,37 @@ macro(addBundledLibraries)
         pkg_check_modules(miniaudio REQUIRED IMPORTED_TARGET miniaudio)
     endif()
 
+    if (NOT USE_SYSTEM_JTHREAD)
+        add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/jthread EXCLUDE_FROM_ALL)
+        set(JTHREAD_LIBRARIES jthread)
+    else()
+        find_path(JOSUTTIS_JTHREAD_INCLUDE_DIRS "condition_variable_any2.hpp")
+        include_directories(${JOSUTTIS_JTHREAD_INCLUDE_DIRS})
+
+        add_library(jthread INTERFACE)
+        target_include_directories(jthread INTERFACE ${JOSUTTIS_JTHREAD_INCLUDE_DIRS})
+        set(JTHREAD_LIBRARIES jthread)
+    endif()
+
     if (NOT USE_SYSTEM_CAPSTONE)
         set(CAPSTONE_BUILD_STATIC_RUNTIME OFF CACHE BOOL "Disable shared library building")
         set(CAPSTONE_BUILD_SHARED OFF CACHE BOOL "Disable shared library building")
         set(CAPSTONE_BUILD_TESTS OFF CACHE BOOL "Disable tests")
-        add_subdirectory(${EXTERN_LIBS_FOLDER}/capstone EXCLUDE_FROM_ALL)
+        add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/capstone EXCLUDE_FROM_ALL)
         set_target_properties(capstone PROPERTIES POSITION_INDEPENDENT_CODE ON)
+        target_compile_options(capstone PRIVATE -Wno-unused-function)
         set(CAPSTONE_LIBRARIES "capstone")
-        set(CAPSTONE_INCLUDE_DIRS ${EXTERN_LIBS_FOLDER}/capstone/include)
+        set(CAPSTONE_INCLUDE_DIRS ${THIRD_PARTY_LIBS_FOLDER}/capstone/include)
     else()
         find_package(PkgConfig REQUIRED)
         pkg_search_module(CAPSTONE 4.0.2 REQUIRED capstone)
     endif()
 
-    add_subdirectory(${EXTERN_LIBS_FOLDER}/pattern_language EXCLUDE_FROM_ALL)
+    set(LIBPL_BUILD_CLI_AS_EXECUTABLE OFF)
+    add_subdirectory(${EXTERNAL_LIBS_FOLDER}/pattern_language EXCLUDE_FROM_ALL)
     set_target_properties(libpl PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
-    find_package(mbedTLS 2.26.0 REQUIRED)
+    find_package(mbedTLS 3.4.0 REQUIRED)
 
     pkg_search_module(MAGIC libmagic>=5.39)
     if(NOT MAGIC_FOUND)
@@ -574,6 +638,12 @@ macro(addBundledLibraries)
     endif ()
 endmacro()
 
+function(enableUnityBuild TARGET)
+    if (IMHEX_ENABLE_UNITY_BUILD)
+        set_target_properties(${TARGET} PROPERTIES UNITY_BUILD ON UNITY_BUILD_MODE BATCH)
+    endif ()
+endfunction()
+
 function(generatePDBs)
     if (NOT WIN32 OR CMAKE_BUILD_TYPE STREQUAL "Debug")
         return()
@@ -587,11 +657,13 @@ function(generatePDBs)
     )
     FetchContent_Populate(cv2pdb)
 
-    set(PDBS_TO_GENERATE main libimhex ${PLUGINS})
+    set(PDBS_TO_GENERATE main main-forwarder libimhex ${PLUGINS})
     add_custom_target(pdbs)
     foreach (PDB ${PDBS_TO_GENERATE})
         if (PDB STREQUAL "main")
             set(GENERATED_PDB imhex)
+        elseif (PDB STREQUAL "main-forwarder")
+            set(GENERATED_PDB imhex-gui)
         elseif (PDB STREQUAL "libimhex")
             set(GENERATED_PDB libimhex)
         else ()
@@ -611,5 +683,13 @@ function(generatePDBs)
         install(FILES ${CMAKE_BINARY_DIR}/${GENERATED_PDB}.pdb DESTINATION ".")
     endforeach ()
 
+endfunction()
 
+function(generateSDKDirectory)
+    set(SDK_PATH "./sdk")
+
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/lib/libimhex/include DESTINATION "${SDK_PATH}")
+    install(FILES ${CMAKE_SOURCE_DIR}/cmake/modules/ImHexPlugin.cmake DESTINATION "${SDK_PATH}/cmake/modules")
+    install(TARGETS libimhex ARCHIVE DESTINATION "${SDK_PATH}/lib")
+    install(TARGETS libimhex RUNTIME DESTINATION "${SDK_PATH}/lib")
 endfunction()

cmake/modules/FindCoreClrEmbed.cmake

@@ -0,0 +1,81 @@
+set(CoreClrEmbed_FOUND FALSE)
+
+set(CORECLR_ARCH "linux-x64")
+set(CORECLR_SUBARCH "x64")
+if (WIN32)
+    set(CORECLR_ARCH "win-x64")
+endif()
+if (UNIX)
+    if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+        set(CORECLR_ARCH "linux-arm64")
+        set(CORECLR_SUBARCH "arm64")
+    endif()
+endif()
+
+if (NOT DOTNET_EXECUTABLE)
+    set(DOTNET_EXECUTABLE dotnet)
+endif ()
+
+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 "")
+    message(STATUS "Unable to find any .NET runtimes")
+    return()
+endif ()
+
+set(_ALL_RUNTIMES ${CORECLR_LIST_RUNTIMES_OUTPUT})
+string(REPLACE "\n" ";" _ALL_RUNTIMES_LIST ${_ALL_RUNTIMES})
+
+foreach(X ${_ALL_RUNTIMES_LIST})
+    string(REGEX MATCH "Microsoft\.NETCore\.App ([0-9]+)\.([0-9]+)\.([a-zA-Z0-9.-]+) [\[](.*)Microsoft\.NETCore\.App[\]]"
+    CORECLR_VERSION_REGEX_MATCH ${X})
+
+    set(_RUNTIME_VERSION ${CMAKE_MATCH_1}.${CMAKE_MATCH_2})
+
+    if (CMAKE_MATCH_1 AND CMAKE_MATCH_4)
+        if (${_RUNTIME_VERSION} STREQUAL ${CORECLR_VERSION})
+            set(CORECLR_RUNTIME_VERSION ${_RUNTIME_VERSION})
+            set(CORECLR_RUNTIME_VERSION_FULL ${CORECLR_VERSION}.${CMAKE_MATCH_3})
+            set(CORECLR_RUNTIME_ROOT_PATH ${CMAKE_MATCH_4})
+            message(STATUS "Found matching .NET runtime version '${CORECLR_RUNTIME_VERSION_FULL}' path='${CORECLR_RUNTIME_ROOT_PATH}'")
+        endif()
+    endif()
+endforeach()
+
+if (CORECLR_RUNTIME_ROOT_PATH)
+    get_filename_component(CORECLR_RUNTIME_ROOT_PATH ${CORECLR_RUNTIME_ROOT_PATH} DIRECTORY)
+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()
+endif()
+
+set(CORECLR_HOST_BASE_PATH "${CORECLR_RUNTIME_ROOT_PATH}/packs/Microsoft.NETCore.App.Host.${CORECLR_ARCH}/${CORECLR_RUNTIME_VERSION_FULL}")
+file(GLOB _CORECLR_FOUND_PATH ${CORECLR_HOST_BASE_PATH})
+if (_CORECLR_FOUND_PATH)
+    set(CORECLR_NETHOST_ROOT "${_CORECLR_FOUND_PATH}/runtimes/${CORECLR_ARCH}/native")
+endif()
+
+find_library(CoreClrEmbed_LIBRARY nethost PATHS
+    ${CORECLR_NETHOST_ROOT}
+)
+find_path(CoreClrEmbed_INCLUDE_DIR nethost.h PATHS
+    ${CORECLR_NETHOST_ROOT}
+)
+find_file(CoreClrEmbed_SHARED_LIBRARY nethost.dll nethost.so libnethost.so nethost.dylib libnethost.dylib PATHS
+    ${CORECLR_NETHOST_ROOT})
+
+if (CoreClrEmbed_INCLUDE_DIR AND CoreClrEmbed_LIBRARY)
+    set(CoreClrEmbed_FOUND TRUE)
+    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)
+endif()

cmake/modules/ImHexPlugin.cmake

@@ -0,0 +1,63 @@
+macro(add_imhex_plugin)
+    # Parse arguments
+    set(options "")
+    set(oneValueArgs NAME)
+    set(multiValueArgs SOURCES INCLUDES LIBRARIES)
+    cmake_parse_arguments(IMHEX_PLUGIN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    if (IMHEX_STATIC_LINK_PLUGINS)
+        set(IMHEX_PLUGIN_LIBRARY_TYPE STATIC)
+
+        target_link_libraries(libimhex PUBLIC ${IMHEX_PLUGIN_NAME})
+
+        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)
+    else()
+        set(IMHEX_PLUGIN_LIBRARY_TYPE MODULE)
+    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})
+
+    # Add include directories and link libraries
+    target_include_directories(${IMHEX_PLUGIN_NAME} PUBLIC ${IMHEX_PLUGIN_INCLUDES})
+    target_link_libraries(${IMHEX_PLUGIN_NAME} PRIVATE libimhex ${FMT_LIBRARIES} ${IMHEX_PLUGIN_LIBRARIES})
+
+    # Add 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})
+
+    # Enable required compiler flags
+    set_target_properties(${IMHEX_PLUGIN_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+    enableUnityBuild(${IMHEX_PLUGIN_NAME})
+    setupCompilerFlags(${IMHEX_PLUGIN_NAME})
+
+    # Configure build properties
+    set_target_properties(${IMHEX_PLUGIN_NAME}
+            PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins
+            CXX_STANDARD 23
+            PREFIX ""
+            SUFFIX ".hexplug"
+    )
+
+    # 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})
+
+    # Add the new plugin to the main dependency list so it gets built by default
+    add_dependencies(imhex_all ${IMHEX_PLUGIN_NAME})
+endmacro()
+
+macro(add_romfs_resource input output)
+    configure_file(${input} ${CMAKE_CURRENT_BINARY_DIR}/romfs/${output} COPYONLY)
+
+    list(APPEND LIBROMFS_RESOURCE_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/romfs)
+endmacro()

cmake/modules/PostprocessBundle.cmake

@@ -15,13 +15,21 @@ if(CMAKE_GENERATOR)
 	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}"
+			COMMAND ${CMAKE_COMMAND} -DBUNDLE_PATH="$<TARGET_FILE_DIR:${in_target}>/../.."
+				-DCODE_SIGN_CERTIFICATE_ID="${CODE_SIGN_CERTIFICATE_ID}"
+				-DEXTRA_BUNDLE_LIBRARY_PATHS="${EXTRA_BUNDLE_LIBRARY_PATHS}"
 				-P "${_POSTPROCESS_BUNDLE_MODULE_LOCATION}"
 		)
 	endfunction()
 	return()
 endif()
 
+# 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}")
 
@@ -29,13 +37,13 @@ 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")
 
-message(STATUS "Fixing up application bundle: ${extra_dirs}")
 
 # 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")
+set(extra_dirs "/usr/local/lib" "/lib" "/usr/lib" ${EXTRA_BUNDLE_LIBRARY_PATHS})
+message(STATUS "Fixing up application bundle: ${extra_dirs}")
 
 # BundleUtilities is overly verbose, so disable most of its messages
 function(message)

dist/AppImageBuilder.yml

@@ -20,7 +20,7 @@ AppDir:
     - 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://.archive.ubuntu.com/ubuntu/ jammy-backports main restricted
+    - 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
@@ -38,8 +38,6 @@ AppDir:
     - libtinfo6:amd64
   files:
     include:
-    - /lib/x86_64-linux-gnu/libGLX.so.0
-    - /lib/x86_64-linux-gnu/libGLdispatch.so.0
     - /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
@@ -64,6 +62,7 @@ AppDir:
     - /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
@@ -76,7 +75,6 @@ AppDir:
     - /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/libglapi.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

dist/Arch/PKGBUILD

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

dist/Brewfile

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

dist/Dockerfile

@@ -14,6 +14,7 @@ RUN pacman -S --needed --noconfirm      \
     file                                \
     mbedtls                             \
     freetype2                           \
+    curl                                \
     dbus                                \
     xdg-desktop-portal
 

dist/appimage/Dockerfile

@@ -0,0 +1,85 @@
+FROM ubuntu:22.04 as build
+
+# Used to invalidate layer cache but not mount cache
+# See https://github.com/moby/moby/issues/41715#issuecomment-733976493
+ARG UNIQUEKEY 1
+
+COPY dist/get_deps_debian.sh /tmp
+RUN --mount=type=cache,target=/var/apt/cache <<EOF
+# Install apt dependencies
+set -xe
+
+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 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
+COPY . /imhex
+
+ARG LTO=ON
+ARG BUILD_TYPE=RelWithDebInfo
+ARG GIT_COMMIT_HASH
+ARG GIT_BRANCH
+WORKDIR /build
+SHELL ["bash", "-c"] # Ubuntu sh doesnt support string substitution
+RUN <<EOF
+# Prepare ImHex build
+set -xe
+
+CC=gcc-12 CXX=g++-12 cmake -G "Ninja"                  \
+    -DCMAKE_BUILD_TYPE=${BUILD_TYPE}                   \
+    -DCMAKE_INSTALL_PREFIX="/usr"                      \
+    -DCMAKE_C_COMPILER_LAUNCHER=ccache                 \
+    -DCMAKE_CXX_COMPILER_LAUNCHER=ccache               \
+    -DIMHEX_PATTERNS_PULL_MASTER=ON                    \
+    -DIMHEX_COMMIT_HASH_SHORT="${GIT_COMMIT_HASH::7}"  \
+    -DIMHEX_COMMIT_HASH_LONG="${GIT_COMMIT_HASH}"      \
+    -DIMHEX_COMMIT_BRANCH="${GIT_BRANCH}"              \
+    -DIMHEX_ENABLE_LTO=${LTO}                          \
+    -DIMHEX_PLUGINS_IN_SHARE=ON                        \
+    /imhex
+EOF
+
+ENV CCACHE_DIR /cache/ccache
+RUN --mount=type=cache,target=/cache <<EOF
+# Build Imhex
+set -xe
+
+ccache -zs
+DESTDIR=AppDir ninja install
+ccache -s
+EOF
+
+RUN <<EOF
+# Package ImHex as AppImage
+set -xe
+
+export VERSION=$(cat /imhex/VERSION)
+appimage-builder --recipe /imhex/dist/AppImageBuilder.yml
+EOF
+
+FROM scratch
+
+# Copy build artifact
+COPY --from=build /build/*.AppImage /build/*.AppImage.zsync ./

dist/compiling/docker.md

@@ -0,0 +1,48 @@
+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             |
+|--------------|-----------------------------|
+| MacOS M1     | dist/macOS/arm64.Dockerfile |
+| AppImage     | dist/appimage/Dockerfile    |
+| Web version  | dist/web/Dockerfile         |
+
+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 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)

dist/compiling/macos.md

@@ -1,6 +1,6 @@
 ### Compiling ImHex on macOS
 
-On macOS, ImHex is built through regular GCC and AppleClang.
+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`
@@ -17,8 +17,7 @@ PKG_CONFIG_PATH="$(brew --prefix openssl)/lib/pkgconfig":"$(brew --prefix)/lib/p
 MACOSX_DEPLOYMENT_TARGET="10.15"          \
 cmake                                     \
   -DCMAKE_BUILD_TYPE=Release              \
-  -DCREATE_BUNDLE=ON                      \
-  -DCREATE_PACKAGE=ON                     \
+  -DIMHEX_GENERATE_PACKAGE=ON             \
   -DCMAKE_C_COMPILER_LAUNCHER=ccache      \
   -DCMAKE_CXX_COMPILER_LAUNCHER=ccache    \
   -DCMAKE_OBJC_COMPILER_LAUNCHER=ccache   \

dist/compiling/windows.md

@@ -7,22 +7,19 @@ On Windows, ImHex is built through [msys2 / mingw](https://www.msys2.org/)'s gcc
 3. Clone the repo using `git clone https://github.com/WerWolv/ImHex --recurse-submodules`
 4. Install all the dependencies using `./ImHex/dist/get_deps_msys2.sh`
 5. Build ImHex itself using the following commands:
+
 ```sh
 cd ImHex
 mkdir build
 cd build
-cmake -G "MinGW Makefiles"                \
+cmake -G "Ninja"                          \
   -DCMAKE_BUILD_TYPE=Release              \
   -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"        \
-  -DCMAKE_OBJC_COMPILER_LAUNCHER=ccache   \
-  -DCMAKE_OBJCXX_COMPILER_LAUNCHER=ccache \
-  -DRUST_PATH="$USERPROFILE/.cargo/bin/"  \
+  -DIMHEX_USE_DEFAULT_BUILD_SETTINGS=ON   \
   ..
-mingw32-make -j install
+ninja install
 ```
 
 ImHex will look for any extra resources either in various folders directly next to the executable or in `%localappdata%/imhex`
+
+For low RAM-usage system, you can use `mingw32-make -j N install` instead, to reduce RAM usage at compile time. Where `N` is amount of jobs you are willling to run at once. Roughly ~1 GB of RAM usage per job.

dist/get_deps_archlinux.sh

@@ -9,8 +9,9 @@ pacman -S $@ --needed \
   mbedtls   \
   freetype2 \
   dbus      \
-  xdg-desktop-portal \
+  gtk3      \
   curl      \
   fmt       \
   yara      \
-  nlohmann-json
+  nlohmann-json \
+  ninja

dist/get_deps_debian.sh

@@ -13,7 +13,6 @@ apt install -y \
   lld                   \
   ${PKGCONF:-}          \
   cmake                 \
-  make                  \
   ccache                \
   libglfw3-dev          \
   libglm-dev            \
@@ -21,4 +20,6 @@ apt install -y \
   libmbedtls-dev        \
   libfreetype-dev       \
   libdbus-1-dev         \
-  xdg-desktop-portal
+  libcurl4-gnutls-dev   \
+  libgtk-3-dev          \
+  ninja-build

dist/get_deps_fedora.sh

@@ -5,9 +5,11 @@ dnf install -y      \
   dbus-devel        \
   file-devel        \
   freetype-devel    \
+  libcurl-devel     \
   gcc-c++           \
   git               \
   mesa-libGL-devel  \
   glfw-devel        \
   lld               \
-  mbedtls-devel
+  mbedtls-devel     \
+  gtk3-devel

dist/get_deps_msys2.sh

@@ -4,10 +4,12 @@ pacman -S --needed --noconfirm  \
   mingw-w64-x86_64-gcc          \
   mingw-w64-x86_64-lld          \
   mingw-w64-x86_64-cmake        \
-  mingw-w64-x86_64-make         \
   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-dlfcn        \
+  mingw-w64-x86_64-ninja        \
+  mingw-w64-x86_64-capstone

dist/macOS/arm64.Dockerfile

@@ -0,0 +1,165 @@
+# This base image is also known as "crosscompile". See arm64.crosscompile.Dockerfile
+FROM ghcr.io/itrooz/macos-crosscompile:clang17-nosdk as build
+
+ENV MACOSX_DEPLOYMENT_TARGET 12.1
+
+# -- DOWNLOADING STUFF
+
+## Install make
+RUN --mount=type=cache,target=/var/lib/apt/lists/ apt update && apt install -y make
+
+## 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-darwin23-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/MacOSX14.0.sdk ]; then
+    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
+    mkdir -p /osxcross/target/SDK
+    tar -C /osxcross/target/SDK -xf /cache/MacOSX14.0.sdk.tar.xz
+fi
+EOF
+
+
+## Download libmagic
+### Clone libmagic
+RUN git clone https://github.com/file/file /mnt/file
+### Download libmagic dependencies
+RUN --mount=type=cache,target=/var/lib/apt/lists/ 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
+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-darwin23-clang CXX=/osxcross/target/bin/aarch64-apple-darwin23-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
+
+## 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-gcc CXX=o64-g++ 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=14.0 \
+        ..
+    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-darwin23-clang OBJCXX=/osxcross/target/bin/aarch64-apple-darwin23-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=14.0 \
+        `# Override compilers for code generators` \
+        -DNATIVE_CMAKE_C_COMPILER=/usr/bin/clang -DNATIVE_CMAKE_CXX_COMPILER=/usr/bin/clang++ \
+        `# Normal ImHex flags` \
+        -DIMHEX_GENERATE_PACKAGE=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+        `# other flags` \
+        -DIMHEX_STRICT_WARNINGS=OFF \
+        -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
+
+    ccache -s
+EOF
+
+
+FROM scratch
+COPY --from=build /mnt/ImHex/build/imhex.app imhex.app

dist/macOS/arm64.crosscompile.Dockerfile

@@ -0,0 +1,96 @@
+# This image is is provided for reference, but a (probably more up to date) image should be available at https://github.com/iTrooz/macos-crosscompile
+FROM ubuntu:22.04
+
+ENV PATH                $PATH:/osxcross/target/bin
+ENV LD_LIBRARY_PATH     /osxcross/target/lib
+ENV OSXCROSS_SDK        /osxcross/target/SDK/MacOSX14.0.sdk
+ENV OSXCROSS_TARGET     darwin23
+ENV OSXCROSS_TARGET_DIR /osxcross/target
+ENV OSXCROSS_HOST       aarch64-apple-darwin23
+
+# -- 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
+# Not needed, because we don't use gcc for cross-compiling anymore
+# ## Install dependencies for gcc-13
+# RUN apt install -y gcc g++ zlib1g-dev libmpc-dev libmpfr-dev libgmp-dev
+# ## Build cross-compiler gcc-13
+# RUN --mount=type=cache,target=/cache <<EOF
+#     set -xe
+#     ccache -zs
+
+#     cd /osxcross
+#     UNATTENDED=1 CC=/usr/lib/ccache/gcc CXX=/usr/lib/ccache/g++ GCC_VERSION=13.2.0 ./build_gcc.sh
+
+#     ccache -s
+# EOF
+
+ARG DELETE_SDK=1
+RUN <<EOF
+# 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/rpm/imhex.spec

@@ -26,6 +26,7 @@ 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
 %endif
@@ -60,7 +61,7 @@ same time ImHex is completely free and open source under the GPLv2 language.
 %prep
 %autosetup -n ImHex
 # remove bundled libs we aren't using
-rm -rf lib/external/{curl,fmt,llvm,nlohmann_json,yara}
+rm -rf lib/third_party/{fmt,nlohmann_json,yara}
 
 %build
 %if 0%{?rhel}
@@ -74,10 +75,10 @@ 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_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
@@ -108,11 +109,11 @@ rm -f %{buildroot}%{_metainfodir}/net.werwolv.%{name}.appdata.xml
 appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/net.werwolv.%{name}.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
+cp -a lib/third_party/nativefiledialog/LICENSE                       %{buildroot}%{_datadir}/licenses/%{name}/nativefiledialog-LICENSE
+cp -a lib/third_party/capstone/LICENSE.TXT                           %{buildroot}%{_datadir}/licenses/%{name}/capstone-LICENSE
+cp -a lib/third_party/capstone/suite/regress/LICENSE                 %{buildroot}%{_datadir}/licenses/%{name}/capstone-regress-LICENSE
+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

dist/web/Dockerfile

@@ -0,0 +1,89 @@
+FROM emscripten/emsdk:latest as build
+
+# Used to invalidate layer cache but not mount cache
+# See https://github.com/moby/moby/issues/41715#issuecomment-733976493
+ARG UNIQUEKEY 1
+
+RUN apt update
+RUN apt install -y git ccache autoconf automake libtool cmake pkg-config
+
+RUN <<EOF
+# Install vcpkg
+# Note: we are a patch on the libmagic port
+set -xe
+
+git clone https://github.com/microsoft/vcpkg /vcpkg
+/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
+
+# Patch vcpkg build instructions to add -pthread
+RUN <<EOF
+set -xe
+
+echo '
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+' >> /emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake
+EOF
+
+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/vcpkg install --triplet=wasm32-emscripten libmagic
+/vcpkg/vcpkg install --triplet=wasm32-emscripten freetype
+/vcpkg/vcpkg install --triplet=wasm32-emscripten mbedtls
+EOF
+
+# Build ImHex
+ARG JOBS=4
+ENV CCACHE_DIR /cache/ccache
+
+RUN mkdir /build
+WORKDIR /build
+RUN --mount=type=cache,target=/cache \
+    --mount=type=bind,source=.,target=/imhex <<EOF
+
+set -xe
+ccache -zs
+
+cmake /imhex                                                                                            \
+    -DIMHEX_OFFLINE_BUILD=ON                                                                            \
+    -DIMHEX_STATIC_LINK_PLUGINS=ON                                                                      \
+    -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 \
+    -DCMAKE_BUILD_TYPE=Release
+
+make -j $JOBS
+
+cp /imhex/dist/web/source/* /build
+ccache -s
+EOF
+
+FROM scratch
+COPY --from=build [             \
+    # ImHex                     \
+    "/build/imhex.wasm",        \
+    "/build/imhex.js",          \
+    "/build/imhex.worker.js",   \
+                                \
+    # Static files              \
+    "/build/index.html",        \
+    "/build/style.css",         \
+    "/build/wasm-config.js",    \
+    "/build/enable-threads.js", \
+    "/build/favicon.ico",       \
+    "/build/icon.png",          \
+    "/build/manifest.json",     \
+                                \
+    # Destination               \
+    "./"                        \
+]

dist/web/plugin-bundle.cpp.in

@@ -0,0 +1,11 @@
+#include <hex/helpers/logger.hpp>
+
+extern "C" void forceLinkPlugin_@IMHEX_PLUGIN_NAME@();
+
+struct StaticLoad {
+    StaticLoad() {
+        forceLinkPlugin_@IMHEX_PLUGIN_NAME@();
+    }
+};
+
+static StaticLoad staticLoad;

dist/web/serve.py

@@ -0,0 +1,15 @@
+import http.server
+import os
+
+class MyHttpRequestHandler(http.server.SimpleHTTPRequestHandler):
+
+    def end_headers(self):
+        self.send_header("Cross-Origin-Embedder-Policy", "require-corp")
+        self.send_header("Cross-Origin-Opener-Policy", "same-origin")
+        http.server.SimpleHTTPRequestHandler.end_headers(self)
+
+if __name__ == '__main__':
+    os.chdir(".")
+    httpd = http.server.HTTPServer(("localhost", 9090), MyHttpRequestHandler)
+    print(f"Serving {os.getcwd()} on http://{httpd.server_address[0]}:{httpd.server_address[1]}")
+    httpd.serve_forever()

dist/web/source/enable-threads.js

@@ -0,0 +1,79 @@
+// NOTE: This file creates a service worker that cross-origin-isolates the page (read more here: https://web.dev/coop-coep/) which allows us to use wasm threads.
+// Normally you would set the COOP and COEP headers on the server to do this, but Github Pages doesn't allow this, so this is a hack to do that.
+
+/* Edited version of: coi-serviceworker v0.1.6 - Guido Zuidhof, licensed under MIT */
+// From here: https://github.com/gzuidhof/coi-serviceworker
+if(typeof window === 'undefined') {
+    self.addEventListener("install", () => self.skipWaiting());
+    self.addEventListener("activate", e => e.waitUntil(self.clients.claim()));
+
+    async function handleFetch(request) {
+        if(request.cache === "only-if-cached" && request.mode !== "same-origin") {
+            return;
+        }
+
+        if(request.mode === "no-cors") { // We need to set `credentials` to "omit" for no-cors requests, per this comment: https://bugs.chromium.org/p/chromium/issues/detail?id=1309901#c7
+            request = new Request(request.url, {
+                cache: request.cache,
+                credentials: "omit",
+                headers: request.headers,
+                integrity: request.integrity,
+                destination: request.destination,
+                keepalive: request.keepalive,
+                method: request.method,
+                mode: request.mode,
+                redirect: request.redirect,
+                referrer: request.referrer,
+                referrerPolicy: request.referrerPolicy,
+                signal: request.signal,
+            });
+        }
+
+        let r = await fetch(request).catch(e => console.error(e));
+
+        if(r.status === 0) {
+            return r;
+        }
+
+        const headers = new Headers(r.headers);
+        headers.set("Cross-Origin-Embedder-Policy", "require-corp"); // or: require-corp
+        headers.set("Cross-Origin-Opener-Policy", "same-origin");
+
+        return new Response(r.body, { status: r.status, statusText: r.statusText, headers });
+    }
+
+    self.addEventListener("fetch", function(e) {
+        e.respondWith(handleFetch(e.request)); // respondWith must be executed synchonously (but can be passed a Promise)
+    });
+
+} else {
+    (async function() {
+        if(window.crossOriginIsolated !== false) return;
+
+        if (!('serviceWorker' in navigator)) {
+            alert("Your browser doesn't support service workers.\nIf you're using Firefox, you need to not be in a private window.")
+        }
+
+        let registration = await navigator.serviceWorker.register(window.document.currentScript.src).catch(e => console.error("COOP/COEP Service Worker failed to register:", e));
+        if(registration) {
+            console.log("COOP/COEP Service Worker registered", registration.scope);
+
+            registration.addEventListener("updatefound", () => {
+                console.log("Reloading page to make use of updated COOP/COEP Service Worker.");
+                window.location.reload();
+            });
+
+            // If the registration is active, but it's not controlling the page
+            if(registration.active && !navigator.serviceWorker.controller) {
+                console.log("Reloading page to make use of COOP/COEP Service Worker.");
+                window.location.reload();
+            }
+        }
+    })();
+}
+
+// Code to deregister:
+// let registrations = await navigator.serviceWorker.getRegistrations();
+// for(let registration of registrations) {
+//   await registration.unregister();
+// }

dist/web/source/index.html

@@ -0,0 +1,74 @@
+<!doctype html>
+<html lang="en-us">
+<head>
+    <link rel="manifest" href="manifest.json" />
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+
+    <!-- Primary Meta Tags -->
+    <title>ImHex Web - Online Hex Editor</title>
+    <meta name="title" content="ImHex">
+    <meta name="description" content="A Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM.">
+    <link rel="icon" type="image/x-icon" href="favicon.ico">
+
+    <!-- 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 -->
+    <meta property="twitter:card" content="summary_large_image">
+    <meta property="twitter:url" content="https://imhex.werwolv.net/">
+    <meta property="twitter:title" content="ImHex Web - Online Hex Editor">
+    <meta property="twitter:description"
+          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" />
+
+    <script type="application/ld+json">
+        {
+            "@context": "https://schema.org",
+            "@type": "Organization",
+            "alumni": "WerWolv",
+            "email": "hey@werwolv.net",
+            "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"
+        }
+    </script>
+
+    <script type="application/ld+json">
+        {
+            "@context": "https://schema.org",
+            "@type": "SoftwareApplication",
+            "name": "ImHex Web",
+            "operatingSystem": "Windows, MacOS, Linux",
+            "applicationCategory": "DeveloperApplication",
+            "offers": {
+                "@type": "Offer",
+                "price": "0",
+                "priceCurrency": "USD"
+            }
+        }
+    </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>
+
+    <script type="text/javascript" src="wasm-config.js"></script>
+    <script async type="text/javascript" src="imhex.js"></script>
+</body>
+</html>

dist/web/source/manifest.json

@@ -0,0 +1,20 @@
+{
+    "name": "ImHex",
+    "description": "🔍 A Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM.",
+    "background_color": "#0F0F0F",
+    "theme_color": "#0F0F0F",
+    "categories": [
+        "education",
+        "productivity",
+        "utilities"
+    ],
+    "icons": [
+        {
+            "src": "icon.png",
+            "type": "image/png",
+            "sizes": "640x640"
+        }
+    ],
+    "start_url": ".",
+    "display": "standalone"
+}

dist/web/source/style.css

@@ -0,0 +1,36 @@
+html, body {
+    height: 100%;
+    margin: 0px;
+    user-select: none;
+}
+
+body {
+    display: flex;
+    align-items: center;
+    background-color: #121212;
+    overflow: hidden;
+}
+
+.emscripten {
+    padding-right: 0;
+    margin-left: auto;
+    margin-right: auto;
+    display: none;
+    border: 0px none;
+}
+
+.canvas_full_screen {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+}
+
+#loading_text {
+    color: #F0F0F0;
+    font-size: 30px;
+    font-family: monospace;
+    width: 100%;
+    text-align: center;
+}

dist/web/source/wasm-config.js

@@ -0,0 +1,70 @@
+function glfwSetCursorCustom(wnd, shape) {
+    let body = document.getElementsByTagName("body")[0]
+    switch (shape) {
+        case 0x00036001: // GLFW_ARROW_CURSOR
+            body.style.cursor = "default";
+            break;
+        case 0x00036002: // GLFW_IBEAM_CURSOR
+            body.style.cursor = "text";
+            break;
+        case 0x00036003: // GLFW_CROSSHAIR_CURSOR
+            body.style.cursor = "crosshair";
+            break;
+        case 0x00036004: // GLFW_HAND_CURSOR
+            body.style.cursor = "pointer";
+            break;
+        case 0x00036005: // GLFW_HRESIZE_CURSOR
+            body.style.cursor = "ew-resize";
+            break;
+        case 0x00036006: // GLFW_VRESIZE_CURSOR
+            body.style.cursor = "ns-resize";
+            break;
+        default:
+            body.style.cursor = "default";
+            break;
+    }
+
+}
+
+function glfwCreateStandardCursorCustom(shape) {
+    return shape
+}
+
+var Module = {
+    preRun:  [],
+    postRun: [],
+    onRuntimeInitialized: function() {
+        // Triggered when the wasm module is loaded and ready to use.
+        document.getElementById("loading_text").style.display = "none"
+        document.getElementById("canvas").style.display = "initial"
+    },
+    print:   (function() { })(),
+    printErr: function(text) { },
+    canvas: (function() {
+        let canvas = document.getElementById('canvas');
+        // As a default initial behavior, pop up an alert when webgl context is lost. To make your
+        // application robust, you may want to override this behavior before shipping!
+        // See http://www.khronos.org/registry/webgl/specs/latest/1.0/#5.15.2
+        canvas.addEventListener("webglcontextlost", function(e) { alert('WebGL context lost. You will need to reload the page.'); e.preventDefault(); }, false);
+
+        return canvas;
+    })(),
+    setStatus: function(text) { },
+    totalDependencies: 0,
+    monitorRunDependencies: function(left) { },
+    instantiateWasm: function(imports, successCallback) {
+        imports.env.glfwSetCursor = glfwSetCursorCustom
+        imports.env.glfwCreateStandardCursor = glfwCreateStandardCursorCustom
+        instantiateAsync(wasmBinary, wasmBinaryFile, imports, (result) => successCallback(result.instance, result.module));
+    }
+};
+
+
+window.addEventListener('resize', js_resizeCanvas, false);
+function js_resizeCanvas() {
+    let canvas = document.getElementById('canvas');
+    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")
+}

lib/external/imgui/CMakeLists.txt

@@ -1,41 +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_options(imgui PRIVATE -Wno-stringop-overflow)
-
-target_compile_definitions(imgui PUBLIC IMGUI_USER_CONFIG="imgui_config.h")
-
-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/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/llvm-demangle/include/llvm/Demangle/StringView.h

@@ -1,122 +0,0 @@
-//===--- StringView.h ----------------*- mode:c++;eval:(read-only-mode) -*-===//
-//       Do not edit! See README.txt.
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// FIXME: Use std::string_view instead when we support C++17.
-// There are two copies of this file in the source tree.  The one under
-// libcxxabi is the original and the one under llvm is the copy.  Use
-// cp-to-llvm.sh to update the copy.  See README.txt for more details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_DEMANGLE_STRINGVIEW_H
-#define LLVM_DEMANGLE_STRINGVIEW_H
-
-#include "DemangleConfig.h"
-#include <cassert>
-#include <cstring>
-
-DEMANGLE_NAMESPACE_BEGIN
-
-class StringView {
-  const char *First;
-  const char *Last;
-
-public:
-  static const size_t npos = ~size_t(0);
-
-  template <size_t N>
-  StringView(const char (&Str)[N]) : First(Str), Last(Str + N - 1) {}
-  StringView(const char *First_, const char *Last_)
-      : First(First_), Last(Last_) {}
-  StringView(const char *First_, size_t Len)
-      : First(First_), Last(First_ + Len) {}
-  StringView(const char *Str) : First(Str), Last(Str + std::strlen(Str)) {}
-  StringView() : First(nullptr), Last(nullptr) {}
-
-  StringView substr(size_t Pos, size_t Len = npos) const {
-    assert(Pos <= size());
-    if (Len > size() - Pos)
-      Len = size() - Pos;
-    return StringView(begin() + Pos, Len);
-  }
-
-  size_t find(char C, size_t From = 0) const {
-    // Avoid calling memchr with nullptr.
-    if (From < size()) {
-      // Just forward to memchr, which is faster than a hand-rolled loop.
-      if (const void *P = ::memchr(First + From, C, size() - From))
-        return size_t(static_cast<const char *>(P) - First);
-    }
-    return npos;
-  }
-
-  StringView dropFront(size_t N = 1) const {
-    if (N >= size())
-      N = size();
-    return StringView(First + N, Last);
-  }
-
-  StringView dropBack(size_t N = 1) const {
-    if (N >= size())
-      N = size();
-    return StringView(First, Last - N);
-  }
-
-  char front() const {
-    assert(!empty());
-    return *begin();
-  }
-
-  char back() const {
-    assert(!empty());
-    return *(end() - 1);
-  }
-
-  char popFront() {
-    assert(!empty());
-    return *First++;
-  }
-
-  bool consumeFront(char C) {
-    if (!startsWith(C))
-      return false;
-    *this = dropFront(1);
-    return true;
-  }
-
-  bool consumeFront(StringView S) {
-    if (!startsWith(S))
-      return false;
-    *this = dropFront(S.size());
-    return true;
-  }
-
-  bool startsWith(char C) const { return !empty() && *begin() == C; }
-
-  bool startsWith(StringView Str) const {
-    if (Str.size() > size())
-      return false;
-    return std::strncmp(Str.begin(), begin(), Str.size()) == 0;
-  }
-
-  const char &operator[](size_t Idx) const { return *(begin() + Idx); }
-
-  const char *begin() const { return First; }
-  const char *end() const { return Last; }
-  size_t size() const { return static_cast<size_t>(Last - First); }
-  bool empty() const { return First == Last; }
-};
-
-inline bool operator==(const StringView &LHS, const StringView &RHS) {
-  return LHS.size() == RHS.size() &&
-         std::strncmp(LHS.begin(), RHS.begin(), LHS.size()) == 0;
-}
-
-DEMANGLE_NAMESPACE_END
-
-#endif

lib/external/nlohmann_json/include/nlohmann/json_fwd.hpp

@@ -1,78 +0,0 @@
-#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
-#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
-
-#include <cstdint> // int64_t, uint64_t
-#include <map> // map
-#include <memory> // allocator
-#include <string> // string
-#include <vector> // vector
-
-/*!
-@brief namespace for Niels Lohmann
-@see https://github.com/nlohmann
-@since version 1.0.0
-*/
-namespace nlohmann
-{
-/*!
-@brief default JSONSerializer template argument
-
-This serializer ignores the template arguments and uses ADL
-([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
-for serialization.
-*/
-template<typename T = void, typename SFINAE = void>
-struct adl_serializer;
-
-template<template<typename U, typename V, typename... Args> class ObjectType =
-         std::map,
-         template<typename U, typename... Args> class ArrayType = std::vector,
-         class StringType = std::string, class BooleanType = bool,
-         class NumberIntegerType = std::int64_t,
-         class NumberUnsignedType = std::uint64_t,
-         class NumberFloatType = double,
-         template<typename U> class AllocatorType = std::allocator,
-         template<typename T, typename SFINAE = void> class JSONSerializer =
-         adl_serializer,
-         class BinaryType = std::vector<std::uint8_t>>
-class basic_json;
-
-/*!
-@brief JSON Pointer
-
-A JSON pointer defines a string syntax for identifying a specific value
-within a JSON document. It can be used with functions `at` and
-`operator[]`. Furthermore, JSON pointers are the base for JSON patches.
-
-@sa [RFC 6901](https://tools.ietf.org/html/rfc6901)
-
-@since version 2.0.0
-*/
-template<typename BasicJsonType>
-class json_pointer;
-
-/*!
-@brief default JSON class
-
-This type is the default specialization of the @ref basic_json class which
-uses the standard template types.
-
-@since version 1.0.0
-*/
-using json = basic_json<>;
-
-template<class Key, class T, class IgnoredLess, class Allocator>
-struct ordered_map;
-
-/*!
-@brief ordered JSON class
-
-This type preserves the insertion order of object keys.
-
-@since version 3.9.0
-*/
-using ordered_json = basic_json<nlohmann::ordered_map>;
-
-}  // namespace nlohmann
-
-#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_

lib/libimhex/CMakeLists.txt

@@ -5,38 +5,46 @@ set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_SHARED_LIBRARY_PREFIX "")
 
 set(LIBIMHEX_SOURCES
-        source/api/event.cpp
         source/api/imhex_api.cpp
         source/api/content_registry.cpp
-        source/api/task.cpp
-        source/api/keybinding.cpp
+        source/api/event_manager.cpp
+        source/api/task_manager.cpp
+        source/api/shortcut_manager.cpp
         source/api/plugin_manager.cpp
-        source/api/localization.cpp
         source/api/project_file_manager.cpp
         source/api/theme_manager.cpp
         source/api/layout_manager.cpp
+        source/api/achievement_manager.cpp
+        source/api/localization_manager.cpp
 
         source/data_processor/attribute.cpp
         source/data_processor/link.cpp
         source/data_processor/node.cpp
 
         source/helpers/utils.cpp
+        source/helpers/utils_linux.cpp
         source/helpers/fs.cpp
         source/helpers/magic.cpp
         source/helpers/crypto.cpp
         source/helpers/http_requests.cpp
+        source/helpers/http_requests_native.cpp
+        source/helpers/http_requests_emscripten.cpp
         source/helpers/opengl.cpp
         source/helpers/patches.cpp
         source/helpers/encoding_file.cpp
         source/helpers/logger.cpp
         source/helpers/stacktrace.cpp
         source/helpers/tar.cpp
+        source/helpers/debugging.cpp
 
         source/providers/provider.cpp
+        source/providers/undo/stack.cpp
 
         source/ui/imgui_imhex_extensions.cpp
         source/ui/view.cpp
         source/ui/popup.cpp
+
+        source/subcommands/subcommands.cpp
 )
 
 if (APPLE)
@@ -54,15 +62,31 @@ endif ()
 
 add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
 
-add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+if (IMHEX_STATIC_LINK_PLUGINS)
+    add_library(libimhex STATIC ${LIBIMHEX_SOURCES})
+else()
+    add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+endif()
+
 set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+enableUnityBuild(libimhex)
 setupCompilerFlags(libimhex)
 
+include(GenerateExportHeader)
+generate_export_header(libimhex)
 
-target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS} ${LIBBACKTRACE_INCLUDE_DIRS})
+target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIR} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS} ${LIBBACKTRACE_INCLUDE_DIRS})
 target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
 
+if (NOT EMSCRIPTEN)
+    # curl is only used in non-emscripten builds
+    target_include_directories(libimhex PUBLIC  ${CURL_INCLUDE_DIRS})
+    target_link_libraries(libimhex PUBLIC ${LIBCURL_LIBRARIES})
+endif()
+
+
 if (WIN32)
+    set_target_properties(libimhex PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
     target_link_options(libimhex PRIVATE -Wl,--export-all-symbols)
 elseif (APPLE)
     find_library(FOUNDATION NAMES Foundation)
@@ -70,4 +94,48 @@ elseif (APPLE)
 endif ()
 
 target_link_libraries(libimhex PRIVATE ${FMT_LIBRARIES})
-target_link_libraries(libimhex PUBLIC dl imgui ${NFD_LIBRARIES} magic ${CAPSTONE_LIBRARIES} LLVMDemangle microtar ${NLOHMANN_JSON_LIBRARIES} ${YARA_LIBRARIES} ${LIBCURL_LIBRARIES} ${MBEDTLS_LIBRARIES} ${LIBBACKTRACE_LIBRARIES} libpl libpl-gen ${MINIAUDIO_LIBRARIES} libwolv-utils libwolv-io libwolv-hash libwolv-net libwolv-containers)
+target_link_libraries(libimhex PUBLIC dl ${IMGUI_LIBRARIES} ${NFD_LIBRARIES} magic ${CAPSTONE_LIBRARIES} LLVMDemangle microtar ${NLOHMANN_JSON_LIBRARIES} ${YARA_LIBRARIES} ${MBEDTLS_LIBRARIES} ${LIBBACKTRACE_LIBRARIES} plcli libpl libpl-gen ${MINIAUDIO_LIBRARIES} ${JTHREAD_LIBRARIES} wolv::utils wolv::io wolv::hash wolv::net wolv::containers wolv::math_eval)
+
+set_property(TARGET libimhex PROPERTY INTERPROCEDURAL_OPTIMIZATION FALSE)
+
+if (DEFINED IMHEX_COMMIT_HASH_LONG AND DEFINED IMHEX_COMMIT_HASH_SHORT AND DEFINED IMHEX_COMMIT_BRANCH)
+    set(GIT_COMMIT_HASH_LONG "${IMHEX_COMMIT_HASH_LONG}")
+    set(GIT_COMMIT_HASH_SHORT "${IMHEX_COMMIT_HASH_SHORT}")
+    set(GIT_BRANCH "${IMHEX_COMMIT_BRANCH}")
+else()
+    # Get the current working branch
+    execute_process(
+            COMMAND git rev-parse --abbrev-ref HEAD
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+            OUTPUT_VARIABLE GIT_BRANCH
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+            RESULT_VARIABLE RESULT_BRANCH
+    )
+
+    # Get the latest abbreviated commit hash of the working branch
+    execute_process(
+            COMMAND git log -1 --format=%h --abbrev=7
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+            OUTPUT_VARIABLE GIT_COMMIT_HASH_SHORT
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+            RESULT_VARIABLE RESULT_HASH_SHORT
+    )
+
+    execute_process(
+            COMMAND git log -1 --format=%H
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+            OUTPUT_VARIABLE GIT_COMMIT_HASH_LONG
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+            RESULT_VARIABLE RESULT_HASH_LONG
+    )
+endif ()
+
+if ((NOT GIT_COMMIT_HASH_SHORT STREQUAL "") AND (NOT GIT_COMMIT_HASH_LONG STREQUAL "") AND (NOT GIT_BRANCH STREQUAL ""))
+    addDefineToSource(source/api/imhex_api.cpp "GIT_COMMIT_HASH_SHORT=\"${GIT_COMMIT_HASH_SHORT}\"")
+    addDefineToSource(source/api/imhex_api.cpp "GIT_COMMIT_HASH_LONG=\"${GIT_COMMIT_HASH_LONG}\"")
+    addDefineToSource(source/api/imhex_api.cpp "GIT_BRANCH=\"${GIT_BRANCH}\"")
+endif ()
+
+addDefineToSource(source/api/imhex_api.cpp "IMHEX_VERSION=\"${IMHEX_VERSION_STRING}\"")
+
+add_dependencies(imhex_all libimhex)

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

@@ -0,0 +1,420 @@
+#pragma once
+
+#include <hex.hpp>
+
+#include <functional>
+#include <list>
+#include <memory>
+#include <span>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+#include <imgui.h>
+#include <hex/ui/imgui_imhex_extensions.h>
+
+namespace hex {
+
+    class AchievementManager;
+
+    class Achievement {
+    public:
+        explicit Achievement(std::string unlocalizedCategory, std::string unlocalizedName) : m_unlocalizedCategory(std::move(unlocalizedCategory)), m_unlocalizedName(std::move(unlocalizedName)) { }
+
+        /**
+         * @brief Returns the unlocalized name of the achievement
+         * @return Unlocalized name of the achievement
+         */
+        [[nodiscard]] const std::string &getUnlocalizedName() const {
+            return this->m_unlocalizedName;
+        }
+
+        /**
+         * @brief Returns the unlocalized category of the achievement
+         * @return Unlocalized category of the achievement
+         */
+        [[nodiscard]] const std::string &getUnlocalizedCategory() const {
+            return this->m_unlocalizedCategory;
+        }
+
+        /**
+         * @brief Returns whether the achievement is unlocked
+         * @return Whether the achievement is unlocked
+         */
+        [[nodiscard]] bool isUnlocked() const {
+            return this->m_progress == this->m_maxProgress;
+        }
+
+        /**
+         * @brief Sets the description of the achievement
+         * @param description Description of the achievement
+         * @return Reference to the achievement
+         */
+        Achievement& setDescription(std::string description) {
+            this->m_unlocalizedDescription = std::move(description);
+
+            return *this;
+        }
+
+        /**
+         * @brief Adds a requirement to the achievement. The achievement will only be unlockable if all requirements are unlocked.
+         * @param requirement Unlocalized name of the requirement
+         * @return Reference to the achievement
+         */
+        Achievement& addRequirement(std::string requirement) {
+            this->m_requirements.emplace_back(std::move(requirement));
+
+            return *this;
+        }
+
+        /**
+         * @brief Adds a visibility requirement to the achievement. The achievement will only be visible if all requirements are unlocked.
+         * @param requirement Unlocalized name of the requirement
+         * @return Reference to the achievement
+         */
+        Achievement& addVisibilityRequirement(std::string requirement) {
+            this->m_visibilityRequirements.emplace_back(std::move(requirement));
+
+            return *this;
+        }
+
+        /**
+         * @brief Marks the achievement as blacked. Blacked achievements are visible but their name and description are hidden.
+         * @return Reference to the achievement
+         */
+        Achievement& setBlacked() {
+            this->m_blacked = true;
+
+            return *this;
+        }
+
+        /**
+         * @brief Marks the achievement as invisible. Invisible achievements are not visible at all.
+         * @return Reference to the achievement
+         */
+        Achievement& setInvisible() {
+            this->m_invisible = true;
+
+            return *this;
+        }
+
+        /**
+         * @brief Returns whether the achievement is blacked
+         * @return Whether the achievement is blacked
+         */
+        [[nodiscard]] bool isBlacked() const {
+            return this->m_blacked;
+        }
+
+        /**
+         * @brief Returns whether the achievement is invisible
+         * @return Whether the achievement is invisible
+         */
+        [[nodiscard]] bool isInvisible() const {
+            return this->m_invisible;
+        }
+
+        /**
+         * @brief Returns the list of requirements of the achievement
+         * @return List of requirements of the achievement
+         */
+        [[nodiscard]] const std::vector<std::string> &getRequirements() const {
+            return this->m_requirements;
+        }
+
+        /**
+         * @brief Returns the list of visibility requirements of the achievement
+         * @return List of visibility requirements of the achievement
+         */
+        [[nodiscard]] const std::vector<std::string> &getVisibilityRequirements() const {
+            return this->m_visibilityRequirements;
+        }
+
+        /**
+         * @brief Returns the unlocalized description of the achievement
+         * @return Unlocalized description of the achievement
+         */
+        [[nodiscard]] const std::string &getUnlocalizedDescription() const {
+            return this->m_unlocalizedDescription;
+        }
+
+        /**
+         * @brief Returns the icon of the achievement
+         * @return Icon of the achievement
+         */
+        [[nodiscard]] const ImGuiExt::Texture &getIcon() const {
+            if (this->m_iconData.empty())
+                return this->m_icon;
+
+            if (this->m_icon.isValid())
+                return m_icon;
+
+            this->m_icon = ImGuiExt::Texture(this->m_iconData.data(), this->m_iconData.size());
+
+            return this->m_icon;
+        }
+
+        /**
+         * @brief Sets the icon of the achievement
+         * @param data Icon data
+         * @return Reference to the achievement
+         */
+        Achievement& setIcon(std::span<const std::byte> data) {
+            this->m_iconData.reserve(data.size());
+            for (auto &byte : data)
+                this->m_iconData.emplace_back(static_cast<u8>(byte));
+
+            return *this;
+        }
+
+        /**
+         * @brief Sets the icon of the achievement
+         * @param data Icon data
+         * @return Reference to the achievement
+         */
+        Achievement& setIcon(std::span<const u8> data) {
+            this->m_iconData.assign(data.begin(), data.end());
+
+            return *this;
+        }
+
+        /**
+         * @brief Sets the icon of the achievement
+         * @param data Icon data
+         * @return Reference to the achievement
+         */
+        Achievement& setIcon(std::vector<u8> data) {
+            this->m_iconData = std::move(data);
+
+            return *this;
+        }
+
+        /**
+         * @brief Sets the icon of the achievement
+         * @param data Icon data
+         * @return Reference to the achievement
+         */
+        Achievement& setIcon(const std::vector<std::byte> &data) {
+            this->m_iconData.reserve(data.size());
+            for (auto &byte : data)
+                this->m_iconData.emplace_back(static_cast<u8>(byte));
+
+            return *this;
+        }
+
+        /**
+         * @brief Specifies the required progress to unlock the achievement. This is the number of times this achievement has to be triggered to unlock it. The default is 1.
+         * @param progress Required progress
+         * @return Reference to the achievement
+         */
+        Achievement& setRequiredProgress(u32 progress) {
+            this->m_maxProgress = progress;
+
+            return *this;
+        }
+
+        /**
+         * @brief Returns the required progress to unlock the achievement
+         * @return Required progress to unlock the achievement
+         */
+        [[nodiscard]] u32 getRequiredProgress() const {
+            return this->m_maxProgress;
+        }
+
+        /**
+         * @brief Returns the current progress of the achievement
+         * @return Current progress of the achievement
+         */
+        [[nodiscard]] u32 getProgress() const {
+            return this->m_progress;
+        }
+
+        /**
+         * @brief Sets the callback to call when the achievement is clicked
+         * @param callback Callback to call when the achievement is clicked
+         */
+        void setClickCallback(const std::function<void(Achievement &)> &callback) {
+            this->m_clickCallback = callback;
+        }
+
+        /**
+         * @brief Returns the callback to call when the achievement is clicked
+         * @return Callback to call when the achievement is clicked
+         */
+        [[nodiscard]] const std::function<void(Achievement &)> &getClickCallback() const {
+            return this->m_clickCallback;
+        }
+
+        /**
+         * @brief Returns whether the achievement is temporary. Temporary achievements have been added by challenge projects for example and will be removed when the project is closed.
+         * @return Whether the achievement is temporary
+         */
+        [[nodiscard]] bool isTemporary() const {
+            return this->m_temporary;
+        }
+
+        /**
+         * @brief Sets whether the achievement is unlocked
+         * @param unlocked Whether the achievement is unlocked
+         */
+        void setUnlocked(bool unlocked) {
+            if (unlocked) {
+                if (this->m_progress < this->m_maxProgress)
+                    this->m_progress++;
+            } else {
+                this->m_progress = 0;
+            }
+        }
+
+    protected:
+        void setProgress(u32 progress) {
+            this->m_progress = progress;
+        }
+
+    private:
+        std::string m_unlocalizedCategory, m_unlocalizedName;
+        std::string m_unlocalizedDescription;
+
+        bool m_blacked = false;
+        bool m_invisible = false;
+        std::vector<std::string> m_requirements, m_visibilityRequirements;
+
+        std::function<void(Achievement &)> m_clickCallback;
+
+        std::vector<u8> m_iconData;
+        mutable ImGuiExt::Texture m_icon;
+
+        u32 m_progress = 0;
+        u32 m_maxProgress = 1;
+
+        bool m_temporary = false;
+
+        friend class AchievementManager;
+    };
+
+    class AchievementManager {
+    public:
+        AchievementManager() = delete;
+
+        struct AchievementNode {
+            Achievement *achievement;
+            std::vector<AchievementNode*> children, parents;
+            std::vector<AchievementNode*> visibilityParents;
+            ImVec2 position;
+
+            [[nodiscard]] bool hasParents() const {
+                return !this->parents.empty();
+            }
+
+            [[nodiscard]] bool isUnlockable() const {
+                return std::all_of(this->parents.begin(), this->parents.end(), [](auto &parent) { return parent->achievement->isUnlocked(); });
+            }
+
+            [[nodiscard]] bool isVisible() const {
+                return std::all_of(this->visibilityParents.begin(), this->visibilityParents.end(), [](auto &parent) { return parent->achievement->isUnlocked(); });
+            }
+
+            [[nodiscard]] bool isUnlocked() const {
+                return this->achievement->isUnlocked();
+            }
+        };
+
+        /**
+         * @brief Adds a new achievement
+         * @tparam T Type of the achievement
+         * @param args Arguments to pass to the constructor of the achievement
+         * @return Reference to the achievement
+         */
+        template<std::derived_from<Achievement> T = Achievement>
+        static Achievement& addAchievement(auto && ... args) {
+            auto newAchievement = std::make_unique<T>(std::forward<decltype(args)>(args)...);
+
+            const auto &category = newAchievement->getUnlocalizedCategory();
+            const auto &name = newAchievement->getUnlocalizedName();
+
+            auto [categoryIter, categoryInserted] = getAchievements().insert({ category, std::unordered_map<std::string, std::unique_ptr<Achievement>>{} });
+            auto &[categoryKey, achievements] = *categoryIter;
+
+            auto [achievementIter, achievementInserted] = achievements.insert({ name, std::move(newAchievement) });
+            auto &[achievementKey, achievement] = *achievementIter;
+
+            achievementAdded();
+
+            return *achievement;
+        }
+
+        /**
+         * @brief Adds a new temporary achievement
+         * @tparam T Type of the achievement
+         * @param args Arguments to pass to the constructor of the achievement
+         * @return Reference to the achievement
+         */
+        template<std::derived_from<Achievement> T = Achievement>
+        static Achievement& addTemporaryAchievement(auto && ... args) {
+            auto &achievement = addAchievement<T>(std::forward<decltype(args)>(args)...);
+
+            achievement.m_temporary = true;
+
+            return achievement;
+        }
+
+        /**
+         * @brief Unlocks an achievement
+         * @param unlocalizedCategory Unlocalized category of the achievement
+         * @param unlocalizedName Unlocalized name of the achievement
+         */
+        static void unlockAchievement(const std::string &unlocalizedCategory, const std::string &unlocalizedName);
+
+        /**
+         * @brief Returns all registered achievements
+         * @return All achievements
+         */
+        static std::unordered_map<std::string, std::unordered_map<std::string, std::unique_ptr<Achievement>>>& getAchievements();
+
+        /**
+         * @brief Returns all achievement start nodes
+         * @note Start nodes are all nodes that don't have any parents
+         * @param rebuild Whether to rebuild the list of start nodes
+         * @return All achievement start nodes
+         */
+        static std::unordered_map<std::string, std::vector<AchievementNode*>>& getAchievementStartNodes(bool rebuild = true);
+
+        /**
+         * @brief Returns all achievement nodes
+         * @param rebuild Whether to rebuild the list of nodes
+         * @return All achievement nodes
+         */
+        static std::unordered_map<std::string, std::list<AchievementNode>>& getAchievementNodes(bool rebuild = true);
+
+        /**
+         * @brief Loads the progress of all achievements from the achievements save file
+         */
+        static void loadProgress();
+
+        /**
+         * @brief Stores the progress of all achievements to the achievements save file
+         */
+        static void storeProgress();
+
+        /**
+         * @brief Removes all registered achievements from the tree
+         */
+        static void clear();
+
+        /**
+         * @brief Removes all temporary achievements from the tree
+         */
+        static void clearTemporary();
+
+        /**
+         * \brief Returns the current progress of all achievements
+         * \return A pair containing the number of unlocked achievements and the total number of achievements
+         */
+        static std::pair<u32, u32> getProgress();
+
+    private:
+        static void achievementAdded();
+    };
+
+}

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

@@ -23,7 +23,11 @@
 #define EVENT_DEF(event_name, ...)          EVENT_DEF_IMPL(event_name, #event_name, true, __VA_ARGS__)
 #define EVENT_DEF_NO_LOG(event_name, ...)   EVENT_DEF_IMPL(event_name, #event_name, false, __VA_ARGS__)
 
+
+/* Forward declarations */
 struct GLFWwindow;
+namespace hex { class Achievement; }
+
 
 namespace hex {
 
@@ -39,7 +43,9 @@ namespace hex {
                 }
             }
 
-            constexpr bool operator==(const EventId &rhs) const = default;
+            constexpr bool operator==(const EventId &other) const {
+                return this->m_hash == other.m_hash;
+            }
 
         private:
             u32 m_hash;
@@ -50,7 +56,7 @@ namespace hex {
         };
 
         template<typename... Params>
-        struct Event : public EventBase {
+        struct Event : EventBase {
             using Callback = std::function<void(Params...)>;
 
             explicit Event(Callback func) noexcept : m_func(std::move(func)) { }
@@ -63,6 +69,9 @@ namespace hex {
             Callback m_func;
         };
 
+        template<typename T>
+        concept EventType = std::derived_from<T, EventBase>;
+
     }
 
 
@@ -80,9 +89,12 @@ namespace hex {
          * @param function Function to call when the event is posted
          * @return Token to unsubscribe from the event
          */
-        template<typename E>
+        template<impl::EventType E>
         static EventList::iterator subscribe(typename E::Callback function) {
-            return s_events.insert(s_events.end(), std::make_pair(E::Id, std::make_unique<E>(function)));
+            std::scoped_lock lock(getEventMutex());
+
+            auto &events = getEvents();
+            return events.insert(events.end(), std::make_pair(E::Id, std::make_unique<E>(function)));
         }
 
         /**
@@ -91,9 +103,22 @@ namespace hex {
          * @param token Unique token to register the event to. Later required to unsubscribe again
          * @param function Function to call when the event is posted
          */
-        template<typename E>
+        template<impl::EventType E>
         static void subscribe(void *token, typename E::Callback function) {
-            s_tokenStore.insert(std::make_pair(token, subscribe<E>(function)));
+            std::scoped_lock lock(getEventMutex());
+
+            if (getTokenStore().contains(token)) {
+                auto&& [begin, end] = getTokenStore().equal_range(token);
+                auto eventRegistered = std::any_of(begin, end, [&](auto &item) {
+                    return item.second->first == E::Id;
+                });
+                if (eventRegistered) {
+                    log::fatal("The token '{}' has already registered the same event ('{}')", token, wolv::type::getTypeName<E>());
+                    return;
+                }
+            }
+
+            getTokenStore().insert({ token, subscribe<E>(function) });
         }
 
         /**
@@ -101,7 +126,9 @@ namespace hex {
          * @param token Token returned by subscribe
          */
         static void unsubscribe(const EventList::iterator &token) noexcept {
-            s_events.erase(token);
+            std::scoped_lock lock(getEventMutex());
+
+            getEvents().erase(token);
         }
 
         /**
@@ -109,15 +136,18 @@ namespace hex {
          * @tparam E Event
          * @param token Token passed to subscribe
          */
-        template<typename E>
+        template<impl::EventType E>
         static void unsubscribe(void *token) noexcept {
-            auto iter = std::find_if(s_tokenStore.begin(), s_tokenStore.end(), [&](auto &item) {
+            std::scoped_lock lock(getEventMutex());
+
+            auto &tokenStore = getTokenStore();
+            auto iter = std::find_if(tokenStore.begin(), tokenStore.end(), [&](auto &item) {
                 return item.first == token && item.second->first == E::Id;
             });
 
-            if (iter != s_tokenStore.end()) {
-                s_events.remove(*iter->second);
-                s_tokenStore.erase(iter);
+            if (iter != tokenStore.end()) {
+                getEvents().remove(*iter->second);
+                tokenStore.erase(iter);
             }
 
         }
@@ -127,11 +157,17 @@ namespace hex {
          * @tparam E Event
          * @param args Arguments to pass to the event
          */
-        template<typename E>
+        template<impl::EventType E>
         static void post(auto &&...args) noexcept {
-            for (const auto &[id, event] : s_events) {
+            std::scoped_lock lock(getEventMutex());
+
+            for (const auto &[id, event] : getEvents()) {
                 if (id == E::Id) {
-                    (*static_cast<E *const>(event.get()))(std::forward<decltype(args)>(args)...);
+                    try {
+                        (*static_cast<E *const>(event.get()))(std::forward<decltype(args)>(args)...);
+                    } catch (const std::exception &e) {
+                        log::error("Event '{}' threw {}: {}", wolv::type::getTypeName<decltype(e)>(), wolv::type::getTypeName<E>(), e.what());
+                    }
                 }
             }
 
@@ -145,13 +181,16 @@ namespace hex {
          * @brief Unsubscribe all subscribers from all events
          */
         static void clear() noexcept {
-            s_events.clear();
-            s_tokenStore.clear();
+            std::scoped_lock lock(getEventMutex());
+
+            getEvents().clear();
+            getTokenStore().clear();
         }
 
     private:
-        static std::map<void *, EventList::iterator> s_tokenStore;
-        static EventList s_events;
+        static std::multimap<void *, EventList::iterator>& getTokenStore();
+        static EventList& getEvents();
+        static std::recursive_mutex& getEventMutex();
     };
 
     /* Default Events */
@@ -195,11 +234,18 @@ namespace hex {
     EVENT_DEF(EventWindowInitialized);
     EVENT_DEF(EventBookmarkCreated, ImHexApi::Bookmarks::Entry&);
     EVENT_DEF(EventPatchCreated, u64, u8, u8);
+    EVENT_DEF(EventPatternEvaluating);
     EVENT_DEF(EventPatternExecuted, const std::string&);
     EVENT_DEF(EventPatternEditorChanged, const std::string&);
     EVENT_DEF(EventStoreContentDownloaded, const std::fs::path&);
     EVENT_DEF(EventStoreContentRemoved, const std::fs::path&);
     EVENT_DEF(EventImHexClosing);
+    EVENT_DEF(EventAchievementUnlocked, const Achievement&);
+    EVENT_DEF(EventSearchBoxClicked);
+
+    EVENT_DEF(EventProviderDataModified, prv::Provider *, u64, u64, const u8*);
+    EVENT_DEF(EventProviderDataInserted, prv::Provider *, u64, u64);
+    EVENT_DEF(EventProviderDataRemoved, prv::Provider *, u64, u64);
 
     /**
      * @brief Called when a project has been loaded
@@ -210,9 +256,12 @@ namespace hex {
     EVENT_DEF_NO_LOG(EventFrameEnd);
     EVENT_DEF_NO_LOG(EventSetTaskBarIconState, u32, u32, u32);
 
+    EVENT_DEF(RequestAddInitTask, std::string, bool, std::function<bool()>);
+    EVENT_DEF(RequestAddExitTask, std::string, std::function<bool()>);
     EVENT_DEF(RequestOpenWindow, std::string);
     EVENT_DEF(RequestSelectionChange, Region);
-    EVENT_DEF(RequestAddBookmark, Region, std::string, std::string, color_t);
+    EVENT_DEF(RequestAddBookmark, Region, std::string, std::string, color_t, u64*);
+    EVENT_DEF(RequestRemoveBookmark, u64);
     EVENT_DEF(RequestSetPatternLanguageCode, std::string);
     EVENT_DEF(RequestLoadPatternLanguageFile, std::fs::path);
     EVENT_DEF(RequestSavePatternLanguageFile, std::fs::path);
@@ -232,4 +281,16 @@ namespace hex {
     EVENT_DEF(RequestOpenInfoPopup, const std::string);
     EVENT_DEF(RequestOpenErrorPopup, const std::string);
     EVENT_DEF(RequestOpenFatalPopup, const std::string);
+
+
+    /**
+     * @brief Send an event to the main Imhex instance
+     */
+    EVENT_DEF(SendMessageToMainInstance, const std::string, const std::vector<u8>&);
+
+    /**
+     * Move the data from all PerProvider instances from one provider to another.
+     * The 'from' provider should not have any per provider data after this, and should be immediately deleted
+    */
+    EVENT_DEF(MovePerProviderData, prv::Provider *, prv::Provider *);
 }

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

@@ -2,20 +2,18 @@
 
 #include <hex.hpp>
 
-#include <list>
 #include <optional>
+#include <span>
 #include <string>
 #include <vector>
-#include <variant>
 #include <map>
 
-#include <hex/helpers/concepts.hpp>
-#include <hex/api/keybinding.hpp>
-
 #include <wolv/io/fs.hpp>
 
 using ImGuiID = unsigned int;
 struct ImVec2;
+struct ImFontAtlas;
+struct ImFont;
 
 namespace hex {
 
@@ -58,7 +56,7 @@ namespace hex {
                 color_t m_color = 0x00;
             };
 
-            struct ProviderRegion : public Region {
+            struct ProviderRegion : Region {
                 prv::Provider *provider;
 
                 [[nodiscard]] prv::Provider *getProvider() const { return this->provider; }
@@ -77,7 +75,7 @@ namespace hex {
                 std::map<u32, Tooltip> &getTooltips();
                 std::map<u32, TooltipFunction> &getTooltipFunctions();
 
-                void setCurrentSelection(std::optional<ProviderRegion> region);
+                void setCurrentSelection(const std::optional<ProviderRegion> &region);
             }
 
             /**
@@ -215,6 +213,7 @@ namespace hex {
                 std::string comment;
                 u32 color;
                 bool locked;
+                u64 id;
             };
 
             /**
@@ -224,8 +223,25 @@ namespace hex {
              * @param name The name of the bookmark
              * @param comment The comment of the bookmark
              * @param color The color of the bookmark or 0x00 for the default color
+             * @return Bookmark ID
              */
-            void add(u64 address, size_t size, const std::string &name, const std::string &comment, color_t color = 0x00000000);
+            u64 add(u64 address, size_t size, const std::string &name, const std::string &comment, color_t color = 0x00000000);
+
+            /**
+            * @brief Adds a new bookmark
+            * @param region The region of the bookmark
+            * @param name The name of the bookmark
+            * @param comment The comment of the bookmark
+            * @param color The color of the bookmark or 0x00 for the default color
+            * @return Bookmark ID
+            */
+            u64 add(Region region, const std::string &name, const std::string &comment, color_t color = 0x00000000);
+
+            /**
+            * @brief Removes a bookmark
+            * @param id The ID of the bookmark to remove
+            */
+            void remove(u64 id);
 
         }
 
@@ -239,7 +255,7 @@ namespace hex {
             namespace impl {
 
                 void resetClosingProvider();
-                prv::Provider* getClosingProvider();
+                const std::vector<prv::Provider*>& getClosingProviders();
 
             }
 
@@ -261,6 +277,12 @@ namespace hex {
              */
             void setCurrentProvider(u32 index);
 
+            /**
+             * @brief Gets the index of the currently selected data provider
+             * @return Index of the selected provider
+             */
+            i64 getCurrentProviderIndex();
+
             /**
              * @brief Checks whether the currently selected data provider is valid
              * @return Whether the currently selected data provider is valid
@@ -314,6 +336,7 @@ namespace hex {
              * @brief Creates a new provider using its unlocalized name and add it to the list of providers
              * @param unlocalizedName The unlocalized name of the provider to create
              * @param skipLoadInterface Whether to skip the provider's loading interface (see property documentation)
+             * @param select Whether to select the provider after adding it
              */
             prv::Provider* createProvider(const std::string &unlocalizedName, bool skipLoadInterface = false, bool select = true);
 
@@ -322,7 +345,10 @@ namespace hex {
         /* Functions to interact with various ImHex system settings */
         namespace System {
 
+            bool isMainInstance();
+
             namespace impl {
+                void setMainInstanceStatus(bool status);
 
                 void setMainWindowPosition(i32 x, i32 y);
                 void setMainWindowSize(u32 width, u32 height);
@@ -331,18 +357,14 @@ namespace hex {
                 void setGlobalScale(float scale);
                 void setNativeScale(float scale);
 
-                void setProgramArguments(int argc, char **argv, char **envp);
-
                 void setBorderlessWindowMode(bool enabled);
 
-                void setCustomFontPath(const std::fs::path &path);
-                void setFontSize(float size);
-
                 void setGPUVendor(const std::string &vendor);
 
                 void setPortableVersion(bool enabled);
 
                 void addInitArgument(const std::string &key, const std::string &value = { });
+
             }
 
             struct ProgramArguments {
@@ -383,20 +405,6 @@ namespace hex {
             void setTaskBarProgress(TaskProgressState state, TaskProgressType type, u32 progress);
 
 
-            /**
-             * @brief Gets the current program arguments
-             * @return The current program arguments
-             */
-            const ProgramArguments &getProgramArguments();
-
-            /**
-             * @brief Gets a program argument
-             * @param index The index of the argument to get
-             * @return The argument at the given index
-             */
-            std::optional<std::u8string> getProgramArgument(int index);
-
-
             /**
              * @brief Gets the current target FPS
              * @return The current target FPS
@@ -454,21 +462,6 @@ namespace hex {
              */
             std::map<std::string, std::string> &getInitArguments();
 
-            constexpr static float DefaultFontSize = 13.0;
-
-            /**
-             * @brief Gets the current custom font path
-             * @return The current custom font path
-             */
-            const std::filesystem::path &getCustomFontPath();
-
-            /**
-             * @brief Gets the current font size
-             * @return The current font size
-             */
-            float getFontSize();
-
-
             /**
              * @brief Sets if ImHex should follow the system theme
              * @param enabled Whether to follow the system theme
@@ -486,7 +479,7 @@ namespace hex {
              * @brief Gets the currently set additional folder paths
              * @return The currently set additional folder paths
              */
-            const std::vector<std::filesystem::path> &getAdditionalFolderPaths();
+            std::vector<std::filesystem::path> &getAdditionalFolderPaths();
 
             /**
              * @brief Sets the additional folder paths
@@ -507,11 +500,139 @@ namespace hex {
              */
             bool isPortableVersion();
 
+            /**
+             * @brief Gets the current Operating System name
+             * @return Operating System name
+             */
             std::string getOSName();
 
+            /**
+             * @brief Gets the current Operating System version
+             * @return Operating System version
+             */
             std::string getOSVersion();
 
+            /**
+             * @brief Gets the current CPU architecture
+             * @return CPU architecture
+             */
             std::string getArchitecture();
+
+            /**
+             * @brief Gets the current ImHex version
+             * @return ImHex version
+             */
+            std::string getImHexVersion(bool withBuildType = true);
+
+            /**
+             * @brief Gets the current git commit hash
+             * @param longHash Whether to return the full hash or the shortened version
+             * @return Git commit hash
+             */
+            std::string getCommitHash(bool longHash = false);
+
+            /**
+             * @brief Gets the current git commit branch
+             * @return Git commit branch
+             */
+            std::string getCommitBranch();
+
+            /**
+             * @brief Checks if ImHex was built in debug mode
+             * @return True if ImHex was built in debug mode, false otherwise
+             */
+            bool isDebugBuild();
+
+            enum class UpdateType {
+                Stable,
+                Nightly
+            };
+
+            /**
+             * @brief Triggers the update process
+             * @param updateType The update channel
+             * @return If the update process was successfully started
+             */
+            bool updateImHex(UpdateType updateType);
+
+            void addStartupTask(const std::string &name, bool async, const std::function<bool()> &function);
+        }
+
+        /**
+         * @brief Cross-instance messaging system
+         * This allows you to send messages to the "main" instance of ImHex running, from any other instance
+         */
+        namespace Messaging {
+            
+            namespace impl {
+                using MessagingHandler = std::function<void(const std::vector<u8> &)>;
+
+                std::map<std::string, MessagingHandler> &getHandlers();
+
+                void runHandler(const std::string &eventName, const std::vector<u8> &args);
+            }
+
+            /**
+             * @brief Register the handler for this specific event name
+             */
+            void registerHandler(const std::string &eventName, const impl::MessagingHandler &handler);
+        }
+
+        namespace Fonts {
+
+            struct GlyphRange { u16 begin, end; };
+            struct Offset { float x, y; };
+
+            struct Font {
+                std::string name;
+                std::vector<u8> fontData;
+                std::vector<GlyphRange> glyphRanges;
+                Offset offset;
+                u32 flags;
+            };
+
+            namespace impl {
+
+                std::vector<Font>& getFonts();
+
+                void setCustomFontPath(const std::fs::path &path);
+                void setFontSize(float size);
+                void setFontAtlas(ImFontAtlas *fontAtlas);
+
+                void setFonts(ImFont *bold, ImFont *italic);
+            }
+
+            GlyphRange glyph(const char *glyph);
+            GlyphRange glyph(u32 codepoint);
+            GlyphRange range(const char *glyphBegin, const char *glyphEnd);
+            GlyphRange range(u32 codepointBegin, u32 codepointEnd);
+
+            void loadFont(const std::fs::path &path, const std::vector<GlyphRange> &glyphRanges = {}, Offset offset = {}, u32 flags = 0);
+            void loadFont(const std::string &name, const std::span<const u8> &data, const std::vector<GlyphRange> &glyphRanges = {}, Offset offset = {}, u32 flags = 0);
+
+            constexpr static float DefaultFontSize = 13.0;
+
+            ImFont* Bold();
+            ImFont* Italic();
+
+            /**
+             * @brief Gets the current custom font path
+             * @return The current custom font path
+             */
+            std::filesystem::path &getCustomFontPath();
+
+            /**
+             * @brief Gets the current font size
+             * @return The current font size
+             */
+            float getFontSize();
+
+            /**
+             * @brief Gets the current font atlas
+             * @return Current font atlas
+             */
+            ImFontAtlas* getFontAtlas();
+
         }
 
     }

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

@@ -1,13 +1,10 @@
 #pragma once
 
-#include <hex.hpp>
 #include <hex/helpers/fs.hpp>
 
 #include <string>
-#include <variant>
 
 #include <nlohmann/json_fwd.hpp>
-#include <imgui.h>
 
 namespace hex {
 
@@ -18,22 +15,48 @@ namespace hex {
             std::fs::path path;
         };
 
+        /**
+         * @brief Save the current layout
+         * @param name Name of the layout
+         */
         static void save(const std::string &name);
+
+        /**
+         * @brief Load a layout from a file
+         * @param path Path to the layout file
+         */
         static void load(const std::fs::path &path);
+
+        /**
+         * @brief Load a layout from a string
+         * @param content Layout string
+         */
         static void loadString(const std::string &content);
 
+        /**
+         * @brief Get a list of all layouts
+         * @return List of all added layouts
+         */
         static std::vector<Layout> getLayouts();
 
+        /**
+         * @brief Handles loading of layouts if needed
+         * @note This function should only be called by ImHex
+         */
         static void process();
+
+        /**
+         * @brief Reload all layouts
+         */
         static void reload();
+
+        /**
+         * @brief Reset the layout manager
+         */
         static void reset();
 
     private:
         LayoutManager() = default;
-
-        static std::optional<std::fs::path> s_layoutPathToLoad;
-        static std::optional<std::string> s_layoutStringToLoad;
-        static std::vector<Layout> s_layouts;
     };
 
 }

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

@@ -1,69 +0,0 @@
-#pragma once
-
-#include <initializer_list>
-#include <map>
-#include <string>
-#include <string_view>
-
-#include <fmt/format.h>
-
-namespace hex {
-
-    class LanguageDefinition {
-    public:
-        explicit LanguageDefinition(std::map<std::string, std::string> &&entries);
-
-        [[nodiscard]] const std::map<std::string, std::string> &getEntries() const;
-
-    private:
-        std::map<std::string, std::string> m_entries;
-    };
-
-    class LangEntry {
-    public:
-        explicit LangEntry(const char *unlocalizedString);
-        explicit LangEntry(std::string unlocalizedString);
-        explicit LangEntry(std::string_view unlocalizedString);
-
-        operator std::string() const;
-        operator std::string_view() const;
-        operator const char *() const;
-
-        [[nodiscard]] const std::string &get() const;
-
-        static void loadLanguage(const std::string &language);
-        static const std::map<std::string, std::string> &getSupportedLanguages();
-
-        static void setFallbackLanguage(const std::string &language);
-        static const std::string &getFallbackLanguage();
-
-        static void resetLanguageStrings();
-
-    private:
-        std::string m_unlocalizedString;
-
-        static std::string s_fallbackLanguage;
-        static std::map<std::string, std::string> s_currStrings;
-    };
-
-    std::string operator+(const std::string &&left, const LangEntry &&right);
-    std::string operator+(const LangEntry &&left, const std::string &&right);
-    std::string operator+(const std::string_view &&left, const LangEntry &&right);
-    std::string operator+(const LangEntry &&left, const std::string_view &&right);
-    std::string operator+(const char *left, const LangEntry &&right);
-    std::string operator+(const LangEntry &&left, const char *right);
-    std::string operator+(const LangEntry &&left, const LangEntry &&right);
-
-    inline LangEntry operator""_lang(const char *string, size_t) {
-        return LangEntry(string);
-    }
-
-}
-
-template<>
-struct fmt::formatter<hex::LangEntry> : fmt::formatter<std::string_view> {
-    template<typename FormatContext>
-    auto format(const hex::LangEntry &entry, FormatContext &ctx) {
-        return fmt::formatter<std::string_view>::format(entry, ctx);
-    }
-};

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

@@ -0,0 +1,71 @@
+#pragma once
+
+#include <map>
+#include <string>
+#include <string_view>
+
+#include <fmt/format.h>
+
+namespace hex {
+
+    namespace LocalizationManager {
+
+        class LanguageDefinition {
+        public:
+            explicit LanguageDefinition(std::map<std::string, std::string> &&entries);
+
+            [[nodiscard]] const std::map<std::string, std::string> &getEntries() const;
+
+        private:
+            std::map<std::string, std::string> m_entries;
+        };
+
+        namespace impl {
+            void setFallbackLanguage(const std::string &language);
+            void resetLanguageStrings();
+        }
+
+        void loadLanguage(const std::string &language);
+
+        [[nodiscard]] const std::map<std::string, std::string> &getSupportedLanguages();
+        [[nodiscard]] const std::string &getFallbackLanguage();
+        [[nodiscard]] const std::string &getSelectedLanguage();
+    }
+
+    class Lang {
+    public:
+        explicit Lang(const char *unlocalizedString);
+        explicit Lang(std::string unlocalizedString);
+        explicit Lang(std::string_view unlocalizedString);
+
+        [[nodiscard]] operator std::string() const;
+        [[nodiscard]] operator std::string_view() const;
+        [[nodiscard]] operator const char *() const;
+
+        [[nodiscard]] const std::string &get() const;
+
+    private:
+        std::string m_unlocalizedString;
+    };
+
+    [[nodiscard]] std::string operator+(const std::string &&left, const Lang &&right);
+    [[nodiscard]] std::string operator+(const Lang &&left, const std::string &&right);
+    [[nodiscard]] std::string operator+(const std::string_view &&left, const Lang &&right);
+    [[nodiscard]] std::string operator+(const Lang &&left, const std::string_view &&right);
+    [[nodiscard]] std::string operator+(const char *left, const Lang &&right);
+    [[nodiscard]] std::string operator+(const Lang &&left, const char *right);
+    [[nodiscard]] std::string operator+(const Lang &&left, const Lang &&right);
+
+    [[nodiscard]] inline Lang operator""_lang(const char *string, size_t) {
+        return Lang(string);
+    }
+
+}
+
+template<>
+struct fmt::formatter<hex::Lang> : fmt::formatter<std::string_view> {
+    template<typename FormatContext>
+    auto format(const hex::Lang &entry, FormatContext &ctx) {
+        return fmt::formatter<std::string_view>::format(entry.get(), ctx);
+    }
+};

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

@@ -1,25 +1,46 @@
 #pragma once
 
-#include <hex.hpp>
-
-#include <hex/helpers/fmt.hpp>
-#include <hex/helpers/fs.hpp>
-
+#include <functional>
+#include <span>
 #include <string>
 
-#if defined(OS_WINDOWS)
-    #include <windows.h>
-#else
-    #include <dlfcn.h>
-#endif
+#include <wolv/io/fs.hpp>
 
 struct ImGuiContext;
 
 namespace hex {
 
+    struct SubCommand {
+        std::string commandKey;
+        std::string commandDesc;
+        std::function<void(const std::vector<std::string>&)> callback;
+    };
+
+    struct PluginFunctions {
+        using InitializePluginFunc     = void (*)();
+        using GetPluginNameFunc        = const char *(*)();
+        using GetPluginAuthorFunc      = const char *(*)();
+        using GetPluginDescriptionFunc = const char *(*)();
+        using GetCompatibleVersionFunc = const char *(*)();
+        using SetImGuiContextFunc      = void (*)(ImGuiContext *);
+        using IsBuiltinPluginFunc      = bool (*)();
+        using GetSubCommandsFunc       = void* (*)();
+
+        InitializePluginFunc        initializePluginFunction        = nullptr;
+        GetPluginNameFunc           getPluginNameFunction           = nullptr;
+        GetPluginAuthorFunc         getPluginAuthorFunction         = nullptr;
+        GetPluginDescriptionFunc    getPluginDescriptionFunction    = nullptr;
+        GetCompatibleVersionFunc    getCompatibleVersionFunction    = nullptr;
+        SetImGuiContextFunc         setImGuiContextFunction         = nullptr;
+        IsBuiltinPluginFunc         isBuiltinPluginFunction         = nullptr;
+        GetSubCommandsFunc          getSubCommandsFunction          = nullptr;
+    };
+
     class Plugin {
     public:
         explicit Plugin(const std::fs::path &path);
+        explicit Plugin(PluginFunctions functions);
+
         Plugin(const Plugin &) = delete;
         Plugin(Plugin &&other) noexcept;
         ~Plugin();
@@ -36,39 +57,22 @@ namespace hex {
 
         [[nodiscard]] bool isLoaded() const;
 
-    private:
-        using InitializePluginFunc     = void (*)();
-        using GetPluginNameFunc        = const char *(*)();
-        using GetPluginAuthorFunc      = const char *(*)();
-        using GetPluginDescriptionFunc = const char *(*)();
-        using GetCompatibleVersionFunc = const char *(*)();
-        using SetImGuiContextFunc      = void (*)(ImGuiContext *);
-        using IsBuiltinPluginFunc      = bool (*)();
+        [[nodiscard]] std::span<SubCommand> getSubCommands() const;
 
-        #if defined(OS_WINDOWS)
-            HMODULE m_handle = nullptr;
-        #else
-            void *m_handle = nullptr;
-        #endif
+    private:
+        uintptr_t m_handle = 0;
         std::fs::path m_path;
 
         mutable bool m_initialized = false;
 
-        InitializePluginFunc m_initializePluginFunction         = nullptr;
-        GetPluginNameFunc m_getPluginNameFunction               = nullptr;
-        GetPluginAuthorFunc m_getPluginAuthorFunction           = nullptr;
-        GetPluginDescriptionFunc m_getPluginDescriptionFunction = nullptr;
-        GetCompatibleVersionFunc m_getCompatibleVersionFunction = nullptr;
-        SetImGuiContextFunc m_setImGuiContextFunction           = nullptr;
-        IsBuiltinPluginFunc m_isBuiltinPluginFunction           = nullptr;
+        PluginFunctions m_functions = {};
 
         template<typename T>
         [[nodiscard]] auto getPluginFunction(const std::string &symbol) {
             return reinterpret_cast<T>(this->getPluginFunction(symbol));
         }
 
-    private:
-        [[nodiscard]] void *getPluginFunction(const std::string &symbol);
+        [[nodiscard]] void *getPluginFunction(const std::string &symbol) const;
     };
 
     class PluginManager {
@@ -79,13 +83,10 @@ namespace hex {
         static void unload();
         static void reload();
 
-        static const auto &getPlugins() {
-            return PluginManager::s_plugins;
-        }
+        static void addPlugin(PluginFunctions functions);
 
-    private:
-        static std::fs::path s_pluginFolder;
-        static std::vector<Plugin> s_plugins;
+        static std::vector<Plugin> &getPlugins();
+        static std::vector<std::fs::path> &getPluginPaths();
     };
 
 }

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

@@ -1,15 +1,5 @@
 #pragma once
 
-#include <list>
-#include <string>
-#include <string_view>
-
-#include <hex/api/imhex_api.hpp>
-#include <hex/api/event.hpp>
-
-#include <hex/helpers/fs.hpp>
-#include <hex/helpers/utils.hpp>
-#include <hex/helpers/concepts.hpp>
 #include <hex/helpers/tar.hpp>
 
 /**
@@ -21,6 +11,10 @@
  */
 namespace hex {
 
+    namespace prv {
+        class Provider;
+    }
+
     class ProjectFile {
     public:
         struct Handler {
@@ -47,7 +41,7 @@ namespace hex {
          */
         static void setProjectFunctions(
             const std::function<bool(const std::fs::path&)> &loadFun,
-            const std::function<bool(std::optional<std::fs::path>)> &storeFun
+            const std::function<bool(std::optional<std::fs::path>, bool)> &storeFun
         );
 
         /**
@@ -63,10 +57,11 @@ namespace hex {
          * @brief Store a project file
          *
          * @param filePath Path to the project file
+         * @param updateLocation update the project location so subssequent saves will save there
          * @return true if the project file was stored successfully
          * @return false if the project file was not stored successfully
          */
-        static bool store(std::optional<std::fs::path> filePath = std::nullopt);
+        static bool store(std::optional<std::fs::path> filePath = std::nullopt, bool updateLocation = true);
 
         /**
          * @brief Check if a project file is currently loaded
@@ -115,27 +110,16 @@ namespace hex {
          * @brief Get the list of registered handlers
          * @return List of registered handlers
          */
-        static std::vector<Handler>& getHandlers() {
-            return s_handlers;
-        }
+        static std::vector<Handler>& getHandlers();
 
         /**
          * @brief Get the list of registered per-provider handlers
          * @return List of registered per-provider handlers
          */
-        static std::vector<ProviderHandler>& getProviderHandlers() {
-            return s_providerHandlers;
-        }
+        static std::vector<ProviderHandler>& getProviderHandlers();
 
     private:
         ProjectFile() = default;
-
-        static std::function<bool(const std::fs::path&)> s_loadProjectFunction;
-        static std::function<bool(std::optional<std::fs::path>)> s_storeProjectFunction;
-
-        static std::fs::path s_currProjectPath;
-        static std::vector<Handler> s_handlers;
-        static std::vector<ProviderHandler> s_providerHandlers;
     };
 
 }

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

@@ -4,8 +4,8 @@
 #include <GLFW/glfw3.h>
 
 #include <functional>
-#include <map>
 #include <memory>
+#include <optional>
 #include <set>
 #include <string>
 
@@ -133,13 +133,14 @@ namespace hex {
 
     class Key {
     public:
+        constexpr Key() = default;
         constexpr Key(Keys key) : m_key(static_cast<u32>(key)) { }
 
         auto operator<=>(const Key &) const = default;
 
         [[nodiscard]] constexpr u32 getKeyCode() const { return this->m_key; }
     private:
-        u32 m_key;
+        u32 m_key = 0;
     };
 
 
@@ -160,8 +161,15 @@ namespace hex {
     public:
         Shortcut() = default;
         Shortcut(Keys key) : m_keys({ key }) { }
+        explicit Shortcut(std::set<Key> keys) : m_keys(std::move(keys)) { }
+        Shortcut(const Shortcut &other) = default;
+        Shortcut(Shortcut &&) noexcept = default;
 
-        const static inline auto None = Keys(0);
+        Shortcut& operator=(const Shortcut &other) = default;
+
+        Shortcut& operator=(Shortcut &&) noexcept = default;
+
+        constexpr static inline auto None = Keys(0);
 
         Shortcut operator+(const Key &other) const {
             Shortcut result = *this;
@@ -181,7 +189,15 @@ namespace hex {
         }
 
         bool operator==(const Shortcut &other) const {
-            return this->m_keys == other.m_keys;
+            auto thisKeys = this->m_keys;
+            auto otherKeys = other.m_keys;
+
+            thisKeys.erase(CurrentView);
+            thisKeys.erase(AllowWhileTyping);
+            otherKeys.erase(CurrentView);
+            otherKeys.erase(AllowWhileTyping);
+
+            return thisKeys == otherKeys;
         }
 
         bool isLocal() const {
@@ -351,6 +367,8 @@ namespace hex {
             return result;
         }
 
+        const std::set<Key>& getKeys() const { return this->m_keys; }
+
     private:
         friend Shortcut operator+(const Key &lhs, const Key &rhs);
 
@@ -370,21 +388,29 @@ namespace hex {
      */
     class ShortcutManager {
     public:
+        using Callback = std::function<void()>;
+        struct ShortcutEntry {
+            Shortcut shortcut;
+            std::string unlocalizedName;
+            Callback callback;
+        };
 
         /**
          * @brief Add a global shortcut. Global shortcuts can be triggered regardless of what view is currently focused
          * @param shortcut The shortcut to add.
+         * @param unlocalizedName The unlocalized name of the shortcut
          * @param callback The callback to call when the shortcut is triggered.
          */
-        static void addGlobalShortcut(const Shortcut &shortcut, const std::function<void()> &callback);
+        static void addGlobalShortcut(const Shortcut &shortcut, const std::string &unlocalizedName, const Callback &callback);
 
         /**
          * @brief Add a view-specific shortcut. View-specific shortcuts can only be triggered when the specified view is focused.
          * @param view The view to add the shortcut to.
          * @param shortcut The shortcut to add.
+         * @param unlocalizedName The unlocalized name of the shortcut
          * @param callback The callback to call when the shortcut is triggered.
          */
-        static void addShortcut(View *view, const Shortcut &shortcut, const std::function<void()> &callback);
+        static void addShortcut(View *view, const Shortcut &shortcut, const std::string &unlocalizedName, const Callback &callback);
 
 
         /**
@@ -414,8 +440,15 @@ namespace hex {
          */
         static void clearShortcuts();
 
-    private:
-        static std::map<Shortcut, std::function<void()>> s_globalShortcuts;
+        static void resumeShortcuts();
+        static void pauseShortcuts();
+
+        [[nodiscard]] static std::optional<Shortcut> getPreviousShortcut();
+
+        [[nodiscard]] static std::vector<ShortcutEntry> getGlobalShortcuts();
+        [[nodiscard]] static std::vector<ShortcutEntry> getViewShortcuts(View *view);
+
+        [[nodiscard]] static bool updateShortcut(const Shortcut &oldShortcut, const Shortcut &newShortcut, View *view = nullptr);
     };
 
 }

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

@@ -5,13 +5,13 @@
 #include <cstdio>
 #include <thread>
 #include <functional>
-#include <cstdint>
 #include <mutex>
-#include <chrono>
 #include <memory>
 #include <list>
 #include <condition_variable>
 
+#include <jthread.hpp>
+
 namespace hex {
 
     class TaskHolder;
@@ -110,7 +110,7 @@ namespace hex {
 
         [[nodiscard]] u32 getProgress() const;
 
-        void interrupt();
+        void interrupt() const;
     private:
         std::weak_ptr<Task> m_task;
     };
@@ -144,7 +144,6 @@ namespace hex {
          */
         static TaskHolder createBackgroundTask(std::string name, std::function<void(Task &)> function);
 
-
         /**
          * @brief Creates a new synchronous task that will execute the given function at the start of the next frame
          * @param function Function to be executed
@@ -157,7 +156,6 @@ namespace hex {
          */
         static void runWhenTasksFinished(const std::function<void()> &function);
 
-
         static void collectGarbage();
 
         static size_t getRunningTaskCount();
@@ -167,17 +165,6 @@ namespace hex {
         static void runDeferredCalls();
 
     private:
-        static std::mutex s_deferredCallsMutex, s_tasksFinishedMutex;
-
-        static std::list<std::shared_ptr<Task>> s_tasks;
-        static std::list<std::shared_ptr<Task>> s_taskQueue;
-        static std::list<std::function<void()>> s_deferredCalls;
-        static std::list<std::function<void()>> s_tasksFinishedCallbacks;
-
-        static std::mutex s_queueMutex;
-        static std::condition_variable s_jobCondVar;
-        static std::vector<std::jthread> s_workers;
-
         static void runner(const std::stop_token &stopToken);
     };
 

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

@@ -58,7 +58,7 @@ namespace hex {
 
 
         static std::vector<std::string> getThemeNames();
-        static const std::string &getThemeImagePostfix();
+        static const std::string &getImageTheme();
 
         static std::optional<ImColor> parseColorString(const std::string &colorString);
 
@@ -78,18 +78,11 @@ namespace hex {
             StyleMap styleMap;
         };
 
-        static std::map<std::string, ThemeHandler>& getThemeHandlers() { return s_themeHandlers; }
-        static std::map<std::string, StyleHandler>& getStyleHandlers() { return s_styleHandlers; }
+        static std::map<std::string, ThemeHandler>& getThemeHandlers();
+        static std::map<std::string, StyleHandler>& getStyleHandlers();
 
     private:
         ThemeManager() = default;
-
-
-        static std::map<std::string, nlohmann::json> s_themes;
-        static std::map<std::string, ThemeHandler> s_themeHandlers;
-        static std::map<std::string, StyleHandler> s_styleHandlers;
-        static std::string s_imagePostfix;
-        static std::string s_currTheme;
     };
 
 }

lib/libimhex/include/hex/api_urls.hpp

@@ -1,2 +1,4 @@
-constexpr static const auto ImHexApiURL  = "https://api.werwolv.net/imhex";
-constexpr static const auto GitHubApiURL = "https://api.github.com/repos/WerWolv/ImHex";
+#pragma once
+
+constexpr static auto ImHexApiURL  = "https://api.werwolv.net/imhex";
+constexpr static auto GitHubApiURL = "https://api.github.com/repos/WerWolv/ImHex";

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

@@ -1,7 +1,6 @@
 #pragma once
 #include <hex.hpp>
 
-#include <optional>
 #include <string>
 #include <string_view>
 #include <map>
@@ -51,10 +50,7 @@ namespace hex::dp {
 
         [[nodiscard]] std::vector<u8>& getDefaultData() { return this->m_defaultData; }
 
-        static void setIdCounter(int id) {
-            if (id > Attribute::s_idCounter)
-                Attribute::s_idCounter = id;
-        }
+        static void setIdCounter(int id);
 
     private:
         int m_id;

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

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <hex.hpp>
-
 namespace hex::dp {
 
     class Link {
@@ -14,10 +12,7 @@ namespace hex::dp {
         [[nodiscard]] int getFromId() const { return this->m_from; }
         [[nodiscard]] int getToId() const { return this->m_to; }
 
-        static void setIdCounter(int id) {
-            if (id > Link::s_idCounter)
-                Link::s_idCounter = id;
-        }
+        static void setIdCounter(int id);
 
     private:
         int m_id;

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

@@ -1,4 +1,5 @@
 #pragma once
+
 #include <hex.hpp>
 
 #include <hex/helpers/intrinsics.hpp>
@@ -6,7 +7,6 @@
 
 #include <set>
 #include <span>
-#include <string_view>
 #include <vector>
 
 #include <nlohmann/json_fwd.hpp>
@@ -69,18 +69,15 @@ namespace hex::dp {
             return this->m_position;
         }
 
-        static void setIdCounter(int id) {
-            if (id > Node::s_idCounter)
-                Node::s_idCounter = id;
-        }
+        static void setIdCounter(int id);
 
         const std::vector<u8>& getBufferOnInput(u32 index);
         const i128& getIntegerOnInput(u32 index);
-        const long double& getFloatOnInput(u32 index);
+        const double& getFloatOnInput(u32 index);
 
         void setBufferOnOutput(u32 index, std::span<const u8> data);
         void setIntegerOnOutput(u32 index, i128 integer);
-        void setFloatOnOutput(u32 index, long double floatingPoint);
+        void setFloatOnOutput(u32 index, double floatingPoint);
 
     private:
         int m_id;
@@ -114,6 +111,10 @@ namespace hex::dp {
                 throwNodeError("Recursion detected!");
         }
 
+        void unmarkInputProcessed(u32 index) {
+            this->m_processedInputs.erase(index);
+        }
+
     protected:
         [[noreturn]] void throwNodeError(const std::string &message) {
             throw NodeError { this, message };

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

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <hex.hpp>
-
 #include <type_traits>
 #include <memory>
 
@@ -18,6 +16,7 @@ namespace hex {
     template<typename T>
     class ICloneable {
     public:
+        virtual ~ICloneable() = default;
         [[nodiscard]] virtual std::unique_ptr<T> clone() const = 0;
     };
 

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

@@ -3,7 +3,6 @@
 #include <hex.hpp>
 
 #include <array>
-#include <optional>
 #include <string>
 #include <vector>
 
@@ -16,9 +15,9 @@ namespace hex::crypt {
     void initialize();
     void exit();
 
-    u8 crc8(prv::Provider *&data, u64 offset, size_t size, u32 polynomial, u32 init, u32 xorout, bool reflectIn, bool reflectOut);
-    u16 crc16(prv::Provider *&data, u64 offset, size_t size, u32 polynomial, u32 init, u32 xorout, bool reflectIn, bool reflectOut);
-    u32 crc32(prv::Provider *&data, u64 offset, size_t size, u32 polynomial, u32 init, u32 xorout, bool reflectIn, bool reflectOut);
+    u8 crc8(prv::Provider *&data, u64 offset, size_t size, u32 polynomial, u32 init, u32 xorOut, bool reflectIn, bool reflectOut);
+    u16 crc16(prv::Provider *&data, u64 offset, size_t size, u32 polynomial, u32 init, u32 xorOut, bool reflectIn, bool reflectOut);
+    u32 crc32(prv::Provider *&data, u64 offset, size_t size, u32 polynomial, u32 init, u32 xorOut, bool reflectIn, bool reflectOut);
 
     std::array<u8, 16> md5(prv::Provider *&data, u64 offset, size_t size);
     std::array<u8, 20> sha1(prv::Provider *&data, u64 offset, size_t size);

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

@@ -0,0 +1,47 @@
+#pragma once
+
+#include <wolv/utils/preproc.hpp>
+
+#include <hex/ui/imgui_imhex_extensions.h>
+
+
+#if defined(DEBUG)
+    #define DBG_DEFINE_DEBUG_VARIABLE(type, name)                       \
+        static type name;                                               \
+        hex::dbg::impl::drawDebugVariable(name, WOLV_STRINGIFY(name));
+#else
+    #define DBG_DEFINE_DEBUG_VARIABLE(type, name)                       \
+        static_assert(false, "Debug variables are only intended for use during development.");
+#endif
+
+namespace hex::dbg {
+
+    namespace impl {
+        bool &getDebugWindowState();
+
+        template<typename T>
+        static void drawDebugVariable(T &variable, std::string_view name) {
+            if (!getDebugWindowState())
+                return;
+
+            if (ImGui::Begin("Debug Variables", &getDebugWindowState(), ImGuiWindowFlags_AlwaysAutoResize)) {
+                using Type = std::remove_cvref_t<T>;
+                if constexpr (std::same_as<Type, bool>) {
+                    ImGui::Checkbox(name.data(), &variable);
+                } else if constexpr (std::integral<Type> || std::floating_point<Type>) {
+                    ImGui::InputScalar(name.data(), ImGuiExt::getImGuiDataType<Type>(), &variable);
+                } else if constexpr (std::same_as<Type, ImVec2>) {
+                    ImGui::InputFloat2(name.data(), &variable.x);
+                } else if constexpr (std::same_as<Type, std::string>) {
+                    ImGui::InputText(name.data(), variable);
+                } else if constexpr (std::same_as<Type, ImColor>) {
+                    ImGui::ColorEdit4(name.data(), &variable.Value.x, ImGuiColorEditFlags_AlphaBar);
+                } else {
+                    static_assert(hex::always_false<Type>::value, "Unsupported type");
+                }
+            }
+            ImGui::End();
+        }
+    }
+
+}

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

@@ -26,9 +26,13 @@ namespace hex {
             RISCV   = CS_ARCH_RISCV,
             MOS65XX = CS_ARCH_MOS65XX,
             BPF     = CS_ARCH_BPF,
+            SH      = CS_ARCH_SH,
+            TRICORE = CS_ARCH_TRICORE,
+            MAX   = TRICORE,
+        # else
+            MAX   = EVM,
         #endif
 
-        MAX         = CS_ARCH_MAX,
         MIN         = ARM
     };
 
@@ -38,12 +42,12 @@ namespace hex {
             return static_cast<cs_arch>(architecture);
         }
 
-        static inline bool isSupported(Architecture architecture) {
+        static bool isSupported(Architecture architecture) {
             return cs_support(toCapstoneArchitecture(architecture));
         }
 
-        constexpr static auto ArchitectureNames = [](){
-            std::array<const char *, static_cast<u32>(Architecture::MAX)> names = { };
+        constexpr static auto ArchitectureNames = []{
+            std::array<const char *, static_cast<u32>(Architecture::MAX) + 1> names = { };
 
             names[CS_ARCH_ARM]          = "ARM";
             names[CS_ARCH_ARM64]        = "AArch64";
@@ -63,19 +67,21 @@ namespace hex {
                 names[CS_ARCH_RISCV]    = "RISC-V";
                 names[CS_ARCH_MOS65XX]  = "MOS Technology 65xx";
                 names[CS_ARCH_BPF]      = "Berkeley Packet Filter";
+                names[CS_ARCH_SH]       = "SuperH";
+                names[CS_ARCH_TRICORE]  = "Tricore";
             #endif
 
             return names;
         }();
 
-        static inline i32 getArchitectureSupportedCount() {
+        static i32 getArchitectureSupportedCount() {
             static i32 supportedCount = -1;
 
             if (supportedCount != -1) {
                 return supportedCount;
             }
 
-            for (supportedCount = static_cast<i32>(Architecture::MIN); supportedCount < static_cast<i32>(Architecture::MAX); supportedCount++) {
+            for (supportedCount = static_cast<i32>(Architecture::MIN); supportedCount < static_cast<i32>(Architecture::MAX) + 1; supportedCount++) {
                 if (!cs_support(supportedCount)) {
                     break;
                 }

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

@@ -7,9 +7,7 @@
 #include <vector>
 #include <span>
 
-#include <hex/helpers/fs.hpp>
-
-#include <wolv/io/file.hpp>
+#include <wolv/io/fs.hpp>
 
 namespace hex {
 
@@ -22,12 +20,12 @@ namespace hex {
 
         EncodingFile();
         EncodingFile(const EncodingFile &other);
-        EncodingFile(EncodingFile &&other);
+        EncodingFile(EncodingFile &&other) noexcept;
         EncodingFile(Type type, const std::fs::path &path);
-        EncodingFile(Type type, const std::string &path);
+        EncodingFile(Type type, const std::string &content);
 
         EncodingFile& operator=(const EncodingFile &other);
-        EncodingFile& operator=(EncodingFile &&other);
+        EncodingFile& operator=(EncodingFile &&other) noexcept;
 
         [[nodiscard]] std::pair<std::string_view, size_t> getEncodingFor(std::span<u8> buffer) const;
         [[nodiscard]] size_t getEncodingLengthFor(std::span<u8> buffer) const;
@@ -37,11 +35,14 @@ namespace hex {
 
         [[nodiscard]] const std::string& getTableContent() const { return this->m_tableContent; }
 
+        [[nodiscard]] const std::string& getName() const { return this->m_name; }
+
     private:
         void parse(const std::string &content);
 
         bool m_valid = false;
 
+        std::string m_name;
         std::string m_tableContent;
         std::unique_ptr<std::map<size_t, std::map<std::vector<u8>, std::string>>> m_mapping;
         size_t m_longestSequence = 0;

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

@@ -2,18 +2,12 @@
 
 #include <string_view>
 #include <fmt/format.h>
-#include <fmt/chrono.h>
 
 namespace hex {
 
     template<typename... Args>
-    inline std::string format(std::string_view format, Args... args) {
+    std::string format(std::string_view format, Args... args) {
         return fmt::format(fmt::runtime(format), args...);
     }
 
-    template<typename... Args>
-    inline void print(std::string_view format, Args... args) {
-        fmt::print(fmt::runtime(format), args...);
-    }
-
 }

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

@@ -2,14 +2,11 @@
 
 #include <hex.hpp>
 
-#include <optional>
 #include <string>
 #include <vector>
 #include <filesystem>
 #include <functional>
 
-#include <nfd.hpp>
-
 #include <wolv/io/fs.hpp>
 
 namespace hex::fs {
@@ -20,8 +17,15 @@ namespace hex::fs {
         Folder
     };
 
+    struct ItemFilter {
+        // Human-friendly name
+        std::string name;
+        // Extensions that constitute this filter
+        std::string spec;
+    };
+
     void setFileBrowserErrorCallback(const std::function<void(const std::string&)> &callback);
-    bool openFileBrowser(DialogMode mode, const std::vector<nfdfilteritem_t> &validExtensions, const std::function<void(std::fs::path)> &callback, const std::string &defaultPath = {}, bool multiple = false);
+    bool openFileBrowser(DialogMode mode, const std::vector<ItemFilter> &validExtensions, const std::function<void(std::fs::path)> &callback, const std::string &defaultPath = {}, bool multiple = false);
 
     void openFileExternal(const std::fs::path &filePath);
     void openFolderExternal(const std::fs::path &dirPath);
@@ -53,7 +57,7 @@ namespace hex::fs {
 
     std::vector<std::fs::path> getDefaultPaths(ImHexPath path, bool listNonExisting = false);
 
-    // temporarily expose these for the migration function
+    // Temporarily expose these for the migration function
     std::vector<std::fs::path> getDataPaths();
     std::vector<std::fs::path> appendPath(std::vector<std::fs::path> paths, const std::fs::path &folder);
 }

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

@@ -7,17 +7,18 @@
 #include <string>
 #include <vector>
 
-#include <curl/curl.h>
-
-#include <hex/helpers/logger.hpp>
-#include <hex/helpers/fmt.hpp>
-
 #include <wolv/io/file.hpp>
-#include <wolv/utils/core.hpp>
 #include <wolv/utils/guards.hpp>
-#include <wolv/utils/string.hpp>
 
-#include <mbedtls/ssl.h>
+#if defined(OS_WEB)
+    #include <emscripten/fetch.h>
+
+    using curl_off_t = long;
+#else
+    #include <curl/curl.h>
+#endif
+
+typedef void CURL;
 
 namespace hex {
 
@@ -67,39 +68,12 @@ namespace hex {
         HttpRequest(const HttpRequest&) = delete;
         HttpRequest& operator=(const HttpRequest&) = delete;
 
-        HttpRequest(HttpRequest &&other) noexcept {
-            this->m_curl = other.m_curl;
-            other.m_curl = nullptr;
+        HttpRequest(HttpRequest &&other) noexcept;
 
-            this->m_method = std::move(other.m_method);
-            this->m_url = std::move(other.m_url);
-            this->m_headers = std::move(other.m_headers);
-            this->m_body = std::move(other.m_body);
+        HttpRequest& operator=(HttpRequest &&other) noexcept;
 
-            this->m_caCert = std::move(other.m_caCert);
-        }
-
-        HttpRequest& operator=(HttpRequest &&other) noexcept {
-            this->m_curl = other.m_curl;
-            other.m_curl = nullptr;
-
-            this->m_method = std::move(other.m_method);
-            this->m_url = std::move(other.m_url);
-            this->m_headers = std::move(other.m_headers);
-            this->m_body = std::move(other.m_body);
-
-            this->m_caCert = std::move(other.m_caCert);
-
-            return *this;
-        }
-
-        static void setCACert(std::string data) {
-            HttpRequest::s_caCertData = std::move(data);
-        }
-
-        static void setProxy(std::string proxy) {
-            HttpRequest::s_proxyUrl = std::move(proxy);
-        }
+        static void setProxyState(bool enabled);
+        static void setProxyUrl(std::string proxy);
 
         void setMethod(std::string method) {
             this->m_method = std::move(method);
@@ -130,197 +104,60 @@ namespace hex {
         }
 
         template<typename T = std::string>
-        std::future<Result<T>> downloadFile(const std::fs::path &path) {
-            return std::async(std::launch::async, [this, path] {
-                std::vector<u8> response;
+        std::future<Result<T>> downloadFile(const std::fs::path &path);
 
-                wolv::io::File file(path, wolv::io::File::Mode::Create);
-                curl_easy_setopt(this->m_curl, CURLOPT_WRITEFUNCTION, writeToFile);
-                curl_easy_setopt(this->m_curl, CURLOPT_WRITEDATA, &file);
-
-                return this->executeImpl<T>(response);
-            });
-        }
-
-        std::future<Result<std::vector<u8>>> downloadFile() {
-            return std::async(std::launch::async, [this] {
-                std::vector<u8> response;
-
-                curl_easy_setopt(this->m_curl, CURLOPT_WRITEFUNCTION, writeToVector);
-                curl_easy_setopt(this->m_curl, CURLOPT_WRITEDATA, &response);
-
-                return this->executeImpl<std::vector<u8>>(response);
-            });
-        }
+        std::future<Result<std::vector<u8>>> downloadFile();
 
         template<typename T = std::string>
-        std::future<Result<T>> uploadFile(const std::fs::path &path, const std::string &mimeName = "filename") {
-            return std::async(std::launch::async, [this, path, mimeName]{
-                auto fileName = wolv::util::toUTF8String(path.filename());
-
-                curl_mime *mime     = curl_mime_init(this->m_curl);
-                curl_mimepart *part = curl_mime_addpart(mime);
-
-                wolv::io::File file(path, wolv::io::File::Mode::Read);
-
-                curl_mime_data_cb(part, file.getSize(),
-                                  [](char *buffer, size_t size, size_t nitems, void *arg) -> size_t {
-                                      auto file = static_cast<FILE*>(arg);
-
-                                      return fread(buffer, size, nitems, file);
-                                  },
-                                  [](void *arg, curl_off_t offset, int origin) -> int {
-                                      auto file = static_cast<FILE*>(arg);
-
-                                      if (fseek(file, offset, origin) != 0)
-                                          return CURL_SEEKFUNC_CANTSEEK;
-                                      else
-                                          return CURL_SEEKFUNC_OK;
-                                  },
-                                  [](void *arg) {
-                                      auto file = static_cast<FILE*>(arg);
-
-                                      fclose(file);
-                                  },
-                                  file.getHandle());
-                curl_mime_filename(part, fileName.c_str());
-                curl_mime_name(part, mimeName.c_str());
-
-                curl_easy_setopt(this->m_curl, CURLOPT_MIMEPOST, mime);
-
-                std::vector<u8> responseData;
-                curl_easy_setopt(this->m_curl, CURLOPT_WRITEFUNCTION, writeToVector);
-                curl_easy_setopt(this->m_curl, CURLOPT_WRITEDATA, &responseData);
-
-                return this->executeImpl<T>(responseData);
-            });
-        }
-        template<typename T = std::string>
-        std::future<Result<T>> uploadFile(std::vector<u8> data, const std::string &mimeName = "filename", const std::fs::path &fileName = "data.bin") {
-            return std::async(std::launch::async, [this, data = std::move(data), mimeName, fileName]{
-                curl_mime *mime     = curl_mime_init(this->m_curl);
-                curl_mimepart *part = curl_mime_addpart(mime);
-
-                curl_mime_data(part, reinterpret_cast<const char *>(data.data()), data.size());
-                auto fileNameStr = wolv::util::toUTF8String(fileName.filename());
-                curl_mime_filename(part, fileNameStr.c_str());
-                curl_mime_name(part, mimeName.c_str());
-
-                curl_easy_setopt(this->m_curl, CURLOPT_MIMEPOST, mime);
-
-                std::vector<u8> responseData;
-                curl_easy_setopt(this->m_curl, CURLOPT_WRITEFUNCTION, writeToVector);
-                curl_easy_setopt(this->m_curl, CURLOPT_WRITEDATA, &responseData);
-
-                return this->executeImpl<T>(responseData);
-            });
-        }
+        std::future<Result<T>> uploadFile(const std::fs::path &path, const std::string &mimeName = "filename");
 
         template<typename T = std::string>
-        std::future<Result<T>> execute() {
-            return std::async(std::launch::async, [this] {
+        std::future<Result<T>> uploadFile(std::vector<u8> data, const std::string &mimeName = "filename", const std::fs::path &fileName = "data.bin");
 
-                std::vector<u8> responseData;
-                curl_easy_setopt(this->m_curl, CURLOPT_WRITEFUNCTION, writeToVector);
-                curl_easy_setopt(this->m_curl, CURLOPT_WRITEDATA, &responseData);
+        template<typename T = std::string>
+        std::future<Result<T>> execute();
 
-                return this->executeImpl<T>(responseData);
-            });
-        }
+        static std::string urlEncode(const std::string &input);
 
-        std::string urlEncode(const std::string &input) {
-            auto escapedString = curl_easy_escape(this->m_curl, input.c_str(), std::strlen(input.c_str()));
-
-            if (escapedString != nullptr) {
-                std::string output = escapedString;
-                curl_free(escapedString);
-
-                return output;
-            }
-
-            return {};
-        }
-
-        std::string urlDecode(const std::string &input) {
-            auto unescapedString = curl_easy_unescape(this->m_curl, input.c_str(), std::strlen(input.c_str()), nullptr);
-
-            if (unescapedString != nullptr) {
-                std::string output = unescapedString;
-                curl_free(unescapedString);
-
-                return output;
-            }
-
-            return {};
-        }
+        static std::string urlDecode(const std::string &input);
 
     protected:
         void setDefaultConfig();
 
         template<typename T>
-        Result<T> executeImpl(std::vector<u8> &data) {
-            curl_easy_setopt(this->m_curl, CURLOPT_URL, this->m_url.c_str());
-            curl_easy_setopt(this->m_curl, CURLOPT_CUSTOMREQUEST, this->m_method.c_str());
+        Result<T> executeImpl(std::vector<u8> &data);
 
-            setDefaultConfig();
-
-            if (!this->m_body.empty()) {
-                curl_easy_setopt(this->m_curl, CURLOPT_POSTFIELDS, this->m_body.c_str());
-            }
-
-            curl_slist *headers = nullptr;
-            headers = curl_slist_append(headers, "Cache-Control: no-cache");
-            ON_SCOPE_EXIT { curl_slist_free_all(headers); };
-
-            for (auto &[key, value] : this->m_headers) {
-                std::string header = hex::format("{}: {}", key, value);
-                headers = curl_slist_append(headers, header.c_str());
-            }
-            curl_easy_setopt(this->m_curl, CURLOPT_HTTPHEADER, headers);
-
-            {
-                std::scoped_lock lock(this->m_transmissionMutex);
-
-                auto result = curl_easy_perform(this->m_curl);
-                if (result != CURLE_OK){
-                    char *url = nullptr;
-                    curl_easy_getinfo(this->m_curl, CURLINFO_EFFECTIVE_URL, &url);
-                    log::error("Http request '{0} {1}' failed with error {2}: '{3}'", this->m_method, url, u32(result), curl_easy_strerror(result));
-                    if (!HttpRequest::s_proxyUrl.empty()){
-                        log::info("A custom proxy '{0}' is in use. Is it working correctly?", HttpRequest::s_proxyUrl);
-                    }
-
-                    return { };
-                }
-            }
-
-            long statusCode = 0;
-            curl_easy_getinfo(this->m_curl, CURLINFO_RESPONSE_CODE, &statusCode);
-
-            return Result<T>(statusCode, { data.begin(), data.end() });
-        }
-
-        [[maybe_unused]] static CURLcode sslCtxFunction(CURL *ctx, void *sslctx, void *userData);
         static size_t writeToVector(void *contents, size_t size, size_t nmemb, void *userdata);
         static size_t writeToFile(void *contents, size_t size, size_t nmemb, void *userdata);
         static int progressCallback(void *contents, curl_off_t dlTotal, curl_off_t dlNow, curl_off_t ulTotal, curl_off_t ulNow);
 
     private:
+        static void checkProxyErrors();
+
+    private:
+        #if defined(OS_WEB)
+        emscripten_fetch_attr_t m_attr;
+        #else
         CURL *m_curl;
+        #endif
 
         std::mutex m_transmissionMutex;
 
         std::string m_method;
         std::string m_url;
         std::string m_body;
+        std::promise<std::vector<u8>> m_promise;
         std::map<std::string, std::string> m_headers;
         u32 m_timeout = 1000;
 
         std::atomic<float> m_progress = 0.0F;
         std::atomic<bool> m_canceled = false;
-
-        [[maybe_unused]] std::unique_ptr<mbedtls_x509_crt> m_caCert;
-        static std::string s_caCertData, s_proxyUrl;
     };
+}
 
-}
+
+#if defined(OS_WEB)
+#include <hex/helpers/http_requests_emscripten.hpp>
+#else
+#include <hex/helpers/http_requests_native.hpp>
+#endif

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

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

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

@@ -0,0 +1,145 @@
+#pragma once
+
+#include <string>
+#include <future>
+
+#include <curl/curl.h>
+
+#include <hex/helpers/logger.hpp>
+#include <hex/helpers/fmt.hpp>
+
+#include <wolv/utils/string.hpp>
+
+namespace hex {
+
+    template<typename T>
+    std::future<HttpRequest::Result<T>> HttpRequest::downloadFile(const std::fs::path &path) {
+        return std::async(std::launch::async, [this, path] {
+            std::vector<u8> response;
+
+            wolv::io::File file(path, wolv::io::File::Mode::Create);
+            curl_easy_setopt(this->m_curl, CURLOPT_WRITEFUNCTION, writeToFile);
+            curl_easy_setopt(this->m_curl, CURLOPT_WRITEDATA, &file);
+
+            return this->executeImpl<T>(response);
+        });
+    }
+
+    template<typename T>
+    std::future<HttpRequest::Result<T>> HttpRequest::uploadFile(const std::fs::path &path, const std::string &mimeName) {
+        return std::async(std::launch::async, [this, path, mimeName]{
+            auto fileName = wolv::util::toUTF8String(path.filename());
+
+            curl_mime *mime     = curl_mime_init(this->m_curl);
+            curl_mimepart *part = curl_mime_addpart(mime);
+
+            wolv::io::File file(path, wolv::io::File::Mode::Read);
+
+            curl_mime_data_cb(part, file.getSize(),
+                                [](char *buffer, size_t size, size_t nitems, void *arg) -> size_t {
+                                    auto handle = static_cast<FILE*>(arg);
+
+                                    return fread(buffer, size, nitems, handle);
+                                },
+                                [](void *arg, curl_off_t offset, int origin) -> int {
+                                    auto handle = static_cast<FILE*>(arg);
+
+                                    if (fseek(handle, offset, origin) != 0)
+                                        return CURL_SEEKFUNC_CANTSEEK;
+                                    else
+                                        return CURL_SEEKFUNC_OK;
+                                },
+                                [](void *arg) {
+                                    auto handle = static_cast<FILE*>(arg);
+
+                                    fclose(handle);
+                                },
+                                file.getHandle());
+            curl_mime_filename(part, fileName.c_str());
+            curl_mime_name(part, mimeName.c_str());
+
+            curl_easy_setopt(this->m_curl, CURLOPT_MIMEPOST, mime);
+
+            std::vector<u8> responseData;
+            curl_easy_setopt(this->m_curl, CURLOPT_WRITEFUNCTION, writeToVector);
+            curl_easy_setopt(this->m_curl, CURLOPT_WRITEDATA, &responseData);
+
+            return this->executeImpl<T>(responseData);
+        });
+    }
+
+    template<typename T>
+    std::future<HttpRequest::Result<T>> HttpRequest::uploadFile(std::vector<u8> data, const std::string &mimeName, const std::fs::path &fileName) {
+        return std::async(std::launch::async, [this, data = std::move(data), mimeName, fileName]{
+            curl_mime *mime     = curl_mime_init(this->m_curl);
+            curl_mimepart *part = curl_mime_addpart(mime);
+
+            curl_mime_data(part, reinterpret_cast<const char *>(data.data()), data.size());
+            auto fileNameStr = wolv::util::toUTF8String(fileName.filename());
+            curl_mime_filename(part, fileNameStr.c_str());
+            curl_mime_name(part, mimeName.c_str());
+
+            curl_easy_setopt(this->m_curl, CURLOPT_MIMEPOST, mime);
+
+            std::vector<u8> responseData;
+            curl_easy_setopt(this->m_curl, CURLOPT_WRITEFUNCTION, writeToVector);
+            curl_easy_setopt(this->m_curl, CURLOPT_WRITEDATA, &responseData);
+
+            return this->executeImpl<T>(responseData);
+        });
+    }
+
+    template<typename T>
+    std::future<HttpRequest::Result<T>> HttpRequest::execute() {
+        return std::async(std::launch::async, [this] {
+
+            std::vector<u8> responseData;
+            curl_easy_setopt(this->m_curl, CURLOPT_WRITEFUNCTION, writeToVector);
+            curl_easy_setopt(this->m_curl, CURLOPT_WRITEDATA, &responseData);
+
+            return this->executeImpl<T>(responseData);
+        });
+    }
+
+    template<typename T>
+    HttpRequest::Result<T> HttpRequest::executeImpl(std::vector<u8> &data) {
+        curl_easy_setopt(this->m_curl, CURLOPT_URL, this->m_url.c_str());
+        curl_easy_setopt(this->m_curl, CURLOPT_CUSTOMREQUEST, this->m_method.c_str());
+
+        setDefaultConfig();
+
+        if (!this->m_body.empty()) {
+            curl_easy_setopt(this->m_curl, CURLOPT_POSTFIELDS, this->m_body.c_str());
+        }
+
+        curl_slist *headers = nullptr;
+        headers = curl_slist_append(headers, "Cache-Control: no-cache");
+        ON_SCOPE_EXIT { curl_slist_free_all(headers); };
+
+        for (auto &[key, value] : this->m_headers) {
+            std::string header = hex::format("{}: {}", key, value);
+            headers = curl_slist_append(headers, header.c_str());
+        }
+        curl_easy_setopt(this->m_curl, CURLOPT_HTTPHEADER, headers);
+
+        {
+            std::scoped_lock lock(this->m_transmissionMutex);
+
+            auto result = curl_easy_perform(this->m_curl);
+            if (result != CURLE_OK){
+                char *url = nullptr;
+                curl_easy_getinfo(this->m_curl, CURLINFO_EFFECTIVE_URL, &url);
+                log::error("Http request '{0} {1}' failed with error {2}: '{3}'", this->m_method, url, u32(result), curl_easy_strerror(result));
+                checkProxyErrors();
+
+                return { };
+            }
+        }
+
+        long statusCode = 0;
+        curl_easy_getinfo(this->m_curl, CURLINFO_RESPONSE_CODE, &statusCode);
+
+        return Result<T>(statusCode, { data.begin(), data.end() });
+    }
+
+}

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

@@ -2,7 +2,7 @@
 
 namespace hex {
 
-    inline void unused(auto && ... x) {
+    void unused(auto && ... x) {
         ((void)x, ...);
     }
 

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

@@ -4,19 +4,19 @@ namespace hex::literals {
 
     /* Byte literals */
 
-    constexpr static inline unsigned long long operator""_Bytes(unsigned long long bytes) noexcept {
+    constexpr static unsigned long long operator""_Bytes(unsigned long long bytes) noexcept {
         return bytes;
     }
 
-    constexpr static inline unsigned long long operator""_KiB(unsigned long long kiB) noexcept {
+    constexpr static unsigned long long operator""_KiB(unsigned long long kiB) noexcept {
         return operator""_Bytes(kiB * 1024);
     }
 
-    constexpr static inline unsigned long long operator""_MiB(unsigned long long MiB) noexcept {
+    constexpr static unsigned long long operator""_MiB(unsigned long long MiB) noexcept {
         return operator""_KiB(MiB * 1024);
     }
 
-    constexpr static inline unsigned long long operator""_GiB(unsigned long long GiB) noexcept {
+    constexpr static unsigned long long operator""_GiB(unsigned long long GiB) noexcept {
         return operator""_MiB(GiB * 1024);
     }
 

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

@@ -2,12 +2,10 @@
 
 #include <hex.hpp>
 
-#include <chrono>
 #include <mutex>
 
 #include <fmt/core.h>
 #include <fmt/color.h>
-#include <fmt/chrono.h>
 
 #include <wolv/io/file.hpp>
 
@@ -19,60 +17,76 @@ namespace hex::log {
         wolv::io::File& getFile();
         bool isRedirected();
         [[maybe_unused]] void redirectToFile();
+        [[maybe_unused]] void enableColorPrinting();
 
-        extern std::mutex s_loggerMutex;
+        extern std::mutex g_loggerMutex;
 
-    }
+        struct LogEntry {
+            std::string project;
+            std::string level;
+            std::string message;
+        };
 
-    namespace {
+        std::vector<LogEntry>& getLogEntries();
 
-        [[maybe_unused]] void printPrefix(FILE *dest, const fmt::text_style &ts, const std::string &level) {
-            const auto now = fmt::localtime(std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()));
+        [[maybe_unused]] void printPrefix(FILE *dest, const fmt::text_style &ts, const std::string &level);
 
-            fmt::print(dest, "[{0:%H:%M:%S}] ", now);
-
-            if (impl::isRedirected())
-                fmt::print(dest, "{0} ", level);
-            else
-                fmt::print(dest, ts, "{0} ", level);
-
-            fmt::print(dest, "[{0}] ", IMHEX_PROJECT_NAME);
-        }
-
-        template<typename... T>
-        [[maybe_unused]] void print(const fmt::text_style &ts, const std::string &level, const std::string &fmt, auto... args) {
-            std::scoped_lock lock(impl::s_loggerMutex);
+        [[maybe_unused]] void print(const fmt::text_style &ts, const std::string &level, const std::string &fmt, auto && ... args) {
+            std::scoped_lock lock(impl::g_loggerMutex);
 
             auto dest = impl::getDestination();
             printPrefix(dest, ts, level);
-            fmt::print(dest, fmt::runtime(fmt), args...);
-            fmt::print(dest, "\n");
+
+            auto message = fmt::format(fmt::runtime(fmt), args...);
+            fmt::print(dest, "{}\n", message);
+            fflush(dest);
+
+            impl::getLogEntries().push_back({ IMHEX_PROJECT_NAME, level, std::move(message) });
         }
 
     }
 
-    [[maybe_unused]] void debug(const std::string &fmt, auto &&...args) {
-#if defined(DEBUG)
-        hex::log::print(fg(fmt::color::light_green) | fmt::emphasis::bold, "[DEBUG]", fmt, args...);
-#else
-        hex::unused(fmt, args...);
-#endif
+    [[maybe_unused]] void debug(const std::string &fmt, auto && ... args) {
+        #if defined(DEBUG)
+            hex::log::impl::print(fg(fmt::color::light_green) | fmt::emphasis::bold, "[DEBUG]", fmt, args...);
+        #else
+            impl::getLogEntries().push_back({ IMHEX_PROJECT_NAME, "[DEBUG]", fmt::format(fmt::runtime(fmt), args...) });
+        #endif
     }
 
-    [[maybe_unused]] void info(const std::string &fmt, auto &&...args) {
-        hex::log::print(fg(fmt::color::cadet_blue) | fmt::emphasis::bold, "[INFO] ", fmt, args...);
+    [[maybe_unused]] void info(const std::string &fmt, auto && ... args) {
+        hex::log::impl::print(fg(fmt::color::cadet_blue) | fmt::emphasis::bold, "[INFO] ", fmt, args...);
     }
 
-    [[maybe_unused]] void warn(const std::string &fmt, auto &&...args) {
-        hex::log::print(fg(fmt::color::orange) | fmt::emphasis::bold, "[WARN] ", fmt, args...);
+    [[maybe_unused]] void warn(const std::string &fmt, auto && ... args) {
+        hex::log::impl::print(fg(fmt::color::orange) | fmt::emphasis::bold, "[WARN] ", fmt, args...);
     }
 
-    [[maybe_unused]] void error(const std::string &fmt, auto &&...args) {
-        hex::log::print(fg(fmt::color::red) | fmt::emphasis::bold, "[ERROR]", fmt, args...);
+    [[maybe_unused]] void error(const std::string &fmt, auto && ... args) {
+        hex::log::impl::print(fg(fmt::color::red) | fmt::emphasis::bold, "[ERROR]", fmt, args...);
     }
 
-    [[maybe_unused]] void fatal(const std::string &fmt, auto &&...args) {
-        hex::log::print(fg(fmt::color::purple) | fmt::emphasis::bold, "[FATAL]", fmt, args...);
+    [[maybe_unused]] void fatal(const std::string &fmt, auto && ... args) {
+        hex::log::impl::print(fg(fmt::color::purple) | fmt::emphasis::bold, "[FATAL]", fmt, args...);
+    }
+
+
+    [[maybe_unused]] void print(const std::string &fmt, auto && ... args) {
+        std::scoped_lock lock(impl::g_loggerMutex);
+
+        auto dest = impl::getDestination();
+        auto message = fmt::format(fmt::runtime(fmt), args...);
+        fmt::print(dest, "{}", message);
+        fflush(dest);
+    }
+
+    [[maybe_unused]] void println(const std::string &fmt, auto && ... args) {
+        std::scoped_lock lock(impl::g_loggerMutex);
+
+        auto dest = impl::getDestination();
+        auto message = fmt::format(fmt::runtime(fmt), args...);
+        fmt::print(dest, "{}\n", message);
+        fflush(dest);
     }
 
 }

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

@@ -9,11 +9,12 @@
 #include <span>
 #include <string>
 
-#include <imgui_impl_opengl3_loader.h>
+#include <opengl_support.h>
+#include <GLFW/glfw3.h>
 
 namespace hex::gl {
 
-    namespace {
+    namespace impl {
 
         template<typename T>
         GLuint getType() {
@@ -21,8 +22,10 @@ namespace hex::gl {
                 return GL_FLOAT;
             else if constexpr (std::is_same_v<T, u32>)
                 return GL_UNSIGNED_INT;
-            else
+            else {
                 static_assert(hex::always_false<T>::value, "Unsupported type");
+                return 0;
+            }
         }
 
     }
@@ -41,30 +44,30 @@ namespace hex::gl {
 
         [[nodiscard]] size_t size() const { return this->m_data.size(); }
 
-        auto operator+(const Vector<T, Size>& other) {
+        auto operator+(const Vector& other) {
             auto copy = *this;
             for (size_t i = 0; i < Size; i++)
                 copy[i] += other[i];
             return copy;
         }
 
-        auto operator-(const Vector<T, Size>& other) {
+        auto operator-(const Vector& other) {
             auto copy = *this;
             for (size_t i = 0; i < Size; i++)
                 copy[i] -= other[i];
             return copy;
         }
 
-        auto dot(const Vector<T, Size>& other) {
+        auto dot(const Vector& other) {
             T result = 0;
             for (size_t i = 0; i < Size; i++)
                 result += this->m_data[i] * other[i];
             return result;
         }
 
-        auto cross(const Vector<T, Size>& other) {
+        auto cross(const Vector& other) {
             static_assert(Size == 3, "Cross product is only defined for 3D vectors");
-            return Vector<T, Size>({ this->m_data[1] * other[2] - this->m_data[2] * other[1], this->m_data[2] * other[0] - this->m_data[0] * other[2], this->m_data[0] * other[1] - this->m_data[1] * other[0] });
+            return Vector({ this->m_data[1] * other[2] - this->m_data[2] * other[1], this->m_data[2] * other[0] - this->m_data[0] * other[2], this->m_data[0] * other[1] - this->m_data[1] * other[0] });
         }
 
         auto normalize() {
@@ -75,7 +78,7 @@ namespace hex::gl {
             return copy;
         }
 
-        auto operator==(const Vector<T, Size>& other) {
+        auto operator==(const Vector& other) {
             for (size_t i = 0; i < Size; i++)
                 if (this->m_data[i] != other[i])
                     return false;
@@ -160,7 +163,7 @@ namespace hex::gl {
         void addBuffer(u32 index, const Buffer<T> &buffer) const {
             glEnableVertexAttribArray(index);
             buffer.bind();
-            glVertexAttribPointer(index, 3, getType<T>(), GL_FALSE, 3 * sizeof(T), nullptr);
+            glVertexAttribPointer(index, 3, impl::getType<T>(), GL_FALSE, 3 * sizeof(T), nullptr);
             buffer.unbind();
         }
 
@@ -168,7 +171,7 @@ namespace hex::gl {
         void unbind() const;
 
     private:
-        GLuint m_array;
+        GLuint m_array = 0;
     };
 
     class Texture {

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

@@ -4,11 +4,14 @@
 
 #include <map>
 #include <vector>
-#include <expected>
+
+#include <wolv/utils/expected.hpp>
 
 namespace hex {
 
-    using Patches = std::map<u64, u8>;
+    namespace prv {
+        class Provider;
+    }
 
     enum class IPSError {
         AddressOutOfRange,
@@ -18,9 +21,22 @@ namespace hex {
         MissingEOF
     };
 
-    std::expected<std::vector<u8>, IPSError> generateIPSPatch(const Patches &patches);
-    std::expected<std::vector<u8>, IPSError> generateIPS32Patch(const Patches &patches);
+    class Patches {
+    public:
+        Patches() = default;
+        Patches(std::map<u64, u8> &&patches) : m_patches(std::move(patches)) {}
 
-    std::expected<Patches, IPSError> loadIPSPatch(const std::vector<u8> &ipsPatch);
-    std::expected<Patches, IPSError> loadIPS32Patch(const std::vector<u8> &ipsPatch);
+        static wolv::util::Expected<Patches, IPSError> fromProvider(hex::prv::Provider *provider);
+        static wolv::util::Expected<Patches, IPSError> fromIPSPatch(const std::vector<u8> &ipsPatch);
+        static wolv::util::Expected<Patches, IPSError> fromIPS32Patch(const std::vector<u8> &ipsPatch);
+
+        wolv::util::Expected<std::vector<u8>, IPSError> toIPSPatch() const;
+        wolv::util::Expected<std::vector<u8>, IPSError> toIPS32Patch() const;
+
+        const auto& get() const { return this->m_patches; }
+        auto& get() { return this->m_patches; }
+
+    private:
+        std::map<u64, u8> m_patches;
+    };
 }

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

@@ -30,7 +30,7 @@ namespace hex {
          * @brief get the error string explaining the error that occured when opening the file.
          * This error is a combination of the tar error and the native file open error
          */
-        std::string getOpenErrorString();
+        std::string getOpenErrorString() const;
 
         [[nodiscard]] std::vector<u8> readVector(const std::fs::path &path);
         [[nodiscard]] std::string readString(const std::fs::path &path);
@@ -52,7 +52,7 @@ namespace hex {
 
         bool m_valid = false;
         
-        // these will be updated when the constructor is called
+        // These will be updated when the constructor is called
         int m_tarOpenErrno = MTAR_ESUCCESS;
         int m_fileOpenErrno = 0;
     };

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

@@ -21,7 +21,7 @@ namespace hex {
 
     struct Region {
         u64 address;
-        size_t size;
+        u64 size;
 
         [[nodiscard]] constexpr bool isWithin(const Region &other) const {
             if (*this == Invalid() || other == Invalid())
@@ -44,7 +44,12 @@ namespace hex {
         }
 
         [[nodiscard]] constexpr u64 getStartAddress() const { return this->address; }
-        [[nodiscard]] constexpr u64 getEndAddress() const { return this->address + this->size - 1;}
+        [[nodiscard]] constexpr u64 getEndAddress() const {
+            if (this->size == 0)
+                return this->address;
+            else
+                return this->address + this->size - 1;
+        }
         [[nodiscard]] constexpr size_t getSize() const { return this->size; }
 
         [[nodiscard]] constexpr bool operator==(const Region &other) const {

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

@@ -4,7 +4,6 @@
 
 #include <hex/helpers/concepts.hpp>
 #include <hex/helpers/fs.hpp>
-#include <hex/helpers/intrinsics.hpp>
 
 #include <array>
 #include <bit>
@@ -19,10 +18,20 @@
 #include <variant>
 #include <vector>
 
+#if defined(OS_MACOS)
+    #include <hex/helpers/utils_macos.hpp>
+#elif defined(OS_LINUX)
+    #include <hex/helpers/utils_linux.hpp>
+#endif
+
 struct ImVec2;
 
 namespace hex {
 
+    namespace prv {
+        class Provider;
+    }
+
     template<typename T>
     [[nodiscard]] std::vector<T> sampleData(const std::vector<T> &data, size_t count) {
         size_t stride = std::max(1.0, double(data.size()) / count);
@@ -59,13 +68,14 @@ namespace hex {
     [[nodiscard]] std::string toByteString(u64 bytes);
     [[nodiscard]] std::string makePrintable(u8 c);
 
-    void runCommand(const std::string &command);
+    void startProgram(const std::string &command);
+    int executeCommand(const std::string &command);
     void openWebpage(std::string url);
 
     [[nodiscard]] std::string encodeByteString(const std::vector<u8> &bytes);
     [[nodiscard]] std::vector<u8> decodeByteString(const std::string &string);
 
-    [[nodiscard]] constexpr inline u64 extract(u8 from, u8 to, const std::unsigned_integral auto &value) {
+    [[nodiscard]] constexpr u64 extract(u8 from, u8 to, const std::unsigned_integral auto &value) {
         if (from < to) std::swap(from, to);
 
         using ValueType = std::remove_cvref_t<decltype(value)>;
@@ -89,13 +99,13 @@ namespace hex {
         return (value & mask) >> to;
     }
 
-    [[nodiscard]] constexpr inline i128 signExtend(size_t numBits, i128 value) {
+    [[nodiscard]] constexpr i128 signExtend(size_t numBits, i128 value) {
         i128 mask = 1ULL << (numBits - 1);
         return (value ^ mask) - mask;
     }
 
     template<std::integral T>
-    [[nodiscard]] constexpr inline T swapBitOrder(size_t numBits, T value) {
+    [[nodiscard]] constexpr T swapBitOrder(size_t numBits, T value) {
         T result = 0x00;
 
         for (size_t bit = 0; bit < numBits; bit++) {
@@ -106,14 +116,14 @@ namespace hex {
         return result;
     }
 
-    [[nodiscard]] constexpr inline size_t strnlen(const char *s, size_t n) {
+    [[nodiscard]] constexpr size_t strnlen(const char *s, size_t n) {
         size_t i = 0;
         while (i < n && s[i] != '\x00') i++;
 
         return i;
     }
 
-    template<size_t Size>
+    template<size_t>
     struct SizeTypeImpl { };
 
     template<>
@@ -214,7 +224,7 @@ namespace hex {
 
     [[nodiscard]] inline std::vector<u8> parseByteString(const std::string &string) {
         auto byteString = std::string(string);
-        byteString.erase(std::remove(byteString.begin(), byteString.end(), ' '), byteString.end());
+        std::erase(byteString, ' ');
 
         if ((byteString.length() % 2) != 0) return {};
 
@@ -229,11 +239,11 @@ namespace hex {
         return result;
     }
 
-    [[nodiscard]] inline std::string toBinaryString(std::unsigned_integral auto number) {
+    [[nodiscard]] std::string toBinaryString(std::unsigned_integral auto number) {
         if (number == 0) return "0";
 
         std::string result;
-        for (i16 bit = hex::bit_width(number) - 1; bit >= 0; bit--)
+        for (i16 bit = hex::bit_width(number) - 1; bit >= 0; bit -= 1)
             result += (number & (0b1 << bit)) == 0 ? '0' : '1';
 
         return result;
@@ -286,4 +296,7 @@ namespace hex {
 
     [[nodiscard]] std::optional<std::fs::path> getInitialFilePath();
 
+    [[nodiscard]] std::string generateHexView(u64 offset, u64 size, prv::Provider *provider);
+    [[nodiscard]] std::string generateHexView(u64 offset, const std::vector<u8> &data);
+
 }

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

@@ -0,0 +1,9 @@
+#pragma once
+
+#if defined(OS_LINUX)
+
+namespace hex {
+    void executeCmd(const std::vector<std::string> &argsVector);
+}
+
+#endif

lib/libimhex/include/hex/plugin.hpp

@@ -1,9 +1,21 @@
 #pragma once
 
+#include <hex.hpp>
+#include <hex/api/plugin_manager.hpp>
+
+#include <string>
+
 #include <imgui.h>
 #include <imgui_internal.h>
 
-#include <hex.hpp>
+#include <wolv/utils/string.hpp>
+#include <wolv/utils/preproc.hpp>
+
+#if defined (IMHEX_STATIC_LINK_PLUGINS)
+    #define IMHEX_PLUGIN_VISIBILITY_PREFIX static
+#else
+    #define IMHEX_PLUGIN_VISIBILITY_PREFIX extern "C" [[gnu::visibility("default")]]
+#endif
 
 /**
  * This macro is used to define all the required entry points for a plugin.
@@ -11,13 +23,43 @@
  */
 #define IMHEX_PLUGIN_SETUP(name, author, description) IMHEX_PLUGIN_SETUP_IMPL(name, author, description)
 
-#define IMHEX_PLUGIN_SETUP_IMPL(name, author, description)                                                 \
-    extern "C" [[gnu::visibility("default")]] const char *getPluginName() { return name; }                 \
-    extern "C" [[gnu::visibility("default")]] const char *getPluginAuthor() { return author; }             \
-    extern "C" [[gnu::visibility("default")]] const char *getPluginDescription() { return description; }   \
-    extern "C" [[gnu::visibility("default")]] const char *getCompatibleVersion() { return IMHEX_VERSION; } \
-    extern "C" [[gnu::visibility("default")]] void setImGuiContext(ImGuiContext *ctx) {                    \
-        ImGui::SetCurrentContext(ctx);                                                                     \
-        GImGui = ctx;                                                                                      \
-    }                                                                                                      \
-    extern "C" [[gnu::visibility("default")]] void initializePlugin()
+#define IMHEX_PLUGIN_SETUP_IMPL(name, author, description)                                                      \
+    IMHEX_PLUGIN_VISIBILITY_PREFIX const char *getPluginName() { return name; }                                 \
+    IMHEX_PLUGIN_VISIBILITY_PREFIX const char *getPluginAuthor() { return author; }                             \
+    IMHEX_PLUGIN_VISIBILITY_PREFIX const char *getPluginDescription() { return description; }                   \
+    IMHEX_PLUGIN_VISIBILITY_PREFIX const char *getCompatibleVersion() { return IMHEX_VERSION; }                 \
+    IMHEX_PLUGIN_VISIBILITY_PREFIX void setImGuiContext(ImGuiContext *ctx) {                                    \
+        ImGui::SetCurrentContext(ctx);                                                                          \
+        GImGui = ctx;                                                                                           \
+    }                                                                                                           \
+    IMHEX_PLUGIN_VISIBILITY_PREFIX void initializePlugin();                                                     \
+    extern "C" [[gnu::visibility("default")]] void WOLV_TOKEN_CONCAT(forceLinkPlugin_, IMHEX_PLUGIN_NAME)() {   \
+        hex::PluginManager::addPlugin(hex::PluginFunctions {                                                    \
+            initializePlugin,                                                                                   \
+            getPluginName,                                                                                      \
+            getPluginAuthor,                                                                                    \
+            getPluginDescription,                                                                               \
+            getCompatibleVersion,                                                                               \
+            setImGuiContext,                                                                                    \
+            nullptr,                                                                                            \
+            nullptr                                                                                             \
+        });                                                                                                     \
+    }                                                                                                           \
+    IMHEX_PLUGIN_VISIBILITY_PREFIX void initializePlugin()
+
+/**
+ * This macro is used to define subcommands defined by the plugin
+ * A subcommand consists of a key, a description, and a callback
+ * The key is what the first argument to ImHex should be, prefixed by `--`
+ * For example, if the key if `help`, ImHex should be started with `--help` as its first argument to trigger the subcommand
+ * when the subcommand is triggerred, it's callback will be executed. The callback is executed BEFORE most of ImHex initialization
+ * so to do anything meaningful, you should subscribe to an event (like EventImHexStartupFinished) and run your code there.
+ */
+#define IMHEX_PLUGIN_SUBCOMMANDS() IMHEX_PLUGIN_SUBCOMMANDS_IMPL()
+
+#define IMHEX_PLUGIN_SUBCOMMANDS_IMPL()                                                 \
+    extern std::vector<hex::SubCommand> g_subCommands;                                  \
+    extern "C" [[gnu::visibility("default")]] void* getSubCommands() {                  \
+        return &g_subCommands;                                                          \
+    }                                                                                   \
+    std::vector<hex::SubCommand> g_subCommands

lib/libimhex/include/hex/providers/buffered_reader.hpp

@@ -1,8 +1,5 @@
 #pragma once
 
-#include <span>
-#include <vector>
-
 #include <hex/providers/provider.hpp>
 #include <hex/helpers/literals.hpp>
 
@@ -20,7 +17,7 @@ namespace hex::prv {
     public:
         using BufferedReader::BufferedReader;
 
-        ProviderReader(Provider *provider, size_t bufferSize = 0x100000) : BufferedReader(provider, provider->getActualSize(), bufferSize) {
+        explicit ProviderReader(Provider *provider, size_t bufferSize = 0x100000) : BufferedReader(provider, provider->getActualSize(), bufferSize) {
             this->setEndAddress(provider->getBaseAddress() + provider->getActualSize() - 1);
             this->seek(provider->getBaseAddress());
         }

lib/libimhex/include/hex/providers/provider.hpp

@@ -6,13 +6,15 @@
 #include <map>
 #include <optional>
 #include <string>
+#include <variant>
 #include <vector>
 
-#include <hex/api/imhex_api.hpp>
 #include <hex/providers/overlay.hpp>
 #include <hex/helpers/fs.hpp>
 
-#include <nlohmann/json.hpp>
+#include <nlohmann/json_fwd.hpp>
+
+#include <hex/providers/undo_redo/stack.hpp>
 
 namespace hex::prv {
 
@@ -36,11 +38,68 @@ namespace hex::prv {
         Provider();
         virtual ~Provider();
 
+        /**
+         * @brief Opens this provider
+         * @note The return value of this function allows to ensure the provider is available,
+         * so calling Provider::isAvailable() just after a call to open() that returned true is redundant.
+         * @note This is not related to the EventProviderOpened event
+         * @return true if the provider was opened successfully, else false
+         */
+        [[nodiscard]] virtual bool open() = 0;
+
+        /**
+         * @brief Closes this provider
+         * @note This function is called when the user requests for a provider to be closed, e.g. by closing a tab.
+         * In general, this function should close the underlying data source but leave the provider in a state where
+         * it can be opened again later by calling the open() function again.
+         */
+        virtual void close() = 0;
+
+        /**
+         * @brief Checks if this provider is open and can be used to access data
+         * @return Generally, if the open() function succeeded and the data source was successfully opened, this
+         * function should return true
+         */
         [[nodiscard]] virtual bool isAvailable() const = 0;
+
+        /**
+         * @brief Checks if the data in this provider can be read
+         * @return True if the provider is readable, false otherwise
+         */
         [[nodiscard]] virtual bool isReadable() const  = 0;
+
+        /**
+         * @brief Controls if the user can write data to this specific provider.
+         *   This may be false for e.g. a file opened in read-only
+         */
         [[nodiscard]] virtual bool isWritable() const  = 0;
+
+        /**
+         * @brief Controls if the user can resize this provider
+         * @return True if the provider is resizable, false otherwise
+         */
         [[nodiscard]] virtual bool isResizable() const = 0;
-        [[nodiscard]] virtual bool isSavable() const   = 0;
+
+        /**
+         * @brief Controls whether the provider can be saved ("saved", not "saved as")
+         *   This is mainly used by providers that aren't buffered, and so don't need to be saved
+         *   This function will usually return false for providers that aren't writable, but this isn't guaranted
+         */
+        [[nodiscard]] virtual bool isSavable() const = 0;
+
+        /**
+         * @brief Controls whether we can dump data from this provider (e.g. "save as", or "export -> ..").
+         *   Typically disabled for process with sparse data, like the Process memory provider
+         *   where the virtual address space is several TiBs large.
+         *   Default implementation returns true.
+         */
+        [[nodiscard]] virtual bool isDumpable() const;
+
+        /**
+         * @brief Controls whether this provider can be saved as a recent entry
+         *   Typically used for providers that do not retain data, e.g. the memory provider
+         */
+        [[nodiscard]] virtual bool isSavableAsRecent() const { return true; }
 
         /**
          * @brief Read data from this provider, applying overlays and patches
@@ -49,7 +108,7 @@ namespace hex::prv {
          * @param size number of bytes to read
          * @param overlays apply overlays and patches is true. Same as readRaw() if false
          */
-        virtual void read(u64 offset, void *buffer, size_t size, bool overlays = true);
+        void read(u64 offset, void *buffer, size_t size, bool overlays = true);
         
         /**
          * @brief Write data to the patches of this provider. Will not directly modify provider.
@@ -57,14 +116,7 @@ namespace hex::prv {
          * @param buffer buffer to take data to write from
          * @param size number of bytes to write
          */
-        virtual void write(u64 offset, const void *buffer, size_t size);
-
-        virtual void resize(size_t newSize);
-        virtual void insert(u64 offset, size_t size);
-        virtual void remove(u64 offset, size_t size);
-
-        virtual void save();
-        virtual void saveAs(const std::fs::path &path);
+        void write(u64 offset, const void *buffer, size_t size);
 
         /**
          * @brief Read data from this provider, without applying overlays and patches
@@ -72,7 +124,7 @@ namespace hex::prv {
          * @param buffer buffer to write read data
          * @param size number of bytes to read
          */
-        virtual void readRaw(u64 offset, void *buffer, size_t size)        = 0;
+        virtual void readRaw(u64 offset, void *buffer, size_t size) = 0;
         /**
          * @brief Write data directly to this provider
          * @param offset offset to start writing the data
@@ -80,17 +132,45 @@ namespace hex::prv {
          * @param size number of bytes to write
          */
         virtual void writeRaw(u64 offset, const void *buffer, size_t size) = 0;
-        [[nodiscard]] virtual size_t getActualSize() const                 = 0;
 
-        void applyOverlays(u64 offset, void *buffer, size_t size);
+        /**
+         * @brief Get the full size of the data in this provider
+         * @return The size of the entire available data of this provider
+         */
+        [[nodiscard]] virtual size_t getActualSize() const = 0;
 
-        [[nodiscard]] std::map<u64, u8> &getPatches();
-        [[nodiscard]] const std::map<u64, u8> &getPatches() const;
-        void applyPatches();
+        /**
+         * @brief Gets the type name of this provider
+         * @note This is mainly used to be stored in project files and recents to be able to later on
+         * recreate this exact provider type. This needs to be unique across all providers, this is usually something
+         * like "hex.builtin.provider.memory" or "hex.builtin.provider.file"
+         * @return The provider's type name
+         */
+        [[nodiscard]] virtual std::string getTypeName() const = 0;
+
+        /**
+         * @brief Gets a human readable representation of the current provider
+         * @note This is mainly used to display the provider in the UI. For example, the file provider
+         * will return the file name here
+         * @return The name of the current provider
+         */
+        [[nodiscard]] virtual std::string getName() const = 0;
+
+        void resize(size_t newSize);
+        void insert(u64 offset, size_t size);
+        void remove(u64 offset, size_t size);
+
+        virtual void resizeRaw(size_t newSize) { hex::unused(newSize); }
+        virtual void insertRaw(u64 offset, size_t size) { hex::unused(offset, size); }
+        virtual void removeRaw(u64 offset, size_t size) { hex::unused(offset, size); }
+
+        virtual void save();
+        virtual void saveAs(const std::fs::path &path);
 
         [[nodiscard]] Overlay *newOverlay();
         void deleteOverlay(Overlay *overlay);
-        [[nodiscard]] const std::list<Overlay *> &getOverlays();
+        void applyOverlays(u64 offset, void *buffer, size_t size) const;
+        [[nodiscard]] const std::list<std::unique_ptr<Overlay>> &getOverlays() const;
 
         [[nodiscard]] size_t getPageSize() const;
         void setPageSize(size_t pageSize);
@@ -105,23 +185,9 @@ namespace hex::prv {
         [[nodiscard]] virtual size_t getSize() const;
         [[nodiscard]] virtual std::optional<u32> getPageOfAddress(u64 address) const;
 
-        [[nodiscard]] virtual std::string getName() const                                                 = 0;
-        [[nodiscard]] virtual std::vector<Description> getDataDescription() const = 0;
+        [[nodiscard]] virtual std::vector<Description> getDataDescription() const;
         [[nodiscard]] virtual std::variant<std::string, i128> queryInformation(const std::string &category, const std::string &argument);
 
-        /**
-         * @brief Opens this provider
-         * the return value of this function allows to ensure the provider is available,
-         * so calling Provider::isAvailable() just after a call to open() that returned true is dedundant.
-         * @note This is not related to the EventProviderOpened event
-         * @return true if the provider was opened sucessfully, else false
-         */
-        [[nodiscard]] virtual bool open() = 0;
-        virtual void close() = 0;
-
-        void addPatch(u64 offset, const void *buffer, size_t size, bool createUndo = false);
-        void createUndoPoint();
-
         void undo();
         void redo();
 
@@ -131,9 +197,7 @@ namespace hex::prv {
         [[nodiscard]] virtual bool hasFilePicker() const;
         virtual bool handleFilePicker();
 
-        virtual std::vector<MenuEntry> getMenuEntries() {
-            return { };
-        };
+        virtual std::vector<MenuEntry> getMenuEntries() { return { }; }
 
         [[nodiscard]] virtual bool hasLoadInterface() const;
         [[nodiscard]] virtual bool hasInterface() const;
@@ -143,11 +207,9 @@ namespace hex::prv {
         [[nodiscard]] u32 getID() const;
         void setID(u32 id);
 
-        [[nodiscard]] virtual nlohmann::json storeSettings(nlohmann::json settings = { }) const;
+        [[nodiscard]] virtual nlohmann::json storeSettings(nlohmann::json settings) const;
         virtual void loadSettings(const nlohmann::json &settings);
 
-        [[nodiscard]] virtual std::string getTypeName() const = 0;
-
         void markDirty(bool dirty = true) { this->m_dirty = dirty; }
         [[nodiscard]] bool isDirty() const { return this->m_dirty; }
 
@@ -159,13 +221,20 @@ namespace hex::prv {
         void setErrorMessage(const std::string &errorMessage) { this->m_errorMessage = errorMessage; }
         [[nodiscard]] const std::string& getErrorMessage() const { return this->m_errorMessage; }
 
+        template<std::derived_from<undo::Operation> T>
+        bool addUndoableOperation(auto && ... args) {
+            return this->m_undoRedoStack.add<T>(std::forward<decltype(args)...>(args)...);
+        }
+
+        [[nodiscard]] undo::Stack& getUndoStack() { return this->m_undoRedoStack; }
+
     protected:
         u32 m_currPage    = 0;
         u64 m_baseAddress = 0;
 
-        std::list<std::map<u64, u8>> m_patches;
-        decltype(m_patches)::iterator m_currPatches;
-        std::list<Overlay *> m_overlays;
+        undo::Stack m_undoRedoStack;
+
+        std::list<std::unique_ptr<Overlay>> m_overlays;
 
         u32 m_id;
 
@@ -187,9 +256,6 @@ namespace hex::prv {
         std::string m_errorMessage;
 
         size_t m_pageSize = MaxPageSize;
-
-    private:
-        static u32 s_idCounter;
     };
 
 }