fix moving window to space in sonoma (#3638)

Author: asmagill

extensions/spaces/libspaces.m

@@ -12,6 +12,14 @@
 
 #pragma mark - Support Functions and Classes
 
+// https://github.com/koekeishiya/yabai/commit/7bacdd59bdf39b53012e024b442d61913095794e#diff-fab09245ac7f0bacbd4b3648bdd51eff6c41dc937f5dbaaf7459ff9ea70d3557R17-R27
+static bool workspace_is_macos_sonoma14_5_or_newer(void) {
+    NSOperatingSystemVersion os_version = [[NSProcessInfo processInfo] operatingSystemVersion];
+    if (os_version.majorVersion > 14) return true;
+    if (os_version.majorVersion == 14 && os_version.minorVersion >= 5) return true;
+    return false;
+}
+
 #pragma mark - Module Functions
 
 /// hs.spaces.screensHaveSeparateSpaces() -> bool
@@ -171,7 +179,15 @@ static int spaces_moveWindowToSpace(lua_State *L) { // NOTE: wrapped in init.lua
                 CFRelease(spacesList);
                 return 2 ;
             }
-            SLSMoveWindowsToManagedSpace(g_connection, (__bridge CFArrayRef)windows, sid) ;
+
+// https://github.com/koekeishiya/yabai/commit/98bbdbd1363f27d35f09338cded0de1ec010d830
+            if (workspace_is_macos_sonoma14_5_or_newer()) {
+                SLSSpaceSetCompatID(g_connection, sid, 0x79616265);
+                SLSSetWindowListWorkspace(g_connection, &wid, 1, 0x79616265);
+                SLSSpaceSetCompatID(g_connection, sid, 0x0);
+            } else {
+                SLSMoveWindowsToManagedSpace(g_connection, (__bridge CFArrayRef)windows, sid) ;
+            }
         }
         lua_pushboolean(L, true) ;
         CFRelease(spacesList) ;

extensions/spaces/private.h

@@ -13,6 +13,8 @@ extern CFArrayRef SLSCopyWindowsWithOptionsAndTags(int cid, uint32_t owner, CFAr
 extern void SLSMoveWindowsToManagedSpace(int cid, CFArrayRef window_list, uint64_t sid);
 extern CFArrayRef SLSCopySpacesForWindows(int cid, int selector, CFArrayRef window_list);
 
+extern CGError SLSSpaceSetCompatID(int cid, uint64_t sid, int workspace);
+extern CGError SLSSetWindowListWorkspace(int cid, uint32_t *window_list, int window_count, int workspace);
 // extern uint64_t SLSManagedDisplayGetCurrentSpace(int cid, CFStringRef uuid) ;
 // extern CFStringRef SLSCopyManagedDisplayForSpace(int cid, uint64_t sid);
 // extern CFStringRef SLSSpaceCopyName(int cid, uint64_t sid);

extensions/spaces/spaces.lua

@@ -11,18 +11,7 @@
 ---
 --- It is recommended that you also enable "Displays have separate Spaces" in System Preferences -> Mission Control.
 ---
---- This module is a distillation of my previous `hs._asm.undocumented.spaces` module, changes inspired by reviewing the `Yabai` source, and some experimentation with `hs.axuielement`. If you require more sophisticated control, I encourage you to check out https://github.com/koekeishiya/yabai -- it does require some additional setup (changes to SIP, possibly edits to `sudoers`, etc.) but may be worth the extra steps for some power users.
-
--- TODO:
---    does this work if "Displays have Separate Spaces" isn't checked in System Preferences ->
---        Mission Control? What changes, and can we work around it?
---
---    need working hs.window.filter (or replacement) for pruning windows list and making use of other space windows
-
--- I think we're probably done with Yabai duplication -- basic functionality desired is present, minus window id pruning
--- +  yabai supports *some* stuff on M1 without injection... investigate
--- *      move window to space               -- according to M1 tracking issue
--- +      ids of windows on other spaces     -- partial; see hs.window.filter comment above
+--- Portions of this module are based on code and fixes discovered by the developers of Yabai (https://github.com/koekeishiya/yabai). This has been noted in the relevant places of the source code for this module if you wish more information. Yabai provides much functionality with regards to the manipulation of macOS Spaces and power users may want to consider utilizing Yabai as an adjunct to Hammerspoon.
 
 local USERDATA_TAG = "hs.spaces"
 local module       = require(table.concat({ USERDATA_TAG:match("^([%w%._]+%.)([%w_]+)$") }, "lib"))