skija 0.143.3, macos: Screen::getICCProfile

Author: tonsky

examples/dashboard/java/Example.java

@@ -37,7 +37,7 @@ public class Example implements Consumer<Event> {
 
     public Window window;
 
-    public boolean paused = true;
+    public boolean paused = false;
 
     public Options progressBars = new Options("Default", "0%", "50%", "100%", "Indeterminate");
 

examples/dashboard/java/PanelTheme.java

@@ -1,6 +1,7 @@
 package io.github.humbleui.jwm.examples;
 
 import io.github.humbleui.jwm.*;
+import io.github.humbleui.types.*;
 import io.github.humbleui.skija.*;
 
 public class PanelTheme extends Panel {
@@ -19,20 +20,46 @@ public void accept(Event e) {
     }
 
     @Override
-    public void paintImpl(Canvas canvas, int width, int height, float scale) {    
+    public void paintImpl(Canvas canvas, int width, int height, float scale) {
         try (var paint = new Paint()) {
+            // sRGB row
             paint.setColor(0xFFFFFFFF);
-            canvas.drawString("isHighContrast", Example.PADDING, Example.PADDING * 2, Example.FONT12, paint);
-            canvas.drawString("" + Theme.isHighContrast(), width / 2 + Example.PADDING / 2, Example.PADDING * 2, Example.FONT12, paint);
+            canvas.drawString("sRGB", Example.PADDING, Example.PADDING * 2, Example.FONT12, paint);
+            float x = width / 2 + Example.PADDING / 2;
+            Color4f[] colors = {
+                new Color4f(1, 0, 0, 1),  // red
+                new Color4f(0, 1, 0, 1),  // green
+                new Color4f(0, 0, 1, 1),  // blue
+                new Color4f(1, 1, 0, 1),  // yellow
+                new Color4f(1, 0, 1, 1),  // magenta
+                new Color4f(0, 1, 1, 1)   // cyan
+            };
+            for (int i = 0; i < colors.length; i++) {
+                paint.setColor4f(colors[i], ColorSpace.getSRGB());
+                canvas.drawRect(Rect.makeXYWH(x + i * Example.PADDING * 2, Example.PADDING * 0.5f, Example.PADDING * 2, Example.PADDING * 2), paint);
+            }
 
-            canvas.drawString("isDark", Example.PADDING, Example.PADDING * 4, Example.FONT12, paint);
-            canvas.drawString("" + Theme.isDark(), width / 2 + Example.PADDING / 2, Example.PADDING * 4, Example.FONT12, paint);
+            // Display P3 row
+            paint.setColor(0xFFFFFFFF);
+            canvas.drawString("Display P3", Example.PADDING, Example.PADDING * 4, Example.FONT12, paint);
+            x = width / 2 + Example.PADDING / 2;
+            for (int i = 0; i < colors.length; i++) {
+                paint.setColor4f(colors[i], ColorSpace.getDisplayP3());
+                canvas.drawRect(Rect.makeXYWH(x + i * Example.PADDING * 2, Example.PADDING * 2.5f, Example.PADDING * 2, Example.PADDING * 2), paint);
+            }
+
+            paint.setColor(0xFFFFFFFF);
+            canvas.drawString("isHighContrast", Example.PADDING, Example.PADDING * 6, Example.FONT12, paint);
+            canvas.drawString("" + Theme.isHighContrast(), width / 2 + Example.PADDING / 2, Example.PADDING * 6, Example.FONT12, paint);
+
+            canvas.drawString("isDark", Example.PADDING, Example.PADDING * 8, Example.FONT12, paint);
+            canvas.drawString("" + Theme.isDark(), width / 2 + Example.PADDING / 2, Example.PADDING * 8, Example.FONT12, paint);
 
-            canvas.drawString("isInverted", Example.PADDING, Example.PADDING * 6, Example.FONT12, paint);
-            canvas.drawString("" + Theme.isInverted(), width / 2 + Example.PADDING / 2, Example.PADDING * 6, Example.FONT12, paint);
+            canvas.drawString("isInverted", Example.PADDING, Example.PADDING * 10, Example.FONT12, paint);
+            canvas.drawString("" + Theme.isInverted(), width / 2 + Example.PADDING / 2, Example.PADDING * 10, Example.FONT12, paint);
 
-            canvas.drawString("zOrder", Example.PADDING, Example.PADDING * 8, Example.FONT12, paint);
-            canvas.drawString("" + window.getZOrder(), width / 2 + Example.PADDING / 2, Example.PADDING * 8, Example.FONT12, paint);            
+            canvas.drawString("zOrder", Example.PADDING, Example.PADDING * 12, Example.FONT12, paint);
+            canvas.drawString("" + window.getZOrder(), width / 2 + Example.PADDING / 2, Example.PADDING * 12, Example.FONT12, paint);
         }
     }
 }

macos/cc/Screen.mm

@@ -0,0 +1,44 @@
+#import <Cocoa/Cocoa.h>
+#import <CoreGraphics/CoreGraphics.h>
+#include <jni.h>
+
+extern "C" JNIEXPORT jbyteArray JNICALL Java_io_github_humbleui_jwm_Screen__1nGetICCProfile
+  (JNIEnv* env, jclass jclass, jlong screenId) {
+    NSArray* screens = [NSScreen screens];
+    NSScreen* targetScreen = nil;
+
+    for (NSScreen* screen in screens) {
+        NSNumber* id = [[screen deviceDescription] valueForKey:@"NSScreenNumber"];
+        if ([id longValue] == screenId) {
+            targetScreen = screen;
+            break;
+        }
+    }
+
+    if (!targetScreen) {
+        return nullptr;
+    }
+
+    CGColorSpaceRef cgColorSpace = targetScreen.colorSpace.CGColorSpace;
+    if (!cgColorSpace) {
+        return nullptr;
+    }
+
+    CFDataRef cfIccProfile = CGColorSpaceCopyICCData(cgColorSpace);
+    if (!cfIccProfile) {
+        return nullptr;
+    }
+
+    const UInt8* data = CFDataGetBytePtr(cfIccProfile);
+    CFIndex length = CFDataGetLength(cfIccProfile);
+
+    jbyteArray result = env->NewByteArray(static_cast<jsize>(length));
+    if (result) {
+        env->SetByteArrayRegion(result, 0, static_cast<jsize>(length),
+                                reinterpret_cast<const jbyte*>(data));
+    }
+
+    CFRelease(cfIccProfile);
+
+    return result;
+}

macos/java/skija/LayerMetalSkija.java

@@ -8,8 +8,8 @@
 public class LayerMetalSkija extends LayerMetal {
     @Getter @Setter @ApiStatus.Internal public SurfaceOrigin _origin = SurfaceOrigin.TOP_LEFT;
     @Getter @Setter @ApiStatus.Internal public SurfaceColorFormat _colorFormat = SurfaceColorFormat.BGRA_8888;
-    @Getter @Setter @ApiStatus.Internal public ColorSpace _colorSpace = ColorSpace.getSRGB(); // TODO load monitor profile
-    @Getter @Setter @ApiStatus.Internal public SurfaceProps _surfaceProps = new SurfaceProps(PixelGeometry.RGB_H);
+    @Getter @Setter @ApiStatus.Internal public ColorSpace _colorSpace = null;
+    @Getter @Setter @ApiStatus.Internal public SurfaceProps _surfaceProps = new SurfaceProps(PixelGeometry.UNKNOWN);
 
     @Getter @ApiStatus.Internal public DirectContext _directContext;
 
@@ -21,8 +21,12 @@ public void attach(Window window) {
 
     @Override
     public void frame() {
+        if (_colorSpace == null) {
+            _colorSpace = LayerSkija.windowColorSpace(_window);
+        }
+
         try (BackendRenderTarget _renderTarget = BackendRenderTarget.makeMetal(_width, _height, nextDrawableTexturePtr());
-             Surface _surface = Surface.makeFromBackendRenderTarget(_directContext, _renderTarget, _origin, _colorFormat, _colorSpace, _surfaceProps);)
+             Surface _surface = Surface.wrapBackendRenderTarget(_directContext, _renderTarget, _origin, _colorFormat, _colorSpace, _surfaceProps);)
         {
             _window.accept(new EventFrameSkija(_surface));
 
@@ -31,6 +35,15 @@ public void frame() {
         }
     }
 
+    @Override
+    public void reconfigure() {
+        if (_colorSpace != null) {
+            _colorSpace.close();
+        };
+        _colorSpace = null;
+        super.reconfigure();
+    }
+
     @Override
     public void close() {
         assert !isClosed();

script/build.py

@@ -36,9 +36,9 @@ def main():
   parser.add_argument('--only', choices = ['native', 'java'])
   (args, _) = parser.parse_known_args()
   res = 0
-  if None == args.only or 'native' == args.only:
+  if args.only is None or 'native' == args.only:
     res += build_native()
-  if None == args.only or 'java' == args.only:
+  if args.only is None or 'java' == args.only:
     res += build_java()
   return res
 

script/build_utils.py

@@ -1,5 +1,5 @@
 #! /usr/bin/env python3
-import argparse, base64, functools, glob, hashlib, itertools, json, os, pathlib, platform, random, re, shutil, subprocess, tempfile, time, urllib.request, zipfile
+import argparse, base64, collections, functools, glob, hashlib, itertools, json, os, pathlib, platform, random, re, shutil, subprocess, sys, tempfile, time, urllib.request, zipfile
 from typing import List, Tuple
 
 def get_arg(name):
@@ -14,6 +14,7 @@ def get_arg(name):
 system = get_arg("system") or {'Darwin': 'macos', 'Linux': 'linux', 'Windows': 'windows'}[platform.system()]
 classpath_separator = ';' if platform.system() == 'Windows' else ':'
 mvn = "mvn.cmd" if platform.system() == "Windows" else "mvn"
+lombok_version = '1.18.42'
 
 def classpath_join(entries):
   return classpath_separator.join(entries)
@@ -28,6 +29,35 @@ def parse_sha() -> str:
   if sha:
     return sha[:10]
 
+def release_notes(version: str):
+  with open('CHANGELOG.md', 'r') as f:
+    lines = f.readlines()
+
+  # Find the header that starts with "# {version}"
+  start_idx = None
+  for i, line in enumerate(lines):
+    if line.startswith(f'# {version}'):
+      start_idx = i
+      break
+
+  if start_idx is None:
+    raise Exception(f"Version {version} not found in CHANGELOG.md")
+
+  # Extract lines after the header until the next header (line starting with #) or end of file
+  content_lines = []
+  for i in range(start_idx + 1, len(lines)):
+    line = lines[i]
+    if line.startswith('#'):
+      break
+    content_lines.append(line)
+
+  # Write to RELEASE_NOTES.md
+  content = ''.join(content_lines).strip() + '\n'
+  with open('RELEASE_NOTES.md', 'w') as f:
+    f.write(content)
+
+  print(f"Wrote release notes for {version} to RELEASE_NOTES.md", flush=True)
+
 def makedirs(path):
   os.makedirs(path, exist_ok=True)
 
@@ -88,7 +118,7 @@ def ninja(dir):
   total_errors = 0
 
   process = subprocess.Popen(
-    ['ninja'],
+    ['ninja', '-k', '0'],
     cwd=dir,
     stdout=subprocess.PIPE,
     stderr=subprocess.STDOUT,
@@ -132,19 +162,62 @@ def fetch_maven(group, name, version, classifier=None, repo='https://repo1.maven
 def fetch_all_maven(deps, repo='https://repo1.maven.org/maven2'):
   return [fetch_maven(dep['group'], dep['name'], dep['version'], repo=dep.get('repo', repo)) for dep in deps]
 
+@functools.lru_cache(maxsize=1)
+def jdk_version() -> Tuple[int, int, int]:
+  output = subprocess.run(['java', '-version'], capture_output=True, text=True).stderr
+  match = re.search(r'"([^"]+)"', output)
+  if not match:
+    raise Exception(f"Could not parse java version from: {output}")
+  version_str = match.group(1)
+  if version_str.startswith('1.'):
+    # Old format: 1.8.0_181 -> (8, 0, 181)
+    parts = version_str.split('.')
+    major = int(parts[1])
+    if len(parts) > 2:
+      minor_patch = parts[2].split('_')
+      minor = int(minor_patch[0])
+      patch = int(minor_patch[1]) if len(minor_patch) > 1 else 0
+    else:
+      minor = 0
+      patch = 0
+  else:
+    # New format: 11.0.2 -> (11, 0, 2), 17.0.1+12 -> (17, 0, 1)
+    parts = version_str.split('.')
+    major = int(parts[0])
+    minor = int(parts[1]) if len(parts) > 1 else 0
+    if len(parts) > 2:
+      patch_str = re.split(r'[+\-]', parts[2])[0]
+      patch = int(patch_str) if patch_str else 0
+    else:
+      patch = 0
+  return (major, minor, patch)
+
+def javac_sources(sources):
+  groups = collections.defaultdict(list)
+  for path in sources:
+    groups[os.path.dirname(path)].append(os.path.basename(path))
+  sorted_keys = sorted(groups.keys(), key=str.lower)
+  lines = []
+  for key in sorted_keys:
+    sorted_values = sorted(groups[key], key=str.lower)
+    lines.append('  ' + key + '/ ' + ' '.join(sorted_values))
+
+  return '\n'.join(lines)
+
 def javac(sources, target, classpath = [], modulepath = [], add_modules = [], release = '11', opts=[]):
   makedirs(target)
   classes = {path.stem: path.stat().st_mtime for path in pathlib.Path(target).rglob('*.class') if '$' not in path.stem}
   newer = lambda path: path.stem not in classes or path.stat().st_mtime > classes.get(path.stem)
-  new_sources = [path for path in sources if newer(pathlib.Path(path))]
+  new_sources = sorted([path for path in sources if newer(pathlib.Path(path))], key=str.lower)
   if new_sources:
-    print('Compiling', len(new_sources), 'java files to', target + ':\n ', '\n  '.join(new_sources), flush=True)
+    print('Compiling', len(new_sources), 'java files to', target + ':\n' + javac_sources(new_sources), flush=True)
     subprocess.check_call([
       'javac',
       '-encoding', 'UTF8',
       '-Xlint:-options',
-      *opts,
       '-Xlint:deprecation',
+      *(['-proc:full', '-J--sun-misc-unsafe-memory-access=allow'] if jdk_version()[0] >= 23 else []),
+      *opts,
       '--release', release,
       *(['--class-path', classpath_join(classpath + [target])] if classpath else []),
       *(['--module-path', classpath_join(modulepath)] if modulepath else []),
@@ -164,14 +237,16 @@ def jar(target: str, *content: List[Tuple[str, str]], opts=[]) -> str:
 
 @functools.lru_cache(maxsize=1)
 def lombok():
-  return fetch_maven('org.projectlombok', 'lombok', '1.18.30')
+  return fetch_maven('org.projectlombok', 'lombok', lombok_version)
 
 def delombok(dirs: List[str], target: str, classpath: List[str] = [], modulepath: List[str] = []):
   sources = files(*[dir + "/**/*.java" for dir in dirs])
   if has_newer(sources, files(target + "/**")):
     print("Delomboking", *dirs, "to", target, flush=True)
-    subprocess.check_call(["java",
+    subprocess.check_call([
+      "java",
       "-Dfile.encoding=UTF8",
+      *(['--sun-misc-unsafe-memory-access=allow'] if jdk_version()[0] >= 23 else []),
       "-jar", lombok(),
       "delombok",
       *dirs,

script/common.py

@@ -2,17 +2,18 @@
 import argparse, build_utils, functools, os
 
 basedir = os.path.abspath(os.path.dirname(__file__) + '/..')
+default_skija_version = '0.143.3'
 
 @functools.lru_cache(maxsize=1)
 def deps_compile():
   parser = argparse.ArgumentParser()
   parser.add_argument('--skija-dir', default=None)
   parser.add_argument('--skija-shared-jar', default=None)
-  parser.add_argument('--skija-version', default='0.123.0')
+  parser.add_argument('--skija-version', default=default_skija_version)
   (args, _) = parser.parse_known_args()
 
   deps = [
-    build_utils.fetch_maven('org.projectlombok', 'lombok', '1.18.30'),
+    build_utils.fetch_maven('org.projectlombok', 'lombok', build_utils.lombok_version),
     build_utils.fetch_maven('org.jetbrains', 'annotations', '20.1.0')
   ]
 
@@ -38,4 +39,4 @@ def deps_compile():
 
   return deps
 
-version = build_utils.get_arg("version") or build_utils.parse_ref() or build_utils.parse_sha() or "0.0.0-SNAPSHOT"
+version = build_utils.get_arg("version") or build_utils.parse_ref() or build_utils.parse_sha() or "0.0.0-SNAPSHOT"

script/run.py

@@ -5,7 +5,7 @@ def main():
   parser = argparse.ArgumentParser()
   parser.add_argument('--example', default='dashboard')
   parser.add_argument('--jwm-version', default=None)
-  parser.add_argument('--skija-version', default='0.123.0')
+  parser.add_argument('--skija-version', default=common.default_skija_version)
   parser.add_argument('--skija-dir', default=None)
   parser.add_argument('--skija-shared-jar', default=None)
   parser.add_argument('--skija-platform-jar', default=None)
@@ -38,8 +38,8 @@ def main():
 
   if args.skija_dir:
     classpath += [
-      skija_dir + '/platform/build',
-      skija_dir + '/platform/target/classes',
+      f'{skija_dir}/platform/target/{build_utils.system + '-' + build_utils.arch}/native',
+      f'{skija_dir}/platform/target/{build_utils.system + '-' + build_utils.arch}/classes',
     ]
   elif args.skija_platform_jar:
     classpath += [
@@ -61,6 +61,7 @@ def main():
     '-enableassertions',
     '-enablesystemassertions',
     '-Dfile.encoding=UTF-8',
+    *(['--enable-native-access=ALL-UNNAMED'] if build_utils.jdk_version()[0] >= 24 else []),
     '-Xcheck:jni',
     'io.github.humbleui.jwm.examples.Example'
   ])