From 969a6b9fd7f7afc60250309f3ada205c1473cf8e Mon Sep 17 00:00:00 2001
From: Ajit Ghaisas <aghaisas@openjdk.org>
Date: Mon, 10 Apr 2023 04:52:35 +0000
Subject: [PATCH] 8304825: MacOS metal pipeline - window isn't painted if
 created during display sleep

Reviewed-by: kcr, avu, prr
---
 .../libawt_lwawt/java2d/metal/MTLLayer.m      | 41 +++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLLayer.m b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLLayer.m
index 3bb6a144e389d..d7d75f16966c7 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLLayer.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLLayer.m
@@ -45,6 +45,12 @@ @implementation MTLLayer
 @synthesize displayLink;
 @synthesize displayLinkCount;
 
+- (void) createDisplayLink {
+    CVDisplayLinkCreateWithActiveCGDisplays(&displayLink);
+    CVDisplayLinkSetOutputCallback(displayLink, &displayLinkCallback, (__bridge void*)self);
+    self.displayLinkCount = 0;
+}
+
 - (id) initWithJavaLayer:(jobject)layer
 {
     AWT_ASSERT_APPKIT_THREAD;
@@ -74,12 +80,38 @@ - (id) initWithJavaLayer:(jobject)layer
     self.framebufferOnly = NO;
     self.nextDrawableCount = 0;
     self.opaque = YES;
-    CVDisplayLinkCreateWithActiveCGDisplays(&displayLink);
-    CVDisplayLinkSetOutputCallback(displayLink, &displayLinkCallback, (__bridge void*)self);
-    self.displayLinkCount = 0;
+    [self createDisplayLink];
+
+    [[[NSWorkspace sharedWorkspace] notificationCenter]
+        addObserver : self
+           selector : @selector(onScreenSleep)
+               name : NSWorkspaceScreensDidSleepNotification object: NULL];
+
+    [[[NSWorkspace sharedWorkspace] notificationCenter]
+        addObserver : self
+           selector : @selector(onScreenWakeup)
+               name : NSWorkspaceScreensDidWakeNotification object: NULL];
+
     return self;
 }
 
+- (void) onScreenSleep {
+    J2dTraceLn(J2D_TRACE_VERBOSE, "MTLLayer.onScreenSleep ---  received screen sleep notification.");
+
+    [self stopDisplayLink];
+}
+
+- (void) onScreenWakeup {
+    J2dTraceLn(J2D_TRACE_VERBOSE, "MTLLayer.onScreenWakeup ---  received screen wakeup notification.");
+    [self stopDisplayLink];
+    CVDisplayLinkRelease(self.displayLink);
+    self.displayLink = nil;
+
+    [self createDisplayLink];
+
+    [self startDisplayLink];
+}
+
 - (void) blitTexture {
     if (self.ctx == NULL || self.javaLayer == NULL || self.buffer == nil || self.ctx.device == nil) {
         J2dTraceLn4(J2D_TRACE_VERBOSE,
@@ -148,6 +180,9 @@ - (void) blitTexture {
 }
 
 - (void) dealloc {
+
+    [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
+
     JNIEnv *env = [ThreadUtilities getJNIEnvUncached];
     (*env)->DeleteWeakGlobalRef(env, self.javaLayer);
     self.javaLayer = nil;