build: Bumped version to 1.19.3

* cleanup

* Remove prints

.github/workflows/analysis.yml

@@ -56,6 +56,7 @@ jobs:
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache  \
           -DCMAKE_C_FLAGS="-fuse-ld=lld"        \
           -DCMAKE_CXX_FLAGS="-fuse-ld=lld"      \
+          -DIMHEX_PATTERNS_PULL_MASTER=ON       \
           ..
         make -j 4 install
 

.github/workflows/build.yml

@@ -96,6 +96,7 @@ jobs:
           -DCMAKE_OBJC_COMPILER_LAUNCHER=ccache   \
           -DCMAKE_OBJCXX_COMPILER_LAUNCHER=ccache \
           -DRUST_PATH="$USERPROFILE/.cargo/bin/"  \
+          -DIMHEX_PATTERNS_PULL_MASTER=ON         \
           ..
         mingw32-make -j4 install
         cpack
@@ -163,6 +164,7 @@ jobs:
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache    \
           -DCMAKE_OBJC_COMPILER_LAUNCHER=ccache   \
           -DCMAKE_OBJCXX_COMPILER_LAUNCHER=ccache \
+          -DIMHEX_PATTERNS_PULL_MASTER=ON         \
           ..
         make -j4 package
 
@@ -227,20 +229,21 @@ jobs:
           cd build
           CC=gcc-12 CXX=g++-12 cmake                  \
             -DCMAKE_BUILD_TYPE=$BUILD_TYPE            \
-            -DCMAKE_INSTALL_PREFIX="/usr" 	      \
+            -DCMAKE_INSTALL_PREFIX="/usr" 	          \
             -DCMAKE_C_COMPILER_LAUNCHER=ccache        \
             -DCMAKE_CXX_COMPILER_LAUNCHER=ccache      \
             -DCMAKE_C_FLAGS="-fuse-ld=lld"            \
             -DCMAKE_CXX_FLAGS="-fuse-ld=lld"          \
-            -DCMAKE_OBJC_COMPILER_LAUNCHER=ccache   \
-            -DCMAKE_OBJCXX_COMPILER_LAUNCHER=ccache \
+            -DCMAKE_OBJC_COMPILER_LAUNCHER=ccache     \
+            -DCMAKE_OBJCXX_COMPILER_LAUNCHER=ccache   \
             -DRUST_PATH="$HOME/.cargo/bin/"           \
+            -DIMHEX_PATTERNS_PULL_MASTER=ON           \
             ..
           make -j 4 install DESTDIR=AppDir
 
       - name: 📜 Set version variable
         run: |
-          echo "version=`cat VERSION`" >> $GITHUB_ENV
+          echo "IMHEX_VERSION=`cat VERSION`" >> $GITHUB_ENV
 
       #- name: 📦 Bundle Flatpak
       #  run: |
@@ -255,14 +258,14 @@ jobs:
         run: |
           cp -r build/DEBIAN build/AppDir
           dpkg-deb --build build/AppDir
-          mv build/AppDir.deb imhex-${{env.version}}.deb
+          mv build/AppDir.deb imhex-${{env.IMHEX_VERSION}}.deb
           rm -rf build/AppDir/DEBIAN
 
       - name: 📦 Bundle AppImage
         run: |
           cd build
           appimage-builder --recipe ../dist/AppImageBuilder.yml
-          mv ImHex-AppImage-x86_64.AppImage ../imhex-${{env.version}}.AppImage
+          mv ImHex-AppImage-x86_64.AppImage ../imhex-${{env.IMHEX_VERSION}}.AppImage
           cd ..
 
       #- name: ⬆️ Upload Flatpak
@@ -328,25 +331,26 @@ jobs:
         run: |
           mkdir -p build
           cd build
-          CC=gcc CXX=g++ cmake                  \
+          CC=gcc CXX=g++ cmake                      \
           -DCMAKE_BUILD_TYPE=$BUILD_TYPE            \
-          -DCMAKE_INSTALL_PREFIX="/usr" 	      \
+          -DCMAKE_INSTALL_PREFIX="/usr" 	        \
           -DCMAKE_C_COMPILER_LAUNCHER=ccache        \
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache      \
           -DCMAKE_C_FLAGS="-fuse-ld=lld"            \
           -DCMAKE_CXX_FLAGS="-fuse-ld=lld"          \
           -DRUST_PATH="$HOME/.cargo/bin/"           \
+          -DIMHEX_PATTERNS_PULL_MASTER=ON           \
           ..
           make -j 4 install DESTDIR=installDir
 
       - name: 📜 Set version variable
         run: |
-          echo "version=`cat VERSION`" >> $GITHUB_ENV
+          echo "IMHEX_VERSION=`cat VERSION`" >> $GITHUB_ENV
       
       - name: ✒️ Prepare PKGBUILD
         run: |
           cp dist/Arch/PKGBUILD build
-          sed -i 's/%version%/${{env.version}}/g' build/PKGBUILD
+          sed -i 's/%version%/${{env.IMHEX_VERSION}}/g' build/PKGBUILD
 
     # makepkg doesn't want to run as root, so I had to chmod 777 all over
       - name: 📦 Package ArchLinux .pkg.tar.zst
@@ -355,20 +359,20 @@ jobs:
           
           # the name is a small trick to make makepkg recognize it as the source
           # else, it would try to download the file from the release
-          tar -cvf imhex-${{env.version}}-ArchLinux.pkg.tar.zst -C installDir .
+          tar -cvf imhex-${{env.IMHEX_VERSION}}-ArchLinux.pkg.tar.zst -C installDir .
           
           chmod -R 777 .
           
           sudo -u nobody makepkg
 
           # Remplace the old file
-          rm imhex-${{env.version}}-ArchLinux.pkg.tar.zst
-          mv *.pkg.tar.zst imhex-${{env.version}}-ArchLinux.pkg.tar.zst
+          rm imhex-${{env.IMHEX_VERSION}}-ArchLinux.pkg.tar.zst
+          mv *.pkg.tar.zst imhex-${{env.IMHEX_VERSION}}-ArchLinux.pkg.tar.zst
       
       - name: ⬆️ Upload imhex-archlinux.pkg.tar.zst
         uses: actions/upload-artifact@v3
         with:
           name: ArchLinux .pkg.tar.zst
           path: |
-            build/imhex-${{env.version}}-ArchLinux.pkg.tar.zst
+            build/imhex-${{env.IMHEX_VERSION}}-ArchLinux.pkg.tar.zst
             

.github/workflows/release.yml

@@ -29,7 +29,7 @@ jobs:
             exit 1
           fi
 
-          echo "version=$project_version" >> $GITHUB_ENV
+          echo "IMHEX_VERSION=$project_version" >> $GITHUB_ENV
 
       - name: 🗜️ Create tarball from sources with dependencies
         run: tar --exclude-vcs -czvf Full.Sources.tar.gz ImHex
@@ -58,7 +58,7 @@ jobs:
           done
 
       - name: 🟩 Rename Windows Portable Zip
-        run: mv "Windows Portable.zip" imhex-${{env.version}}-Windows-Portable.zip
+        run: mv "Windows Portable.zip" imhex-${{env.IMHEX_VERSION}}-Windows-Portable.zip
 
       - name: ⬆️ Upload everything to release
         uses: softprops/action-gh-release@v1
@@ -69,17 +69,17 @@ jobs:
         run: |
           cp ImHex/dist/Arch/PKGBUILD .
           
-          hash=`md5sum imhex-${{env.version}}-ArchLinux.pkg.tar.zst | cut -d ' ' -f 1`
+          hash=`md5sum imhex-${{env.IMHEX_VERSION}}-ArchLinux.pkg.tar.zst | cut -d ' ' -f 1`
 
-          sed -i 's/%version%/${{env.version}}/g' PKGBUILD
+          sed -i 's/%version%/${{env.IMHEX_VERSION}}/g' PKGBUILD
           sed -i "s/(SKIP)/($hash)/g" PKGBUILD
 
       - name: ⬆️ Publish AUR package
         
         # I couldn't make the condition in the env directly for some reason
         env:
-          MY_KEY: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
-        if: "${{ env.MY_KEY != '' }}"
+          AUR_SSH_PRIVATE_KEY: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
+        if: "${{ env.AUR_SSH_PRIVATE_KEY != '' }}"
 
         uses: KSXGitHub/github-actions-deploy-aur@v2
         with:
@@ -88,5 +88,25 @@ jobs:
           commit_username: iTrooz
           commit_email: itrooz@protonmail.com
           ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
-          commit_message: Bump to version ${{env.version}}
+          commit_message: Bump to version ${{env.IMHEX_VERSION}}
           ssh_keyscan_types: rsa,dsa,ecdsa,ed25519
