Show input modes in the keyboard indicator

test/shell.d/input-indicator-test.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+set -euo pipefail
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+OMARCHY_PATH="$ROOT" /usr/bin/python - <<'PY'
+import importlib.util
+import os
+from unittest.mock import patch
+
+spec = importlib.util.spec_from_file_location("indicator", os.environ["OMARCHY_PATH"] + "/default/input-methods/indicator.py")
+indicator = importlib.util.module_from_spec(spec)
+spec.loader.exec_module(indicator)
+
+with patch.object(indicator, "call", side_effect=[
+  ("Default",),
+  ("us", [("keyboard-us", ""), ("mozc", ""), ("mozc", "")]),
+  ("mozc", "Mozc", "", "fcitx_mozc", "あ", "ja", "mozc", True, "", {}),
+]):
+  state = indicator.snapshot(None)
+  assert state == {"methods": ["keyboard-us", "mozc"], "current": "mozc", "name": "Mozc", "label": "あ", "language": "ja"}
+print("ok - live state deduplicates modes and reads language independently of the engine label")
+
+def check_cycle(current, methods, expected):
+  state = {"current": current, "methods": methods}
+  with patch.object(indicator, "snapshot", return_value=state), patch.object(indicator, "call") as call:
+    indicator.cycle(None)
+    if expected is None:
+      call.assert_not_called()
+    else:
+      assert call.call_args.args[1] == "SetCurrentIM"
+      assert call.call_args.args[2].unpack() == (expected,)
+
+check_cycle("keyboard-us", ["keyboard-us", "mozc"], "mozc")
+check_cycle("mozc", ["keyboard-us", "mozc"], "keyboard-us")
+check_cycle("mozc", ["keyboard-us", "mozc", "hangul"], "hangul")
+check_cycle("hangul", ["keyboard-us", "mozc", "hangul"], "keyboard-us")
+check_cycle("keyboard-us", ["keyboard-us"], None)
+check_cycle("removed", ["keyboard-us", "mozc"], None)
+check_cycle("", [], None)
+print("ok - input cycling covers Latin, multiple engines, single modes, and stale contexts")
+PY

test/shell.d/keyboard-layout-test.sh

@@ -7,6 +7,22 @@ source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
 run_node_test <<'JS'
 const model = requireFromRoot('shell/plugins/bar/widgets/KeyboardLayoutModel.js')
 
+const japanese = { methods: ['keyboard-us', 'mozc'], current: 'mozc', name: 'Mozc', language: 'ja' }
+assertEqual(model.inputLabel(japanese, 'EN'), 'あ', 'Japanese input has a distinct active label')
+assertEqual(model.inputLabel({ ...japanese, label: 'ア' }, 'EN'), 'ア', 'the live engine mode takes precedence over its default glyph')
+assertEqual(model.inputLabel({ ...japanese, current: 'keyboard-us' }, 'EN'), 'EN', 'Latin input retains the keyboard label')
+assertEqual(model.inputLabel({}, 'EN'), 'EN', 'a stopped input service retains the keyboard label')
+assertEqual(model.inputLabel({ current: 'hangul' }, 'EN'), '한', 'Korean input has a distinct label')
+assertEqual(model.inputLabel({ current: 'custom', language: 'vi' }, 'EN'), 'VI', 'other engines use their reported language')
+assertEqual(model.inputTooltip(japanese, 'English (US)', false).includes('Space twice'), true, 'Japanese explains character choices')
+assertEqual(model.inputTooltip(japanese, 'English (US)', true).includes('Right-click'), true, 'combined input and layout switching stays discoverable')
+assertEqual(model.inputTooltip({ methods: ['keyboard-fr'] }, 'French', false), 'French\nClick to set up an input language', 'one foreign mode offers input setup')
+assertEqual(model.showIndicator('EN', false, false), false, 'English alone stays hidden')
+assertEqual(model.showIndicator('ENG', false, false), false, 'English before the brief table loads stays hidden')
+assertEqual(model.showIndicator('FR', false, false), true, 'a single non-English layout stays available')
+assertEqual(model.showIndicator('EN', false, true), true, 'Latin with another input mode stays available')
+assertEqual(model.showIndicator('EN', true, false), true, 'multiple keyboard layouts stay available')
+
 // Trimmed from xkbcli list, keeping the format of every section it prints,
 // including the options nested under an option group: those quote their
 // description and print an empty brief, one indent deeper than a layout's.