diff options
| author | salmonik <salmonik@tuta.io> | 2026-08-21 20:13:59 +0200 |
|---|---|---|
| committer | salmonik <salmonik@tuta.io> | 2026-08-21 20:13:59 +0200 |
| commit | 2f4cf666c0c7bd224932fa48973e7334360c1de3 (patch) | |
| tree | 7526314b18728b05c4e9d285b9a41cf6fcd6d6d6 /scripts/test-focus.py | |
| parent | image: single dd-able system.img replaces vvfat+data-disk pair (diff) | |
| download | rs-dos-2f4cf666c0c7bd224932fa48973e7334360c1de3.tar.gz rs-dos-2f4cf666c0c7bd224932fa48973e7334360c1de3.zip | |
input: total keyboard routing + per-terminal discipline (ADR 0006 ph1)
wm: FOCUSED is now a plain window id — window 0 (home terminal) is an
ordinary focusable window in the z-order. The CONSOLE sentinel
(usize::MAX) and the focused()==0 special cases are gone; focus_console()
is an alias for focus(0). Desktop clicks focus window 0. The WM input
pump routes every key unconditionally: IRQ ring -> pump -> focused
window's owner; nothing polls the scancode rings directly any more.
tty: read_line() reads from the calling task's message queue (the old
global-ring read_line and the duplicate read_line_from_queue are merged);
raw mode (read_byte/try_read_byte) consumes the same queue;
interrupt_pressed drains the queue instead of the ring.
shell: task 0 owns home terminal window 0 and blocks on its queue like a
windowed shell; cat/hexdump stdin paths pass the home terminal handle.
sched: watchdog comments updated (shell parks on recv_blocking).
Verified in QEMU: F1 spawns terminals, F2 cycles focus home->term1->
term2, keystrokes land only in the focused window, ^C cancels a line,
edit runs raw over the queue and exits to a working prompt; test-disk
regression PASS.
Diffstat (limited to 'scripts/test-focus.py')
| -rwxr-xr-x | scripts/test-focus.py | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/scripts/test-focus.py b/scripts/test-focus.py new file mode 100755 index 0000000..e1bbe2d --- /dev/null +++ b/scripts/test-focus.py | |||
| @@ -0,0 +1,56 @@ | |||
| 1 | #!/usr/bin/env python3 | ||
| 2 | """Drive the focus-routing gate: 3 windows, type markers, verify routing. | ||
| 3 | |||
| 4 | Connects to the QEMU monitor once and keeps the socket open (the per-call | ||
| 5 | scripts/sendkeys.py pattern loses the socket when the monitor resets). | ||
| 6 | |||
| 7 | Usage: python3 scripts/test-focus.py /tmp/qmon.sock | ||
| 8 | """ | ||
| 9 | import socket | ||
| 10 | import sys | ||
| 11 | import time | ||
| 12 | |||
| 13 | sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) | ||
| 14 | sock.connect(sys.argv[1] if len(sys.argv) > 1 else "/tmp/sysboot-mon.sock") | ||
| 15 | |||
| 16 | |||
| 17 | def sk(k, d=0.35): | ||
| 18 | sock.sendall(f"sendkey {k}\n".encode()) | ||
| 19 | time.sleep(d) | ||
| 20 | |||
| 21 | |||
| 22 | def line(txt, d=0.8): | ||
| 23 | for ch in txt: | ||
| 24 | if ch == " ": | ||
| 25 | sk("spc", 0.1) | ||
| 26 | elif ch.isupper(): | ||
| 27 | sk("shift-" + ch.lower(), 0.12) | ||
| 28 | else: | ||
| 29 | sk(ch, 0.12) | ||
| 30 | sk("ret", d) | ||
| 31 | |||
| 32 | |||
| 33 | time.sleep(0.5) | ||
| 34 | |||
| 35 | # Home is focused at boot. | ||
| 36 | line("windows") # expect: home + nothing (or existing windows) | ||
| 37 | time.sleep(1.5) | ||
| 38 | |||
| 39 | # F1 -> term1 (focused on creation) | ||
| 40 | sk("f1", 1.5) | ||
| 41 | line("echo TERM1MARK") | ||
| 42 | time.sleep(1.0) | ||
| 43 | |||
| 44 | # F1 -> term2 (focused on creation) | ||
| 45 | sk("f1", 1.5) | ||
| 46 | line("echo TERM2MARK") | ||
| 47 | time.sleep(1.0) | ||
| 48 | |||
| 49 | # F2 cycles z-order: term2 -> term1 | ||
| 50 | sk("f2", 0.8) | ||
| 51 | line("echo CYCLED") | ||
| 52 | time.sleep(1.0) | ||
| 53 | |||
| 54 | # F2 again: term1 -> home (window 0, oldest) | ||
| 55 | sk("f2", 0.8) | ||
| 56 | line("windows") | ||
