fix: Hyprland clash when unplug monitor

.gitignore

@@ -3,4 +3,5 @@ compile_flags.txt
 compile_commands.json
 .cache
 result/
-.idea
+.idea
+build

CMakeLists.txt

@@ -0,0 +1,28 @@
+cmake_minimum_required(VERSION 3.10)
+project(virtual-desktops)
+
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(PIXMAN REQUIRED pixman-1)
+pkg_check_modules(DRM REQUIRED libdrm)
+
+file(GLOB_RECURSE SOURCE_FILES src/*.cpp)
+add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES})
+target_include_directories(${PROJECT_NAME} PRIVATE
+    ./include
+    ${PIXMAN_INCLUDE_DIRS}
+    ${DRM_INCLUDE_DIRS}
+)
+target_link_libraries(${PROJECT_NAME} PRIVATE
+    ${PIXMAN_LIBRARIES}
+    ${DRM_LIBRARIES}
+)
+
+set_target_properties(${PROJECT_NAME} PROPERTIES
+    POSITION_INDEPENDENT_CODE ON # -fPIC
+    COMPILE_FLAGS "--no-gnu-unique -std=c++23 -Wall"
+)
+
+target_compile_definitions(${PROJECT_NAME} PRIVATE
+    WLR_USE_UNSTABLE
+)
+

src/main.cpp

@@ -19,9 +19,9 @@ using namespace Hyprutils::Memory;
 static CSharedPointer<HOOK_CALLBACK_FN> onWorkspaceChangeHook = nullptr;
 static CSharedPointer<HOOK_CALLBACK_FN> onWindowOpenHook      = nullptr;
 static CSharedPointer<HOOK_CALLBACK_FN> onConfigReloadedHook  = nullptr;
+static CSharedPointer<HOOK_CALLBACK_FN> onMonitorConnectHook  = nullptr;
+static CSharedPointer<HOOK_CALLBACK_FN> onMonitorDisconnectHook  = nullptr;
 
-inline CFunctionHook*                   g_pMonitorConnectHook    = nullptr;
-inline CFunctionHook*                   g_pMonitorDisconnectHook = nullptr;
 typedef void (*origMonitorConnect)(void*, bool);
 typedef void (*origMonitorDisconnect)(void*, bool);
 
@@ -294,12 +294,11 @@ void onWindowOpen(void*, SCallbackInfo&, std::any val) {
         manager->changeActiveDesk(vdesk, true);
 }
 
-void hookMonitorDisconnect(void* thisptr, bool destroy) {
+void onPreMonitorRemoved(void*,  SCallbackInfo&, std::any val) {
+    auto monitor = std::any_cast<PHLMONITOR>(val);
     monitorLayoutChanging = true;
-    (*(origMonitorDisconnect)g_pMonitorDisconnectHook->m_pOriginal)(thisptr, destroy);
     monitorLayoutChanging = false;
 
-    CSharedPointer<CMonitor> monitor = CSharedPointer(static_cast<CMonitor*>(thisptr));
     if (isVerbose())
         printLog("Monitor disconnect called with disabled monitor " + monitor->szName);
     if (!currentlyEnabledMonitors(monitor).empty()) {
@@ -310,12 +309,11 @@ void hookMonitorDisconnect(void* thisptr, bool destroy) {
     }
 }
 
-void hookMonitorConnect(void* thisptr, bool noRule) {
+void onMonitorAdded(void*, SCallbackInfo&, std::any val) {
+    auto monitor = std::any_cast<PHLMONITOR>(val);
     monitorLayoutChanging = true;
-    (*(origMonitorConnect)g_pMonitorConnectHook->m_pOriginal)(thisptr, noRule);
     monitorLayoutChanging = false;
 
-    CSharedPointer<CMonitor> monitor = CSharedPointer(static_cast<CMonitor*>(thisptr));
     if (monitor->szName == std::string("HEADLESS-1")) {
         return;
     }
@@ -405,15 +403,8 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) {
     onWorkspaceChangeHook = HyprlandAPI::registerCallbackDynamic(PHANDLE, "workspace", onWorkspaceChange);
     onWindowOpenHook      = HyprlandAPI::registerCallbackDynamic(PHANDLE, "openWindow", onWindowOpen);
     onConfigReloadedHook  = HyprlandAPI::registerCallbackDynamic(PHANDLE, "configReloaded", onConfigReloaded);
-
-    // Function hooks
-    static const auto METHODS_CONNECT = HyprlandAPI::findFunctionsByName(PHANDLE, "onConnect");
-    g_pMonitorConnectHook             = HyprlandAPI::createFunctionHook(handle, METHODS_CONNECT[0].address, (void*)&hookMonitorConnect);
-    g_pMonitorConnectHook->hook();
-
-    static const auto METHODS_DISCONNECT = HyprlandAPI::findFunctionsByName(PHANDLE, "onDisconnect");
-    g_pMonitorDisconnectHook             = HyprlandAPI::createFunctionHook(handle, METHODS_DISCONNECT[0].address, (void*)&hookMonitorDisconnect);
-    g_pMonitorDisconnectHook->hook();
+    onMonitorConnectHook = HyprlandAPI::registerCallbackDynamic(PHANDLE, "monitorAdded", onMonitorAdded);
+    onMonitorDisconnectHook = HyprlandAPI::registerCallbackDynamic(PHANDLE, "preMonitorRemoved", onPreMonitorRemoved);
 
     registerHyprctlCommands();