From 1f3b2158b6f776b0d5fd50d6a56fc1afbc8cb972 Mon Sep 17 00:00:00 2001 From: koekeishiya Date: Tue, 25 May 2021 19:17:09 +0200 Subject: [PATCH] v3.3.9 --- CHANGELOG.md | 7 ++++++- doc/yabai.1 | 4 ++-- src/osax/common.h | 2 +- src/osax/sa.m | 2 +- src/osax/x86_64/payload.m | 6 +++--- src/yabai.c | 2 +- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6144f713..bc0e86fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] +## [3.3.9] - 2021-05-25 +### Changed +- Update scripting addition to support macOS 11.4 + ## [3.3.8] - 2021-04-28 ### Changed - Update scripting addition to support macOS 11.3 @@ -345,7 +349,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Added - First official release -[Unreleased]: https://github.com/koekeishiya/yabai/compare/v3.3.8...HEAD +[Unreleased]: https://github.com/koekeishiya/yabai/compare/v3.3.9...HEAD +[3.3.9]: https://github.com/koekeishiya/yabai/compare/v3.3.8...v3.3.9 [3.3.8]: https://github.com/koekeishiya/yabai/compare/v3.3.7...v3.3.8 [3.3.7]: https://github.com/koekeishiya/yabai/compare/v3.3.6...v3.3.7 [3.3.6]: https://github.com/koekeishiya/yabai/compare/v3.3.5...v3.3.6 diff --git a/doc/yabai.1 b/doc/yabai.1 index 6d6d385a..c8dbb48e 100644 --- a/doc/yabai.1 +++ b/doc/yabai.1 @@ -2,12 +2,12 @@ .\" Title: yabai .\" Author: [see the "AUTHOR(S)" section] .\" Generator: Asciidoctor 2.0.12 -.\" Date: 2021-04-28 +.\" Date: 2021-05-25 .\" Manual: Yabai Manual .\" Source: Yabai .\" Language: English .\" -.TH "YABAI" "1" "2021-04-28" "Yabai" "Yabai Manual" +.TH "YABAI" "1" "2021-05-25" "Yabai" "Yabai Manual" .ie \n(.g .ds Aq \(aq .el .ds Aq ' .ss \n[.ss] 0 diff --git a/src/osax/common.h b/src/osax/common.h index b18bbc57..84021327 100644 --- a/src/osax/common.h +++ b/src/osax/common.h @@ -1,7 +1,7 @@ #ifndef SA_COMMON_H #define SA_COMMON_H -#define OSAX_VERSION "1.0.29" +#define OSAX_VERSION "1.0.30" #define OSAX_PAYLOAD_SUCCESS 0 #define OSAX_PAYLOAD_NOT_FOUND 1 diff --git a/src/osax/sa.m b/src/osax/sa.m index bddea5ef..76011f33 100644 --- a/src/osax/sa.m +++ b/src/osax/sa.m @@ -231,7 +231,7 @@ static int scripting_addition_perform_validation(bool loaded) return PAYLOAD_STATUS_OUTDATED; } else if ((attrib & OSAX_ATTRIB_ALL) != OSAX_ATTRIB_ALL) { - notify("scripting-addition", "payload doesn't support this macOS version!"); + notify("scripting-addition", "payload (0x%X) doesn't support this macOS version!", attrib); return PAYLOAD_STATUS_NO_ATTRIB; } else { notify("scripting-addition", "payload v%s", version); diff --git a/src/osax/x86_64/payload.m b/src/osax/x86_64/payload.m index 6182df52..700e6eaa 100644 --- a/src/osax/x86_64/payload.m +++ b/src/osax/x86_64/payload.m @@ -152,8 +152,8 @@ uint64_t get_set_front_window_offset(NSOperatingSystemVersion os_version) { const char *get_remove_space_pattern(NSOperatingSystemVersion os_version) { if ((os_version.majorVersion == 11) || (os_version.majorVersion == 10 && os_version.minorVersion == 16)) { - if (os_version.majorVersion == 11 && os_version.minorVersion == 3) { - return "55 48 89 E5 41 57 41 56 41 55 41 54 53 48 81 EC C8 00 00 00 49 89 CC 49 89 D7 49 89 F5 49 89 FE E8 35 67 F4 FF 48 89 C3 48 B8 01 00 00 00 00 00 00 40 48 BF F8 FF FF FF FF FF FF 00 48 21 DF 48 85 C3 0F 85 0C 06 00 00 48 8B 47 10 48 83 F8 02 0F 8C 36 02 00 00 4C 89 65 A8 4C 89 AD 68 FF FF FF 48 89 5D A0 48 8D 05 EF BF 13 00 48 8B 00 4D"; + if (os_version.majorVersion == 11 && os_version.minorVersion >= 3) { + return "55 48 89 E5 41 57 41 56 41 55 41 54 53 48 81 EC C8 00 00 00 49 89 CC 49 89 D7 49 89 F5 49 89 FE E8 ?? ?? F4 FF 48 89 C3 48 B8 01 00 00 00 00 00 00 40 48 BF F8 FF FF FF FF FF FF 00 48 21 DF 48 85 C3 0F 85 0C 06 00 00 48 8B 47 10 48 83 F8 02 0F 8C 36 02 00 00 4C 89 65 A8 4C 89 AD 68 FF FF FF 48 89 5D A0 48 8D 05 ?? ?? 13 00 48 8B 00 4D"; } return "55 48 89 E5 41 57 41 56 41 55 41 54 53 48 83 EC 68 48 89 4D 98 49 89 D4 49 89 F6 49 89 FF 49 89 F5 E8 ?? ?? F3 FF 49 89 C5 48 B8 01 00 00 00 00 00 00 40 49 85 C5 0F 85 DE 03 00 00 48 B8 F8 FF FF FF FF FF FF 00 4C 21 E8 48 8B 58 10 48 83 FB 02 0F 8C CD 01 00 00 4C 89 75 A0 48 8D 05 ?? ?? ?? 00 48 8B 00 4D 8B 34 07 4C 89 E3 4D 8B 64 07"; } else if (os_version.minorVersion == 15) { @@ -176,7 +176,7 @@ uint64_t get_set_front_window_offset(NSOperatingSystemVersion os_version) { const char *get_move_space_pattern(NSOperatingSystemVersion os_version) { if ((os_version.majorVersion == 11) || (os_version.majorVersion == 10 && os_version.minorVersion == 16)) { - if (os_version.majorVersion == 11 && os_version.minorVersion == 3) { + if (os_version.majorVersion == 11 && os_version.minorVersion >= 3) { return "55 48 89 E5 41 57 41 56 41 55 41 54 53 48 83 EC 48 4C 89 E9 41 89 D5 49 89 F6 49 89 FF 48 8D 1D ?? ?? ?? 00 48 8B 03 4C 8B 24 07 4C 89 E7 48 89 4D A0 48 89 CE E8 ?? ?? 00 00 48 85 C0 74 ?? 48 8D 0D ?? ?? ?? 00 80 39 01 48 89 55 C8 48 89 45 A8 75 38 49 89 D5 49 83 C5 28 48 89 C3 48 89 C7"; } return "55 48 89 E5 41 57 41 56 41 55 41 54 53 48 83 EC 48 4C 89 E9 41 89 D5 49 89 F6 49 89 FF 48 8D 1D ?? ?? ?? 00 48 8B 03 4C 8B 24 07 4C 89 E7 48 89 4D A0 48 89 CE E8 ?? ?? 00 00 48 85 C0 74 27 48 8D 0D ?? ?? ?? 00 80 39 01 48 89 55 C8 48 89 45 A8 75 1A 48 89 C7 4C 89 F6 49 89 D5 E8 ?? ?? F4"; diff --git a/src/yabai.c b/src/yabai.c index 2973bc85..cbb94ca2 100644 --- a/src/yabai.c +++ b/src/yabai.c @@ -20,7 +20,7 @@ #define MAJOR 3 #define MINOR 3 -#define PATCH 8 +#define PATCH 9 #define CONNECTION_CALLBACK(name) void name(uint32_t type, void *data, size_t data_length, void *context, int cid) typedef CONNECTION_CALLBACK(connection_callback);