sys: Fixed global shortcuts not working correctly

Fixes #606

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

@@ -102,7 +102,6 @@ namespace hex {
 
     /* Default Events */
     EVENT_DEF(EventFileLoaded, std::fs::path);
-    EVENT_DEF(EventFileUnloaded);
     EVENT_DEF(EventDataChanged);
     EVENT_DEF(EventHighlightingChanged);
     EVENT_DEF(EventWindowClosing, GLFWwindow *);
@@ -114,6 +113,7 @@ namespace hex {
     EVENT_DEF(EventOSThemeChanged);
     EVENT_DEF(EventProviderCreated, prv::Provider *);
     EVENT_DEF(EventProviderChanged, prv::Provider *, prv::Provider *);
+    EVENT_DEF(EventProviderDeleted, prv::Provider *);
     EVENT_DEF(EventFrameBegin);
     EVENT_DEF(EventFrameEnd);
     EVENT_DEF(EventWindowInitialized);

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

@@ -188,7 +188,9 @@ namespace hex {
     public:
         static void addGlobalShortcut(const Shortcut &shortcut, const std::function<void()> &callback);
         static void addShortcut(View *view, const Shortcut &shortcut, const std::function<void()> &callback);
+
         static void process(View *currentView, bool ctrl, bool alt, bool shift, bool super, bool focused, u32 keyCode);
+        static void processGlobals(bool ctrl, bool alt, bool shift, bool super, u32 keyCode);
 
         static void clearShortcuts();
 

lib/libimhex/source/api/imhex_api.cpp

@@ -251,10 +251,17 @@ namespace hex {
         }
 
         void remove(prv::Provider *provider) {
+            if (provider == nullptr)
+                 return;
+
             if (Task::getRunningTaskCount() > 0)
                 return;
 
             auto it = std::find(s_providers.begin(), s_providers.end(), provider);
+            if (it == s_providers.end())
+                return;
+
+            EventManager::post<EventProviderDeleted>(provider);
 
             s_providers.erase(it);
 

lib/libimhex/source/api/keybinding.cpp

@@ -15,7 +15,7 @@ namespace hex {
         view->m_shortcuts.insert({ shortcut, callback });
     }
 
-    void ShortcutManager::process(View *currentView, bool ctrl, bool alt, bool shift, bool super, bool focused, u32 keyCode) {
+    static Shortcut getShortcut(bool ctrl, bool alt, bool shift, bool super, u32 keyCode) {
         Shortcut pressedShortcut;
 
         if (ctrl)
@@ -29,9 +29,20 @@ namespace hex {
 
         pressedShortcut += static_cast<Keys>(keyCode);
 
+        return pressedShortcut;
+    }
+
+    void ShortcutManager::process(View *currentView, bool ctrl, bool alt, bool shift, bool super, bool focused, u32 keyCode) {
+        Shortcut pressedShortcut = getShortcut(ctrl, alt, shift, super, keyCode);
+
         if (focused && currentView->m_shortcuts.contains(pressedShortcut))
             currentView->m_shortcuts[pressedShortcut]();
-        else if (ShortcutManager::s_globalShortcuts.contains(pressedShortcut))
+    }
+
+    void ShortcutManager::processGlobals(bool ctrl, bool alt, bool shift, bool super, u32 keyCode) {
+        Shortcut pressedShortcut = getShortcut(ctrl, alt, shift, super, keyCode);
+
+        if (ShortcutManager::s_globalShortcuts.contains(pressedShortcut))
             ShortcutManager::s_globalShortcuts[pressedShortcut]();
     }
 

main/source/window/window.cpp

@@ -87,7 +87,7 @@ namespace hex {
                 EventManager::post<EventWindowClosing>(this->m_window);
         });
 
-        EventManager::subscribe<EventFileUnloaded>(this, [] {
+        EventManager::subscribe<EventProviderDeleted>(this, [](const auto*) {
             EventManager::post<RequestChangeWindowTitle>("");
         });
 
@@ -163,7 +163,7 @@ namespace hex {
         this->exitImGui();
         this->exitGLFW();
 
-        EventManager::unsubscribe<EventFileUnloaded>(this);
+        EventManager::unsubscribe<EventProviderDeleted>(this);
         EventManager::unsubscribe<RequestCloseImHex>(this);
         EventManager::unsubscribe<RequestChangeWindowTitle>(this);
         EventManager::unsubscribe<EventAbnormalTermination>(this);
@@ -416,6 +416,7 @@ namespace hex {
             calls.clear();
         }
 
+        auto &io = ImGui::GetIO();
         for (auto &[name, view] : ContentRegistry::Views::getEntries()) {
             ImGui::GetCurrentContext()->NextWindowData.ClearFlags();
 
@@ -442,13 +443,16 @@ namespace hex {
                     ImGui::End();
                 }
 
-                auto &io = ImGui::GetIO();
                 for (const auto &key : this->m_pressedKeys) {
                     ShortcutManager::process(view, io.KeyCtrl, io.KeyAlt, io.KeyShift, io.KeySuper, focused, key);
                 }
             }
         }
 
+        for (const auto &key : this->m_pressedKeys) {
+            ShortcutManager::processGlobals(io.KeyCtrl, io.KeyAlt, io.KeyShift, io.KeySuper, key);
+        }
+
         this->m_pressedKeys.clear();
     }
 

plugins/builtin/CMakeLists.txt

@@ -23,6 +23,7 @@ add_library(${PROJECT_NAME} SHARED
         source/content/data_visualizers.cpp
         source/content/events.cpp
         source/content/hashes.cpp
+        source/content/shortcuts.cpp
 
         source/content/providers/file_provider.cpp
         source/content/providers/gdb_provider.cpp

plugins/builtin/source/content/main_menu_items.cpp

@@ -46,7 +46,6 @@ namespace hex::plugin::builtin {
             bool taskRunning = Task::getRunningTaskCount() > 0;
 
             if (ImGui::MenuItem("hex.builtin.menu.file.close"_lang, "CTRL + W", false, providerValid && !taskRunning)) {
-                EventManager::post<EventFileUnloaded>();
                 ImHexApi::Provider::remove(ImHexApi::Provider::get());
             }
 

plugins/builtin/source/content/shortcuts.cpp

@@ -0,0 +1,20 @@
+#include <hex/api/keybinding.hpp>
+#include <hex/api/event.hpp>
+
+namespace hex::plugin::builtin {
+
+    void registerShortcuts() {
+        // Open file
+        ShortcutManager::addGlobalShortcut(CTRL + Keys::O, [] {
+            fs::openFileBrowser(fs::DialogMode::Open, {}, [](const auto &path) {
+                EventManager::post<RequestOpenFile>(path);
+            });
+        });
+
+        // Close file
+        ShortcutManager::addGlobalShortcut(CTRL + Keys::W, [] {
+            ImHexApi::Provider::remove(ImHexApi::Provider::get());
+        });
+    }
+
+}

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

@@ -37,7 +37,7 @@ namespace hex::plugin::builtin {
             ProjectFile::setBookmarks(this->m_bookmarks);
         });
 
-        EventManager::subscribe<EventFileUnloaded>(this, [this] {
+        EventManager::subscribe<EventProviderDeleted>(this, [this](const auto*) {
             this->m_bookmarks.clear();
         });
 
@@ -115,7 +115,7 @@ namespace hex::plugin::builtin {
         EventManager::unsubscribe<RequestAddBookmark>(this);
         EventManager::unsubscribe<EventProjectFileLoad>(this);
         EventManager::unsubscribe<EventProjectFileStore>(this);
-        EventManager::unsubscribe<EventFileUnloaded>(this);
+        EventManager::unsubscribe<EventProviderDeleted>(this);
 
         this->m_bookmarks.clear();
     }

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

@@ -22,7 +22,7 @@ namespace hex::plugin::builtin {
             }
         });
 
-        EventManager::subscribe<EventFileUnloaded>(this, [this] {
+        EventManager::subscribe<EventProviderDeleted>(this, [this](const auto*) {
             this->m_disassembly.clear();
         });
     }
@@ -30,7 +30,7 @@ namespace hex::plugin::builtin {
     ViewDisassembler::~ViewDisassembler() {
         EventManager::unsubscribe<EventDataChanged>(this);
         EventManager::unsubscribe<EventRegionSelected>(this);
-        EventManager::unsubscribe<EventFileUnloaded>(this);
+        EventManager::unsubscribe<EventProviderDeleted>(this);
     }
 
     void ViewDisassembler::disassemble() {

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

@@ -1243,19 +1243,6 @@ namespace hex::plugin::builtin {
             pasteBytes(selection);
         });
 
-        // Open file
-        ShortcutManager::addGlobalShortcut(CTRL + Keys::O, [] {
-            fs::openFileBrowser(fs::DialogMode::Open, {}, [](const auto &path) {
-                EventManager::post<RequestOpenFile>(path);
-            });
-        });
-
-        // Close file
-        ShortcutManager::addGlobalShortcut(CTRL + Keys::W, [] {
-            EventManager::post<EventFileUnloaded>();
-            ImHexApi::Provider::remove(ImHexApi::Provider::get());
-        });
-
         // Undo / Redo
         ShortcutManager::addShortcut(this, CTRL + Keys::Z, [] {
             if (ImHexApi::Provider::isValid())

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

@@ -42,7 +42,7 @@ namespace hex::plugin::builtin {
                 this->m_entropyHandlePosition = region.address / this->m_blockSize;
         });
 
-        EventManager::subscribe<EventFileUnloaded>(this, [this] {
+        EventManager::subscribe<EventProviderDeleted>(this, [this](const auto*) {
             this->m_dataValid = false;
         });
 
@@ -61,7 +61,7 @@ namespace hex::plugin::builtin {
     ViewInformation::~ViewInformation() {
         EventManager::unsubscribe<EventDataChanged>(this);
         EventManager::unsubscribe<EventRegionSelected>(this);
-        EventManager::unsubscribe<EventFileUnloaded>(this);
+        EventManager::unsubscribe<EventProviderDeleted>(this);
     }
 
     static float calculateEntropy(std::array<ImU64, 256> &valueCounts, size_t blockSize) {

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

@@ -150,8 +150,8 @@ namespace hex::plugin::builtin {
             }
         });
 
-        EventManager::subscribe<EventFileUnloaded>(this, [] {
+        EventManager::subscribe<EventProviderDeleted>(this, [](auto *provider) {
-            ImHexApi::Provider::get()->getPatternLanguageRuntime().abort();
+            provider->getPatternLanguageRuntime().abort();
         });
 
         EventManager::subscribe<EventProviderChanged>(this, [this](prv::Provider *oldProvider, prv::Provider *newProvider) {
@@ -283,7 +283,7 @@ namespace hex::plugin::builtin {
         EventManager::unsubscribe<EventProjectFileLoad>(this);
         EventManager::unsubscribe<RequestSetPatternLanguageCode>(this);
         EventManager::unsubscribe<EventFileLoaded>(this);
-        EventManager::unsubscribe<EventFileUnloaded>(this);
+        EventManager::unsubscribe<EventProviderDeleted>(this);
         EventManager::unsubscribe<RequestChangeTheme>(this);
         EventManager::unsubscribe<EventProviderChanged>(this);
     }

plugins/builtin/source/plugin_builtin.cpp

@@ -19,6 +19,7 @@ namespace hex::plugin::builtin {
     void registerMainMenuEntries();
     void createWelcomeScreen();
     void registerViews();
+    void registerShortcuts();
 
     void addFooterItems();
     void addToolbarItems();
@@ -62,6 +63,7 @@ IMHEX_PLUGIN_SETUP("Built-in", "WerWolv", "Default ImHex functionality") {
     registerDataFormatters();
     createWelcomeScreen();
     registerViews();
+    registerShortcuts();
 
     addFooterItems();
     addToolbarItems();