+
+      - name: 🎫 Create PatternLanguage release
+        uses: ncipollo/release-action@v1
+        env:
+          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        if: "${{ env.RELEASE_TOKEN != '' }}"
+        with:
+          tag: ImHex-v${{env.IMHEX_VERSION}}
+          repo: PatternLanguage
+          token: ${{ secrets.RELEASE_TOKEN }}
+
+      - name: 🎫 Create ImHex-Patterns release
+        uses: ncipollo/release-action@v1
+        env:
+          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        if: "${{ env.RELEASE_TOKEN != '' }}"
+        with:
+          tag: ImHex-v${{env.IMHEX_VERSION}}
+          repo: ImHex-Patterns
+          token: ${{ secrets.RELEASE_TOKEN }}

.github/workflows/tests.yml

@@ -54,6 +54,7 @@ jobs:
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache  \
           -DCMAKE_C_FLAGS="-fuse-ld=lld"        \
           -DCMAKE_CXX_FLAGS="-fuse-ld=lld"      \
+          -DIMHEX_PATTERNS_PULL_MASTER=ON       \
           ..
         make -j4 unit_tests install
 

CMakeLists.txt

@@ -5,11 +5,14 @@ file(READ "VERSION" IMHEX_VERSION)
 project(imhex VERSION ${IMHEX_VERSION})
 message("Project version ${IMHEX_VERSION}")
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 set(IMHEX_BASE_FOLDER ${CMAKE_CURRENT_SOURCE_DIR})
 set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules")
 include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
 
+option(IMHEX_OFFLINE_BUILD "Enable offline build" OFF)
+option(IMHEX_PATTERNS_PULL_MASTER "Download latest files from master branch of the ImHex-Patterns repo" OFF)
+
 # Make sure project is configured correctly
 setDefaultBuiltTypeIfUnset()
 detectBadClone()

VERSION

@@ -1 +1 @@
-1.19.1
+1.19.3

cmake/build_helpers.cmake

@@ -222,6 +222,7 @@ macro(createPackage)
     
         configure_file(${CMAKE_SOURCE_DIR}/dist/DEBIAN/control.in ${CMAKE_BINARY_DIR}/DEBIAN/control)    
     
+        install(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION ${CMAKE_INSTALL_PREFIX}/share/licenses/imhex)
         install(FILES ${CMAKE_SOURCE_DIR}/dist/imhex.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
         install(FILES ${CMAKE_SOURCE_DIR}/resources/icon.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME imhex.png)
         install(FILES "$<TARGET_FILE:libimhex>" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
@@ -289,17 +290,25 @@ endmacro()
 
 
 function(downloadImHexPatternsFiles dest)
-    FetchContent_Declare(
-        imhex_patterns
-        GIT_REPOSITORY https://github.com/WerWolv/ImHex-Patterns.git
-        GIT_TAG master
-    )
+    if (NOT IMHEX_OFFLINE_BUILD)
+        if (IMHEX_PATTERNS_PULL_MASTER)
+            set(PATTERNS_BRANCH master)
+        else ()
+            set(PATTERNS_BRANCH ImHex-v${IMHEX_VERSION})
+        endif ()
 
-    FetchContent_Populate(imhex_patterns)
+        FetchContent_Declare(
+            imhex_patterns
+            GIT_REPOSITORY https://github.com/WerWolv/ImHex-Patterns.git
+            GIT_TAG master
+        )
 
-    set(PATTERNS_FOLDERS_TO_INSTALL constants encodings includes patterns magic)
-    foreach (FOLDER ${PATTERNS_FOLDERS_TO_INSTALL})
-        install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION ${dest})
-    endforeach()
+        FetchContent_Populate(imhex_patterns)
+
+        set(PATTERNS_FOLDERS_TO_INSTALL constants encodings includes patterns magic)
+        foreach (FOLDER ${PATTERNS_FOLDERS_TO_INSTALL})
+            install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION ${dest})
+        endforeach ()
+    endif ()
 
 endfunction()

dist/AppImageBuilder.yml

@@ -26,7 +26,6 @@ AppDir:
     - sourceline: deb http://security.ubuntu.com/ubuntu jammy-security universe
     - sourceline: deb http://security.ubuntu.com/ubuntu jammy-security multiverse
     include:
-    - adwaita-icon-theme-full
     - librsvg2-common
     - libbz2-1.0:amd64
     - libcap2:amd64
@@ -85,7 +84,6 @@ AppDir:
     - /lib/x86_64-linux-gnu/libgnutls.so.30
     - /lib/x86_64-linux-gnu/libgobject-2.0.so.0
     - /lib/x86_64-linux-gnu/libgraphite2.so.3
-    - /lib/x86_64-linux-gnu/libgtk-3.so.0
     - /lib/x86_64-linux-gnu/libharfbuzz.so.0
     - /lib/x86_64-linux-gnu/libhogweed.so.6
     - /lib/x86_64-linux-gnu/libicudata.so.70

dist/Arch/PKGBUILD

@@ -8,7 +8,7 @@ url="https://github.com/WerWolv/ImHex"
 repo=$url
 license=('GPL 2.0')
 groups=()
-depends=(glfw mbedtls python freetype2 libglvnd gtk3)
+depends=(glfw mbedtls python freetype2 libglvnd dbus xdg-desktop-portal)
 makedepends=(git)
 checkdepends=()
 optdepends=()
@@ -34,5 +34,6 @@ package() {
     done
 
 	cp -r $srcdir/usr/share/imhex/{constants,encodings,includes,magic,patterns} $pkgdir/usr/share/imhex
-    install -d $pkgdir/usr/share/imhex
+	cp -r $srcdir/usr/share/{applications,licenses} $pkgdir/usr/share
+    install -d $pkgdir/usr/share
 }

dist/Brewfile

@@ -7,5 +7,4 @@ brew "python3"
 brew "freetype2"
 brew "libmagic"
 brew "pkg-config"
-brew "llvm"
 brew "gcc@12"

dist/DEBIAN/control.in

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

dist/DEBIAN/imhex.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=ImHex
-Comment=ImHex Hex Editor
-GenericName=Hex Editor
-Exec=/usr/bin/imhex %U
-Icon=/usr/share/pixmaps/imhex.png
-Type=Application
-StartupNotify=true
-Categories=GNOME;GTK;Development;
-StartupWMClass=imhex
-

dist/Dockerfile

@@ -15,7 +15,8 @@ RUN pacman -S --needed --noconfirm      \
     mbedtls                             \
     python3                             \
     freetype2                           \
-    gtk3
+    dbus                                \
+    xdg-desktop-portal
 
 # Clone ImHex
 RUN git clone https://github.com/WerWolv/ImHex --recurse-submodules /root/ImHex

dist/ImHex-9999.ebuild

@@ -27,6 +27,7 @@ RDEPEND="${DEPEND}
 		sys-apps/file
 		dev-libs/mbedtls
 		dev-cpp/nlohmann_json
-		x11-libs/gtk+
+		dbus
+		xdg-desktop-portal
 		"
 BDEPEND="${DEPEND}"

dist/compiling/windows.md

@@ -1,6 +1,6 @@
 ### Compiling ImHex on Windows
 
-On Windows, ImHex is built through msys2 / mingw. To install all dependencies, open a mys2 window and run the PKGCONFIG script in the [dist/msys2](dist/msys2) folder.
+On Windows, ImHex is built through msys2 / mingw. To install all dependencies, open a msys2 window and run the PKGCONFIG script in the [dist/msys2](dist/msys2) folder.
 After all the dependencies are installed, run the following commands to build ImHex:
 
 ```sh
@@ -20,4 +20,4 @@ cmake -G "MinGW Makefiles"                \
 mingw32-make -j install
 ```
 
-ImHex will look for any extra resources either in various folders directly next to the executable or in `%localappdata%/imhex`
+ImHex will look for any extra resources either in various folders directly next to the executable or in `%localappdata%/imhex`

dist/get_deps_archlinux.sh

@@ -9,4 +9,5 @@ pacman -S $@ --needed \
   mbedtls   \
   python3   \
   freetype2 \
-  gtk3
+  dbus      \
+  xdg-desktop-portal

dist/get_deps_debian.sh

@@ -21,4 +21,5 @@ apt install -y \
   libmbedtls-dev        \
   python3-dev           \
   libfreetype-dev       \
-  libgtk-3-dev
+  libdbus-1-dev         \
+  xdg-desktop-portal

dist/get_deps_fedora.sh

@@ -10,4 +10,5 @@ dnf install         \
   mbedtls-devel     \
   python-devel      \
   freetype-devel    \
-  gtk3-devel
+  dbus              \
+  xdg-desktop-portal

lib/external/imgui/CMakeLists.txt

@@ -32,14 +32,14 @@ add_library(imgui OBJECT
         source/implot_items.cpp
         source/implot_demo.cpp
 
-        fonts/fontawesome_font.c
-        fonts/codicons_font.c
-        fonts/unifont_font.c
+        source/fonts/fontawesome_font.c
+        source/fonts/codicons_font.c
+        source/fonts/unifont_font.c
 )
 
 add_compile_definitions(IMGUI_IMPL_OPENGL_LOADER_GLAD)
 
