#2036 changes to window detection logic

koekeishiya · Jan 3, 2024 · eed5e98 · eed5e98
1 parent 79bf9e9
commit eed5e98
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 1 deletion.
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
+- Changes to window detection logic [#2036](https://github.com/koekeishiya/yabai/issues/2036)
 
 ## [6.0.3] - 2024-01-03
 ### Changed

diff --git a/src/window.c b/src/window.c
@@ -452,6 +452,27 @@ bool window_is_standard(struct window *window)
     return standard_win;
 }
 
+bool window_is_really_a_window(struct window *window)
+{
+    bool win = false;
+    CFStringRef role  = NULL;
+    CFStringRef srole = NULL;
+
+    if (!(role  = window_role(window)))    goto out;
+    if (!(srole = window_subrole(window))) goto role;
+
+    win = CFEqual(role, kAXWindowRole) &&
+          (CFEqual(srole, kAXStandardWindowSubrole) ||
+           CFEqual(srole, kAXFloatingWindowSubrole) ||
+           CFEqual(srole, kAXDialogSubrole));
+
+    CFRelease(srole);
+role:
+    CFRelease(role);
+out:
+    return win;
+}
+
 bool window_is_dialog(struct window *window)
 {
     bool standard_win = false;

diff --git a/src/window.h b/src/window.h
@@ -90,6 +90,7 @@ bool window_is_undersized(struct window *window);
 bool window_is_minimized(struct window *window);
 bool window_is_fullscreen(struct window *window);
 bool window_is_sticky(struct window *window);
+bool window_is_really_a_window(struct window *window);
 bool window_is_standard(struct window *window);
 bool window_is_dialog(struct window *window);
 bool window_is_group(struct window *window);

diff --git a/src/window_manager.c b/src/window_manager.c
@@ -137,6 +137,11 @@ void window_manager_apply_rule_to_window(struct space_manager *sm, struct window
     int regex_match_subrole = rule->subrole_regex_exclude ? REGEX_MATCH_YES : REGEX_MATCH_NO;
     if (regex_match(rule->subrole_regex_valid, &rule->subrole_regex, window_subrole) == regex_match_subrole) return;
 
+    if (!window_rule_check_flag(window, WINDOW_RULE_MANAGED)) {
+        if (!rule->role_regex_valid    && !string_equals(window_role   , "AXWindow"))         return;
+        if (!rule->subrole_regex_valid && !string_equals(window_subrole, "AXStandardWindow")) return;
+    }
+
     if (rule->sid || rule->did) {
         if (!window_is_fullscreen(window) && !space_is_fullscreen(window_space(window))) {
             uint64_t sid = rule->did ? display_space_id(rule->did) : rule->sid;
@@ -1305,7 +1310,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_is_standard(window) && !window_rule_check_flag(window, WINDOW_RULE_MANAGED)) {
+    if (!window_is_really_a_window(window) && !window_rule_check_flag(window, WINDOW_RULE_MANAGED)) {
         debug("%s ignoring incorrectly marked window %s %d\n", __FUNCTION__, window->application->name, window->id);
 
         //