diff --git a/.github/workflows/fork-desktop-modules.yml b/.github/workflows/fork-desktop-modules.yml
index 5dc2b071f..a63af54ad 100644
--- a/.github/workflows/fork-desktop-modules.yml
+++ b/.github/workflows/fork-desktop-modules.yml
@@ -70,11 +70,18 @@ jobs:
./scripts/publish-skiko-awt.sh "$RUNNER_TEMP/skiko-awt"
find ~/.m2/repository/org/thisisthepy/compose -name '*.jar' | sort
+ - name: Mark the artifact root
+ # upload-artifact roots the artifact at the common parent of its paths. skiko-awt now
+ # sits inside org/thisisthepy/compose, so this marker keeps the root at org, and the
+ # download into ~/.m2/repository/org restores the org/thisisthepy/compose prefix.
+ run: touch ~/.m2/repository/org/.compose-fork-desktop
+
- name: Keep the published modules
uses: actions/upload-artifact@v4
with:
name: compose-fork-desktop
+ include-hidden-files: true
path: |
~/.m2/repository/org/thisisthepy/compose
- ~/.m2/repository/org/jetbrains/skiko/skiko-awt
+ ~/.m2/repository/org/.compose-fork-desktop
retention-days: 7
diff --git a/.github/workflows/test-compose-from-fork.yml b/.github/workflows/test-compose-from-fork.yml
index c8e15eda3..a237a3fcb 100644
--- a/.github/workflows/test-compose-from-fork.yml
+++ b/.github/workflows/test-compose-from-fork.yml
@@ -15,7 +15,7 @@
# differs between the two;
# 3. the two repositories are compared file by file, and every archive entry by entry with
# zip timestamps left out (.github/scripts/compare-maven-repos.py). The fork publishes
-# under its own coordinates (org.thisisthepy.compose at 1.11.1-ext.1) where the old build
+# under its own coordinates (org.thisisthepy.compose at 1.11.1-ext.2) where the old build
# used JetBrains' (org.jetbrains.compose at 1.11.1), so the fork's side is read under the
# old names: its paths, its metadata and the module names inside its klibs. It also
# publishes every sibling its modules name, which the old build took from JetBrains, so
@@ -315,6 +315,11 @@ jobs:
# The comparison runs before the renderer and does not stop it, so that one failing
# does not hide the other's result. This is where a difference fails the job.
if: always() && steps.compare.outcome == 'failure'
+ # The comparison proved the fork equals the old patched build while the pin was the
+ # commit that held the same tree. The pin has moved on to the fork's ext.2 line, whose
+ # Compose differs on purpose (new metadata, new sources), so a difference is reported
+ # in the comparison step and no longer fails the job. The renderer built against the
+ # fork's publication below is the proof that matters now. The guard is to come back as a
+ # comparison with the ext.2 baseline: DarkPyonix/compose-rust#361.
run: |
- echo "the fork and the patched build published different contents; see the comparison step" >&2
- exit 1
+ echo "the fork and the patched build published different contents, as the moved pin is expected to; see the comparison step" >&2
diff --git a/.github/workflows/test-graalvm-renderer.yml b/.github/workflows/test-graalvm-renderer.yml
index f02acf857..f1540c8f3 100644
--- a/.github/workflows/test-graalvm-renderer.yml
+++ b/.github/workflows/test-graalvm-renderer.yml
@@ -283,13 +283,20 @@ jobs:
./scripts/publish-skiko-awt.sh "$RUNNER_TEMP/skiko-awt"
find ~/.m2/repository/org/thisisthepy/compose -name '*.jar' | sort
+ - name: Mark the artifact root
+ # upload-artifact roots the artifact at the common parent of its paths. skiko-awt now
+ # sits inside org/thisisthepy/compose, so this marker keeps the root at org, and the
+ # download into ~/.m2/repository/org restores the org/thisisthepy/compose prefix.
+ run: touch ~/.m2/repository/org/.compose-fork-desktop
+
- name: Keep the published modules
uses: actions/upload-artifact@v4
with:
name: compose-fork-desktop
+ include-hidden-files: true
path: |
~/.m2/repository/org/thisisthepy/compose
- ~/.m2/repository/org/jetbrains/skiko/skiko-awt
+ ~/.m2/repository/org/.compose-fork-desktop
retention-days: 7
linux-x64:
diff --git a/.github/workflows/test-windows-resize-metrics.yml b/.github/workflows/test-windows-resize-metrics.yml
index cddf4a582..a6e618aa1 100644
--- a/.github/workflows/test-windows-resize-metrics.yml
+++ b/.github/workflows/test-windows-resize-metrics.yml
@@ -61,7 +61,7 @@ jobs:
~/.m2/repository
.scratch/skiko-build/out/windows-x64/skiko-bridges.lib
.scratch/skiko-build/out/windows-x64/skia
- .scratch/skiko-build/out/windows-x64/embedded_icu.cpp
+ .scratch/skiko-build/out/windows-x64/embedded_icu.obj
key: compose-mingwx64-${{ hashFiles('renderer/scripts/build-compose.sh', 'renderer/scripts/compose-fork-mingw.changes') }}
- name: Make room for the Compose build
@@ -120,7 +120,7 @@ jobs:
~/.m2/repository
.scratch/skiko-build/out/windows-x64/skiko-bridges.lib
.scratch/skiko-build/out/windows-x64/skia
- .scratch/skiko-build/out/windows-x64/embedded_icu.cpp
+ .scratch/skiko-build/out/windows-x64/embedded_icu.obj
key: ${{ steps.kit-cache.outputs.cache-primary-key }}
- name: Report what was published
@@ -141,7 +141,7 @@ jobs:
~/.m2/repository
.scratch/skiko-build/out/windows-x64/skiko-bridges.lib
.scratch/skiko-build/out/windows-x64/skia
- .scratch/skiko-build/out/windows-x64/embedded_icu.cpp
+ .scratch/skiko-build/out/windows-x64/embedded_icu.obj
if-no-files-found: error
retention-days: 3
@@ -199,7 +199,7 @@ jobs:
rm -rf ~/.m2/repository .scratch/skiko-build/out/windows-x64
mv "$m2" ~/.m2/repository
mv "$skiko" .scratch/skiko-build/out/windows-x64
- ls ~/.m2/repository/org/jetbrains/compose/ui | head
+ ls ~/.m2/repository/org/thisisthepy/compose/ui | head
ls -la .scratch/skiko-build/out/windows-x64
- name: Restore the Kotlin toolchain
diff --git a/.github/workflows/windows-static.yml b/.github/workflows/windows-static.yml
index ce92646ad..2327a4697 100644
--- a/.github/workflows/windows-static.yml
+++ b/.github/workflows/windows-static.yml
@@ -51,7 +51,7 @@ jobs:
~/.m2/repository
.scratch/skiko-build/out/windows-x64/skiko-bridges.lib
.scratch/skiko-build/out/windows-x64/skia
- .scratch/skiko-build/out/windows-x64/embedded_icu.cpp
+ .scratch/skiko-build/out/windows-x64/embedded_icu.obj
key: compose-mingwx64-${{ hashFiles('renderer/scripts/build-compose.sh', 'renderer/scripts/compose-fork-mingw.changes') }}
- name: Make room for the Compose build
@@ -110,7 +110,7 @@ jobs:
~/.m2/repository
.scratch/skiko-build/out/windows-x64/skiko-bridges.lib
.scratch/skiko-build/out/windows-x64/skia
- .scratch/skiko-build/out/windows-x64/embedded_icu.cpp
+ .scratch/skiko-build/out/windows-x64/embedded_icu.obj
key: ${{ steps.kit-cache.outputs.cache-primary-key }}
- name: Report what was published
@@ -131,7 +131,7 @@ jobs:
~/.m2/repository
.scratch/skiko-build/out/windows-x64/skiko-bridges.lib
.scratch/skiko-build/out/windows-x64/skia
- .scratch/skiko-build/out/windows-x64/embedded_icu.cpp
+ .scratch/skiko-build/out/windows-x64/embedded_icu.obj
if-no-files-found: error
retention-days: 3
@@ -189,7 +189,7 @@ jobs:
rm -rf ~/.m2/repository .scratch/skiko-build/out/windows-x64
mv "$m2" ~/.m2/repository
mv "$skiko" .scratch/skiko-build/out/windows-x64
- ls ~/.m2/repository/org/jetbrains/compose/ui | head
+ ls ~/.m2/repository/org/thisisthepy/compose/ui | head
ls -la .scratch/skiko-build/out/windows-x64
- name: Restore the Kotlin toolchain
diff --git a/docs/guide/en/troubleshooting.html b/docs/guide/en/troubleshooting.html
index 9b0e4c485..696a4bf11 100644
--- a/docs/guide/en/troubleshooting.html
+++ b/docs/guide/en/troubleshooting.html
@@ -119,7 +119,7 @@
The build stops: the fork's artifacts are missing
The renderer depends on modules only the Compose fork publishes, and only into
~/.m2: the patched Compose under its own group and version
- (org.thisisthepy.compose.*, 1.11.1-ext.1), skiko-awt under
+ (org.thisisthepy.compose.*, 1.11.1-ext.2), skiko-awt under
0.144.6.1, the Linux targets, and the window modules. Every
renderer script checks for them before the Kotlin toolchain runs and stops like this:
@@ -128,7 +128,7 @@
The build stops: the fork's artifacts are missing
error: the Compose fork's artifacts are not in the local Maven repository
...
missing, under ~/.m2/repository:
- org/thisisthepy/compose/foundation/foundation/1.11.1-ext.1/foundation-1.11.1-ext.1.pom
+ org/thisisthepy/compose/foundation/foundation/1.11.1-ext.2/foundation-1.11.1-ext.2.pom
fix, from the repository root, then run this build again:
renderer/scripts/build-compose.sh --target macosArm64
@@ -140,7 +140,7 @@
The build stops: the fork's artifacts are missing
The check also reads the metadata the fork published. Every module the fork's metadata names
under org.thisisthepy.compose has to be published too, for each target the
- renderer builds, or foundation 1.11.1-ext.1 asks for a sibling that exists
+ renderer builds, or foundation 1.11.1-ext.2 asks for a sibling that exists
nowhere. renderer/scripts/fork-dependencies.sh check lists any that are
missing. If it lists some, run build-compose.sh again, which publishes the
fork's whole set.
@@ -152,8 +152,8 @@
The fork is published and resolution still fails
output
-
ERROR: Unable to resolve dependency org.thisisthepy.compose.foundation:foundation:1.11.1-ext.1
- Unable to download checksums of file foundation-1.11.1-ext.1.pom
+
ERROR: Unable to resolve dependency org.thisisthepy.compose.foundation:foundation:1.11.1-ext.2
+ Unable to download checksums of file foundation-1.11.1-ext.2.pom
The cause is the Kotlin toolchain's incremental state. A build that ran before the fork was
diff --git a/docs/guide/ko/troubleshooting.html b/docs/guide/ko/troubleshooting.html
index 68a79d93f..8f30bf91c 100644
--- a/docs/guide/ko/troubleshooting.html
+++ b/docs/guide/ko/troubleshooting.html
@@ -115,7 +115,7 @@
빌드되고 실행되는데 창이 뜨지 않습니다
빌드가 멈춥니다: 포크의 아티팩트가 없습니다
렌더러는 Compose 포크만 게시하는 모듈에 기대고, 포크는 그것을 ~/.m2 에만
- 게시합니다. 자기 그룹과 버전(org.thisisthepy.compose.*, 1.11.1-ext.1)으로
+ 게시합니다. 자기 그룹과 버전(org.thisisthepy.compose.*, 1.11.1-ext.2)으로
낸 패치된 Compose, 0.144.6.1 의 skiko-awt, Linux 타깃, 창 모듈입니다. 렌더러 스크립트는 모두 Kotlin 툴체인을 돌리기 전에 이것을
확인하고, 없으면 이렇게 멈춥니다.
@@ -124,7 +124,7 @@
빌드가 멈춥니다: 포크의 아티팩트가 없습
error: the Compose fork's artifacts are not in the local Maven repository
...
missing, under ~/.m2/repository:
- org/thisisthepy/compose/foundation/foundation/1.11.1-ext.1/foundation-1.11.1-ext.1.pom
+ org/thisisthepy/compose/foundation/foundation/1.11.1-ext.2/foundation-1.11.1-ext.2.pom
fix, from the repository root, then run this build again:
renderer/scripts/build-compose.sh --target macosArm64
@@ -135,7 +135,7 @@
빌드가 멈춥니다: 포크의 아티팩트가 없습
이 확인은 포크가 게시한 메타데이터도 읽습니다. 포크의 메타데이터가
org.thisisthepy.compose 아래에서 부르는 모듈은 렌더러가 빌드하는 타깃마다 모두
- 게시되어 있어야 합니다. 그렇지 않으면 foundation 1.11.1-ext.1 이 어디에도 없는 형제
+ 게시되어 있어야 합니다. 그렇지 않으면 foundation 1.11.1-ext.2 이 어디에도 없는 형제
모듈을 요구합니다. renderer/scripts/fork-dependencies.sh check 는 빠진 것을
나열합니다. 나열되는 것이 있으면 포크의 전체를 게시하는 build-compose.sh 를 다시
실행하십시오.
@@ -147,8 +147,8 @@
포크를 게시했는데도 의존성 해석이 실패합
출력
-
ERROR: Unable to resolve dependency org.thisisthepy.compose.foundation:foundation:1.11.1-ext.1
- Unable to download checksums of file foundation-1.11.1-ext.1.pom
+
ERROR: Unable to resolve dependency org.thisisthepy.compose.foundation:foundation:1.11.1-ext.2
+ Unable to download checksums of file foundation-1.11.1-ext.2.pom
원인은 Kotlin 툴체인의 증분 상태입니다. 포크를 게시하기 전에 돈 빌드가 실패한 해석을
diff --git a/renderer/desktop/c/renderer_entry.c b/renderer/desktop/c/renderer_entry.c
index 39c858187..5444f6aab 100644
--- a/renderer/desktop/c/renderer_entry.c
+++ b/renderer/desktop/c/renderer_entry.c
@@ -719,3 +719,23 @@ int32_t dxc_win32_window_zoomed(void *window) {
return 0;
}
#endif
+
+/*
+ * The names the fork's other desktop wrappers declare, which this image links without ever
+ * calling. A wrapper's file is reached by the platform switch that names all three loops, and a
+ * name no C file in the image defines is a link that fails on Linux and Windows.
+ */
+#ifndef __APPLE__
+int32_t dxc_native_metal_allocated_mb(void *device_pointer) {
+ (void)device_pointer;
+ return -1;
+}
+#endif
+
+#ifndef __linux__
+void dxc_native_window_begin_drag_at(int32_t edge, float x, float y) {
+ (void)edge;
+ (void)x;
+ (void)y;
+}
+#endif
diff --git a/renderer/desktop/module.yaml b/renderer/desktop/module.yaml
index 6055a75ba..7837be610 100644
--- a/renderer/desktop/module.yaml
+++ b/renderer/desktop/module.yaml
@@ -6,7 +6,7 @@ product: jvm/app
# publishes, and its skiko-awt, which `scripts/publish-skiko-awt.sh` publishes. They carry what
# the toolkit-free windows need and upstream does not have. The fork publishes under its own
# group, org.thisisthepy.compose, so nothing JetBrains publishes can stand in for them, and
-# skiko-awt under a version of its own above JetBrains' 0.144.6.
+# skiko-awt under org.thisisthepy.compose.skiko, on the same version line.
repositories:
- mavenLocal
@@ -20,19 +20,19 @@ dependencies:
# native half for each desktop system a build script here supports. The toolchain can pick
# the system only for JetBrains' own desktop module, so every one is named; each loads only
# its own library at run time, and the native image scripts keep only this system's.
- - org.thisisthepy.compose.runtime:runtime:1.11.1-ext.1
- - org.thisisthepy.compose.desktop:desktop:1.11.1-ext.1
- - org.thisisthepy.compose.ui:ui:1.11.1-ext.1
- - org.thisisthepy.compose.ui:ui-text:1.11.1-ext.1
- - org.thisisthepy.compose.foundation:foundation:1.11.1-ext.1
- - org.jetbrains.skiko:skiko-awt:0.144.6.1
+ - org.thisisthepy.compose.runtime:runtime:1.11.1-ext.2
+ - org.thisisthepy.compose.desktop:desktop:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-text:1.11.1-ext.2
+ - org.thisisthepy.compose.foundation:foundation:1.11.1-ext.2
+ - org.thisisthepy.compose.skiko:skiko-awt:1.11.1-ext.2
- org.jetbrains.skiko:skiko-awt-runtime-macos-arm64:0.144.6
- org.jetbrains.skiko:skiko-awt-runtime-macos-x64:0.144.6
- org.jetbrains.skiko:skiko-awt-runtime-linux-x64:0.144.6
- org.jetbrains.skiko:skiko-awt-runtime-linux-arm64:0.144.6
- org.jetbrains.skiko:skiko-awt-runtime-windows-x64:0.144.6
# FR-11's example extension draws a Material 3 progress indicator.
- - org.thisisthepy.compose.material3:material3:1.11.0-alpha07-ext.1
+ - org.thisisthepy.compose.material3:material3:1.11.1-ext.2
# Swing's Dispatchers.Main, which a run on a JVM with the toolkit's window needs. The native
# image scripts take it off the image's class path: the windows there answer Dispatchers.Main
# themselves (FrameMainDispatcher).
@@ -44,12 +44,12 @@ dependencies:
- org.graalvm.sdk:nativeimage:25.0.1: compile-only
# What every window decides the same way, and the AppKit and X11 windows of the native
# image path. The Windows window is still this module's own.
- - org.thisisthepy.compose.window:common:0.1.0
- - org.thisisthepy.compose.window:graalvm-macos:0.1.0
- - org.thisisthepy.compose.window:graalvm-linux:0.1.0
+ - org.thisisthepy.compose.window:common:1.11.1-ext.2
+ - org.thisisthepy.compose.window:graalvm-macos:1.11.1-ext.2
+ - org.thisisthepy.compose.window:graalvm-linux:1.11.1-ext.2
test-dependencies:
- - org.thisisthepy.compose.ui:ui-test-junit4:1.11.1-ext.1
+ - org.thisisthepy.compose.ui:ui-test-junit4:1.11.1-ext.2
- $kotlin.test
settings:
diff --git a/renderer/desktop/scripts/build-native-linux.sh b/renderer/desktop/scripts/build-native-linux.sh
index 37ee078fe..27f56f516 100755
--- a/renderer/desktop/scripts/build-native-linux.sh
+++ b/renderer/desktop/scripts/build-native-linux.sh
@@ -32,7 +32,10 @@ classpath="$(tr ':' '\n' <<< "$classpath" | grep -v 'kotlinx-coroutines-swing' |
# skiko's native half for every desktop system is on the JVM class path (desktop/module.yaml names
# them all, because the toolchain can pick the system only for JetBrains' own desktop module).
# The image takes this system's alone, as it did when the toolchain picked it.
-classpath="$(tr ':' '\n' <<< "$classpath" | grep -v -E 'skiko-awt-runtime-' ;
+# JetBrains' skiko-awt comes in as well, because the fork's Compose modules ask for
+# org.jetbrains.skiko:skiko, whose JVM half it is. The fork's skiko-awt (a different group) is the
+# one the image takes, and two jars of the same classes would leave the choice to class path order.
+classpath="$(tr ':' '\n' <<< "$classpath" | grep -v -E 'skiko-awt-runtime-|/org/jetbrains/skiko/skiko-awt/' ;
tr ':' '\n' <<< "$classpath" | grep -E "skiko-awt-runtime-linux-$SKIKO_ARCH-[0-9]" || true)"
classpath="$(paste -sd: - <<< "$classpath")"
@@ -45,7 +48,7 @@ compose_as="$(sed -n 's/^COMPOSE_AS="\([^"]*\)"$/\1/p' "$compose_script")"
skiko_as="$(sed -n 's/^SKIKO_AWT_AS="\([^"]*\)"$/\1/p' "$compose_script")"
[[ -n "$compose_as" && -n "$skiko_as" ]] || die "$compose_script names no COMPOSE_AS or SKIKO_AWT_AS"
for fork_jar in "repository/org/thisisthepy/compose/ui/ui-desktop/$compose_as/" \
- "repository/org/jetbrains/skiko/skiko-awt/$skiko_as/"; do
+ "repository/org/thisisthepy/compose/skiko/skiko-awt/$skiko_as/"; do
grep -q "$fork_jar" <<< "$(tr ':' '\n' <<< "$classpath")" || die \
"the class path holds no $fork_jar" \
"These are the Compose fork's desktop modules and its skiko-awt, published to the local" \
diff --git a/renderer/desktop/scripts/build-native.sh b/renderer/desktop/scripts/build-native.sh
index 6184109b3..e9483149d 100755
--- a/renderer/desktop/scripts/build-native.sh
+++ b/renderer/desktop/scripts/build-native.sh
@@ -34,7 +34,10 @@ classpath="$(tr ':' '\n' <<< "$classpath" | grep -v 'kotlinx-coroutines-swing' |
# skiko's native half for every desktop system is on the JVM class path (desktop/module.yaml names
# them all, because the toolchain can pick the system only for JetBrains' own desktop module).
# The image takes this system's alone, as it did when the toolchain picked it.
-classpath="$(tr ':' '\n' <<< "$classpath" | grep -v -E 'skiko-awt-runtime-' ;
+# JetBrains' skiko-awt comes in as well, because the fork's Compose modules ask for
+# org.jetbrains.skiko:skiko, whose JVM half it is. The fork's skiko-awt (a different group) is the
+# one the image takes, and two jars of the same classes would leave the choice to class path order.
+classpath="$(tr ':' '\n' <<< "$classpath" | grep -v -E 'skiko-awt-runtime-|/org/jetbrains/skiko/skiko-awt/' ;
tr ':' '\n' <<< "$classpath" | grep -E "skiko-awt-runtime-macos-$SKIKO_ARCH-[0-9]" || true)"
classpath="$(paste -sd: - <<< "$classpath")"
@@ -47,7 +50,7 @@ compose_as="$(sed -n 's/^COMPOSE_AS="\([^"]*\)"$/\1/p' "$compose_script")"
skiko_as="$(sed -n 's/^SKIKO_AWT_AS="\([^"]*\)"$/\1/p' "$compose_script")"
[[ -n "$compose_as" && -n "$skiko_as" ]] || die "$compose_script names no COMPOSE_AS or SKIKO_AWT_AS"
for fork_jar in "repository/org/thisisthepy/compose/ui/ui-desktop/$compose_as/" \
- "repository/org/jetbrains/skiko/skiko-awt/$skiko_as/"; do
+ "repository/org/thisisthepy/compose/skiko/skiko-awt/$skiko_as/"; do
grep -q "$fork_jar" <<< "$(tr ':' '\n' <<< "$classpath")" || die \
"the class path holds no $fork_jar" \
"These are the Compose fork's desktop modules and its skiko-awt, published to the local" \
diff --git a/renderer/desktop/scripts/build-windows.sh b/renderer/desktop/scripts/build-windows.sh
index a91fc18c2..9e50b5173 100755
--- a/renderer/desktop/scripts/build-windows.sh
+++ b/renderer/desktop/scripts/build-windows.sh
@@ -103,7 +103,7 @@ KOTLIN_WRAPPER="$PROJECT_DIR/kotlin"
"It is the self-bootstrapping Kotlin Toolchain wrapper; no separate install is needed."
SKIKO_OUT="${DXC_SKIKO_BUILD:-$REPO_DIR/.scratch/skiko-build}/out/windows-x64"
-for needed in skiko-bridges.lib skia/skia.lib skia/icudtl.dat embedded_icu.cpp; do
+for needed in skiko-bridges.lib skia/skia.lib embedded_icu.obj; do
[[ -f "$SKIKO_OUT/$needed" ]] || die "no $needed in $SKIKO_OUT" \
"Run renderer/scripts/build-compose.sh --target mingwX64 first: it builds" \
"skiko for Windows and leaves its C++ half there."
@@ -286,8 +286,9 @@ c_dir="$("$PROJECT_DIR/../scripts/fetch-fork-window.sh")/extended/window/windows
compile "$c_dir/win32_window.c" "$OUT_DIR/native/win32_window.obj" "/I$(tool_path "$c_dir")"
compile "$c_dir/win32_notifications.c" "$OUT_DIR/native/win32_notifications.obj"
compile "$PROJECT_DIR/windows/native/mingw_bridge.c" "$OUT_DIR/native/mingw_bridge.obj"
-compile "$SKIKO_OUT/embedded_icu.cpp" "$OUT_DIR/native/embedded_icu.obj" \
- /std:c++17 /GR- -Wno-c23-extensions "/clang:--embed-dir=$(tool_path "$SKIKO_OUT/skia")"
+# Skia's ICU data, compiled in by the fork's skiko build (embedded_icu.obj), so no icudtl.dat sits
+# beside the executable. Taken as it is built: the fork compiles it with the flags clang 19 needs.
+cp "$SKIKO_OUT/embedded_icu.obj" "$OUT_DIR/native/embedded_icu.obj"
# Apart from the rest: only an application that links the UCRT statically links it.
static_ucrt_object="$OUT_DIR/static-ucrt/mingw_bridge_static_ucrt.obj"
mkdir -p "$OUT_DIR/static-ucrt"
diff --git a/renderer/desktop/src/AppKitAccessibility.kt b/renderer/desktop/src/AppKitAccessibility.kt
index 2600eb25b..3c3e5c8af 100644
--- a/renderer/desktop/src/AppKitAccessibility.kt
+++ b/renderer/desktop/src/AppKitAccessibility.kt
@@ -4,12 +4,18 @@ package dev.darkpyonix.composerust.ui.platform
import androidx.compose.ui.platform.PlatformContext
import androidx.compose.ui.semantics.SemanticsActions
+import androidx.compose.ui.semantics.SemanticsConfiguration
import androidx.compose.ui.semantics.SemanticsNode
import androidx.compose.ui.semantics.SemanticsOwner
import androidx.compose.ui.semantics.SemanticsProperties
+import androidx.compose.ui.semantics.getAllSemanticsNodes
import androidx.compose.ui.semantics.getOrNull
import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.state.ToggleableState
+import androidx.compose.ui.text.AnnotatedString
+import org.thisisthepy.compose.window.AccessibleAction
import org.thisisthepy.compose.window.AccessibleElement
+import org.thisisthepy.compose.window.AccessibleState
import org.thisisthepy.compose.window.ElementRole
// What the window tells a reader who cannot see it.
@@ -25,52 +31,155 @@ import org.thisisthepy.compose.window.ElementRole
// reader has been heard using this.
/**
- * Everything in this tree worth announcing, in the order it is laid out.
+ * Everything in this tree worth announcing, in the order it is laid out, in window points
+ * ([density] pixels to a point).
*
- * A node with nothing to say is left out. A group that carries no label and no action is
- * scaffolding: announcing it would make a reader walk through the layout rather than
- * through the screen.
+ * A node with nothing to say is left out, and its children are attached to the nearest
+ * ancestor that was kept. The fork's windows keep the tree and answer a reader from it, so
+ * every element carries its id, its parent, its states, the actions it answers and the value
+ * it is told as.
*/
-internal fun SemanticsOwner.describe(): List {
+internal fun SemanticsOwner.describe(density: Float): List {
val found = ArrayList()
- fun walk(node: SemanticsNode) {
- node.describe()?.let(found::add)
- for (child in node.children) {
- walk(child)
- }
- }
- walk(rootSemanticsNode)
+ describeTree(rootSemanticsNode, -1, density, found)
return found
}
-private fun SemanticsNode.describe(): AccessibleElement? {
+private fun describeTree(node: SemanticsNode, parentId: Int, density: Float, into: MutableList) {
+ val element = node.describe(parentId, density)
+ if (element != null) into += element
+ val childParent = element?.id ?: parentId
+ for (child in node.children) describeTree(child, childParent, density, into)
+}
+
+private fun SemanticsNode.describe(parentId: Int, density: Float): AccessibleElement? {
val config = config
+ if (config.getOrNull(SemanticsProperties.HideFromAccessibility) != null) return null
+ val editable = config.getOrNull(SemanticsProperties.EditableText)
val label = config.getOrNull(SemanticsProperties.ContentDescription)?.firstOrNull()
?: config.getOrNull(SemanticsProperties.Text)?.firstOrNull()?.text
- ?: config.getOrNull(SemanticsProperties.EditableText)?.text
- val clickable = config.getOrNull(SemanticsActions.OnClick) != null
+ ?: editable?.text
+ val composeRole = config.getOrNull(SemanticsProperties.Role)
+ val toggle = config.getOrNull(SemanticsProperties.ToggleableState)
+ val range = config.getOrNull(SemanticsProperties.ProgressBarRangeInfo)
+ val canClick = config.getOrNull(SemanticsActions.OnClick) != null
+ val canSetText = config.getOrNull(SemanticsActions.SetText) != null
+ val canSetProgress = config.getOrNull(SemanticsActions.SetProgress) != null
val role = when {
- config.getOrNull(SemanticsProperties.Role) == Role.Button -> ElementRole.BUTTON
- config.getOrNull(SemanticsProperties.Role) == Role.Checkbox -> ElementRole.CHECKBOX
- config.getOrNull(SemanticsProperties.Role) == Role.Image -> ElementRole.IMAGE
- config.getOrNull(SemanticsProperties.EditableText) != null -> ElementRole.FIELD
- clickable -> ElementRole.BUTTON
+ composeRole == Role.Button -> ElementRole.BUTTON
+ composeRole == Role.Checkbox -> ElementRole.CHECKBOX
+ composeRole == Role.Switch -> ElementRole.SWITCH
+ composeRole == Role.RadioButton -> ElementRole.RADIO_BUTTON
+ composeRole == Role.Tab -> ElementRole.TAB
+ composeRole == Role.Image -> ElementRole.IMAGE
+ composeRole == Role.DropdownList -> ElementRole.COMBO_BOX
+ editable != null -> ElementRole.FIELD
+ range != null -> if (canSetProgress) ElementRole.SLIDER else ElementRole.PROGRESS
+ toggle != null -> ElementRole.CHECKBOX
+ canClick -> ElementRole.BUTTON
+ config.getOrNull(SemanticsProperties.Heading) != null && label != null -> ElementRole.HEADING
label != null -> ElementRole.TEXT
- else -> ElementRole.GROUP
+ else -> return null
+ }
+
+ var states = 0
+ if (config.getOrNull(SemanticsProperties.Disabled) == null) states = states or AccessibleState.ENABLED
+ val focused = config.getOrNull(SemanticsProperties.Focused)
+ if (focused == true) states = states or AccessibleState.FOCUSED
+ if (focused != null || config.getOrNull(SemanticsActions.RequestFocus) != null) {
+ states = states or AccessibleState.FOCUSABLE
+ }
+ if (toggle != null) {
+ states = states or AccessibleState.CHECKABLE
+ when (toggle) {
+ ToggleableState.On -> states = states or AccessibleState.CHECKED
+ ToggleableState.Indeterminate -> states = states or AccessibleState.MIXED
+ ToggleableState.Off -> {}
+ }
+ }
+ if (config.getOrNull(SemanticsProperties.Selected) == true) states = states or AccessibleState.SELECTED
+ val password = config.getOrNull(SemanticsProperties.Password) != null
+ if (editable != null) {
+ states = states or if (canSetText) AccessibleState.EDITABLE else AccessibleState.READ_ONLY
+ if (password) states = states or AccessibleState.PASSWORD
+ }
+
+ var actions = 0
+ if (canClick) actions = actions or AccessibleAction.PRESS
+ if (config.getOrNull(SemanticsActions.RequestFocus) != null) actions = actions or AccessibleAction.FOCUS
+ if (canSetText) actions = actions or AccessibleAction.SET_VALUE
+ if (canSetProgress) {
+ actions = actions or AccessibleAction.SET_VALUE or AccessibleAction.INCREMENT or AccessibleAction.DECREMENT
+ }
+ if (config.getOrNull(SemanticsActions.ScrollBy) != null) {
+ actions = actions or AccessibleAction.SCROLL_FORWARD or AccessibleAction.SCROLL_BACKWARD
+ }
+ if (config.getOrNull(SemanticsActions.OnLongClick) != null) actions = actions or AccessibleAction.SHOW_MENU
+
+ val value = when {
+ // A password is announced by its length, never its letters.
+ editable != null && password -> "\u2022".repeat(editable.text.length)
+ editable != null -> editable.text
+ range != null -> config.getOrNull(SemanticsProperties.StateDescription) ?: range.current.toString()
+ else -> config.getOrNull(SemanticsProperties.StateDescription)
}
- // Nothing to say and nothing to do. The layout is not the screen.
- if (label == null && !clickable) return null
val bounds = boundsInRoot
return AccessibleElement(
role = role,
- x = bounds.left,
- y = bounds.top,
- width = bounds.width,
- height = bounds.height,
+ x = bounds.left / density,
+ y = bounds.top / density,
+ width = bounds.width / density,
+ height = bounds.height / density,
label = label ?: "",
+ id = id,
+ parentId = parentId,
+ value = value,
+ hint = config.getOrNull(SemanticsActions.OnClick)?.label,
+ states = states,
+ actions = actions,
+ rangeMin = range?.range?.start,
+ rangeMax = range?.range?.endInclusive,
+ rangeValue = range?.current,
)
}
+/**
+ * Runs the semantics action an [AccessibleAction] stands for. [height] and [width] are the
+ * node's size in pixels, the distance one page of scrolling moves.
+ */
+private fun SemanticsConfiguration.perform(action: Int, argument: String?, height: Float, width: Float): Boolean {
+ fun stepped(sign: Int): Boolean {
+ val range = getOrNull(SemanticsProperties.ProgressBarRangeInfo) ?: return false
+ val set = getOrNull(SemanticsActions.SetProgress)?.action ?: return false
+ val span = range.range.endInclusive - range.range.start
+ val step = if (range.steps > 0) span / (range.steps + 1) else span / 20f
+ val next = (range.current + sign * step).coerceIn(range.range.start, range.range.endInclusive)
+ return set(next)
+ }
+ fun scrolled(sign: Int): Boolean {
+ val scroll = getOrNull(SemanticsActions.ScrollBy)?.action ?: return false
+ val vertical = getOrNull(SemanticsProperties.VerticalScrollAxisRange) != null ||
+ getOrNull(SemanticsProperties.HorizontalScrollAxisRange) == null
+ return if (vertical) scroll(0f, sign * height) else scroll(sign * width, 0f)
+ }
+ return when (action) {
+ AccessibleAction.PRESS -> getOrNull(SemanticsActions.OnClick)?.action?.invoke() ?: false
+ AccessibleAction.FOCUS -> getOrNull(SemanticsActions.RequestFocus)?.action?.invoke() ?: false
+ AccessibleAction.SET_VALUE -> {
+ val text = argument ?: return false
+ getOrNull(SemanticsActions.SetText)?.action?.invoke(AnnotatedString(text))
+ ?: text.toFloatOrNull()?.let { getOrNull(SemanticsActions.SetProgress)?.action?.invoke(it) }
+ ?: false
+ }
+ AccessibleAction.INCREMENT -> stepped(+1)
+ AccessibleAction.DECREMENT -> stepped(-1)
+ AccessibleAction.SCROLL_FORWARD -> scrolled(+1)
+ AccessibleAction.SCROLL_BACKWARD -> scrolled(-1)
+ AccessibleAction.SHOW_MENU -> getOrNull(SemanticsActions.OnLongClick)?.action?.invoke() ?: false
+ else -> false
+ }
+}
+
/**
* Keeps the platform's copy of the tree in step with the scene's.
*
@@ -121,7 +230,7 @@ internal class NativeSemantics(private val push: (List) -> Un
* Called after a frame, which is when everything in it has been placed. Doing nothing
* is the ordinary case: a screen that is not changing has nothing new to say.
*/
- fun pushIfChanged(afterDrawing: Boolean = false) {
+ fun pushIfChanged(density: Float, afterDrawing: Boolean = false) {
// Read again after a frame that painted, whether or not anything said so. What
// the listener reports is that a tree changed, and a tree that was placed
// differently without changing says nothing: a control that moved is at a new
@@ -129,12 +238,22 @@ internal class NativeSemantics(private val push: (List) -> Un
if (!changed && !afterDrawing) return
changed = false
val owner = owner ?: return
- val described = owner.describe()
+ val described = owner.describe(density)
if (described == last) return
last = described
push(described)
}
+ /**
+ * Does what a reader asked of the control with [id]: [action] is an [AccessibleAction]
+ * value and [argument] the new value of a set-value request. Returns whether the
+ * control offered it. Called from the window's listener, on the thread that pumps.
+ */
+ fun perform(id: Int, action: Int, argument: String?): Boolean {
+ val node = owner?.getAllSemanticsNodes(mergingEnabled = true)?.firstOrNull { it.id == id } ?: return false
+ return node.config.perform(action, argument, node.size.height.toFloat(), node.size.width.toFloat())
+ }
+
// What was last handed over, so that reading again costs a comparison rather than a
// crossing. A screen that is animating is placed anew on every frame and says the
// same thing about itself throughout.
diff --git a/renderer/desktop/src/AppKitWindow.kt b/renderer/desktop/src/AppKitWindow.kt
index 65e64f201..b77a56111 100644
--- a/renderer/desktop/src/AppKitWindow.kt
+++ b/renderer/desktop/src/AppKitWindow.kt
@@ -33,6 +33,7 @@ import androidx.compose.ui.scene.ComposeScene
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
+import org.thisisthepy.compose.window.AccessibleAction
import org.thisisthepy.compose.window.DockIcon
import org.thisisthepy.compose.window.FrameClock
import org.thisisthepy.compose.window.WindowEvent
@@ -57,7 +58,8 @@ import org.thisisthepy.compose.window.graalvm.macos.readDroppedPaths
import org.thisisthepy.compose.window.graalvm.macos.registerFrameCallback
import org.thisisthepy.compose.window.graalvm.macos.setApplicationIcon
import org.thisisthepy.compose.window.graalvm.macos.setPointerShape
-import org.thisisthepy.compose.window.graalvm.macos.AccessibleElement as AppKitElement
+import org.thisisthepy.compose.window.graalvm.macos.ACCESSIBILITY_ACTION_EVENT
+import org.thisisthepy.compose.window.graalvm.macos.takeAccessibilityArgument
// A window that is ours, drawn into with Skia and with no toolkit in between.
//
@@ -190,7 +192,7 @@ internal fun runAppKitWindow(autoExitMillis: Long? = null) {
System.err.println("compose-rust: the window has ${elements.size} things to say")
}
synthetic?.noteElements(elements)
- window.describeTo(elements.map { AppKitElement(it.role, it.x, it.y, it.width, it.height, it.label) })
+ window.describeTo(elements)
}
// Kept rather than left to the scene. What a scene picks for itself is the toolkit's
// queue, and the Host this renderer talks to is on this thread and invisible from
@@ -278,6 +280,14 @@ internal fun runAppKitWindow(autoExitMillis: Long? = null) {
LatencyTrace.mark("synthetic ${event.kind} sent")
}
for (event in events) {
+ // A reader asked a control to do something. It goes to the control, not to the
+ // scene as input; a new value arrives apart from the event because it can be
+ // longer than an event's text.
+ if (event.kind == ACCESSIBILITY_ACTION_EVENT) {
+ val argument = if (event.codePoint == AccessibleAction.SET_VALUE) takeAccessibilityArgument() else null
+ if (semantics.perform(event.keyCode, event.codePoint, argument)) heard = true
+ continue
+ }
if (report && event.kind != WindowEvent.POINTER_MOVE) {
System.err.println("compose-rust: window heard $event")
}
@@ -356,7 +366,7 @@ internal fun runAppKitWindow(autoExitMillis: Long? = null) {
// tree that changed on the last one is a tree nobody has been told about, and
// a window that has gone still is exactly where that would be forgotten.
// Costs a comparison when nothing has changed, which is almost always.
- semantics.pushIfChanged(afterDrawing = drew)
+ semantics.pushIfChanged(scene.density.density, afterDrawing = drew)
reportCaret(textInput)
}
LatencyTrace.summary()
diff --git a/renderer/desktop/src/SemanticsFanOut.kt b/renderer/desktop/src/SemanticsFanOut.kt
deleted file mode 100644
index 65d23f019..000000000
--- a/renderer/desktop/src/SemanticsFanOut.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-@file:OptIn(androidx.compose.ui.InternalComposeUiApi::class)
-
-package dev.darkpyonix.composerust.ui.platform
-
-import androidx.compose.ui.platform.PlatformContext
-import androidx.compose.ui.semantics.SemanticsOwner
-
-/**
- * One semantics listener that tells several.
- *
- * A scene reports its semantics to one listener, and a window can have more than one reader
- * of them: the elements the window keeps for its own accessibility records, and a screen
- * reader on the AT-SPI bus answered from a tree of its own. Each hears every change.
- */
-internal class SemanticsFanOut(
- private vararg val listeners: PlatformContext.SemanticsOwnerListener,
-) : PlatformContext.SemanticsOwnerListener {
- override fun onSemanticsOwnerAppended(semanticsOwner: SemanticsOwner) {
- for (listener in listeners) listener.onSemanticsOwnerAppended(semanticsOwner)
- }
-
- override fun onSemanticsOwnerRemoved(semanticsOwner: SemanticsOwner) {
- for (listener in listeners) listener.onSemanticsOwnerRemoved(semanticsOwner)
- }
-
- override fun onSemanticsChange(semanticsOwner: SemanticsOwner) {
- for (listener in listeners) listener.onSemanticsChange(semanticsOwner)
- }
-
- override fun onLayoutChange(semanticsOwner: SemanticsOwner, semanticsNodeId: Int) {
- for (listener in listeners) listener.onLayoutChange(semanticsOwner, semanticsNodeId)
- }
-}
diff --git a/renderer/desktop/src/Win32Window.kt b/renderer/desktop/src/Win32Window.kt
index 95402c930..a0748841a 100644
--- a/renderer/desktop/src/Win32Window.kt
+++ b/renderer/desktop/src/Win32Window.kt
@@ -563,7 +563,7 @@ internal fun runWin32Window(autoExitMillis: Long? = null) {
// the window has been placed and can say where it is. Every frame, because a
// tree that changed on the last one is a tree nobody has been told about, and
// a window that has gone still is exactly where that would be forgotten.
- semantics.pushIfChanged(afterDrawing = drew)
+ semantics.pushIfChanged(scene.density.density, afterDrawing = drew)
busy = heard || drew
}
LatencyTrace.summary()
diff --git a/renderer/desktop/src/X11Window.kt b/renderer/desktop/src/X11Window.kt
index f8957cc15..68c164aae 100644
--- a/renderer/desktop/src/X11Window.kt
+++ b/renderer/desktop/src/X11Window.kt
@@ -12,8 +12,6 @@ import org.thisisthepy.compose.window.WindowConfig
import org.thisisthepy.compose.window.WindowEvent
import org.thisisthepy.compose.window.WindowFrames
import org.thisisthepy.compose.window.WindowListener
-import org.thisisthepy.compose.window.atspi.AtspiSemanticsSource
-import org.thisisthepy.compose.window.graalvm.linux.X11Accessibility
import org.thisisthepy.compose.window.graalvm.linux.X11Upcalls
import org.thisisthepy.compose.window.graalvm.linux.X11Window as ForkX11Window
@@ -56,7 +54,14 @@ internal fun runX11Window(autoExitMillis: Long? = null) {
window.backdrop = false
val heard = ArrayList()
var closed = false
+ // Set once the scene's semantics exist; a reader's request is answered from them.
+ var semanticsRef: NativeSemantics? = null
val listener = object : WindowListener {
+ // A screen reader on the AT-SPI bus asked a control to do something. The window
+ // keeps the tree and answers its questions; this is the one thing it cannot do.
+ override fun onAccessibilityAction(id: Int, action: Int, argument: String?): Boolean =
+ semanticsRef?.perform(id, action, argument) ?: false
+
override fun onEvent(event: WindowEvent) {
heard.add(event)
}
@@ -101,16 +106,7 @@ internal fun runX11Window(autoExitMillis: Long? = null) {
synthetic?.noteElements(elements)
window.setAccessibility(elements)
}
- // A screen reader on this desktop is answered over AT-SPI from a tree of its own, so the
- // scene tells both what changed. Null where there is no accessibility bus to join.
- val atspiSource = AtspiSemanticsSource()
- val accessibility = X11Accessibility.join(window, atspiSource)
- if (report) {
- System.err.println(
- accessibility?.let { "compose-rust: joined the accessibility bus as ${it.busName}" }
- ?: "compose-rust: no accessibility bus to join",
- )
- }
+ semanticsRef = semantics
// Kept rather than left to the scene. What a scene picks for itself is the toolkit's
// queue, and the Host this renderer talks to is on this thread and invisible from
// there.
@@ -119,7 +115,7 @@ internal fun runX11Window(autoExitMillis: Long? = null) {
density = androidx.compose.ui.unit.Density(measured.scale),
size = size,
coroutineContext = work,
- platformContext = NativePlatformContext({ size }, textInput, SemanticsFanOut(semantics, atspiSource), window::setCursor),
+ platformContext = NativePlatformContext({ size }, textInput, semantics, window::setCursor),
)
WindowStartReport.sceneCreated(size.width, size.height, measured.scale)
// The application's own tree, drawn by the same interpreter the toolkit path uses.
@@ -242,10 +238,7 @@ internal fun runX11Window(autoExitMillis: Long? = null) {
// the window has been placed and can say where it is. Every frame, because a
// tree that changed on the last one is a tree nobody has been told about, and
// a window that has gone still is exactly where that would be forgotten.
- semantics.pushIfChanged(afterDrawing = drew)
- // After the drawing, for the same reason: what a reader is told is where
- // everything was placed. Its questions are answered here too, on this thread.
- accessibility?.afterFrame(options.title)
+ semantics.pushIfChanged(scene.density.density, afterDrawing = drew)
reportCaret(textInput)
}
} finally {
@@ -254,7 +247,6 @@ internal fun runX11Window(autoExitMillis: Long? = null) {
// Before the scene closes. A resize arriving between the two would otherwise ask a
// scene that has gone to draw into a context that has gone with it.
X11Upcalls.clearFramePainter()
- accessibility?.close()
LatencyTrace.summary()
if (System.getenv("DXC_REPORT_RESIZE") != null) System.err.println(window.resizeReport())
scene.close()
diff --git a/renderer/linux/module.yaml b/renderer/linux/module.yaml
index 3a57fb00e..58c68e534 100644
--- a/renderer/linux/module.yaml
+++ b/renderer/linux/module.yaml
@@ -53,45 +53,47 @@ dependencies:
- $libs.kotlinx.coroutines.core
# The window and what every window decides the same way. Published by
# scripts/publish-window.sh from the pinned fork commit, next to the patched Compose.
- - org.thisisthepy.compose.window:common:0.1.0
+ - org.thisisthepy.compose.window:common:1.11.1-ext.2
dependencies@linuxX64:
- - org.thisisthepy.compose.runtime:runtime-linuxx64:1.11.1-ext.1
- - org.thisisthepy.compose.runtime:runtime-saveable-linuxx64:1.11.1-ext.1
- - org.thisisthepy.compose.window:native-linux-linuxx64:0.1.0
- - org.thisisthepy.compose.animation:animation-linuxx64:1.11.1-ext.1
- - org.thisisthepy.compose.animation:animation-core-linuxx64:1.11.1-ext.1
- - org.thisisthepy.compose.foundation:foundation-linuxx64:1.11.1-ext.1
- - org.thisisthepy.compose.foundation:foundation-layout-linuxx64:1.11.1-ext.1
- - org.thisisthepy.compose.material:material-ripple-linuxx64:1.11.1-ext.1
- - org.thisisthepy.compose.material3:material3-linuxx64:1.11.0-alpha07-ext.1
- - org.thisisthepy.compose.ui:ui-linuxx64:1.11.1-ext.1
- - org.thisisthepy.compose.ui:ui-backhandler-linuxx64:1.11.1-ext.1
- - org.thisisthepy.compose.ui:ui-geometry-linuxx64:1.11.1-ext.1
- - org.thisisthepy.compose.ui:ui-graphics-linuxx64:1.11.1-ext.1
- - org.thisisthepy.compose.ui:ui-text-linuxx64:1.11.1-ext.1
- - org.thisisthepy.compose.ui:ui-tooling-preview-linuxx64:1.11.1-ext.1
- - org.thisisthepy.compose.ui:ui-unit-linuxx64:1.11.1-ext.1
- - org.thisisthepy.compose.ui:ui-util-linuxx64:1.11.1-ext.1
+ - org.thisisthepy.compose.runtime:runtime-linuxx64:1.11.1-ext.2
+ - org.thisisthepy.compose.runtime:runtime-saveable-linuxx64:1.11.1-ext.2
+ - org.thisisthepy.compose.window:native-linux-linuxx64:1.11.1-ext.2
+ - org.thisisthepy.compose.window:scene-linuxx64:1.11.1-ext.2
+ - org.thisisthepy.compose.animation:animation-linuxx64:1.11.1-ext.2
+ - org.thisisthepy.compose.animation:animation-core-linuxx64:1.11.1-ext.2
+ - org.thisisthepy.compose.foundation:foundation-linuxx64:1.11.1-ext.2
+ - org.thisisthepy.compose.foundation:foundation-layout-linuxx64:1.11.1-ext.2
+ - org.thisisthepy.compose.material:material-ripple-linuxx64:1.11.1-ext.2
+ - org.thisisthepy.compose.material3:material3-linuxx64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-linuxx64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-backhandler-linuxx64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-geometry-linuxx64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-graphics-linuxx64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-text-linuxx64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-tooling-preview-linuxx64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-unit-linuxx64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-util-linuxx64:1.11.1-ext.2
dependencies@linuxArm64:
- - org.thisisthepy.compose.runtime:runtime-linuxarm64:1.11.1-ext.1
- - org.thisisthepy.compose.runtime:runtime-saveable-linuxarm64:1.11.1-ext.1
- - org.thisisthepy.compose.window:native-linux-linuxarm64:0.1.0
- - org.thisisthepy.compose.animation:animation-linuxarm64:1.11.1-ext.1
- - org.thisisthepy.compose.animation:animation-core-linuxarm64:1.11.1-ext.1
- - org.thisisthepy.compose.foundation:foundation-linuxarm64:1.11.1-ext.1
- - org.thisisthepy.compose.foundation:foundation-layout-linuxarm64:1.11.1-ext.1
- - org.thisisthepy.compose.material:material-ripple-linuxarm64:1.11.1-ext.1
- - org.thisisthepy.compose.material3:material3-linuxarm64:1.11.0-alpha07-ext.1
- - org.thisisthepy.compose.ui:ui-linuxarm64:1.11.1-ext.1
- - org.thisisthepy.compose.ui:ui-backhandler-linuxarm64:1.11.1-ext.1
- - org.thisisthepy.compose.ui:ui-geometry-linuxarm64:1.11.1-ext.1
- - org.thisisthepy.compose.ui:ui-graphics-linuxarm64:1.11.1-ext.1
- - org.thisisthepy.compose.ui:ui-text-linuxarm64:1.11.1-ext.1
- - org.thisisthepy.compose.ui:ui-tooling-preview-linuxarm64:1.11.1-ext.1
- - org.thisisthepy.compose.ui:ui-unit-linuxarm64:1.11.1-ext.1
- - org.thisisthepy.compose.ui:ui-util-linuxarm64:1.11.1-ext.1
+ - org.thisisthepy.compose.runtime:runtime-linuxarm64:1.11.1-ext.2
+ - org.thisisthepy.compose.runtime:runtime-saveable-linuxarm64:1.11.1-ext.2
+ - org.thisisthepy.compose.window:native-linux-linuxarm64:1.11.1-ext.2
+ - org.thisisthepy.compose.window:scene-linuxarm64:1.11.1-ext.2
+ - org.thisisthepy.compose.animation:animation-linuxarm64:1.11.1-ext.2
+ - org.thisisthepy.compose.animation:animation-core-linuxarm64:1.11.1-ext.2
+ - org.thisisthepy.compose.foundation:foundation-linuxarm64:1.11.1-ext.2
+ - org.thisisthepy.compose.foundation:foundation-layout-linuxarm64:1.11.1-ext.2
+ - org.thisisthepy.compose.material:material-ripple-linuxarm64:1.11.1-ext.2
+ - org.thisisthepy.compose.material3:material3-linuxarm64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-linuxarm64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-backhandler-linuxarm64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-geometry-linuxarm64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-graphics-linuxarm64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-text-linuxarm64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-tooling-preview-linuxarm64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-unit-linuxarm64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-util-linuxarm64:1.11.1-ext.2
test-dependencies:
- $kotlin.test
diff --git a/renderer/linux/src/LinuxRenderer.kt b/renderer/linux/src/LinuxRenderer.kt
index b0b59f1e4..ae80e0173 100644
--- a/renderer/linux/src/LinuxRenderer.kt
+++ b/renderer/linux/src/LinuxRenderer.kt
@@ -72,9 +72,6 @@ internal fun runRenderer(connection: () -> HostConnection): Int {
// No caption is passed. The window manager draws this platform's title bar itself, outside
// the window, so there is no strip of our own for content to step clear of.
opened = window
- // Joined before the loop starts: a screen reader that is already running reads the window
- // from its first frame. Nothing happens where there is no accessibility bus.
- window.startAccessibility(PosixBusConnection.applicationName())
// The bus is read on this thread every turn, because there is no other thread to read it
// on and nothing else would notice a press arriving while the window is idle.
window.onTurn = { host.table.notifications.pump() }
diff --git a/renderer/linux/src/LinuxWindow.kt b/renderer/linux/src/LinuxWindow.kt
index c46cb2bf8..99e9e1754 100644
--- a/renderer/linux/src/LinuxWindow.kt
+++ b/renderer/linux/src/LinuxWindow.kt
@@ -15,12 +15,10 @@ import androidx.compose.ui.input.pointer.PointerIcon
import androidx.compose.ui.platform.PlatformContext
import androidx.compose.ui.platform.PlatformTextInputMethodRequest
import androidx.compose.ui.platform.WindowInfo
-import androidx.compose.ui.semantics.SemanticsOwner
import androidx.compose.ui.scene.CanvasLayersComposeScene
import androidx.compose.ui.unit.Density
import androidx.compose.ui.unit.IntSize
import java.lang.System
-import platform.posix.getuid
import org.thisisthepy.compose.window.CaretRect
import org.thisisthepy.compose.window.FrameClock
import org.thisisthepy.compose.window.WindowConfig
@@ -28,15 +26,11 @@ import org.thisisthepy.compose.window.WindowEvent
import org.thisisthepy.compose.window.WindowFrames
import org.thisisthepy.compose.window.WindowListener
import org.thisisthepy.compose.window.candidateSpot
-import org.thisisthepy.compose.window.atspi.AtspiActions
-import org.thisisthepy.compose.window.atspi.AtspiBridge
-import org.thisisthepy.compose.window.atspi.AtspiSemanticsSource
import org.thisisthepy.compose.window.linux.CURSOR_ARROW
import org.thisisthepy.compose.window.linux.CURSOR_CROSSHAIR
import org.thisisthepy.compose.window.linux.CURSOR_HAND
import org.thisisthepy.compose.window.linux.CURSOR_TEXT
import org.thisisthepy.compose.window.linux.X11Window
-import org.thisisthepy.compose.window.linux.PosixBusConnection as AccessibilityBusConnection
/**
* The Compose half of the window this renderer opens on X11: the scene, what is typed into it
@@ -98,8 +92,8 @@ internal class LinuxWindow private constructor(
/**
* What the window would tell a reader who cannot see it, as the platform-neutral list the
- * other desktops hand their reader. Kept for the frame report below; what a Linux screen
- * reader is answered from is [atspiSource], which keeps the tree rather than a list.
+ * other desktops hand their reader. Kept for the frame report below; the window itself
+ * serves it on the AT-SPI bus and hands a reader's requests back to [onAccessibilityAction].
*/
private var described: List = emptyList()
@@ -109,6 +103,7 @@ internal class LinuxWindow private constructor(
private val semantics = NativeSemantics { elements ->
described = elements
synthetic?.noteElements(elements)
+ x11.setAccessibility(elements)
if (reportFrames) {
System.err.println(
"compose-rust: the window holds ${described.size} things to say" +
@@ -117,35 +112,6 @@ internal class LinuxWindow private constructor(
}
}
- /** The scene's semantics, read into the tree AT-SPI serves. */
- private val atspiSource = AtspiSemanticsSource()
-
- /** Both listeners hear every change: the scene has one place to report to. */
- private val semanticsListeners: PlatformContext.SemanticsOwnerListener = object : PlatformContext.SemanticsOwnerListener {
- override fun onSemanticsOwnerAppended(semanticsOwner: SemanticsOwner) {
- semantics.onSemanticsOwnerAppended(semanticsOwner)
- atspiSource.onSemanticsOwnerAppended(semanticsOwner)
- }
-
- override fun onSemanticsOwnerRemoved(semanticsOwner: SemanticsOwner) {
- semantics.onSemanticsOwnerRemoved(semanticsOwner)
- atspiSource.onSemanticsOwnerRemoved(semanticsOwner)
- }
-
- override fun onSemanticsChange(semanticsOwner: SemanticsOwner) {
- semantics.onSemanticsChange(semanticsOwner)
- atspiSource.onSemanticsChange(semanticsOwner)
- }
-
- override fun onLayoutChange(semanticsOwner: SemanticsOwner, semanticsNodeId: Int) {
- semantics.onLayoutChange(semanticsOwner, semanticsNodeId)
- atspiSource.onLayoutChange(semanticsOwner, semanticsNodeId)
- }
- }
-
- /** This window's place on the accessibility bus, once [startAccessibility] has joined it. */
- private var accessibility: AtspiBridge? = null
-
/** The field that asked to be typed into, kept to ask where its caret is. */
private var inputRequest: PlatformTextInputMethodRequest? = null
@@ -158,7 +124,7 @@ internal class LinuxWindow private constructor(
private val platformContext: PlatformContext =
object : PlatformContext by PlatformContext.Empty() {
override val windowInfo get() = this@LinuxWindow.windowInfo
- override val semanticsOwnerListener get() = semanticsListeners
+ override val semanticsOwnerListener get() = semantics
override suspend fun startInputMethod(
request: PlatformTextInputMethodRequest,
@@ -259,6 +225,10 @@ internal class LinuxWindow private constructor(
override fun onCloseRequested(): Boolean = true
+ /** A screen reader asked a control to do something; the window serves the bus, the scene does it. */
+ override fun onAccessibilityAction(id: Int, action: Int, argument: String?): Boolean =
+ semantics.perform(id, action, argument)
+
fun setContent(content: @Composable () -> Unit) {
scene.setContent(content)
}
@@ -295,9 +265,6 @@ internal class LinuxWindow private constructor(
x11.pump(FRAME_MILLISECONDS)
focused = x11.isFocused
onTurn()
- // A reader's questions are answered between frames, on this thread, so that
- // a press it asks for happens where every other press does.
- accessibility?.pump()
// Before the events and before the drawing. What is waiting here is the scene's
// own work and whatever was sent to `Dispatchers.Main`, and a list that asked for
// rows on the last frame wants them in hand before this one is measured. Work sent
@@ -348,13 +315,7 @@ internal class LinuxWindow private constructor(
// window has been placed and can say where it is. Every frame, because a tree
// that changed on the last one is a tree nobody has been told about, and a window
// that has gone still is exactly where that would be forgotten.
- semantics.pushIfChanged(afterDrawing = drew)
- accessibility?.let { bridge ->
- // After the drawing, for the reason the line above is: what is read is where
- // everything was placed.
- atspiSource.capture(title)?.let { bridge.update(it) }
- bridge.windowActive(focused)
- }
+ semantics.pushIfChanged(scene.density.density, afterDrawing = drew)
updateInputMethod()
}
} finally {
@@ -381,35 +342,7 @@ internal class LinuxWindow private constructor(
x11.setImeSpot(spot.first, spot.second)
}
- /**
- * Joins the accessibility bus, so that a screen reader that is already running reads this
- * window from its first frame. Nothing happens where there is no accessibility bus.
- */
- fun startAccessibility(applicationName: String) {
- if (accessibility != null || System.getenv("NO_AT_BRIDGE") == "1") return
- val actions = object : AtspiActions {
- override fun click(id: Int) = atspiSource.click(id)
- override fun focus(id: Int) = atspiSource.focus(id)
- override fun windowOrigin(): Pair = x11.originOnScreen()
- }
- val bridge = AtspiBridge(
- openSession = { AccessibilityBusConnection.open() },
- openAccessibility = { address -> AccessibilityBusConnection.open(address) },
- userId = getuid().toLong(),
- applicationName = applicationName,
- actions = actions,
- )
- if (bridge.start()) {
- accessibility = bridge
- if (reportFrames) System.err.println("compose-rust: joined the accessibility bus as ${bridge.busName}")
- } else if (reportFrames) {
- System.err.println("compose-rust: no accessibility bus to join")
- }
- }
-
private fun close() {
- accessibility?.close()
- accessibility = null
scene.close()
x11.close()
}
@@ -452,6 +385,9 @@ internal class LinuxWindow private constructor(
}
override fun onCloseRequested(): Boolean = target?.onCloseRequested() ?: true
+
+ override fun onAccessibilityAction(id: Int, action: Int, argument: String?): Boolean =
+ target?.onAccessibilityAction(id, action, argument) ?: false
}
private const val FRAME_MILLISECONDS = 16L
diff --git a/renderer/macos/module.yaml b/renderer/macos/module.yaml
index fca6c6109..82230dfbe 100644
--- a/renderer/macos/module.yaml
+++ b/renderer/macos/module.yaml
@@ -32,16 +32,16 @@ apply:
dependencies:
# The fork's runtime: a stub with no classes that points at androidx.compose.runtime.
- - org.thisisthepy.compose.runtime:runtime:1.11.1-ext.1
+ - org.thisisthepy.compose.runtime:runtime:1.11.1-ext.2
# The fork's Compose. Not `$compose.foundation` and the rest: those are JetBrains', and the two
# side by side would be the same classes twice under two groups.
- - org.thisisthepy.compose.foundation:foundation:1.11.1-ext.1
- - org.thisisthepy.compose.material3:material3:1.11.0-alpha07-ext.1
- - org.thisisthepy.compose.ui:ui:1.11.1-ext.1
+ - org.thisisthepy.compose.foundation:foundation:1.11.1-ext.2
+ - org.thisisthepy.compose.material3:material3:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui:1.11.1-ext.2
# The window: AppKit and Metal, and what every window decides the same way. Published by
# scripts/publish-window.sh from the pinned fork commit, next to the patched Compose.
- - org.thisisthepy.compose.window:common:0.1.0
- - org.thisisthepy.compose.window:native-macos:0.1.0
+ - org.thisisthepy.compose.window:common:1.11.1-ext.2
+ - org.thisisthepy.compose.window:native-macos:1.11.1-ext.2
test-dependencies:
- $kotlin.test
diff --git a/renderer/macos/src/MacosRenderer.kt b/renderer/macos/src/MacosRenderer.kt
index 54a21af47..cde402bd1 100644
--- a/renderer/macos/src/MacosRenderer.kt
+++ b/renderer/macos/src/MacosRenderer.kt
@@ -29,6 +29,10 @@ import org.thisisthepy.compose.window.macos.MacosClipboardManager
import org.thisisthepy.compose.window.macos.MacosWindow
import org.thisisthepy.compose.window.macos.observeSystemAppearance
import org.thisisthepy.compose.window.macos.systemIsDark
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
import platform.AppKit.NSApplication
import platform.AppKit.NSApplicationActivationPolicy
import platform.AppKit.NSApplicationWillTerminateNotification
@@ -144,6 +148,16 @@ internal fun runRenderer(connection: () -> HostConnection): Int {
),
)
requestFrame = window::requestFrame
+ // The fork's window runs the scene's coroutines (the frame requests below among them, and
+ // every delay) only inside a frame, and an idle window is not drawn. A request a Host
+ // worker makes would wait for a frame nobody asks for, so each one is turned into a
+ // redraw on the main thread, which is where AppKit wants `needsDisplay` set.
+ @OptIn(DelicateCoroutinesApi::class)
+ GlobalScope.launch(Dispatchers.Default) {
+ FrameRequests.global.counter.collect {
+ NSOperationQueue.mainQueue.addOperationWithBlock { window.requestFrame() }
+ }
+ }
val dockIcon = DockIcon(
lookup = { id -> (host.table.assets.asset(id) as? Asset.Raster)?.bitmap },
apply = { picture -> picture.toNSImage()?.let { application.applicationIconImage = it } },
diff --git a/renderer/scripts/build-compose.sh b/renderer/scripts/build-compose.sh
index b95d13da7..569dad78a 100755
--- a/renderer/scripts/build-compose.sh
+++ b/renderer/scripts/build-compose.sh
@@ -10,7 +10,7 @@
# edits by hand, and runs the fork's own extended/compose/publish-local.sh, which publishes
# every module the renderer draws with to the local Maven repository.
#
-# The fork publishes under its own group and version, org.thisisthepy.compose.*:1.11.1-ext.1
+# The fork publishes under its own group and version, org.thisisthepy.compose.*:1.11.1-ext.2
# (its extended/COORDINATES.md), and the renderer modules ask for exactly those. Nothing
# JetBrains publishes sits at those coordinates, so a resolver that already holds JetBrains'
# Compose (Amper's cache does) cannot take JetBrains' jars in their place, and nothing here
@@ -32,41 +32,33 @@ set -euo pipefail
# compose-fork.changes lists what this commit must hold at every path it changes, and
# scripts/tests/compose-fork.test.sh checks it.
FORK="https://github.com/thisisthepy/compose-multiplatform-core-extended.git"
-REVISION="127311dc737d8badb68953291d248db8a7071cca"
+REVISION="2eb80c12e7615ef80c7661ea63e0f20651f20a31"
# The window modules and skiko's builds are not Compose sources: the renderer builds them from
# this commit (scripts/fetch-fork-window.sh and fetch-fork-skiko.sh) into artifacts of its own,
-# so they can move without moving the Compose build above. This one is the fork's merge of the
-# resize soak (#109), which draws each GraalVM frame in an autorelease pool of its own; it
-# carries the merge of the coordinates (#119), so the window modules compile against the fork's
-# Compose coordinates, which the Compose pin introduced, and the window changes before it.
-# This is a backport branch of the fork, feat/windows-window-backport-57b4a0e: 57b4a0e plus the
-# Windows wheel direction fix (fork #170) and the caption buttons safe default with the
-# HTMAXBUTTON hit test for Snap Layouts (fork #172). Do not delete that branch while this pins it.
-WINDOW_REVISION="aed8307c70d2f6b3c4854ab5ebfeac92b50e962e"
-# The commit the Windows build takes, which is its own on purpose. Windows needs the
-# commits the Compose pin (REVISION) leaves out: 296beb3 adds mingwX64 to every Compose UI module and
-# reads skiko from the local Maven repository first, and f17cb30 adds the skiko build for
-# mingwX64 under extended/. This is the tip of `extended` that merged them and the fixes to
-# that skiko build after it, 8ec7c32. Every commit between 296beb3 and here changes only
-# extended/skiko, so the Compose sources are the ones 296beb3 left, and extended/skiko is
-# where the ICU loader the Windows link compiles (embedded_icu.cpp) comes from as well.
-# Two pins rather than one moved for everybody, because moving macOS and Linux would change
-# what they publish (every module's root metadata would name a mingw_x64 variant nobody
-# built there) for nothing they use. compose-fork-mingw.changes lists what this commit must
-# hold, and scripts/tests/compose-fork.test.sh checks both pins.
-MINGW_REVISION="11da941766762c4760df9cf3c11429837d772bdd"
+# so they can move without moving the Compose build above. This is the tip of the fork's
+# `extended` branch, which holds the Windows caption buttons safe default and HTMAXBUTTON hit test
+# for Snap Layouts (fork #172), the Windows wheel direction fix (fork #170) and the windows' own
+# accessibility bridges (the renderer hands them the scene's semantics). It replaces the
+# backport branch feat/windows-window-backport-57b4a0e, which carried those two fixes on an
+# older base; multi-window work builds on `extended` itself.
+WINDOW_REVISION="2eb80c12e7615ef80c7661ea63e0f20651f20a31"
+# The commit the Windows build takes. It was its own pin while the Windows Compose lived on a
+# branch apart from the Compose pin; the fork's `extended` now holds mingwX64 for every Compose UI
+# module, the skiko build for mingwX64 (extended/skiko/build-skiko-mingw.sh, which also compiles
+# Skia's ICU data in as embedded_icu.obj) and publish-local.sh mingwX64, so all three pins are one
+# commit. The name stays so the Windows pin can move apart again. compose-fork-mingw.changes lists
+# what this commit must hold, and scripts/tests/compose-fork.test.sh checks both pins.
+MINGW_REVISION="2eb80c12e7615ef80c7661ea63e0f20651f20a31"
# What the pinned commit publishes as: its gradle.properties gives every library line a version
# of the form -ext.. The renderer modules ask for these by name, and
# scripts/tests/fork-versions.test.sh checks that they do; this script checks the pinned
# commit's gradle.properties says the same before it builds anything.
-COMPOSE_AS="1.11.1-ext.1"
-MATERIAL3_AS="1.11.0-alpha07-ext.1"
+COMPOSE_AS="1.11.1-ext.2"
+MATERIAL3_AS="1.11.1-ext.2"
# The fork's patched skiko-awt, published by its extended/skiko/build-skiko-awt.sh (through
-# scripts/publish-skiko-awt.sh). skiko keeps JetBrains' group, so it has a version of its own,
-# which sorts above JetBrains' 0.144.6 in every resolver.
-SKIKO_AWT_AS="0.144.6.1"
-PUBLISHED_AS="1.11.1"
-MATERIAL3_PUBLISHED_AS="1.11.0-alpha07"
+# scripts/publish-skiko-awt.sh). It goes out as org.thisisthepy.compose.skiko:skiko-awt on the
+# fork's version line; its module metadata declares JetBrains' skiko-awt as a capability.
+SKIKO_AWT_AS="1.11.1-ext.2"
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
RENDERER_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
@@ -101,24 +93,6 @@ case "$target" in
mingwX64)
publish_targets=(mingwX64)
revision="$MINGW_REVISION"
- publications=(MingwX64)
- published_as="$PUBLISHED_AS"
- modules=(
- compose:animation:animation
- compose:animation:animation-core
- compose:foundation:foundation
- compose:foundation:foundation-layout
- compose:material:material-ripple
- compose:material3:material3
- compose:ui:ui
- compose:ui:ui-backhandler
- compose:ui:ui-geometry
- compose:ui:ui-graphics
- compose:ui:ui-text
- compose:ui:ui-tooling-preview
- compose:ui:ui-unit
- compose:ui:ui-util
- )
;;
*) die "unknown target '$target'" "known: macosArm64, desktop, linux (both of the next two), linuxX64, linuxArm64, mingwX64" ;;
esac
@@ -160,31 +134,6 @@ if [[ "$target" == mingwX64 ]]; then
"The Windows pin has to be a commit of the fork that carries the skiko build."
echo "==> building skiko for mingwX64 into $SKIKO_WORK"
bash "$skiko_script" "$SKIKO_WORK"
- # Skia's ICU loader with the data compiled in, which the Windows link needs so that no
- # icudtl.dat has to sit beside the executable. Put with the rest of skiko's Windows half,
- # where desktop/scripts/build-windows.sh compiles it against the icudtl.dat already there.
- cp "$WORK/extended/skiko/embedded_icu.cpp" "$SKIKO_WORK/out/windows-x64/"
-
- echo "==> publishing ${#modules[@]} compose module(s) for $target as $published_as"
- tasks=()
- for module in "${modules[@]}"; do
- for publication in "${publications[@]}"; do
- tasks+=(":$module:publish${publication}PublicationToMavenLocal")
- done
- tasks+=(":$module:publishKotlinMultiplatformPublicationToMavenLocal")
- done
- (
- cd "$WORK"
- ./gradlew --no-daemon --no-configuration-cache \
- "-Pjetbrains.publication.version.COMPOSE=$published_as" \
- "-Pjetbrains.publication.version.COMPOSE_MATERIAL3=$MATERIAL3_PUBLISHED_AS" \
- "${tasks[@]}"
- )
-
- echo
- echo "published to $HOME/.m2/repository/org/jetbrains/compose as $published_as"
- echo "the renderer's macos, linux and windows modules read mavenLocal first, so the next build links these"
- exit 0
fi
publish="$WORK/extended/compose/publish-local.sh"
diff --git a/renderer/scripts/compose-fork-mingw.changes b/renderer/scripts/compose-fork-mingw.changes
index c94e8f165..dd1b50899 100644
--- a/renderer/scripts/compose-fork-mingw.changes
+++ b/renderer/scripts/compose-fork-mingw.changes
@@ -13,35 +13,50 @@
#
# git diff --raw --no-renames --no-abbrev |
# awk '{ print ($5 == "D" ? "-" : $4), $6 }'
+186b395417b667862f41c1ffe900d68a9700a509 .github/actions/fork-compose/action.yml
10ea84f93bea1345a89f098e02351c1a8deb12d9 .github/workflows/design-systems.yml
+cdaeca492f70e4eb8fe9663cf86718afc1e85f4c .github/workflows/extended-coordinates.yml
0a264ed0d3746e303bc7527a8cd896027300c47f .github/workflows/extended-desktop-test.yml
-a50ab3735dafa77d8281cf7e3907f724978f3824 .github/workflows/extended-foundation-macos.yml
+362dfe90cb673c941030bca17672c241a3e40ae9 .github/workflows/extended-foundation-macos.yml
8adf1f176b40f6fa65d5fb84516dfe21ae52dfdc .github/workflows/extended-foundation-text.yml
1bb9da55216200dc8bc6f43d63b3cf9b18c76b5c .github/workflows/extended-packaging.yml
c489d6b9cc0125393c7046ec68d1c9bf2613c724 .github/workflows/extended-pointericon-test.yml
-3f3033e0037d35abbb00221325240015a099ed30 .github/workflows/extended-public-api.yml
-27162e79c3f8f6f202fbdc74b7c41fe2ebe8e03b .github/workflows/extended-skiko-awt-free.yml
+52cfcc117590fe697c0baf84b21433678fb4c4b8 .github/workflows/extended-public-api.yml
+4920b125cd1197f50230a860f57507def41f7f7f .github/workflows/extended-publish-local.yml
+82279fa49160124fe91fb688eb74f360b739c036 .github/workflows/extended-publish.yml
+7a4ed72e43124e2971c9964cda64884c7f22ae1c .github/workflows/extended-skiko-awt-free.yml
+c124322aec986f37fb0741bb911ebe4ab706b5f6 .github/workflows/extended-skiko-awt-jar.yml
1c7c99a2152edb15911d90ab4de153fb08c72cdd .github/workflows/extended-skiko-static.yml
-b26acaeb46f24bb73a4f3ca84de509598ba1942f .github/workflows/extended-window-common.yml
-f8593c179dcc9323db860a4fb105847981ab48f2 .github/workflows/extended-window-graalvm-linux.yml
-59dd7f474957dd3bed4d60985d48fbcaf5c9c64e .github/workflows/extended-window-graalvm-macos.yml
-03326c783483c358887846bed45fbcc178e3507d .github/workflows/extended-window-linux.yml
-389b3b65d04bfc8d49c781b677343d592bc0b058 .github/workflows/extended-window-macos.yml
-e23b228775cfe326691e2990bd4a800968f8d13d .github/workflows/extended-window-publish.yml
-daf84a107b41df119f738c670bce742363b0df58 .github/workflows/extended-window-scene.yml
+cd6b40c32d9f0fa8013a3d133a7a6276f6bcf0b7 .github/workflows/extended-window-common.yml
+1ee3da3c867d84af32e3b917369d2a63277d00cd .github/workflows/extended-window-graalvm-linux.yml
+dfc528b9eebf03b6a13dc8685f7e135cfd87226f .github/workflows/extended-window-graalvm-macos.yml
+0a57068c1be8aa09b8eb252e470ede1e2d48c31f .github/workflows/extended-window-linux.yml
+680b471cdc4a8c2285f332450fe35ef716a3c5de .github/workflows/extended-window-macos.yml
+cbf6d898b5d2805df3d0d3722782f463919920a7 .github/workflows/extended-window-publish.yml
+f701a6b7878390de49bae8dc75356bbc63f00a0d .github/workflows/extended-window-scene.yml
+5d03ea1e2042ae011c4d1ee94c062c47c27174c0 .github/workflows/extended-window-windows-shared.yml
+0fc78de0a35afe43705c3a37e9788ada8f52a404 buildSrc-tests/src/test/java/androidx/build/VersionTest.kt
+031817243c3ab9f48394ae288aceea3c2999bb0f buildSrc-tests/src/test/java/org/jetbrains/androidx/build/JetBrainsPublicationTest.kt
+04c6e5b91c0e7ee81cb294a72cd4cf3178495869 buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsCapabilityRule.kt
+e2745610240f448b4257d76ae6ef5ad3d5cbab8b buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsMavenCoordinatesChanger.kt
+c12bcda6a1674830f32055bafd9500e2945405ef buildSrc/public/src/main/kotlin/androidx/build/Version.kt
+645bf724219aa459388df94bbaccc8e6230f812a buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsPublication.kt
+c981513296444a15dfe32579ccdb82fb00435c9f buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsVersionsService.kt
f23e9bccb013b0d29997accc1cfc9bca6f72d083 buildSrc/repos.gradle
680eab84686e82520a22dcfc44400d3107adb961 compose/animation/animation-core/build.gradle
c6f9e44ee9f95de7dbfbb9aee1fb0931487b4b10 compose/animation/animation-core/src/linuxMain/kotlin/androidx/compose/animation/core/Expect.linux.kt
d5513f4f908e5da84f5e6138a52b9b7943a6823f compose/animation/animation-core/src/mingwMain/kotlin/androidx/compose/animation/core/Expect.mingw.kt
-7a1480b91fa4b8c27e0aa3064e7a0cfaa6bce814 compose/animation/animation-graphics/build.gradle
+db7367bbf6184d35b31e11d410c5254833ef60fb compose/animation/animation-graphics/build.gradle
700b779b121a6b4e34b72c4a3a51bf4c971106d6 compose/animation/animation/build.gradle
ba7568eee6f36b55f9684ac0998fb8752ef48500 compose/foundation/foundation-layout/build.gradle
9ecc078ef19d2391e3f5655110f49a810dd85c75 compose/foundation/foundation/build.gradle
8e8eb7a4b58fb98b49ed21e57778bcdb37bd99e3 compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/MultiParagraphLayoutCache.kt
bea85f2b5b496240934e2304c2993e417aeeb348 compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/ParagraphLayoutCache.kt
-bb687fabeb9c2672272d8f02ed1281c6c1456f8d compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/internal/AwtClipEntry.desktop.kt
+1504262993cfd556623dd082e6f7bfe34504c03f compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/gestures/DesktopScrollable.desktop.kt
+8aa8f87195a378f1153f2928d58fbe308bc88a5e compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/internal/AwtClipEntry.desktop.kt
51d71999ff4b80ac51dcb39e31709abf27ff89df compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/internal/ClipboardUtils.desktop.kt
20f3bb1e976cde383ece19bb5c72efa8b962513d compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/internal/PlainTextClipEntry.desktop.kt
+f9add022e88b9346fc6538d5907caf1dc4a3df0b compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/text/KeyEventHelpers.desktop.kt
0c34b7cfa925d2e959a03ac46678029d49907a5a compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/text/input/internal/selection/TextFieldSelectionState.desktop.kt
40dafa8b03ef1ead013cd7a240434226a6ab8f25 compose/foundation/foundation/src/desktopTest/kotlin/androidx/compose/foundation/internal/AwtFreeClipEntryTest.desktop.kt
1ca98578603e66c5eb984e3e9bb89aa058ca4f15 compose/foundation/foundation/src/iosMain/kotlin/androidx/compose/foundation/text/contextmenu/internal/ProvideDefaultPlatformTextContextMenuProviders.ios.kt
@@ -70,10 +85,11 @@ c18b81002f5757db28ba51637e509cf0e5559d2d compose/foundation/foundation/src/linux
8c0054a7c171d6e10c976c3bc2005d72e3991051 compose/foundation/foundation/src/linuxMain/kotlin/androidx/compose/foundation/text/selection/SelectionHandles.linux.kt
5d74a80d73414bc5fe0655695267286d8de10ce5 compose/foundation/foundation/src/linuxMain/kotlin/androidx/compose/foundation/text/selection/SelectionManager.linux.kt
67357fb069b13841572424e6544fc745ef5be7c4 compose/foundation/foundation/src/linuxMain/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionManager.linux.kt
-29fa07e4f1926329832af050ae179282c1108033 compose/foundation/foundation/src/macosMain/kotlin/androidx/compose/foundation/text/contextmenu/internal/ProvideDefaultPlatformTextContextMenuProviders.macos.kt
+e9bec593d0cf02c9288fd3a91a2001fe412effc2 compose/foundation/foundation/src/macosMain/kotlin/androidx/compose/foundation/text/contextmenu/internal/ProvideDefaultPlatformTextContextMenuProviders.macos.kt
3918e2591cd12bfaaf218d93286aac8cf3eba908 compose/foundation/foundation/src/macosMain/kotlin/androidx/compose/foundation/text/input/internal/selection/TextFieldSelectionState.macos.kt
e734071cd081440d716c096a7c0c09f8cf442abd compose/foundation/foundation/src/macosMain/kotlin/androidx/compose/foundation/text/selection/SelectionManager.macos.kt
67357fb069b13841572424e6544fc745ef5be7c4 compose/foundation/foundation/src/macosMain/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionManager.macos.kt
+8cb941931a9a0a474ec57269432d78f03413787b compose/foundation/foundation/src/macosTest/kotlin/androidx/compose/foundation/text/contextmenu/MacosTextContextMenuProviderTest.kt
549c24ebb7d466e9b6afdcb4673f055c94b039fe compose/foundation/foundation/src/macosTest/kotlin/androidx/compose/foundation/text/contextmenu/internal/MenuLocationTest.kt
8840943dfa742c17b41315a09368a1420a78c14e compose/foundation/foundation/src/mingwMain/kotlin/androidx/compose/foundation/Clickable.mingw.kt
d79b2c666175d2343cbbd4c1044e2a2c2b2775a7 compose/foundation/foundation/src/mingwMain/kotlin/androidx/compose/foundation/Overscroll.mingw.kt
@@ -104,15 +120,16 @@ c18b81002f5757db28ba51637e509cf0e5559d2d compose/foundation/foundation/src/mingw
f5f80a51d0d61060a5697e7226e89de492fc634f compose/foundation/foundation/src/nativeMain/kotlin/androidx/compose/foundation/text/NativeTextContextMenuItems.native.kt
- compose/foundation/foundation/src/nativeMain/kotlin/androidx/compose/foundation/text/contextmenu/internal/ProvideDefaultPlatformTextContextMenuProviders.native.kt
407536ee80fb380a80816adb9de13b1d1f9cf466 compose/foundation/foundation/src/skikoTest/kotlin/androidx/compose/foundation/text/modifiers/LayoutCacheWidthChangeTest.kt
-9f6b6a928e009b5a97b9bf09b3f590906485c4c0 compose/material/material-navigation/build.gradle
+4ea28f54e2544b76927d0777e50560689c14224a compose/gradle.properties
+e58882de663660ba551b20821f9cd4ab1e110455 compose/material/material-navigation/build.gradle
a93c71739aaa1cc9dbb811918beb80d1bda81246 compose/material/material-ripple/build.gradle
fc56acdeb9af68f4a1b21e2127cac46af6ecaf32 compose/material/material/build.gradle
-ef397676ae85f62127f64ee9f2e145240033fbc5 compose/material3/adaptive/adaptive-layout/build.gradle
-50e3f5dcc71b2fbcf05128949536d8374bad9834 compose/material3/adaptive/adaptive-navigation/build.gradle
-9171128f59cd0b8cb49c22b70bc90f48217b39b2 compose/material3/adaptive/adaptive-navigation3/build.gradle
-2de0805c13e39bad966c4a1f5d96ba3a8a1dbbb9 compose/material3/adaptive/adaptive/build.gradle
-4a3e4cc705f307120417c4a06aa19d3fad7e5011 compose/material3/material3-adaptive-navigation-suite/build.gradle
-55e535505b5e7a9d4b021a5eb138b062fed7e2af compose/material3/material3-window-size-class/build.gradle
+94a3b18bc9ea79cd82b4282d6d7bdf477d94872e compose/material3/adaptive/adaptive-layout/build.gradle
+49d4951f177a6b72f56b97a93fbb7eb125d91fd2 compose/material3/adaptive/adaptive-navigation/build.gradle
+56470e57c6420b60aa577bbc039e7300de0c6e36 compose/material3/adaptive/adaptive-navigation3/build.gradle
+18c29a9060f58f3db7d7653974db6e74790d56dc compose/material3/adaptive/adaptive/build.gradle
+77732fe0e45c57a27507a195cac30206ff12c615 compose/material3/material3-adaptive-navigation-suite/build.gradle
+77f18554dc3bc7119843db9e09ad05f15cdf8454 compose/material3/material3-window-size-class/build.gradle
b13b3fb5f3202838205f8ed4087a1b6b4e12562d compose/material3/material3/build.gradle
f159af9724cc5b46d5835d2e623637238f0f2ff4 compose/material3/material3/src/linuxMain/kotlin/androidx/compose/material3/CalendarLocale.linux.kt
1acc2a22a520526bfde7044d2fe244c31248eaa7 compose/material3/material3/src/linuxMain/kotlin/androidx/compose/material3/internal/PlatformDateFormat.linux.kt
@@ -138,15 +155,17 @@ aaea411b48cb0bb2833d8ac5ab5c343c0bb6ac7c compose/ui/ui-text/src/mingwMain/kotlin
3c18e041e05beb44e2e4a3694bf3595ba2d186cb compose/ui/ui-util/src/mingwMain/kotlin/androidx/compose/ui/util/Trace.mingw.kt
f863e4dd433da53c552e170104132df0365af1c8 compose/ui/ui/build.gradle
18ed6c46a212ec2f55dc2ac0ed9c702b90d207b2 compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/Actuals.desktop.kt
-b263924bd292b6efc7d7a0ea31a64c1c46f8da74 compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/awt/AwtEvents.desktop.kt
+818ac970379ad6d1e8b54de4bd239a789364c69e compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/awt/AwtEvents.desktop.kt
+846cca7af44cd53ff58daae28a090293d5218a03 compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/input/key/Key.desktop.kt
209a2da00df207d81df4299fc038038960de8050 compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/input/pointer/PointerIcon.desktop.kt
-b6d6c4e97ff664126c5d99d5718f273b7eed5379 compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/internal/ExtendedMainDispatcher.desktop.kt
-c93c963f54c49c0120b7d4afcf9464bb7ed77c61 compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/internal/ExtendedPointerIcon.desktop.kt
+4e8c8941b2a50ab30b2fe7af92ea533c11116b1a compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/internal/ExtendedAwt.desktop.kt
+e95b4925270330cc105c0982507a8e7412efd3c7 compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/internal/ExtendedMainDispatcher.desktop.kt
+694caf0dd98eb9a38bee6569c2af65279d66bcc3 compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/internal/ExtendedPointerIcon.desktop.kt
e169679b0545acbf9aa1f00549b98ffe43134a12 compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/platform/GlobalSnapshotManager.desktop.kt
-3a23e117dd184d8afe892b976d34e470a28a18e8 compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/platform/PlatformClipboard.desktop.kt
+3dcb3814e764cbfe77127c7edadd6188b9b2b0fc compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/platform/PlatformClipboard.desktop.kt
16fd9b4b892e79bebc7afadb8ded43dea80f2914 compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/scene/ComposeSceneMediator.desktop.kt
7f93b20ffef469e8eeab3734c4d17ab1c751ec89 compose/ui/ui/src/desktopTest/kotlin/androidx/compose/ui/input/pointer/AwtFreePointerIconTest.kt
-26e45beea8b9c5f73ed05ed7b6c053e9f5261ec2 compose/ui/ui/src/desktopTest/kotlin/androidx/compose/ui/internal/AwtFreeMainDispatcherTest.desktop.kt
+3b4931c9026dae84c49ff7d55f76e95bc413aa0a compose/ui/ui/src/desktopTest/kotlin/androidx/compose/ui/internal/AwtFreeMainDispatcherTest.desktop.kt
eeaec03f8a4073efee2a60f9cc6b436d5e537726 compose/ui/ui/src/linuxMain/kotlin/androidx/compose/ui/draganddrop/DragAndDrop.linux.kt
44eebf07eee639ae79e188306d42f9d98e587334 compose/ui/ui/src/linuxMain/kotlin/androidx/compose/ui/focus/Focusability.linux.kt
f3afc0c0a72dec78adf071a396391881594938d3 compose/ui/ui/src/linuxMain/kotlin/androidx/compose/ui/input/key/Key.linux.kt
@@ -165,8 +184,22 @@ bc40e3295a52eb28baa931e79a34d6780cb75442 compose/ui/ui/src/mingwMain/kotlin/andr
90836b3cb58d0690ee195ec62eaebf2f4562d3ab compose/ui/ui/src/mingwMain/kotlin/androidx/compose/ui/viewinterop/InteropView.mingw.kt
ba3c1e00f09aad1f8c4ff93e3a39f96f4bc2cb96 compose/ui/ui/src/nativeMain/kotlin/androidx/compose/ui/platform/GlobalSnapshotManager.native.kt
bcf2202586cfd254460a0ea9f1a7e215bf0414fc compose/ui/ui/src/nonJvmMain/kotlin/androidx/compose/ui/Actuals.nonJvm.kt
-1bb4677123d8587c4cf96be98fc1274245a60c08 extended/README.md
-1eef04bbd7313ce09c1084fd36bd35d4ed88f50d extended/README_ko.md
+2db999c05fa029e34ac8104638489c519eeecab1 extended/CHANGELOG.md
+0620d39af696f88e32f9d5be705335878b7e2218 extended/CHANGELOG_ko.md
+6a3ade1d0c71baca3056fb6b3fa106a28eb46e68 extended/COORDINATES.md
+0cb3ac8817e6b9a7f653468ab4acddfa076233a9 extended/README.md
+bfb165ec45119d3562260cd25952394eca017c4a extended/README_ko.md
+442a3d02413f9c77f8428196de969bb63013af99 extended/compose/check-local.py
+ffc844e7fbab7016b17600b8d3a34a5c32c1c7e7 extended/compose/consumer-check/build.gradle.kts
+6faa509fb5a2ab0f86aa0e7d1f8442fae25c4dd4 extended/compose/consumer-check/gradle.properties
+8ac859fe1378ce47ad415049c31360b46322ea13 extended/compose/consumer-check/mingw-program/build.gradle.kts
+6faa509fb5a2ab0f86aa0e7d1f8442fae25c4dd4 extended/compose/consumer-check/mingw-program/gradle.properties
+20b5c8ffcf929ee78b5fa6e9a1ece873f009c4bd extended/compose/consumer-check/mingw-program/settings.gradle.kts
+08a3ee6996fb23f9d58680297ce161253e28f07e extended/compose/consumer-check/mingw-program/src/mingwX64Main/kotlin/check/Main.kt
+7a2384024ac0ec8342943027219367413510e317 extended/compose/consumer-check/settings.gradle.kts
+f327703f8af9f4d23c87931cbfe9f3f246e3cabc extended/compose/publish-local.init.gradle
+65a34314f080d4d2a3570b4ee1ffb09a4d4c4b3f extended/compose/publish-local.sh
+fc9114cb7a9728b055a8f237b7ddec9607208a71 extended/compose/tests/check-local.test.sh
c6a8386c8163f2346f936fb07f115b908aec005d extended/design-systems/.gitignore
9e567952e4800c87c42108e9f01fe2b01fa83d0c extended/design-systems/README.md
f32f3ec0f9fc6e01c90df8dec4a5d8e03d85ea97 extended/design-systems/breeze/module.yaml
@@ -225,125 +258,234 @@ b5f750f219d2e4304b9f7725adeea00ce873e358 extended/packaging/templates/AppxManife
b02c1f175f66d78170f02f591cb5572976850fb6 extended/packaging/templates/app.metainfo.xml.in
dd710128e60e64015a59572c7eb43760caa8b2c7 extended/packaging/templates/application.manifest.in
b29d1b01b49d519cb2298b83219237df51eff97a extended/packaging/templates/flatpak-manifest.json.in
+b9e8b3e284af4fb31698b6114ee85908a19d8859 extended/publish-local-all.sh
+39c3a85e1dc148e0de9af9299d1e293cfbf8b394 extended/publish/central-upload.sh
+1ec146b0a18907cbff753fac4711077020f6918d extended/publish/central_bundle.py
+7765c93f0d14f607a30f66590b61fb65f8000e4e extended/publish/check_targets.py
+0bbc0ab5557498db61472d3b75e8858e9e77d529 extended/publish/consumer/build.gradle.kts
+b547db5ead84a4d5766236defd10bed49c0c2a04 extended/publish/consumer/settings.gradle.kts
+ba04ee720ca6108db27b288f53692a5654b8d1e1 extended/publish/tests/central-bundle.test.sh
+edf4963538eaad731801feba6abe9a56546eb8f1 extended/publish/tests/check_targets_test.py
+532e932aba87153c85014efec3024ed8378afd24 extended/publish/throwaway-key.sh
f60869d75c481026e823037d4c6a75b074914368 extended/skiko/0001-mingw-x64-target.patch
-5bbb915bd00e0958b73a3e728c06b652e54b0819 extended/skiko/README.md
-548516fcb7c8f69d8f1fc9de56b32a03697aae74 extended/skiko/build-skiko-mingw.sh
-717c9d9573f4435c27a41a0fd08b333a08eb73bb extended/skiko/build-skiko-static-jvm.sh
+98d43829280e911deb7f5b32aa10c0d89ca49a48 extended/skiko/README.md
+e41aaa8f13c0b1c669c03a9e2204742d7c8d6b05 extended/skiko/awt/0001-awt-switch.patch
+95bc6d7726ab46c59bdc7ee5f0cf215f9b1b0147 extended/skiko/build-skiko-awt.sh
+fdd049f630dfefd77e6cc04a95ba04cf56d6b1ad extended/skiko/build-skiko-mingw.sh
+15c1ed08ebf3e28e15842e260cdf4e65a590ca47 extended/skiko/build-skiko-static-jvm.sh
710305a7ac975ebde413737dd6e444fa047b9982 extended/skiko/embedded_icu.cpp
4067ea3ab3d5afafcd76fa89a365194900504d22 extended/skiko/extend-skiko-root.py
+71fb5c82da4c0b633f6e6d28e03da583faa4eda7 extended/skiko/republish-skiko-awt.py
+63f10a62e07a4447b3727db7d994b7b142963224 extended/skiko/republish-skiko-mingw.py
9d424d6cf5bf930240f5aeb6158a58708afa553f extended/skiko/static_jawt.c
03db2672a61b1555986396a43b44c5ae393e467c extended/skiko/static_no_jawt.c
f8ac74889ef52398d6762dea1b862d5b2c98b880 extended/skiko/tests/LoaderCheck.java
+94345d41d2908567e26466d8608a5969796d94a1 extended/skiko/tests/republish-skiko-mingw.test.sh
c6a8386c8163f2346f936fb07f115b908aec005d extended/window/.gitignore
-c55bbcc21278779776887e92be3cc72b1628f588 extended/window/common/module.yaml
-27f4b08848b2d785aa7690847f317814c4c5ec14 extended/window/common/src/org/thisisthepy/compose/window/AccessibilityCache.kt
+bc2680893a6931b88e7635fff108c9e7b9d6dd0d extended/window/common/module.yaml
+80ef0c8aa26e86ba61a382beb89d9da830378da0 extended/window/common/src/org/thisisthepy/compose/window/AccessibilityCache.kt
d787c70f2c263d57452e9d518804f9151604a462 extended/window/common/src/org/thisisthepy/compose/window/CodePoints.kt
929c03acedd747df05ca67e4076a72031dcc5f64 extended/window/common/src/org/thisisthepy/compose/window/EditMenu.kt
+f830f3dbc494dcbd7b5b415abab2c19e9574cd95 extended/window/common/src/org/thisisthepy/compose/window/FrameClock.kt
88bbd619caa7e689d5e8943caaa63636e72ad521 extended/window/common/src/org/thisisthepy/compose/window/FrameRequests.kt
a5f3a2291f33022c2ab7020966a81b1afc4068be extended/window/common/src/org/thisisthepy/compose/window/ImeComposition.kt
+9d9c771a85b66df4def965a30d09a0246c1f39d1 extended/window/common/src/org/thisisthepy/compose/window/MacosAccessibility.kt
+d212d30e7d6012222676c7226ab513e7ba1d2d42 extended/window/common/src/org/thisisthepy/compose/window/MacosAxSnapshot.kt
2b9a710761982402bc781f5c7beae4d3f5cd85e7 extended/window/common/src/org/thisisthepy/compose/window/MacosCornerRadius.kt
+6888987ce19e53397fcf4c5e6f412f2e1302e491 extended/window/common/src/org/thisisthepy/compose/window/MacosTitleBar.kt
+58188c352e1c9cd3623b72951738c3165e3d768a extended/window/common/src/org/thisisthepy/compose/window/ResizeStats.kt
6a6742699ad38f7a84e0f45d328788446e52c288 extended/window/common/src/org/thisisthepy/compose/window/ResizeSync.kt
+06e519d62b7047bee7906f0b71f0989a53e80a57 extended/window/common/src/org/thisisthepy/compose/window/WindowChrome.kt
beec5775e0cfcef03ce7246a39db233471901ce2 extended/window/common/src/org/thisisthepy/compose/window/WindowEvent.kt
4dac77b20d7f4b237da36e8ba53ef2acd8b43dfa extended/window/common/src/org/thisisthepy/compose/window/WindowEventLog.kt
86a4ed2138f6186bfad81b664b58669731426840 extended/window/common/src/org/thisisthepy/compose/window/WindowFrames.kt
1e855d1604acb95924acb7ac6ceb7d093a9c879f extended/window/common/src/org/thisisthepy/compose/window/WindowParity.kt
-e9c8acdd82c578d5b311d9666a4a82e4a268ae74 extended/window/common/src/org/thisisthepy/compose/window/WindowPlatform.kt
+9256e6e615607b1e6ee8873452d9a35f3491ef57 extended/window/common/src/org/thisisthepy/compose/window/WindowPlatform.kt
96450b578e286cc51d4e8266a3e38cf142ba5a2d extended/window/common/src/org/thisisthepy/compose/window/WindowPolicy.kt
31517219f18a9329b4b7548ae74acd4e7daa72c3 extended/window/common/src/org/thisisthepy/compose/window/WindowSizeHints.kt
-e62888d14f3f297094537c76a7e6f30685642f58 extended/window/common/src/org/thisisthepy/compose/window/WindowState.kt
+775f44421e4a9bdf349b495c435d800116c6d195 extended/window/common/src/org/thisisthepy/compose/window/WindowState.kt
+b8be44bbb728772075a03b8b087de816f87a3fd5 extended/window/common/src/org/thisisthepy/compose/window/X11Chrome.kt
59a32de62f89cf3bd5c7e2fde6b5b53afbae22c1 extended/window/common/src/org/thisisthepy/compose/window/X11Keys.kt
+3e42370be81fa138449a495e97c1020875b58dfd extended/window/common/src/org/thisisthepy/compose/window/atspi/AtspiBridge.kt
+57b6455ece4aa50f17729f2a708c228e1d735a18 extended/window/common/src/org/thisisthepy/compose/window/atspi/AtspiModel.kt
+fce48d54c12803c3982213b0681a96c0fe034ac1 extended/window/common/src/org/thisisthepy/compose/window/atspi/AtspiServer.kt
+49caa1a9ab1294c7c10be8865a84c3d4100f198d extended/window/common/src/org/thisisthepy/compose/window/atspi/AtspiWindow.kt
+0bf930281aa3961fba413b64a1f2937f38301304 extended/window/common/src/org/thisisthepy/compose/window/atspi/AtspiWire.kt
+4ab0f0534bf012adae97614cb7f962a4724ef141 extended/window/common/src/org/thisisthepy/compose/window/atspi/DBusWire.kt
1f24f38ed087db380408c2e26e129b2b240c9109 extended/window/common/test/org/thisisthepy/compose/window/CommonTest.kt
+f2d3e1e4d3aa0b98de6907af52b1146080e290e7 extended/window/common/test/org/thisisthepy/compose/window/FrameClockTest.kt
af0257b36a3abeb3cc47c8cacc14d6a45d205b40 extended/window/common/test/org/thisisthepy/compose/window/LogicTest.kt
+7a4b9d073f50c0ebd675d43b70a2ac6101429e7d extended/window/common/test/org/thisisthepy/compose/window/MacosAccessibilityTest.kt
+0d595a7fda7173b59f3d85767bc1d4a07048ee74 extended/window/common/test/org/thisisthepy/compose/window/MacosAxSnapshotTest.kt
8e9f788476f3314a5d0369159e98cb967eb58e8c extended/window/common/test/org/thisisthepy/compose/window/MacosCornerRadiusTest.kt
+f1ff079319c0804d92d0e91e62da7121cbe5d43d extended/window/common/test/org/thisisthepy/compose/window/MacosTitleBarTest.kt
+d74ce36f9ab777f74cfa601f0b2dd8ede880a8d6 extended/window/common/test/org/thisisthepy/compose/window/ResizeStatsTest.kt
+989c0ab80eab0e01b13c3d97cf01dbc24c02a778 extended/window/common/test/org/thisisthepy/compose/window/WindowChromeTest.kt
fc340523b8c30b228ac8ca2cf425ee54d9309e74 extended/window/common/test/org/thisisthepy/compose/window/WindowParityTest.kt
5b304e22c3d4664d5bb436932bd81f9f22cad862 extended/window/common/test/org/thisisthepy/compose/window/WindowSizeHintsTest.kt
+cb4cb18a7153b4b545c873090f04c30fbadd8053 extended/window/common/test/org/thisisthepy/compose/window/X11ChromeTest.kt
18090e4222f3a6271224296135e611956f1983a4 extended/window/common/test/org/thisisthepy/compose/window/X11EventsTest.kt
ab48ed1ee0f65b16301b265ed49f3cb70951d637 extended/window/common/test/org/thisisthepy/compose/window/X11KeysTest.kt
-29e4b6b7b122146d2927e8102fb9aa6ef83cef23 extended/window/graalvm/graalvm-linux/c/x11_window.c
-357e10d587032e1df715e6d80cb338540b026758 extended/window/graalvm/graalvm-linux/module.yaml
-7bbd9dd50074e850ce0badb741e3afdad20b68fe extended/window/graalvm/graalvm-linux/src/org/thisisthepy/compose/window/graalvm/linux/X11Natives.kt
-290ccf75af5a3039299bff0deed40e332ec9d369 extended/window/graalvm/graalvm-linux/src/org/thisisthepy/compose/window/graalvm/linux/X11Policy.kt
+7a36ed249f75f886e3f94fa7f9ee416aa0b454dc extended/window/common/test/org/thisisthepy/compose/window/atspi/AtspiTest.kt
+439f4debdb86af6a7daad3ca8a395fd243ecd028 extended/window/compose.module-template.yaml
+a8d3c308690e369bda823fd78681090843ded1c7 extended/window/graalvm/graalvm-linux/c/x11_window.c
+80bcff5e8e0facc95cadb1bcfb7185b508aed737 extended/window/graalvm/graalvm-linux/module.yaml
+942622b0d22df0dd51f0bf93af902069173d4a88 extended/window/graalvm/graalvm-linux/src/org/thisisthepy/compose/window/graalvm/linux/GlWindowSurface.kt
+7caa9ec986e7d42f023f97346c9a0d6c117e226f extended/window/graalvm/graalvm-linux/src/org/thisisthepy/compose/window/graalvm/linux/JvmBusConnection.kt
+6aa4f45ec582ec4a7af2aa5729c74b5662129f5e extended/window/graalvm/graalvm-linux/src/org/thisisthepy/compose/window/graalvm/linux/X11Natives.kt
+6d19a3d23e3d54a7a29f379ef5976f4f2d0faa67 extended/window/graalvm/graalvm-linux/src/org/thisisthepy/compose/window/graalvm/linux/X11Policy.kt
5acf692b0585c2c7b2e6217f2c22159cf4e6e61e extended/window/graalvm/graalvm-linux/src/org/thisisthepy/compose/window/graalvm/linux/X11Upcalls.kt
-8b4542dc53519049f6822bfed74b997b7299aa94 extended/window/graalvm/graalvm-linux/src/org/thisisthepy/compose/window/graalvm/linux/X11Window.kt
-cbebeb195408d4bf88b06e9989974ea76661e7ee extended/window/graalvm/graalvm-linux/test/org/thisisthepy/compose/window/graalvm/linux/X11LayoutTest.kt
-ecd9eb6819b86be08bcbd0fb8a1068e0318bdb7f extended/window/graalvm/graalvm-linux/test/org/thisisthepy/compose/window/graalvm/linux/X11PlatformTest.kt
-33302560bdf53f10dad4d9e3b0dadbac5771b4c8 extended/window/graalvm/graalvm-macos/module.yaml
+8459a3d77ed841d298c3cec9608dab8cdc018532 extended/window/graalvm/graalvm-linux/src/org/thisisthepy/compose/window/graalvm/linux/X11Window.kt
+fef5e647ecec9389ca9e497f608b724387ea8bbb extended/window/graalvm/graalvm-linux/test/c/chrome_test.c
+b67b19ba4c8c4660cd5c6185138e44f8e91a26de extended/window/graalvm/graalvm-linux/test/c/resize_test.c
+dec2bbbe19656252008470460970283644430493 extended/window/graalvm/graalvm-linux/test/c/wake_latency_test.c
+eb52c4281869b6a45cb4f32ba001ad8e1ef29a0e extended/window/graalvm/graalvm-linux/test/c/wake_test.c
+ce713f7bb2619f442de497b7c40f2f565dec3f4a extended/window/graalvm/graalvm-linux/test/c/wm_resize_test.c
+80e1a3dab31c44a7b5bf8ea66030962c404b1a1e extended/window/graalvm/graalvm-linux/test/c/xdnd_drop_test.c
+aa0d323ff7310738fcb5a9e527dab24a7d3ea3e6 extended/window/graalvm/graalvm-linux/test/org/thisisthepy/compose/window/graalvm/linux/AtspiReadbackTest.kt
+95b687e1917017c8793e2886ecf779022431906b extended/window/graalvm/graalvm-linux/test/org/thisisthepy/compose/window/graalvm/linux/JvmBusConnectionTest.kt
+a47b0ecdec1220d5319ed369a8a4e7ffc6aff4c1 extended/window/graalvm/graalvm-linux/test/org/thisisthepy/compose/window/graalvm/linux/X11FrameTimeTest.kt
+36743f05859b6d8c5830edf338676adb2291b731 extended/window/graalvm/graalvm-linux/test/org/thisisthepy/compose/window/graalvm/linux/X11LayoutTest.kt
+a1120bdd74af72d7d02b968384c346b3def81b2a extended/window/graalvm/graalvm-linux/test/org/thisisthepy/compose/window/graalvm/linux/X11PlatformTest.kt
+5aac14888955de5566da070ee18cf8468296d6c2 extended/window/graalvm/graalvm-macos/module.yaml
+ca7015735fcb676a8ee9d215a59c7f189517014c extended/window/graalvm/graalvm-macos/native/appkit_accessibility.h
+c4b4197600b6c1cc27f52e90477505ee60e7606f extended/window/graalvm/graalvm-macos/native/appkit_frame_time.h
+b28d9388c32b884c1d13cfc811f9a506f4835f83 extended/window/graalvm/graalvm-macos/native/appkit_frame_time_test.c
1e264d15ae968877d55d65a9b7251b3b46933040 extended/window/graalvm/graalvm-macos/native/appkit_resize.h
-57a51b6a3149d8ec4e9bb45d681917c0d9225996 extended/window/graalvm/graalvm-macos/native/appkit_window.m
+047f062c6d0d82194d219eeabde294ad4ca7bf24 extended/window/graalvm/graalvm-macos/native/appkit_resize_soak.h
+49ab6cf439d2277ccb711bd6c1fd5590de1eca68 extended/window/graalvm/graalvm-macos/native/appkit_vresize_probe.h
+acf8d8f56426065615984748d82676a24038bb0b extended/window/graalvm/graalvm-macos/native/appkit_window.m
+c027db1a51d605cb80b7d3d4c8d27278641803ac extended/window/graalvm/graalvm-macos/native/appkit_window_test.m
+040d54e3a45969f51ae79a89785dae6f5db4a39a extended/window/graalvm/graalvm-macos/src/org/thisisthepy/compose/window/graalvm/macos/AccessibilityRecords.kt
e82b7bbd8e5bdbe660d0c516be832e30b81651ab extended/window/graalvm/graalvm-macos/src/org/thisisthepy/compose/window/graalvm/macos/AppKitUpcallSlots.kt
a28786c8d3f2099e63f54e27024f888f796bae18 extended/window/graalvm/graalvm-macos/src/org/thisisthepy/compose/window/graalvm/macos/AppKitUpcalls.java
-91e3d1b93fe629c53def7a1372f007f4ce261551 extended/window/graalvm/graalvm-macos/src/org/thisisthepy/compose/window/graalvm/macos/AppKitWindow.kt
-ba5379c94a0ae1aaf382b818342f0a981fa79892 extended/window/graalvm/graalvm-macos/src/org/thisisthepy/compose/window/graalvm/macos/AppKitWindowPlatform.kt
-7dc830af46e77d935ec839064c0431b59970e5f4 extended/window/graalvm/graalvm-macos/src/org/thisisthepy/compose/window/graalvm/macos/WindowTypes.kt
-467902a6f6683af79274a1947c122cabc2f6029e extended/window/graalvm/graalvm-macos/test/org/thisisthepy/compose/window/graalvm/macos/UpcallTableTest.kt
+dc018b88e782a679db8ad36f6a5bc170ccc15408 extended/window/graalvm/graalvm-macos/src/org/thisisthepy/compose/window/graalvm/macos/AppKitWindow.kt
+8212d995fa0a0c74244f3320b305f0d6b7818601 extended/window/graalvm/graalvm-macos/src/org/thisisthepy/compose/window/graalvm/macos/AppKitWindowPlatform.kt
+3568c8e3738f662514e7a8fee74314559a8b3553 extended/window/graalvm/graalvm-macos/src/org/thisisthepy/compose/window/graalvm/macos/MetalWindowSurface.kt
+e7545e1e5dcfe64f84b085781e4f6f7cc3104e64 extended/window/graalvm/graalvm-macos/src/org/thisisthepy/compose/window/graalvm/macos/WindowTypes.kt
+48550ae7142db644272778bd68008c62799206cf extended/window/graalvm/graalvm-macos/test/org/thisisthepy/compose/window/graalvm/macos/AccessibilityRecordsTest.kt
+0ec8ae361e3783f0abff76ed6d37771c67119c2f extended/window/graalvm/graalvm-macos/test/org/thisisthepy/compose/window/graalvm/macos/UpcallTableTest.kt
f78df96de041bd86557e1b8a9e14c28800b255fc extended/window/graalvm/graalvm-macos/tools/gen-upcalls.sh
ac356976bcf204f4269b40f5944bbbf6d9f37268 extended/window/graalvm/graalvm-macos/upcalls.txt
-85765b1d66a64926b7a6ec05ae41bb475511fa26 extended/window/kotlin
-4a87ebfdef5130fddef4d23f36e76007f9278059 extended/window/kotlin.bat
+35a9537ac8993678be8c50611b4c270374492333 extended/window/kotlin
+88331564e620f7a8d46b347677d35baedc91a535 extended/window/kotlin.bat
c10dff1b641a59567ce316705530a27f187f96fb extended/window/libs.versions.toml
+30b704cc2760fe67a65757ef061e16454662af41 extended/window/native/linux-scene/module.yaml
+2438847f257ab500dfaaca289b14c9f82d8c6af6 extended/window/native/linux-scene/src/X11WindowSurface.kt
+2a5638856b956961a695241831be7bdfa034378a extended/window/native/linux-scene/test/X11WindowSurfaceTest.kt
ae30ac3f5a0039b85da8d744dc6720e38da0c46a extended/window/native/linux/cinterop/include/dxc_langinfo.h
a54579f8645b40fe718e3564ecec71c16cd807cf extended/window/native/linux/cinterop/include/dxc_unix_socket.h
da620b1b6080a2a07324f54f0d4434840b14efb5 extended/window/native/linux/cinterop/langinfo.def
c5f57ddcd1246d84bcd39e6db48dac3ee1f62eaf extended/window/native/linux/cinterop/unixsocket.def
3c180bb2d644187885adf1731eb226cb07e88bda extended/window/native/linux/cinterop/x11.def
-a574738b0dcc12396a94cfc7b65e9c87a1a95081 extended/window/native/linux/module.yaml
-9e712be7964f537c628c2242a1be8af6140c7839 extended/window/native/linux/src/AtspiBridge.kt
-0b72db851ff3af787ba7898fb4a398310216c561 extended/window/native/linux/src/AtspiModel.kt
-12df1e3046d108f0e4147bcea9bdb1d3c4969938 extended/window/native/linux/src/AtspiSemantics.kt
-88e179f98ce9b1cf12c771629fbb9cabd85361c4 extended/window/native/linux/src/AtspiServer.kt
-ccdaa051a3c72c37d83e1d317d1aaab1fda0338f extended/window/native/linux/src/AtspiWire.kt
-39f89e13e2c2007f4dd8d31eda3697fe4f71c300 extended/window/native/linux/src/DBusWire.kt
-77bc22796472555fcfc2298d00f451c71a00ef55 extended/window/native/linux/src/GlSurface.kt
+c5f2fd698fceffcca09288757f11b62b15b494bd extended/window/native/linux/module.yaml
+e8f6890e89bc62415a91f26d0fa38792e71e91b1 extended/window/native/linux/src/GlSurface.kt
3dd443582747f464349ac46de27e74087ee9d355 extended/window/native/linux/src/InputMethod.kt
+820a8f58610920daa40b3c0c64076fbeecbd9d7e extended/window/native/linux/src/LinuxFileDrop.kt
9e308ac3b2f8367cfd70f58dd9a1027297c4b247 extended/window/native/linux/src/LinuxInput.kt
-fe32e5265e1e731b3c5647a406076a3538ee625f extended/window/native/linux/src/PosixBusConnection.kt
-52e8b904e20b97c21cdbe80f5423225c9569a6d1 extended/window/native/linux/src/X11Window.kt
+e39fe60f0c6110bc497b246c6a1a2fd9ca2db5e3 extended/window/native/linux/src/PosixBusConnection.kt
+7991088015595ade06a72eadbb61321808fe01a6 extended/window/native/linux/src/X11Window.kt
+efb3a684d9abfb77121d07c223efb84a8349cab7 extended/window/native/linux/src/XdndTarget.kt
022f356b6ae8543a75926a714476fa7f59cf37ea extended/window/native/linux/src/XimContext.kt
-3028726d4b1bc76316f87d24aa76b2afe3f7c938 extended/window/native/linux/test/AtspiTest.kt
+cbe5d66571cdf2439c0fcc9b81a4023b65debc73 extended/window/native/linux/test/AtspiReadbackTest.kt
+f6dc0994d0a40251504f29a55f832c47fc367c7d extended/window/native/linux/test/ChromeTest.kt
+d6e405efd66ee03078a96feeb33f9116334079ba extended/window/native/linux/test/FrameTimeTest.kt
dac9be8339cfec11511c7a72ab454070e83d6156 extended/window/native/linux/test/InputMethodTest.kt
674f306fc9efb449a7350d9d4eeb8c590304be77 extended/window/native/linux/test/LinuxInputTest.kt
-ef959a931824a607e6c1e331dd7fc603e6f48876 extended/window/native/linux/test/X11WindowTest.kt
-0692df35752546296f70326a3422499d717bba93 extended/window/native/macos/module.yaml
-2b4e547e35a9bff77b23ca9db3354f3725309e4b extended/window/native/macos/src/org/thisisthepy/compose/window/macos/AppKitAccessibility.kt
+06a0b0142bf5a077e49ec8faf9ecbe7b60b6b40b extended/window/native/linux/test/ScriptedResizeTest.kt
+422d2e1d1bfb81eb4d1bb2b25f826d39a3d590c3 extended/window/native/linux/test/WakeLatencyTest.kt
+e33c811f60599243dce296a0a85e89cef1e630fb extended/window/native/linux/test/WakeTest.kt
+a77a8dd990a9bd90155e966fd2716bba0f59eceb extended/window/native/linux/test/WmDragTest.kt
+d83c219dad6cabab89ac274c2da23de3d9c48ab0 extended/window/native/linux/test/X11WindowTest.kt
+b9ad59fb535891a0b86512f6284a3326c03cf02f extended/window/native/linux/test/XdndDropTest.kt
+6343160e3d52ee27cf13161847a2639698841105 extended/window/native/macos/module.yaml
+a193dc270735ba945284e5a1bc7e8968019669c9 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/AccessibilitySnapshot.kt
+d8a201126444954ed794191d0a91fe75e3bc757d extended/window/native/macos/src/org/thisisthepy/compose/window/macos/AppKitAccessibility.kt
+f8addce58af77063b77701f8ca961a528b62ecae extended/window/native/macos/src/org/thisisthepy/compose/window/macos/AppKitAccessibilityTree.kt
4da22802744c4dd46e3261e1f737a424c97f99c8 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/AppKitKeys.kt
+6ce5e7dbb7e2ac056d529412baadca9768611f9e extended/window/native/macos/src/org/thisisthepy/compose/window/macos/DragMetrics.kt
0ea953e6f30ed9849398e731ba123a5381145809 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/HeldButtons.kt
-977dfe0ccc003635d2d9f75e52a1c23bc5ebb89a extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacKeys.kt
+44fdb5cfa8cb9ec29dba34a585aeae3679f611e4 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacKeys.kt
39cd49a626bf2e33d628bf1c79d1e2e114941e55 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacosAppearance.kt
65397379ce005b54ac43515d2c7d7f1c81425c3c extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacosClipboard.kt
13271313f2ffd1bc1491c7267ccd9948026b42c6 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacosFileDrop.kt
11867ff15b233ef62f8b7a6d291c1d3efe7f4b51 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacosTextToolbar.kt
-ebbc834bd4d055bc60da06ecb39551141738924b extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacosWindow.kt
+9e8e13e76e376ba072515c64a4913268b62a2363 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacosWindow.kt
077328c0319ce61049a44f88803fca2de256bb58 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacosWindowChrome.kt
-d3f29aedfdf30c6419dab3efbebba73e8fa402a9 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacosWindowPlatform.kt
-933fbdaaeaa4ae415d79d62162eae5c51419d6f7 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MetalSurface.kt
-db596f5645c2ca92c21241a31a8ce37e5da3a242 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/ResizeMetrics.kt
+15624e45e10e245ac1396b7551ebcd3e8713dcfa extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacosWindowPlatform.kt
+50e35728e7ad226d3760457ea21c28fcc8ca8446 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MetalSurface.kt
+78c5554d41c5b864f0c8d62419e4d0ea8976141b extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MetalWindowSurface.kt
+6fc4dfecabe7a91abe38dc419dc05b51b8f1c169 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/ResizeMetrics.kt
+d4d12a21aa6e52c8c79b4bfdb09c337550ce6d39 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/ResizeSoak.kt
4687f06b41a42edd997ea04860a9dfc492ad02f6 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/TextContextMenu.kt
6f92bb6f5891c783c49949b290fd09282789f594 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/TextInputSession.kt
+ad5b6f2319bfd7ac78af497b20f0ed265bbe7ffd extended/window/native/macos/src/org/thisisthepy/compose/window/macos/VerticalResizeProbe.kt
25f801983a9c32eff60647ba1268a7a619f537c2 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/WindowCaption.kt
-2f57fe34382eedeaeb65b874296ca9ea1d73b9ef extended/window/native/macos/src/org/thisisthepy/compose/window/macos/WindowChrome.kt
+07779ff4d2966be65e6b0900349c20bad83e802b extended/window/native/macos/src/org/thisisthepy/compose/window/macos/WindowChrome.kt
d6b869e16576736f30112ef9fb25c78fc160282b extended/window/native/macos/src/org/thisisthepy/compose/window/macos/WindowParity.kt
+80862489244245784555f8670d16a19b4721cb7d extended/window/native/macos/test/AppKitAccessibilityTreeTest.kt
b156938aa1b7af53bac7181f1ebdf94351e21b60 extended/window/native/macos/test/AppKitKeysTest.kt
3ab7ee0a2c9b8b482e303c00c0e1622a3b8e4427 extended/window/native/macos/test/ContentOffsetTest.kt
+dda876b003e3283bdba3102b03d22600e17f2366 extended/window/native/macos/test/DragMetricsTest.kt
+652423ba8179fc1a70a1b6e0be038671d9d974c1 extended/window/native/macos/test/FrameTimeTest.kt
6800210ec85ba38665b769ba415bb4782cc22f6d extended/window/native/macos/test/HeldButtonsTest.kt
5cc68d2e4616517d56ab32fc9ee905f100806d6e extended/window/native/macos/test/MacKeysTest.kt
33ab0b290240fd4328eb0ca221c21857dcd6d7f3 extended/window/native/macos/test/MacosClipboardTest.kt
990e34134c9e5405ae50eb2e29ae2137377ec8a9 extended/window/native/macos/test/MacosWindowChromeTest.kt
-746d4d60c5c89386fcfb1c9964fe6d38e433a66a extended/window/native/macos/test/MacosWindowPlatformTest.kt
-0e346ba60af694aa9c1fa2ba0ff99ae877389126 extended/window/native/macos/test/MetalSurfaceTest.kt
-0fe39f857c9e97859f858bcec7e51ef3bbd937d3 extended/window/project.yaml
-cbf1a1232cce832119890783d205615bdc56ce7c extended/window/scene/module.yaml
-86497f4559ab26183d0aa0377f04c0d2ead2f1c6 extended/window/scene/src/org/thisisthepy/compose/window/scene/ComposeWindow.kt
+e4e5ceea2927ae51a7fdc9440812ab8a25c58c50 extended/window/native/macos/test/MacosWindowPlatformChromeTest.kt
+725bebad4cabb8b15516d596b7d4a8220854a2e5 extended/window/native/macos/test/MacosWindowPlatformTest.kt
+38458f01050d4e07222198b8f016374273cc6259 extended/window/native/macos/test/MacosWindowStartTest.kt
+718d5cb57aa2db28f91bda6089897a3dc8ab2fba extended/window/native/macos/test/MeasuringRunTest.kt
+b42701d4eb335de29b4081409aa5a307319fe910 extended/window/native/macos/test/MetalSurfaceTest.kt
+24cb1a74c3767eac51bfaf0bec2f4d490f0f98b9 extended/window/project.yaml
+4175907cbe47e931e8befe4ba8b970cabae7740f extended/window/scene/module.yaml
+ba7dd3c4b0fe791b210474d5321da0503d3678fc extended/window/scene/src/org/thisisthepy/compose/window/scene/ComposeWindow.kt
1eb807b56aff86eb737ba070c17c38fe2a68e24a extended/window/scene/src/org/thisisthepy/compose/window/scene/DrawnEditMenu.kt
0fe9785ac694cff01163289404f2ed770db09c37 extended/window/scene/src/org/thisisthepy/compose/window/scene/FrameDispatcher.kt
-7c3236cda556b8cae9e1a6c86539d62785e98df5 extended/window/scene/src/org/thisisthepy/compose/window/scene/SceneContext.kt
+b66de36d060f7936784195e0679424558a9d6666 extended/window/scene/src/org/thisisthepy/compose/window/scene/MainDispatcher.kt
+940b92c44118db681678cb4af39aaa6d7e2b6dd0 extended/window/scene/src/org/thisisthepy/compose/window/scene/SceneAccessibility.kt
+de763659a527c870cd33e513b9a496db6d000750 extended/window/scene/src/org/thisisthepy/compose/window/scene/SceneCaption.kt
+dfee08ea23501336d688668c096a628e078d8c96 extended/window/scene/src/org/thisisthepy/compose/window/scene/SceneContext.kt
f92f037b931ceb04c1ea52be577b9f5e6de0342f extended/window/scene/src/org/thisisthepy/compose/window/scene/SceneEditChords.kt
252ef2ee727400555b44bd32bc5afd20589fdad9 extended/window/scene/src/org/thisisthepy/compose/window/scene/SceneInput.kt
4b33c54cf055c4da3f7f0553fb5acc2e34cba3b0 extended/window/scene/src/org/thisisthepy/compose/window/scene/SceneKeys.kt
ff3d4883678516d56c299b97d07564e7e111169b extended/window/scene/src/org/thisisthepy/compose/window/scene/SceneTextInput.kt
-b9d6b9392a58fff2c8b33afda1d9cae4954a8baa extended/window/scene/test/org/thisisthepy/compose/window/scene/ComposeWindowHostTest.kt
+64421039d05527b33ba4caab637da17c4ab322e0 extended/window/scene/src@jvm/org/thisisthepy/compose/window/scene/MainDispatcher.jvm.kt
+15a01335ce6272343a4828047c86971fa7a276bb extended/window/scene/src@native/org/thisisthepy/compose/window/scene/MainDispatcher.native.kt
+5d82cfe71f3dd06525a3a1d12dd86ab66afaa891 extended/window/scene/test/org/thisisthepy/compose/window/scene/ComposeWindowHostTest.kt
+cfbc467b908ed6a0af1dcf6bc35d613af95d25d4 extended/window/scene/test/org/thisisthepy/compose/window/scene/FrameTimeTest.kt
+9125bc6ec8511adb18bc1366c70fa8fbcda385f8 extended/window/scene/test/org/thisisthepy/compose/window/scene/SceneAccessibilityTest.kt
e9e2d844942bd490423e26a73cc2c17f2b61a724 extended/window/scene/test/org/thisisthepy/compose/window/scene/SceneKeysTest.kt
+ca22df7a27f713b5820412e8ac4ccb1b89111dbf extended/window/scene/test@jvm/org/thisisthepy/compose/window/scene/MainDispatcherTest.kt
+651fead3de78d95c994be44c7de7d7fdee993d43 extended/window/scene/test@jvm/org/thisisthepy/compose/window/scene/TwoWindowsTest.kt
+601f65968a4de442e56a204d85b9508012bffb33 extended/window/scripts/atspi-readback.c
0b3330e1e4185f39e0d40dd0de679c4344c12841 extended/window/scripts/check-klib-names.sh
5d2b457847dd5eddc985ffe273d459325f657565 extended/window/scripts/check-macos-corner-radius.sh
43030dc980ce70b280fa5bb4da2a7eec79f05590 extended/window/scripts/check-no-private-api.sh
-2751345e0f0e8cf4b03588e55101a6a3c8e90891 gradle.properties
-45d0950315016187fd9d39949fe5c8e81cd2642f navigation/navigation-compose/build.gradle
+bcc86ed0bd23a1b22b4432a84af6cb156b1448ab extended/window/scripts/publish-native-linux.sh
+56f6c882d49dd3ad0076b4874be1f2d1f7de1287 extended/window/scripts/wm-chrome.sh
+08c769cce69203591ed8425029673201beadcc03 extended/window/scripts/wm-drag.sh
+aa5875517e2805e278901aa486a40bfe3f46c333 extended/window/windows-shared/README.md
+7a21a43479619630abac52e8db3af0d30bd075b1 extended/window/windows-shared/c/test/win32_shared_test.c
+1afe29ef166bbe72174092e57740634ea6e428fd extended/window/windows-shared/c/win32_caption.h
+56e4963612b54300abdc27252a747421f4e0c7f3 extended/window/windows-shared/c/win32_ime_text.h
+d6d1612142eeced256204f49974ddff3d70bb6cd extended/window/windows-shared/c/win32_notifications.c
+828eca700a5a89175e2fe38138fd9ba0671a962f extended/window/windows-shared/c/win32_resize.h
+043cc9f8274427b6c3e012e5f0e53594e67a9653 extended/window/windows-shared/c/win32_wheel.h
+9ff2e229abd6ea8737a6238d84ea4a2542782423 extended/window/windows-shared/c/win32_window.c
+c7bda235c5e6b64a13ae4175a9cd1e95191026f8 extended/window/windows-shared/cinterop/include/win32_window.h
+6c82f1b64382eb13f3a4c47b477117b658bbc7f0 extended/window/windows-shared/cinterop/win32_window.def
+d44b3aaf7afa95e3b91eb3ecdcf73b8cbcda3242 extended/window/windows-shared/module.yaml
+4ea5670c93174095548b0ef3d5382138984f8808 extended/window/windows-shared/src/org/thisisthepy/compose/window/windows/Win32NativeWindow.kt
+1768d8a118f2f793bb32f7984cdf70852f6232d1 extended/window/windows-shared/src/org/thisisthepy/compose/window/windows/Win32Records.kt
+80361f8962ddd9a1be2fc4a27cc578a388128cc5 extended/window/windows-shared/test/org/thisisthepy/compose/window/windows/Win32RecordsTest.kt
+6c134563dfbaf6ca3c08778f8086777fb08a6533 gradle.properties
+2e0aec0fbc9ec9e25ae72da58087c5e83d1df837 lifecycle/gradle.properties
+1d581935788a0f47e1c4d7bac3f2067809ee74c8 navigation/gradle.properties
+328a6f1bd4bfcb6d66c05ed89dc78445380f06d3 navigation/navigation-compose/build.gradle
+74d39626e21b565be8aee0e34ed5ea70a1c9bf74 navigation3/gradle.properties
+51a74ee79382fd0cf86c14fe29f38c00c12934d0 navigation3/navigation3-ui/build.gradle
+7e780a5616271a3bede1be65cde15e3726f9f494 navigationevent/gradle.properties
+9b3ed0904571773141a29717f4396cc6b3b31f53 performance/gradle.properties
+4990fa85e65971bbc708317e987d287640600a66 savedstate/gradle.properties
+5afce910ae236acbd8a0d8fd96c61c40c3cfb5f6 window/gradle.properties
diff --git a/renderer/scripts/compose-fork.changes b/renderer/scripts/compose-fork.changes
index e90b10bbc..a97e30401 100644
--- a/renderer/scripts/compose-fork.changes
+++ b/renderer/scripts/compose-fork.changes
@@ -16,31 +16,35 @@
#
# git diff --raw --no-renames --no-abbrev |
# awk '{ print ($5 == "D" ? "-" : $4), $6 }'
-e6bf249c38261a72debb8e1936c790d75fa3c4b8 .github/actions/fork-compose/action.yml
+186b395417b667862f41c1ffe900d68a9700a509 .github/actions/fork-compose/action.yml
10ea84f93bea1345a89f098e02351c1a8deb12d9 .github/workflows/design-systems.yml
-40452ed02fa0aa65b03846c86de539c49ec3718b .github/workflows/extended-coordinates.yml
+cdaeca492f70e4eb8fe9663cf86718afc1e85f4c .github/workflows/extended-coordinates.yml
0a264ed0d3746e303bc7527a8cd896027300c47f .github/workflows/extended-desktop-test.yml
362dfe90cb673c941030bca17672c241a3e40ae9 .github/workflows/extended-foundation-macos.yml
8adf1f176b40f6fa65d5fb84516dfe21ae52dfdc .github/workflows/extended-foundation-text.yml
1bb9da55216200dc8bc6f43d63b3cf9b18c76b5c .github/workflows/extended-packaging.yml
c489d6b9cc0125393c7046ec68d1c9bf2613c724 .github/workflows/extended-pointericon-test.yml
52cfcc117590fe697c0baf84b21433678fb4c4b8 .github/workflows/extended-public-api.yml
+4920b125cd1197f50230a860f57507def41f7f7f .github/workflows/extended-publish-local.yml
+82279fa49160124fe91fb688eb74f360b739c036 .github/workflows/extended-publish.yml
7a4ed72e43124e2971c9964cda64884c7f22ae1c .github/workflows/extended-skiko-awt-free.yml
-26aa0155c28c7909a05d7942b1a90a77cc528b2e .github/workflows/extended-skiko-awt-jar.yml
+c124322aec986f37fb0741bb911ebe4ab706b5f6 .github/workflows/extended-skiko-awt-jar.yml
1c7c99a2152edb15911d90ab4de153fb08c72cdd .github/workflows/extended-skiko-static.yml
-caa35fa45c7f606806d3f14fa0eea023fe94309e .github/workflows/extended-window-common.yml
-c826990774474984b6d805831ad2401945fe67bd .github/workflows/extended-window-graalvm-linux.yml
-d05dcf1682a8a74c71f92ac6c481ccadb99fe6a8 .github/workflows/extended-window-graalvm-macos.yml
-11aeca3e732efe15e32cb166992baaf0a1edbc0b .github/workflows/extended-window-linux.yml
-e2d4f4c604a5a95f3a0855b403ed5f10ade57926 .github/workflows/extended-window-macos.yml
-ef065872ff6e951bb4b92182f16bb166fe53ce8a .github/workflows/extended-window-publish.yml
-b2472337ff825fecefe8f3854b89588f71657c1a .github/workflows/extended-window-scene.yml
-1db821c392a19de3cb74f1d98f0a0ff5ac6a9925 buildSrc-tests/src/test/java/androidx/build/VersionTest.kt
+cd6b40c32d9f0fa8013a3d133a7a6276f6bcf0b7 .github/workflows/extended-window-common.yml
+1ee3da3c867d84af32e3b917369d2a63277d00cd .github/workflows/extended-window-graalvm-linux.yml
+dfc528b9eebf03b6a13dc8685f7e135cfd87226f .github/workflows/extended-window-graalvm-macos.yml
+0a57068c1be8aa09b8eb252e470ede1e2d48c31f .github/workflows/extended-window-linux.yml
+680b471cdc4a8c2285f332450fe35ef716a3c5de .github/workflows/extended-window-macos.yml
+cbf6d898b5d2805df3d0d3722782f463919920a7 .github/workflows/extended-window-publish.yml
+f701a6b7878390de49bae8dc75356bbc63f00a0d .github/workflows/extended-window-scene.yml
+5d03ea1e2042ae011c4d1ee94c062c47c27174c0 .github/workflows/extended-window-windows-shared.yml
+0fc78de0a35afe43705c3a37e9788ada8f52a404 buildSrc-tests/src/test/java/androidx/build/VersionTest.kt
031817243c3ab9f48394ae288aceea3c2999bb0f buildSrc-tests/src/test/java/org/jetbrains/androidx/build/JetBrainsPublicationTest.kt
04c6e5b91c0e7ee81cb294a72cd4cf3178495869 buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsCapabilityRule.kt
-5933a45bfea43f8c7ae5793ffab617f49ebe2cf3 buildSrc/public/src/main/kotlin/androidx/build/Version.kt
+e2745610240f448b4257d76ae6ef5ad3d5cbab8b buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsMavenCoordinatesChanger.kt
+c12bcda6a1674830f32055bafd9500e2945405ef buildSrc/public/src/main/kotlin/androidx/build/Version.kt
645bf724219aa459388df94bbaccc8e6230f812a buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsPublication.kt
-530f9c38ca819e1eaba7de4923bcfb90e3efb426 buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsVersionsService.kt
+c981513296444a15dfe32579ccdb82fb00435c9f buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsVersionsService.kt
f23e9bccb013b0d29997accc1cfc9bca6f72d083 buildSrc/repos.gradle
680eab84686e82520a22dcfc44400d3107adb961 compose/animation/animation-core/build.gradle
c6f9e44ee9f95de7dbfbb9aee1fb0931487b4b10 compose/animation/animation-core/src/linuxMain/kotlin/androidx/compose/animation/core/Expect.linux.kt
@@ -183,13 +187,22 @@ bc40e3295a52eb28baa931e79a34d6780cb75442 compose/ui/ui/src/mingwMain/kotlin/andr
90836b3cb58d0690ee195ec62eaebf2f4562d3ab compose/ui/ui/src/mingwMain/kotlin/androidx/compose/ui/viewinterop/InteropView.mingw.kt
ba3c1e00f09aad1f8c4ff93e3a39f96f4bc2cb96 compose/ui/ui/src/nativeMain/kotlin/androidx/compose/ui/platform/GlobalSnapshotManager.native.kt
bcf2202586cfd254460a0ea9f1a7e215bf0414fc compose/ui/ui/src/nonJvmMain/kotlin/androidx/compose/ui/Actuals.nonJvm.kt
-10bdb339a43c9e4a4bec8f6a5131617b808ce082 extended/COORDINATES.md
-3c74a78758e99e9a732065189158f035b3872570 extended/README.md
-0a80d157c0f6ed574883f5bfee9553656eba9949 extended/README_ko.md
-eb780dc6cf17461723f5f52bc6a95daded6a5d8d extended/compose/check-local.py
+2db999c05fa029e34ac8104638489c519eeecab1 extended/CHANGELOG.md
+0620d39af696f88e32f9d5be705335878b7e2218 extended/CHANGELOG_ko.md
+6a3ade1d0c71baca3056fb6b3fa106a28eb46e68 extended/COORDINATES.md
+0cb3ac8817e6b9a7f653468ab4acddfa076233a9 extended/README.md
+bfb165ec45119d3562260cd25952394eca017c4a extended/README_ko.md
+442a3d02413f9c77f8428196de969bb63013af99 extended/compose/check-local.py
+ffc844e7fbab7016b17600b8d3a34a5c32c1c7e7 extended/compose/consumer-check/build.gradle.kts
+6faa509fb5a2ab0f86aa0e7d1f8442fae25c4dd4 extended/compose/consumer-check/gradle.properties
+8ac859fe1378ce47ad415049c31360b46322ea13 extended/compose/consumer-check/mingw-program/build.gradle.kts
+6faa509fb5a2ab0f86aa0e7d1f8442fae25c4dd4 extended/compose/consumer-check/mingw-program/gradle.properties
+20b5c8ffcf929ee78b5fa6e9a1ece873f009c4bd extended/compose/consumer-check/mingw-program/settings.gradle.kts
+08a3ee6996fb23f9d58680297ce161253e28f07e extended/compose/consumer-check/mingw-program/src/mingwX64Main/kotlin/check/Main.kt
+7a2384024ac0ec8342943027219367413510e317 extended/compose/consumer-check/settings.gradle.kts
f327703f8af9f4d23c87931cbfe9f3f246e3cabc extended/compose/publish-local.init.gradle
-737e0b4df61bbe81ab3c641ae542726d1761cb92 extended/compose/publish-local.sh
-d4401a591e1ab4b96d78df3d9c06a2e957972a5f extended/compose/tests/check-local.test.sh
+65a34314f080d4d2a3570b4ee1ffb09a4d4c4b3f extended/compose/publish-local.sh
+fc9114cb7a9728b055a8f237b7ddec9607208a71 extended/compose/tests/check-local.test.sh
c6a8386c8163f2346f936fb07f115b908aec005d extended/design-systems/.gitignore
9e567952e4800c87c42108e9f01fe2b01fa83d0c extended/design-systems/README.md
f32f3ec0f9fc6e01c90df8dec4a5d8e03d85ea97 extended/design-systems/breeze/module.yaml
@@ -248,144 +261,228 @@ b5f750f219d2e4304b9f7725adeea00ce873e358 extended/packaging/templates/AppxManife
b02c1f175f66d78170f02f591cb5572976850fb6 extended/packaging/templates/app.metainfo.xml.in
dd710128e60e64015a59572c7eb43760caa8b2c7 extended/packaging/templates/application.manifest.in
b29d1b01b49d519cb2298b83219237df51eff97a extended/packaging/templates/flatpak-manifest.json.in
+b9e8b3e284af4fb31698b6114ee85908a19d8859 extended/publish-local-all.sh
+39c3a85e1dc148e0de9af9299d1e293cfbf8b394 extended/publish/central-upload.sh
+1ec146b0a18907cbff753fac4711077020f6918d extended/publish/central_bundle.py
+7765c93f0d14f607a30f66590b61fb65f8000e4e extended/publish/check_targets.py
+0bbc0ab5557498db61472d3b75e8858e9e77d529 extended/publish/consumer/build.gradle.kts
+b547db5ead84a4d5766236defd10bed49c0c2a04 extended/publish/consumer/settings.gradle.kts
+ba04ee720ca6108db27b288f53692a5654b8d1e1 extended/publish/tests/central-bundle.test.sh
+edf4963538eaad731801feba6abe9a56546eb8f1 extended/publish/tests/check_targets_test.py
+532e932aba87153c85014efec3024ed8378afd24 extended/publish/throwaway-key.sh
f60869d75c481026e823037d4c6a75b074914368 extended/skiko/0001-mingw-x64-target.patch
-5bbb915bd00e0958b73a3e728c06b652e54b0819 extended/skiko/README.md
+98d43829280e911deb7f5b32aa10c0d89ca49a48 extended/skiko/README.md
e41aaa8f13c0b1c669c03a9e2204742d7c8d6b05 extended/skiko/awt/0001-awt-switch.patch
-0f8bed32bc70a4ab5353bed78fa1d4d984e3285a extended/skiko/build-skiko-awt.sh
-762d088f48efc9cb3f3e10137e3cfa4015dd9761 extended/skiko/build-skiko-mingw.sh
+95bc6d7726ab46c59bdc7ee5f0cf215f9b1b0147 extended/skiko/build-skiko-awt.sh
+fdd049f630dfefd77e6cc04a95ba04cf56d6b1ad extended/skiko/build-skiko-mingw.sh
15c1ed08ebf3e28e15842e260cdf4e65a590ca47 extended/skiko/build-skiko-static-jvm.sh
710305a7ac975ebde413737dd6e444fa047b9982 extended/skiko/embedded_icu.cpp
4067ea3ab3d5afafcd76fa89a365194900504d22 extended/skiko/extend-skiko-root.py
+71fb5c82da4c0b633f6e6d28e03da583faa4eda7 extended/skiko/republish-skiko-awt.py
+63f10a62e07a4447b3727db7d994b7b142963224 extended/skiko/republish-skiko-mingw.py
9d424d6cf5bf930240f5aeb6158a58708afa553f extended/skiko/static_jawt.c
03db2672a61b1555986396a43b44c5ae393e467c extended/skiko/static_no_jawt.c
f8ac74889ef52398d6762dea1b862d5b2c98b880 extended/skiko/tests/LoaderCheck.java
+94345d41d2908567e26466d8608a5969796d94a1 extended/skiko/tests/republish-skiko-mingw.test.sh
c6a8386c8163f2346f936fb07f115b908aec005d extended/window/.gitignore
-190d72bbbda6d6b637672f5ad963cf81bba6a2dd extended/window/common/module.yaml
-27f4b08848b2d785aa7690847f317814c4c5ec14 extended/window/common/src/org/thisisthepy/compose/window/AccessibilityCache.kt
+bc2680893a6931b88e7635fff108c9e7b9d6dd0d extended/window/common/module.yaml
+80ef0c8aa26e86ba61a382beb89d9da830378da0 extended/window/common/src/org/thisisthepy/compose/window/AccessibilityCache.kt
d787c70f2c263d57452e9d518804f9151604a462 extended/window/common/src/org/thisisthepy/compose/window/CodePoints.kt
929c03acedd747df05ca67e4076a72031dcc5f64 extended/window/common/src/org/thisisthepy/compose/window/EditMenu.kt
f830f3dbc494dcbd7b5b415abab2c19e9574cd95 extended/window/common/src/org/thisisthepy/compose/window/FrameClock.kt
88bbd619caa7e689d5e8943caaa63636e72ad521 extended/window/common/src/org/thisisthepy/compose/window/FrameRequests.kt
a5f3a2291f33022c2ab7020966a81b1afc4068be extended/window/common/src/org/thisisthepy/compose/window/ImeComposition.kt
+9d9c771a85b66df4def965a30d09a0246c1f39d1 extended/window/common/src/org/thisisthepy/compose/window/MacosAccessibility.kt
+d212d30e7d6012222676c7226ab513e7ba1d2d42 extended/window/common/src/org/thisisthepy/compose/window/MacosAxSnapshot.kt
2b9a710761982402bc781f5c7beae4d3f5cd85e7 extended/window/common/src/org/thisisthepy/compose/window/MacosCornerRadius.kt
+6888987ce19e53397fcf4c5e6f412f2e1302e491 extended/window/common/src/org/thisisthepy/compose/window/MacosTitleBar.kt
+58188c352e1c9cd3623b72951738c3165e3d768a extended/window/common/src/org/thisisthepy/compose/window/ResizeStats.kt
6a6742699ad38f7a84e0f45d328788446e52c288 extended/window/common/src/org/thisisthepy/compose/window/ResizeSync.kt
+06e519d62b7047bee7906f0b71f0989a53e80a57 extended/window/common/src/org/thisisthepy/compose/window/WindowChrome.kt
beec5775e0cfcef03ce7246a39db233471901ce2 extended/window/common/src/org/thisisthepy/compose/window/WindowEvent.kt
4dac77b20d7f4b237da36e8ba53ef2acd8b43dfa extended/window/common/src/org/thisisthepy/compose/window/WindowEventLog.kt
86a4ed2138f6186bfad81b664b58669731426840 extended/window/common/src/org/thisisthepy/compose/window/WindowFrames.kt
1e855d1604acb95924acb7ac6ceb7d093a9c879f extended/window/common/src/org/thisisthepy/compose/window/WindowParity.kt
-ecbb0e62339d19093cefb7c6052e2c827359cd1b extended/window/common/src/org/thisisthepy/compose/window/WindowPlatform.kt
+9256e6e615607b1e6ee8873452d9a35f3491ef57 extended/window/common/src/org/thisisthepy/compose/window/WindowPlatform.kt
96450b578e286cc51d4e8266a3e38cf142ba5a2d extended/window/common/src/org/thisisthepy/compose/window/WindowPolicy.kt
31517219f18a9329b4b7548ae74acd4e7daa72c3 extended/window/common/src/org/thisisthepy/compose/window/WindowSizeHints.kt
-e62888d14f3f297094537c76a7e6f30685642f58 extended/window/common/src/org/thisisthepy/compose/window/WindowState.kt
+775f44421e4a9bdf349b495c435d800116c6d195 extended/window/common/src/org/thisisthepy/compose/window/WindowState.kt
+b8be44bbb728772075a03b8b087de816f87a3fd5 extended/window/common/src/org/thisisthepy/compose/window/X11Chrome.kt
59a32de62f89cf3bd5c7e2fde6b5b53afbae22c1 extended/window/common/src/org/thisisthepy/compose/window/X11Keys.kt
+3e42370be81fa138449a495e97c1020875b58dfd extended/window/common/src/org/thisisthepy/compose/window/atspi/AtspiBridge.kt
+57b6455ece4aa50f17729f2a708c228e1d735a18 extended/window/common/src/org/thisisthepy/compose/window/atspi/AtspiModel.kt
+fce48d54c12803c3982213b0681a96c0fe034ac1 extended/window/common/src/org/thisisthepy/compose/window/atspi/AtspiServer.kt
+49caa1a9ab1294c7c10be8865a84c3d4100f198d extended/window/common/src/org/thisisthepy/compose/window/atspi/AtspiWindow.kt
+0bf930281aa3961fba413b64a1f2937f38301304 extended/window/common/src/org/thisisthepy/compose/window/atspi/AtspiWire.kt
+4ab0f0534bf012adae97614cb7f962a4724ef141 extended/window/common/src/org/thisisthepy/compose/window/atspi/DBusWire.kt
1f24f38ed087db380408c2e26e129b2b240c9109 extended/window/common/test/org/thisisthepy/compose/window/CommonTest.kt
f2d3e1e4d3aa0b98de6907af52b1146080e290e7 extended/window/common/test/org/thisisthepy/compose/window/FrameClockTest.kt
af0257b36a3abeb3cc47c8cacc14d6a45d205b40 extended/window/common/test/org/thisisthepy/compose/window/LogicTest.kt
+7a4b9d073f50c0ebd675d43b70a2ac6101429e7d extended/window/common/test/org/thisisthepy/compose/window/MacosAccessibilityTest.kt
+0d595a7fda7173b59f3d85767bc1d4a07048ee74 extended/window/common/test/org/thisisthepy/compose/window/MacosAxSnapshotTest.kt
8e9f788476f3314a5d0369159e98cb967eb58e8c extended/window/common/test/org/thisisthepy/compose/window/MacosCornerRadiusTest.kt
+f1ff079319c0804d92d0e91e62da7121cbe5d43d extended/window/common/test/org/thisisthepy/compose/window/MacosTitleBarTest.kt
+d74ce36f9ab777f74cfa601f0b2dd8ede880a8d6 extended/window/common/test/org/thisisthepy/compose/window/ResizeStatsTest.kt
+989c0ab80eab0e01b13c3d97cf01dbc24c02a778 extended/window/common/test/org/thisisthepy/compose/window/WindowChromeTest.kt
fc340523b8c30b228ac8ca2cf425ee54d9309e74 extended/window/common/test/org/thisisthepy/compose/window/WindowParityTest.kt
5b304e22c3d4664d5bb436932bd81f9f22cad862 extended/window/common/test/org/thisisthepy/compose/window/WindowSizeHintsTest.kt
+cb4cb18a7153b4b545c873090f04c30fbadd8053 extended/window/common/test/org/thisisthepy/compose/window/X11ChromeTest.kt
18090e4222f3a6271224296135e611956f1983a4 extended/window/common/test/org/thisisthepy/compose/window/X11EventsTest.kt
ab48ed1ee0f65b16301b265ed49f3cb70951d637 extended/window/common/test/org/thisisthepy/compose/window/X11KeysTest.kt
-afe1013dd81c215a38284e954de8be0cea12af6b extended/window/compose.module-template.yaml
-f3074d45459f9822d2719ef160e0b58e96bef42c extended/window/graalvm/graalvm-linux/c/x11_window.c
-357e10d587032e1df715e6d80cb338540b026758 extended/window/graalvm/graalvm-linux/module.yaml
-7bbd9dd50074e850ce0badb741e3afdad20b68fe extended/window/graalvm/graalvm-linux/src/org/thisisthepy/compose/window/graalvm/linux/X11Natives.kt
+7a36ed249f75f886e3f94fa7f9ee416aa0b454dc extended/window/common/test/org/thisisthepy/compose/window/atspi/AtspiTest.kt
+439f4debdb86af6a7daad3ca8a395fd243ecd028 extended/window/compose.module-template.yaml
+a8d3c308690e369bda823fd78681090843ded1c7 extended/window/graalvm/graalvm-linux/c/x11_window.c
+80bcff5e8e0facc95cadb1bcfb7185b508aed737 extended/window/graalvm/graalvm-linux/module.yaml
+942622b0d22df0dd51f0bf93af902069173d4a88 extended/window/graalvm/graalvm-linux/src/org/thisisthepy/compose/window/graalvm/linux/GlWindowSurface.kt
+7caa9ec986e7d42f023f97346c9a0d6c117e226f extended/window/graalvm/graalvm-linux/src/org/thisisthepy/compose/window/graalvm/linux/JvmBusConnection.kt
+6aa4f45ec582ec4a7af2aa5729c74b5662129f5e extended/window/graalvm/graalvm-linux/src/org/thisisthepy/compose/window/graalvm/linux/X11Natives.kt
6d19a3d23e3d54a7a29f379ef5976f4f2d0faa67 extended/window/graalvm/graalvm-linux/src/org/thisisthepy/compose/window/graalvm/linux/X11Policy.kt
5acf692b0585c2c7b2e6217f2c22159cf4e6e61e extended/window/graalvm/graalvm-linux/src/org/thisisthepy/compose/window/graalvm/linux/X11Upcalls.kt
-8bca04ec4587beb05d00f5c05c153f97ed1f4107 extended/window/graalvm/graalvm-linux/src/org/thisisthepy/compose/window/graalvm/linux/X11Window.kt
+8459a3d77ed841d298c3cec9608dab8cdc018532 extended/window/graalvm/graalvm-linux/src/org/thisisthepy/compose/window/graalvm/linux/X11Window.kt
+fef5e647ecec9389ca9e497f608b724387ea8bbb extended/window/graalvm/graalvm-linux/test/c/chrome_test.c
+b67b19ba4c8c4660cd5c6185138e44f8e91a26de extended/window/graalvm/graalvm-linux/test/c/resize_test.c
+dec2bbbe19656252008470460970283644430493 extended/window/graalvm/graalvm-linux/test/c/wake_latency_test.c
+eb52c4281869b6a45cb4f32ba001ad8e1ef29a0e extended/window/graalvm/graalvm-linux/test/c/wake_test.c
+ce713f7bb2619f442de497b7c40f2f565dec3f4a extended/window/graalvm/graalvm-linux/test/c/wm_resize_test.c
80e1a3dab31c44a7b5bf8ea66030962c404b1a1e extended/window/graalvm/graalvm-linux/test/c/xdnd_drop_test.c
+aa0d323ff7310738fcb5a9e527dab24a7d3ea3e6 extended/window/graalvm/graalvm-linux/test/org/thisisthepy/compose/window/graalvm/linux/AtspiReadbackTest.kt
+95b687e1917017c8793e2886ecf779022431906b extended/window/graalvm/graalvm-linux/test/org/thisisthepy/compose/window/graalvm/linux/JvmBusConnectionTest.kt
a47b0ecdec1220d5319ed369a8a4e7ffc6aff4c1 extended/window/graalvm/graalvm-linux/test/org/thisisthepy/compose/window/graalvm/linux/X11FrameTimeTest.kt
-cbebeb195408d4bf88b06e9989974ea76661e7ee extended/window/graalvm/graalvm-linux/test/org/thisisthepy/compose/window/graalvm/linux/X11LayoutTest.kt
+36743f05859b6d8c5830edf338676adb2291b731 extended/window/graalvm/graalvm-linux/test/org/thisisthepy/compose/window/graalvm/linux/X11LayoutTest.kt
a1120bdd74af72d7d02b968384c346b3def81b2a extended/window/graalvm/graalvm-linux/test/org/thisisthepy/compose/window/graalvm/linux/X11PlatformTest.kt
-33302560bdf53f10dad4d9e3b0dadbac5771b4c8 extended/window/graalvm/graalvm-macos/module.yaml
+5aac14888955de5566da070ee18cf8468296d6c2 extended/window/graalvm/graalvm-macos/module.yaml
+ca7015735fcb676a8ee9d215a59c7f189517014c extended/window/graalvm/graalvm-macos/native/appkit_accessibility.h
c4b4197600b6c1cc27f52e90477505ee60e7606f extended/window/graalvm/graalvm-macos/native/appkit_frame_time.h
b28d9388c32b884c1d13cfc811f9a506f4835f83 extended/window/graalvm/graalvm-macos/native/appkit_frame_time_test.c
1e264d15ae968877d55d65a9b7251b3b46933040 extended/window/graalvm/graalvm-macos/native/appkit_resize.h
-ca1daeaa8f0d9c6e75dd0ee12352db4d7291a3fc extended/window/graalvm/graalvm-macos/native/appkit_window.m
+047f062c6d0d82194d219eeabde294ad4ca7bf24 extended/window/graalvm/graalvm-macos/native/appkit_resize_soak.h
+49ab6cf439d2277ccb711bd6c1fd5590de1eca68 extended/window/graalvm/graalvm-macos/native/appkit_vresize_probe.h
+acf8d8f56426065615984748d82676a24038bb0b extended/window/graalvm/graalvm-macos/native/appkit_window.m
+c027db1a51d605cb80b7d3d4c8d27278641803ac extended/window/graalvm/graalvm-macos/native/appkit_window_test.m
+040d54e3a45969f51ae79a89785dae6f5db4a39a extended/window/graalvm/graalvm-macos/src/org/thisisthepy/compose/window/graalvm/macos/AccessibilityRecords.kt
e82b7bbd8e5bdbe660d0c516be832e30b81651ab extended/window/graalvm/graalvm-macos/src/org/thisisthepy/compose/window/graalvm/macos/AppKitUpcallSlots.kt
a28786c8d3f2099e63f54e27024f888f796bae18 extended/window/graalvm/graalvm-macos/src/org/thisisthepy/compose/window/graalvm/macos/AppKitUpcalls.java
-e8c7f00c8cd80b5b0dc2865df3428cc2f0c387b0 extended/window/graalvm/graalvm-macos/src/org/thisisthepy/compose/window/graalvm/macos/AppKitWindow.kt
-b2013607d6ed0c23c780598148200617e631b7f3 extended/window/graalvm/graalvm-macos/src/org/thisisthepy/compose/window/graalvm/macos/AppKitWindowPlatform.kt
-7dc830af46e77d935ec839064c0431b59970e5f4 extended/window/graalvm/graalvm-macos/src/org/thisisthepy/compose/window/graalvm/macos/WindowTypes.kt
-467902a6f6683af79274a1947c122cabc2f6029e extended/window/graalvm/graalvm-macos/test/org/thisisthepy/compose/window/graalvm/macos/UpcallTableTest.kt
+dc018b88e782a679db8ad36f6a5bc170ccc15408 extended/window/graalvm/graalvm-macos/src/org/thisisthepy/compose/window/graalvm/macos/AppKitWindow.kt
+8212d995fa0a0c74244f3320b305f0d6b7818601 extended/window/graalvm/graalvm-macos/src/org/thisisthepy/compose/window/graalvm/macos/AppKitWindowPlatform.kt
+3568c8e3738f662514e7a8fee74314559a8b3553 extended/window/graalvm/graalvm-macos/src/org/thisisthepy/compose/window/graalvm/macos/MetalWindowSurface.kt
+e7545e1e5dcfe64f84b085781e4f6f7cc3104e64 extended/window/graalvm/graalvm-macos/src/org/thisisthepy/compose/window/graalvm/macos/WindowTypes.kt
+48550ae7142db644272778bd68008c62799206cf extended/window/graalvm/graalvm-macos/test/org/thisisthepy/compose/window/graalvm/macos/AccessibilityRecordsTest.kt
+0ec8ae361e3783f0abff76ed6d37771c67119c2f extended/window/graalvm/graalvm-macos/test/org/thisisthepy/compose/window/graalvm/macos/UpcallTableTest.kt
f78df96de041bd86557e1b8a9e14c28800b255fc extended/window/graalvm/graalvm-macos/tools/gen-upcalls.sh
ac356976bcf204f4269b40f5944bbbf6d9f37268 extended/window/graalvm/graalvm-macos/upcalls.txt
-85765b1d66a64926b7a6ec05ae41bb475511fa26 extended/window/kotlin
-4a87ebfdef5130fddef4d23f36e76007f9278059 extended/window/kotlin.bat
+35a9537ac8993678be8c50611b4c270374492333 extended/window/kotlin
+88331564e620f7a8d46b347677d35baedc91a535 extended/window/kotlin.bat
c10dff1b641a59567ce316705530a27f187f96fb extended/window/libs.versions.toml
+30b704cc2760fe67a65757ef061e16454662af41 extended/window/native/linux-scene/module.yaml
+2438847f257ab500dfaaca289b14c9f82d8c6af6 extended/window/native/linux-scene/src/X11WindowSurface.kt
+2a5638856b956961a695241831be7bdfa034378a extended/window/native/linux-scene/test/X11WindowSurfaceTest.kt
ae30ac3f5a0039b85da8d744dc6720e38da0c46a extended/window/native/linux/cinterop/include/dxc_langinfo.h
a54579f8645b40fe718e3564ecec71c16cd807cf extended/window/native/linux/cinterop/include/dxc_unix_socket.h
da620b1b6080a2a07324f54f0d4434840b14efb5 extended/window/native/linux/cinterop/langinfo.def
c5f57ddcd1246d84bcd39e6db48dac3ee1f62eaf extended/window/native/linux/cinterop/unixsocket.def
3c180bb2d644187885adf1731eb226cb07e88bda extended/window/native/linux/cinterop/x11.def
-741a283eebabaa6e42f0942d630ef7c8bddc80c7 extended/window/native/linux/module.yaml
-9e712be7964f537c628c2242a1be8af6140c7839 extended/window/native/linux/src/AtspiBridge.kt
-0b72db851ff3af787ba7898fb4a398310216c561 extended/window/native/linux/src/AtspiModel.kt
-12df1e3046d108f0e4147bcea9bdb1d3c4969938 extended/window/native/linux/src/AtspiSemantics.kt
-88e179f98ce9b1cf12c771629fbb9cabd85361c4 extended/window/native/linux/src/AtspiServer.kt
-ccdaa051a3c72c37d83e1d317d1aaab1fda0338f extended/window/native/linux/src/AtspiWire.kt
-39f89e13e2c2007f4dd8d31eda3697fe4f71c300 extended/window/native/linux/src/DBusWire.kt
-77bc22796472555fcfc2298d00f451c71a00ef55 extended/window/native/linux/src/GlSurface.kt
+c5f2fd698fceffcca09288757f11b62b15b494bd extended/window/native/linux/module.yaml
+e8f6890e89bc62415a91f26d0fa38792e71e91b1 extended/window/native/linux/src/GlSurface.kt
3dd443582747f464349ac46de27e74087ee9d355 extended/window/native/linux/src/InputMethod.kt
820a8f58610920daa40b3c0c64076fbeecbd9d7e extended/window/native/linux/src/LinuxFileDrop.kt
9e308ac3b2f8367cfd70f58dd9a1027297c4b247 extended/window/native/linux/src/LinuxInput.kt
-fe32e5265e1e731b3c5647a406076a3538ee625f extended/window/native/linux/src/PosixBusConnection.kt
-92ccb4de38876a37e11c3ae173989db09629cf18 extended/window/native/linux/src/X11Window.kt
+e39fe60f0c6110bc497b246c6a1a2fd9ca2db5e3 extended/window/native/linux/src/PosixBusConnection.kt
+7991088015595ade06a72eadbb61321808fe01a6 extended/window/native/linux/src/X11Window.kt
efb3a684d9abfb77121d07c223efb84a8349cab7 extended/window/native/linux/src/XdndTarget.kt
022f356b6ae8543a75926a714476fa7f59cf37ea extended/window/native/linux/src/XimContext.kt
-3028726d4b1bc76316f87d24aa76b2afe3f7c938 extended/window/native/linux/test/AtspiTest.kt
+cbe5d66571cdf2439c0fcc9b81a4023b65debc73 extended/window/native/linux/test/AtspiReadbackTest.kt
+f6dc0994d0a40251504f29a55f832c47fc367c7d extended/window/native/linux/test/ChromeTest.kt
d6e405efd66ee03078a96feeb33f9116334079ba extended/window/native/linux/test/FrameTimeTest.kt
dac9be8339cfec11511c7a72ab454070e83d6156 extended/window/native/linux/test/InputMethodTest.kt
674f306fc9efb449a7350d9d4eeb8c590304be77 extended/window/native/linux/test/LinuxInputTest.kt
-ef959a931824a607e6c1e331dd7fc603e6f48876 extended/window/native/linux/test/X11WindowTest.kt
+06a0b0142bf5a077e49ec8faf9ecbe7b60b6b40b extended/window/native/linux/test/ScriptedResizeTest.kt
+422d2e1d1bfb81eb4d1bb2b25f826d39a3d590c3 extended/window/native/linux/test/WakeLatencyTest.kt
+e33c811f60599243dce296a0a85e89cef1e630fb extended/window/native/linux/test/WakeTest.kt
+a77a8dd990a9bd90155e966fd2716bba0f59eceb extended/window/native/linux/test/WmDragTest.kt
+d83c219dad6cabab89ac274c2da23de3d9c48ab0 extended/window/native/linux/test/X11WindowTest.kt
b9ad59fb535891a0b86512f6284a3326c03cf02f extended/window/native/linux/test/XdndDropTest.kt
-8006e941395f026f65eb1d7ab896328d6b8e4d55 extended/window/native/macos/module.yaml
-2b4e547e35a9bff77b23ca9db3354f3725309e4b extended/window/native/macos/src/org/thisisthepy/compose/window/macos/AppKitAccessibility.kt
+6343160e3d52ee27cf13161847a2639698841105 extended/window/native/macos/module.yaml
+a193dc270735ba945284e5a1bc7e8968019669c9 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/AccessibilitySnapshot.kt
+d8a201126444954ed794191d0a91fe75e3bc757d extended/window/native/macos/src/org/thisisthepy/compose/window/macos/AppKitAccessibility.kt
+f8addce58af77063b77701f8ca961a528b62ecae extended/window/native/macos/src/org/thisisthepy/compose/window/macos/AppKitAccessibilityTree.kt
4da22802744c4dd46e3261e1f737a424c97f99c8 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/AppKitKeys.kt
+6ce5e7dbb7e2ac056d529412baadca9768611f9e extended/window/native/macos/src/org/thisisthepy/compose/window/macos/DragMetrics.kt
0ea953e6f30ed9849398e731ba123a5381145809 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/HeldButtons.kt
-977dfe0ccc003635d2d9f75e52a1c23bc5ebb89a extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacKeys.kt
+44fdb5cfa8cb9ec29dba34a585aeae3679f611e4 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacKeys.kt
39cd49a626bf2e33d628bf1c79d1e2e114941e55 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacosAppearance.kt
65397379ce005b54ac43515d2c7d7f1c81425c3c extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacosClipboard.kt
13271313f2ffd1bc1491c7267ccd9948026b42c6 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacosFileDrop.kt
11867ff15b233ef62f8b7a6d291c1d3efe7f4b51 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacosTextToolbar.kt
-2ce7f2b118748c7c15507b40e3b3abb78e438302 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacosWindow.kt
+9e8e13e76e376ba072515c64a4913268b62a2363 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacosWindow.kt
077328c0319ce61049a44f88803fca2de256bb58 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacosWindowChrome.kt
-4c4a336c0d32556fe58328bf81ba5e8aa8e2b49d extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacosWindowPlatform.kt
-a88a3835e65030895c038043fd791d9ddc615988 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MetalSurface.kt
+15624e45e10e245ac1396b7551ebcd3e8713dcfa extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MacosWindowPlatform.kt
+50e35728e7ad226d3760457ea21c28fcc8ca8446 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MetalSurface.kt
+78c5554d41c5b864f0c8d62419e4d0ea8976141b extended/window/native/macos/src/org/thisisthepy/compose/window/macos/MetalWindowSurface.kt
6fc4dfecabe7a91abe38dc419dc05b51b8f1c169 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/ResizeMetrics.kt
+d4d12a21aa6e52c8c79b4bfdb09c337550ce6d39 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/ResizeSoak.kt
4687f06b41a42edd997ea04860a9dfc492ad02f6 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/TextContextMenu.kt
6f92bb6f5891c783c49949b290fd09282789f594 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/TextInputSession.kt
+ad5b6f2319bfd7ac78af497b20f0ed265bbe7ffd extended/window/native/macos/src/org/thisisthepy/compose/window/macos/VerticalResizeProbe.kt
25f801983a9c32eff60647ba1268a7a619f537c2 extended/window/native/macos/src/org/thisisthepy/compose/window/macos/WindowCaption.kt
-2f57fe34382eedeaeb65b874296ca9ea1d73b9ef extended/window/native/macos/src/org/thisisthepy/compose/window/macos/WindowChrome.kt
+07779ff4d2966be65e6b0900349c20bad83e802b extended/window/native/macos/src/org/thisisthepy/compose/window/macos/WindowChrome.kt
d6b869e16576736f30112ef9fb25c78fc160282b extended/window/native/macos/src/org/thisisthepy/compose/window/macos/WindowParity.kt
+80862489244245784555f8670d16a19b4721cb7d extended/window/native/macos/test/AppKitAccessibilityTreeTest.kt
b156938aa1b7af53bac7181f1ebdf94351e21b60 extended/window/native/macos/test/AppKitKeysTest.kt
3ab7ee0a2c9b8b482e303c00c0e1622a3b8e4427 extended/window/native/macos/test/ContentOffsetTest.kt
+dda876b003e3283bdba3102b03d22600e17f2366 extended/window/native/macos/test/DragMetricsTest.kt
652423ba8179fc1a70a1b6e0be038671d9d974c1 extended/window/native/macos/test/FrameTimeTest.kt
6800210ec85ba38665b769ba415bb4782cc22f6d extended/window/native/macos/test/HeldButtonsTest.kt
5cc68d2e4616517d56ab32fc9ee905f100806d6e extended/window/native/macos/test/MacKeysTest.kt
33ab0b290240fd4328eb0ca221c21857dcd6d7f3 extended/window/native/macos/test/MacosClipboardTest.kt
990e34134c9e5405ae50eb2e29ae2137377ec8a9 extended/window/native/macos/test/MacosWindowChromeTest.kt
-746d4d60c5c89386fcfb1c9964fe6d38e433a66a extended/window/native/macos/test/MacosWindowPlatformTest.kt
+e4e5ceea2927ae51a7fdc9440812ab8a25c58c50 extended/window/native/macos/test/MacosWindowPlatformChromeTest.kt
+725bebad4cabb8b15516d596b7d4a8220854a2e5 extended/window/native/macos/test/MacosWindowPlatformTest.kt
38458f01050d4e07222198b8f016374273cc6259 extended/window/native/macos/test/MacosWindowStartTest.kt
-9bfbf134b9872c452bdd384a1b2b3419a1b5d440 extended/window/native/macos/test/MetalSurfaceTest.kt
-0fe39f857c9e97859f858bcec7e51ef3bbd937d3 extended/window/project.yaml
-21d96f855b62f55dd18a4efb800763592ea989a8 extended/window/scene/module.yaml
-39aa2d39bb31e37dedf6d82998103ae5dd8f517e extended/window/scene/src/org/thisisthepy/compose/window/scene/ComposeWindow.kt
+718d5cb57aa2db28f91bda6089897a3dc8ab2fba extended/window/native/macos/test/MeasuringRunTest.kt
+b42701d4eb335de29b4081409aa5a307319fe910 extended/window/native/macos/test/MetalSurfaceTest.kt
+24cb1a74c3767eac51bfaf0bec2f4d490f0f98b9 extended/window/project.yaml
+4175907cbe47e931e8befe4ba8b970cabae7740f extended/window/scene/module.yaml
+ba7dd3c4b0fe791b210474d5321da0503d3678fc extended/window/scene/src/org/thisisthepy/compose/window/scene/ComposeWindow.kt
1eb807b56aff86eb737ba070c17c38fe2a68e24a extended/window/scene/src/org/thisisthepy/compose/window/scene/DrawnEditMenu.kt
0fe9785ac694cff01163289404f2ed770db09c37 extended/window/scene/src/org/thisisthepy/compose/window/scene/FrameDispatcher.kt
-7c3236cda556b8cae9e1a6c86539d62785e98df5 extended/window/scene/src/org/thisisthepy/compose/window/scene/SceneContext.kt
+b66de36d060f7936784195e0679424558a9d6666 extended/window/scene/src/org/thisisthepy/compose/window/scene/MainDispatcher.kt
+940b92c44118db681678cb4af39aaa6d7e2b6dd0 extended/window/scene/src/org/thisisthepy/compose/window/scene/SceneAccessibility.kt
+de763659a527c870cd33e513b9a496db6d000750 extended/window/scene/src/org/thisisthepy/compose/window/scene/SceneCaption.kt
+dfee08ea23501336d688668c096a628e078d8c96 extended/window/scene/src/org/thisisthepy/compose/window/scene/SceneContext.kt
f92f037b931ceb04c1ea52be577b9f5e6de0342f extended/window/scene/src/org/thisisthepy/compose/window/scene/SceneEditChords.kt
252ef2ee727400555b44bd32bc5afd20589fdad9 extended/window/scene/src/org/thisisthepy/compose/window/scene/SceneInput.kt
4b33c54cf055c4da3f7f0553fb5acc2e34cba3b0 extended/window/scene/src/org/thisisthepy/compose/window/scene/SceneKeys.kt
ff3d4883678516d56c299b97d07564e7e111169b extended/window/scene/src/org/thisisthepy/compose/window/scene/SceneTextInput.kt
-b9d6b9392a58fff2c8b33afda1d9cae4954a8baa extended/window/scene/test/org/thisisthepy/compose/window/scene/ComposeWindowHostTest.kt
+64421039d05527b33ba4caab637da17c4ab322e0 extended/window/scene/src@jvm/org/thisisthepy/compose/window/scene/MainDispatcher.jvm.kt
+15a01335ce6272343a4828047c86971fa7a276bb extended/window/scene/src@native/org/thisisthepy/compose/window/scene/MainDispatcher.native.kt
+5d82cfe71f3dd06525a3a1d12dd86ab66afaa891 extended/window/scene/test/org/thisisthepy/compose/window/scene/ComposeWindowHostTest.kt
cfbc467b908ed6a0af1dcf6bc35d613af95d25d4 extended/window/scene/test/org/thisisthepy/compose/window/scene/FrameTimeTest.kt
+9125bc6ec8511adb18bc1366c70fa8fbcda385f8 extended/window/scene/test/org/thisisthepy/compose/window/scene/SceneAccessibilityTest.kt
e9e2d844942bd490423e26a73cc2c17f2b61a724 extended/window/scene/test/org/thisisthepy/compose/window/scene/SceneKeysTest.kt
+ca22df7a27f713b5820412e8ac4ccb1b89111dbf extended/window/scene/test@jvm/org/thisisthepy/compose/window/scene/MainDispatcherTest.kt
+651fead3de78d95c994be44c7de7d7fdee993d43 extended/window/scene/test@jvm/org/thisisthepy/compose/window/scene/TwoWindowsTest.kt
+601f65968a4de442e56a204d85b9508012bffb33 extended/window/scripts/atspi-readback.c
0b3330e1e4185f39e0d40dd0de679c4344c12841 extended/window/scripts/check-klib-names.sh
5d2b457847dd5eddc985ffe273d459325f657565 extended/window/scripts/check-macos-corner-radius.sh
43030dc980ce70b280fa5bb4da2a7eec79f05590 extended/window/scripts/check-no-private-api.sh
-19a038b692f7f4917fb6244e47191a6eddd45399 extended/window/scripts/publish-native-linux.sh
-200a32f345e2bfa404c4e05fc97f927980c3962c gradle.properties
+bcc86ed0bd23a1b22b4432a84af6cb156b1448ab extended/window/scripts/publish-native-linux.sh
+56f6c882d49dd3ad0076b4874be1f2d1f7de1287 extended/window/scripts/wm-chrome.sh
+08c769cce69203591ed8425029673201beadcc03 extended/window/scripts/wm-drag.sh
+aa5875517e2805e278901aa486a40bfe3f46c333 extended/window/windows-shared/README.md
+7a21a43479619630abac52e8db3af0d30bd075b1 extended/window/windows-shared/c/test/win32_shared_test.c
+1afe29ef166bbe72174092e57740634ea6e428fd extended/window/windows-shared/c/win32_caption.h
+56e4963612b54300abdc27252a747421f4e0c7f3 extended/window/windows-shared/c/win32_ime_text.h
+d6d1612142eeced256204f49974ddff3d70bb6cd extended/window/windows-shared/c/win32_notifications.c
+828eca700a5a89175e2fe38138fd9ba0671a962f extended/window/windows-shared/c/win32_resize.h
+043cc9f8274427b6c3e012e5f0e53594e67a9653 extended/window/windows-shared/c/win32_wheel.h
+9ff2e229abd6ea8737a6238d84ea4a2542782423 extended/window/windows-shared/c/win32_window.c
+c7bda235c5e6b64a13ae4175a9cd1e95191026f8 extended/window/windows-shared/cinterop/include/win32_window.h
+6c82f1b64382eb13f3a4c47b477117b658bbc7f0 extended/window/windows-shared/cinterop/win32_window.def
+d44b3aaf7afa95e3b91eb3ecdcf73b8cbcda3242 extended/window/windows-shared/module.yaml
+4ea5670c93174095548b0ef3d5382138984f8808 extended/window/windows-shared/src/org/thisisthepy/compose/window/windows/Win32NativeWindow.kt
+1768d8a118f2f793bb32f7984cdf70852f6232d1 extended/window/windows-shared/src/org/thisisthepy/compose/window/windows/Win32Records.kt
+80361f8962ddd9a1be2fc4a27cc578a388128cc5 extended/window/windows-shared/test/org/thisisthepy/compose/window/windows/Win32RecordsTest.kt
+6c134563dfbaf6ca3c08778f8086777fb08a6533 gradle.properties
2e0aec0fbc9ec9e25ae72da58087c5e83d1df837 lifecycle/gradle.properties
1d581935788a0f47e1c4d7bac3f2067809ee74c8 navigation/gradle.properties
328a6f1bd4bfcb6d66c05ed89dc78445380f06d3 navigation/navigation-compose/build.gradle
diff --git a/renderer/scripts/gate-platforms.sh b/renderer/scripts/gate-platforms.sh
index e65ff9ae6..aed77f3b9 100755
--- a/renderer/scripts/gate-platforms.sh
+++ b/renderer/scripts/gate-platforms.sh
@@ -69,7 +69,7 @@ has_x11() {
# The Windows Compose this module compiles against, as build-compose.sh publishes it. One
# module stands for the fourteen: they are published together or not at all.
has_mingw_compose() {
- [[ -d "$HOME/.m2/repository/org/jetbrains/compose/ui/ui-mingwx64" ]]
+ [[ -d "$HOME/.m2/repository/org/thisisthepy/compose/ui/ui-mingwx64" ]]
}
is_windows() {
diff --git a/renderer/scripts/publish-window.sh b/renderer/scripts/publish-window.sh
index 8614c0ef1..d5280d60d 100755
--- a/renderer/scripts/publish-window.sh
+++ b/renderer/scripts/publish-window.sh
@@ -4,7 +4,7 @@
# Usage: publish-window.sh
#
# The window code is the Compose fork's, at the commit build-compose.sh pins. The renderer
-# depends on it as org.thisisthepy.compose.window::0.1.0, so the modules are built
+# depends on it as org.thisisthepy.compose.window::1.11.1-ext.2, so the modules are built
# from that commit and published under ~/.m2 before the renderer is, the same way the patched
# Compose is. common is published on every machine. The GraalVM window modules and the scene
# they name are published wherever the fork's desktop Compose is in the local repository, which
@@ -39,6 +39,9 @@ fi
case "$(uname -s)" in
Darwin)
if [[ -d "$HOME/.m2/repository/org/thisisthepy/compose/ui/ui-macosarm64" ]]; then
+ # native/macos names ../../scene, so scene is published with it even on a Mac that
+ # has only the macosArm64 Compose and not the desktop one.
+ [[ " ${modules[*]} " == *" scene "* ]] || modules+=(scene)
modules+=(native/macos)
fi ;;
# The Windows window's Kotlin/Native layer, for mingwX64. Its C is compiled by MSVC from
@@ -87,13 +90,20 @@ case "$(uname -s)" in
rm -f "$window/common/module.yaml.orig"
;;
esac
-# The GraalVM modules need scene's JVM half alone, and nothing this renderer builds uses its
-# other platform (macosArm64, which would also need the fork's Compose for macosArm64), so
-# only the JVM half is built.
+# scene is built for the JVM, which the GraalVM window modules compile against, and on a Mac that
+# also has the fork's Compose for macosArm64 for macosArm64 as well, because native/macos depends
+# on it. The Linux and Windows layers do not: native/linux-scene is published by
+# publish-native-linux.sh with its own scene, and nothing else asks for scene's native halves.
if [[ " ${modules[*]} " == *" scene "* ]]; then
+ scene_platforms=()
+ # The JVM half compiles against the fork's desktop Compose, and the macosArm64 half against
+ # its macosArm64 Compose: each is built only where that Compose is in the local repository.
+ [[ -d "$HOME/.m2/repository/org/thisisthepy/compose/ui/ui-desktop" ]] && scene_platforms+=(jvm)
+ [[ " ${modules[*]} " == *" native/macos "* ]] && scene_platforms+=(macosArm64)
+ scene_platforms_list="$(IFS=,; echo "${scene_platforms[*]}" | sed 's/,/, /g')"
# A suffix for -i and the copy removed after, because BSD sed on macOS takes the next
# argument to -i as one.
- sed -i.orig 's/^ platforms: \[.*\]$/ platforms: [ jvm ]/' "$window/scene/module.yaml"
+ sed -i.orig "s/^ platforms: \\[.*\\]\$/ platforms: [ $scene_platforms_list ]/" "$window/scene/module.yaml"
rm -f "$window/scene/module.yaml.orig"
fi
# The PATH kotlin.bat runs with on Windows: System32 first, and none of Git's own directories
diff --git a/renderer/scripts/require-fork-artifacts.sh b/renderer/scripts/require-fork-artifacts.sh
index a4bfe383f..bd376f559 100755
--- a/renderer/scripts/require-fork-artifacts.sh
+++ b/renderer/scripts/require-fork-artifacts.sh
@@ -11,7 +11,7 @@
#
# Why this has to run first rather than letting the build fail: when the toolchain resolves one
# of those coordinates and the local repository does not have it, it asks the remote
-# repositories, fails with "Unable to download checksums of file foundation-1.11.1-ext.1.pom", and
+# repositories, fails with "Unable to download checksums of file foundation-1.11.1-ext.2.pom", and
# keeps that result in the renderer's own build directory (build/incremental.state). The entry is
# keyed on the coordinates and repositories alone, not on what ~/.m2 holds, so every later build
# replays it as up to date, even once ~/.m2 has the files, and nothing in the message says where
@@ -88,17 +88,13 @@ for module in "$@"; do
case "$group:$version" in
org.thisisthepy.compose.window*) continue ;;
org.thisisthepy.compose.*:"$compose_as"|org.thisisthepy.compose.*:"$material3_as") ;;
- org.jetbrains.skiko:"$skiko_as") ;;
*) continue ;;
esac
- case "$version" in
- "$skiko_as") ;;
- *) add_check "$version" "$variant" "$compose_fix" ;;
- esac
+ [[ "$group" == org.thisisthepy.compose.skiko ]] || add_check "$version" "$variant" "$compose_fix"
names=("$artifact")
# The desktop module publishes one jar per system (desktop-jvm--), not one per
# target, so its root is all there is to look for.
- if [[ -n "$variant" && "$group" == org.thisisthepy.compose.* && "$group" != org.thisisthepy.compose.desktop ]]; then
+ if [[ -n "$variant" && "$group" == org.thisisthepy.compose.* && "$group" != org.thisisthepy.compose.desktop && "$group" != org.thisisthepy.compose.skiko ]]; then
names+=("$artifact-$variant")
fi
for name in "${names[@]}"; do
@@ -106,7 +102,7 @@ for module in "$@"; do
for extension in pom module; do
if [[ ! -s "$directory/$name-$version.$extension" ]]; then
missing+=("${directory#"$repository"/}/$name-$version.$extension")
- if [[ "$group" == org.jetbrains.skiko ]]; then
+ if [[ "$group" == org.thisisthepy.compose.skiko ]]; then
add_fix "scripts/publish-skiko-awt.sh "
else
add_fix "$compose_fix"
@@ -114,7 +110,7 @@ for module in "$@"; do
fi
done
done
- done < <(sed -En 's/^[[:space:]]*-[[:space:]]*(org\.thisisthepy\.compose[A-Za-z0-9.]*|org\.jetbrains\.skiko):([A-Za-z0-9._-]+):([A-Za-z0-9._-]+)[[:space:]]*$/\1 \2 \3/p' "$module_file")
+ done < <(sed -En 's/^[[:space:]]*-[[:space:]]*(org\.thisisthepy\.compose[A-Za-z0-9.]*):([A-Za-z0-9._-]+):([A-Za-z0-9._-]+)[[:space:]]*$/\1 \2 \3/p' "$module_file")
done
# The files being there is half of it. A .pom or .module the fork published names its siblings
diff --git a/renderer/windows/module.yaml b/renderer/windows/module.yaml
index 12eff9a9d..b7f7e7644 100644
--- a/renderer/windows/module.yaml
+++ b/renderer/windows/module.yaml
@@ -36,27 +36,27 @@ repositories:
# `scripts/tests/windows-kotlin-native.test.sh` says so when the two stop agreeing.
dependencies:
- $compose.runtime
- - org.jetbrains.compose.animation:animation-mingwx64:1.11.1
- - org.jetbrains.compose.animation:animation-core-mingwx64:1.11.1
- - org.jetbrains.compose.foundation:foundation-mingwx64:1.11.1
- - org.jetbrains.compose.foundation:foundation-layout-mingwx64:1.11.1
- - org.jetbrains.compose.material:material-ripple-mingwx64:1.11.1
- - org.jetbrains.compose.material3:material3-mingwx64:1.11.0-alpha07
- - org.jetbrains.compose.ui:ui-mingwx64:1.11.1
- - org.jetbrains.compose.ui:ui-backhandler-mingwx64:1.11.1
- - org.jetbrains.compose.ui:ui-geometry-mingwx64:1.11.1
- - org.jetbrains.compose.ui:ui-graphics-mingwx64:1.11.1
- - org.jetbrains.compose.ui:ui-text-mingwx64:1.11.1
- - org.jetbrains.compose.ui:ui-tooling-preview-mingwx64:1.11.1
- - org.jetbrains.compose.ui:ui-unit-mingwx64:1.11.1
- - org.jetbrains.compose.ui:ui-util-mingwx64:1.11.1
+ - org.thisisthepy.compose.animation:animation-mingwx64:1.11.1-ext.2
+ - org.thisisthepy.compose.animation:animation-core-mingwx64:1.11.1-ext.2
+ - org.thisisthepy.compose.foundation:foundation-mingwx64:1.11.1-ext.2
+ - org.thisisthepy.compose.foundation:foundation-layout-mingwx64:1.11.1-ext.2
+ - org.thisisthepy.compose.material:material-ripple-mingwx64:1.11.1-ext.2
+ - org.thisisthepy.compose.material3:material3-mingwx64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-mingwx64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-backhandler-mingwx64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-geometry-mingwx64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-graphics-mingwx64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-text-mingwx64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-tooling-preview-mingwx64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-unit-mingwx64:1.11.1-ext.2
+ - org.thisisthepy.compose.ui:ui-util-mingwx64:1.11.1-ext.2
# What every window decides the same way, and the event and accessibility records: the
# fork's window logic, published for mingwX64 by scripts/publish-window.sh from the pinned
# fork commit, as the macOS and Linux renderers link it.
- - org.thisisthepy.compose.window:common:0.1.0
+ - org.thisisthepy.compose.window:common:1.11.1-ext.2
# The window itself: the Kotlin/Native layer over the fork's Win32 C (Win32NativeWindow,
# Win32Loop), published for mingwX64 by the same script on Windows.
- - org.thisisthepy.compose.window:windows-shared:0.1.0
+ - org.thisisthepy.compose.window:windows-shared:1.11.1-ext.2
test-dependencies:
- $kotlin.test
diff --git a/renderer/windows/src/Win32Window.kt b/renderer/windows/src/Win32Window.kt
index 49ee23704..98617d02d 100644
--- a/renderer/windows/src/Win32Window.kt
+++ b/renderer/windows/src/Win32Window.kt
@@ -173,7 +173,7 @@ internal class Win32Window private constructor(
draw()
}
// After the drawing, because that is when what is in the window has been placed.
- semantics.pushIfChanged(afterDrawing = drew)
+ semantics.pushIfChanged(scene.density.density, afterDrawing = drew)
busy = heard || drew
}
}
diff --git a/scripts/publish-skiko-awt.sh b/scripts/publish-skiko-awt.sh
index 512cafbd2..b1ed96d87 100755
--- a/scripts/publish-skiko-awt.sh
+++ b/scripts/publish-skiko-awt.sh
@@ -5,7 +5,7 @@
# Usage: ./scripts/publish-skiko-awt.sh
#
# The fork's extended/skiko/build-skiko-awt.sh, at the pinned commit, builds skiko-awt with the
-# AWT switch and publishes it under a version of its own (0.144.6.1), with its natives still
+# AWT switch and publishes it as org.thisisthepy.compose.skiko:skiko-awt on the fork's version, with its natives still
# named at JetBrains' 0.144.6. Under JetBrains' own 0.144.6, a resolver that already holds
# JetBrains' jar (Amper's cache does) would never look at the local repository, and the image
# would carry an unpatched skiko-awt and keep the Java toolkit. This checks that what the fork
@@ -27,6 +27,23 @@ published="$(sed -n 's/^PUBLISHED_AS="\([^"]*\)"$/\1/p' "$fork/extended/skiko/bu
}
"$fork/extended/skiko/build-skiko-awt.sh" "$1"
-jar="$HOME/.m2/repository/org/jetbrains/skiko/skiko-awt/$version/skiko-awt-$version.jar"
+# The fork's metadata lists JetBrains' skiko-awt as a second capability of every variant, so Gradle
+# keeps one of the two. Amper takes a variant only when its capabilities are exactly its own
+# coordinate, so with the second one it finds no variant and stops with "Platform is not supported
+# by the library". The renderer is resolved by Amper alone and filters JetBrains' skiko-awt off
+# its class path itself, so the extra capability is dropped from the published copy.
+module="$HOME/.m2/repository/$(tr . / <<< "org.thisisthepy.compose.skiko")/skiko-awt/$version/skiko-awt-$version.module"
+[[ -f "$module" ]] || { echo "error: no $module after the build" >&2; exit 1; }
+python3 - "$module" <<'PY'
+import json, sys
+path = sys.argv[1]
+metadata = json.load(open(path, encoding="utf-8"))
+for variant in metadata.get("variants", []):
+ if "capabilities" in variant:
+ variant["capabilities"] = variant["capabilities"][:1]
+json.dump(metadata, open(path, "w", encoding="utf-8"), indent=2)
+PY
+
+jar="$HOME/.m2/repository/org/thisisthepy/compose/skiko/skiko-awt/$version/skiko-awt-$version.jar"
[[ -f "$jar" ]] || { echo "error: no $jar after the build" >&2; exit 1; }
echo "published $jar"
diff --git a/scripts/tests/appkit-window-layout.test.sh b/scripts/tests/appkit-window-layout.test.sh
index 8669e9af5..22f106b54 100755
--- a/scripts/tests/appkit-window-layout.test.sh
+++ b/scripts/tests/appkit-window-layout.test.sh
@@ -36,7 +36,6 @@ trap 'rm -f "$probe" "${probe%.m}"' EXIT
grep '^#define DXC_TEXT_BYTES' "$source_file"
sed -n '/^struct dxc_native_window {/,/^};/p' "$source_file"
sed -n '/^struct dxc_event {/,/^};/p' "$source_file"
- sed -n '/^struct dxc_element {/,/^};/p' "$source_file"
echo 'int main(void) {'
echo ' printf("window %zu\nview %zu\ndevice %zu\nqueue %zu\nlayer %zu\nsize %zu\n",'
echo ' offsetof(struct dxc_native_window, window),'
@@ -55,9 +54,6 @@ trap 'rm -f "$probe" "${probe%.m}"' EXIT
echo ' offsetof(struct dxc_event, code_point),'
echo ' offsetof(struct dxc_event, text),'
echo ' sizeof(struct dxc_event));'
- echo ' printf("element_label %zu\nelement_size %zu\n",'
- echo ' offsetof(struct dxc_element, label),'
- echo ' sizeof(struct dxc_element));'
echo ' return 0;'
echo '}'
} > "$probe"
@@ -103,18 +99,6 @@ if ! grep -q "TEXT_OFFSET = $text_offset" "$kotlin_file"; then
red=1
fi
-element_label="$(awk '$1 == "element_label" { print $2 }' <<< "$layout")"
-if ! grep -q "ELEMENT_LABEL_OFFSET = $element_label" "$kotlin_file"; then
- echo "fail: C puts an element's label at $element_label, not where AppKitWindow.kt writes it"
- red=1
-fi
-
-element_size="$(awk '$1 == "element_size" { print $2 }' <<< "$layout")"
-if ! grep -q "ELEMENT_BYTES = $element_size" "$kotlin_file"; then
- echo "fail: an element is $element_size bytes, which is not what AppKitWindow.kt writes"
- red=1
-fi
-
event_size="$(awk '$1 == "event_size" { print $2 }' <<< "$layout")"
if ! grep -q "EVENT_STRUCT_BYTES = $event_size" "$kotlin_file"; then
echo "fail: an event is $event_size bytes, which is not what AppKitWindow.kt reserves"
diff --git a/scripts/tests/desktop-c-symbols.test.sh b/scripts/tests/desktop-c-symbols.test.sh
index 74ead22cb..c24bc5a92 100755
--- a/scripts/tests/desktop-c-symbols.test.sh
+++ b/scripts/tests/desktop-c-symbols.test.sh
@@ -52,7 +52,8 @@ declared="$(printf '%s\n' $declared $loop_names | sort -u)"
# Which C files each desktop compiles, read from its own build script rather than listed
# again here, so that adding a file to a build is not a way of quietly failing this.
macos_files="$(grep -ho 'c/[a-z0-9_]*\.[mc]' "$scripts/build-native.sh" | sort -u)
-$fork_window/graalvm/graalvm-macos/native/appkit_window.m"
+$fork_window/graalvm/graalvm-macos/native/appkit_window.m
+$fork_window/graalvm/graalvm-macos/native/appkit_accessibility.h"
linux_files="$(grep -ho 'c/[a-z0-9_]*\.[mc]' "$scripts/build-native-linux.sh" | sort -u)
$fork_window/graalvm/graalvm-linux/c/x11_window.c"
windows_files="$(grep -ho 'c[/\\][a-z0-9_]*\.[mc]' "$scripts/build-native-windows.ps1" |
diff --git a/scripts/tests/fork-artifacts-before-amper.test.sh b/scripts/tests/fork-artifacts-before-amper.test.sh
index 1fc53d428..19558bd62 100755
--- a/scripts/tests/fork-artifacts-before-amper.test.sh
+++ b/scripts/tests/fork-artifacts-before-amper.test.sh
@@ -4,7 +4,7 @@
# scripts/publish-skiko-awt.sh). When a build script runs the Kotlin toolchain before they are
# there, the toolchain tries to download them, fails, and records the failure in its own cache.
# From then on the build keeps failing with "Unable to download checksums of file
-# foundation-1.11.1-ext.1.pom" even after ~/.m2 holds the files, until someone finds that cache.
+# foundation-1.11.1-ext.2.pom" even after ~/.m2 holds the files, until someone finds that cache.
#
# So every script that resolves those versions checks ~/.m2 first and stops before the
# toolchain runs. This proves it for each script by running it in a copy of the tree with the
@@ -46,16 +46,15 @@ fork_files() {
case "$group:$version" in
org.thisisthepy.compose.window*) continue ;;
org.thisisthepy.compose.*:"$compose_as"|org.thisisthepy.compose.*:"$material3_as") ;;
- org.jetbrains.skiko:"$skiko_as") ;;
*) continue ;;
esac
base="$(tr . / <<< "$group")"
for name in "$artifact" ${variant:+"$artifact-$variant"}; do
- [[ "$name" == "$artifact" || ( "$group" == org.thisisthepy.compose.* && "$group" != org.thisisthepy.compose.desktop ) ]] || continue
+ [[ "$name" == "$artifact" || ( "$group" == org.thisisthepy.compose.* && "$group" != org.thisisthepy.compose.desktop && "$group" != org.thisisthepy.compose.skiko ) ]] || continue
echo "$base/$name/$version/$name-$version.pom"
echo "$base/$name/$version/$name-$version.module"
done
- done < <(sed -En 's/^[[:space:]]*-[[:space:]]*(org\.thisisthepy\.compose[A-Za-z0-9.]*|org\.jetbrains\.skiko):([A-Za-z0-9._-]+):([A-Za-z0-9._-]+)[[:space:]]*$/\1 \2 \3/p' \
+ done < <(sed -En 's/^[[:space:]]*-[[:space:]]*(org\.thisisthepy\.compose[A-Za-z0-9.]*):([A-Za-z0-9._-]+):([A-Za-z0-9._-]+)[[:space:]]*$/\1 \2 \3/p' \
"$repo/renderer/$module/module.yaml")
}
@@ -152,7 +151,7 @@ for case_line in "${cases[@]}"; do
fi
# skiko-awt has a publish command of its own.
expected="$command"
- [[ "$state" == partial && "${files[${#files[@]}-1]}" == org/jetbrains/skiko/* ]] &&
+ [[ "$state" == partial && "${files[${#files[@]}-1]}" == org/thisisthepy/compose/skiko/* ]] &&
expected="publish-skiko-awt.sh"
grep -q -- "$expected" "$work/out" ||
fail "$script did not name '$expected' with the fork's artifacts missing ($state ~/.m2)"
diff --git a/scripts/tests/fork-dependencies.test.sh b/scripts/tests/fork-dependencies.test.sh
index 6cc595f86..fff867387 100755
--- a/scripts/tests/fork-dependencies.test.sh
+++ b/scripts/tests/fork-dependencies.test.sh
@@ -3,7 +3,7 @@
# its own (COMPOSE_AS in renderer/scripts/build-compose.sh), and every module names its siblings
# at that version. A sibling that is not there, because a build stopped half way or a module was
# left off the fork's publish-local.sh, sends the Kotlin toolchain to the network for a coordinate
-# nobody published: "Unable to download checksums of file foundation-1.11.1-ext.1.pom", kept in
+# nobody published: "Unable to download checksums of file foundation-1.11.1-ext.2.pom", kept in
# its own cache after that.
#
# This runs build-compose.sh in a copy of the tree with git stubbed and a fake fork checkout
diff --git a/scripts/tests/fork-versions.test.sh b/scripts/tests/fork-versions.test.sh
index 5fa4be52f..a1939edd2 100755
--- a/scripts/tests/fork-versions.test.sh
+++ b/scripts/tests/fork-versions.test.sh
@@ -30,7 +30,7 @@ for module in ui:ui ui:ui-text foundation:foundation desktop:desktop; do
check renderer/desktop/module.yaml "org.thisisthepy.compose.${module%%:*}:${module##*:}:$compose_as"
done
check renderer/desktop/module.yaml "org.thisisthepy.compose.material3:material3:$material3_as"
-check renderer/desktop/module.yaml "org.jetbrains.skiko:skiko-awt:$skiko_as"
+check renderer/desktop/module.yaml "org.thisisthepy.compose.skiko:skiko-awt:$skiko_as"
check renderer/macos/module.yaml "org.thisisthepy.compose.ui:ui:$compose_as"
check renderer/macos/module.yaml "org.thisisthepy.compose.foundation:foundation:$compose_as"
check renderer/macos/module.yaml "org.thisisthepy.compose.material3:material3:$material3_as"
diff --git a/scripts/tests/kotlin-gate-platforms.test.sh b/scripts/tests/kotlin-gate-platforms.test.sh
index 355bc37c6..e58ff0c45 100755
--- a/scripts/tests/kotlin-gate-platforms.test.sh
+++ b/scripts/tests/kotlin-gate-platforms.test.sh
@@ -45,7 +45,7 @@ fi
# hour of someone else's build. Where that has not been done the gate leaves it out, and
# where it has the gate builds it; its tests run only on Windows.
echo "$declared" | grep -qx mingwX64 || fail "no module declares mingwX64 any more"
-if [[ -d "$HOME/.m2/repository/org/jetbrains/compose/ui/ui-mingwx64" ]]; then
+if [[ -d "$HOME/.m2/repository/org/thisisthepy/compose/ui/ui-mingwx64" ]]; then
echo "$listed" | grep -qx mingwX64 ||
fail "Compose for mingwX64 is published here and the gate leaves mingwX64 out"
else
diff --git a/scripts/tests/linux-input-access.test.sh b/scripts/tests/linux-input-access.test.sh
index f0dba8512..fc09c2662 100755
--- a/scripts/tests/linux-input-access.test.sh
+++ b/scripts/tests/linux-input-access.test.sh
@@ -12,9 +12,9 @@
# drawn by the input method outside the field;
# - the start callback is reinterpreted as returning an int, because an input method reads the
# return register and a Unit function leaves garbage in it;
-# - the accessibility bridge is started before the loop and read once a turn on the window's own
-# thread, and the semantics listener it reads from is the one the scene reports to. Both
-# X11 windows serve it, with one protocol implementation in the fork's common module.
+# - the accessibility bridge is the window's own (the fork's common module serves AT-SPI for both
+# X11 windows). The renderer hands it the scene's flattened semantics with setAccessibility
+# and carries a reader's requests back through the window listener's onAccessibilityAction.
set -uo pipefail
repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
@@ -33,8 +33,9 @@ entry="$src/LinuxRenderer.kt"
atspi="$fork_window/common/src/org/thisisthepy/compose/window/atspi"
bridge="$atspi/AtspiBridge.kt"
server="$atspi/AtspiServer.kt"
+atspi_window="$atspi/AtspiWindow.kt"
graalvm_src="$fork_window/graalvm/graalvm-linux/src/org/thisisthepy/compose/window/graalvm/linux"
-graalvm_access="$graalvm_src/X11Accessibility.kt"
+graalvm_window="$graalvm_src/X11Window.kt"
graalvm_host="$repo_root/renderer/desktop/src/X11Window.kt"
graalvm_workflow="$repo_root/.github/workflows/test-graalvm-renderer.yml"
# The Linux static renderer is built, and checked, in the reusable workflow the native
@@ -48,8 +49,8 @@ fail() {
}
for file in "$host_window" "$window" "$xim" "$ime" "$entry" "$bridge" "$server" \
- "$fork_src/AtspiSemantics.kt" "$atspi/AtspiModel.kt" "$atspi/AtspiWire.kt" \
- "$atspi/DBusWire.kt" "$graalvm_access" "$graalvm_src/JvmBusConnection.kt" "$graalvm_host" \
+ "$atspi_window" "$atspi/AtspiModel.kt" "$atspi/AtspiWire.kt" \
+ "$atspi/DBusWire.kt" "$graalvm_window" "$graalvm_src/JvmBusConnection.kt" "$graalvm_host" \
"$fork_window/native/linux/test/InputMethodTest.kt" \
"$fork_window/common/test/org/thisisthepy/compose/window/atspi/AtspiTest.kt"; do
[[ -f "$file" ]] || fail "missing $file"
@@ -109,25 +110,21 @@ has '"GetAddress"' "$bridge" "the accessibility bus is not looked up through the
has 'org.a11y.atspi.Accessible' "$server" "the accessible interface is not served"
has 'org.a11y.atspi.Component' "$server" "the component interface is not served, so no reader can place a control"
has 'org.a11y.atspi.Action' "$server" "the action interface is not served, so nothing can be pressed"
-has 'startAccessibility\(' "$entry" "the entry point never joins the accessibility bus"
-has 'accessibility\?\.pump\(\)' "$host_window" "calls from a reader are never answered"
-has 'semanticsListeners' "$host_window" "the scene does not report its semantics to the bridge"
-has 'NO_AT_BRIDGE' "$host_window" "the standard switch for turning the bridge off is not honoured"
+has 'NO_AT_BRIDGE' "$window" "the standard switch for turning the bridge off is not honoured"
+has 'AtspiWindow\(' "$window" "the Kotlin/Native X11 window never joins the accessibility bus"
+has 'setAccessibility\(elements\)' "$host_window" "the scene's semantics never reach the window's bridge"
+has 'override fun onAccessibilityAction' "$host_window" "a reader's request never reaches the scene"
+has 'semantics\.perform\(' "$host_window" "a reader's request is not carried out on a control"
+absent 'startAccessibility|AtspiBridge|AtspiSemanticsSource' "$host_window" "the renderer must not run a bridge of its own beside the window's"
absent 'java\.|JNI|org\.graalvm' "$bridge" "Kotlin/Native has no JVM"
absent 'java\.|platform\.(posix|linux)|kotlinx\.cinterop' "$server" "the protocol is shared by both windows, so it names neither platform"
-# The semantics reader is one file, held byte for byte in both modules (a link would not survive
-# a Windows checkout, where the GraalVM module is built too).
-cmp -s "$fork_src/AtspiSemantics.kt" \
- "$fork_window/graalvm/graalvm-linux/src/org/thisisthepy/compose/window/atspi/AtspiSemantics.kt" ||
- fail "the GraalVM X11 window reads semantics with a reader that differs from the Kotlin/Native one"
# ---- AT-SPI on the GraalVM X11 window -------------------------------------------------------
-has 'AtspiBridge\(' "$graalvm_access" "the GraalVM X11 window never joins the accessibility bus"
-has 'NO_AT_BRIDGE' "$graalvm_access" "the standard switch for turning the bridge off is not honoured"
-has 'bridge\.pump\(\)' "$graalvm_access" "calls from a reader are never answered on the GraalVM X11 window"
-has 'X11Accessibility\.join\(' "$graalvm_host" "the GraalVM renderer never joins the accessibility bus"
-has 'SemanticsFanOut\(semantics, atspiSource\)' "$graalvm_host" "the scene does not report its semantics to the GraalVM bridge"
-has 'afterFrame\(' "$graalvm_host" "the GraalVM bridge is never given the tree or asked to answer"
+has 'AtspiWindow\(' "$graalvm_window" "the GraalVM X11 window never joins the accessibility bus"
+has 'NO_AT_BRIDGE' "$graalvm_window" "the standard switch for turning the bridge off is not honoured"
+has 'window\.setAccessibility\(elements\)' "$graalvm_host" "the GraalVM renderer never gives the window the scene's semantics"
+has 'override fun onAccessibilityAction' "$graalvm_host" "a reader's request never reaches the scene on the GraalVM window"
+absent 'X11Accessibility|AtspiSemanticsSource|SemanticsFanOut' "$graalvm_host" "the removed bridge classes are still used"
has 'check-linux-input-access\.sh renderer/build/native-image-linux' "$graalvm_workflow" \
"the headless check is not run against the GraalVM X11 window"
diff --git a/scripts/tests/linux-native-window.test.sh b/scripts/tests/linux-native-window.test.sh
index b9746df50..8dbe46c7f 100755
--- a/scripts/tests/linux-native-window.test.sh
+++ b/scripts/tests/linux-native-window.test.sh
@@ -261,7 +261,7 @@ fi
# A turn of the loop does what the other desktops' turns do.
# ---------------------------------------------------------------------------
-for call in 'work.runPending()' 'scene.hasInvalidations()' 'semantics.pushIfChanged(afterDrawing'; do
+for call in 'work.runPending()' 'scene.hasInvalidations()' 'semantics.pushIfChanged(scene.density.density, afterDrawing'; do
grep -Fq "$call" "$model" ||
fail "X11Window.kt no longer does '$call', so this test is comparing against nothing"
grep -Fq "$call" "$host_window" || fail "the Linux window does not do '$call' per frame"
diff --git a/scripts/tests/publish-window-windows-tools.test.sh b/scripts/tests/publish-window-windows-tools.test.sh
index 4cf124fe4..62bd92ef7 100755
--- a/scripts/tests/publish-window-windows-tools.test.sh
+++ b/scripts/tests/publish-window-windows-tools.test.sh
@@ -33,12 +33,15 @@ tree="$work/tree"
fork="$work/fork"
window="$fork/extended/window"
mkdir -p "$tree/renderer/scripts" "$tree/scripts" "$window/common" "$window/graalvm/graalvm-macos" \
- "$window/graalvm/graalvm-linux" "$window/native/macos"
+ "$window/graalvm/graalvm-linux" "$window/native/macos" "$window/scene"
cp "$repo/renderer/scripts/publish-window.sh" "$tree/renderer/scripts/"
printf '#!/usr/bin/env bash\necho "%s"\n' "$fork" > "$tree/scripts/fetch-fork-window.sh"
chmod +x "$tree/scripts/fetch-fork-window.sh"
printf 'modules:\n - common\n' > "$window/project.yaml"
printf 'product:\n type: lib\n platforms: [ jvm ]\n' > "$window/common/module.yaml"
+# scene is published wherever the fork's desktop Compose is in the local repository, which this
+# machine may have, so the fixture has the module the script edits.
+printf 'product:\n type: lib\n platforms: [ jvm, macosArm64, linuxX64, linuxArm64 ]\n' > "$window/scene/module.yaml"
record="$work/wrapper.txt"
# The wrapper stubs: say they ran, and (on Windows) which tar.exe comes first on PATH.
printf '#!/usr/bin/env bash\necho "ran ./kotlin $*" > "%s"\n' "$record" > "$window/kotlin"
diff --git a/scripts/tests/renderer/window-modules-no-awt.test.sh b/scripts/tests/renderer/window-modules-no-awt.test.sh
index 16eed8d0b..32d164197 100755
--- a/scripts/tests/renderer/window-modules-no-awt.test.sh
+++ b/scripts/tests/renderer/window-modules-no-awt.test.sh
@@ -42,7 +42,7 @@ done
repository="${DXC_M2_REPOSITORY:-$HOME/.m2/repository}/org/thisisthepy/compose/window"
class_pattern='java/awt|javax/swing|sun/awt'
for artifact in common-jvm graalvm-macos graalvm-linux; do
- jar="$repository/$artifact/0.1.0/$artifact-0.1.0.jar"
+ jar="$repository/$artifact/1.11.1-ext.2/$artifact-1.11.1-ext.2.jar"
if [ ! -f "$jar" ]; then
fail "$jar is missing; run renderer/scripts/publish-window.sh first"
continue
diff --git a/scripts/tests/stale-resolution-state.test.sh b/scripts/tests/stale-resolution-state.test.sh
index e5c0df4cb..f25ab7056 100755
--- a/scripts/tests/stale-resolution-state.test.sh
+++ b/scripts/tests/stale-resolution-state.test.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# When the Kotlin toolchain resolves a coordinate only the Compose fork publishes before the fork
# has published it, the resolution fails with "Unable to download checksums of file
-# foundation-1.11.1-ext.1.pom" and the toolchain keeps that result in the renderer's
+# foundation-1.11.1-ext.2.pom" and the toolchain keeps that result in the renderer's
# build/incremental.state. The entry is keyed on the coordinates and repositories, not on what
# ~/.m2 holds, so every later build replays the failure, even once ~/.m2 has the files.
#
diff --git a/scripts/tests/windows-kotlin-native.test.sh b/scripts/tests/windows-kotlin-native.test.sh
index c67777a4a..f6eee8ed6 100755
--- a/scripts/tests/windows-kotlin-native.test.sh
+++ b/scripts/tests/windows-kotlin-native.test.sh
@@ -77,17 +77,20 @@ grep -q 'GetProcAddress' "$renderer/windows/src/HostSymbolLookup.kt" ||
# Every Compose module this target is given is one the build script publishes.
# ---------------------------------------------------------------------------
-asked="$(grep -oE 'org\.jetbrains\.compose\.[a-z0-9]+:[a-z0-9-]+-mingwx64' "$module" |
- sed -E 's/^org\.jetbrains\.compose\.([a-z0-9]+):([a-z0-9-]+)-mingwx64$/compose:\1:\2/' | sort -u)"
-published="$(awk '/^ mingwX64\)/ { inside = 1; next } inside && /;;/ { exit } inside' "$compose_script" |
- grep -oE 'compose:[a-z0-9]+:[a-z0-9-]+' | sort -u)"
+asked="$(grep -oE 'org\.thisisthepy\.compose\.[a-z0-9]+:[a-z0-9-]+-mingwx64:[^ ]+' "$module" | sort -u)"
[[ -n "$asked" ]] || fail "the windows module asks for no Compose module by its mingwx64 coordinate"
-[[ -n "$published" ]] || fail "build-compose.sh publishes nothing for mingwX64"
-if [[ -n "$asked" && -n "$published" && "$asked" != "$published" ]]; then
- fail "the windows module and build-compose.sh --target mingwX64 disagree:
- only asked for: $(comm -23 <(echo "$asked") <(echo "$published") | tr '\n' ' ')
- only published: $(comm -13 <(echo "$asked") <(echo "$published") | tr '\n' ' ')"
-fi
+# The fork publishes mingwX64 through its own publish-local.sh like every other target, so what
+# this module may name is every module of the fork's list, all at the version the pin publishes.
+compose_as="$(sed -n 's/^COMPOSE_AS="\(.*\)"$/\1/p' "$compose_script")"
+while IFS= read -r coordinate; do
+ version="${coordinate##*:}"
+ [[ "$version" == "$compose_as" ]] ||
+ fail "the windows module asks for ${coordinate%:*} at $version, and the pin publishes $compose_as"
+done <<< "$asked"
+grep -q 'org\.jetbrains\.compose\.' "$module" &&
+ fail "the windows module still names a JetBrains Compose coordinate, which the fork no longer publishes for mingwX64"
+awk '/^ mingwX64\)/ { inside = 1; next } inside && /;;/ { exit } inside' "$compose_script" |
+ grep -q 'publish_targets=(mingwX64)' || fail "build-compose.sh does not publish mingwX64 through the fork's publish-local.sh"
# The Windows pin has to be one with the skiko build in it, and the script has to run that
# build before Compose, which resolves skiko from the local repository.
diff --git a/scripts/tests/x11-window-frames.test.sh b/scripts/tests/x11-window-frames.test.sh
index aa5abf8a5..9e6df22fc 100755
--- a/scripts/tests/x11-window-frames.test.sh
+++ b/scripts/tests/x11-window-frames.test.sh
@@ -56,7 +56,7 @@ absent 'Thread\.sleep' "$loop_file" \
# these is a defect that has been found on that one: a window that hears nothing, a list
# whose rows are fetched on a thread with no Host, a screen redrawn sixty times a second
# while an input method is trying to reach the process, a tree nobody was told about.
-for call in 'work.runPending()' 'scene.hasInvalidations()' 'semantics.pushIfChanged(afterDrawing'; do
+for call in 'work.runPending()' 'scene.hasInvalidations()' 'semantics.pushIfChanged(scene.density.density, afterDrawing'; do
grep -Fq "$call" "$model_file" ||
fail "AppKitWindow.kt no longer does '$call', so this test is comparing against nothing"
grep -Fq "$call" "$loop_file" || fail "the X11 loop does not do '$call' per frame"
@@ -140,7 +140,7 @@ grep -Fq "'-H:NativeLinkerOption=-lXext'" "$build_script" ||
# first time the pointer crosses into a text field.
for symbol in dxc_native_window_open dxc_native_window_size dxc_native_frame_begin \
dxc_native_frame_end dxc_native_poll_event dxc_native_pump \
- dxc_native_window_closed dxc_native_set_cursor dxc_native_set_accessibility \
+ dxc_native_window_closed dxc_native_set_cursor \
dxc_native_set_frame_callback dxc_native_wake dxc_native_window_origin \
dxc_native_window_focused dxc_native_ime_reset dxc_native_resize_serial \
dxc_native_window_server_size dxc_native_debug_resize; do
diff --git a/scripts/tests/x11-window-layout.test.sh b/scripts/tests/x11-window-layout.test.sh
index 0e6ac7a12..f6f17aea9 100755
--- a/scripts/tests/x11-window-layout.test.sh
+++ b/scripts/tests/x11-window-layout.test.sh
@@ -23,9 +23,6 @@ done
declaration() {
sed -n '/^struct dxc_event {/,/^};/p' "$1" | sed 's://.*::' | tr -s ' \t\n' ' '
}
-element_declaration() {
- sed -n '/^struct dxc_element {/,/^};/p' "$1" | sed 's://.*::' | tr -s ' \t\n' ' '
-}
x11_event="$(declaration "$source_file")"
appkit_event="$(declaration "$appkit_source")"
win32_event="$(declaration "$win32_source")"
@@ -33,15 +30,10 @@ if [[ -z "$x11_event" || "$x11_event" != "$appkit_event" || "$x11_event" != "$wi
echo "fail: the three windows declare different dxc_event fields or order"
exit 1
fi
-# What the window tells a reader who cannot see it. The renderer writes these records once
-# and every platform reads that one layout, so a field that moved in one file only would
-# have one window reading a label where another reads a rectangle.
-x11_element="$(element_declaration "$source_file")"
-appkit_element="$(element_declaration "$appkit_source")"
-if [[ -z "$x11_element" || "$x11_element" != "$appkit_element" ]]; then
- echo "fail: the X11 and macOS windows declare different dxc_element fields or order"
- exit 1
-fi
+# What the window tells a reader who cannot see it is no longer one shared record. The X11
+# window answers screen readers over AT-SPI from Kotlin, and the AppKit window has a record of
+# its own (struct dxc_ax_element in appkit_accessibility.h), whose layout the fork's
+# appkit_window_test.m checks with offsetof against the Kotlin that writes it.
text_bytes="$(grep '^#define DXC_TEXT_BYTES ' "$source_file")"
if [[ "$text_bytes" != "$(grep '^#define DXC_TEXT_BYTES ' "$appkit_source")" ||
@@ -66,7 +58,6 @@ probe="$work/x11-window-layout.c"
grep '^#define DXC_TEXT_BYTES' "$source_file"
sed -n '/^struct dxc_native_window {/,/^};/p' "$source_file"
sed -n '/^struct dxc_event {/,/^};/p' "$source_file"
- sed -n '/^struct dxc_element {/,/^};/p' "$source_file"
echo 'int main(void) {'
for field in window view device queue layer; do
echo "printf(\"$field %zu\\n\", offsetof(struct dxc_native_window, $field));"
@@ -76,8 +67,6 @@ probe="$work/x11-window-layout.c"
echo "printf(\"$field %zu\\n\", offsetof(struct dxc_event, $field));"
done
echo 'printf("event_size %zu\n", sizeof(struct dxc_event));'
- echo 'printf("element_label %zu\n", offsetof(struct dxc_element, label));'
- echo 'printf("element_size %zu\n", sizeof(struct dxc_element));'
echo 'return 0; }'
} > "$probe"
cc -o "$work/layout" "$probe" || { echo "fail: the declarations did not compile"; exit 1; }
@@ -105,16 +94,8 @@ done
grep -Fq "record.readByte($(offset text) + length)" "$event_reader" || { echo "fail: text offset"; red=1; }
grep -Fq "EVENT_BYTES = $(offset text) + EVENT_TEXT_BYTES" "$layout_file" || { echo "fail: event size"; red=1; }
grep -Fq "WINDOW_BYTES = $(offset window_size)" "$layout_file" || { echo "fail: window size"; red=1; }
-# The accessibility records are written by the X11 window's setAccessibility, so the offsets it
-# writes at are checked against the C the X11 window declares.
-grep -Fq "ELEMENT_LABEL_OFFSET = $(offset element_label)" "$layout_file" ||
- { echo "fail: an element's label is not written where C keeps it"; red=1; }
text_capacity="$(sed -n 's/^#define DXC_TEXT_BYTES \([0-9]*\)$/\1/p' "$source_file")"
grep -Fq "EVENT_TEXT_BYTES = $text_capacity" "$layout_file" ||
{ echo "fail: the Kotlin text capacity is not the one C declares"; red=1; }
-grep -Fq "ELEMENT_BYTES = ELEMENT_LABEL_OFFSET + EVENT_TEXT_BYTES" "$layout_file" ||
- { echo "fail: an element is not label offset plus text in Kotlin"; red=1; }
-[[ "$(( $(offset element_label) + text_capacity ))" == "$(offset element_size)" ]] ||
- { echo "fail: an element is not the size the Kotlin layout computes"; red=1; }
(( red == 0 )) || exit 1
echo "ok: X11 fields and shared events match their Kotlin offsets"