#2380 use space workaround for Ventura 13.6, and fix misc Sequoia sup…

…port
koekeishiya · Aug 10, 2024 · 6773d2b · 6773d2b
1 parent 4572d69
commit 6773d2b
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Allow *window_animation_duration* to be set to `0.0` without requesting *Screen Capture* permissions [#2378](https://github.com/koekeishiya/yabai/issues/2378)
 - Add new *window --toggle* option `windowed-fullscreen` to fullscreen a window, ignoring all configured padding for both managed and unmanaged windows [#2221](https://github.com/koekeishiya/yabai/issues/2221)
 - Moving windows to other spaces requires SIP to be disabled on macOS Sequoia [#2324](https://github.com/koekeishiya/yabai/issues/2324) [#2331](https://github.com/koekeishiya/yabai/issues/2331)
-- Updated scripting-addition mach loader/injection and payload to work for macOS Sequoia Beta 1, 2, 3, and 4 [#2324](https://github.com/koekeishiya/yabai/issues/2324) [#2331](https://github.com/koekeishiya/yabai/issues/2331)
+- Updated scripting-addition mach loader/injection and payload to work for macOS Sequoia Beta 1, 2, 3, 4, and 5 [#2324](https://github.com/koekeishiya/yabai/issues/2324) [#2331](https://github.com/koekeishiya/yabai/issues/2331)
 - Extend *stack window selector* to allow numeric indices: `yabai -m window --focus stack.3` [#2342](https://github.com/koekeishiya/yabai/issues/2342)
 
 ## [7.1.1] - 2024-05-18

diff --git a/src/event_loop.c b/src/event_loop.c
@@ -1360,7 +1360,10 @@ static EVENT_HANDLER(DOCK_DID_RESTART)
 {
     debug("%s:\n", __FUNCTION__);
 
-    if (workspace_is_macos_monterey() || workspace_is_macos_ventura() || workspace_is_macos_sonoma()) {
+    if (workspace_is_macos_monterey() ||
+        workspace_is_macos_ventura() ||
+        workspace_is_macos_sonoma() ||
+        workspace_is_macos_sequoia()) {
         mission_control_unobserve();
         mission_control_observe();
     }

diff --git a/src/space_manager.c b/src/space_manager.c
@@ -647,31 +647,27 @@ uint64_t space_manager_active_space(void)
 
 void space_manager_move_window_list_to_space(uint64_t sid, uint32_t *window_list, int window_count)
 {
-    if (workspace_is_macos_sonoma14_5_or_newer()) {
-        if (!scripting_addition_move_window_list_to_space(sid, window_list, window_count)) {
-            SLSSpaceSetCompatID(g_connection, sid, 0x79616265);
-            SLSSetWindowListWorkspace(g_connection, window_list, window_count, 0x79616265);
-            SLSSpaceSetCompatID(g_connection, sid, 0x0);
-        }
-    } else {
+    if (!workspace_use_macos_space_workaround()) {
         CFArrayRef window_list_ref = cfarray_of_cfnumbers(window_list, sizeof(uint32_t), window_count, kCFNumberSInt32Type);
         SLSMoveWindowsToManagedSpace(g_connection, window_list_ref, sid);
         CFRelease(window_list_ref);
+    } else if (!scripting_addition_move_window_list_to_space(sid, window_list, window_count)) {
+        SLSSpaceSetCompatID(g_connection, sid, 0x79616265);
+        SLSSetWindowListWorkspace(g_connection, window_list, window_count, 0x79616265);
+        SLSSpaceSetCompatID(g_connection, sid, 0x0);
     }
 }
 
 void space_manager_move_window_to_space(uint64_t sid, struct window *window)
 {
-    if (workspace_is_macos_sonoma14_5_or_newer()) {
-        if (!scripting_addition_move_window_to_space(sid, window->id)) {
-            SLSSpaceSetCompatID(g_connection, sid, 0x79616265);
-            SLSSetWindowListWorkspace(g_connection, &window->id, 1, 0x79616265);
-            SLSSpaceSetCompatID(g_connection, sid, 0x0);
-        }
-    } else {
+    if (!workspace_use_macos_space_workaround()) {
         CFArrayRef window_list_ref = cfarray_of_cfnumbers(&window->id, sizeof(uint32_t), 1, kCFNumberSInt32Type);
         SLSMoveWindowsToManagedSpace(g_connection, window_list_ref, sid);
         CFRelease(window_list_ref);
+    } else if (!scripting_addition_move_window_to_space(sid, window->id)) {
+        SLSSpaceSetCompatID(g_connection, sid, 0x79616265);
+        SLSSetWindowListWorkspace(g_connection, &window->id, 1, 0x79616265);
+        SLSSpaceSetCompatID(g_connection, sid, 0x0);
     }
 }
 

diff --git a/src/window.c b/src/window.c
@@ -889,7 +889,7 @@ int window_level(uint32_t wid)
 {
     int level = 0;
 
-    if (workspace_is_macos_ventura() || workspace_is_macos_sonoma()) {
+    if (workspace_is_macos_ventura() || workspace_is_macos_sonoma() || workspace_is_macos_sequoia()) {
         CFArrayRef window_ref = cfarray_of_cfnumbers(&wid, sizeof(uint32_t), 1, kCFNumberSInt32Type);
 
         CFTypeRef query = SLSWindowQueryWindows(g_connection, window_ref, 1);

diff --git a/src/window_manager.c b/src/window_manager.c
@@ -2173,7 +2173,10 @@ void window_manager_wait_for_native_fullscreen_transition(struct window *window)
 {
     TIME_FUNCTION;
 
-    if (workspace_is_macos_monterey() || workspace_is_macos_ventura() || workspace_is_macos_sonoma()) {
+    if (workspace_is_macos_monterey() ||
+        workspace_is_macos_ventura() ||
+        workspace_is_macos_sonoma() ||
+        workspace_is_macos_sequoia()) {
         while (!space_is_user(space_manager_active_space())) {
 
             //

diff --git a/src/workspace.h b/src/workspace.h
@@ -2,6 +2,7 @@
 #define WORKSPACE_H
 
 #define SUPPORTED_MACOS_VERSION_LIST    \
+    SUPPORT_MACOS_VERSION(sequoia,  15) \
     SUPPORT_MACOS_VERSION(sonoma,   14) \
     SUPPORT_MACOS_VERSION(ventura,  13) \
     SUPPORT_MACOS_VERSION(monterey, 12) \
@@ -31,6 +32,6 @@ void workspace_application_observe_activation_policy(void *context, struct proce
 int workspace_display_notch_height(uint32_t did);
 pid_t workspace_get_dock_pid(void);
 bool workspace_event_handler_begin(void **context);
-bool workspace_is_macos_sonoma14_5_or_newer(void);
+bool workspace_use_macos_space_workaround(void);
 
 #endif
diff --git a/src/workspace.m b/src/workspace.m
@@ -14,15 +14,14 @@ bool workspace_event_handler_begin(void **context)
     return true;
 }
 
-bool workspace_is_macos_sonoma14_5_or_newer(void)
+bool workspace_use_macos_space_workaround(void)
 {
     NSOperatingSystemVersion os_version = [[NSProcessInfo processInfo] operatingSystemVersion];
 
-    if (os_version.majorVersion > 14) return true;
-
+    if (os_version.majorVersion == 13 && os_version.minorVersion >= 6) return true;
     if (os_version.majorVersion == 14 && os_version.minorVersion >= 5) return true;
 
-    return false;
+    return os_version.majorVersion >= 15;
 }
 
 void *workspace_application_create_running_ns_application(struct process *process)

diff --git a/src/yabai.c b/src/yabai.c
@@ -307,10 +307,15 @@ int main(int argc, char **argv)
         error("yabai: could not start mouse handler! abort..\n");
     }
 
-    if (workspace_is_macos_monterey() || workspace_is_macos_ventura() || workspace_is_macos_sonoma()) {
+    if (workspace_is_macos_monterey() ||
+        workspace_is_macos_ventura() ||
+        workspace_is_macos_sonoma() ||
+        workspace_is_macos_sequoia()) {
         mission_control_observe();
 
-        if (workspace_is_macos_ventura() || workspace_is_macos_sonoma()) {
+        if (workspace_is_macos_ventura() ||
+            workspace_is_macos_sonoma() ||
+            workspace_is_macos_sequoia()) {
             SLSRegisterConnectionNotifyProc(g_connection, connection_handler, 1327, NULL);
             SLSRegisterConnectionNotifyProc(g_connection, connection_handler, 1328, NULL);
         }