From 6f2856fa70722dad7f7c69a3addaa05ea9fd6e94 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Fri, 19 Jun 2026 22:36:43 +0800
Subject: [PATCH] Add two-key window shortcut codes
---
C3.tools/round1-vertical-keyboard-app-focus-fixture-qa.sh | 148 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 147 insertions(+), 1 deletions(-)
diff --git a/C3.tools/round1-vertical-keyboard-app-focus-fixture-qa.sh b/C3.tools/round1-vertical-keyboard-app-focus-fixture-qa.sh
index 2520ff9..9a3b1a2 100755
--- a/C3.tools/round1-vertical-keyboard-app-focus-fixture-qa.sh
+++ b/C3.tools/round1-vertical-keyboard-app-focus-fixture-qa.sh
@@ -14,7 +14,7 @@
REPORT_DIR="$BUILD_REPORT_ROOT"
FIXTURE_APP_COUNT="${ALIGNER_ROUND1_VERTICAL_KEYBOARD_APP_COUNT:-12}"
FIXTURE_WINDOWS_PER_APP="${ALIGNER_ROUND1_VERTICAL_KEYBOARD_WINDOWS_PER_APP:-8}"
-REPORT_WAIT="${ALIGNER_ROUND1_VERTICAL_KEYBOARD_REPORT_WAIT:-6.0}"
+REPORT_WAIT="${ALIGNER_ROUND1_VERTICAL_KEYBOARD_REPORT_WAIT:-12.0}"
APP_PID=""
fail() {
@@ -114,6 +114,45 @@
if last_report is not None:
print(json.dumps(last_report, indent=2, ensure_ascii=False), file=sys.stderr)
print(f"vertical keyboard report did not reach expected commands within {timeout:.1f}s", file=sys.stderr)
+sys.exit(1)
+PY
+}
+
+wait_for_committed_report() {
+ local report="$1"
+ local expected_sequence="$2"
+
+ /usr/bin/python3 - "$report" "$REPORT_WAIT" "$expected_sequence" <<'PY'
+import json
+import sys
+import time
+
+path = sys.argv[1]
+timeout = float(sys.argv[2])
+expected_sequence = [part for part in sys.argv[3].split(",") if part]
+deadline = time.monotonic() + timeout
+last_report = None
+
+while time.monotonic() < deadline:
+ try:
+ with open(path, "r", encoding="utf-8") as file:
+ report = json.load(file)
+ last_report = report
+ root = report.get("rootView", {})
+ if (
+ report.get("snapshotLoaded") is True
+ and root.get("keyboardCommandsApplied") == expected_sequence
+ ):
+ sys.exit(0)
+ except FileNotFoundError:
+ pass
+ except json.JSONDecodeError:
+ pass
+ time.sleep(0.2)
+
+if last_report is not None:
+ print(json.dumps(last_report, indent=2, ensure_ascii=False), file=sys.stderr)
+print(f"vertical keyboard committed report did not reach expected commands within {timeout:.1f}s", file=sys.stderr)
sys.exit(1)
PY
}
@@ -239,6 +278,82 @@
PY
}
+assert_window_shortcut_report() {
+ local report="$1"
+ local expected_sequence="$2"
+ local target_app_index="$3"
+ local target_window_index="$4"
+ local expected_code="$5"
+
+ /usr/bin/python3 - \
+ "$report" \
+ "$expected_sequence" \
+ "$target_app_index" \
+ "$target_window_index" \
+ "$expected_code" \
+ "$FIXTURE_APP_COUNT" \
+ "$FIXTURE_WINDOWS_PER_APP" <<'PY'
+import json
+import sys
+
+path = sys.argv[1]
+expected_sequence = [part for part in sys.argv[2].split(",") if part]
+target_app_index = int(sys.argv[3])
+target_window_index = int(sys.argv[4])
+expected_code = sys.argv[5]
+fixture_app_count = int(sys.argv[6])
+fixture_windows_per_app = int(sys.argv[7])
+
+with open(path, "r", encoding="utf-8") as file:
+ report = json.load(file)
+
+def require(condition, message):
+ if not condition:
+ print(message, file=sys.stderr)
+ print(json.dumps(report, indent=2, ensure_ascii=False), file=sys.stderr)
+ sys.exit(1)
+
+root = report.get("rootView", {})
+columns = root.get("waterfallColumns", [])
+require(report.get("snapshotLoaded") is True, "snapshotLoaded must be true")
+require(report.get("appCount") == fixture_app_count, "fixture appCount must match")
+require(report.get("windowCount") == fixture_app_count * fixture_windows_per_app, "fixture windowCount must match")
+require(root.get("waterfallViewMode") == "verticalColumns", "window shortcut fixture must run in vertical Waterfall")
+require(root.get("keyboardCommandsApplied") == expected_sequence, "two-key window shortcut commands must match")
+require(root.get("appShelfIndexKeyDownCount") == 2, "two-key window shortcut must exercise two physical keyDown events")
+require(root.get("lastAppShelfIndexKeySymbol") == expected_code[-1], "last physical symbol must be the window index key")
+require(root.get("lastWindowIndexKeyCommand") == f"window:{expected_code}", "last window shortcut command must be reported")
+require(root.get("lastWindowIndexKeyCommitCode") == expected_code, "last window shortcut commit code must be reported")
+require(root.get("windowIndexKeyPendingAppGroupIndex") is None, "two-key commit must clear pending App")
+require(root.get("windowIndexKeyPendingAppSymbol") is None, "two-key commit must clear pending App symbol")
+require(target_app_index < len(columns), "target App index must exist")
+target_column = columns[target_app_index]
+cards = target_column.get("cards", [])
+require(target_window_index < len(cards), "target window index must exist")
+target_card = cards[target_window_index]
+require(target_card.get("windowShortcutCode") == expected_code, "target card must expose expected two-character shortcut code")
+require(target_card.get("primarySpaceLabel") != target_card.get("windowShortcutCode"), "shortcut code must replace the old Space label in the UI meta slot")
+require(root.get("lastCommittedAppGroupIndex") == target_app_index, "two-key shortcut must commit target App")
+require(root.get("lastCommittedWindowIndex") == target_window_index, "two-key shortcut must commit target window")
+require(root.get("lastCommittedWindowID") == target_card.get("windowID"), "two-key shortcut must commit target window ID")
+require(root.get("lastCommitSource") == "keyboard", "two-key shortcut commit must be keyboard sourced")
+require(root.get("selectedAppGroupIndex") == target_app_index, "two-key shortcut must select target App")
+require(root.get("selectedWindowIndex") == target_window_index, "two-key shortcut must select target window")
+require(root.get("selectedWindowID") == target_card.get("windowID"), "two-key shortcut selection ID must match target window")
+
+for column in columns:
+ for card in column.get("cards", []):
+ code = card.get("windowShortcutCode")
+ require(code != "No Space" and code != "N...", "window shortcut code must not expose the old No Space label")
+
+print(json.dumps({
+ "commands": root.get("keyboardCommandsApplied"),
+ "code": expected_code,
+ "lastCommittedWindowID": root.get("lastCommittedWindowID")
+}, indent=2, ensure_ascii=False))
+PY
+}
+
run_case() {
local name="$1"
local sequence="$2"
@@ -287,6 +402,36 @@
swift "$SCRIPT_DIR/window-logic-qa.swift" --expect-no-quick-switch >&2
}
+run_window_shortcut_case() {
+ local name="window-shortcut"
+ local sequence="physical-index:3,physical-index:6"
+ local expected_sequence="app:3,window:36"
+ local report="$REPORT_DIR/round01-vertical-keyboard-$name-report.json"
+
+ stop_current_aligner
+ rm -f "$report"
+
+ "$APP/Contents/MacOS/Aligner" \
+ --round0-skip-permissions \
+ --round01-open-quick-switch \
+ --round01-waterfall-view-mode=vertical \
+ --round01-fixture-app-count="$FIXTURE_APP_COUNT" \
+ --round01-fixture-windows-per-app="$FIXTURE_WINDOWS_PER_APP" \
+ --round01-disable-screenshot-refresh \
+ --round01-debug-key-sequence="$sequence" \
+ --round01-quick-switch-report="$report" &
+
+ APP_PID=$!
+ wait_for_committed_report "$report" "$expected_sequence"
+ assert_window_shortcut_report "$report" "$expected_sequence" 2 5 "36"
+
+ kill "$APP_PID" 2>/dev/null || true
+ wait "$APP_PID" 2>/dev/null || true
+ APP_PID=""
+ sleep 0.3
+ swift "$SCRIPT_DIR/window-logic-qa.swift" --expect-no-quick-switch >&2
+}
+
if [ "$FIXTURE_APP_COUNT" -lt 12 ]; then
fail "fixture app count must be at least 12"
fi
@@ -310,6 +455,7 @@
run_case "right-wrap-to-first" "$LAST_APP_SYMBOL,right" 0 0 0 0 "none" "false" "false"
run_case "bottom-boundary" "3,down,down,down,down,down,down,down,down,down" 2 2 7 1 "down" "false" "true"
run_case "top-boundary" "4,down,up" 3 3 0 1 "up" "false" "true"
+run_window_shortcut_case
trap - EXIT
cleanup
--
Gitblit v1.9.3