diff --git a/nix/tests/vm/lib/komorebi_vm/platforms/kde/extras/scrolling.py b/nix/tests/vm/lib/komorebi_vm/platforms/kde/extras/scrolling.py new file mode 100644 index 00000000..59459424 --- /dev/null +++ b/nix/tests/vm/lib/komorebi_vm/platforms/kde/extras/scrolling.py @@ -0,0 +1,86 @@ +"""What only KDE can tell about the scrolling layout, beside the shared `scrolling` scenario. + +The strip runs past the edge of the work area, and KWin is expected to leave the windows exactly +where the daemon puts them, off the screen too: KWin keeps part of a window it resizes on an +output, and the bridge asks again for the position of a window that was pulled back (`settle` in +`bridge.js`). The shared scenario checks that the focused window is in view; these check where +KWin keeps the ones that are not, and that the strip scrolls with the focus `komorebic focus` +moves. +""" + +from komorebi_vm.core.checks import Checks +from komorebi_vm.core.geometry import Rect +from komorebi_vm.core.platform import Client +from komorebi_vm.kde_platform import KdePlatform + +WINDOWS = 5 + + +def run(platform: KdePlatform, checks: Checks, clients: list[Client]) -> None: + """Five windows in two columns: the last two are in view and the others are scrolled out, where + KWin keeps them; focusing to the far left and back scrolls the strip with the focus. The daemon + must be running with no window. The daemon is stopped at the end.""" + kde = platform.kde + width = platform.size[0] + + def n(i: int) -> Rect: + return kde.rect(kde.wid(f"win{i}")) + + def in_view(r: Rect) -> bool: + return r.x >= 0 and r.x + r.w <= width + + def out_of_view(r: Rect) -> bool: + return r.x >= width or r.x + r.w <= 0 + + def focused_monitor() -> int: + return platform.state().focused_monitor + + def agree(title: str) -> bool: + return kde.title(kde.active()) == title and kde.focused_title() == title + + kde.komorebic("change-layout", "scrolling") + kde.komorebic("scrolling-layout-columns", "2") + for i in range(1, WINDOWS + 1): + platform.spawn(f"win{i}") + checks.check( + "the daemon manages all five", kde.wait_for(lambda: kde.managed() == WINDOWS, timeout=20) + ) + checks.check( + "the focused (last) window is in view, and so is the one before it", + kde.wait_for(lambda: in_view(n(5)) and in_view(n(4)), timeout=20), + ) + checks.check( + "the first three are scrolled out of view", + kde.wait_for(lambda: all(out_of_view(n(i)) for i in (1, 2, 3)), timeout=20), + ) + for i in range(1, WINDOWS + 1): + print(f" win{i}: {n(i)}") + # not an absolute x: the paddings move every column + pitch = n(5).x - n(4).x + checks.check( + f"KWin left them where the daemon put them: win1 is three columns left of win4" + f" ({n(1).x} = {n(4).x} - 3 x {pitch}), not pulled back", + kde.wait_for(lambda: n(1).x == n(4).x - 3 * pitch, timeout=10), + ) + checks.check("KWin and the daemon agree on the focus", kde.wait_for(lambda: agree("win5"))) + + for _ in range(4): + kde.komorebic("focus", "left") + kde.wait_for(lambda: kde.title(kde.active()) == kde.focused_title()) + checks.check( + "focusing to the far left scrolls the strip back: win1 in view", + kde.wait_for(lambda: in_view(n(1)), timeout=10), + ) + checks.check("... and win5 is past the right edge", kde.wait_for(lambda: out_of_view(n(5)))) + checks.check("... and the focus is win1 on both sides", kde.wait_for(lambda: agree("win1"))) + checks.check("... on the first monitor", focused_monitor() == 0) + + for _ in range(4): + kde.komorebic("focus", "right") + kde.wait_for(lambda: kde.title(kde.active()) == kde.focused_title()) + checks.check("walking right again reaches win5", kde.wait_for(lambda: agree("win5"))) + checks.check("... without the focus having left the first monitor", focused_monitor() == 0) + checks.check("... and win5 is in view", kde.wait_for(lambda: in_view(n(5)), timeout=10)) + + kde.komorebic("stop") + kde.wait_for(lambda: not kde.komorebi_running()) diff --git a/nix/tests/vm/suites/scrolling/test.py b/nix/tests/vm/suites/scrolling/test.py index 420463b3..4f48565b 100644 --- a/nix/tests/vm/suites/scrolling/test.py +++ b/nix/tests/vm/suites/scrolling/test.py @@ -1,10 +1,14 @@ # The scrolling layout in a real KWin. The strip runs past the edge of the work area, and KWin is -# expected to leave the windows exactly where komorebi puts them, off the screen too: KWin keeps -# part of a window it resizes on an output, and the bridge asks again for the position of a window -# that was pulled back (`settle` in `bridge.js`). `komorebi/tests/layout_options.rs` checks where -# komorebi puts the columns against the fake; this checks that KWin keeps them there, and that the -# strip scrolls with the focus that `komorebic focus` moves. -from komorebi_vm import Checks, Kde, Rect +# expected to leave the windows exactly where komorebi puts them, off the screen too. What only a +# real KWin can tell is in `komorebi_vm.platforms.kde.extras.scrolling`: that KWin keeps them there +# and that the strip scrolls with the focus `komorebic focus` moves. The shared scenario +# (`komorebi_vm.core.scenarios.scrolling`), which `core-e2e` runs and which runs on Windows too, +# checks the focused window is in view. `komorebi/tests/layout_options.rs` checks where komorebi +# puts the columns against the fake. +from komorebi_vm import Checks, Kde +from komorebi_vm.core.suite import platform_only, run_suite +from komorebi_vm.kde_platform import KdePlatform +from komorebi_vm.platforms.kde.extras import scrolling as kde_scrolling W, H = 1920, 1080 @@ -14,76 +18,10 @@ machine.wait_for_unit("user@1000.service") checks = Checks() kde = Kde.headless(machine, "main", size=(W, H), scale=SCALE) +platform = KdePlatform(kde, (W, H)) +platform.start_komorebi() +run_suite(checks, platform_only("kde", kde_scrolling.run, platform, checks, [])) -def n(i: int) -> Rect: - return kde.rect(kde.wid(f"win{i}")) - - -def in_view(r: Rect) -> bool: - return r.x >= 0 and r.x + r.w <= W - - -def out_of_view(r: Rect) -> bool: - return r.x >= W or r.x + r.w <= 0 - - -def focused_monitor() -> int: - return kde.state()["monitors"]["focused"] - - -def agree(title: str) -> bool: - return kde.title(kde.active()) == title and kde.focused_title() == title - - -print("== five windows in two columns") -kde.start_komorebi() -kde.wait_for(lambda: kde.run("komorebic monitor-information")[0] == 0, timeout=30) -kde.komorebic("change-layout", "scrolling") -kde.komorebic("scrolling-layout-columns", "2") -for i in range(1, 6): - kde.spawn(f"foot -T win{i} sleep 3000") - kde.wait_for(lambda i=i: kde.wid(f"win{i}") != "", timeout=30) -checks.check("komorebi manages all five", kde.wait_for(lambda: kde.managed() == 5, timeout=20)) -checks.check( - "the focused (last) window is in view, and so is the one before it", - kde.wait_for(lambda: in_view(n(5)) and in_view(n(4)), timeout=20), -) -checks.check( - "the first three are scrolled out of view", - kde.wait_for(lambda: all(out_of_view(n(i)) for i in (1, 2, 3)), timeout=20), -) -for i in range(1, 6): - print(f" win{i}: {n(i)}") -# not an absolute x: the paddings move every column -pitch = n(5).x - n(4).x -checks.check( - f"KWin left them where komorebi put them: win1 is three columns left of win4" - f" ({n(1).x} = {n(4).x} - 3 x {pitch}), not pulled back", - kde.wait_for(lambda: n(1).x == n(4).x - 3 * pitch, timeout=10), -) -checks.check("KWin and komorebi agree on the focus", kde.wait_for(lambda: agree("win5"))) - -print("== focus to the far left and back") -for _ in range(4): - kde.komorebic("focus", "left") - kde.wait_for(lambda: kde.title(kde.active()) == kde.focused_title()) -checks.check( - "focusing to the far left scrolls the strip back: win1 in view", - kde.wait_for(lambda: in_view(n(1)), timeout=10), -) -checks.check("... and win5 is past the right edge", kde.wait_for(lambda: out_of_view(n(5)))) -checks.check("... and the focus is win1 on both sides", kde.wait_for(lambda: agree("win1"))) -checks.check("... on the first monitor", focused_monitor() == 0) - -for _ in range(4): - kde.komorebic("focus", "right") - kde.wait_for(lambda: kde.title(kde.active()) == kde.focused_title()) -checks.check("walking right again reaches win5", kde.wait_for(lambda: agree("win5"))) -checks.check("... without the focus having left the first monitor", focused_monitor() == 0) -checks.check("... and win5 is in view", kde.wait_for(lambda: in_view(n(5)), timeout=10)) - -kde.komorebic("stop") -kde.wait_for(lambda: not kde.komorebi_running()) kde.stop() checks.finish()