#2048 fix regression causing window_destroyed signal to not trigger

koekeishiya · Jan 14, 2024 · 60380a1 · 60380a1
1 parent d55a647
commit 60380a1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- Fix regression causing window_destroyed signal to not trigger [#2048](https://github.com/koekeishiya/yabai/issues/2048)
 
 ## [6.0.6] - 2024-01-08
 ### Changed

diff --git a/src/event_loop.c b/src/event_loop.c
@@ -213,7 +213,7 @@ static EVENT_HANDLER(APPLICATION_TERMINATED)
 
         if (g_mouse_state.window == window) g_mouse_state.window = NULL;
 
-        if (window_manager_is_window_eligible(window)) {
+        if (window->is_eligible) {
             event_signal_push(SIGNAL_WINDOW_DESTROYED, window);
         }
 
@@ -472,7 +472,7 @@ static EVENT_HANDLER(WINDOW_DESTROYED)
 
     if (g_mouse_state.window == window) g_mouse_state.window = NULL;
 
-    if (window_manager_is_window_eligible(window)) {
+    if (window->is_eligible) {
         event_signal_push(SIGNAL_WINDOW_DESTROYED, window);
     }
 

diff --git a/src/rule.c b/src/rule.c
@@ -85,6 +85,7 @@ void rule_add(struct rule *rule)
                     window_manager_apply_manage_rule_to_window(&g_space_manager, &g_window_manager, window, rule, window_title, window_role, window_subrole);
 
                     if (window_manager_is_window_eligible(window)) {
+                        window->is_eligible = true;
                         window_manager_apply_rule_to_window(&g_space_manager, &g_window_manager, window, rule, window_title, window_role, window_subrole);
                     }
                 }

diff --git a/src/window.h b/src/window.h
@@ -36,6 +36,7 @@ struct window
     uint32_t *volatile id_ptr;
     CGRect frame;
     bool is_root;
+    bool is_eligible;
     uint8_t notification;
     uint8_t rule_flags;
     uint8_t flags;

diff --git a/src/window_manager.c b/src/window_manager.c
@@ -1329,6 +1329,7 @@ struct window *window_manager_create_and_add_window(struct space_manager *sm, st
         window_manager_apply_manage_rules_to_window(sm, wm, window, window_title, window_role, window_subrole);
 
         if (window_manager_is_window_eligible(window)) {
+            window->is_eligible = true;
             window_manager_apply_rules_to_window(sm, wm, window, window_title, window_role, window_subrole);
             window_manager_purify_window(wm, window);
             window_manager_set_window_opacity(wm, window, wm->normal_window_opacity);