* Unify input methods with the installer keyboard selection * Preserve inherited input keys and later keyboard changes * Exercise input engines across desktop toolkits * Show input modes in the keyboard indicator * Keep Pinyin setup prompts visible * Remember input selections before an app gains focus * Remove the Japanese input welcome notification * Show explicit choices on notification cards * Suppress the Cloudpinyin first-use prompt * Show the input switching shortcut in keyboard hints * Verify input setup and composition stay quiet * Use Super+I for input switching independently of Fcitx keys * Restore linked input settings and attribute test notifications to Fcitx * Correct the input setup shortcut hint * Keep input tooltips to the name and switching shortcut * Place the input language selector with the right bar widgets * Show input switching only for multiple layouts or methods * Unify input method and keyboard layout switching * Select keyboard layouts and input methods in the Typing menu * Apply typing selections immediately from the menu * Use installer keyboard choices and keep typing selections accurate * Queue typing changes and wait for saved selections * Keep queued typing selections when reopening the menu * Cycle keyboard layouts alongside composition engines * Avoid shadowing Python typing and retain pending mixed input selections * Keep input clicks working through controller and compositor failures * Move the keyboard layout widget to the right side of existing bars Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Map keyboard choices to the layouts the installer sets Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Keep the switching order when changing input methods Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Set input method fonts only after the selection saves Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Restore confirmed picker checks when an immediate change fails Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Route Super+I through the shell's input reader so unfocused choices stick Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Restore the input group when the font preference cannot be written Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Drop the azerty conversion now that the installer no longer offers it Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Apply the owner's keyboard layout once before persisting the input choice A quattro merge kept a second apply_keyboard after the retry loop, which re-ran loadkeys and firstboot, ignored their failure, and overwrote the XKB layout setup supplies for keymaps kbd-model-map lacks. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Give the Lao keyboard choice a Lao desktop layout The row used la-latin1, kbd's Latin American Spanish keymap, so Lao installs typed Spanish. There is no Lao console keymap; like Korean, the console stays US and the desktop gets la, which Omarchy keeps behind US as a non-Latin layout. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Load engines installed after Fcitx started when they are selected The Typing menu refused an engine whose package an update had installed, since Fcitx discovers engines only at startup. Restart input once and wait for the engine; name the package when it really is not installed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Cycle input methods back with Super+Shift+I Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Drop notification action buttons now that the Pinyin prompt is suppressed Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Cycle input only through the shell's reader Without the shell there is no bar or menu either, so the one-shot cycling path only duplicated the reader's logic. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Add engines from the command line through the Typing menu's path omarchy setup input <engine> had its own restart, append, select and live-rollback code in configure.py, parallel to the menu's. It now installs the packages and appends through typing_setup, leaving configure.py with install-time seeding and update defaults. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Keep Ctrl+Space out of Fcitx's toggles instead of probing for it The terminal prefix bind read the Fcitx config and profile on every press to avoid fighting a Ctrl+Space toggle. configure --defaults now removes that key from every trigger list, so the bind only checks for a terminal. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Run the input-method scripts with the system Python A bare python resolves through PATH, so a mise, pyenv or venv interpreter could run them without the system's PyGObject. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
205 lines
11 KiB
Bash
Executable File
205 lines
11 KiB
Bash
Executable File
#!/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
|
|
import json
|
|
import subprocess
|
|
|
|
# Script-directory imports must not shadow Python's standard typing module.
|
|
subprocess.run(["/usr/bin/python", "-c", "import sys; sys.path.insert(0, sys.argv[1]); import typing; from gi.repository import Gio; assert hasattr(typing, 'TYPE_CHECKING')", os.environ["OMARCHY_PATH"] + "/default/input-methods"], check=True)
|
|
|
|
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):
|
|
assert indicator.cycle_choice({"current": current, "methods": methods}, [])[0] == 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")
|
|
|
|
entries = [("keyboard-us", "English", "", "input-keyboard", "en", "en", True),
|
|
("pinyin", "Pinyin", "", "fcitx-pinyin", "拼", "zh_CN", True)]
|
|
live = {"methods": ["keyboard-us", "pinyin"], "current": "", "name": "", "label": "", "language": ""}
|
|
selected = []
|
|
def fake_call(bus, method, args=None):
|
|
if method == "AvailableInputMethods":
|
|
return (entries,)
|
|
if method == "SetCurrentIM":
|
|
selected.append(args.unpack()[0])
|
|
live["current"] = selected[-1]
|
|
return ()
|
|
raise AssertionError(method)
|
|
|
|
with patch.object(indicator, "snapshot", side_effect=lambda bus: dict(live)), patch.object(indicator, "call", side_effect=fake_call), patch.object(indicator.subprocess, "run", return_value=subprocess.CompletedProcess([], 0, stdout='{"keyboards": []}')):
|
|
reader = indicator.Indicator(None)
|
|
assert reader.refresh()["current"] == "keyboard-us"
|
|
reader.select_next()
|
|
assert reader.refresh()["current"] == "pinyin"
|
|
assert reader.pending == "pinyin" and selected == []
|
|
reader.select_next()
|
|
assert reader.pending == "keyboard-us"
|
|
reader.select_next()
|
|
live["current"] = "keyboard-us"
|
|
assert reader.refresh()["current"] == "pinyin"
|
|
assert reader.pending == "" and selected == ["pinyin"]
|
|
live["current"] = ""
|
|
reader.select_next()
|
|
live["methods"] = ["pinyin"]
|
|
reader.refresh()
|
|
assert reader.pending == ""
|
|
print("ok - desktop clicks update the label, cycle pending choices, and apply once a text context exists")
|
|
|
|
with patch.object(indicator, "snapshot", return_value={"methods": ["keyboard-us", "keyboard-fr"], "current": "keyboard-us"}), patch.object(indicator, "call") as call, patch.object(indicator.subprocess, "run", return_value=subprocess.CompletedProcess([], 0, stdout='{"keyboards": []}')) as process:
|
|
indicator.Indicator(None).select_next()
|
|
assert call.call_args_list[0].args[2].unpack() == ("keyboard-fr",)
|
|
assert process.call_count == 1
|
|
print("ok - the shortcut cycles Fcitx keyboard methods without requiring a bar widget")
|
|
|
|
keyboards = [
|
|
{"name": "power-button", "layout": "us,fr", "active_layout_index": 1},
|
|
{"name": "physical keyboard", "layout": "us,fr", "active_layout_index": 0},
|
|
{"name": "consumer-control", "layout": "us,fr", "active_layout_index": 0},
|
|
{"name": "custom", "layout": "de", "active_layout_index": 0},
|
|
]
|
|
expected = [["hyprctl", "switchxkblayout", item["name"], "1"] for item in keyboards[:3]]
|
|
assert indicator.layout_switches(keyboards) == expected
|
|
assert indicator.layout_switches([keyboards[-1]] + keyboards[:-1]) == expected
|
|
assert indicator.layout_switches([{ "name": "custom-first", "layout": "us,de,fr", "active_layout_index": 2 }] + keyboards) == expected
|
|
keyboards[1]["active_layout_index"] = 1
|
|
assert all(command[-1] == "0" for command in indicator.layout_switches(keyboards))
|
|
assert indicator.layout_switches([{ "name": "physical", "layout": "fr" }]) == []
|
|
assert indicator.layout_switches([]) == []
|
|
print("ok - layout switching synchronizes matching devices, wraps, and preserves device-specific layouts")
|
|
|
|
import json
|
|
def reader_cycle(state, keyboards):
|
|
with patch.object(indicator, "snapshot", return_value=dict(state)), patch.object(indicator, "call") as call, patch.object(indicator.subprocess, "run", return_value=subprocess.CompletedProcess([], 0, stdout=json.dumps({"keyboards": keyboards}))) as process:
|
|
indicator.Indicator(None).select_next()
|
|
return call, [command.args[0] for command in process.call_args_list[1:]]
|
|
|
|
call, commands = reader_cycle({"methods": ["keyboard-us"], "current": "keyboard-us"}, keyboards)
|
|
assert commands == indicator.layout_switches(keyboards)
|
|
print("ok - keyboard-only input falls back to compositor layouts")
|
|
state = {"methods": ["keyboard-us", "mozc", "hangul"], "current": "keyboard-us"}
|
|
keyboards[1]["active_layout_index"] = 0
|
|
assert indicator.cycle_choice(state, keyboards) == ("keyboard-us", 1)
|
|
call, commands = reader_cycle(state, keyboards)
|
|
assert commands and all(command[-1] == "1" for command in commands)
|
|
assert all(item.args[2].unpack() == ("keyboard-us",) for item in call.call_args_list if item.args[1] == "SetCurrentIM")
|
|
keyboards[1]["active_layout_index"] = 1
|
|
assert indicator.cycle_choice(state, keyboards) == ("mozc", None)
|
|
state["current"] = "mozc"
|
|
assert indicator.cycle_choice(state, keyboards) == ("hangul", None)
|
|
state["current"] = "hangul"
|
|
assert indicator.cycle_choice(state, keyboards) == ("keyboard-us", 0)
|
|
call, commands = reader_cycle(state, keyboards)
|
|
assert call.call_args_list[0].args[2].unpack() == ("keyboard-us",)
|
|
assert all(command[-1] == "0" for command in commands)
|
|
print("ok - layouts and composition engines share one cycle and returning to direct input resets the layout")
|
|
|
|
keyboards = [{"name": "physical", "layout": "us,dk", "active_layout_index": 0}]
|
|
live = {"methods": ["keyboard-us", "pinyin"], "current": "", "name": "", "label": "", "language": ""}
|
|
selected.clear()
|
|
def fake_process(command, **kwargs):
|
|
if command[:3] == ["hyprctl", "-j", "devices"]:
|
|
return subprocess.CompletedProcess(command, 0, stdout=json.dumps({"keyboards": keyboards}))
|
|
keyboards[0]["active_layout_index"] = int(command[-1])
|
|
return subprocess.CompletedProcess(command, 0, stdout="")
|
|
with patch.object(indicator, "snapshot", side_effect=lambda bus: dict(live)), patch.object(indicator, "call", side_effect=fake_call), patch.object(indicator.subprocess, "run", side_effect=fake_process):
|
|
reader = indicator.Indicator(None)
|
|
reader.last = "removed-engine"
|
|
reader.select_next()
|
|
assert keyboards[0]["active_layout_index"] == 1
|
|
reader.select_next()
|
|
assert reader.pending == "pinyin" and selected == []
|
|
assert reader.refresh()["current"] == "pinyin"
|
|
live["current"] = "keyboard-us"
|
|
reader.refresh()
|
|
assert selected == ["pinyin"] and reader.pending == ""
|
|
reader.select_next()
|
|
assert keyboards[0]["active_layout_index"] == 0
|
|
assert selected[-1] == "keyboard-us"
|
|
print("ok - mixed-layout bar clicks queue an engine without focus and apply it when a text field gains focus")
|
|
|
|
from unittest.mock import Mock
|
|
callback = {}
|
|
def register(source, flags, fn):
|
|
callback["read"] = fn
|
|
return 1
|
|
def exercise():
|
|
assert callback["read"](None, None) == indicator.GLib.SOURCE_CONTINUE
|
|
assert callback["read"](None, None) == indicator.GLib.SOURCE_CONTINUE
|
|
state = {"methods": ["keyboard-us", "pinyin"], "current": "keyboard-us", "name": "English", "label": "en", "language": "en"}
|
|
loop = Mock()
|
|
loop.run.side_effect = exercise
|
|
with patch.object(indicator.GLib, "MainLoop", return_value=loop), patch.object(indicator.GLib, "io_add_watch", side_effect=register), patch.object(indicator.GLib, "timeout_add", return_value=1), patch.object(indicator.GLib, "source_remove"), patch.object(indicator.os, "read", return_value=b"cycle\n"), patch.object(indicator, "snapshot", return_value=state), patch.object(indicator.subprocess, "run", side_effect=[subprocess.CalledProcessError(1, "hyprctl"), subprocess.CompletedProcess([], 0, stdout='{"keyboards": []}')]), patch.object(indicator, "call") as call, patch("builtins.print"):
|
|
indicator.watch(None)
|
|
assert call.call_args.args[1] == "SetCurrentIM"
|
|
print("ok - a failed compositor query leaves the bar click reader alive for the next request")
|
|
|
|
keyboards = [{"name": "physical", "layout": "us,dk", "active_layout_index": 0}]
|
|
with patch.object(indicator, "snapshot", side_effect=indicator.GLib.Error("no fcitx")), patch.object(indicator.subprocess, "run", side_effect=fake_process):
|
|
indicator.Indicator(None).select_next()
|
|
assert keyboards[0]["active_layout_index"] == 1
|
|
print("ok - the shortcut reader cycles compositor layouts when Fcitx is unavailable")
|
|
|
|
keyboards = [{"name": "physical", "layout": "us,dk", "active_layout_index": 0}]
|
|
state = {"methods": ["keyboard-us", "mozc", "hangul"], "current": "keyboard-us"}
|
|
assert indicator.cycle_choice(state, keyboards) == ("keyboard-us", 1)
|
|
assert indicator.cycle_choice(state, keyboards, -1) == ("hangul", None)
|
|
state["current"] = "mozc"
|
|
assert indicator.cycle_choice(state, keyboards, -1) == ("keyboard-us", 1)
|
|
assert indicator.cycle_choice({"methods": ["keyboard-us", "mozc", "hangul"], "current": "keyboard-us"}, [], -1) == ("hangul", None)
|
|
assert indicator.layout_switches(keyboards, step=-1)[0][-1] == "1"
|
|
print("ok - cycling back walks the same choices in reverse")
|
|
|
|
PY
|
|
|
|
stubs=$(mktemp -d)
|
|
trap 'rm -rf "$stubs"' EXIT
|
|
calls="$stubs/calls"
|
|
cat >"$stubs/omarchy-shell" <<'SH'
|
|
#!/bin/bash
|
|
echo "shell $*" >>"$CALLS"
|
|
echo "$SHELL_REPLY"
|
|
SH
|
|
chmod +x "$stubs/omarchy-shell"
|
|
|
|
CALLS=$calls SHELL_REPLY=ok PATH="$stubs:$PATH" OMARCHY_PATH="$ROOT" "$ROOT/bin/omarchy-input-method" cycle
|
|
[[ $(<"$calls") == "shell shell cycleInput next" ]] || fail "Super+I goes through the shell's reader" "$(<"$calls")"
|
|
pass "Super+I goes through the shell's reader, which retains a choice made without focus"
|
|
|
|
if CALLS=$calls SHELL_REPLY="not running" PATH="$stubs:$PATH" OMARCHY_PATH="$ROOT" "$ROOT/bin/omarchy-input-method" cycle 2>/dev/null; then
|
|
fail "Super+I reports a missing input reader"
|
|
fi
|
|
pass "Super+I reports a missing input reader instead of silently doing nothing"
|
|
|
|
: >"$calls"
|
|
CALLS=$calls SHELL_REPLY=ok PATH="$stubs:$PATH" OMARCHY_PATH="$ROOT" "$ROOT/bin/omarchy-input-method" cycle back
|
|
[[ $(<"$calls") == "shell shell cycleInput back" ]] || fail "Super+Shift+I cycles back" "$(<"$calls")"
|
|
if CALLS=$calls PATH="$stubs:$PATH" OMARCHY_PATH="$ROOT" "$ROOT/bin/omarchy-input-method" cycle sideways 2>/dev/null; then
|
|
fail "an unknown cycle direction is rejected"
|
|
fi
|
|
pass "Super+Shift+I cycles back through the shell, and other directions are rejected"
|