Ticket #65354: patch-safeAreaInsets-fix.diff

sources/NSScreen+iTerm.m

@@ -93 +93 @@
 }
 
 - (CGFloat)notchHeight {
-    if (@available(macOS 12.0, *)) {
-        return self.safeAreaInsets.top;
-    }
+//  safeAreaInsets has proven to be absent and fail to compile on macOS 10.15.7 (Darwin 19.6.0), and indications of
+//  issues on later systems have been seen and reported in https://trac.macports.org/ticket/63824
+//  Commenting this out avoids the problem on these pre-notched Macs. See also below in it_menuBarHeight.
+    // if (@available(macOS 12.0, *)) {
+    //    return self.safeAreaInsets.top;
+    // }
     return 0;
 }
 
@@ -107 +110 @@
 }
 
 - (CGFloat)it_menuBarHeight {
-    if (@available(macOS 12, *)) {
+   // if (@available(macOS 12, *)) {
         // When the "current" screen has a notch, there doesn't seem to be a way to get the height
         // of the menu bar on other screens :(
-        return MAX(24, self.safeAreaInsets.top);
-    }
+        // return MAX(24, self.safeAreaInsets.top);
+   // }
     return NSApp.mainMenu.menuBarHeight;
 }
 

sources/iTermRootTerminalView.m

@@ -1252 +1252 @@
     if (fakeHeight > 0) {
         return fakeHeight;
     }
-    if (@available(macOS 12, *)) {
-        // self.safeAreaInsets is all 0s on a notch Mac. Why the hell doesn't anything work right?
-        const NSEdgeInsets safeAreaInsets = self.window.screen.safeAreaInsets;
-        return safeAreaInsets.top;
-    }
+
+//  safeAreaInsets has proven to be absent and fail to compile on macOS 10.15.7 (Darwin 19.6.0), and indications of 
+//  issues on later systems have been seen and reported in https://trac.macports.org/ticket/63824
+//  Commenting this out avoids the problem on these pre-notched Macs.
+//    if (@available(macOS 12, *)) {
+//        // self.safeAreaInsets is all 0s on a notch Mac. Why the hell doesn't anything work right?
+//        const NSEdgeInsets safeAreaInsets = self.window.screen.safeAreaInsets;
+//        return safeAreaInsets.top;
+//    }
     return 0;
 }