Skip to content

Commit 01949f5

Browse files
committed
#2589 fix x86-64 payload for macOS 15.4
1 parent 527b0aa commit 01949f5

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
55
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
### Update scripting addition for macOS 15.4 Intel x86-64 [#2589](https://github.com/koekeishiya/yabai/issues/2589)
89

910
## [7.1.13] - 2025-03-23
1011
### Changed

src/osax/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef SA_COMMON_H
22
#define SA_COMMON_H
33

4-
#define OSAX_VERSION "2.1.21"
4+
#define OSAX_VERSION "2.1.22"
55

66
#define OSAX_ATTRIB_DOCK_SPACES 0x01
77
#define OSAX_ATTRIB_DPPM 0x02

src/osax/x64_payload.m

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ uint64_t get_dppm_offset(NSOperatingSystemVersion os_version) {
3838

3939
uint64_t get_fix_animation_offset(NSOperatingSystemVersion os_version) {
4040
if (os_version.majorVersion == 15) {
41-
return 0x280000;
41+
return os_version.minorVersion >= 4 ? 0x270000 : 0x280000;
4242
} else if (os_version.majorVersion == 14) {
4343
return os_version.minorVersion > 0 ? 0x1f0000 : 0x210000;
4444
} else if (os_version.majorVersion == 13) {
@@ -157,6 +157,9 @@ uint64_t get_set_front_window_offset(NSOperatingSystemVersion os_version) {
157157

158158
const char *get_fix_animation_pattern(NSOperatingSystemVersion os_version) {
159159
if (os_version.majorVersion == 15) {
160+
if (os_version.minorVersion >= 4) {
161+
return "F2 0F 10 05 DB 13 0B 00 4C 89 F7 48 89 DE";
162+
}
160163
return "F2 0F 10 05 ?? ?? ?? 00 48 8B ?? ?? 48 ?? ??";
161164
} else if (os_version.majorVersion == 14) {
162165
return "F2 0F 10 05 ?? ?? ?? 00 4C 89 ?? 48 89 DE";

0 commit comments

Comments
 (0)