-target_include_directories(imgui PUBLIC include fonts ${CMAKE_CURRENT_SOURCE_DIR} ${FREETYPE_INCLUDE_DIRS} ${GLFW_INCLUDE_DIRS})
+target_include_directories(imgui PUBLIC include ${FREETYPE_INCLUDE_DIRS} ${GLFW_INCLUDE_DIRS})
 
 target_link_directories(imgui PUBLIC ${GLFW_LIBRARY_DIRS})
 

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

@@ -110,6 +110,11 @@ namespace hex::prv {
 
             friend bool operator== (const Iterator& left, const Iterator& right) { return left.m_address == right.m_address; };
             friend bool operator!= (const Iterator& left, const Iterator& right) { return left.m_address != right.m_address; };
+            friend bool operator>  (const Iterator& left, const Iterator& right) { return left.m_address >  right.m_address; };
+            friend bool operator<  (const Iterator& left, const Iterator& right) { return left.m_address <  right.m_address; };
+            friend bool operator>= (const Iterator& left, const Iterator& right) { return left.m_address >= right.m_address; };
+            friend bool operator<= (const Iterator& left, const Iterator& right) { return left.m_address <= right.m_address; };
+
         private:
             BufferedReader *m_reader;
             u64 m_address;
@@ -176,10 +181,14 @@ namespace hex::prv {
 
             friend bool operator== (const ReverseIterator& left, const ReverseIterator& right) { return left.m_address == right.m_address; };
             friend bool operator!= (const ReverseIterator& left, const ReverseIterator& right) { return left.m_address != right.m_address; };
+            friend bool operator>  (const ReverseIterator& left, const ReverseIterator& right) { return left.m_address >  right.m_address; };
+            friend bool operator<  (const ReverseIterator& left, const ReverseIterator& right) { return left.m_address <  right.m_address; };
+            friend bool operator>= (const ReverseIterator& left, const ReverseIterator& right) { return left.m_address >= right.m_address; };
+            friend bool operator<= (const ReverseIterator& left, const ReverseIterator& right) { return left.m_address <= right.m_address; };
 
         private:
             BufferedReader *m_reader;
-            u64 m_address;
+            u64 m_address = 0x00;
         };
 
         Iterator begin() {
@@ -187,7 +196,7 @@ namespace hex::prv {
         }
 
         Iterator end() {
-            return { this, this->m_baseAddress + this->m_provider->getActualSize() };
+            return { this, this->m_provider->getActualSize() };
         }
 
         ReverseIterator rbegin() {

lib/libimhex/include/hex/ui/imgui_imhex_extensions.h

@@ -132,6 +132,7 @@ namespace ImGui {
     bool InputText(const char* label, std::string &buffer, ImGuiInputTextFlags flags = ImGuiInputTextFlags_None);
     bool InputText(const char *label, std::u8string &buffer, ImGuiInputTextFlags flags = ImGuiInputTextFlags_None);
     bool InputTextMultiline(const char* label, std::string &buffer, const ImVec2& size = ImVec2(0, 0), ImGuiInputTextFlags flags = ImGuiInputTextFlags_None);
+    bool InputTextWithHint(const char *label, const char *hint, std::string &buffer, ImGuiInputTextFlags flags = ImGuiInputTextFlags_None);
 
     bool InputScalarCallback(const char* label, ImGuiDataType data_type, void* p_data, const char* format, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data);
 

lib/libimhex/include/hex/ui/view.hpp

@@ -7,8 +7,8 @@
 #include <imgui_internal.h>
 #include <hex/ui/imgui_imhex_extensions.h>
 
-#include <fontawesome_font.h>
-#include <codicons_font.h>
+#include <fonts/fontawesome_font.h>
+#include <fonts/codicons_font.h>
 
 #include <hex/api/imhex_api.hpp>
 #include <hex/api/event.hpp>

lib/libimhex/source/helpers/encoding_file.cpp

@@ -38,8 +38,6 @@ namespace hex {
             {
                 auto delimiterPos = line.find('=');
 
-                if (delimiterPos == std::string::npos)
-                    continue;
                 if (delimiterPos >= line.length())
                     continue;
 
@@ -47,12 +45,16 @@ namespace hex {
                 to   = line.substr(delimiterPos + 1);
 
                 if (from.empty()) continue;
-                if (to.empty()) to = " ";
             }
 
             auto fromBytes = hex::parseByteString(from);
             if (fromBytes.empty()) continue;
 
+            if (to.length() > 1)
+                hex::trim(to);
+            if (to.empty())
+                to = " ";
+
             if (!this->m_mapping.contains(fromBytes.size()))
                 this->m_mapping.insert({ fromBytes.size(), {} });
             this->m_mapping[fromBytes.size()].insert({ fromBytes, to });

lib/libimhex/source/helpers/fs.cpp

@@ -71,7 +71,7 @@ namespace hex::fs {
     bool openFileBrowser(DialogMode mode, const std::vector<nfdfilteritem_t> &validExtensions, const std::function<void(std::fs::path)> &callback, const std::string &defaultPath) {
         NFD::Init();
 
-        nfdchar_t *outPath;
+        nfdchar_t *outPath = nullptr;
         nfdresult_t result;
         switch (mode) {
             case DialogMode::Open:
@@ -87,18 +87,8 @@ namespace hex::fs {
                 hex::unreachable();
         }
 
-        std::fs::path path;
-        #if defined(OS_LINUX)
-            // xdg-desktop-portal, which is the file picker backend used on Linux, returns all paths with URI encoding.
-            // This is a bit ugly and will most likely be fixed sometime in the future but until then, we'll just use
-            // curl to decode the URI string into a valid file path string
-            path = Net().decode(outPath);
-        #else
-            path = reinterpret_cast<char8_t*>(outPath);
-        #endif
-
-        if (result == NFD_OKAY) {
-            callback(path);
+        if (result == NFD_OKAY && outPath != nullptr) {
+            callback(reinterpret_cast<char8_t*>(outPath));
             NFD::FreePath(outPath);
         }
 
@@ -257,8 +247,8 @@ namespace hex::fs {
         std::vector<std::fs::path> configDirs = xdg::ConfigDirs();
         std::vector<std::fs::path> dataDirs   = xdg::DataDirs();
 
-        configDirs.push_back(xdg::ConfigHomeDir());
-        dataDirs.push_back(xdg::DataHomeDir());
+        configDirs.insert(configDirs.begin(), xdg::ConfigHomeDir());
+        dataDirs.insert(dataDirs.begin(), xdg::DataHomeDir());
 
         for (auto &dir : dataDirs)
             dir = dir / "imhex";

lib/libimhex/source/ui/imgui_imhex_extensions.cpp

@@ -553,6 +553,10 @@ namespace ImGui {
         return ImGui::InputText(label, buffer.data(), buffer.size() + 1, ImGuiInputTextFlags_CallbackResize | flags, ImGui::UpdateStringSizeCallback, &buffer);
     }
 
+    bool InputTextWithHint(const char *label, const char *hint, std::string &buffer, ImGuiInputTextFlags flags) {
+        return ImGui::InputTextWithHint(label, hint, buffer.data(), buffer.size() + 1, ImGuiInputTextFlags_CallbackResize | flags, ImGui::UpdateStringSizeCallback, &buffer);
+    }
+
     bool InputText(const char *label, std::u8string &buffer, ImGuiInputTextFlags flags) {
         return ImGui::InputText(label, reinterpret_cast<char *>(buffer.data()), buffer.size() + 1, ImGuiInputTextFlags_CallbackResize | flags, ImGui::UpdateStringSizeCallback, &buffer);
     }

main/CMakeLists.txt

@@ -26,7 +26,7 @@ set_target_properties(main PROPERTIES
 add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
 
 if (WIN32)
-    target_link_libraries(main PUBLIC libimhex wsock32 ws2_32 Dwmapi.lib)
+    target_link_libraries(main PUBLIC usp10 libimhex wsock32 ws2_32 Dwmapi.lib)
 else ()
     target_link_libraries(main PUBLIC libimhex pthread)
 endif ()

main/source/init/splash_window.cpp

@@ -13,7 +13,7 @@
 #include <hex/ui/imgui_imhex_extensions.h>
 #include <imgui_impl_glfw.h>
 #include <imgui_impl_opengl3.h>
-#include <fontawesome_font.h>
+#include <fonts/fontawesome_font.h>
 #include <GLFW/glfw3.h>
 
 #include <unistd.h>

main/source/init/tasks.cpp

@@ -9,9 +9,9 @@
 #include <hex/helpers/fs.hpp>
 #include <hex/helpers/logger.hpp>
 
-#include <fontawesome_font.h>
-#include <codicons_font.h>
-#include <unifont_font.h>
+#include <fonts/fontawesome_font.h>
+#include <fonts/codicons_font.h>
+#include <fonts/unifont_font.h>
 
 #include <hex/api/plugin_manager.hpp>
 

main/source/window/win_window.cpp

@@ -9,7 +9,7 @@
 
     #include <imgui.h>
     #include <imgui_internal.h>
-    #include <codicons_font.h>
+    #include <fonts/codicons_font.h>
 
     #include <nlohmann/json.hpp>
 

main/source/window/window.cpp

@@ -30,7 +30,7 @@
 #include <imnodes.h>
 #include <imnodes_internal.h>
 
-#include <codicons_font.h>
+#include <fonts/codicons_font.h>
 
 #include <hex/helpers/project_file_handler.hpp>
 

plugins/builtin/include/content/views/view_bookmarks.hpp

@@ -16,6 +16,7 @@ namespace hex::plugin::builtin {
 
     private:
         std::list<ImHexApi::Bookmarks::Entry> m_bookmarks;
+        std::string m_currFilter;
     };
 
 }

plugins/builtin/include/content/views/view_hex_editor.hpp

@@ -41,7 +41,9 @@ namespace hex::plugin::builtin {
             if (end == InvalidSelection)
                 end = start;
 
-            const size_t maxAddress = ImHexApi::Provider::get()->getActualSize() - 1;
+            auto provider = ImHexApi::Provider::get();
+
+            const size_t maxAddress = provider->getActualSize() + provider->getBaseAddress() - 1;
 
             this->m_selectionChanged = this->m_selectionStart != start || this->m_selectionEnd != end;
 

plugins/builtin/include/content/views/view_pattern_data.hpp

@@ -21,7 +21,7 @@ namespace hex::plugin::builtin {
         void drawContent() override;
 
     private:
-        std::map<prv::Provider *, std::vector<std::shared_ptr<pl::Pattern>>> m_sortedPatterns;
+        std::map<prv::Provider *, std::vector<pl::Pattern*>> m_sortedPatterns;
         hex::PatternDrawer m_patternDrawer;
     };
 

plugins/builtin/include/content/views/view_pattern_editor.hpp

@@ -56,7 +56,6 @@ namespace hex::plugin::builtin {
         };
 
         std::map<std::string, PatternVariable> m_patternVariables;
-        std::vector<std::string> m_patternTypes;
 
         enum class EnvVarType
         {
@@ -102,4 +101,4 @@ namespace hex::plugin::builtin {
         void evaluatePattern(const std::string &code);
     };
 
-}
+}

plugins/builtin/source/content/data_inspector.cpp

@@ -54,7 +54,7 @@ namespace hex::plugin::builtin {
 
     template<std::floating_point T>
     static std::vector<u8> stringToFloat(const std::string &value, std::endian endian) requires(sizeof(T) <= sizeof(long double)) {
-        auto result = std::strtold(value.c_str(), nullptr);
+        T result = std::strtold(value.c_str(), nullptr);
 
         std::vector<u8> bytes(sizeof(T), 0x00);
         std::memcpy(bytes.data(), &result, bytes.size());
@@ -349,7 +349,7 @@ namespace hex::plugin::builtin {
 
         ContentRegistry::DataInspector::add("hex.builtin.inspector.string", 1,
             [](auto buffer, auto endian, auto style) {
-                hex::unused(endian, style);
+                hex::unused(buffer, endian, style);
 
                 auto currSelection = ImHexApi::HexEditor::getSelection();
 
@@ -358,14 +358,15 @@ namespace hex::plugin::builtin {
                 std::string value, copyValue;
 
                 if (currSelection.has_value()) {
-                    std::vector<u8> stringBuffer(std::min<size_t>(MaxStringLength, currSelection->size), 0x00);
+                    std::vector<u8> stringBuffer(std::min<size_t>(currSelection->size, 0x1000), 0x00);
                     ImHexApi::Provider::get()->read(currSelection->address, stringBuffer.data(), stringBuffer.size());
 
-                    value = hex::encodeByteString(stringBuffer);
-                    copyValue = hex::encodeByteString(buffer);
+                    value = copyValue = hex::encodeByteString(stringBuffer);
 
-                    if (currSelection->size > MaxStringLength)
+                    if (currSelection->size > MaxStringLength) {
+                        value.resize(MaxStringLength);
                         value += "...";
+                    }
                 } else {
                     value = "";
                     copyValue = "";

plugins/builtin/source/content/data_processor_nodes.cpp

@@ -91,7 +91,7 @@ namespace hex::plugin::builtin {
         }
 
         void load(nlohmann::json &j) override {
-            this->m_value = j["data"];
+            this->m_value = j["data"].get<std::string>();
         }
 
     private:
@@ -213,7 +213,7 @@ namespace hex::plugin::builtin {
         }
 
         void load(nlohmann::json &j) override {
-            this->m_comment = j["comment"];
+            this->m_comment = j["comment"].get<std::string>();
         }
 
     private:

plugins/builtin/source/content/main_menu_items.cpp

@@ -250,14 +250,11 @@ namespace hex::plugin::builtin {
         });
 
         ContentRegistry::Interface::addMenuItem("hex.builtin.menu.edit", 1050, [&] {
-            auto provider      = ImHexApi::Provider::get();
             bool providerValid = ImHexApi::Provider::isValid();
             auto selection     = ImHexApi::HexEditor::getSelection();
 
             if (ImGui::MenuItem("hex.builtin.menu.edit.bookmark"_lang, nullptr, false, selection.has_value() && providerValid)) {
-                auto base = provider->getBaseAddress();
-
-                ImHexApi::Bookmarks::add(base + selection->getStartAddress(), selection->size, {}, {});
+                ImHexApi::Bookmarks::add(selection->getStartAddress(), selection->getSize(), {}, {});
             }
         });
 

plugins/builtin/source/content/settings_entries.cpp

@@ -13,6 +13,19 @@
 
 #include <nlohmann/json.hpp>
 
+namespace {
+    static std::vector<std::fs::path> userFolders;
+    static void loadUserFoldersFromSetting(nlohmann::json &setting) {
+        userFolders.clear();
+        std::vector<std::string> paths = setting;
+        for (const auto &path : paths) {
+            // JSON reads char8_t as array, char8_t is not supported as of now
+            std::u8string_view uString(reinterpret_cast<const char8_t *>(&path.front()), reinterpret_cast<const char8_t *>(std::next(&path.back())));
+            userFolders.emplace_back(uString);
+        }
+    }
+};
+
 namespace hex::plugin::builtin {
 
     void registerSettings() {
@@ -247,7 +260,7 @@ namespace hex::plugin::builtin {
                 for (const auto &[unlocalizedName, visualizer] : visualizers) {
                     if (ImGui::Selectable(LangEntry(unlocalizedName))) {
                         setting = unlocalizedName;
-                        result = true;
+                        result  = true;
                     }
                 }
 
@@ -314,34 +327,27 @@ namespace hex::plugin::builtin {
         ContentRegistry::Settings::add(dirsSetting, dirsSetting, std::vector<std::string> {}, [](auto name, nlohmann::json &setting) {
             hex::unused(name);
 
-            static size_t currentItemIndex = 0;
-            static std::vector<std::fs::path> folders = [&setting]{
-                std::vector<std::fs::path> result;
+            static size_t currentItemIndex = [&setting] {loadUserFoldersFromSetting(setting); return 0; }();
 
-                std::vector<std::u8string> paths = setting;
-                for (const auto &path : paths)
-                    result.emplace_back(path);
-
-                return result;
-            }();
+            auto saveToSetting = [&setting] {
+                std::vector<std::string> folderStrings;
+                for (const auto &folder : userFolders) {
+                    auto utfString = folder.u8string();
+                    // JSON stores char8_t as array, char8_t is not supported as of now
+                    folderStrings.emplace_back(reinterpret_cast<const char *>(&utfString.front()), reinterpret_cast<const char *>(std::next(&utfString.back())));
+                }
+                setting = folderStrings;
+                ImHexApi::System::setAdditionalFolderPaths(userFolders);
+            };
 
             bool result = false;
 
-            auto writeSetting = [&setting]{
-                std::vector<std::u8string> folderStrings;
-                for (const auto &folder : folders)
-                    folderStrings.push_back(folder.u8string());
-                setting = folderStrings;
-
-                ImHexApi::System::setAdditionalFolderPaths(folders);
-            };
-
             if (!ImGui::BeginListBox("", ImVec2(-38, -FLT_MIN))) {
                 return false;
             } else {
-                for (size_t n = 0; n < folders.size(); n++) {
+                for (size_t n = 0; n < userFolders.size(); n++) {
                     const bool isSelected = (currentItemIndex == n);
-                    if (ImGui::Selectable(folders.at(n).string().c_str(), isSelected)) { currentItemIndex = n; }
+                    if (ImGui::Selectable(userFolders.at(n).string().c_str(), isSelected)) { currentItemIndex = n; }
                     if (isSelected) { ImGui::SetItemDefaultFocus(); }
                 }
                 ImGui::EndListBox();
@@ -351,12 +357,9 @@ namespace hex::plugin::builtin {
 
             if (ImGui::IconButton(ICON_VS_NEW_FOLDER, ImGui::GetCustomColorVec4(ImGuiCustomCol_DescButton), ImVec2(30, 30))) {
                 fs::openFileBrowser(fs::DialogMode::Folder, {}, [&](const std::fs::path &path) {
-
-                    if (std::find(folders.begin(), folders.end(), path) == folders.end()) {
-                        folders.emplace_back(path);
-
-                        writeSetting();
-
+                    if (std::find(userFolders.begin(), userFolders.end(), path) == userFolders.end()) {
+                        userFolders.emplace_back(path);
+                        saveToSetting();
                         result = true;
                     }
                 });
@@ -364,10 +367,9 @@ namespace hex::plugin::builtin {
             ImGui::InfoTooltip("hex.builtin.setting.folders.add_folder"_lang);
 
             if (ImGui::IconButton(ICON_VS_REMOVE_CLOSE, ImGui::GetCustomColorVec4(ImGuiCustomCol_DescButton), ImVec2(30, 30))) {
-                if (!folders.empty()) {
-                    folders.erase(std::next(folders.begin(), currentItemIndex));
-
-                    writeSetting();
+                if (!userFolders.empty()) {
+                    userFolders.erase(std::next(userFolders.begin(), currentItemIndex));
+                    saveToSetting();
 
                     result = true;
                 }
@@ -480,10 +482,18 @@ namespace hex::plugin::builtin {
         ImHexApi::System::setTheme(static_cast<ImHexApi::System::Theme>(theme));
     }
 
+    static void loadFoldersSettings() {
+        static const std::string dirsSetting { "hex.builtin.setting.folders" };
+        auto dirs = ContentRegistry::Settings::getSetting(dirsSetting, dirsSetting);
+        loadUserFoldersFromSetting(dirs);
+        ImHexApi::System::setAdditionalFolderPaths(userFolders);
+    }
+
     void loadSettings() {
         loadInterfaceScalingSetting();
         loadFontSettings();
         loadThemeSettings();
+        loadFoldersSettings();
     }
 
 }

plugins/builtin/source/content/tools_entries.cpp

@@ -712,8 +712,8 @@ namespace hex::plugin::builtin {
 
                     auto json = nlohmann::json::parse(response.body);
 
-                    resultTitle   = json["query"]["pages"][0]["title"];
-                    resultExtract = json["query"]["pages"][0]["extract"];
+                    resultTitle   = json["query"]["pages"][0]["title"].get<std::string>();
+                    resultExtract = json["query"]["pages"][0]["extract"].get<std::string>();
 
                     if (!extendedSearch && resultExtract.ends_with(':')) {
                         extendedSearch = true;

plugins/builtin/source/content/ui_items.cpp

@@ -6,7 +6,7 @@
 #include <hex/helpers/fmt.hpp>
 #include <hex/helpers/logger.hpp>
 
-#include <codicons_font.h>
+#include <fonts/codicons_font.h>
 #include <imgui.h>
 #include <imgui_internal.h>
 #include <hex/ui/imgui_imhex_extensions.h>
@@ -107,8 +107,11 @@ namespace hex::plugin::builtin {
 
                 u32 index = 0;
                 for (auto &path : s_selectableFiles) {
+                    ImGui::PushID(index);
                     if (ImGui::Selectable(path.filename().string().c_str(), index == s_selectableFileIndex))
                         s_selectableFileIndex = index;
+                    ImGui::PopID();
+
                     index++;
                 }
 
@@ -283,7 +286,7 @@ namespace hex::plugin::builtin {
                     auto region = ImHexApi::HexEditor::getSelection();
 
                     if (region.has_value())
-                        ImHexApi::Bookmarks::add(region->address, region->size, {}, {});
+                        ImHexApi::Bookmarks::add(region->getStartAddress(), region->getSize(), {}, {});
                 }
             }
             ImGui::EndDisabled();

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

@@ -61,11 +61,11 @@ namespace hex::plugin::builtin {
 
                 ImGui::BeginTooltip();
 
-                if (ImGui::BeginTable("##tooltips", 1, ImGuiTableFlags_NoHostExtendX | ImGuiTableFlags_RowBg | ImGuiTableFlags_NoClip)) {
+                ImGui::PushID(&bookmark);
+                if (ImGui::BeginTable("##tooltips", 1, ImGuiTableFlags_RowBg | ImGuiTableFlags_NoClip)) {
                     ImGui::TableNextRow();
                     ImGui::TableNextColumn();
 
-                    ImGui::PushID(&bookmark);
                     {
                         ImGui::ColorButton("##color", ImColor(bookmark.color));
                         ImGui::SameLine(0, 10);
@@ -73,7 +73,7 @@ namespace hex::plugin::builtin {
 
                         if (ImGui::GetIO().KeyShift) {
                             ImGui::Indent();
-                            if (ImGui::BeginTable("##extra_info", 2, ImGuiTableFlags_RowBg | ImGuiTableFlags_NoHostExtendX | ImGuiTableFlags_NoClip)) {
+                            if (ImGui::BeginTable("##extra_info", 2, ImGuiTableFlags_RowBg | ImGuiTableFlags_NoClip)) {
 
                                 ImGui::TableNextRow();
                                 ImGui::TableNextColumn();
@@ -98,13 +98,13 @@ namespace hex::plugin::builtin {
                         }
                     }
 
-                    ImGui::PopID();
 
                     ImGui::PushStyleColor(ImGuiCol_TableRowBg, bookmark.color);
                     ImGui::PushStyleColor(ImGuiCol_TableRowBgAlt, bookmark.color);
                     ImGui::EndTable();
                     ImGui::PopStyleColor(2);
                 }
+                ImGui::PopID();
 
                 ImGui::EndTooltip();
             }
@@ -122,17 +122,29 @@ namespace hex::plugin::builtin {
 
     void ViewBookmarks::drawContent() {
         if (ImGui::Begin(View::toWindowName("hex.builtin.view.bookmarks.name").c_str(), &this->getWindowOpenState())) {
-            if (ImGui::BeginChild("##scrolling")) {
+
+            ImGui::PushItemWidth(ImGui::GetContentRegionAvailWidth());
+            ImGui::InputTextWithHint("##filter", "Filter", this->m_currFilter);
+            ImGui::PopItemWidth();
+
+            ImGui::NewLine();
+
+            if (ImGui::BeginChild("##bookmarks")) {
 
                 if (this->m_bookmarks.empty()) {
                     ImGui::TextFormattedCentered("hex.builtin.view.bookmarks.no_bookmarks"_lang);
                 }
 
-                u32 id                = 1;
+                u32 id = 1;
                 auto bookmarkToRemove = this->m_bookmarks.end();
                 for (auto iter = this->m_bookmarks.begin(); iter != this->m_bookmarks.end(); iter++) {
                     auto &[region, name, comment, color, locked] = *iter;
 
+                    if (!this->m_currFilter.empty()) {
+                        if (!name.contains(this->m_currFilter) && !comment.contains(this->m_currFilter))
+                            continue;
+                    }
+
                     auto headerColor = ImColor(color);
                     auto hoverColor  = ImColor(color);
                     hoverColor.Value.w *= 1.3F;

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

@@ -34,11 +34,11 @@ namespace hex::plugin::builtin {
 
                     for (auto value : content["values"]) {
                         Constant constant;
-                        constant.category = content["name"];
-                        constant.name     = value["name"];
+                        constant.category = content["name"].get<std::string>();
+                        constant.name     = value["name"].get<std::string>();
                         if (value.contains("desc"))
-                            constant.description = value["desc"];
-                        constant.value = value["value"];
+                            constant.description = value["desc"].get<std::string>();
+                        constant.value = value["value"].get<std::string>();
 
                         auto type = value["type"];
                         if (type == "int10")

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

@@ -104,8 +104,10 @@ namespace hex::plugin::builtin {
             if (ImGui::BeginTabBar("##find_tabs")) {
                 if (ImGui::BeginTabItem("hex.builtin.view.hex_editor.search.hex"_lang)) {
                     if (ImGui::InputText("##input", this->m_input, ImGuiInputTextFlags_EnterReturnsTrue | ImGuiInputTextFlags_AutoSelectAll | ImGuiInputTextFlags_CharsHexadecimal)) {
-                        this->m_shouldSearch = true;
-                        this->m_backwards = false;
+                        if (!this->m_input.empty()) {
+                            this->m_shouldSearch = true;
+                            this->m_backwards = false;
+                        }
                     }
 
                     this->drawButtons();
@@ -119,8 +121,10 @@ namespace hex::plugin::builtin {
 
                 if (ImGui::BeginTabItem("hex.builtin.view.hex_editor.search.string"_lang)) {
                     if (ImGui::InputText("##input", this->m_input, ImGuiInputTextFlags_EnterReturnsTrue | ImGuiInputTextFlags_AutoSelectAll)) {
-                        this->m_shouldSearch = true;
-                        this->m_backwards = false;
+                       if (!this->m_input.empty()) {
+                            this->m_shouldSearch = true;
+                            this->m_backwards = false;
+                       }
                     }
 
                     this->drawButtons();
@@ -129,8 +133,8 @@ namespace hex::plugin::builtin {
                         searchSequence.clear();
                         std::copy(this->m_input.begin(), this->m_input.end(), std::back_inserter(searchSequence));
 
-                        // Remove null termination
-                        searchSequence.pop_back();
+                        if (searchSequence.back() == 0x00)
+                            searchSequence.pop_back();
                     }
 
                     ImGui::EndTabItem();
@@ -140,9 +144,9 @@ namespace hex::plugin::builtin {
             }
 
             if (!this->m_searchRunning && !searchSequence.empty() && this->m_shouldSearch) {
+                this->m_searchRunning = true;
                 std::thread([this, searchSequence, editor]{
-                    this->m_searchTask = ImHexApi::Tasks::createTask("Searching", ImHexApi::Provider::get()->getSize());
-                    this->m_searchRunning = true;
+                    auto task = ImHexApi::Tasks::createTask("Searching", ImHexApi::Provider::get()->getSize());
 
                     if (auto region = this->findSequence(editor, searchSequence, this->m_backwards); region.has_value()) {
                         ImHexApi::Tasks::doLater([editor, region]{
@@ -177,15 +181,20 @@ namespace hex::plugin::builtin {
                     this->m_searchPosition.reset();
                 }
 
-                if (ImGui::IconButton(ICON_VS_ARROW_UP "##up", ButtonColor, ButtonSize)) {
-                    this->m_shouldSearch = true;
-                    this->m_backwards = true;
-                }
-                ImGui::SameLine();
-                if (ImGui::IconButton(ICON_VS_ARROW_DOWN "##down", ButtonColor, ButtonSize)) {
-                    this->m_shouldSearch = true;
-                    this->m_backwards = false;
+                ImGui::BeginDisabled(!this->m_searchPosition.has_value());
+                {
+                    if (ImGui::IconButton(ICON_VS_ARROW_UP "##up", ButtonColor, ButtonSize)) {
+                        this->m_shouldSearch = true;
+                        this->m_backwards = true;
+                    }
+                    ImGui::SameLine();
+                    if (ImGui::IconButton(ICON_VS_ARROW_DOWN "##down", ButtonColor, ButtonSize)) {
+                        this->m_shouldSearch = true;
+                        this->m_backwards = false;
+                    }
                 }
+
+                ImGui::EndDisabled();
             }
             ImGui::EndDisabled();
         }
@@ -196,7 +205,7 @@ namespace hex::plugin::builtin {
             if (!editor->isSelectionValid())
                 reader.seek(this->m_searchPosition.value_or(0x00));
             else
-                reader.seek(this->m_searchPosition.value_or(editor->getSelection().getEndAddress()));
+                reader.seek(this->m_searchPosition.value_or(editor->getSelection().getStartAddress()));
 
             constexpr static auto searchFunction = [](const auto &haystackBegin, const auto &haystackEnd, const auto &needleBegin, const auto &needleEnd) {
                 return std::search(haystackBegin, haystackEnd, std::boyer_moore_horspool_searcher(needleBegin, needleEnd));
@@ -205,13 +214,17 @@ namespace hex::plugin::builtin {
             if (!backwards) {
                 auto occurrence = searchFunction(reader.begin(), reader.end(), sequence.begin(), sequence.end());
                 if (occurrence != reader.end()) {
-                    this->m_searchPosition = occurrence.getAddress() + 1;
+                    this->m_searchPosition = occurrence.getAddress() + sequence.size();
                     return Region { occurrence.getAddress(), sequence.size() };
                 }
             } else {
                 auto occurrence = searchFunction(reader.rbegin(), reader.rend(), sequence.begin(), sequence.end());
                 if (occurrence != reader.rend()) {
-                    this->m_searchPosition = occurrence.getAddress() - 1;
+                    if (occurrence.getAddress() < sequence.size())
+                        this->m_searchPosition = 0x00;
+                    else
+                        this->m_searchPosition = occurrence.getAddress() - sequence.size();
+
                     return Region { occurrence.getAddress(), sequence.size() };
                 }
             }
@@ -226,7 +239,6 @@ namespace hex::plugin::builtin {
         std::atomic<bool> m_shouldSearch = false;
         std::atomic<bool> m_backwards    = false;
 
-        std::optional<Task> m_searchTask;
         std::atomic<bool> m_searchRunning = false;
     };
 
@@ -239,7 +251,8 @@ namespace hex::plugin::builtin {
         void draw(ViewHexEditor *editor) override {
             ImGui::TextUnformatted("hex.builtin.view.hex_editor.menu.edit.set_base"_lang);
 
-            if (ImGui::InputHexadecimal("##base_address", &this->m_baseAddress, ImGuiInputTextFlags_EnterReturnsTrue)) {
+            ImGui::InputHexadecimal("##base_address", &this->m_baseAddress);
+            if (ImGui::IsItemFocused() && ImGui::IsKeyPressed(ImGuiKey_Enter)) {
                 setBaseAddress(this->m_baseAddress);
                 editor->closePopup();
             }
@@ -272,6 +285,10 @@ namespace hex::plugin::builtin {
             ImGui::TextUnformatted("hex.builtin.view.hex_editor.menu.edit.resize"_lang);
 
             ImGui::InputHexadecimal("##resize", &this->m_size);
+            if (ImGui::IsItemFocused() && ImGui::IsKeyPressed(ImGuiKey_Enter)) {
+                resize(static_cast<size_t>(this->m_size));
+                editor->closePopup();
+            }
 
             View::confirmButtons("hex.builtin.common.set"_lang, "hex.builtin.common.cancel"_lang,
                 [&, this]{
@@ -434,15 +451,15 @@ namespace hex::plugin::builtin {
         const auto [decoded, advance] = encodingFile.getEncodingFor(buffer);
         const ImColor color = [&decoded = decoded, &advance = advance]{
             if (decoded.length() == 1 && std::isalnum(decoded[0]))
-                return 0xFFFF8000;
+                return ImGui::GetCustomColorU32(ImGuiCustomCol_ToolbarBlue);
             else if (decoded.length() == 1 && advance == 1)
-                return 0xFF0000FF;
+                return ImGui::GetCustomColorU32(ImGuiCustomCol_ToolbarRed);
             else if (decoded.length() > 1 && advance == 1)
-                return 0xFF00FFFF;
+                return ImGui::GetCustomColorU32(ImGuiCustomCol_ToolbarYellow);
             else if (advance > 1)
-                return 0xFFFFFFFF;
+                return ImGui::GetColorU32(ImGuiCol_Text);
             else
-                return 0xFFFF8000;
+                return ImGui::GetCustomColorU32(ImGuiCustomCol_ToolbarBlue);
         }();
 
         return { std::string(decoded), advance, color };
@@ -556,7 +573,7 @@ namespace hex::plugin::builtin {
             drawList->AddLine(cellPos, cellPos + ImVec2(0, cellSize.y), ImColor(SelectionFrameColor), 1.0F);
 
         // Draw vertical line at the right of the last byte and the end of the line
-        if (x == u16((this->m_bytesPerRow / bytesPerCell) - 1) || (byteAddress + this->m_currDataVisualizer->getBytesPerCell()) > selection.getEndAddress())
+        if (x == u16((this->m_bytesPerRow / bytesPerCell) - 1) || (byteAddress + bytesPerCell) > selection.getEndAddress())
             drawList->AddLine(cellPos + ImVec2(cellSize.x, -1), cellPos + cellSize, ImColor(SelectionFrameColor), 1.0F);
 
         // Draw horizontal line at the top of the bytes
@@ -677,7 +694,7 @@ namespace hex::plugin::builtin {
                         const u8 validBytes = std::min<u64>(this->m_bytesPerRow, provider->getSize() - y * this->m_bytesPerRow);
 
                         std::vector<u8> bytes(validBytes);
-                        provider->read(y * this->m_bytesPerRow + provider->getCurrentPageAddress(), bytes.data(), validBytes);
+                        provider->read(y * this->m_bytesPerRow + provider->getBaseAddress() + provider->getCurrentPageAddress(), bytes.data(), validBytes);
 
                         std::vector<std::tuple<std::optional<color_t>, std::optional<color_t>>> cellColors;
                         {
@@ -688,9 +705,9 @@ namespace hex::plugin::builtin {
 
                                 // Query cell colors
                                 if (x < validBytes) {
-                                    const auto foregroundColor = queryForegroundColor(byteAddress, &bytes[x], cellBytes);
+                                    const auto foregroundColor = queryForegroundColor(byteAddress, &bytes[x * cellBytes], cellBytes);
                                     const auto backgroundColor = [&]{
-                                        auto color = queryBackgroundColor(byteAddress, &bytes[x], cellBytes);
+                                        auto color = queryBackgroundColor(byteAddress, &bytes[x * cellBytes], cellBytes);
 
                                         if ((byteAddress >= selectionMin && byteAddress <= selectionMax)) {
                                             if (color.has_value())
@@ -748,7 +765,7 @@ namespace hex::plugin::builtin {
 
                                 const bool cellHovered = ImGui::IsMouseHoveringRect(cellStartPos, cellStartPos + cellSize, true);
 
-                                this->handleSelection(byteAddress, bytesPerCell, &bytes[x], cellHovered);
+                                this->handleSelection(byteAddress, bytesPerCell, &bytes[x * bytesPerCell], cellHovered);
 
                                 // Get byte foreground color
                                 if (foregroundColor.has_value())
@@ -757,7 +774,7 @@ namespace hex::plugin::builtin {
                                 // Draw cell content
                                 ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
                                 ImGui::PushItemWidth((CharacterSize * this->m_currDataVisualizer->getMaxCharsPerCell()).x);
-                                this->drawCell(byteAddress, &bytes[x], bytesPerCell, cellHovered);
+                                this->drawCell(byteAddress, &bytes[x * bytesPerCell], bytesPerCell, cellHovered);
                                 ImGui::PopItemWidth();
                                 ImGui::PopStyleVar();
 
@@ -830,19 +847,21 @@ namespace hex::plugin::builtin {
                             } while (offset < this->m_bytesPerRow);
 
                             ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, ImVec2(0, 0));
-                            if (ImGui::BeginTable("##encoding_cell", encodingData.size(), ImGuiTableFlags_SizingFixedFit)) {
+                            ImGui::PushID(y);
+                            if (ImGui::BeginTable("##encoding_cell", encodingData.size(), ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_NoKeepColumnsVisible)) {
                                 ImGui::TableNextRow();
 
                                 for (const auto &[address, data] : encodingData) {
                                     ImGui::TableNextColumn();
 
                                     const auto cellStartPos = getCellPosition();
-                                    const auto cellSize = CharacterSize * data.advance;
+                                    const auto cellSize = ImGui::CalcTextSize(data.displayValue.c_str()) * ImVec2(1, 0) + ImVec2(0, CharacterSize.y);
                                     const bool cellHovered = ImGui::IsMouseHoveringRect(cellStartPos, cellStartPos + cellSize, true);
 
+
                                     const auto x = address % this->m_bytesPerRow;
                                     if (x < validBytes) {
-                                        auto [foregroundColor, backgroundColor] = cellColors[x];
+                                        auto [foregroundColor, backgroundColor] = cellColors[x / bytesPerCell];
 
                                         // Draw highlights and selection
                                         if (backgroundColor.has_value()) {
@@ -854,7 +873,9 @@ namespace hex::plugin::builtin {
                                             this->drawSelectionFrame(x, y, address, 1, cellStartPos, cellSize);
                                         }
 
+                                        ImGui::PushItemWidth(cellSize.x);
                                         ImGui::TextFormattedColored(data.color, "{}", data.displayValue);
+                                        ImGui::PopItemWidth();
 
                                         this->handleSelection(address, data.advance, &bytes[address % this->m_bytesPerRow], cellHovered);
                                     }
@@ -863,6 +884,7 @@ namespace hex::plugin::builtin {
                                 ImGui::EndTable();
                             }
                             ImGui::PopStyleVar();
+                            ImGui::PopID();
 
                         }
 
@@ -908,11 +930,11 @@ namespace hex::plugin::builtin {
                 if (this->m_shouldJumpToSelection) {
                     this->m_shouldJumpToSelection = false;
 
-                    const auto pageAddress = provider->getCurrentPageAddress() + provider->getBaseAddress();
                     auto newSelection = this->getSelection();
-                    newSelection.address -= pageAddress;
+                    provider->setCurrentPage(provider->getPageOfAddress(newSelection.address).value_or(0));
 
-                    ImGui::SetScrollFromPosY(ImGui::GetCursorStartPos().y + (static_cast<long double>(newSelection.getStartAddress()) / this->m_bytesPerRow) * CharacterSize.y, 0.5);
+                    const auto pageAddress = provider->getCurrentPageAddress() + provider->getBaseAddress();
+                    ImGui::SetScrollFromPosY(ImGui::GetCursorStartPos().y + (static_cast<long double>(newSelection.getStartAddress() - pageAddress) / this->m_bytesPerRow) * CharacterSize.y, 0.5);
                 }
 
             } else {
@@ -1222,7 +1244,7 @@ namespace hex::plugin::builtin {
         });
 
         // Open file
-        ShortcutManager::addShortcut(this, CTRL + Keys::O, [] {
+        ShortcutManager::addGlobalShortcut(CTRL + Keys::O, [] {
             fs::openFileBrowser(fs::DialogMode::Open, {}, [](const auto &path) {
                 EventManager::post<RequestOpenFile>(path);
             });
@@ -1253,7 +1275,6 @@ namespace hex::plugin::builtin {
 
             if (region.size != 0) {
                 provider->setCurrentPage(page.value());
-                region.address -= provider->getBaseAddress() + provider->getCurrentPageAddress();
                 this->setSelection(region);
                 this->jumpToSelection();
             }

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

@@ -67,7 +67,7 @@ namespace hex::plugin::builtin {
         return false;
     }
 
-    static bool beginPatternTable(prv::Provider *&provider, const std::vector<std::shared_ptr<pl::Pattern>> &patterns, std::vector<std::shared_ptr<pl::Pattern>> &sortedPatterns) {
+    static bool beginPatternTable(prv::Provider *&provider, const std::vector<std::shared_ptr<pl::Pattern>> &patterns, std::vector<pl::Pattern*> &sortedPatterns) {
         if (ImGui::BeginTable("##Patterntable", 6, ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable | ImGuiTableFlags_Sortable | ImGuiTableFlags_Hideable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_RowBg | ImGuiTableFlags_ScrollY)) {
             ImGui::TableSetupScrollFreeze(0, 1);
             ImGui::TableSetupColumn("hex.builtin.view.pattern_data.var_name"_lang, 0, 0, ImGui::GetID("name"));
@@ -80,10 +80,13 @@ namespace hex::plugin::builtin {
             auto sortSpecs = ImGui::TableGetSortSpecs();
 
             if (sortSpecs->SpecsDirty || sortedPatterns.empty()) {
-                sortedPatterns = patterns;
+                sortedPatterns.clear();
+                std::transform(patterns.begin(), patterns.end(), std::back_inserter(sortedPatterns), [](const std::shared_ptr<pl::Pattern> &pattern) {
+                    return pattern.get();
+                });
 
-                std::sort(sortedPatterns.begin(), sortedPatterns.end(), [&sortSpecs, &provider](const std::shared_ptr<pl::Pattern> &left, const std::shared_ptr<pl::Pattern> &right) -> bool {
-                    return sortPatterns(provider, sortSpecs, left.get(), right.get());
+                std::sort(sortedPatterns.begin(), sortedPatterns.end(), [&sortSpecs, &provider](pl::Pattern *left, pl::Pattern *right) -> bool {
+                    return sortPatterns(provider, sortSpecs, left, right);
                 });
 
                 for (auto &pattern : sortedPatterns)

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

@@ -28,7 +28,7 @@ namespace hex::plugin::builtin {
                 langDef.mKeywords.insert(k);
 
             static constexpr std::array builtInTypes = {
-                "u8", "u16", "u32", "u64", "u128", "s8", "s16", "s32", "s64", "s128", "float", "double", "char", "char16", "bool", "padding", "str", "auto"
+                "u8", "u16", "u24", "u32", "u48", "u64", "u96", "u128", "s8", "s16", "s24", "s32", "s48", "s64", "s96", "s128", "float", "double", "char", "char16", "bool", "padding", "str", "auto"
             };
             for (const auto name : builtInTypes) {
                 TextEditor::Identifier id;
@@ -93,9 +93,7 @@ namespace hex::plugin::builtin {
         });
 
         EventManager::subscribe<RequestSetPatternLanguageCode>(this, [this](const std::string &code) {
-            this->m_textEditor.SelectAll();
-            this->m_textEditor.Delete();
-            this->m_textEditor.InsertText(code);
+            this->m_textEditor.SetText(code);
         });
 
         EventManager::subscribe<EventFileLoaded>(this, [this](const std::fs::path &path) {
@@ -127,7 +125,7 @@ namespace hex::plugin::builtin {
 
             std::error_code errorCode;
             for (const auto &dir : fs::getDefaultPaths(fs::ImHexPath::Patterns)) {
-                for (auto &entry : std::fs::directory_iterator(dir, errorCode)) {
+                for (auto &entry : std::fs::recursive_directory_iterator(dir, errorCode)) {
                     foundCorrectType = false;
                     if (!entry.is_regular_file())
                         continue;
@@ -236,31 +234,44 @@ namespace hex::plugin::builtin {
             if (this->m_runningEvaluators != 0)
                 return std::nullopt;
 
-            const auto pattern = ImHexApi::Provider::get()->getPatternLanguageRuntime().getPattern(address);
-            if (pattern != nullptr)
-                return pattern->getColor();
-            else
-                return std::nullopt;
+            std::optional<ImColor> color;
+            for (const auto &pattern : ImHexApi::Provider::get()->getPatternLanguageRuntime().getPatterns(address)) {
+                if (pattern->isHidden())
+                    continue;
+
+                if (color.has_value())
+                    color = ImAlphaBlendColors(*color, pattern->getColor());
+                else
+                    color = pattern->getColor();
+            }
+
+            return color;
         });
 
         ImHexApi::HexEditor::addTooltipProvider([this](u64 address, const u8 *data, size_t size) {
             hex::unused(data, size);
 
-            auto pattern = ImHexApi::Provider::get()->getPatternLanguageRuntime().getPattern(address);
-            if (pattern != nullptr) {
+            auto patterns = ImHexApi::Provider::get()->getPatternLanguageRuntime().getPatterns(address);
+            if (!patterns.empty() && !std::all_of(patterns.begin(), patterns.end(), [](const auto &pattern) { return pattern->isHidden(); })) {
                 ImGui::BeginTooltip();
-
-                if (ImGui::BeginTable("##tooltips", 1, ImGuiTableFlags_NoHostExtendX | ImGuiTableFlags_RowBg | ImGuiTableFlags_NoClip)) {
-                    ImGui::TableNextRow();
-                    ImGui::TableNextColumn();
-
-                    this->drawPatternTooltip(pattern);
+                for (const auto &pattern : patterns) {
+                    if (pattern->isHidden())
+                        continue;
 
                     auto tooltipColor = (pattern->getColor() & 0x00FF'FFFF) | 0x7000'0000;
-                    ImGui::PushStyleColor(ImGuiCol_TableRowBg, tooltipColor);
-                    ImGui::PushStyleColor(ImGuiCol_TableRowBgAlt, tooltipColor);
-                    ImGui::EndTable();
-                    ImGui::PopStyleColor(2);
+                    ImGui::PushID(pattern);
+                    if (ImGui::BeginTable("##tooltips", 1, ImGuiTableFlags_RowBg | ImGuiTableFlags_NoClip)) {
+                        ImGui::TableNextRow();
+                        ImGui::TableNextColumn();
+
+                        this->drawPatternTooltip(pattern);
+
+                        ImGui::PushStyleColor(ImGuiCol_TableRowBg, tooltipColor);
+                        ImGui::PushStyleColor(ImGuiCol_TableRowBgAlt, tooltipColor);
+                        ImGui::EndTable();
+                        ImGui::PopStyleColor(2);
+                    }
+                    ImGui::PopID();
                 }
                 ImGui::EndTooltip();
             }
@@ -558,25 +569,27 @@ namespace hex::plugin::builtin {
                         if (variable.outVariable) {
                             ImGui::TextUnformatted(pl::Token::literalToString(variable.value, true).c_str());
                         } else if (variable.inVariable) {
+                            const std::string label { "##" + name };
+
                             if (pl::Token::isSigned(variable.type)) {
                                 i64 value = hex::get_or<i128>(variable.value, 0);
-                                ImGui::InputScalar("", ImGuiDataType_S64, &value);
+                                ImGui::InputScalar(label.c_str(), ImGuiDataType_S64, &value);
                                 variable.value = i128(value);
                             } else if (pl::Token::isUnsigned(variable.type)) {
                                 u64 value = hex::get_or<u128>(variable.value, 0);
-                                ImGui::InputScalar("", ImGuiDataType_U64, &value);
+                                ImGui::InputScalar(label.c_str(), ImGuiDataType_U64, &value);
                                 variable.value = u128(value);
                             } else if (pl::Token::isFloatingPoint(variable.type)) {
                                 double value = hex::get_or<double>(variable.value, 0.0);
-                                ImGui::InputScalar("", ImGuiDataType_Double, &value);
+                                ImGui::InputScalar(label.c_str(), ImGuiDataType_Double, &value);
                                 variable.value = value;
                             } else if (variable.type == pl::Token::ValueType::Boolean) {
                                 bool value = hex::get_or<bool>(variable.value, false);
-                                ImGui::Checkbox("", &value);
+                                ImGui::Checkbox(label.c_str(), &value);
                                 variable.value = value;
                             } else if (variable.type == pl::Token::ValueType::Character) {
                                 char buffer[2];
-                                ImGui::InputText("", buffer, 2);
+                                ImGui::InputText(label.c_str(), buffer, 2);
                                 variable.value = buffer[0];
                             }
                         }
@@ -674,7 +687,7 @@ namespace hex::plugin::builtin {
                     ImGui::TableNextColumn();
                     ImGui::TextFormatted("{}", pattern->getEndian() == std::endian::little ? "Little" : "Big");
 
-                    if (auto comment = pattern->getComment(); comment.has_value()) {
+                    if (const auto &comment = pattern->getComment(); comment.has_value()) {
                         ImGui::TableNextRow();
                         ImGui::TableNextColumn();
                         ImGui::TextFormatted("Comment: ");
@@ -717,7 +730,6 @@ namespace hex::plugin::builtin {
             auto ast = this->m_parserRuntime->parseString(code);
 
             this->m_patternVariables.clear();
-            this->m_patternTypes.clear();
 
             if (ast) {
                 for (auto &node : *ast) {
@@ -752,7 +764,7 @@ namespace hex::plugin::builtin {
 
         this->m_textEditor.SetErrorMarkers({});
         this->m_console.clear();
-        this->clearPatterns();
+        ImHexApi::Provider::get()->getPatternLanguageRuntime().reset();
 
         EventManager::post<EventHighlightingChanged>();
 

plugins/builtin/source/content/welcome_screen.cpp

@@ -18,8 +18,8 @@
 #include <nlohmann/json.hpp>
 #include <romfs/romfs.hpp>
 
-#include <fontawesome_font.h>
-#include <codicons_font.h>
+#include <fonts/fontawesome_font.h>
+#include <fonts/codicons_font.h>
 
 #include <list>
 

plugins/builtin/source/lang/zh_CN.cpp

@@ -224,7 +224,7 @@ namespace hex::plugin::builtin {
                     { "hex.builtin.view.hashes.type", "类型" },
                     { "hex.builtin.view.hashes.result", "结果" },
                     { "hex.builtin.view.hashes.remove", "移除哈希" },
-                    { "hex.builtin.view.hashes.hover_info", "将鼠标放在 Hex 编辑器的选区上，按住 SHIFT来查看其哈希。" },
+                    { "hex.builtin.view.hashes.hover_info", "将鼠标放在 Hex 编辑器的选区上，按住 SHIFT 来查看其哈希。" },
 
 
                 { "hex.builtin.view.help.name", "帮助" },

plugins/builtin/source/pattern_drawer.cpp

@@ -44,9 +44,13 @@ namespace hex {
 
     void PatternDrawer::visit(pl::PatternBitfieldField& pattern) {
         ImGui::TableNextRow();
+        createLeafNode(pattern);
         ImGui::TableNextColumn();
-        drawNameColumn(pattern);
+
         makeSelectable(pattern);
+        drawCommentTooltip(pattern);
+        ImGui::SameLine();
+        drawNameColumn(pattern);
         drawColorColumn(pattern);
 
         auto byteAddr = pattern.getOffset() + pattern.getBitOffset() / 8;
@@ -167,8 +171,9 @@ namespace hex {
     }
 
     void PatternDrawer::visit(pl::PatternString& pattern) {
-        this->createDefaultEntry(pattern, pattern.getFormattedValue(), pattern.getValue());
-    }
+        if (pattern.getSize() > 0)
+            this->createDefaultEntry(pattern, pattern.getFormattedValue(), pattern.getValue());
+        }
 
     void PatternDrawer::visit(pl::PatternStruct& pattern) {
         bool open = true;
@@ -237,9 +242,8 @@ namespace hex {
     }
 
     void PatternDrawer::visit(pl::PatternWideString& pattern) {
-        std::string utf8String = pattern.getValue();
-
-        this->createDefaultEntry(pattern, pattern.getFormattedValue(), utf8String);
+        if (pattern.getSize() > 0)
+            this->createDefaultEntry(pattern, pattern.getFormattedValue(), pattern.getValue());
     }
 
     void PatternDrawer::createDefaultEntry(const pl::Pattern &pattern, const std::string &value, pl::Token::Literal &&literal) const {

plugins/windows/source/content/ui_items.cpp

@@ -8,8 +8,8 @@
 #include <imgui.h>
 #include <hex/ui/imgui_imhex_extensions.h>
 
-#include <fontawesome_font.h>
-#include <codicons_font.h>
+#include <fonts/fontawesome_font.h>
+#include <fonts/codicons_font.h>
 
 namespace hex::plugin::windows {