From 959cbabdff475858c371544941a151bb9bcc6976 Mon Sep 17 00:00:00 2001 From: Lef Date: Tue, 17 Nov 2026 13:47:08 +0200 Subject: [PATCH 01/19] settings: keyboard backend for hardware and on-screen layouts keyboard.sh edits only the live kb_layout, kb_variant and the grp: part of kb_options in ~/.config/hypr/input.lua (backup, flock, abort if the file changed), applies it live with hyprctl eval instead of a reload, and writes the same list to the input-sources gsettings key for the OSK. Test uses fake input.lua files, a fake hyprctl and gsettings. --- .../omamobile-settings/backends/keyboard.sh | 339 ++++++++++++++++++ .../test/keyboard-backend.sh | 151 ++++++++ 2 files changed, 490 insertions(+) create mode 100755 packages/omamobile-settings/backends/keyboard.sh create mode 100755 packages/omamobile-settings/test/keyboard-backend.sh diff --git a/packages/omamobile-settings/backends/keyboard.sh b/packages/omamobile-settings/backends/keyboard.sh new file mode 100755 index 000000000..48d347a17 --- /dev/null +++ b/packages/omamobile-settings/backends/keyboard.sh @@ -0,0 +1,339 @@ +#!/bin/bash +# SPDX-License-Identifier: MIT +# Keyboard layouts for the Settings app. The hardware keyboard's layouts live in Omarchy's user file +# ~/.config/hypr/input.lua (kb_layout, kb_variant and the grp: switch key in kb_options); the on-screen +# keyboard's list is gsettings org.gnome.desktop.input-sources sources. This keeps both the same. +# Prints one line of JSON. +# keyboard.sh get {"layouts":[{"layout":"us","variant":""}],"switchKey":"","active":0} +# keyboard.sh set layouts us,gr[:variant] 1 to 4 layouts, each a name (and variant) in the xkb rules list +# keyboard.sh set switch-key grp:OPTION or "none"; one layout left always drops the switch key +# "active" is the index Hyprland reports for the first real keyboard, or null without one. A set answer +# carries "warn" when the first layout is not a Latin one (a password typed on the lock screen would be +# typed in it). input.lua is edited in place: only the last live kb_layout, kb_variant and kb_options +# strings change, comments and every other option (grp_led:caps, compose:...) stay, a copy of the old +# file goes to input.lua.bak-omamobile first, and the write is dropped if the file changed meanwhile. +# A file with no live kb_layout is an error: nothing is appended, so a second input table never appears. +# The change is applied live without `hyprctl reload` (a reload sets the configured refresh rate again and +# re-runs phone.lua), then written to gsettings in the same order. +# Test hooks (nothing in the environment sets them): OMAMOBILE_KBD_INPUT is the input.lua path, +# OMAMOBILE_KBD_RULES the xkb rules .lst file; the test puts a fake hyprctl and gsettings first on PATH. +set -euo pipefail +set +x +fail() { printf '{"error":"%s"}\n' "$1"; exit 2; } + +find_hypr() { + [[ -n ${HYPRLAND_INSTANCE_SIGNATURE:-} ]] && return 0 + local d best='' sig + for d in "${XDG_RUNTIME_DIR:-/run/user/$(id -u)}"/hypr/*/; do + [[ -S $d.socket.sock ]] || continue + if [[ -z $best || $d.socket.sock -nt $best.socket.sock ]]; then best=$d; fi + done + [[ -n $best ]] || return 0 + sig=${best%/}; sig=${sig##*/} + export HYPRLAND_INSTANCE_SIGNATURE=$sig +} +find_hypr + +input=${OMAMOBILE_KBD_INPUT:-${XDG_CONFIG_HOME:-$HOME/.config}/hypr/input.lua} +rules=${OMAMOBILE_KBD_RULES:-} +if [[ -z $rules ]]; then + for f in /usr/share/X11/xkb/rules/base.lst /usr/share/X11/xkb/rules/evdev.lst; do + [[ -r $f ]] && { rules=$f; break; } + done +fi +export KBD_INPUT=$input KBD_RULES=$rules + +/usr/bin/python3 -I - "$@" <<'PY' || exit 2 +import fcntl, hashlib, json, os, re, shutil, subprocess, sys + +KEYS = ("kb_layout", "kb_variant", "kb_options") +NAME_RE = re.compile(r"[a-z][a-z0-9_-]{0,31}") +SWITCH_RE = re.compile(r"grp:[a-z0-9_]{1,48}") +OPTION_RE = re.compile(r"[a-z0-9_]{1,32}:[A-Za-z0-9_]{1,48}") +LATIN = {"us", "gb", "de", "fr", "es", "it", "pt", "nl", "be", "ch", "at", "se", "no", "dk", "fi", + "is", "ie", "pl", "cz", "sk", "hu", "ro", "hr", "si", "ee", "lv", "lt", "tr", "br", "latam", + "ca", "au", "nz", "za", "epo"} +MAX = 4 +path = os.environ["KBD_INPUT"] + +def out(obj): + print(json.dumps(obj, separators=(",", ":"))) + +def fail(msg): + out({"error": msg}) + sys.exit(2) + +# Lua tokens, enough to see live `key = "string"` assignments: comments and long strings are skipped, +# so an assignment inside `-- ...` or `--[[ ... ]]` is invisible (the same rules as the desktop plugin). +def tokens(text): + i, n = 0, len(text) + while i < n: + m = re.compile(r"--\[(=*)\[").match(text, i) + if m: + e = text.find("]" + m.group(1) + "]", m.end()) + i = n if e < 0 else e + len(m.group(1)) + 2 + continue + if text.startswith("--", i): + e = text.find("\n", i) + i = n if e < 0 else e + continue + c = text[i] + if c.isspace(): + i += 1 + continue + if c in "\"'": + m = re.compile(r"(?:\\.|[^\\\n%s])*" % c, re.S).match(text, i + 1) + e = m.end() + closed = e < n and text[e] == c + yield ("string", text[i + 1:e], i, e + 1 if closed else e, not closed) + i = e + 1 if closed else e + continue + m = re.compile(r"\[(=*)\[").match(text, i) + if m: + e = text.find("]" + m.group(1) + "]", m.end()) + stop = n if e < 0 else e + len(m.group(1)) + 2 + yield ("long", "", i, stop, True) + i = stop + continue + m = re.compile(r"[A-Za-z_][A-Za-z0-9_]*").match(text, i) + if m: + yield ("ident", m.group(0), i, m.end(), False) + i = m.end() + continue + if text.startswith("==", i): + yield ("other", "==", i, i + 2, False) + i += 2 + continue + yield ("eq" if c == "=" else "other", c, i, i + 1, False) + i += 1 + +# The last live assignment of each key wins, as a later hl.config() overrides an earlier one. +def scan(text): + t = list(tokens(text)) + found = {} + for a, b, c in zip(t, t[1:], t[2:]): + if a[0] == "ident" and a[1] in KEYS and b[0] == "eq" and c[0] in ("string", "long"): + found[a[1]] = c + return found + +def fields(raw): + return [x.strip() for x in raw.split(",")] if raw.strip() else [] + +def parse(text): + found = scan(text) + vals = {} + for k, tok in found.items(): + if tok[0] == "long" or tok[4]: + fail("input.lua: %s is not a plain string" % k) + if re.search(r"[\x00-\x1f\x7f\\\"]", tok[1]) or len(tok[1]) > 512: + fail("input.lua: %s has characters this editor does not handle" % k) + vals[k] = tok[1] + layouts = fields(vals.get("kb_layout", "")) + variants = fields(vals.get("kb_variant", "")) + variants = (variants + [""] * len(layouts))[:len(layouts)] + options = [o for o in fields(vals.get("kb_options", "")) if o] + return found, layouts, variants, options + +def read_file(): + try: + with open(path, "rb") as f: + data = f.read(1 << 20) + st = os.fstat(f.fileno()) + except FileNotFoundError: + fail("input.lua is missing") + except OSError: + fail("cannot read input.lua") + try: + text = data.decode("utf-8") + except UnicodeDecodeError: + fail("input.lua is not UTF-8") + return data, st, text + +def run(cmd): + try: + r = subprocess.run(cmd, capture_output=True, text=True, timeout=5) + except (OSError, subprocess.TimeoutExpired): + return None + return r.stdout if r.returncode == 0 else None + +def active(): + s = run(["hyprctl", "-j", "devices"]) + try: + kbs = json.loads(s)["keyboards"] + except (TypeError, ValueError, KeyError): + return None + real = [k for k in kbs if not re.match(r"hl-virtual-keyboard|.*(consumer-control|power-button|video-bus)", + str(k.get("name", "")))] + pick = [k for k in real if k.get("main")] or real + if not pick: + return None + i = pick[0].get("active_layout_index") + return i if isinstance(i, int) and i >= 0 else None + +def state(layouts, variants, options): + sw = next((o for o in options if o.startswith("grp:")), "") + return {"layouts": [{"layout": l, "variant": v} for l, v in zip(layouts, variants)], + "switchKey": sw, "active": active()} + +def rules(): + lay, var, opt, sec = set(), set(), set(), None + p = os.environ.get("KBD_RULES") or "" + try: + with open(p, encoding="utf-8", errors="replace") as f: + for line in f: + if line.startswith("!"): + sec = line[1:].strip() + continue + w = line.split() + if not w: + continue + if sec == "layout": + lay.add(w[0]) + elif sec == "variant" and len(w) > 1 and w[1].endswith(":"): + var.add((w[1][:-1], w[0])) + elif sec == "option": + opt.add(w[0]) + except OSError: + fail("cannot read the xkb layout list") + return lay, var, opt + +def write(data, st, text, found, new): + edits = sorted(((found[k][2], found[k][3], v) for k, v in new.items() if k in found), reverse=True) + for s, e, v in edits: + text = text[:s] + '"' + v + '"' + text[e:] + missing = [k for k in KEYS if k in new and k not in found] + if missing: + # A missing key goes on its own line right after the live kb_layout, only when that line ends + # with a comma, so it lands in the same `input = { }` table. Anything else is an error. + anchor = scan(text)["kb_layout"] + ls = text.rfind("\n", 0, anchor[2]) + 1 + indent = re.match(r"[ \t]*", text[ls:]).group(0) + le = text.find("\n", anchor[3]) + le = len(text) if le < 0 else le + if not re.fullmatch(r"[ \t]*,[ \t]*(--[^\n]*)?", text[anchor[3]:le]): + fail("input.lua: cannot add %s next to kb_layout" % missing[0]) + text = text[:le] + "".join('\n%s%s = "%s",' % (indent, k, new[k]) for k in missing) + text[le:] + updated = text.encode("utf-8") + if updated == data: + return + bak = path + ".bak-omamobile" + tmp = "%s.tmp-omamobile.%d" % (path, os.getpid()) + try: + shutil.copyfile(path, bak) + fd = os.open(tmp, os.O_WRONLY | os.O_CREAT | os.O_EXCL, st.st_mode & 0o777) + with os.fdopen(fd, "wb") as f: + f.write(updated) + f.flush() + os.fsync(f.fileno()) + with open(path, "rb") as f: + now = f.read(1 << 20) + nst = os.fstat(f.fileno()) + if (hashlib.sha256(now).digest() != hashlib.sha256(data).digest() + or (nst.st_ino, nst.st_mtime_ns) != (st.st_ino, st.st_mtime_ns)): + os.unlink(tmp) + fail("input.lua changed while saving, nothing written") + os.replace(tmp, path) + except OSError: + try: + os.unlink(tmp) + except OSError: + pass + fail("cannot write input.lua") + +# Live apply without `hyprctl reload`. UNVERIFIED on the phone: that Hyprland 0.57 takes +# `hyprctl eval 'hl.config({ input = {...} })'` for the keymap and re-applies it to keyboards already +# connected. The form is the one patch 0006 uses for other options; `hyprctl keyword` is the fallback. +def apply_live(layouts, variants, options): + kv = {"kb_layout": ",".join(layouts), "kb_variant": ",".join(variants) if any(variants) else "", + "kb_options": ",".join(options)} + lua = "hl.config({ input = { %s } })" % ", ".join('%s = "%s"' % (k, kv[k]) for k in KEYS) + r = run(["hyprctl", "eval", lua]) + if r is not None and "error" not in r.lower(): + return True + ok = True + for k in ("kb_variant", "kb_options", "kb_layout"): + r = run(["hyprctl", "keyword", "input:" + k, kv[k]]) + ok = ok and r is not None and "error" not in r.lower() + return ok + +def sync_osk(layouts, variants): + src = ", ".join("('xkb', '%s')" % (l + ("+" + v if v else "")) for l, v in zip(layouts, variants)) + return run(["gsettings", "set", "org.gnome.desktop.input-sources", "sources", "[%s]" % src]) is not None + +def effective_options(): + s = run(["hyprctl", "-j", "getoption", "input:kb_options"]) or "" + try: + v = json.loads(s).get("str", "") + except (ValueError, AttributeError): + v = "" + return [o for o in fields(v) if OPTION_RE.fullmatch(o)] + +args = sys.argv[1:] +verb = args[0] if args else "" +if verb == "get": + _, _, text = read_file() + found, layouts, variants, options = parse(text) + if "kb_layout" not in found: + fail("input.lua has no kb_layout") + out(state(layouts, variants, options)) + sys.exit(0) +if verb != "set": + fail("usage: get|set") +key = args[1] if len(args) > 1 else "" +value = args[2] if len(args) > 2 else "" +if key not in ("layouts", "switch-key"): + fail("unknown key") +lay, var, opt = rules() +if key == "layouts": + items = value.split(",") if value else [] + if not 1 <= len(items) <= MAX: + fail("give 1 to 4 layouts") + new_l, new_v = [], [] + for it in items: + l, _, v = it.partition(":") + if not NAME_RE.fullmatch(l) or (v and not NAME_RE.fullmatch(v)): + fail("bad layout name") + if l not in lay or (v and (l, v) not in var): + fail("unknown layout: " + it) + if (l, v) in zip(new_l, new_v): + fail("layout listed twice: " + it) + new_l.append(l); new_v.append(v) +else: + if value != "none" and (not SWITCH_RE.fullmatch(value) or value not in opt): + fail("unknown switch key") + +lockpath = path + ".lock-omamobile" +try: + lockf = open(lockpath, "a") + fcntl.flock(lockf, fcntl.LOCK_EX) +except OSError: + fail("cannot lock input.lua") +data, st, text = read_file() +found, layouts, variants, options = parse(text) +if "kb_layout" not in found: + fail("input.lua has no kb_layout") +if "kb_options" not in found: + options = effective_options() # keep Omarchy's defaults when input.lua does not set kb_options +if key == "layouts": + layouts, variants = new_l, new_v + sw = [o for o in options if o.startswith("grp:")] +else: + sw = [] if value == "none" else [value] +if len(layouts) < 2: + sw = [] +options = [o for o in options if not o.startswith("grp:")] + sw[:1] +new = {"kb_layout": ",".join(layouts), "kb_options": ",".join(options)} +if "kb_options" not in found and not options: + del new["kb_options"] +if any(variants) or "kb_variant" in found: + new["kb_variant"] = ",".join(variants) if any(variants) else "" +write(data, st, text, found, new) +if not apply_live(layouts, variants, options): + fail("saved to input.lua, but Hyprland did not take it live") +if not sync_osk(layouts, variants): + fail("saved and applied, but the on-screen keyboard list was not updated") +res = state(layouts, variants, options) +if layouts[0] not in LATIN: + res["warn"] = "the first layout is not a Latin one: passwords on the lock screen are typed in it" +out(res) +PY diff --git a/packages/omamobile-settings/test/keyboard-backend.sh b/packages/omamobile-settings/test/keyboard-backend.sh new file mode 100755 index 000000000..1fd950aa6 --- /dev/null +++ b/packages/omamobile-settings/test/keyboard-backend.sh @@ -0,0 +1,151 @@ +#!/bin/bash +# SPDX-License-Identifier: MIT +# backends/keyboard.sh against fake input.lua files, a small xkb rules list and a fake hyprctl and gsettings +# first on PATH that log their arguments. The host's own files and tools are never touched. +set -euo pipefail +src=$(CDPATH='' cd -- "$(dirname -- "$0")/.." && pwd) +tmp=$(mktemp -d); trap 'rm -rf -- "$tmp"' EXIT +mkdir -p "$tmp/bin" "$tmp/run" +cat > "$tmp/bin/hyprctl" <<'EOT' +#!/bin/bash +printf '%s\n' "$*" >> "$FAKE_LOG" +case "$1 $2" in + "-j devices") cat "$FAKE_DEVICES" 2>/dev/null || exit 1 ;; + "-j getoption") printf '{"option":"input:kb_options","str":"%s","set":true}\n' "${FAKE_OPTIONS:-}" ;; + eval*) [[ -n ${FAKE_EVAL_FAIL:-} ]] && echo "error: no eval" || echo ok ;; + keyword*) [[ -n ${FAKE_KEYWORD_FAIL:-} ]] && echo "error: bad" || echo ok ;; +esac +EOT +cat > "$tmp/bin/gsettings" <<'EOT' +#!/bin/bash +printf 'gsettings %s\n' "$*" >> "$FAKE_LOG" +[[ -z ${FAKE_GSETTINGS_FAIL:-} ]] +EOT +chmod +x "$tmp/bin/hyprctl" "$tmp/bin/gsettings" +cat > "$tmp/rules.lst" <<'EOT' +! layout + us English (US) + gr Greek + de German + ru Russian + +! variant + polytonic gr: Greek (polytonic) + intl us: English (US, intl., with dead keys) + +! option + grp Switching to another layout + grp:alt_shift_toggle Alt+Shift + grp:caps_toggle Caps Lock + grp_led:caps Caps Lock +EOT +cat > "$tmp/devices.json" <<'EOT' +{"keyboards":[{"name":"hl-virtual-keyboard-squeekboard","active_layout_index":0,"main":false}, +{"name":"dell-kb7120w","active_layout_index":1,"main":true}]} +EOT +export PATH="$tmp/bin:$PATH" FAKE_LOG="$tmp/log" FAKE_DEVICES="$tmp/devices.json" +export XDG_RUNTIME_DIR="$tmp/run" HYPRLAND_INSTANCE_SIGNATURE=test +export OMAMOBILE_KBD_INPUT="$tmp/input.lua" OMAMOBILE_KBD_RULES="$tmp/rules.lst" +unset FAKE_OPTIONS FAKE_EVAL_FAIL FAKE_KEYWORD_FAIL FAKE_GSETTINGS_FAIL +run() { bash "$src/backends/keyboard.sh" "$@" || true; } +eq() { [[ $1 == "$2" ]] || { echo "FAIL: got $1, want $2" >&2; exit 1; }; } +has() { grep -qF -- "$2" "$1" || { echo "FAIL: $1 lacks $2" >&2; cat "$1" >&2; exit 1; }; } +hasnt() { ! grep -qF -- "$2" "$1" || { echo "FAIL: $1 has $2" >&2; exit 1; }; } + +# Omarchy-style file: comments, an earlier overridden block, grp_led:caps and another option +cat > "$tmp/input.lua" <<'EOT' +-- kb_layout = "fr", a comment, never touched +hl.config({ input = { kb_layout = "de" } }) +--[[ kb_layout = "ru", + kb_options = "grp:caps_toggle" ]] +hl.config({ + input = { + kb_layout = "us", + kb_options = "compose:caps,grp:caps_toggle,grp_led:caps", -- keep me + repeat_rate = 40, + }, +}) +EOT +chmod 640 "$tmp/input.lua" +eq "$(run get)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"grp:caps_toggle","active":1}' + +: > "$tmp/log" +eq "$(run set layouts us,gr:polytonic)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"grp:caps_toggle","active":1}' +has "$tmp/input.lua" 'kb_layout = "us,gr",' +has "$tmp/input.lua" 'kb_variant = ",polytonic",' +has "$tmp/input.lua" 'kb_options = "compose:caps,grp_led:caps,grp:caps_toggle", -- keep me' +has "$tmp/input.lua" '-- kb_layout = "fr", a comment, never touched' +has "$tmp/input.lua" 'hl.config({ input = { kb_layout = "de" } })' +has "$tmp/input.lua" ' kb_options = "grp:caps_toggle" ]]' +eq "$(grep -c 'hl.config' "$tmp/input.lua")" 2 +eq "$(stat -c %a "$tmp/input.lua")" 640 +has "$tmp/input.lua.bak-omamobile" 'kb_layout = "us",' +has "$tmp/log" 'eval hl.config({ input = { kb_layout = "us,gr", kb_variant = ",polytonic", kb_options = "compose:caps,grp_led:caps,grp:caps_toggle" } })' +has "$tmp/log" "gsettings set org.gnome.desktop.input-sources sources [('xkb', 'us'), ('xkb', 'gr+polytonic')]" +hasnt "$tmp/log" 'reload' +eq "$(run get)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"grp:caps_toggle","active":1}' + +# the switch key: only the grp: part changes +eq "$(run set switch-key grp:alt_shift_toggle)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"grp:alt_shift_toggle","active":1}' +has "$tmp/input.lua" 'kb_options = "compose:caps,grp_led:caps,grp:alt_shift_toggle",' +eq "$(run set switch-key none | grep -o '"switchKey":"[^"]*"')" '"switchKey":""' +has "$tmp/input.lua" 'kb_options = "compose:caps,grp_led:caps",' +run set switch-key grp:caps_toggle >/dev/null +# one layout left drops the switch key and the variant; grp_led stays +eq "$(run set layouts us)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"","active":1}' +has "$tmp/input.lua" 'kb_options = "compose:caps,grp_led:caps",' +has "$tmp/input.lua" 'kb_variant = "",' + +# a non-Latin first layout is saved with a warning +eq "$(run set layouts gr,us | grep -c "\"warn\":\"the first layout is not a Latin one")" 1 +eq "$(run set layouts us,gr | grep -c warn || true)" 0 + +# bad input never reaches the file +cp "$tmp/input.lua" "$tmp/before" +eq "$(run set layouts us,gr,de,ru,us:intl)" '{"error":"give 1 to 4 layouts"}' +eq "$(run set layouts us,xx)" '{"error":"unknown layout: xx"}' +eq "$(run set layouts us,gr:intl)" '{"error":"unknown layout: gr:intl"}' +eq "$(run set layouts 'us,gr"')" '{"error":"bad layout name"}' +eq "$(run set layouts us,us)" '{"error":"layout listed twice: us"}' +eq "$(run set layouts '')" '{"error":"give 1 to 4 layouts"}' +eq "$(run set switch-key grp:nope)" '{"error":"unknown switch key"}' +eq "$(run set switch-key 'grp:caps_toggle"')" '{"error":"unknown switch key"}' +eq "$(run set numlock on)" '{"error":"unknown key"}' +eq "$(run nonsense)" '{"error":"usage: get|set"}' +cmp -s "$tmp/input.lua" "$tmp/before" || { echo "FAIL: a rejected set changed input.lua" >&2; exit 1; } + +# no kb_layout: an error, nothing appended +printf -- '-- empty\nhl.config({ input = { repeat_rate = 40 } })\n' > "$tmp/input.lua" +cp "$tmp/input.lua" "$tmp/before" +eq "$(run get)" '{"error":"input.lua has no kb_layout"}' +eq "$(run set layouts us,gr)" '{"error":"input.lua has no kb_layout"}' +cmp -s "$tmp/input.lua" "$tmp/before" || { echo "FAIL: input.lua was changed" >&2; exit 1; } +rm "$tmp/input.lua" +eq "$(run get)" '{"error":"input.lua is missing"}' + +# kb_options and kb_variant absent: added on the kb_layout line's table, Omarchy's effective options kept +printf 'hl.config({\n input = {\n kb_layout = "us",\n },\n})\n' > "$tmp/input.lua" +FAKE_OPTIONS='compose:caps' eq "$(FAKE_OPTIONS=compose:caps run set layouts us,gr:polytonic | grep -o '"switchKey":"[^"]*"')" '"switchKey":""' +has "$tmp/input.lua" ' kb_layout = "us,gr",' +has "$tmp/input.lua" ' kb_variant = ",polytonic",' +has "$tmp/input.lua" ' kb_options = "compose:caps",' +eq "$(grep -c 'hl.config' "$tmp/input.lua")" 1 +# a kb_layout that is not followed by a comma: refused rather than guessed +printf 'hl.config({ input = { kb_layout = "us" } })\n' > "$tmp/input.lua" +eq "$(run set layouts us,gr:polytonic)" '{"error":"input.lua: cannot add kb_variant next to kb_layout"}' +eq "$(run set layouts us,gr)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":""}],"switchKey":"","active":1}' +# a value this editor does not handle is refused +printf 'hl.config({ input = { kb_layout = [[us]], } })\n' > "$tmp/input.lua" +eq "$(run get)" '{"error":"input.lua: kb_layout is not a plain string"}' + +# eval refused: the keyword fallback; both refused: says which half failed +printf 'hl.config({ input = {\n kb_layout = "us",\n kb_options = "grp_led:caps",\n} })\n' > "$tmp/input.lua" +: > "$tmp/log" +FAKE_EVAL_FAIL=1 run set layouts us,gr >/dev/null +has "$tmp/log" 'keyword input:kb_layout us,gr' +eq "$(FAKE_EVAL_FAIL=1 FAKE_KEYWORD_FAIL=1 run set layouts us,de)" '{"error":"saved to input.lua, but Hyprland did not take it live"}' +has "$tmp/input.lua" 'kb_layout = "us,de",' +eq "$(FAKE_GSETTINGS_FAIL=1 run set layouts us,gr)" '{"error":"saved and applied, but the on-screen keyboard list was not updated"}' +# no Hyprland: active is null +FAKE_DEVICES=$tmp/none eq "$(FAKE_DEVICES=$tmp/none run get)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":""}],"switchKey":"","active":null}' +echo "keyboard backend: ok" From b503a1dc07a6d21e8391c1421ed345e77c17d8c8 Mon Sep 17 00:00:00 2001 From: Lef Date: Tue, 17 Nov 2026 13:47:08 +0200 Subject: [PATCH 02/19] settings: install the keyboard backend and run its test --- packages/omamobile-settings/install | 1 + packages/omamobile-settings/test/all | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/omamobile-settings/install b/packages/omamobile-settings/install index 2963f0a8b..2499bbcb4 100755 --- a/packages/omamobile-settings/install +++ b/packages/omamobile-settings/install @@ -11,3 +11,4 @@ install -Dm644 "$source_dir/org.omamobile.Settings.desktop" "$dest/usr/share/app install -Dm644 "$source_dir/org.omamobile.Settings.svg" "$dest/usr/share/icons/hicolor/scalable/apps/org.omamobile.Settings.svg" install -Dm644 "$source_dir/LICENSE" "$dest/usr/share/licenses/omamobile-settings/LICENSE" install -Dm755 "$source_dir/backends/display.sh" "$dest/usr/lib/omamobile-settings/backends/display.sh" +install -Dm755 "$source_dir/backends/keyboard.sh" "$dest/usr/lib/omamobile-settings/backends/keyboard.sh" diff --git a/packages/omamobile-settings/test/all b/packages/omamobile-settings/test/all index d0c6618eb..752cab084 100755 --- a/packages/omamobile-settings/test/all +++ b/packages/omamobile-settings/test/all @@ -5,6 +5,7 @@ source_dir=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd) build_dir=${OMAMOBILE_SETTINGS_TEST_BUILD_DIR:-"$source_dir/build/tests"} "$source_dir/bin/build" "$source_dir/test/display-backend.sh" +"$source_dir/test/keyboard-backend.sh" mkdir -p "$build_dir" fixture=$(mktemp -d) trap 'rm -rf -- "$fixture"' EXIT HUP INT TERM From e5ffa8bf57a5243050cf9ade93fb6f86af2b9e78 Mon Sep 17 00:00:00 2001 From: Lef Date: Tue, 17 Nov 2026 14:03:14 +0200 Subject: [PATCH 03/19] settings: keyboard page with layouts, order and switch key keyboard.sh gets a list verb (layouts and grp: switch keys from the xkb rules file). The action runner allows the keyboard tool with its wider argument set and reads up to 32 KiB of output. --- .../omamobile-settings/app/KeyboardPage.qml | 144 ++++++++++++++++++ packages/omamobile-settings/app/Main.qml | 2 +- .../omamobile-settings/app/actionrunner.cpp | 9 +- .../omamobile-settings/app/actionrunner.h | 2 +- packages/omamobile-settings/app/catalog.json | 11 ++ .../omamobile-settings/app/icons/keyboard.svg | 1 + packages/omamobile-settings/app/resources.qrc | 2 + .../omamobile-settings/backends/keyboard.sh | 13 +- .../test/keyboard-backend.sh | 4 +- 9 files changed, 180 insertions(+), 8 deletions(-) create mode 100644 packages/omamobile-settings/app/KeyboardPage.qml create mode 100644 packages/omamobile-settings/app/icons/keyboard.svg diff --git a/packages/omamobile-settings/app/KeyboardPage.qml b/packages/omamobile-settings/app/KeyboardPage.qml new file mode 100644 index 000000000..8ae246a1a --- /dev/null +++ b/packages/omamobile-settings/app/KeyboardPage.qml @@ -0,0 +1,144 @@ +// SPDX-License-Identifier: MIT +// Keyboard layouts (up to 4) and the hardware switch key, through backends/keyboard.sh. Each change is +// saved and applied at once; the backend keeps the on-screen keyboard's list in the same order. +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import "." +Flickable { + id: page + clip: true + contentWidth: width; contentHeight: col.implicitHeight + boundsBehavior: Flickable.StopAtBounds + property var layouts: [] // ["us", "gr:polytonic"], index 0 = main layout + property string switchKey: "" + property var available: [] // [{layout, name}] + property var switchKeys: [] // [{option, name}] + property string status: qsTr("Reading the keyboard settings...") + property string warn: "" + property bool busy: true + property bool adding: false + property int reqId: -1 + property int listId: -1 + readonly property int maxLayouts: 4 + // Same set as LATIN in backends/keyboard.sh + readonly property var latin: ["us", "gb", "de", "fr", "es", "it", "pt", "nl", "be", "ch", "at", "se", "no", "dk", "fi", + "is", "ie", "pl", "cz", "sk", "hu", "ro", "hr", "si", "ee", "lv", "lt", "tr", "br", "latam", + "ca", "au", "nz", "za", "epo"] + function nameOf(code) { + const l = code.split(":")[0], v = code.split(":")[1] || "" + for (const a of available) if (a.layout === l) return v ? a.name + " (" + v + ")" : a.name + return code + } + function keyName(opt) { + for (const k of switchKeys) if (k.option === opt) return k.name + return opt + } + function apply(r) { + busy = false + if (r.error) { status = r.error; return } + if (!r.layouts) { status = qsTr("The keyboard backend gave no values."); return } + layouts = r.layouts.map(x => x.variant ? x.layout + ":" + x.variant : x.layout) + switchKey = r.switchKey || "" + warn = r.warn || (layouts.length && latin.indexOf(layouts[0].split(":")[0]) < 0 + ? qsTr("The first layout is not a Latin one: passwords on the lock screen are typed in it") : "") + status = qsTr("Changes apply at once to hardware keyboards and the on-screen keyboard.") + } + function save(list) { + busy = true; adding = false + reqId = actions.run("keyboard", ["set", "layouts", list.join(",")]) + } + function move(i, d) { + const l = layouts.slice(), j = i + d + if (j < 0 || j >= l.length) return + const t = l[i]; l[i] = l[j]; l[j] = t + save(l) + } + function remove(i) { const l = layouts.slice(); l.splice(i, 1); save(l) } + function add(code) { if (layouts.indexOf(code) < 0) save(layouts.concat([code])) } + Connections { + target: actions + function onFinished(tool, r, id) { + if (tool !== "keyboard") return + if (id === page.listId) { page.available = r.layouts || []; page.switchKeys = r.switchKeys || [] } + else if (id === page.reqId) page.apply(r) + } + } + Component.onCompleted: { listId = actions.run("keyboard", ["list"]); reqId = actions.run("keyboard", ["get"]) } + ColumnLayout { + id: col + width: page.width + spacing: 14 + SettingsLabel { text: qsTr("Layouts"); font.weight: Font.DemiBold; color: backend.foreground; Layout.fillWidth: true } + Repeater { + model: page.layouts + delegate: RowLayout { + required property string modelData + required property int index + Layout.fillWidth: true; spacing: 8 + SettingsLabel { + text: (index + 1) + ". " + page.nameOf(modelData) + color: backend.foreground; wrapMode: Text.Wrap; Layout.fillWidth: true + } + SettingsButton { text: "↑"; enabled: !page.busy && index > 0; onClicked: page.move(index, -1); Accessible.name: qsTr("Move up") } + SettingsButton { text: "↓"; enabled: !page.busy && index < page.layouts.length - 1; onClicked: page.move(index, 1); Accessible.name: qsTr("Move down") } + SettingsButton { text: "✕"; enabled: !page.busy && page.layouts.length > 1; onClicked: page.remove(index); Accessible.name: qsTr("Remove") } + } + } + SettingsLabel { + visible: page.warn !== "" + text: "⚠ " + page.warn + color: backend.foreground; wrapMode: Text.Wrap; Layout.fillWidth: true + } + SettingsButton { + visible: !page.adding && page.layouts.length < page.maxLayouts + enabled: !page.busy && page.available.length > 0 + text: qsTr("Add a layout") + onClicked: { filter.text = ""; page.adding = true } + } + SettingsTextField { + id: filter + visible: page.adding + Layout.fillWidth: true; Layout.preferredHeight: 52 + placeholderText: qsTr("Search layouts") + color: backend.foreground; placeholderTextColor: backend.muted + background: Rectangle { radius: Math.min(backend.radius, width / 2, height / 2); color: SettingsStyle.fill("normal") } + } + Repeater { + model: page.adding ? page.available.filter(a => { + const q = filter.text.toLowerCase() + return page.layouts.indexOf(a.layout) < 0 && (q === "" || a.name.toLowerCase().indexOf(q) >= 0 || a.layout.indexOf(q) >= 0) + }).slice(0, 30) : [] + delegate: SettingsButton { + required property var modelData + Layout.fillWidth: true + text: modelData.name + " (" + modelData.layout + ")" + enabled: !page.busy + onClicked: page.add(modelData.layout) + } + } + SettingsButton { visible: page.adding; text: qsTr("Cancel"); onClicked: page.adding = false } + SettingsLabel { + visible: page.layouts.length > 1 + text: qsTr("Switch key (hardware keyboard)"); font.weight: Font.DemiBold; color: backend.foreground + Layout.fillWidth: true; Layout.topMargin: 8 + } + Flow { + visible: page.layouts.length > 1 + Layout.fillWidth: true; spacing: 8 + Repeater { + model: [{ option: "none", name: qsTr("None") }].concat(page.switchKeys.filter(k => + ["grp:alt_shift_toggle", "grp:win_space_toggle", "grp:ctrl_shift_toggle", "grp:caps_toggle", + "grp:alt_space_toggle", "grp:ctrl_space_toggle"].indexOf(k.option) >= 0 || k.option === page.switchKey)) + delegate: SettingsButton { + required property var modelData + text: modelData.name + highlighted: modelData.option === "none" ? page.switchKey === "" : page.switchKey === modelData.option + enabled: !page.busy + onClicked: { page.busy = true; page.reqId = actions.run("keyboard", ["set", "switch-key", modelData.option]) } + } + } + } + SettingsLabel { text: page.status; color: backend.muted; font.pixelSize: SettingsStyle.fontPx(13); wrapMode: Text.Wrap; Layout.fillWidth: true } + } +} diff --git a/packages/omamobile-settings/app/Main.qml b/packages/omamobile-settings/app/Main.qml index 25a26417f..bcbc75545 100644 --- a/packages/omamobile-settings/app/Main.qml +++ b/packages/omamobile-settings/app/Main.qml @@ -24,7 +24,7 @@ ApplicationWindow { if (backend.searching) search.clear() backend.back() } - readonly property var customPages: ({ display: "DisplayPage.qml" }) + readonly property var customPages: ({ display: "DisplayPage.qml", keyboard: "KeyboardPage.qml" }) readonly property string customSource: backend.searching ? "" : (customPages[backend.page] || "") readonly property bool showingAbout: backend.page === "about" && !backend.searching Connections { diff --git a/packages/omamobile-settings/app/actionrunner.cpp b/packages/omamobile-settings/app/actionrunner.cpp index a118095f2..b44f2acf5 100644 --- a/packages/omamobile-settings/app/actionrunner.cpp +++ b/packages/omamobile-settings/app/actionrunner.cpp @@ -16,11 +16,14 @@ void ActionRunner::post(const QString &tool, const QVariantMap &result, int id) int ActionRunner::run(const QString &tool, const QStringList &args) { static const QRegularExpression word("\\A[a-z0-9]{1,16}\\z"); - static const QStringList tools = {"display"}; + // keyboard takes layout lists (us,gr:polytonic), switch-key and grp:option names + static const QRegularExpression kbdWord("\\A[a-z][a-z0-9_:,-]{0,159}\\z"); + static const QStringList tools = {"display", "keyboard"}; const int id = ++m_next; auto fail = [this, &tool, id](const QString &why) { post(tool, {{"error", why}}, id); return id; }; if (!tools.contains(tool) || args.size() > 3) return fail("unknown action"); - for (const auto &a : args) if (!word.match(a).hasMatch()) return fail("bad argument"); + const auto &allowed = tool == "keyboard" ? kbdWord : word; + for (const auto &a : args) if (!allowed.match(a).hasMatch()) return fail("bad argument"); const QString dir = "/usr/lib/omamobile-settings/backends"; auto *p = new QProcess(this); // bash would run a startup file named by these @@ -31,7 +34,7 @@ int ActionRunner::run(const QString &tool, const QStringList &args) { p->setProgram("/usr/bin/bash"); p->setArguments(QStringList{dir + "/" + tool + ".sh"} + args); connect(p, &QProcess::finished, this, [this, p, tool, id](int code, QProcess::ExitStatus st) { - const auto raw = p->readAllStandardOutput().left(4096); + const auto raw = p->readAllStandardOutput().left(32768); p->readAllStandardError(); auto obj = QJsonDocument::fromJson(raw).object(); if (obj.isEmpty() || st != QProcess::NormalExit) diff --git a/packages/omamobile-settings/app/actionrunner.h b/packages/omamobile-settings/app/actionrunner.h index e56a52234..5685d0b6a 100644 --- a/packages/omamobile-settings/app/actionrunner.h +++ b/packages/omamobile-settings/app/actionrunner.h @@ -4,7 +4,7 @@ #include #include -// Runs the source-owned backend scripts (display) with a fixed argument list and no shell. Pages call run(); +// Runs the source-owned backend scripts (display, keyboard) with a fixed argument list and no shell. Pages call run(); // the JSON the script prints comes back through finished(), always from the event loop and never before run() // has returned its id. class ActionRunner : public QObject { diff --git a/packages/omamobile-settings/app/catalog.json b/packages/omamobile-settings/app/catalog.json index 23efec22b..8aa44de2d 100644 --- a/packages/omamobile-settings/app/catalog.json +++ b/packages/omamobile-settings/app/catalog.json @@ -9,6 +9,13 @@ "icon": "display", "page": "display" }, + { + "id": "keyboard", + "title": "Keyboard", + "detail": "Layouts and the switch key", + "icon": "keyboard", + "page": "keyboard" + }, { "id": "about", "title": "About this device", @@ -25,5 +32,9 @@ "display": { "title": "Display", "rows": [] + }, + "keyboard": { + "title": "Keyboard", + "rows": [] } } diff --git a/packages/omamobile-settings/app/icons/keyboard.svg b/packages/omamobile-settings/app/icons/keyboard.svg new file mode 100644 index 000000000..e6b769689 --- /dev/null +++ b/packages/omamobile-settings/app/icons/keyboard.svg @@ -0,0 +1 @@ + diff --git a/packages/omamobile-settings/app/resources.qrc b/packages/omamobile-settings/app/resources.qrc index 0f18d70dc..8ce5b4243 100644 --- a/packages/omamobile-settings/app/resources.qrc +++ b/packages/omamobile-settings/app/resources.qrc @@ -4,6 +4,8 @@ Main.qml AboutPage.qml DisplayPage.qml + KeyboardPage.qml + icons/keyboard.svg icons/display.svg catalog.json icons/system.svg diff --git a/packages/omamobile-settings/backends/keyboard.sh b/packages/omamobile-settings/backends/keyboard.sh index 48d347a17..ab3af4856 100755 --- a/packages/omamobile-settings/backends/keyboard.sh +++ b/packages/omamobile-settings/backends/keyboard.sh @@ -5,6 +5,7 @@ # keyboard's list is gsettings org.gnome.desktop.input-sources sources. This keeps both the same. # Prints one line of JSON. # keyboard.sh get {"layouts":[{"layout":"us","variant":""}],"switchKey":"","active":0} +# keyboard.sh list {"layouts":[{"layout":"us","name":"English (US)"}],"switchKeys":[...]} # keyboard.sh set layouts us,gr[:variant] 1 to 4 layouts, each a name (and variant) in the xkb rules list # keyboard.sh set switch-key grp:OPTION or "none"; one layout left always drops the switch key # "active" is the index Hyprland reports for the first real keyboard, or null without one. A set answer @@ -175,7 +176,7 @@ def state(layouts, variants, options): return {"layouts": [{"layout": l, "variant": v} for l, v in zip(layouts, variants)], "switchKey": sw, "active": active()} -def rules(): +def rules(names=None): lay, var, opt, sec = set(), set(), set(), None p = os.environ.get("KBD_RULES") or "" try: @@ -187,6 +188,8 @@ def rules(): w = line.split() if not w: continue + if names is not None and sec in ("layout", "option"): + names.append((sec, w[0], " ".join(w[1:]))) if sec == "layout": lay.add(w[0]) elif sec == "variant" and len(w) > 1 and w[1].endswith(":"): @@ -277,8 +280,14 @@ if verb == "get": fail("input.lua has no kb_layout") out(state(layouts, variants, options)) sys.exit(0) +if verb == "list": + names = [] + rules(names) + out({"layouts": [{"layout": n, "name": d} for s, n, d in names if s == "layout" and NAME_RE.fullmatch(n)], + "switchKeys": [{"option": n, "name": d} for s, n, d in names if s == "option" and SWITCH_RE.fullmatch(n)]}) + sys.exit(0) if verb != "set": - fail("usage: get|set") + fail("usage: get|list|set") key = args[1] if len(args) > 1 else "" value = args[2] if len(args) > 2 else "" if key not in ("layouts", "switch-key"): diff --git a/packages/omamobile-settings/test/keyboard-backend.sh b/packages/omamobile-settings/test/keyboard-backend.sh index 1fd950aa6..3b3d64558 100755 --- a/packages/omamobile-settings/test/keyboard-backend.sh +++ b/packages/omamobile-settings/test/keyboard-backend.sh @@ -111,7 +111,7 @@ eq "$(run set layouts '')" '{"error":"give 1 to 4 layouts"}' eq "$(run set switch-key grp:nope)" '{"error":"unknown switch key"}' eq "$(run set switch-key 'grp:caps_toggle"')" '{"error":"unknown switch key"}' eq "$(run set numlock on)" '{"error":"unknown key"}' -eq "$(run nonsense)" '{"error":"usage: get|set"}' +eq "$(run nonsense)" '{"error":"usage: get|list|set"}' cmp -s "$tmp/input.lua" "$tmp/before" || { echo "FAIL: a rejected set changed input.lua" >&2; exit 1; } # no kb_layout: an error, nothing appended @@ -148,4 +148,6 @@ has "$tmp/input.lua" 'kb_layout = "us,de",' eq "$(FAKE_GSETTINGS_FAIL=1 run set layouts us,gr)" '{"error":"saved and applied, but the on-screen keyboard list was not updated"}' # no Hyprland: active is null FAKE_DEVICES=$tmp/none eq "$(FAKE_DEVICES=$tmp/none run get)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":""}],"switchKey":"","active":null}' +# list: layouts and grp: switch keys from the rules file, other options left out +eq "$(run list)" '{"layouts":[{"layout":"us","name":"English (US)"},{"layout":"gr","name":"Greek"},{"layout":"de","name":"German"},{"layout":"ru","name":"Russian"}],"switchKeys":[{"option":"grp:alt_shift_toggle","name":"Alt+Shift"},{"option":"grp:caps_toggle","name":"Caps Lock"}]}' echo "keyboard backend: ok" From a83ca73d5886ef9726b0a8aa9bc7abe76a230ec6 Mon Sep 17 00:00:00 2001 From: Lef Date: Tue, 17 Nov 2026 14:10:55 +0200 Subject: [PATCH 04/19] shell: omamobile-keyboard-switch and the layout follower next/set/lock switch every real keyboard (never squeekboard's virtual one) through hyprctl switchxkblayout and put the same layout, by name, first in the on-screen keyboard's list. A user service listens for activelayout so the xkb switch key moves the OSK too. Super+Alt+Shift+Space runs next on hardware keyboards (Super+Space is Omarchy's menu). The Settings page no longer offers grp:win_space_toggle for the same reason. --- .../omamobile-settings/app/KeyboardPage.qml | 2 +- .../bin/omamobile-keyboard-switch | 144 ++++++++++++++++++ packages/omamobile-shell/hypr/phone.lua | 5 + packages/omamobile-shell/install | 3 + .../user/omamobile-keyboard-switch.service | 16 ++ packages/omamobile-shell/test/all | 2 + .../omamobile-shell/test/keyboard-switch.sh | 69 +++++++++ 7 files changed, 240 insertions(+), 1 deletion(-) create mode 100755 packages/omamobile-shell/bin/omamobile-keyboard-switch create mode 100644 packages/omamobile-shell/systemd/user/omamobile-keyboard-switch.service create mode 100755 packages/omamobile-shell/test/keyboard-switch.sh diff --git a/packages/omamobile-settings/app/KeyboardPage.qml b/packages/omamobile-settings/app/KeyboardPage.qml index 8ae246a1a..c90cb4c4c 100644 --- a/packages/omamobile-settings/app/KeyboardPage.qml +++ b/packages/omamobile-settings/app/KeyboardPage.qml @@ -128,7 +128,7 @@ Flickable { Layout.fillWidth: true; spacing: 8 Repeater { model: [{ option: "none", name: qsTr("None") }].concat(page.switchKeys.filter(k => - ["grp:alt_shift_toggle", "grp:win_space_toggle", "grp:ctrl_shift_toggle", "grp:caps_toggle", + ["grp:alt_shift_toggle", "grp:ctrl_shift_toggle", "grp:caps_toggle", "grp:alt_space_toggle", "grp:ctrl_space_toggle"].indexOf(k.option) >= 0 || k.option === page.switchKey)) delegate: SettingsButton { required property var modelData diff --git a/packages/omamobile-shell/bin/omamobile-keyboard-switch b/packages/omamobile-shell/bin/omamobile-keyboard-switch new file mode 100755 index 000000000..9e43115c1 --- /dev/null +++ b/packages/omamobile-shell/bin/omamobile-keyboard-switch @@ -0,0 +1,144 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: MIT +"""Hardware keyboard layout switching, kept in step with the on-screen keyboard. + + omamobile-keyboard-switch next every real keyboard to the next layout + omamobile-keyboard-switch set N every real keyboard to layout N (0 = first) + omamobile-keyboard-switch lock layout 0 on every real keyboard and first in + the on-screen keyboard's list (lock screen, + polkit prompt: passwords are typed in layout 0) + omamobile-keyboard-switch listen follow Hyprland's activelayout events (the xkb + grp: switch key runs no command) and move the + same layout to the front of the OSK's list + +Real keyboards are the ones in `hyprctl -j devices` that are not squeekboard's +or another virtual keyboard (hl-virtual-keyboard*) or a pseudo-keyboard +(consumer-control, power-button, video-bus), the same set as the Settings +backend. The layout count and names come from the keyboard's own `layout` and +`variant` fields. The OSK follows by NAME, never by index: squeekboard and +omamobile-keyboard-languages move the current entry to the front of +org.gnome.desktop.input-sources sources, so its order changes on every switch. +A layout that is not in the OSK list is added by omamobile-keyboard-languages. + +UNVERIFIED on the phone's Hyprland (0.57): the socket2 `activelayout>>KB,NAME` +line format, `switchxkblayout` through `hyprctl --batch`, and the device JSON +fields. Checked only against Hyprland 0.56.2 on a desktop. + +OMAMOBILE_HYPRCTL and OMAMOBILE_KBD_LANGUAGES point elsewhere for tests.""" + +import glob +import json +import os +import socket +import subprocess +import sys + +HYPRCTL = os.environ.get("OMAMOBILE_HYPRCTL", "hyprctl") +LANGUAGES = os.environ.get("OMAMOBILE_KBD_LANGUAGES", "omamobile-keyboard-languages") +PSEUDO = ("consumer-control", "power-button", "video-bus") + + +def find_hypr(): + if os.environ.get("HYPRLAND_INSTANCE_SIGNATURE"): + return + run = os.environ.get("XDG_RUNTIME_DIR") or "/run/user/%d" % os.getuid() + socks = glob.glob(os.path.join(run, "hypr", "*", ".socket.sock")) + if socks: + newest = max(socks, key=os.path.getmtime) + os.environ["HYPRLAND_INSTANCE_SIGNATURE"] = os.path.basename(os.path.dirname(newest)) + + +def real(name): + return not name.startswith("hl-virtual-keyboard") and not any(p in name for p in PSEUDO) + + +def keyboards(): + r = subprocess.run([HYPRCTL, "-j", "devices"], capture_output=True, text=True) + if r.returncode: + sys.exit("omamobile-keyboard-switch: hyprctl devices failed") + try: + kbs = json.loads(r.stdout).get("keyboards", []) + except ValueError: + sys.exit("omamobile-keyboard-switch: hyprctl devices gave no JSON") + return [k for k in kbs if real(k.get("name", ""))] + + +def names(kb): + """xkb names as gsettings writes them: layout or layout+variant.""" + lay = kb.get("layout", "").split(",") + var = kb.get("variant", "").split(",") + var += [""] * (len(lay) - len(var)) + return [l + ("+" + v if v else "") for l, v in zip(lay, var) if l] + + +def main_kb(kbs): + return next((k for k in kbs if k.get("main")), kbs[0] if kbs else None) + + +def osk_front(name): + subprocess.run([LANGUAGES, "set", name], stdout=subprocess.DEVNULL) + + +def switch(n, kbs): + cmds = ["switchxkblayout %s %d" % (k["name"], n) for k in kbs] + if cmds: + subprocess.run([HYPRCTL, "--batch", "; ".join(cmds)], stdout=subprocess.DEVNULL) + + +def to(n, front=True): + kbs = keyboards() + kb = main_kb(kbs) + if kb is None: + return + lst = names(kb) + if not lst: + return + n %= len(lst) + switch(n, kbs) + if front: + osk_front(lst[n]) + + +def listen(): + find_hypr() + sig = os.environ.get("HYPRLAND_INSTANCE_SIGNATURE") + if not sig: + sys.exit("omamobile-keyboard-switch: no Hyprland") + run = os.environ.get("XDG_RUNTIME_DIR") or "/run/user/%d" % os.getuid() + s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + s.connect(os.path.join(run, "hypr", sig, ".socket2.sock")) + for line in s.makefile("r", encoding="utf-8", errors="replace"): + ev, _, data = line.rstrip("\n").partition(">>") + if ev != "activelayout": + continue + dev = data.split(",", 1)[0] + if not real(dev): # squeekboard's own keymap changes are not a hardware switch + continue + kb = next((k for k in keyboards() if k.get("name") == dev), None) + if kb is None: + continue + lst, i = names(kb), kb.get("active_layout_index") + # No loop: nothing turns a gsettings change back into a Hyprland switch, and `set` of the + # entry already in front leaves the list as it is (several keyboards report one switch). + if isinstance(i, int) and 0 <= i < len(lst): + osk_front(lst[i]) + + +def main(argv): + find_hypr() + if argv[:1] == ["next"]: + kb = main_kb(keyboards()) + i = kb.get("active_layout_index", 0) if kb else 0 + to((i if isinstance(i, int) else 0) + 1) + elif argv[:1] == ["set"] and len(argv) == 2 and argv[1].isdigit(): + to(int(argv[1])) + elif argv[:1] == ["lock"]: + to(0) + elif argv[:1] == ["listen"]: + listen() + else: + sys.exit(__doc__) + + +if __name__ == "__main__": + main(sys.argv[1:]) diff --git a/packages/omamobile-shell/hypr/phone.lua b/packages/omamobile-shell/hypr/phone.lua index 08ae4f943..13efac92b 100644 --- a/packages/omamobile-shell/hypr/phone.lua +++ b/packages/omamobile-shell/hypr/phone.lua @@ -189,6 +189,11 @@ o.bind("XF86Keyboard", "Keyboard: hide", "omarchy-shell shell call omamobile.key -- keyboard's surface where taps didn't land, and offered a GNOME settings -- panel the phone doesn't have. XF86MediaLanguageMenu is KEY_LANGUAGE's. o.bind("XF86MediaLanguageMenu", "Keyboard: languages", "omarchy-shell shell call omamobile.keyboard languages ''", { device = osk_only }) +-- Next layout on a hardware keyboard (all of them, and the on-screen keyboard +-- follows). Super + Space is Omarchy's menu, so this takes Super + Alt + +-- Shift + Space, which Omarchy's defaults leave free (checked with +-- `hyprctl binds` on a desktop, Hyprland 0.56.2; not yet on the phone). +o.bind("SUPER + ALT + SHIFT + SPACE", "Keyboard: next layout", "omamobile-keyboard-switch next", { device = not_osk }) -- Resolving squeekboard's binds by keysym also lets its Ctrl, Alt, Tab, -- Delete and F-keys reach Omarchy's own binds, which they never did: Ctrl + -- Alt + Delete would close every window, F9 would start Voxtype instead of diff --git a/packages/omamobile-shell/install b/packages/omamobile-shell/install index f886a7c8d..23a7e32f2 100755 --- a/packages/omamobile-shell/install +++ b/packages/omamobile-shell/install @@ -49,6 +49,9 @@ ln -sfn ../omamobile-setup-user.service "$destination/usr/lib/systemd/user/graph install -Dm644 systemd/user/omamobile-osk-guard.service "$destination/usr/lib/systemd/user/omamobile-osk-guard.service" install -d "$destination/usr/lib/systemd/user/graphical-session.target.wants" ln -sfn ../omamobile-osk-guard.service "$destination/usr/lib/systemd/user/graphical-session.target.wants/omamobile-osk-guard.service" +# The OSK follows a hardware keyboard's layout switch, for every user's graphical session. +install -Dm644 systemd/user/omamobile-keyboard-switch.service "$destination/usr/lib/systemd/user/omamobile-keyboard-switch.service" +ln -sfn ../omamobile-keyboard-switch.service "$destination/usr/lib/systemd/user/graphical-session.target.wants/omamobile-keyboard-switch.service" # Sleep on screen-off, for every user's graphical session; it does nothing # until the user turns the omamobile-sleep toggle on. install -Dm644 systemd/user/omamobile-sleepd.service "$destination/usr/lib/systemd/user/omamobile-sleepd.service" diff --git a/packages/omamobile-shell/systemd/user/omamobile-keyboard-switch.service b/packages/omamobile-shell/systemd/user/omamobile-keyboard-switch.service new file mode 100644 index 000000000..a5b5e7f3f --- /dev/null +++ b/packages/omamobile-shell/systemd/user/omamobile-keyboard-switch.service @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: MIT +# Moves the on-screen keyboard to the layout a hardware keyboard switched to +# (the xkb grp: switch key runs no command). Enabled for every user by a +# vendor wants link; runs for the graphical session. +[Unit] +Description=Omarchy Mobile hardware keyboard layout follower +PartOf=graphical-session.target +After=graphical-session.target + +[Service] +ExecStart=/usr/bin/omamobile-keyboard-switch listen +Restart=always +RestartSec=5 + +[Install] +WantedBy=graphical-session.target diff --git a/packages/omamobile-shell/test/all b/packages/omamobile-shell/test/all index 0b80220d4..ad1b3fb7e 100755 --- a/packages/omamobile-shell/test/all +++ b/packages/omamobile-shell/test/all @@ -513,6 +513,8 @@ grep -c 'if (offset > Style.space(60)) sheet.dismissed()' plugins/omamobile.keyb if grep -n 'gnome-control-center\|Keyboard Settings' plugins/omamobile.keyboard/*.qml; then fail "no link to a GNOME settings panel the phone doesn't have"; fi python3 -B -c 'import ast,sys; ast.parse(open(sys.argv[1]).read())' bin/omamobile-keyboard-languages || fail "omamobile-keyboard-languages parses" bash test/keyboard-languages.sh >/dev/null || { bash test/keyboard-languages.sh; fail "omamobile-keyboard-languages"; } +python3 -B -c 'import ast,sys; ast.parse(open(sys.argv[1]).read())' bin/omamobile-keyboard-switch || fail "omamobile-keyboard-switch parses" +bash test/keyboard-switch.sh >/dev/null || { bash test/keyboard-switch.sh; fail "omamobile-keyboard-switch"; } if [[ -n ${OMAMOBILE_KEYBOARD_RENDER:-} ]]; then bash test/keyboard-render "$OMAMOBILE_KEYBOARD_RENDER" >/dev/null || fail "language sheet render" fi diff --git a/packages/omamobile-shell/test/keyboard-switch.sh b/packages/omamobile-shell/test/keyboard-switch.sh new file mode 100755 index 000000000..c5cd18edc --- /dev/null +++ b/packages/omamobile-shell/test/keyboard-switch.sh @@ -0,0 +1,69 @@ +#!/bin/bash +# SPDX-License-Identifier: MIT +# omamobile-keyboard-switch against a fake hyprctl and a fake +# omamobile-keyboard-languages: only real keyboards are switched (never +# squeekboard's hl-virtual-keyboard or a consumer-control pseudo-keyboard), +# next wraps around, the OSK gets the layout by name (layout+variant), and +# listen follows activelayout events from real keyboards only. +set -euo pipefail +cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." +fail() { printf 'not ok - %s\n' "$1" >&2; exit 1; } +pass() { printf 'ok - %s\n' "$1"; } +t=$(mktemp -d); trap 'rm -rf "$t"' EXIT +export T=$t +cat >"$t/hyprctl" <<'SH' +#!/bin/bash +case "$1 $2" in + "-j devices") cat "$T/devices.json" ;; + --batch*) printf '%s\n' "$2" >>"$T/hypr.log" ;; + *) exit 1 ;; +esac +SH +cat >"$t/languages" <<'SH' +#!/bin/bash +printf '%s\n' "$*" >>"$T/osk.log" +SH +chmod +x "$t/hyprctl" "$t/languages" +cat >"$t/devices.json" <<'J' +{"keyboards":[ +{"name":"hl-virtual-keyboard-squeekboard","layout":"us","variant":"","active_layout_index":0,"main":false}, +{"name":"dell-kb7120w-consumer-control","layout":"us,gr","variant":",polytonic","active_layout_index":0,"main":false}, +{"name":"dell-kb7120w","layout":"us,gr","variant":",polytonic","active_layout_index":1,"main":true}, +{"name":"other-kbd","layout":"us,gr","variant":",polytonic","active_layout_index":1,"main":false}]} +J +export OMAMOBILE_HYPRCTL=$t/hyprctl OMAMOBILE_KBD_LANGUAGES=$t/languages HYPRLAND_INSTANCE_SIGNATURE=test +s=bin/omamobile-keyboard-switch + +python3 -B "$s" next +[[ $(cat "$t/hypr.log") == "switchxkblayout dell-kb7120w 0; switchxkblayout other-kbd 0" ]] || fail "next wraps to 0 on real keyboards only: $(cat "$t/hypr.log")" +[[ $(cat "$t/osk.log") == "set us" ]] || fail "next puts us first in the OSK list" +pass "keyboard-switch next" + +: >"$t/hypr.log"; : >"$t/osk.log" +python3 -B "$s" set 1 +[[ $(cat "$t/hypr.log") == "switchxkblayout dell-kb7120w 1; switchxkblayout other-kbd 1" ]] || fail "set 1" +[[ $(cat "$t/osk.log") == "set gr+polytonic" ]] || fail "set 1 puts gr+polytonic first" +: >"$t/hypr.log"; : >"$t/osk.log" +python3 -B "$s" lock +[[ $(cat "$t/hypr.log") == "switchxkblayout dell-kb7120w 0; switchxkblayout other-kbd 0" && $(cat "$t/osk.log") == "set us" ]] || fail "lock goes to layout 0" +pass "keyboard-switch set and lock" + +python3 -B "$s" bogus 2>/dev/null && fail "unknown verb fails" +pass "keyboard-switch refuses unknown verbs" + +# listen: a fake socket2 sends a squeekboard event (ignored) and a hardware one +mkdir -p "$t/run/hypr/test" +: >"$t/osk.log" +python3 -B - "$t/run/hypr/test/.socket2.sock" <<'PY' & +import socket, sys +s = socket.socket(socket.AF_UNIX); s.bind(sys.argv[1]); s.listen(1) +c, _ = s.accept() +c.sendall(b"workspace>>1\nactivelayout>>hl-virtual-keyboard-squeekboard,English (US)\nactivelayout>>dell-kb7120w,Greek (polytonic)\n") +c.close() +PY +server=$! +for _ in $(seq 50); do [[ -S $t/run/hypr/test/.socket2.sock ]] && break; sleep 0.1; done +XDG_RUNTIME_DIR=$t/run timeout 10 python3 -B "$s" listen +wait "$server" +[[ $(cat "$t/osk.log") == "set gr+polytonic" ]] || fail "listen follows hardware events only: $(cat "$t/osk.log")" +pass "keyboard-switch listen" From 64c262b9285b68d65779b4603578c5fa7ecd1703 Mon Sep 17 00:00:00 2001 From: Lef Date: Tue, 17 Nov 2026 14:10:58 +0200 Subject: [PATCH 05/19] bar: keyboard layout label beside the clock Shows EN/GR... for the main hardware keyboard when kb_layout has more than one layout, re-read on activelayout and configreloaded. The call chip anchors to the label, or to the clock when the label is hidden. --- .../plugins/omamobile.bar/Bar.qml | 41 ++++++++++++++++++- .../plugins/omamobile.bar/StatusModel.js | 24 ++++++++++- packages/omamobile-shell/test/all | 1 + packages/omamobile-shell/test/status-model.js | 11 +++++ 4 files changed, 75 insertions(+), 2 deletions(-) diff --git a/packages/omamobile-shell/plugins/omamobile.bar/Bar.qml b/packages/omamobile-shell/plugins/omamobile.bar/Bar.qml index 6bd395a12..599bc5b5f 100644 --- a/packages/omamobile-shell/plugins/omamobile.bar/Bar.qml +++ b/packages/omamobile-shell/plugins/omamobile.bar/Bar.qml @@ -3,6 +3,7 @@ import QtQuick import Qt.labs.folderlistmodel import Quickshell import Quickshell.Bluetooth +import Quickshell.Hyprland import Quickshell.Io import Quickshell.Networking import Quickshell.Services.UPower @@ -98,6 +99,28 @@ Item { } Timer { id: cellRestart; interval: 5000; onTriggered: cellWatch.running = true } + // The hardware keyboard's layout (EN, GR...) beside the clock, only when + // kb_layout has more than one layout. Read from `hyprctl -j devices` at + // start and again on Hyprland's activelayout and configreloaded events + // (event names checked on Hyprland 0.56.2 only, UNVERIFIED on 0.57). + property string layoutLabel: "" + Process { + id: layoutRead + command: ["hyprctl", "-j", "devices"] + running: true + stdout: StdioCollector { + waitForEnd: true + onStreamFinished: root.layoutLabel = StatusModel.layoutLabel(text) + } + } + Timer { id: layoutReread; interval: 150; onTriggered: layoutRead.running = true } + Connections { + target: Hyprland + function onRawEvent(event) { + if (event && (event.name === "activelayout" || event.name === "configreloaded")) layoutReread.restart() + } + } + // A call in progress: a chip with its time beside the clock. omatel's // agent through bin/omamobile-call-watch --observe (the call card runs // the waking, name-holding copy). @@ -306,6 +329,21 @@ Item { font.bold: true } + Text { + id: layoutText + objectName: "layoutLabel" + visible: root.layoutLabel !== "" + anchors.left: clockText.right + anchors.leftMargin: Style.spacing.lg + anchors.verticalCenter: parent.verticalCenter + textFormat: Text.PlainText + text: root.layoutLabel + color: root.foreground + font.family: root.fontFamily + font.pixelSize: Style.font.body + font.bold: true + } + // The call in progress, beside the clock; a tap opens the Phone // app's in-call screen (the bar is never shown over the lock). Rectangle { @@ -313,7 +351,8 @@ Item { objectName: "callChip" visible: root.callChip !== "" z: 2 - anchors.left: clockText.right + // after the layout label, or the clock when the label is hidden + anchors.left: layoutText.visible ? layoutText.right : clockText.right anchors.leftMargin: Style.spacing.lg anchors.verticalCenter: parent.verticalCenter height: Math.round(root.barSize * 0.66) diff --git a/packages/omamobile-shell/plugins/omamobile.bar/StatusModel.js b/packages/omamobile-shell/plugins/omamobile.bar/StatusModel.js index 792817ed5..f9873f9da 100644 --- a/packages/omamobile-shell/plugins/omamobile.bar/StatusModel.js +++ b/packages/omamobile-shell/plugins/omamobile.bar/StatusModel.js @@ -145,11 +145,33 @@ function batteryIcon(percent, charging, full) { return charging ? chargingIcons[index] : defaultIcons[index] } +// The keyboard layout label from `hyprctl -j devices`: the main real keyboard +// (not squeekboard's hl-virtual-keyboard or a consumer-control pseudo one, +// as bin/omamobile-keyboard-switch), "" when it has one layout or none. +// English layouts read EN, the rest their xkb code in capitals (GR, DE). +var englishLayouts = ["us", "gb", "au", "ca", "ie", "nz", "za"] +function layoutLabel(text) { + var kbs + try { kbs = (JSON.parse(text) || {}).keyboards || [] } catch (e) { return "" } + var real = kbs.filter(function(k) { + var n = String(k && k.name || "") + return n !== "" && n.indexOf("hl-virtual-keyboard") !== 0 && !/consumer-control|power-button|video-bus/.test(n) + }) + var kb = real.filter(function(k) { return k.main })[0] || real[0] + if (!kb) return "" + var layouts = String(kb.layout || "").split(",").filter(function(l) { return l !== "" }) + var i = kb.active_layout_index + if (layouts.length < 2 || typeof i !== "number" || i < 0 || i >= layouts.length) return "" + var code = layouts[i] + return englishLayouts.indexOf(code) >= 0 ? "EN" : code.slice(0, 3).toUpperCase() +} + if (typeof module !== "undefined") { module.exports = { findDevice: findDevice, connectedNetwork: connectedNetwork, wifiIcon: wifiIcon, networkIcon: networkIcon, cellularIcon: cellularIcon, cellGlyph: cellGlyph, cellText: cellText, parseCell: parseCell, callChip: callChip, elapsed: elapsed, batteryIcon: batteryIcon, - stampOf: stampOf, parseStamp: parseStamp, unreadCount: unreadCount, unreadStored: unreadStored + stampOf: stampOf, parseStamp: parseStamp, unreadCount: unreadCount, unreadStored: unreadStored, + layoutLabel: layoutLabel } } diff --git a/packages/omamobile-shell/test/all b/packages/omamobile-shell/test/all index ad1b3fb7e..31da802a2 100755 --- a/packages/omamobile-shell/test/all +++ b/packages/omamobile-shell/test/all @@ -309,6 +309,7 @@ else fi grep -cF 'call omamobile.bar notificationsSeen' "$qs" >/dev/null || fail "the shade tells the bar what it has shown" grep -cF 'function notificationsSeen(stamp: string): string' plugins/omamobile.bar/Bar.qml >/dev/null || fail "the bar serves notificationsSeen" +grep -cF 'anchors.left: layoutText.visible ? layoutText.right : clockText.right' plugins/omamobile.bar/Bar.qml >/dev/null || fail "the call chip follows the layout label, or the clock when it is hidden" grep -cF '"/.local/state/omamobile/notifications-seen"' plugins/omamobile.bar/Bar.qml >/dev/null || fail "the bar reads the shade's mark at start" grep -cF '"omarchy-shell", "shell", "summon", "omarchy.clipboard"' "$qs" >/dev/null || fail "the Clipboard tile opens Omarchy's clipboard history" # A swipe on a row forgets that one notification through the service's diff --git a/packages/omamobile-shell/test/status-model.js b/packages/omamobile-shell/test/status-model.js index b239fb966..e3f7b10f5 100644 --- a/packages/omamobile-shell/test/status-model.js +++ b/packages/omamobile-shell/test/status-model.js @@ -70,3 +70,14 @@ assert.strictEqual(M.unreadStored("[{\"ts\": 5", 0), 0, "torn") assert.strictEqual(M.unreadStored(JSON.stringify([null, 4, { ts: "x" }, { ts: -1 }, {}, { ts: 5 }]), 0), 1) assert.strictEqual(M.unreadStored(undefined, 0), 0) console.log("ok - status model: unread notifications on Omarchy 4.5") + +const dev = (o) => JSON.stringify({ keyboards: o }) +const osk = { name: "hl-virtual-keyboard-squeekboard", layout: "us", active_layout_index: 0, main: false } +assert.strictEqual(M.layoutLabel(dev([osk])), "", "squeekboard alone: no label") +assert.strictEqual(M.layoutLabel(dev([osk, { name: "dell", layout: "us", active_layout_index: 0, main: true }])), "", "one layout: no label") +assert.strictEqual(M.layoutLabel(dev([osk, { name: "dell", layout: "us,gr", active_layout_index: 1, main: true }])), "GR") +assert.strictEqual(M.layoutLabel(dev([{ name: "x-consumer-control", layout: "us,gr", active_layout_index: 1 }, + { name: "dell", layout: "gb,de", active_layout_index: 0 }])), "EN", "pseudo-keyboards skipped, gb is EN") +assert.strictEqual(M.layoutLabel("not json"), "") +assert.strictEqual(M.layoutLabel(dev([{ name: "dell", layout: "us,gr", active_layout_index: 5 }])), "", "index out of range") +console.log("ok - status model: keyboard layout label") From a47402916c366971f388a7505325a4b80ae0072e Mon Sep 17 00:00:00 2001 From: Lef Date: Tue, 17 Nov 2026 14:14:55 +0200 Subject: [PATCH 06/19] settings: keyboard backend handles Omarchy's stock input.lua The stock file has kb_layout and kb_options only in comments. get now reports Hyprland's effective values, and set adds one hl.config() block at the end instead of failing. --- .../omamobile-settings/backends/keyboard.sh | 32 +++++++++++++--- .../test/keyboard-backend.sh | 37 +++++++++++++++---- 2 files changed, 56 insertions(+), 13 deletions(-) diff --git a/packages/omamobile-settings/backends/keyboard.sh b/packages/omamobile-settings/backends/keyboard.sh index ab3af4856..a985b5576 100755 --- a/packages/omamobile-settings/backends/keyboard.sh +++ b/packages/omamobile-settings/backends/keyboard.sh @@ -13,7 +13,8 @@ # typed in it). input.lua is edited in place: only the last live kb_layout, kb_variant and kb_options # strings change, comments and every other option (grp_led:caps, compose:...) stay, a copy of the old # file goes to input.lua.bak-omamobile first, and the write is dropped if the file changed meanwhile. -# A file with no live kb_layout is an error: nothing is appended, so a second input table never appears. +# A file with no live kb_layout (Omarchy's stock one has them only in comments) gets one hl.config() block +# appended at the end; get then reports Hyprland's effective values. # The change is applied live without `hyprctl reload` (a reload sets the configured refresh rate again and # re-runs phone.lua), then written to gsettings in the same order. # Test hooks (nothing in the environment sets them): OMAMOBILE_KBD_INPUT is the input.lua path, @@ -205,6 +206,13 @@ def write(data, st, text, found, new): for s, e, v in edits: text = text[:s] + '"' + v + '"' + text[e:] missing = [k for k in KEYS if k in new and k not in found] + if missing and "kb_layout" not in found: + # Omarchy's stock input.lua has its kb_* lines only in comments: add one hl.config() block at the + # end, as the desktop plugin does (InputLua.pl), and leave the commented example as it is. + if text and not text.endswith("\n"): + text += "\n" + text += "\nhl.config({\n input = {\n" + "".join(' %s = "%s",\n' % (k, new[k]) for k in missing) + " },\n})\n" + missing = [] if missing: # A missing key goes on its own line right after the live kb_layout, only when that line ends # with a comma, so it lands in the same `input = { }` table. Anything else is an error. @@ -263,13 +271,23 @@ def sync_osk(layouts, variants): src = ", ".join("('xkb', '%s')" % (l + ("+" + v if v else "")) for l, v in zip(layouts, variants)) return run(["gsettings", "set", "org.gnome.desktop.input-sources", "sources", "[%s]" % src]) is not None -def effective_options(): - s = run(["hyprctl", "-j", "getoption", "input:kb_options"]) or "" +def effective(key): + s = run(["hyprctl", "-j", "getoption", "input:" + key]) or "" try: v = json.loads(s).get("str", "") except (ValueError, AttributeError): v = "" - return [o for o in fields(v) if OPTION_RE.fullmatch(o)] + return v if isinstance(v, str) else "" + +def effective_options(): + return [o for o in fields(effective("kb_options")) if OPTION_RE.fullmatch(o)] + +# No live kb_layout (the stock file): what Hyprland runs with now, "us" when it cannot say. +def effective_layouts(): + lay = [l for l in fields(effective("kb_layout")) if NAME_RE.fullmatch(l)] or ["us"] + var = fields(effective("kb_variant")) + var = [v if NAME_RE.fullmatch(v) else "" for v in var][:len(lay)] + return lay, var + [""] * (len(lay) - len(var)) args = sys.argv[1:] verb = args[0] if args else "" @@ -277,7 +295,9 @@ if verb == "get": _, _, text = read_file() found, layouts, variants, options = parse(text) if "kb_layout" not in found: - fail("input.lua has no kb_layout") + layouts, variants = effective_layouts() + if "kb_options" not in found: + options = effective_options() out(state(layouts, variants, options)) sys.exit(0) if verb == "list": @@ -320,7 +340,7 @@ except OSError: data, st, text = read_file() found, layouts, variants, options = parse(text) if "kb_layout" not in found: - fail("input.lua has no kb_layout") + layouts, variants = effective_layouts() if "kb_options" not in found: options = effective_options() # keep Omarchy's defaults when input.lua does not set kb_options if key == "layouts": diff --git a/packages/omamobile-settings/test/keyboard-backend.sh b/packages/omamobile-settings/test/keyboard-backend.sh index 3b3d64558..70a731cf7 100755 --- a/packages/omamobile-settings/test/keyboard-backend.sh +++ b/packages/omamobile-settings/test/keyboard-backend.sh @@ -11,7 +11,11 @@ cat > "$tmp/bin/hyprctl" <<'EOT' printf '%s\n' "$*" >> "$FAKE_LOG" case "$1 $2" in "-j devices") cat "$FAKE_DEVICES" 2>/dev/null || exit 1 ;; - "-j getoption") printf '{"option":"input:kb_options","str":"%s","set":true}\n' "${FAKE_OPTIONS:-}" ;; + "-j getoption") case $3 in + input:kb_options) printf '{"option":"input:kb_options","str":"%s","set":true}\n' "${FAKE_OPTIONS:-}" ;; + input:kb_layout) printf '{"option":"input:kb_layout","str":"%s","set":true}\n' "${FAKE_LAYOUT:-us}" ;; + *) printf '{"option":"%s","str":"","set":false}\n' "$3" ;; + esac ;; eval*) [[ -n ${FAKE_EVAL_FAIL:-} ]] && echo "error: no eval" || echo ok ;; keyword*) [[ -n ${FAKE_KEYWORD_FAIL:-} ]] && echo "error: bad" || echo ok ;; esac @@ -114,12 +118,31 @@ eq "$(run set numlock on)" '{"error":"unknown key"}' eq "$(run nonsense)" '{"error":"usage: get|list|set"}' cmp -s "$tmp/input.lua" "$tmp/before" || { echo "FAIL: a rejected set changed input.lua" >&2; exit 1; } -# no kb_layout: an error, nothing appended -printf -- '-- empty\nhl.config({ input = { repeat_rate = 40 } })\n' > "$tmp/input.lua" -cp "$tmp/input.lua" "$tmp/before" -eq "$(run get)" '{"error":"input.lua has no kb_layout"}' -eq "$(run set layouts us,gr)" '{"error":"input.lua has no kb_layout"}' -cmp -s "$tmp/input.lua" "$tmp/before" || { echo "FAIL: input.lua was changed" >&2; exit 1; } +# Omarchy's stock file: kb_* only in comments. get reports Hyprland's effective values; set appends +# one hl.config() block and leaves the commented example alone (the phone's file, 0.57, 2026-11-17) +cat > "$tmp/input.lua" <<'EOT' +hl.config({ + input = { + -- Use multiple keyboard layouts and switch between them with Left Alt + Right Alt + -- kb_layout = "us,dk,eu", + -- kb_options = "compose:caps,grp:alts_toggle", + repeat_rate = 40, + }, +}) +EOT +FAKE_OPTIONS="compose:caps,shift:both_capslock_cancel" +export FAKE_OPTIONS +eq "$(run get)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"","active":1}' +run set layouts us,gr >/dev/null +has "$tmp/input.lua" '-- kb_layout = "us,dk,eu",' +has "$tmp/input.lua" ' kb_layout = "us,gr",' +has "$tmp/input.lua" ' kb_options = "compose:caps,shift:both_capslock_cancel",' +eq "$(run get)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":""}],"switchKey":"","active":1}' +eq "$(grep -c 'hl.config' "$tmp/input.lua")" 2 +run set layouts us,de >/dev/null +eq "$(grep -c 'hl.config' "$tmp/input.lua")" 2 +has "$tmp/input.lua" ' kb_layout = "us,de",' +unset FAKE_OPTIONS rm "$tmp/input.lua" eq "$(run get)" '{"error":"input.lua is missing"}' From bb60382c1c46ee404ded5c0b0c5ebee3309cb8f7 Mon Sep 17 00:00:00 2001 From: Lef Date: Tue, 17 Nov 2026 14:18:07 +0200 Subject: [PATCH 07/19] settings: core tests know the keyboard row and page --- packages/omamobile-settings/tests/core_tests.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/omamobile-settings/tests/core_tests.cpp b/packages/omamobile-settings/tests/core_tests.cpp index e8e0a2e77..b5e2f68df 100644 --- a/packages/omamobile-settings/tests/core_tests.cpp +++ b/packages/omamobile-settings/tests/core_tests.cpp @@ -18,7 +18,7 @@ private slots: void navigationRejectsUnknownAndHiddenActions() { Backend backend; QVERIFY(backend.catalogProblems().isEmpty()); - QCOMPARE(backend.rows().size(), 2); + QCOMPARE(backend.rows().size(), 3); QVERIFY(!backend.navigate("recording")); backend.activate("arbitrary-command"); QCOMPARE(backend.page(), QString("root")); @@ -29,6 +29,13 @@ private slots: backend.back(); QCOMPARE(backend.page(), QString("root")); } + void keyboardPageGoesBackToRoot() { + Backend backend; + QVERIFY(backend.navigate("keyboard")); + QCOMPARE(backend.page(), QString("keyboard")); + backend.back(); + QCOMPARE(backend.page(), QString("root")); + } void displayPageGoesBackToRoot() { Backend backend; QVERIFY(backend.navigate("display")); From e27a9c669ca0e3af3465c168c399ebe54fed0704 Mon Sep 17 00:00:00 2001 From: Lef Date: Tue, 17 Nov 2026 14:24:24 +0200 Subject: [PATCH 08/19] shell: one main-keyboard rule, safe batch names, listener syncs keyboards, bar rereads The main keyboard is now the real one marked main, else the first real one with more than one layout, else the first real one, in the bar and the switch tool. radio-control and gpio-keys count as pseudo-keyboards. A device name with a space, ; or quote is left out of the hyprctl --batch string. listen brings the other real keyboards to the index of the one switched. The bar reruns its devices read when an event comes while one is running. --- .../bin/omamobile-keyboard-switch | 43 +++++++++++++++---- .../plugins/omamobile.bar/Bar.qml | 10 ++++- .../plugins/omamobile.bar/StatusModel.js | 12 ++++-- packages/omamobile-shell/test/all | 1 + .../omamobile-shell/test/keyboard-switch.sh | 43 ++++++++++++++++++- packages/omamobile-shell/test/status-model.js | 4 ++ 6 files changed, 98 insertions(+), 15 deletions(-) diff --git a/packages/omamobile-shell/bin/omamobile-keyboard-switch b/packages/omamobile-shell/bin/omamobile-keyboard-switch index 9e43115c1..7d4aecdbf 100755 --- a/packages/omamobile-shell/bin/omamobile-keyboard-switch +++ b/packages/omamobile-shell/bin/omamobile-keyboard-switch @@ -13,8 +13,13 @@ Real keyboards are the ones in `hyprctl -j devices` that are not squeekboard's or another virtual keyboard (hl-virtual-keyboard*) or a pseudo-keyboard -(consumer-control, power-button, video-bus), the same set as the Settings -backend. The layout count and names come from the keyboard's own `layout` and +(consumer-control, power-button, video-bus, radio-control, gpio-keys), the same +set as the Settings backend and the bar. The "main" keyboard (whose layout +`next` steps from and the bar shows) is, in all three: the real one Hyprland +marks main, else the first real one with more than one layout, else the first +real one. `listen` brings every other real keyboard to the index of the one a +switch key was pressed on, so they agree and the pick does not matter much. +On Hyprland 0.56.2 only the virtual keyboard had main: true. The layout count and names come from the keyboard's own `layout` and `variant` fields. The OSK follows by NAME, never by index: squeekboard and omamobile-keyboard-languages move the current entry to the front of org.gnome.desktop.input-sources sources, so its order changes on every switch. @@ -35,7 +40,11 @@ import sys HYPRCTL = os.environ.get("OMAMOBILE_HYPRCTL", "hyprctl") LANGUAGES = os.environ.get("OMAMOBILE_KBD_LANGUAGES", "omamobile-keyboard-languages") -PSEUDO = ("consumer-control", "power-button", "video-bus") +PSEUDO = ("consumer-control", "power-button", "video-bus", "radio-control", "gpio-keys") +# hyprctl --batch splits commands on ";" and arguments on spaces: a name with any of these +# cannot be passed safely, so that keyboard is left out (Hyprland names seen on 0.56.2 are +# lowercase with dashes, e.g. dell-kb7120w). +UNSAFE = set(" ;\t\r\n\"'\\") def find_hypr(): @@ -72,15 +81,27 @@ def names(kb): def main_kb(kbs): - return next((k for k in kbs if k.get("main")), kbs[0] if kbs else None) + return (next((k for k in kbs if k.get("main")), None) + or next((k for k in kbs if len(names(k)) > 1), None) + or (kbs[0] if kbs else None)) def osk_front(name): subprocess.run([LANGUAGES, "set", name], stdout=subprocess.DEVNULL) +def safe(name): + return bool(name) and not any(c in UNSAFE or ord(c) < 32 for c in name) + + def switch(n, kbs): - cmds = ["switchxkblayout %s %d" % (k["name"], n) for k in kbs] + cmds = [] + for k in kbs: + if safe(k["name"]): + cmds.append("switchxkblayout %s %d" % (k["name"], n)) + else: + print("omamobile-keyboard-switch: skipping keyboard %r (name hyprctl --batch cannot take)" + % k["name"], file=sys.stderr) if cmds: subprocess.run([HYPRCTL, "--batch", "; ".join(cmds)], stdout=subprocess.DEVNULL) @@ -114,14 +135,20 @@ def listen(): dev = data.split(",", 1)[0] if not real(dev): # squeekboard's own keymap changes are not a hardware switch continue - kb = next((k for k in keyboards() if k.get("name") == dev), None) + kbs = keyboards() + kb = next((k for k in kbs if k.get("name") == dev), None) if kb is None: continue lst, i = names(kb), kb.get("active_layout_index") + if not (isinstance(i, int) and 0 <= i < len(lst)): + continue + # The xkb grp: key switches only the keyboard it was pressed on: bring the others along. + # Their own activelayout events then find them all on i already, so this stops there. + others = [k for k in kbs if k is not kb and k.get("active_layout_index") != i] + switch(i, others) # No loop: nothing turns a gsettings change back into a Hyprland switch, and `set` of the # entry already in front leaves the list as it is (several keyboards report one switch). - if isinstance(i, int) and 0 <= i < len(lst): - osk_front(lst[i]) + osk_front(lst[i]) def main(argv): diff --git a/packages/omamobile-shell/plugins/omamobile.bar/Bar.qml b/packages/omamobile-shell/plugins/omamobile.bar/Bar.qml index 599bc5b5f..3af5ace53 100644 --- a/packages/omamobile-shell/plugins/omamobile.bar/Bar.qml +++ b/packages/omamobile-shell/plugins/omamobile.bar/Bar.qml @@ -104,16 +104,24 @@ Item { // start and again on Hyprland's activelayout and configreloaded events // (event names checked on Hyprland 0.56.2 only, UNVERIFIED on 0.57). property string layoutLabel: "" + // An event that comes while a read runs marks it pending: setting running + // on a running Process does nothing, so the read is run again after it ends. + property bool layoutPending: false + function readLayout() { + if (layoutRead.running) layoutPending = true + else layoutRead.running = true + } Process { id: layoutRead command: ["hyprctl", "-j", "devices"] running: true + onExited: if (root.layoutPending) { root.layoutPending = false; layoutReread.restart() } stdout: StdioCollector { waitForEnd: true onStreamFinished: root.layoutLabel = StatusModel.layoutLabel(text) } } - Timer { id: layoutReread; interval: 150; onTriggered: layoutRead.running = true } + Timer { id: layoutReread; interval: 150; onTriggered: root.readLayout() } Connections { target: Hyprland function onRawEvent(event) { diff --git a/packages/omamobile-shell/plugins/omamobile.bar/StatusModel.js b/packages/omamobile-shell/plugins/omamobile.bar/StatusModel.js index f9873f9da..696634bb1 100644 --- a/packages/omamobile-shell/plugins/omamobile.bar/StatusModel.js +++ b/packages/omamobile-shell/plugins/omamobile.bar/StatusModel.js @@ -146,8 +146,10 @@ function batteryIcon(percent, charging, full) { } // The keyboard layout label from `hyprctl -j devices`: the main real keyboard -// (not squeekboard's hl-virtual-keyboard or a consumer-control pseudo one, -// as bin/omamobile-keyboard-switch), "" when it has one layout or none. +// (not squeekboard's hl-virtual-keyboard or a pseudo one), picked by the same +// rule as bin/omamobile-keyboard-switch and the Settings backend: the real one +// marked main, else the first real one with more than one layout, else the +// first real one. "" when it has one layout or none. // English layouts read EN, the rest their xkb code in capitals (GR, DE). var englishLayouts = ["us", "gb", "au", "ca", "ie", "nz", "za"] function layoutLabel(text) { @@ -155,9 +157,11 @@ function layoutLabel(text) { try { kbs = (JSON.parse(text) || {}).keyboards || [] } catch (e) { return "" } var real = kbs.filter(function(k) { var n = String(k && k.name || "") - return n !== "" && n.indexOf("hl-virtual-keyboard") !== 0 && !/consumer-control|power-button|video-bus/.test(n) + return n !== "" && n.indexOf("hl-virtual-keyboard") !== 0 && !/consumer-control|power-button|video-bus|radio-control|gpio-keys/.test(n) }) - var kb = real.filter(function(k) { return k.main })[0] || real[0] + var kb = real.filter(function(k) { return k.main })[0] + || real.filter(function(k) { return String(k.layout || "").split(",").filter(function(l) { return l !== "" }).length > 1 })[0] + || real[0] if (!kb) return "" var layouts = String(kb.layout || "").split(",").filter(function(l) { return l !== "" }) var i = kb.active_layout_index diff --git a/packages/omamobile-shell/test/all b/packages/omamobile-shell/test/all index 31da802a2..67e38b56b 100755 --- a/packages/omamobile-shell/test/all +++ b/packages/omamobile-shell/test/all @@ -309,6 +309,7 @@ else fi grep -cF 'call omamobile.bar notificationsSeen' "$qs" >/dev/null || fail "the shade tells the bar what it has shown" grep -cF 'function notificationsSeen(stamp: string): string' plugins/omamobile.bar/Bar.qml >/dev/null || fail "the bar serves notificationsSeen" +grep -cF 'onExited: if (root.layoutPending) { root.layoutPending = false; layoutReread.restart() }' plugins/omamobile.bar/Bar.qml >/dev/null || fail "an event during a layout read reruns it" grep -cF 'anchors.left: layoutText.visible ? layoutText.right : clockText.right' plugins/omamobile.bar/Bar.qml >/dev/null || fail "the call chip follows the layout label, or the clock when it is hidden" grep -cF '"/.local/state/omamobile/notifications-seen"' plugins/omamobile.bar/Bar.qml >/dev/null || fail "the bar reads the shade's mark at start" grep -cF '"omarchy-shell", "shell", "summon", "omarchy.clipboard"' "$qs" >/dev/null || fail "the Clipboard tile opens Omarchy's clipboard history" diff --git a/packages/omamobile-shell/test/keyboard-switch.sh b/packages/omamobile-shell/test/keyboard-switch.sh index c5cd18edc..da8335f06 100755 --- a/packages/omamobile-shell/test/keyboard-switch.sh +++ b/packages/omamobile-shell/test/keyboard-switch.sh @@ -29,12 +29,14 @@ cat >"$t/devices.json" <<'J' {"name":"hl-virtual-keyboard-squeekboard","layout":"us","variant":"","active_layout_index":0,"main":false}, {"name":"dell-kb7120w-consumer-control","layout":"us,gr","variant":",polytonic","active_layout_index":0,"main":false}, {"name":"dell-kb7120w","layout":"us,gr","variant":",polytonic","active_layout_index":1,"main":true}, -{"name":"other-kbd","layout":"us,gr","variant":",polytonic","active_layout_index":1,"main":false}]} +{"name":"other-kbd","layout":"us,gr","variant":",polytonic","active_layout_index":1,"main":false}, +{"name":"bad name;exec x","layout":"us,gr","variant":",polytonic","active_layout_index":1,"main":false}]} J export OMAMOBILE_HYPRCTL=$t/hyprctl OMAMOBILE_KBD_LANGUAGES=$t/languages HYPRLAND_INSTANCE_SIGNATURE=test s=bin/omamobile-keyboard-switch -python3 -B "$s" next +python3 -B "$s" next 2>"$t/err" +grep -q "skipping keyboard 'bad name;exec x'" "$t/err" || fail "a name with a space or ; is left out of the batch" [[ $(cat "$t/hypr.log") == "switchxkblayout dell-kb7120w 0; switchxkblayout other-kbd 0" ]] || fail "next wraps to 0 on real keyboards only: $(cat "$t/hypr.log")" [[ $(cat "$t/osk.log") == "set us" ]] || fail "next puts us first in the OSK list" pass "keyboard-switch next" @@ -67,3 +69,40 @@ XDG_RUNTIME_DIR=$t/run timeout 10 python3 -B "$s" listen wait "$server" [[ $(cat "$t/osk.log") == "set gr+polytonic" ]] || fail "listen follows hardware events only: $(cat "$t/osk.log")" pass "keyboard-switch listen" + +# listen brings the other real keyboards to the index of the one switched (dell on 1, other-kbd on 0) +cat >"$t/devices.json" <<'J' +{"keyboards":[ +{"name":"hl-virtual-keyboard-squeekboard","layout":"us","variant":"","active_layout_index":0,"main":true}, +{"name":"gpio-keys","layout":"us,gr","variant":",polytonic","active_layout_index":0,"main":false}, +{"name":"dell-kb7120w","layout":"us,gr","variant":",polytonic","active_layout_index":1,"main":false}, +{"name":"other-kbd","layout":"us,gr","variant":",polytonic","active_layout_index":0,"main":false}]} +J +rm -f "$t/run/hypr/test/.socket2.sock"; : >"$t/hypr.log"; : >"$t/osk.log" +python3 -B -c ' +import socket, sys +s = socket.socket(socket.AF_UNIX); s.bind(sys.argv[1]); s.listen(1) +c, _ = s.accept() +c.sendall(b"activelayout>>dell-kb7120w,Greek (polytonic)\n") +c.close()' "$t/run/hypr/test/.socket2.sock" & +server=$! +for _ in $(seq 50); do [[ -S $t/run/hypr/test/.socket2.sock ]] && break; sleep 0.1; done +XDG_RUNTIME_DIR=$t/run timeout 10 python3 -B "$s" listen +wait "$server" +[[ $(cat "$t/hypr.log") == "switchxkblayout other-kbd 1" ]] || fail "listen syncs the other real keyboards: $(cat "$t/hypr.log")" +[[ $(cat "$t/osk.log") == "set gr+polytonic" ]] || fail "listen moves the OSK after the sync" +pass "keyboard-switch listen syncs other keyboards" + +# main pick with no real keyboard marked main: the first real one with more than one layout +# (not the virtual one marked main, not gpio-keys, not a one-layout keyboard) +cat >"$t/devices.json" <<'J' +{"keyboards":[ +{"name":"hl-virtual-keyboard-squeekboard","layout":"us","variant":"","active_layout_index":0,"main":true}, +{"name":"gpio-keys","layout":"us,gr","variant":"","active_layout_index":0,"main":false}, +{"name":"single","layout":"us","variant":"","active_layout_index":0,"main":false}, +{"name":"dell-kb7120w","layout":"us,gr","variant":",polytonic","active_layout_index":1,"main":false}]} +J +: >"$t/hypr.log"; : >"$t/osk.log" +python3 -B "$s" next +[[ $(cat "$t/osk.log") == "set us" ]] || fail "next steps from the first real keyboard with 2+ layouts: $(cat "$t/osk.log")" +pass "keyboard-switch main keyboard rule" diff --git a/packages/omamobile-shell/test/status-model.js b/packages/omamobile-shell/test/status-model.js index e3f7b10f5..86a5afc86 100644 --- a/packages/omamobile-shell/test/status-model.js +++ b/packages/omamobile-shell/test/status-model.js @@ -80,4 +80,8 @@ assert.strictEqual(M.layoutLabel(dev([{ name: "x-consumer-control", layout: "us, { name: "dell", layout: "gb,de", active_layout_index: 0 }])), "EN", "pseudo-keyboards skipped, gb is EN") assert.strictEqual(M.layoutLabel("not json"), "") assert.strictEqual(M.layoutLabel(dev([{ name: "dell", layout: "us,gr", active_layout_index: 5 }])), "", "index out of range") +// main pick: virtual main ignored, gpio-keys and one-layout keyboards passed over +assert.strictEqual(M.layoutLabel(dev([{ name: "hl-virtual-keyboard-squeekboard", layout: "us,gr", active_layout_index: 0, main: true }, + { name: "gpio-keys", layout: "us,gr", active_layout_index: 0 }, { name: "single", layout: "us", active_layout_index: 0 }, + { name: "dell", layout: "us,gr", active_layout_index: 1 }])), "GR", "first real keyboard with 2+ layouts") console.log("ok - status model: keyboard layout label") From c81ef9413fc84c49688a8ad13adba5ba98b83353 Mon Sep 17 00:00:00 2001 From: Lef Date: Tue, 17 Nov 2026 14:27:57 +0200 Subject: [PATCH 09/19] settings: keyboard backend merges the OSK list, refuses non-Latin first gsettings is merged instead of replaced: the OSK's own languages and its current entry stay, new hardware layouts are added (only ones squeekboard has a file for), removed ones dropped, and a switch-key change leaves it alone. It is written before the live apply so the layout follower never reads the old list. A list whose first layout is not Latin is refused; the page stops it before sending and reads the state again after a failed set. Only kb_* inside an input = { } table are edited, a symlinked input.lua keeps its link, get uses Hyprland's options like set does, the keyword fallback is one batch, and the main keyboard follows the same rule as the shell. --- .../omamobile-settings/app/KeyboardPage.qml | 25 +++- .../omamobile-settings/backends/keyboard.sh | 107 ++++++++++++------ packages/omamobile-settings/test/all | 3 + .../test/keyboard-backend.sh | 69 +++++++++-- 4 files changed, 158 insertions(+), 46 deletions(-) diff --git a/packages/omamobile-settings/app/KeyboardPage.qml b/packages/omamobile-settings/app/KeyboardPage.qml index c90cb4c4c..3efc85506 100644 --- a/packages/omamobile-settings/app/KeyboardPage.qml +++ b/packages/omamobile-settings/app/KeyboardPage.qml @@ -34,18 +34,33 @@ Flickable { for (const k of switchKeys) if (k.option === opt) return k.name return opt } + property string lastError: "" // shown after the re-read that follows a failed set + function isLatin(code) { return latin.indexOf(code.split(":")[0]) >= 0 } function apply(r) { busy = false - if (r.error) { status = r.error; return } + if (r.error) { + // A set can fail half way (file saved, live apply or OSK not): read the real state again so + // the next change is not built from a stale list, and keep the error on screen. + if (lastError === "") { lastError = r.error; status = r.error; busy = true; reqId = actions.run("keyboard", ["get"]) } + else { status = lastError; lastError = "" } + return + } if (!r.layouts) { status = qsTr("The keyboard backend gave no values."); return } layouts = r.layouts.map(x => x.variant ? x.layout + ":" + x.variant : x.layout) switchKey = r.switchKey || "" - warn = r.warn || (layouts.length && latin.indexOf(layouts[0].split(":")[0]) < 0 - ? qsTr("The first layout is not a Latin one: passwords on the lock screen are typed in it") : "") - status = qsTr("Changes apply at once to hardware keyboards and the on-screen keyboard.") + warn = layouts.length && !isLatin(layouts[0]) + ? qsTr("The first layout is not a Latin one: passwords on the lock screen are typed in it") : "" + status = lastError !== "" ? lastError : qsTr("Changes apply at once to hardware keyboards and the on-screen keyboard.") + lastError = "" } function save(list) { - busy = true; adding = false + adding = false + // The backend refuses this too; stop here so nothing is sent. + if (!list.length || !isLatin(list[0])) { + status = qsTr("The first layout must be a Latin one: passwords on the lock screen are typed in it.") + return + } + busy = true reqId = actions.run("keyboard", ["set", "layouts", list.join(",")]) } function move(i, d) { diff --git a/packages/omamobile-settings/backends/keyboard.sh b/packages/omamobile-settings/backends/keyboard.sh index a985b5576..c9203fc12 100755 --- a/packages/omamobile-settings/backends/keyboard.sh +++ b/packages/omamobile-settings/backends/keyboard.sh @@ -8,17 +8,24 @@ # keyboard.sh list {"layouts":[{"layout":"us","name":"English (US)"}],"switchKeys":[...]} # keyboard.sh set layouts us,gr[:variant] 1 to 4 layouts, each a name (and variant) in the xkb rules list # keyboard.sh set switch-key grp:OPTION or "none"; one layout left always drops the switch key -# "active" is the index Hyprland reports for the first real keyboard, or null without one. A set answer -# carries "warn" when the first layout is not a Latin one (a password typed on the lock screen would be -# typed in it). input.lua is edited in place: only the last live kb_layout, kb_variant and kb_options -# strings change, comments and every other option (grp_led:caps, compose:...) stay, a copy of the old +# "active" is the index Hyprland reports for the main real keyboard, or null without one. Real = not +# hl-virtual-keyboard* and not a pseudo-keyboard (consumer-control, power-button, video-bus, radio-control, +# gpio-keys); main = the real one Hyprland marks main, else the first real one with more than one layout, +# else the first real one (the same rule as omamobile-keyboard-switch and the bar). A layouts list whose +# first entry is not a Latin layout is refused (passwords on the lock screen are typed in layout 1). +# input.lua is edited in place: only the last live kb_layout, kb_variant and kb_options strings inside an +# `input = { }` table change (per-device blocks and variables are left alone), comments and every other option (grp_led:caps, compose:...) stay, a copy of the old # file goes to input.lua.bak-omamobile first, and the write is dropped if the file changed meanwhile. # A file with no live kb_layout (Omarchy's stock one has them only in comments) gets one hl.config() block # appended at the end; get then reports Hyprland's effective values. -# The change is applied live without `hyprctl reload` (a reload sets the configured refresh rate again and -# re-runs phone.lua), then written to gsettings in the same order. +# A symlinked input.lua stays a link: its target is written. gsettings is written first, then the change +# is applied live without `hyprctl reload` (a reload sets the configured refresh rate again and re-runs +# phone.lua), so the layout follower never reads the old list. gsettings is merged, not replaced: the +# OSK's own languages and its current (first) entry stay; new hardware layouts are added at the end +# (only ones squeekboard has a layout file for, when that directory exists); removed ones are dropped. +# A switch-key change does not touch gsettings. # Test hooks (nothing in the environment sets them): OMAMOBILE_KBD_INPUT is the input.lua path, -# OMAMOBILE_KBD_RULES the xkb rules .lst file; the test puts a fake hyprctl and gsettings first on PATH. +# OMAMOBILE_KBD_RULES the xkb rules .lst file, OMAMOBILE_KEYBOARDS_DIR squeekboard's layout files; the test puts a fake hyprctl and gsettings first on PATH. set -euo pipefail set +x fail() { printf '{"error":"%s"}\n' "$1"; exit 2; } @@ -56,7 +63,9 @@ LATIN = {"us", "gb", "de", "fr", "es", "it", "pt", "nl", "be", "ch", "at", "se", "is", "ie", "pl", "cz", "sk", "hu", "ro", "hr", "si", "ee", "lv", "lt", "tr", "br", "latam", "ca", "au", "nz", "za", "epo"} MAX = 4 -path = os.environ["KBD_INPUT"] +path = os.path.realpath(os.environ["KBD_INPUT"]) # write a symlink's target, keep the link +KEYBOARDS = os.environ.get("OMAMOBILE_KEYBOARDS_DIR", "/usr/share/omamobile/squeekboard/keyboards") +PSEUDO_RE = re.compile(r"hl-virtual-keyboard|.*(consumer-control|power-button|video-bus|radio-control|gpio-keys)") def out(obj): print(json.dumps(obj, separators=(",", ":"))) @@ -109,13 +118,21 @@ def tokens(text): yield ("eq" if c == "=" else "other", c, i, i + 1, False) i += 1 -# The last live assignment of each key wins, as a later hl.config() overrides an earlier one. +# The last live assignment of each key wins, as a later hl.config() overrides an earlier one. Only +# assignments whose innermost table was opened by `input = {` count: a per-device block or a variable +# with the same key name is not the global setting. def scan(text): t = list(tokens(text)) - found = {} - for a, b, c in zip(t, t[1:], t[2:]): - if a[0] == "ident" and a[1] in KEYS and b[0] == "eq" and c[0] in ("string", "long"): - found[a[1]] = c + found, stack = {}, [] + for i, a in enumerate(t): + if a[0] == "other" and a[1] == "{": + stack.append(i >= 2 and t[i - 2][:2] == ("ident", "input") and t[i - 1][0] == "eq") + elif a[0] == "other" and a[1] == "}": + if stack: + stack.pop() + elif (a[0] == "ident" and a[1] in KEYS and stack and stack[-1] and i + 2 < len(t) + and t[i + 1][0] == "eq" and t[i + 2][0] in ("string", "long")): + found[a[1]] = t[i + 2] return found def fields(raw): @@ -164,9 +181,9 @@ def active(): kbs = json.loads(s)["keyboards"] except (TypeError, ValueError, KeyError): return None - real = [k for k in kbs if not re.match(r"hl-virtual-keyboard|.*(consumer-control|power-button|video-bus)", - str(k.get("name", "")))] - pick = [k for k in real if k.get("main")] or real + real = [k for k in kbs if not PSEUDO_RE.match(str(k.get("name", "")))] + multi = [k for k in real if len([l for l in str(k.get("layout", "")).split(",") if l]) > 1] + pick = [k for k in real if k.get("main")] or multi or real if not pick: return None i = pick[0].get("active_layout_index") @@ -251,6 +268,29 @@ def write(data, st, text, found, new): pass fail("cannot write input.lua") +def lst_names(layouts, variants): + return [l + ("+" + v if v else "") for l, v in zip(layouts, variants)] + +# Merge into the OSK's list (see the header). UNVERIFIED on the phone: that squeekboard keeps its +# current language when the list changes but its first entry does not. +def sync_osk(old, new): + s = run(["gsettings", "get", "org.gnome.desktop.input-sources", "sources"]) + if s is None: + return False + cur = re.findall(r"\(\s*'([^'\\]*)'\s*,\s*'([^'\\]*)'\s*\)", s) + removed = set(old) - set(new) + keep = [(k, n) for k, n in cur if not (k == "xkb" and n in removed)] + have = {n for k, n in keep if k == "xkb"} + carried = os.path.isdir(KEYBOARDS) + add = [("xkb", n) for n in new + if n not in have and (not carried or os.path.isfile(os.path.join(KEYBOARDS, n + ".yaml")))] + merged = keep + add + if merged == cur: + return True + src = ", ".join("('%s', '%s')" % kn for kn in merged) if merged else "" + return run(["gsettings", "set", "org.gnome.desktop.input-sources", "sources", + "[%s]" % src if merged else "@a(ss) []"]) is not None + # Live apply without `hyprctl reload`. UNVERIFIED on the phone: that Hyprland 0.57 takes # `hyprctl eval 'hl.config({ input = {...} })'` for the keymap and re-applies it to keyboards already # connected. The form is the one patch 0006 uses for other options; `hyprctl keyword` is the fallback. @@ -261,15 +301,11 @@ def apply_live(layouts, variants, options): r = run(["hyprctl", "eval", lua]) if r is not None and "error" not in r.lower(): return True - ok = True - for k in ("kb_variant", "kb_options", "kb_layout"): - r = run(["hyprctl", "keyword", "input:" + k, kv[k]]) - ok = ok and r is not None and "error" not in r.lower() - return ok - -def sync_osk(layouts, variants): - src = ", ".join("('xkb', '%s')" % (l + ("+" + v if v else "")) for l, v in zip(layouts, variants)) - return run(["gsettings", "set", "org.gnome.desktop.input-sources", "sources", "[%s]" % src]) is not None + # One batch, so Hyprland never builds a keymap from new variants with old layouts in between. + # The values hold only names, commas and colons (checked above), never ";" or spaces. + batch = "; ".join("keyword input:%s %s" % (k, kv[k]) for k in ("kb_variant", "kb_options", "kb_layout")) + r = run(["hyprctl", "--batch", batch]) + return r is not None and "error" not in r.lower() def effective(key): s = run(["hyprctl", "-j", "getoption", "input:" + key]) or "" @@ -296,8 +332,8 @@ if verb == "get": found, layouts, variants, options = parse(text) if "kb_layout" not in found: layouts, variants = effective_layouts() - if "kb_options" not in found: - options = effective_options() + if "kb_options" not in found: + options = effective_options() # as set does, so get and set agree on the switch key out(state(layouts, variants, options)) sys.exit(0) if verb == "list": @@ -327,6 +363,8 @@ if key == "layouts": if (l, v) in zip(new_l, new_v): fail("layout listed twice: " + it) new_l.append(l); new_v.append(v) + if new_l[0] not in LATIN: + fail("the first layout must be a Latin one (passwords on the lock screen are typed in it)") else: if value != "none" and (not SWITCH_RE.fullmatch(value) or value not in opt): fail("unknown switch key") @@ -341,6 +379,7 @@ data, st, text = read_file() found, layouts, variants, options = parse(text) if "kb_layout" not in found: layouts, variants = effective_layouts() +old_names = lst_names(layouts, variants) if "kb_options" not in found: options = effective_options() # keep Omarchy's defaults when input.lua does not set kb_options if key == "layouts": @@ -357,12 +396,12 @@ if "kb_options" not in found and not options: if any(variants) or "kb_variant" in found: new["kb_variant"] = ",".join(variants) if any(variants) else "" write(data, st, text, found, new) -if not apply_live(layouts, variants, options): - fail("saved to input.lua, but Hyprland did not take it live") -if not sync_osk(layouts, variants): +osk_ok = key != "layouts" or sync_osk(old_names, lst_names(layouts, variants)) +live_ok = apply_live(layouts, variants, options) +if not live_ok: + fail("saved to input.lua, but Hyprland did not take it live" + + ("" if osk_ok else ", and the on-screen keyboard list was not updated")) +if not osk_ok: fail("saved and applied, but the on-screen keyboard list was not updated") -res = state(layouts, variants, options) -if layouts[0] not in LATIN: - res["warn"] = "the first layout is not a Latin one: passwords on the lock screen are typed in it" -out(res) +out(state(layouts, variants, options)) PY diff --git a/packages/omamobile-settings/test/all b/packages/omamobile-settings/test/all index 752cab084..f2af8f813 100755 --- a/packages/omamobile-settings/test/all +++ b/packages/omamobile-settings/test/all @@ -6,6 +6,9 @@ build_dir=${OMAMOBILE_SETTINGS_TEST_BUILD_DIR:-"$source_dir/build/tests"} "$source_dir/bin/build" "$source_dir/test/display-backend.sh" "$source_dir/test/keyboard-backend.sh" +# The page stops a non-Latin first layout before sending it, and reads the state again after a failed set +grep -qF 'if (!list.length || !isLatin(list[0])) {' "$source_dir/app/KeyboardPage.qml" || { echo "FAIL: page sends a non-Latin first layout" >&2; exit 1; } +grep -qF 'lastError = r.error; status = r.error; busy = true; reqId = actions.run("keyboard", ["get"])' "$source_dir/app/KeyboardPage.qml" || { echo "FAIL: page keeps a stale list after an error" >&2; exit 1; } mkdir -p "$build_dir" fixture=$(mktemp -d) trap 'rm -rf -- "$fixture"' EXIT HUP INT TERM diff --git a/packages/omamobile-settings/test/keyboard-backend.sh b/packages/omamobile-settings/test/keyboard-backend.sh index 70a731cf7..3a82065d2 100755 --- a/packages/omamobile-settings/test/keyboard-backend.sh +++ b/packages/omamobile-settings/test/keyboard-backend.sh @@ -17,13 +17,17 @@ case "$1 $2" in *) printf '{"option":"%s","str":"","set":false}\n' "$3" ;; esac ;; eval*) [[ -n ${FAKE_EVAL_FAIL:-} ]] && echo "error: no eval" || echo ok ;; - keyword*) [[ -n ${FAKE_KEYWORD_FAIL:-} ]] && echo "error: bad" || echo ok ;; + --batch*) [[ -n ${FAKE_KEYWORD_FAIL:-} ]] && echo "error: bad" || echo ok ;; esac EOT cat > "$tmp/bin/gsettings" <<'EOT' #!/bin/bash printf 'gsettings %s\n' "$*" >> "$FAKE_LOG" -[[ -z ${FAKE_GSETTINGS_FAIL:-} ]] +[[ -z ${FAKE_GSETTINGS_FAIL:-} ]] || exit 1 +case $1 in + get) cat "$FAKE_SOURCES" 2>/dev/null || echo "@a(ss) []" ;; + set) printf '%s\n' "$4" > "$FAKE_SOURCES" ;; +esac EOT chmod +x "$tmp/bin/hyprctl" "$tmp/bin/gsettings" cat > "$tmp/rules.lst" <<'EOT' @@ -47,7 +51,8 @@ cat > "$tmp/devices.json" <<'EOT' {"keyboards":[{"name":"hl-virtual-keyboard-squeekboard","active_layout_index":0,"main":false}, {"name":"dell-kb7120w","active_layout_index":1,"main":true}]} EOT -export PATH="$tmp/bin:$PATH" FAKE_LOG="$tmp/log" FAKE_DEVICES="$tmp/devices.json" +export PATH="$tmp/bin:$PATH" FAKE_LOG="$tmp/log" FAKE_DEVICES="$tmp/devices.json" FAKE_SOURCES="$tmp/sources" +export OMAMOBILE_KEYBOARDS_DIR="$tmp/nokeyboards" export XDG_RUNTIME_DIR="$tmp/run" HYPRLAND_INSTANCE_SIGNATURE=test export OMAMOBILE_KBD_INPUT="$tmp/input.lua" OMAMOBILE_KBD_RULES="$tmp/rules.lst" unset FAKE_OPTIONS FAKE_EVAL_FAIL FAKE_KEYWORD_FAIL FAKE_GSETTINGS_FAIL @@ -86,12 +91,17 @@ eq "$(stat -c %a "$tmp/input.lua")" 640 has "$tmp/input.lua.bak-omamobile" 'kb_layout = "us",' has "$tmp/log" 'eval hl.config({ input = { kb_layout = "us,gr", kb_variant = ",polytonic", kb_options = "compose:caps,grp_led:caps,grp:caps_toggle" } })' has "$tmp/log" "gsettings set org.gnome.desktop.input-sources sources [('xkb', 'us'), ('xkb', 'gr+polytonic')]" +# gsettings is written before the live apply (the follower must not read the old list) +g=$(grep -n '^gsettings set' "$tmp/log" | cut -d: -f1); e=$(grep -n '^eval' "$tmp/log" | cut -d: -f1) +(( g < e )) || { echo "FAIL: gsettings ($g) after the live apply ($e)" >&2; exit 1; } hasnt "$tmp/log" 'reload' eq "$(run get)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"grp:caps_toggle","active":1}' -# the switch key: only the grp: part changes +# the switch key: only the grp: part changes, gsettings is not touched +: > "$tmp/log" eq "$(run set switch-key grp:alt_shift_toggle)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"grp:alt_shift_toggle","active":1}' has "$tmp/input.lua" 'kb_options = "compose:caps,grp_led:caps,grp:alt_shift_toggle",' +hasnt "$tmp/log" 'gsettings' eq "$(run set switch-key none | grep -o '"switchKey":"[^"]*"')" '"switchKey":""' has "$tmp/input.lua" 'kb_options = "compose:caps,grp_led:caps",' run set switch-key grp:caps_toggle >/dev/null @@ -100,10 +110,55 @@ eq "$(run set layouts us)" '{"layouts":[{"layout":"us","variant":""}],"switchKey has "$tmp/input.lua" 'kb_options = "compose:caps,grp_led:caps",' has "$tmp/input.lua" 'kb_variant = "",' -# a non-Latin first layout is saved with a warning -eq "$(run set layouts gr,us | grep -c "\"warn\":\"the first layout is not a Latin one")" 1 +# a non-Latin first layout is refused, nothing written +cp "$tmp/input.lua" "$tmp/before"; cp "$tmp/sources" "$tmp/sources.before" +eq "$(run set layouts gr,us)" '{"error":"the first layout must be a Latin one (passwords on the lock screen are typed in it)"}' +eq "$(run set layouts gr)" '{"error":"the first layout must be a Latin one (passwords on the lock screen are typed in it)"}' +cmp -s "$tmp/input.lua" "$tmp/before" && cmp -s "$tmp/sources" "$tmp/sources.before" || { echo "FAIL: a refused set wrote" >&2; exit 1; } eq "$(run set layouts us,gr | grep -c warn || true)" 0 +# OSK merge: the OSK's own languages and its current (first) entry stay, new ones are added, +# removed hardware layouts are dropped; only names squeekboard has a file for, when the dir exists +echo "[('xkb', 'gr'), ('xkb', 'fr'), ('ibus', 'x')]" > "$tmp/sources" +mkdir -p "$tmp/kbds"; touch "$tmp/kbds/us.yaml" "$tmp/kbds/gr.yaml" +OMAMOBILE_KEYBOARDS_DIR=$tmp/kbds run set layouts us,gr,de >/dev/null +eq "$(cat "$tmp/sources")" "[('xkb', 'gr'), ('xkb', 'fr'), ('ibus', 'x'), ('xkb', 'us')]" +run set layouts us,de >/dev/null +eq "$(cat "$tmp/sources")" "[('xkb', 'fr'), ('ibus', 'x'), ('xkb', 'us'), ('xkb', 'de')]" +: > "$tmp/log"; run set layouts us,de >/dev/null +hasnt "$tmp/log" 'gsettings set' +run set layouts us,gr >/dev/null + +# per-device blocks and variables named kb_layout are not the global setting +cat > "$tmp/input.lua" <<'EOT' +local kb_layout = "ru" +hl.config({ + input = { + kb_layout = "us", + kb_options = "grp:caps_toggle", + touchpad = { kb_layout = "fr" }, + }, +}) +hl.device({ name = "x", kb_layout = "de" }) +EOT +eq "$(run get | grep -o '"layouts":[^]]*]')" '"layouts":[{"layout":"us","variant":""}]' +run set layouts us,gr >/dev/null +has "$tmp/input.lua" ' kb_layout = "us,gr",' +has "$tmp/input.lua" 'local kb_layout = "ru"' +has "$tmp/input.lua" 'touchpad = { kb_layout = "fr" },' +has "$tmp/input.lua" 'hl.device({ name = "x", kb_layout = "de" })' + +# a symlinked input.lua stays a link, its target is written +mkdir -p "$tmp/dots"; mv "$tmp/input.lua" "$tmp/dots/input.lua"; ln -s "$tmp/dots/input.lua" "$tmp/input.lua" +run set layouts us,de >/dev/null +[[ -L $tmp/input.lua ]] || { echo "FAIL: the symlink was replaced" >&2; exit 1; } +has "$tmp/dots/input.lua" ' kb_layout = "us,de",' +rm "$tmp/input.lua"; mv "$tmp/dots/input.lua" "$tmp/input.lua" + +# get and set agree on the switch key when input.lua has kb_layout but no kb_options +printf 'hl.config({\n input = {\n kb_layout = "us,gr",\n },\n})\n' > "$tmp/input.lua" +eq "$(FAKE_OPTIONS=grp:caps_toggle run get)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":""}],"switchKey":"grp:caps_toggle","active":1}' + # bad input never reaches the file cp "$tmp/input.lua" "$tmp/before" eq "$(run set layouts us,gr,de,ru,us:intl)" '{"error":"give 1 to 4 layouts"}' @@ -165,7 +220,7 @@ eq "$(run get)" '{"error":"input.lua: kb_layout is not a plain string"}' printf 'hl.config({ input = {\n kb_layout = "us",\n kb_options = "grp_led:caps",\n} })\n' > "$tmp/input.lua" : > "$tmp/log" FAKE_EVAL_FAIL=1 run set layouts us,gr >/dev/null -has "$tmp/log" 'keyword input:kb_layout us,gr' +has "$tmp/log" '--batch keyword input:kb_variant ; keyword input:kb_options grp_led:caps; keyword input:kb_layout us,gr' eq "$(FAKE_EVAL_FAIL=1 FAKE_KEYWORD_FAIL=1 run set layouts us,de)" '{"error":"saved to input.lua, but Hyprland did not take it live"}' has "$tmp/input.lua" 'kb_layout = "us,de",' eq "$(FAKE_GSETTINGS_FAIL=1 run set layouts us,gr)" '{"error":"saved and applied, but the on-screen keyboard list was not updated"}' From aca06b39e0c38a8725818ab31158f906aebc6941 Mon Sep 17 00:00:00 2001 From: Lef Date: Tue, 17 Nov 2026 15:12:01 +0200 Subject: [PATCH 10/19] keyboard: switch key is a Hyprland bind, no OSK writes on a switch The xkb grp: option never switched layouts on the phone (Hyprland 0.57.0), and writing gsettings on a hardware switch made squeekboard resend its keymap, so apps got Latin letters. Settings now writes ~/.config/hypr/omamobile-keyboard.lua (Alt+Shift, Ctrl+Shift, Caps Lock or none, both key orders, every keyboard but squeekboard's), phone.lua loads it, and grp: options are dropped from kb_options. omamobile-keyboard-switch only runs switchxkblayout on real keyboards; the follower service is gone. The layout picker is a search field instead of the full list. --- .../omamobile-settings/app/KeyboardPage.qml | 33 ++--- .../omamobile-settings/app/actionrunner.cpp | 2 +- .../omamobile-settings/backends/keyboard.sh | 124 ++++++++++++++---- packages/omamobile-settings/test/all | 2 + .../test/keyboard-backend.sh | 82 ++++++++---- .../bin/omamobile-keyboard-switch | 77 +++-------- packages/omamobile-shell/hypr/phone.lua | 17 ++- packages/omamobile-shell/install | 3 - .../user/omamobile-keyboard-switch.service | 16 --- packages/omamobile-shell/test/all | 3 + .../omamobile-shell/test/keyboard-switch.sh | 81 ++++-------- 11 files changed, 221 insertions(+), 219 deletions(-) delete mode 100644 packages/omamobile-shell/systemd/user/omamobile-keyboard-switch.service diff --git a/packages/omamobile-settings/app/KeyboardPage.qml b/packages/omamobile-settings/app/KeyboardPage.qml index 3efc85506..4f1452d66 100644 --- a/packages/omamobile-settings/app/KeyboardPage.qml +++ b/packages/omamobile-settings/app/KeyboardPage.qml @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // Keyboard layouts (up to 4) and the hardware switch key, through backends/keyboard.sh. Each change is -// saved and applied at once; the backend keeps the on-screen keyboard's list in the same order. +// saved and applied at once; new layouts are added to the on-screen keyboard's list, and the switch key is a Hyprland bind. import QtQuick import QtQuick.Controls import QtQuick.Layouts @@ -17,7 +17,6 @@ Flickable { property string status: qsTr("Reading the keyboard settings...") property string warn: "" property bool busy: true - property bool adding: false property int reqId: -1 property int listId: -1 readonly property int maxLayouts: 4 @@ -54,7 +53,7 @@ Flickable { lastError = "" } function save(list) { - adding = false + filter.text = "" // The backend refuses this too; stop here so nothing is sent. if (!list.length || !isLatin(list[0])) { status = qsTr("The first layout must be a Latin one: passwords on the lock screen are typed in it.") @@ -105,25 +104,21 @@ Flickable { text: "⚠ " + page.warn color: backend.foreground; wrapMode: Text.Wrap; Layout.fillWidth: true } - SettingsButton { - visible: !page.adding && page.layouts.length < page.maxLayouts - enabled: !page.busy && page.available.length > 0 - text: qsTr("Add a layout") - onClicked: { filter.text = ""; page.adding = true } - } + // Add a layout: a search field, with matches shown as you type (the full list is ~100 long). SettingsTextField { id: filter - visible: page.adding + visible: page.layouts.length < page.maxLayouts + enabled: !page.busy && page.available.length > 0 Layout.fillWidth: true; Layout.preferredHeight: 52 - placeholderText: qsTr("Search layouts") + placeholderText: qsTr("Add a layout: type a language or country") color: backend.foreground; placeholderTextColor: backend.muted background: Rectangle { radius: Math.min(backend.radius, width / 2, height / 2); color: SettingsStyle.fill("normal") } } Repeater { - model: page.adding ? page.available.filter(a => { - const q = filter.text.toLowerCase() - return page.layouts.indexOf(a.layout) < 0 && (q === "" || a.name.toLowerCase().indexOf(q) >= 0 || a.layout.indexOf(q) >= 0) - }).slice(0, 30) : [] + model: filter.visible && filter.text.trim() !== "" ? page.available.filter(a => { + const q = filter.text.trim().toLowerCase() + return page.layouts.indexOf(a.layout) < 0 && (a.name.toLowerCase().indexOf(q) >= 0 || a.layout.indexOf(q) >= 0) + }).slice(0, 12) : [] delegate: SettingsButton { required property var modelData Layout.fillWidth: true @@ -132,7 +127,6 @@ Flickable { onClicked: page.add(modelData.layout) } } - SettingsButton { visible: page.adding; text: qsTr("Cancel"); onClicked: page.adding = false } SettingsLabel { visible: page.layouts.length > 1 text: qsTr("Switch key (hardware keyboard)"); font.weight: Font.DemiBold; color: backend.foreground @@ -142,13 +136,12 @@ Flickable { visible: page.layouts.length > 1 Layout.fillWidth: true; spacing: 8 Repeater { - model: [{ option: "none", name: qsTr("None") }].concat(page.switchKeys.filter(k => - ["grp:alt_shift_toggle", "grp:ctrl_shift_toggle", "grp:caps_toggle", - "grp:alt_space_toggle", "grp:ctrl_space_toggle"].indexOf(k.option) >= 0 || k.option === page.switchKey)) + // From `keyboard.sh list`: Alt+Shift, Ctrl+Shift, Caps Lock, None (Hyprland binds, not xkb grp:) + model: page.switchKeys delegate: SettingsButton { required property var modelData text: modelData.name - highlighted: modelData.option === "none" ? page.switchKey === "" : page.switchKey === modelData.option + highlighted: page.switchKey === modelData.option enabled: !page.busy onClicked: { page.busy = true; page.reqId = actions.run("keyboard", ["set", "switch-key", modelData.option]) } } diff --git a/packages/omamobile-settings/app/actionrunner.cpp b/packages/omamobile-settings/app/actionrunner.cpp index b44f2acf5..4ab875720 100644 --- a/packages/omamobile-settings/app/actionrunner.cpp +++ b/packages/omamobile-settings/app/actionrunner.cpp @@ -16,7 +16,7 @@ void ActionRunner::post(const QString &tool, const QVariantMap &result, int id) int ActionRunner::run(const QString &tool, const QStringList &args) { static const QRegularExpression word("\\A[a-z0-9]{1,16}\\z"); - // keyboard takes layout lists (us,gr:polytonic), switch-key and grp:option names + // keyboard takes layout lists (us,gr:polytonic), and switch-key names (alt_shift, ctrl_shift, caps, none) static const QRegularExpression kbdWord("\\A[a-z][a-z0-9_:,-]{0,159}\\z"); static const QStringList tools = {"display", "keyboard"}; const int id = ++m_next; diff --git a/packages/omamobile-settings/backends/keyboard.sh b/packages/omamobile-settings/backends/keyboard.sh index c9203fc12..7533c1c80 100755 --- a/packages/omamobile-settings/backends/keyboard.sh +++ b/packages/omamobile-settings/backends/keyboard.sh @@ -1,30 +1,39 @@ #!/bin/bash # SPDX-License-Identifier: MIT # Keyboard layouts for the Settings app. The hardware keyboard's layouts live in Omarchy's user file -# ~/.config/hypr/input.lua (kb_layout, kb_variant and the grp: switch key in kb_options); the on-screen -# keyboard's list is gsettings org.gnome.desktop.input-sources sources. This keeps both the same. +# ~/.config/hypr/input.lua (kb_layout, kb_variant); the on-screen keyboard's list is gsettings +# org.gnome.desktop.input-sources sources, and a layouts change adds new ones there too. +# The switch key is a Hyprland bind, not an xkb grp: option (on the phone, Hyprland 0.57.0, 2026-11-17, a +# grp: option never switched; a bind running switchxkblayout did). It is kept in a generated file, +# ~/.config/hypr/omamobile-keyboard.lua, that phone.lua loads: its "-- switch-key: NAME" line is the +# choice, and with two or more layouts it binds both key orders (ALT + SHIFT_L and SHIFT + ALT_L) on every +# keyboard but squeekboard's to `omamobile-keyboard-switch next`. The same binds are applied live with +# `hyprctl eval`. Any grp: option left in kb_options from earlier versions is removed on the next set. # Prints one line of JSON. -# keyboard.sh get {"layouts":[{"layout":"us","variant":""}],"switchKey":"","active":0} +# keyboard.sh get {"layouts":[{"layout":"us","variant":""}],"switchKey":"alt_shift","active":0} # keyboard.sh list {"layouts":[{"layout":"us","name":"English (US)"}],"switchKeys":[...]} # keyboard.sh set layouts us,gr[:variant] 1 to 4 layouts, each a name (and variant) in the xkb rules list -# keyboard.sh set switch-key grp:OPTION or "none"; one layout left always drops the switch key +# keyboard.sh set switch-key NAME alt_shift, ctrl_shift, caps or none (default alt_shift) # "active" is the index Hyprland reports for the main real keyboard, or null without one. Real = not # hl-virtual-keyboard* and not a pseudo-keyboard (consumer-control, power-button, video-bus, radio-control, # gpio-keys); main = the real one Hyprland marks main, else the first real one with more than one layout, # else the first real one (the same rule as omamobile-keyboard-switch and the bar). A layouts list whose # first entry is not a Latin layout is refused (passwords on the lock screen are typed in layout 1). # input.lua is edited in place: only the last live kb_layout, kb_variant and kb_options strings inside an -# `input = { }` table change (per-device blocks and variables are left alone), comments and every other option (grp_led:caps, compose:...) stay, a copy of the old +# `input = { }` table change (per-device blocks and variables are left alone), comments and every other +# option but grp: (grp_led:caps, compose:...) stay, a copy of the old # file goes to input.lua.bak-omamobile first, and the write is dropped if the file changed meanwhile. # A file with no live kb_layout (Omarchy's stock one has them only in comments) gets one hl.config() block # appended at the end; get then reports Hyprland's effective values. # A symlinked input.lua stays a link: its target is written. gsettings is written first, then the change # is applied live without `hyprctl reload` (a reload sets the configured refresh rate again and re-runs -# phone.lua), so the layout follower never reads the old list. gsettings is merged, not replaced: the +# phone.lua). gsettings is merged, not replaced: the # OSK's own languages and its current (first) entry stay; new hardware layouts are added at the end # (only ones squeekboard has a layout file for, when that directory exists); removed ones are dropped. -# A switch-key change does not touch gsettings. +# A switch-key change does not touch gsettings. Switching layouts never writes gsettings either (that made +# squeekboard send its keymap again, and the app got Latin letters while Hyprland said Greek). # Test hooks (nothing in the environment sets them): OMAMOBILE_KBD_INPUT is the input.lua path, +# OMAMOBILE_KBD_BINDS the generated bind file, # OMAMOBILE_KBD_RULES the xkb rules .lst file, OMAMOBILE_KEYBOARDS_DIR squeekboard's layout files; the test puts a fake hyprctl and gsettings first on PATH. set -euo pipefail set +x @@ -50,14 +59,22 @@ if [[ -z $rules ]]; then [[ -r $f ]] && { rules=$f; break; } done fi -export KBD_INPUT=$input KBD_RULES=$rules +binds=${OMAMOBILE_KBD_BINDS:-${XDG_CONFIG_HOME:-$HOME/.config}/hypr/omamobile-keyboard.lua} +export KBD_INPUT=$input KBD_RULES=$rules KBD_BINDS=$binds /usr/bin/python3 -I - "$@" <<'PY' || exit 2 import fcntl, hashlib, json, os, re, shutil, subprocess, sys KEYS = ("kb_layout", "kb_variant", "kb_options") NAME_RE = re.compile(r"[a-z][a-z0-9_-]{0,31}") -SWITCH_RE = re.compile(r"grp:[a-z0-9_]{1,48}") +# Switch keys: each name binds these key strings (both orders, so either key can go down first). +# "caps" binds the key by its code (66), as compose:caps may give it another keysym. UNVERIFIED on the +# phone: ctrl_shift and caps (only ALT + SHIFT_L / SHIFT + ALT_L were tried, 2026-11-17). +SWITCH_KEYS = {"alt_shift": ("ALT + SHIFT_L", "SHIFT + ALT_L"), "ctrl_shift": ("CTRL + SHIFT_L", "SHIFT + CTRL_L"), + "caps": ("code:66",), "none": ()} +SWITCH_NAMES = [("alt_shift", "Alt+Shift"), ("ctrl_shift", "Ctrl+Shift"), ("caps", "Caps Lock"), ("none", "None")] +DEFAULT_KEY = "alt_shift" +BINDS = os.environ["KBD_BINDS"] OPTION_RE = re.compile(r"[a-z0-9_]{1,32}:[A-Za-z0-9_]{1,48}") LATIN = {"us", "gb", "de", "fr", "es", "it", "pt", "nl", "be", "ch", "at", "se", "no", "dk", "fi", "is", "ie", "pl", "cz", "sk", "hu", "ro", "hr", "si", "ee", "lv", "lt", "tr", "br", "latam", @@ -189,8 +206,58 @@ def active(): i = pick[0].get("active_layout_index") return i if isinstance(i, int) and i >= 0 else None +def stored_key(): + try: + with open(BINDS, encoding="utf-8", errors="replace") as f: + for line in f: + m = re.fullmatch(r"-- switch-key: ([a-z_]+)\s*", line) + if m and m.group(1) in SWITCH_KEYS: + return m.group(1) + except OSError: + pass + return DEFAULT_KEY + +def bind_lua(name, count): + """The binds for a switch key, as Lua for the file and for hyprctl eval; none with one layout.""" + if count < 2: + return "" + dev = '{ inclusive = false, list = { "hl-virtual-keyboard-squeekboard" } }' + return "".join('hl.bind("%s", hl.dsp.exec_cmd("omamobile-keyboard-switch next"), ' + '{ description = "Keyboard: next layout", device = %s })\n' % (k, dev) + for k in SWITCH_KEYS[name]) + +def write_binds(name, count): + text = ("-- Written by Omarchy Mobile Settings (Keyboard), loaded by phone.lua. Changes here are replaced.\n" + "-- switch-key: %s\n" % name) + bind_lua(name, count) + tmp = "%s.tmp-omamobile.%d" % (BINDS, os.getpid()) + try: + os.makedirs(os.path.dirname(BINDS), exist_ok=True) + with open(tmp, "w", encoding="utf-8") as f: + f.write(text) + f.flush() + os.fsync(f.fileno()) + os.replace(tmp, BINDS) + except OSError: + try: + os.unlink(tmp) + except OSError: + pass + return False + return True + +# Live: drop the old key's binds (and the new key's, so nothing is bound twice), then bind. hl.unbind +# takes every bind on that key string, a user's own too. UNVERIFIED on the phone: hl.unbind and hl.bind +# through `hyprctl eval` (the phone test bound ALT + SHIFT_L live, not through this code). +def apply_binds(old, name, count): + keys = list(dict.fromkeys(SWITCH_KEYS[old] + SWITCH_KEYS[name])) + lua = "".join('pcall(hl.unbind, "%s")\n' % k for k in keys) + bind_lua(name, count) + if not lua: + return True + r = run(["hyprctl", "eval", lua]) + return r is not None and "error" not in r.lower() + def state(layouts, variants, options): - sw = next((o for o in options if o.startswith("grp:")), "") + sw = stored_key() return {"layouts": [{"layout": l, "variant": v} for l, v in zip(layouts, variants)], "switchKey": sw, "active": active()} @@ -340,7 +407,7 @@ if verb == "list": names = [] rules(names) out({"layouts": [{"layout": n, "name": d} for s, n, d in names if s == "layout" and NAME_RE.fullmatch(n)], - "switchKeys": [{"option": n, "name": d} for s, n, d in names if s == "option" and SWITCH_RE.fullmatch(n)]}) + "switchKeys": [{"option": n, "name": d} for n, d in SWITCH_NAMES]}) sys.exit(0) if verb != "set": fail("usage: get|list|set") @@ -366,7 +433,7 @@ if key == "layouts": if new_l[0] not in LATIN: fail("the first layout must be a Latin one (passwords on the lock screen are typed in it)") else: - if value != "none" and (not SWITCH_RE.fullmatch(value) or value not in opt): + if value not in SWITCH_KEYS: fail("unknown switch key") lockpath = path + ".lock-omamobile" @@ -382,24 +449,29 @@ if "kb_layout" not in found: old_names = lst_names(layouts, variants) if "kb_options" not in found: options = effective_options() # keep Omarchy's defaults when input.lua does not set kb_options +old_key = stored_key() +had_grp = any(o.startswith("grp:") for o in options) +options = [o for o in options if not o.startswith("grp:")] # the switch key is a bind now if key == "layouts": layouts, variants = new_l, new_v - sw = [o for o in options if o.startswith("grp:")] + sw = old_key else: - sw = [] if value == "none" else [value] -if len(layouts) < 2: - sw = [] -options = [o for o in options if not o.startswith("grp:")] + sw[:1] -new = {"kb_layout": ",".join(layouts), "kb_options": ",".join(options)} -if "kb_options" not in found and not options: - del new["kb_options"] -if any(variants) or "kb_variant" in found: - new["kb_variant"] = ",".join(variants) if any(variants) else "" -write(data, st, text, found, new) -osk_ok = key != "layouts" or sync_osk(old_names, lst_names(layouts, variants)) -live_ok = apply_live(layouts, variants, options) + sw = value +live_ok = osk_ok = True +if key == "layouts" or had_grp: + new = {"kb_layout": ",".join(layouts), "kb_options": ",".join(options)} + if "kb_options" not in found and not options: + del new["kb_options"] + if any(variants) or "kb_variant" in found: + new["kb_variant"] = ",".join(variants) if any(variants) else "" + write(data, st, text, found, new) + osk_ok = key != "layouts" or sync_osk(old_names, lst_names(layouts, variants)) + live_ok = apply_live(layouts, variants, options) +if not write_binds(sw, len(layouts)): + fail("cannot write " + os.path.basename(BINDS)) +live_ok = apply_binds(old_key, sw, len(layouts)) and live_ok if not live_ok: - fail("saved to input.lua, but Hyprland did not take it live" + fail("saved, but Hyprland did not take it live" + ("" if osk_ok else ", and the on-screen keyboard list was not updated")) if not osk_ok: fail("saved and applied, but the on-screen keyboard list was not updated") diff --git a/packages/omamobile-settings/test/all b/packages/omamobile-settings/test/all index f2af8f813..fdec653a7 100755 --- a/packages/omamobile-settings/test/all +++ b/packages/omamobile-settings/test/all @@ -6,6 +6,8 @@ build_dir=${OMAMOBILE_SETTINGS_TEST_BUILD_DIR:-"$source_dir/build/tests"} "$source_dir/bin/build" "$source_dir/test/display-backend.sh" "$source_dir/test/keyboard-backend.sh" +# Adding a layout is a search: matches show only once something is typed, never the whole list +grep -qF 'model: filter.visible && filter.text.trim() !== "" ? page.available.filter(' "$source_dir/app/KeyboardPage.qml" || { echo "FAIL: layout picker lists everything" >&2; exit 1; } # The page stops a non-Latin first layout before sending it, and reads the state again after a failed set grep -qF 'if (!list.length || !isLatin(list[0])) {' "$source_dir/app/KeyboardPage.qml" || { echo "FAIL: page sends a non-Latin first layout" >&2; exit 1; } grep -qF 'lastError = r.error; status = r.error; busy = true; reqId = actions.run("keyboard", ["get"])' "$source_dir/app/KeyboardPage.qml" || { echo "FAIL: page keeps a stale list after an error" >&2; exit 1; } diff --git a/packages/omamobile-settings/test/keyboard-backend.sh b/packages/omamobile-settings/test/keyboard-backend.sh index 3a82065d2..d33260f54 100755 --- a/packages/omamobile-settings/test/keyboard-backend.sh +++ b/packages/omamobile-settings/test/keyboard-backend.sh @@ -54,7 +54,7 @@ EOT export PATH="$tmp/bin:$PATH" FAKE_LOG="$tmp/log" FAKE_DEVICES="$tmp/devices.json" FAKE_SOURCES="$tmp/sources" export OMAMOBILE_KEYBOARDS_DIR="$tmp/nokeyboards" export XDG_RUNTIME_DIR="$tmp/run" HYPRLAND_INSTANCE_SIGNATURE=test -export OMAMOBILE_KBD_INPUT="$tmp/input.lua" OMAMOBILE_KBD_RULES="$tmp/rules.lst" +export OMAMOBILE_KBD_INPUT="$tmp/input.lua" OMAMOBILE_KBD_RULES="$tmp/rules.lst" OMAMOBILE_KBD_BINDS="$tmp/omamobile-keyboard.lua" unset FAKE_OPTIONS FAKE_EVAL_FAIL FAKE_KEYWORD_FAIL FAKE_GSETTINGS_FAIL run() { bash "$src/backends/keyboard.sh" "$@" || true; } eq() { [[ $1 == "$2" ]] || { echo "FAIL: got $1, want $2" >&2; exit 1; }; } @@ -76,37 +76,59 @@ hl.config({ }) EOT chmod 640 "$tmp/input.lua" -eq "$(run get)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"grp:caps_toggle","active":1}' +# no bind file yet: the default switch key +eq "$(run get)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"alt_shift","active":1}' : > "$tmp/log" -eq "$(run set layouts us,gr:polytonic)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"grp:caps_toggle","active":1}' +eq "$(run set layouts us,gr:polytonic)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"alt_shift","active":1}' has "$tmp/input.lua" 'kb_layout = "us,gr",' has "$tmp/input.lua" 'kb_variant = ",polytonic",' -has "$tmp/input.lua" 'kb_options = "compose:caps,grp_led:caps,grp:caps_toggle", -- keep me' +# the old grp: option is removed (it never switched on the phone), grp_led and the rest stay +has "$tmp/input.lua" 'kb_options = "compose:caps,grp_led:caps", -- keep me' +# both key orders bound on every keyboard but squeekboard's, in the file and live +b=$tmp/omamobile-keyboard.lua +has "$b" '-- switch-key: alt_shift' +has "$b" 'hl.bind("ALT + SHIFT_L", hl.dsp.exec_cmd("omamobile-keyboard-switch next"), { description = "Keyboard: next layout", device = { inclusive = false, list = { "hl-virtual-keyboard-squeekboard" } } })' +has "$b" 'hl.bind("SHIFT + ALT_L", hl.dsp.exec_cmd("omamobile-keyboard-switch next")' +has "$tmp/log" 'pcall(hl.unbind, "ALT + SHIFT_L")' +has "$tmp/log" 'hl.bind("SHIFT + ALT_L", hl.dsp.exec_cmd("omamobile-keyboard-switch next")' +hasnt "$tmp/log" 'grp:' has "$tmp/input.lua" '-- kb_layout = "fr", a comment, never touched' has "$tmp/input.lua" 'hl.config({ input = { kb_layout = "de" } })' has "$tmp/input.lua" ' kb_options = "grp:caps_toggle" ]]' eq "$(grep -c 'hl.config' "$tmp/input.lua")" 2 eq "$(stat -c %a "$tmp/input.lua")" 640 has "$tmp/input.lua.bak-omamobile" 'kb_layout = "us",' -has "$tmp/log" 'eval hl.config({ input = { kb_layout = "us,gr", kb_variant = ",polytonic", kb_options = "compose:caps,grp_led:caps,grp:caps_toggle" } })' +has "$tmp/log" 'eval hl.config({ input = { kb_layout = "us,gr", kb_variant = ",polytonic", kb_options = "compose:caps,grp_led:caps" } })' has "$tmp/log" "gsettings set org.gnome.desktop.input-sources sources [('xkb', 'us'), ('xkb', 'gr+polytonic')]" -# gsettings is written before the live apply (the follower must not read the old list) -g=$(grep -n '^gsettings set' "$tmp/log" | cut -d: -f1); e=$(grep -n '^eval' "$tmp/log" | cut -d: -f1) +# gsettings is written before the live apply +g=$(grep -n '^gsettings set' "$tmp/log" | cut -d: -f1); e=$(grep -n '^eval' "$tmp/log" | head -1 | cut -d: -f1) (( g < e )) || { echo "FAIL: gsettings ($g) after the live apply ($e)" >&2; exit 1; } hasnt "$tmp/log" 'reload' -eq "$(run get)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"grp:caps_toggle","active":1}' +eq "$(run get)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"alt_shift","active":1}' -# the switch key: only the grp: part changes, gsettings is not touched -: > "$tmp/log" -eq "$(run set switch-key grp:alt_shift_toggle)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"grp:alt_shift_toggle","active":1}' -has "$tmp/input.lua" 'kb_options = "compose:caps,grp_led:caps,grp:alt_shift_toggle",' +# the switch key: the old binds go, the new ones come; input.lua and gsettings are not touched +cp "$tmp/input.lua" "$tmp/before"; : > "$tmp/log" +eq "$(run set switch-key ctrl_shift)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"ctrl_shift","active":1}' +cmp -s "$tmp/input.lua" "$tmp/before" || { echo "FAIL: a switch-key change wrote input.lua" >&2; exit 1; } +has "$b" '-- switch-key: ctrl_shift' +has "$b" 'hl.bind("CTRL + SHIFT_L",' +has "$b" 'hl.bind("SHIFT + CTRL_L",' +hasnt "$b" 'ALT' +has "$tmp/log" 'pcall(hl.unbind, "ALT + SHIFT_L")' +has "$tmp/log" 'pcall(hl.unbind, "SHIFT + ALT_L")' hasnt "$tmp/log" 'gsettings' -eq "$(run set switch-key none | grep -o '"switchKey":"[^"]*"')" '"switchKey":""' -has "$tmp/input.lua" 'kb_options = "compose:caps,grp_led:caps",' -run set switch-key grp:caps_toggle >/dev/null -# one layout left drops the switch key and the variant; grp_led stays -eq "$(run set layouts us)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"","active":1}' +hasnt "$tmp/log" 'kb_options' +run set switch-key caps >/dev/null +has "$b" 'hl.bind("code:66",' +eq "$(run set switch-key none | grep -o '"switchKey":"[^"]*"')" '"switchKey":"none"' +hasnt "$b" 'hl.bind' +has "$b" '-- switch-key: none' +run set switch-key alt_shift >/dev/null +# one layout left: no binds (the choice is kept for later); the variant goes; grp_led stays +eq "$(run set layouts us)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"alt_shift","active":1}' +hasnt "$b" 'hl.bind' +has "$b" '-- switch-key: alt_shift' has "$tmp/input.lua" 'kb_options = "compose:caps,grp_led:caps",' has "$tmp/input.lua" 'kb_variant = "",' @@ -135,7 +157,7 @@ local kb_layout = "ru" hl.config({ input = { kb_layout = "us", - kb_options = "grp:caps_toggle", + kb_options = "compose:caps", touchpad = { kb_layout = "fr" }, }, }) @@ -155,9 +177,11 @@ run set layouts us,de >/dev/null has "$tmp/dots/input.lua" ' kb_layout = "us,de",' rm "$tmp/input.lua"; mv "$tmp/dots/input.lua" "$tmp/input.lua" -# get and set agree on the switch key when input.lua has kb_layout but no kb_options +# an effective grp: option (input.lua has no kb_options) is dropped by a switch-key change too +printf 'hl.config({\n input = {\n kb_layout = "us,gr",\n },\n})\n' > "$tmp/input.lua" +FAKE_OPTIONS=compose:caps,grp:alt_shift_toggle run set switch-key alt_shift >/dev/null +has "$tmp/input.lua" ' kb_options = "compose:caps",' printf 'hl.config({\n input = {\n kb_layout = "us,gr",\n },\n})\n' > "$tmp/input.lua" -eq "$(FAKE_OPTIONS=grp:caps_toggle run get)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":""}],"switchKey":"grp:caps_toggle","active":1}' # bad input never reaches the file cp "$tmp/input.lua" "$tmp/before" @@ -167,8 +191,8 @@ eq "$(run set layouts us,gr:intl)" '{"error":"unknown layout: gr:intl"}' eq "$(run set layouts 'us,gr"')" '{"error":"bad layout name"}' eq "$(run set layouts us,us)" '{"error":"layout listed twice: us"}' eq "$(run set layouts '')" '{"error":"give 1 to 4 layouts"}' -eq "$(run set switch-key grp:nope)" '{"error":"unknown switch key"}' -eq "$(run set switch-key 'grp:caps_toggle"')" '{"error":"unknown switch key"}' +eq "$(run set switch-key grp:alt_shift_toggle)" '{"error":"unknown switch key"}' +eq "$(run set switch-key 'caps"')" '{"error":"unknown switch key"}' eq "$(run set numlock on)" '{"error":"unknown key"}' eq "$(run nonsense)" '{"error":"usage: get|list|set"}' cmp -s "$tmp/input.lua" "$tmp/before" || { echo "FAIL: a rejected set changed input.lua" >&2; exit 1; } @@ -187,12 +211,12 @@ hl.config({ EOT FAKE_OPTIONS="compose:caps,shift:both_capslock_cancel" export FAKE_OPTIONS -eq "$(run get)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"","active":1}' +eq "$(run get)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"alt_shift","active":1}' run set layouts us,gr >/dev/null has "$tmp/input.lua" '-- kb_layout = "us,dk,eu",' has "$tmp/input.lua" ' kb_layout = "us,gr",' has "$tmp/input.lua" ' kb_options = "compose:caps,shift:both_capslock_cancel",' -eq "$(run get)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":""}],"switchKey":"","active":1}' +eq "$(run get)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":""}],"switchKey":"alt_shift","active":1}' eq "$(grep -c 'hl.config' "$tmp/input.lua")" 2 run set layouts us,de >/dev/null eq "$(grep -c 'hl.config' "$tmp/input.lua")" 2 @@ -203,7 +227,7 @@ eq "$(run get)" '{"error":"input.lua is missing"}' # kb_options and kb_variant absent: added on the kb_layout line's table, Omarchy's effective options kept printf 'hl.config({\n input = {\n kb_layout = "us",\n },\n})\n' > "$tmp/input.lua" -FAKE_OPTIONS='compose:caps' eq "$(FAKE_OPTIONS=compose:caps run set layouts us,gr:polytonic | grep -o '"switchKey":"[^"]*"')" '"switchKey":""' +FAKE_OPTIONS='compose:caps' eq "$(FAKE_OPTIONS=compose:caps run set layouts us,gr:polytonic | grep -o '"switchKey":"[^"]*"')" '"switchKey":"alt_shift"' has "$tmp/input.lua" ' kb_layout = "us,gr",' has "$tmp/input.lua" ' kb_variant = ",polytonic",' has "$tmp/input.lua" ' kb_options = "compose:caps",' @@ -211,7 +235,7 @@ eq "$(grep -c 'hl.config' "$tmp/input.lua")" 1 # a kb_layout that is not followed by a comma: refused rather than guessed printf 'hl.config({ input = { kb_layout = "us" } })\n' > "$tmp/input.lua" eq "$(run set layouts us,gr:polytonic)" '{"error":"input.lua: cannot add kb_variant next to kb_layout"}' -eq "$(run set layouts us,gr)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":""}],"switchKey":"","active":1}' +eq "$(run set layouts us,gr)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":""}],"switchKey":"alt_shift","active":1}' # a value this editor does not handle is refused printf 'hl.config({ input = { kb_layout = [[us]], } })\n' > "$tmp/input.lua" eq "$(run get)" '{"error":"input.lua: kb_layout is not a plain string"}' @@ -221,11 +245,11 @@ printf 'hl.config({ input = {\n kb_layout = "us",\n kb_options = "grp_led:caps : > "$tmp/log" FAKE_EVAL_FAIL=1 run set layouts us,gr >/dev/null has "$tmp/log" '--batch keyword input:kb_variant ; keyword input:kb_options grp_led:caps; keyword input:kb_layout us,gr' -eq "$(FAKE_EVAL_FAIL=1 FAKE_KEYWORD_FAIL=1 run set layouts us,de)" '{"error":"saved to input.lua, but Hyprland did not take it live"}' +eq "$(FAKE_EVAL_FAIL=1 FAKE_KEYWORD_FAIL=1 run set layouts us,de)" '{"error":"saved, but Hyprland did not take it live"}' has "$tmp/input.lua" 'kb_layout = "us,de",' eq "$(FAKE_GSETTINGS_FAIL=1 run set layouts us,gr)" '{"error":"saved and applied, but the on-screen keyboard list was not updated"}' # no Hyprland: active is null -FAKE_DEVICES=$tmp/none eq "$(FAKE_DEVICES=$tmp/none run get)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":""}],"switchKey":"","active":null}' +FAKE_DEVICES=$tmp/none eq "$(FAKE_DEVICES=$tmp/none run get)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":""}],"switchKey":"alt_shift","active":null}' # list: layouts and grp: switch keys from the rules file, other options left out -eq "$(run list)" '{"layouts":[{"layout":"us","name":"English (US)"},{"layout":"gr","name":"Greek"},{"layout":"de","name":"German"},{"layout":"ru","name":"Russian"}],"switchKeys":[{"option":"grp:alt_shift_toggle","name":"Alt+Shift"},{"option":"grp:caps_toggle","name":"Caps Lock"}]}' +eq "$(run list)" '{"layouts":[{"layout":"us","name":"English (US)"},{"layout":"gr","name":"Greek"},{"layout":"de","name":"German"},{"layout":"ru","name":"Russian"}],"switchKeys":[{"option":"alt_shift","name":"Alt+Shift"},{"option":"ctrl_shift","name":"Ctrl+Shift"},{"option":"caps","name":"Caps Lock"},{"option":"none","name":"None"}]}' echo "keyboard backend: ok" diff --git a/packages/omamobile-shell/bin/omamobile-keyboard-switch b/packages/omamobile-shell/bin/omamobile-keyboard-switch index 7d4aecdbf..3a9c26c23 100755 --- a/packages/omamobile-shell/bin/omamobile-keyboard-switch +++ b/packages/omamobile-shell/bin/omamobile-keyboard-switch @@ -1,15 +1,14 @@ #!/usr/bin/env python3 # SPDX-License-Identifier: MIT -"""Hardware keyboard layout switching, kept in step with the on-screen keyboard. +"""Hardware keyboard layout switching. omamobile-keyboard-switch next every real keyboard to the next layout omamobile-keyboard-switch set N every real keyboard to layout N (0 = first) - omamobile-keyboard-switch lock layout 0 on every real keyboard and first in - the on-screen keyboard's list (lock screen, + omamobile-keyboard-switch lock layout 0 on every real keyboard (lock screen, polkit prompt: passwords are typed in layout 0) - omamobile-keyboard-switch listen follow Hyprland's activelayout events (the xkb - grp: switch key runs no command) and move the - same layout to the front of the OSK's list + +The switch key the Settings page picks is a Hyprland bind running `next` +(~/.config/hypr/omamobile-keyboard.lua, loaded by phone.lua). Real keyboards are the ones in `hyprctl -j devices` that are not squeekboard's or another virtual keyboard (hl-virtual-keyboard*) or a pseudo-keyboard @@ -17,29 +16,26 @@ or another virtual keyboard (hl-virtual-keyboard*) or a pseudo-keyboard set as the Settings backend and the bar. The "main" keyboard (whose layout `next` steps from and the bar shows) is, in all three: the real one Hyprland marks main, else the first real one with more than one layout, else the first -real one. `listen` brings every other real keyboard to the index of the one a -switch key was pressed on, so they agree and the pick does not matter much. -On Hyprland 0.56.2 only the virtual keyboard had main: true. The layout count and names come from the keyboard's own `layout` and -`variant` fields. The OSK follows by NAME, never by index: squeekboard and -omamobile-keyboard-languages move the current entry to the front of -org.gnome.desktop.input-sources sources, so its order changes on every switch. -A layout that is not in the OSK list is added by omamobile-keyboard-languages. +real one. Every real keyboard is set to the same index. + +This never touches the on-screen keyboard: no gsettings write and no +omamobile-keyboard-languages call. On the phone (Hyprland 0.57.0, 2026-11-17) +a gsettings write on a hardware switch made squeekboard send its keymap again, +and the app then got Latin letters while Hyprland said Greek. The OSK keeps its +own language list and globe key. -UNVERIFIED on the phone's Hyprland (0.57): the socket2 `activelayout>>KB,NAME` -line format, `switchxkblayout` through `hyprctl --batch`, and the device JSON -fields. Checked only against Hyprland 0.56.2 on a desktop. +UNVERIFIED on the phone: `switchxkblayout` through `hyprctl --batch` (the +phone test ran `hyprctl switchxkblayout next` directly). -OMAMOBILE_HYPRCTL and OMAMOBILE_KBD_LANGUAGES point elsewhere for tests.""" +OMAMOBILE_HYPRCTL points elsewhere for tests.""" import glob import json import os -import socket import subprocess import sys HYPRCTL = os.environ.get("OMAMOBILE_HYPRCTL", "hyprctl") -LANGUAGES = os.environ.get("OMAMOBILE_KBD_LANGUAGES", "omamobile-keyboard-languages") PSEUDO = ("consumer-control", "power-button", "video-bus", "radio-control", "gpio-keys") # hyprctl --batch splits commands on ";" and arguments on spaces: a name with any of these # cannot be passed safely, so that keyboard is left out (Hyprland names seen on 0.56.2 are @@ -73,7 +69,7 @@ def keyboards(): def names(kb): - """xkb names as gsettings writes them: layout or layout+variant.""" + """xkb names: layout or layout+variant.""" lay = kb.get("layout", "").split(",") var = kb.get("variant", "").split(",") var += [""] * (len(lay) - len(var)) @@ -86,10 +82,6 @@ def main_kb(kbs): or (kbs[0] if kbs else None)) -def osk_front(name): - subprocess.run([LANGUAGES, "set", name], stdout=subprocess.DEVNULL) - - def safe(name): return bool(name) and not any(c in UNSAFE or ord(c) < 32 for c in name) @@ -106,7 +98,7 @@ def switch(n, kbs): subprocess.run([HYPRCTL, "--batch", "; ".join(cmds)], stdout=subprocess.DEVNULL) -def to(n, front=True): +def to(n): kbs = keyboards() kb = main_kb(kbs) if kb is None: @@ -116,39 +108,6 @@ def to(n, front=True): return n %= len(lst) switch(n, kbs) - if front: - osk_front(lst[n]) - - -def listen(): - find_hypr() - sig = os.environ.get("HYPRLAND_INSTANCE_SIGNATURE") - if not sig: - sys.exit("omamobile-keyboard-switch: no Hyprland") - run = os.environ.get("XDG_RUNTIME_DIR") or "/run/user/%d" % os.getuid() - s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - s.connect(os.path.join(run, "hypr", sig, ".socket2.sock")) - for line in s.makefile("r", encoding="utf-8", errors="replace"): - ev, _, data = line.rstrip("\n").partition(">>") - if ev != "activelayout": - continue - dev = data.split(",", 1)[0] - if not real(dev): # squeekboard's own keymap changes are not a hardware switch - continue - kbs = keyboards() - kb = next((k for k in kbs if k.get("name") == dev), None) - if kb is None: - continue - lst, i = names(kb), kb.get("active_layout_index") - if not (isinstance(i, int) and 0 <= i < len(lst)): - continue - # The xkb grp: key switches only the keyboard it was pressed on: bring the others along. - # Their own activelayout events then find them all on i already, so this stops there. - others = [k for k in kbs if k is not kb and k.get("active_layout_index") != i] - switch(i, others) - # No loop: nothing turns a gsettings change back into a Hyprland switch, and `set` of the - # entry already in front leaves the list as it is (several keyboards report one switch). - osk_front(lst[i]) def main(argv): @@ -161,8 +120,6 @@ def main(argv): to(int(argv[1])) elif argv[:1] == ["lock"]: to(0) - elif argv[:1] == ["listen"]: - listen() else: sys.exit(__doc__) diff --git a/packages/omamobile-shell/hypr/phone.lua b/packages/omamobile-shell/hypr/phone.lua index 13efac92b..17efc59c1 100644 --- a/packages/omamobile-shell/hypr/phone.lua +++ b/packages/omamobile-shell/hypr/phone.lua @@ -189,11 +189,6 @@ o.bind("XF86Keyboard", "Keyboard: hide", "omarchy-shell shell call omamobile.key -- keyboard's surface where taps didn't land, and offered a GNOME settings -- panel the phone doesn't have. XF86MediaLanguageMenu is KEY_LANGUAGE's. o.bind("XF86MediaLanguageMenu", "Keyboard: languages", "omarchy-shell shell call omamobile.keyboard languages ''", { device = osk_only }) --- Next layout on a hardware keyboard (all of them, and the on-screen keyboard --- follows). Super + Space is Omarchy's menu, so this takes Super + Alt + --- Shift + Space, which Omarchy's defaults leave free (checked with --- `hyprctl binds` on a desktop, Hyprland 0.56.2; not yet on the phone). -o.bind("SUPER + ALT + SHIFT + SPACE", "Keyboard: next layout", "omamobile-keyboard-switch next", { device = not_osk }) -- Resolving squeekboard's binds by keysym also lets its Ctrl, Alt, Tab, -- Delete and F-keys reach Omarchy's own binds, which they never did: Ctrl + -- Alt + Delete would close every window, F9 would start Voxtype instead of @@ -252,3 +247,15 @@ elseif o.cmd_present("voxtype") then { "Stop dictation (push-to-talk)", "voxtype record stop", { release = true } }, }) end + +-- The hardware keyboard's layout switch key (Settings > Keyboard writes this +-- file: binds on every keyboard but squeekboard's to +-- `omamobile-keyboard-switch next`). An xkb grp: option never switched on the +-- phone (Hyprland 0.57.0); a bind running switchxkblayout did. pcall: a bad +-- or half-written file must not stop the rest of the config. +local kbd_binds = (os.getenv("XDG_CONFIG_HOME") or ((os.getenv("HOME") or "") .. "/.config")) .. "/hypr/omamobile-keyboard.lua" +local kbd_file = io.open(kbd_binds, "r") +if kbd_file then + kbd_file:close() + pcall(dofile, kbd_binds) +end diff --git a/packages/omamobile-shell/install b/packages/omamobile-shell/install index 23a7e32f2..f886a7c8d 100755 --- a/packages/omamobile-shell/install +++ b/packages/omamobile-shell/install @@ -49,9 +49,6 @@ ln -sfn ../omamobile-setup-user.service "$destination/usr/lib/systemd/user/graph install -Dm644 systemd/user/omamobile-osk-guard.service "$destination/usr/lib/systemd/user/omamobile-osk-guard.service" install -d "$destination/usr/lib/systemd/user/graphical-session.target.wants" ln -sfn ../omamobile-osk-guard.service "$destination/usr/lib/systemd/user/graphical-session.target.wants/omamobile-osk-guard.service" -# The OSK follows a hardware keyboard's layout switch, for every user's graphical session. -install -Dm644 systemd/user/omamobile-keyboard-switch.service "$destination/usr/lib/systemd/user/omamobile-keyboard-switch.service" -ln -sfn ../omamobile-keyboard-switch.service "$destination/usr/lib/systemd/user/graphical-session.target.wants/omamobile-keyboard-switch.service" # Sleep on screen-off, for every user's graphical session; it does nothing # until the user turns the omamobile-sleep toggle on. install -Dm644 systemd/user/omamobile-sleepd.service "$destination/usr/lib/systemd/user/omamobile-sleepd.service" diff --git a/packages/omamobile-shell/systemd/user/omamobile-keyboard-switch.service b/packages/omamobile-shell/systemd/user/omamobile-keyboard-switch.service deleted file mode 100644 index a5b5e7f3f..000000000 --- a/packages/omamobile-shell/systemd/user/omamobile-keyboard-switch.service +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: MIT -# Moves the on-screen keyboard to the layout a hardware keyboard switched to -# (the xkb grp: switch key runs no command). Enabled for every user by a -# vendor wants link; runs for the graphical session. -[Unit] -Description=Omarchy Mobile hardware keyboard layout follower -PartOf=graphical-session.target -After=graphical-session.target - -[Service] -ExecStart=/usr/bin/omamobile-keyboard-switch listen -Restart=always -RestartSec=5 - -[Install] -WantedBy=graphical-session.target diff --git a/packages/omamobile-shell/test/all b/packages/omamobile-shell/test/all index 67e38b56b..f2b0c39f2 100755 --- a/packages/omamobile-shell/test/all +++ b/packages/omamobile-shell/test/all @@ -517,6 +517,9 @@ python3 -B -c 'import ast,sys; ast.parse(open(sys.argv[1]).read())' bin/omamobil bash test/keyboard-languages.sh >/dev/null || { bash test/keyboard-languages.sh; fail "omamobile-keyboard-languages"; } python3 -B -c 'import ast,sys; ast.parse(open(sys.argv[1]).read())' bin/omamobile-keyboard-switch || fail "omamobile-keyboard-switch parses" bash test/keyboard-switch.sh >/dev/null || { bash test/keyboard-switch.sh; fail "omamobile-keyboard-switch"; } +[[ ! -e systemd/user/omamobile-keyboard-switch.service ]] || fail "no layout follower service (it bounced switches back)" +grep -c 'pcall(dofile, kbd_binds)' hypr/phone.lua >/dev/null || fail "phone.lua loads the switch-key binds Settings writes" +if grep -n 'SUPER + ALT + SHIFT + SPACE' hypr/phone.lua; then fail "the old next-layout bind is gone"; fi if [[ -n ${OMAMOBILE_KEYBOARD_RENDER:-} ]]; then bash test/keyboard-render "$OMAMOBILE_KEYBOARD_RENDER" >/dev/null || fail "language sheet render" fi diff --git a/packages/omamobile-shell/test/keyboard-switch.sh b/packages/omamobile-shell/test/keyboard-switch.sh index da8335f06..724c244ca 100755 --- a/packages/omamobile-shell/test/keyboard-switch.sh +++ b/packages/omamobile-shell/test/keyboard-switch.sh @@ -1,17 +1,18 @@ #!/bin/bash # SPDX-License-Identifier: MIT -# omamobile-keyboard-switch against a fake hyprctl and a fake -# omamobile-keyboard-languages: only real keyboards are switched (never -# squeekboard's hl-virtual-keyboard or a consumer-control pseudo-keyboard), -# next wraps around, the OSK gets the layout by name (layout+variant), and -# listen follows activelayout events from real keyboards only. +# omamobile-keyboard-switch against a fake hyprctl: only real keyboards are +# switched (never squeekboard's hl-virtual-keyboard or a consumer-control +# pseudo-keyboard), next wraps around, and the on-screen keyboard is never +# touched (no gsettings, no omamobile-keyboard-languages: both are fakes on +# PATH that log a call). set -euo pipefail cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." fail() { printf 'not ok - %s\n' "$1" >&2; exit 1; } pass() { printf 'ok - %s\n' "$1"; } t=$(mktemp -d); trap 'rm -rf "$t"' EXIT export T=$t -cat >"$t/hyprctl" <<'SH' +mkdir -p "$t/bin" +cat >"$t/bin/hyprctl" <<'SH' #!/bin/bash case "$1 $2" in "-j devices") cat "$T/devices.json" ;; @@ -19,11 +20,11 @@ case "$1 $2" in *) exit 1 ;; esac SH -cat >"$t/languages" <<'SH' -#!/bin/bash -printf '%s\n' "$*" >>"$T/osk.log" -SH -chmod +x "$t/hyprctl" "$t/languages" +for f in gsettings omamobile-keyboard-languages; do + printf '#!/bin/bash\necho "%s $*" >>"$T/osk.log"\n' "$f" >"$t/bin/$f" +done +chmod +x "$t/bin/"* +export PATH="$t/bin:$PATH" cat >"$t/devices.json" <<'J' {"keyboards":[ {"name":"hl-virtual-keyboard-squeekboard","layout":"us","variant":"","active_layout_index":0,"main":false}, @@ -32,67 +33,26 @@ cat >"$t/devices.json" <<'J' {"name":"other-kbd","layout":"us,gr","variant":",polytonic","active_layout_index":1,"main":false}, {"name":"bad name;exec x","layout":"us,gr","variant":",polytonic","active_layout_index":1,"main":false}]} J -export OMAMOBILE_HYPRCTL=$t/hyprctl OMAMOBILE_KBD_LANGUAGES=$t/languages HYPRLAND_INSTANCE_SIGNATURE=test +export OMAMOBILE_HYPRCTL=$t/bin/hyprctl HYPRLAND_INSTANCE_SIGNATURE=test s=bin/omamobile-keyboard-switch python3 -B "$s" next 2>"$t/err" grep -q "skipping keyboard 'bad name;exec x'" "$t/err" || fail "a name with a space or ; is left out of the batch" [[ $(cat "$t/hypr.log") == "switchxkblayout dell-kb7120w 0; switchxkblayout other-kbd 0" ]] || fail "next wraps to 0 on real keyboards only: $(cat "$t/hypr.log")" -[[ $(cat "$t/osk.log") == "set us" ]] || fail "next puts us first in the OSK list" pass "keyboard-switch next" -: >"$t/hypr.log"; : >"$t/osk.log" +: >"$t/hypr.log" python3 -B "$s" set 1 [[ $(cat "$t/hypr.log") == "switchxkblayout dell-kb7120w 1; switchxkblayout other-kbd 1" ]] || fail "set 1" -[[ $(cat "$t/osk.log") == "set gr+polytonic" ]] || fail "set 1 puts gr+polytonic first" -: >"$t/hypr.log"; : >"$t/osk.log" +: >"$t/hypr.log" python3 -B "$s" lock -[[ $(cat "$t/hypr.log") == "switchxkblayout dell-kb7120w 0; switchxkblayout other-kbd 0" && $(cat "$t/osk.log") == "set us" ]] || fail "lock goes to layout 0" +[[ $(cat "$t/hypr.log") == "switchxkblayout dell-kb7120w 0; switchxkblayout other-kbd 0" ]] || fail "lock goes to layout 0" pass "keyboard-switch set and lock" python3 -B "$s" bogus 2>/dev/null && fail "unknown verb fails" +python3 -B "$s" listen 2>/dev/null && fail "the follower is gone" pass "keyboard-switch refuses unknown verbs" -# listen: a fake socket2 sends a squeekboard event (ignored) and a hardware one -mkdir -p "$t/run/hypr/test" -: >"$t/osk.log" -python3 -B - "$t/run/hypr/test/.socket2.sock" <<'PY' & -import socket, sys -s = socket.socket(socket.AF_UNIX); s.bind(sys.argv[1]); s.listen(1) -c, _ = s.accept() -c.sendall(b"workspace>>1\nactivelayout>>hl-virtual-keyboard-squeekboard,English (US)\nactivelayout>>dell-kb7120w,Greek (polytonic)\n") -c.close() -PY -server=$! -for _ in $(seq 50); do [[ -S $t/run/hypr/test/.socket2.sock ]] && break; sleep 0.1; done -XDG_RUNTIME_DIR=$t/run timeout 10 python3 -B "$s" listen -wait "$server" -[[ $(cat "$t/osk.log") == "set gr+polytonic" ]] || fail "listen follows hardware events only: $(cat "$t/osk.log")" -pass "keyboard-switch listen" - -# listen brings the other real keyboards to the index of the one switched (dell on 1, other-kbd on 0) -cat >"$t/devices.json" <<'J' -{"keyboards":[ -{"name":"hl-virtual-keyboard-squeekboard","layout":"us","variant":"","active_layout_index":0,"main":true}, -{"name":"gpio-keys","layout":"us,gr","variant":",polytonic","active_layout_index":0,"main":false}, -{"name":"dell-kb7120w","layout":"us,gr","variant":",polytonic","active_layout_index":1,"main":false}, -{"name":"other-kbd","layout":"us,gr","variant":",polytonic","active_layout_index":0,"main":false}]} -J -rm -f "$t/run/hypr/test/.socket2.sock"; : >"$t/hypr.log"; : >"$t/osk.log" -python3 -B -c ' -import socket, sys -s = socket.socket(socket.AF_UNIX); s.bind(sys.argv[1]); s.listen(1) -c, _ = s.accept() -c.sendall(b"activelayout>>dell-kb7120w,Greek (polytonic)\n") -c.close()' "$t/run/hypr/test/.socket2.sock" & -server=$! -for _ in $(seq 50); do [[ -S $t/run/hypr/test/.socket2.sock ]] && break; sleep 0.1; done -XDG_RUNTIME_DIR=$t/run timeout 10 python3 -B "$s" listen -wait "$server" -[[ $(cat "$t/hypr.log") == "switchxkblayout other-kbd 1" ]] || fail "listen syncs the other real keyboards: $(cat "$t/hypr.log")" -[[ $(cat "$t/osk.log") == "set gr+polytonic" ]] || fail "listen moves the OSK after the sync" -pass "keyboard-switch listen syncs other keyboards" - # main pick with no real keyboard marked main: the first real one with more than one layout # (not the virtual one marked main, not gpio-keys, not a one-layout keyboard) cat >"$t/devices.json" <<'J' @@ -102,7 +62,10 @@ cat >"$t/devices.json" <<'J' {"name":"single","layout":"us","variant":"","active_layout_index":0,"main":false}, {"name":"dell-kb7120w","layout":"us,gr","variant":",polytonic","active_layout_index":1,"main":false}]} J -: >"$t/hypr.log"; : >"$t/osk.log" +: >"$t/hypr.log" python3 -B "$s" next -[[ $(cat "$t/osk.log") == "set us" ]] || fail "next steps from the first real keyboard with 2+ layouts: $(cat "$t/osk.log")" +[[ $(cat "$t/hypr.log") == "switchxkblayout single 0; switchxkblayout dell-kb7120w 0" ]] || fail "next steps from the first real keyboard with 2+ layouts: $(cat "$t/hypr.log")" pass "keyboard-switch main keyboard rule" + +[[ ! -e $t/osk.log ]] || fail "a hardware switch touched the on-screen keyboard: $(cat "$t/osk.log")" +pass "keyboard-switch leaves the on-screen keyboard alone" From 90a8482658edf53806bc764aaac3f14f48783cfc Mon Sep 17 00:00:00 2001 From: Lef Date: Tue, 17 Nov 2026 15:34:57 +0200 Subject: [PATCH 11/19] shell: no on-screen keyboard pop-up while a hardware keyboard is connected omamobile-osk-guard becomes the one writer of screen-keyboard-enabled: false while a real BT/USB keyboard is connected (same rule as the lock backend), true otherwise, while locked with a password, or in the card's show mode. Keyboards are listed per uniq in osk-hwkbd.json with a 5 s grace. A true written by the screensaver restore over a connected keyboard goes straight back off. The shade gets a keyboard card with Show/Hide on-screen keyboard and Disconnect for Bluetooth ones. --- packages/omamobile-shell/README.md | 2 +- .../omamobile-shell/bin/omamobile-osk-guard | 391 ++++++++++++++++-- packages/omamobile-shell/plugins/README.md | 16 + .../HwKeyboardModel.js | 58 +++ .../omamobile.quicksettings/KeyboardCard.qml | 116 ++++++ .../omamobile.quicksettings/QuickSettings.qml | 14 +- .../systemd/user/omamobile-osk-guard.service | 9 +- packages/omamobile-shell/test/all | 5 +- .../omamobile-shell/test/hwkeyboard-model.js | 35 ++ packages/omamobile-shell/test/osk-guard.sh | 116 +++++- 10 files changed, 710 insertions(+), 52 deletions(-) create mode 100644 packages/omamobile-shell/plugins/omamobile.quicksettings/HwKeyboardModel.js create mode 100644 packages/omamobile-shell/plugins/omamobile.quicksettings/KeyboardCard.qml create mode 100644 packages/omamobile-shell/test/hwkeyboard-model.js diff --git a/packages/omamobile-shell/README.md b/packages/omamobile-shell/README.md index 71f4ac874..530e621ab 100644 --- a/packages/omamobile-shell/README.md +++ b/packages/omamobile-shell/README.md @@ -26,7 +26,7 @@ Omarchy Mobile's phone profile for Omarchy's own shell. It isn't a fork: these a | `bin/omamobile-osk-watch` | Reports squeekboard's visibility (sm.puri.OSK0) to the fingerprint, keyboard and launcher plugins | | `bin/omamobile-screenshot-open` | What a screenshot toast's tap ("Tap to view", patch 0020) opens on a phone (`OMARCHY_SCREENSHOT_EDITOR`, set in `environment.d/30-omamobile-screenshot.conf`; Omarchy passes the saved file's path): the screenshot in Loupe (omamobile-apps), fitted, with touch zoom, pan and swipe, and Loupe's copy, share and delete. Tensaku, Omarchy's default, can't be panned or zoomed by touch; without Loupe it is the fallback, through `omamobile-screenshot-edit` | | `bin/omamobile-screenshot-edit` | Tensaku as Omarchy opens a screenshot in it (`tensaku-edit`), with GTK's simple input-method context so the on-screen keyboard doesn't come up over the image (show it by hand for the text tool). `omamobile-setup-user` gives Tensaku's own entry (drawer, Loupe's Open With) the same context once, and `hypr/phone.lua` maximizes its window, which Omarchy floats by class | -| `bin/omamobile-osk-guard` | Turns the on-screen keyboard (`screen-keyboard-enabled`) back on when it was left off with no screensaver running (a user unit for every graphical session) | +| `bin/omamobile-osk-guard` | Owns the on-screen keyboard's auto-show (`screen-keyboard-enabled`): off while a real Bluetooth or USB keyboard is connected (unless the shade's keyboard card says Show, or the lock wants a password), back on when it was left off with no screensaver running; lists the keyboards for the card in `~/.local/state/omamobile/osk-hwkbd.json`, and runs the card's `--mode show|hide` and `--disconnect MAC` (a user unit for every graphical session) | | `bin/omamobile-doubletap` | Double tap to wake, as on Android: two taps within 0.4 s and about 150 px of each other (14 % of the touchscreen's width) on a dark phone wake it as a short power press does (`omamobile-keys double-tap`, which leaves a lit screen alone). `hypr/phone.lua` turns Hyprland's `misc:mouse_move_enables_dpms` off, so a single touch no longer lights the screen; on the lock no touch wakes it either (patch 0029), and this daemon wakes it through `omamobile-keys double-tap`. With the phone in a pocket (proximity near, through iio-sensor-proxy, claimed only from the first dark tap until 2 s after the last) the double tap is skipped; without a proximity sensor it wakes as before. A screen that goes dark while unlocked (an idle blank, the panel powered off by hand) is locked at once (`omamobile-keys dark-unlocked`), as on Android: Hyprland sends a touch to the window under it whatever the screen's state, so on a dark unlocked phone it reached an app no one could see. It works while the phone is awake: a double tap can't wake it from sleep (with the sleep toggle on, the first 30 s after the screen goes off). It times a double tap from one lift to the next touch, and it only wakes: the lock itself ignores touches while dark (0029). The touchscreen is the first input device with `INPUT_PROP_DIRECT`, `BTN_TOUCH` and `ABS_MT_POSITION_X`, read without a grab (the user is in the `input` group). A user unit for every graphical session | | `bin/omamobile-sleepd` | Sleep (s2idle) once the screen has been off behind a secure lock for `OMAMOBILE_SLEEP_AFTER_OFF` s (30), and again 5 s after a dark resume; `now` for the power key (`omamobile-keys`), `check` to see what holds it awake. Refuses with the screen on, Stay awake on, an SSH session open, a logind sleep block inhibitor (calls, GNSS) or a RUNNING PipeWire sink. A user unit for every graphical session, **off until `omarchy-toggle omamobile-sleep on`** (device/cheetah/SUSPEND-PLAN.md 6.2) | | `bin/omamobile-weather` | The current weather for the lock screen's glance (`~/.local/state/omamobile/weather.json`, with the `source` it used) from Open-Meteo, at login and every 30 minutes (`omamobile-weather.timer`, a user unit for every graphical session). Where, in order: the phone's position from GeoClue at city accuracy, at most every 3 h and only while the Location switch is on and GeoClue has an agent for the user (omamobile-gnss's unit, or any other instance of GeoClue's demo agent the user runs; never a prompt); the setting `~/.config/omamobile/weather.json` (`omamobile-weather set "State College, PA" F`, or `{"latitude", "longitude"}`; `"location": "fixed"` puts it before the position); the home screen's today widget's city, or the weather widget's named place. Unit: the setting's, else the locale's. A failure keeps the old reading; a run that starts before the network is back (login, or the catch-up run on resume) tries again with backoff for up to 75 s and then gives up without failing the unit. `omamobile-weather show` says where it would look | diff --git a/packages/omamobile-shell/bin/omamobile-osk-guard b/packages/omamobile-shell/bin/omamobile-osk-guard index bb21cf20c..d44c44486 100755 --- a/packages/omamobile-shell/bin/omamobile-osk-guard +++ b/packages/omamobile-shell/bin/omamobile-osk-guard @@ -1,43 +1,358 @@ -#!/bin/bash +#!/usr/bin/python3 -I # SPDX-License-Identifier: MIT -# The on-screen keyboard's safety net (TOUCH-PLAN 0.5). Omarchy's screensaver -# launcher turns the global screen-keyboard-enabled setting off while the -# screensaver runs (patches/omarchy/0006-*), and its exit paths turn it back -# on. A path that missed left a phone with no keyboard for any text field -# until the next login. This watches the setting: whenever it goes off, it -# waits until no screensaver runs, gives the screensaver's own restore its -# time (it waits up to 5 s for the lock), and turns it back on if it is -# still off. On a phone nothing else turns the keyboard off: squeekboard's -# hide button only hides it. +# The on-screen keyboard's owner: the one program that writes the global +# screen-keyboard-enabled setting (squeekboard's "no physical keyboard" flag). # -# omamobile-osk-guard watch (omamobile-osk-guard.service) -# omamobile-osk-guard --once check once and exit -set -u +# 1. Hardware keyboards (OSK-HWKBD-PLAN): while a real Bluetooth or USB +# keyboard is connected, squeekboard does not pop up on a text field +# (the setting is false), unless the user chose "Show on-screen keyboard" +# on the shade's keyboard card (mode "show"). The keyboards and the mode +# are in ~/.local/state/omamobile/osk-hwkbd.json, which the card reads. A +# keyboard that goes away stays listed for a 5 s grace (a Bluetooth +# keyboard waking up comes back as the same uniq and keeps the mode); +# after it, with no keyboard left, the mode goes back to "auto". While the +# session is locked and the credential is a password, the setting stays +# true, so the lock's field can still bring the keyboard up. +# 2. The safety net (TOUCH-PLAN 0.5): Omarchy's screensaver launcher turns +# the setting off while the screensaver runs (patches/omarchy/0006-*) and +# back on after. When it is off and should not be, this waits until no +# screensaver runs, gives the screensaver's own restore its time, and +# turns it back on. When 0006's restore turns it on while a keyboard is +# connected, this turns it straight back off. No keyboard: always true. +# Stopping the watcher leaves it true. +# +# omamobile-osk-guard watch (omamobile-osk-guard.service) +# omamobile-osk-guard --once check once and exit +# omamobile-osk-guard --mode show|hide|auto +# the card's buttons: set the mode, the +# setting, and show or hide the keyboard +# omamobile-osk-guard --disconnect MAC +# bluetoothctl disconnect (the card) +import fcntl, json, os, re, select, signal, struct, subprocess, sys, tempfile, time + +KEY = ["org.gnome.desktop.a11y.applications", "screen-keyboard-enabled"] +HOME = os.environ.get("HOME", "/") +SYSFS = os.environ.get("OMAMOBILE_OSK_SYSFS", "/sys") +UDEV = os.environ.get("OMAMOBILE_OSK_UDEVDATA", "/run/udev/data") +STATE = os.environ.get("OMAMOBILE_OSK_STATE", HOME + "/.local/state/omamobile/osk-hwkbd.json") +PASSWORD_TOGGLE = HOME + "/.local/state/omarchy/toggles/credential-password" + + +def num(name, default): + try: return float(os.environ.get(name, default)) + except ValueError: return float(default) + -key=(org.gnome.desktop.a11y.applications screen-keyboard-enabled) # The launcher turns the setting off a moment before the screensaver's # window opens, and the screensaver's restore waits for the lock. -grace=${OMAMOBILE_OSK_GUARD_GRACE:-10} - -osk_off() { [[ $(gsettings get "${key[@]}" 2>/dev/null) == false ]]; } -screensaver_up() { pgrep -f '[o]rg.omarchy.screensaver' >/dev/null; } - -check() { - osk_off || return 0 - sleep "$grace" - while screensaver_up; do sleep 2; done - sleep "$grace" - if osk_off && ! screensaver_up; then - gsettings set "${key[@]}" true - echo "omamobile-osk-guard: the on-screen keyboard was off with no screensaver running; turned it back on" - fi -} - -check -[[ ${1:-} == --once ]] && exit 0 - -while IFS= read -r line; do - [[ $line == *false ]] && check -done < <(gsettings monitor "${key[@]}") -# The monitor ended (the session bus went away): let systemd restart it. -exit 1 +GRACE = num("OMAMOBILE_OSK_GUARD_GRACE", 10) +KEYBOARD_GRACE = num("OMAMOBILE_OSK_KEYBOARD_GRACE", 5) +SETTLE = num("OMAMOBILE_OSK_SETTLE", 1) +POLL = num("OMAMOBILE_OSK_POLL", 2) +MAC = re.compile(r"^([0-9a-f]{2}:){5}[0-9a-f]{2}$", re.I) + + +def log(msg): + print("omamobile-osk-guard: " + msg, flush=True) + + +def run(cmd, timeout=10): + try: + return subprocess.run(cmd, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE, + stderr=subprocess.DEVNULL, text=True, timeout=timeout) + except (OSError, subprocess.TimeoutExpired): + return None + + +# ------------------------------------------------------------------ keyboards +# The rule of omamobile-settings' lock.sh keyboard_connected() (a copy: that +# is another package): an event node udev calls a keyboard, on Bluetooth +# (bus 0005) or USB (0003, not a virtual device), not a security key or a +# scanner, with the letter rows and space. gpio-keys (0019) and squeekboard's +# virtual keyboard never pass. +NOT_KEYBOARDS = re.compile(r"yubikey|yubico|nitrokey|solokey|onlykey|token|barcode|scanner", re.I) +LONG_BITS = struct.calcsize("l") * 8 +NEEDED = list(range(16, 26)) + list(range(30, 39)) + list(range(44, 51)) + [57] # Q..P, A..L, Z..M, space + + +def read(p): + try: + with open(p) as f: return f.read().strip() + except (OSError, UnicodeDecodeError): + return None + + +def keyboards(): + """Connected keyboards, one per uniq (else phys, else node): name, uniq, bus.""" + base = os.path.join(SYSFS, "class/input") + try: names = sorted(os.listdir(base), key=lambda n: (len(n), n)) + except OSError: return [] + found = {} + for ev in names: + if not ev.startswith("event"): continue + d = os.path.join(base, ev) + dev, bus = read(d + "/dev"), read(d + "/device/id/bustype") + if not dev or not bus: continue + data = read(os.path.join(UDEV, "c" + dev)) or "" + if "E:ID_INPUT_KEYBOARD=1" not in data.splitlines(): continue + path = os.path.realpath(d + "/device") + if bus == "0005": pass + elif bus == "0003" and "/devices/virtual/input/" not in path + "/": pass + else: continue + name = read(d + "/device/name") + if not name or NOT_KEYBOARDS.search(name): continue + caps = (read(d + "/device/capabilities/key") or "").split() + try: bits = sum(int(w, 16) << (i * LONG_BITS) for i, w in enumerate(reversed(caps))) + except ValueError: continue + if not all(bits >> k & 1 for k in NEEDED): continue + uniq = (read(d + "/device/uniq") or "").lower() + key = uniq or read(d + "/device/phys") or ev + if key not in found: + found[key] = {"name": name, "uniq": uniq, "bus": "bluetooth" if bus == "0005" else "usb"} + return [dict(k, id=key) for key, k in found.items()] + + +# ------------------------------------------------------------------ state file +def locked_state(): + os.makedirs(os.path.dirname(STATE), exist_ok=True) + f = open(STATE + ".lock", "a") + fcntl.flock(f, fcntl.LOCK_EX) + return f + + +def load(): + try: + with open(STATE) as f: s = json.load(f) + if not isinstance(s, dict): raise ValueError + except (OSError, ValueError): + s = {} + kbs = s.get("keyboards") if isinstance(s.get("keyboards"), list) else [] + mode = s.get("mode") if s.get("mode") in ("auto", "show", "hide") else "auto" + return {"keyboards": [k for k in kbs if isinstance(k, dict)], "mode": mode} + + +def save(s): + target = os.path.realpath(STATE) + fd, tmp = tempfile.mkstemp(dir=os.path.dirname(target), prefix=".osk-hwkbd.") + try: + with os.fdopen(fd, "w") as f: + json.dump(s, f, ensure_ascii=False); f.write("\n") + os.chmod(tmp, 0o644) + os.replace(tmp, target) + except BaseException: + try: os.unlink(tmp) + except OSError: pass + raise + + +# ------------------------------------------------------------------ the setting +def osk_get(): + r = run(["gsettings", "get"] + KEY) + v = r.stdout.strip() if r and r.returncode == 0 else "" + return True if v == "true" else False if v == "false" else None + + +def osk_set(value): + run(["gsettings", "set"] + KEY + ["true" if value else "false"]) + + +def screensaver_up(): + r = run(["pgrep", "-f", "[o]rg.omarchy.screensaver"]) + return bool(r and r.returncode == 0) + + +def password_locked(): + if not os.path.exists(PASSWORD_TOGGLE): return False + r = run(["omarchy-shell", "lock", "isLocked"], timeout=5) + return bool(r and r.returncode == 0 and r.stdout.strip() == "true") + + +def wanted(state): + if not state["keyboards"] or state["mode"] == "show": return True + return password_locked() + + +def set_visible(show): + run(["busctl", "--user", "call", "sm.puri.OSK0", "/sm/puri/OSK0", "sm.puri.OSK0", + "SetVisible", "b", "true" if show else "false"]) + + +# ------------------------------------------------------------------ the watcher +class Guard: + def __init__(self): + self.seen = {} # id -> (keyboard, last time present) + self.last_wanted = None + self.restore_at = None # the safety net's deadline (setting off, wanted on) + self.restore_phase = 0 # 0: first grace, 1: screensaver gone, second grace + self.scan_at = 0.0 + self.scanned = 0.0 + # A restart keeps what the file lists for one grace (and its mode). + start = time.monotonic() + for k in load()["keyboards"]: + if isinstance(k.get("id"), str): self.seen[k["id"]] = (k, start) + + def refresh(self, now): + """Rescan; write the state file when the list or the mode changes.""" + self.scanned = now + for k in keyboards(): + self.seen[k["id"]] = (k, now) + listed = [] + for key, (k, t) in list(self.seen.items()): + if t == now or now - t < KEYBOARD_GRACE: listed.append(k) + else: del self.seen[key] + listed.sort(key=lambda k: (k["name"], k["id"])) + with locked_state(): + s = load() + new = {"keyboards": listed, "mode": s["mode"] if listed else "auto"} + if new != s: save(new) + return new + + def evaluate(self, now): + s = self.refresh(now) + want = wanted(s) + actual = osk_get() + if want != self.last_wanted and self.last_wanted is not None: + # Our own change (a keyboard came or went, the lock, the mode): now. + self.restore_at = None + self.last_wanted = want + if actual != want: osk_set(want) + return + self.last_wanted = want + if actual is None or actual == want: + self.restore_at = None + return + if not want: + # Someone turned it on over a connected keyboard (0006's restore). + self.restore_at = None + osk_set(False) + log("a keyboard is connected; turned the on-screen keyboard's auto-show back off") + return + if self.restore_at is None: + self.restore_at = now + GRACE + self.restore_phase = 0 + + def due(self, now): + """The safety net's next step when its deadline came.""" + if self.restore_at is None or now < self.restore_at: return + if screensaver_up(): + self.restore_at = now + POLL + self.restore_phase = 0 + return + if self.restore_phase == 0: + self.restore_phase = 1 + self.restore_at = now + GRACE + return + self.restore_at = None + if osk_get() is False and wanted(load()) and not screensaver_up(): + osk_set(True) + log("the on-screen keyboard was off with no screensaver running; turned it back on") + + def lock_matters(self): + s = load() + return bool(s["keyboards"]) and s["mode"] != "show" and os.path.exists(PASSWORD_TOGGLE) + + def next_deadline(self, now): + times = [t for t in (self.restore_at, self.scan_at or None) if t is not None] + # A keyboard in its grace: drop it (and maybe the mode) when it ends. + times += [t + KEYBOARD_GRACE for _, t in self.seen.values() if t != self.scanned] + if self.lock_matters(): times.append(now + POLL) + return min(times) if times else None + + +def once(): + g = Guard() + g.last_wanted = None + now = time.monotonic() + g.evaluate(now) + while g.restore_at is not None: + time.sleep(max(0.0, g.restore_at - time.monotonic())) + g.due(time.monotonic()) + return 0 + + +def watch(): + children = [] + + def stop(*_): + raise SystemExit(0) + + signal.signal(signal.SIGTERM, stop) + signal.signal(signal.SIGHUP, stop) + try: + mon = subprocess.Popen(["gsettings", "monitor"] + KEY, stdin=subprocess.DEVNULL, + stdout=subprocess.PIPE, text=True) + children.append(mon) + try: + udev = subprocess.Popen(["udevadm", "monitor", "--udev", "--subsystem-match=input"], + stdin=subprocess.DEVNULL, stdout=subprocess.PIPE, + stderr=subprocess.DEVNULL, text=True) + children.append(udev) + except OSError: + udev = None + log("udevadm monitor did not start; hardware keyboards are read only on other changes") + g = Guard() + g.evaluate(time.monotonic()) + streams = [mon.stdout] + ([udev.stdout] if udev else []) + while True: + now = time.monotonic() + deadline = g.next_deadline(now) + timeout = None if deadline is None else max(0.0, deadline - now) + ready, _, _ = select.select(streams, [], [], timeout) + now = time.monotonic() + for r in ready: + line = r.readline() + if not line: + if r is mon.stdout: + # The monitor ended (the session bus went away): let systemd restart it. + return 1 + streams.remove(r) + continue + if udev and r is udev.stdout: + g.scan_at = now + SETTLE + else: + g.evaluate(now) + if g.scan_at and now >= g.scan_at: + g.scan_at = 0.0 + g.evaluate(now) + elif not ready: + g.evaluate(now) # grace expiry, the lock poll + g.due(now) + finally: + for c in children: + try: c.terminate() + except OSError: pass + # Never leave the phone without its keyboard. + if osk_get() is False: osk_set(True) + + +def set_mode(mode): + with locked_state(): + s = load() + s["mode"] = mode + save(s) + want = wanted(s) + if osk_get() != want: osk_set(want) + if mode == "show": set_visible(True) + elif mode == "hide": set_visible(False) + return 0 + + +def disconnect(mac): + if not MAC.match(mac): + print("omamobile-osk-guard: not a Bluetooth address: " + mac, file=sys.stderr) + return 2 + r = run(["bluetoothctl", "disconnect", mac.upper()], timeout=15) + return 0 if r and r.returncode == 0 else 1 + + +def main(argv): + if not argv: return watch() + if argv == ["--once"]: return once() + if len(argv) == 2 and argv[0] == "--mode" and argv[1] in ("show", "hide", "auto"): return set_mode(argv[1]) + if len(argv) == 2 and argv[0] == "--disconnect": return disconnect(argv[1]) + print("Usage: omamobile-osk-guard [--once | --mode show|hide|auto | --disconnect MAC]", file=sys.stderr) + return 2 + + +if __name__ == "__main__": + sys.exit(main(sys.argv[1:])) diff --git a/packages/omamobile-shell/plugins/README.md b/packages/omamobile-shell/plugins/README.md index 6209a381d..3a08bcd24 100644 --- a/packages/omamobile-shell/plugins/README.md +++ b/packages/omamobile-shell/plugins/README.md @@ -191,6 +191,22 @@ omamobile-omarchy's 4.5 series; without it the rows come back). The card takes the room left under the sheet and scrolls past that; it hides in edit mode, or when the sheet leaves no room for it. +### Hardware keyboard card + +While a real Bluetooth or USB keyboard is connected, the on-screen keyboard +stops popping up on text fields and the shade starts with a keyboard card +(`KeyboardCard.qml`, rules in `HwKeyboardModel.js`, tests in +`test/hwkeyboard-model.js` and `test/osk-guard.sh`). `omamobile-osk-guard` +is the only writer of `screen-keyboard-enabled` and lists the keyboards (one +per `uniq`, so a keyboard's several input nodes are one row) in +`~/.local/state/omamobile/osk-hwkbd.json`, which the card watches. Each row +reads " connected", with Disconnect for a Bluetooth keyboard whose +`uniq` is its address (`bluetoothctl disconnect`). Show on-screen keyboard +turns auto-show back on and shows it; Hide turns it off and hides it. A +keyboard that goes away stays listed for 5 s (a reconnect of the same `uniq` +keeps the mode); with none left the mode goes back to auto and auto-show is +on. Locked with a password credential, auto-show stays on. + ### Media card While a player plays or is paused, the shade starts with a media card, as diff --git a/packages/omamobile-shell/plugins/omamobile.quicksettings/HwKeyboardModel.js b/packages/omamobile-shell/plugins/omamobile.quicksettings/HwKeyboardModel.js new file mode 100644 index 000000000..6fb914b1b --- /dev/null +++ b/packages/omamobile-shell/plugins/omamobile.quicksettings/HwKeyboardModel.js @@ -0,0 +1,58 @@ +// SPDX-License-Identifier: MIT +// Pure helpers for the shade's keyboard card (KeyboardCard.qml): the +// hardware keyboards omamobile-osk-guard lists in +// ~/.local/state/omamobile/osk-hwkbd.json, one row each, and the commands of +// the card's buttons. Node runs these in test/hwkeyboard-model.js through the +// module.exports below. + +var MAC = /^([0-9a-f]{2}:){5}[0-9a-f]{2}$/i + +// The guard's file text -> { keyboards: [{ name, uniq, bluetooth, canDisconnect }], mode } +function parse(text) { + var s = null + try { s = JSON.parse(String(text || "")) } catch (e) { s = null } + var out = { keyboards: [], mode: "auto" } + if (!s || typeof s !== "object") return out + if (s.mode === "show" || s.mode === "hide") out.mode = s.mode + var list = Array.isArray(s.keyboards) ? s.keyboards : [] + for (var i = 0; i < list.length; i++) { + var k = list[i] + if (!k || typeof k !== "object") continue + var name = String(k.name || "").trim() || "Keyboard" + var uniq = String(k.uniq || "") + var bluetooth = k.bus === "bluetooth" + out.keyboards.push({ name: name, uniq: uniq, bluetooth: bluetooth, canDisconnect: bluetooth && MAC.test(uniq) }) + } + return out +} + +function rowText(row) { + return row.name + " connected" +} + +function accessibleName(keyboards) { + var n = keyboards.length + if (n === 0) return "" + if (n === 1) return rowText(keyboards[0]) + return n + " keyboards connected" +} + +function modeCommand(mode) { + return ["omamobile-osk-guard", "--mode", mode === "show" ? "show" : "hide"] +} + +// null for a keyboard the card can't disconnect (no Bluetooth address) +function disconnectCommand(row) { + if (!row || !row.canDisconnect) return null + return ["omamobile-osk-guard", "--disconnect", row.uniq] +} + +if (typeof module !== "undefined") { + module.exports = { + parse: parse, + rowText: rowText, + accessibleName: accessibleName, + modeCommand: modeCommand, + disconnectCommand: disconnectCommand + } +} diff --git a/packages/omamobile-shell/plugins/omamobile.quicksettings/KeyboardCard.qml b/packages/omamobile-shell/plugins/omamobile.quicksettings/KeyboardCard.qml new file mode 100644 index 000000000..1cd2e22ea --- /dev/null +++ b/packages/omamobile-shell/plugins/omamobile.quicksettings/KeyboardCard.qml @@ -0,0 +1,116 @@ +// SPDX-License-Identifier: MIT +import QtQuick +import Quickshell +import Quickshell.Io +import qs.Commons +import qs.Commons as Commons +import qs.Ui +import "HwKeyboardModel.js" as HwKeyboardModel + +// The hardware keyboard card at the top of the notification shade, drawn as +// MediaCard.qml: while a Bluetooth or USB keyboard is connected the on-screen +// keyboard no longer pops up on a text field (omamobile-osk-guard owns that +// and lists the keyboards in ~/.local/state/omamobile/osk-hwkbd.json). One +// row per keyboard, " connected", with Disconnect for a Bluetooth one; +// Show / Hide on-screen keyboard set the guard's mode for all of them. +BorderSurface { + id: card + + property color foreground: Commons.Color.popups.text + property var keyboards: [] + property string mode: "auto" + + readonly property int inner: Style.spacing.lg + + visible: keyboards.length > 0 + implicitHeight: visible ? column.implicitHeight + inner * 2 : 0 + radius: Style.cornerRadius + color: Style.normalFillFor(card.foreground, Commons.Color.accent) + borderSpec: Border.controlSpec("normal", card.foreground, Commons.Color.accent) + + Accessible.role: Accessible.Grouping + Accessible.name: HwKeyboardModel.accessibleName(keyboards) + + function load(text) { + var s = HwKeyboardModel.parse(text) + keyboards = s.keyboards + mode = s.mode + } + + FileView { + id: stateFile + path: Quickshell.env("HOME") + "/.local/state/omamobile/osk-hwkbd.json" + printErrors: false + watchChanges: true + onFileChanged: reload() + onLoaded: card.load(text()) + onLoadFailed: card.load("") + } + + // The guard replaces the file (rename); each reload watches it again, and + // this catches a watch that was lost. + Timer { interval: 5000; repeat: true; running: true; onTriggered: stateFile.reload() } + + Column { + id: column + x: card.inner + y: card.inner + width: card.width - card.inner * 2 + spacing: Style.spacing.md + + Repeater { + model: card.keyboards + + Item { + required property var modelData + width: column.width + height: Math.max(rowText.implicitHeight, disconnectButton.visible ? disconnectButton.height : 0) + + Text { + id: rowText + anchors.left: parent.left + anchors.right: disconnectButton.visible ? disconnectButton.left : parent.right + anchors.rightMargin: disconnectButton.visible ? Style.spacing.md : 0 + anchors.verticalCenter: parent.verticalCenter + textFormat: Text.PlainText + text: "󰌌 " + HwKeyboardModel.rowText(modelData) + color: card.foreground + font.family: Style.font.family + font.pixelSize: Style.font.subtitle + font.bold: true + elide: Text.ElideRight + } + + SheetButton { + id: disconnectButton + visible: modelData.canDisconnect + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + width: Math.max(96, Style.space(120)) + label: "Disconnect" + foreground: card.foreground + onTapped: { + var cmd = HwKeyboardModel.disconnectCommand(modelData) + if (cmd) Quickshell.execDetached(cmd) + } + } + } + } + + SheetButton { + width: column.width + label: "Show on-screen keyboard" + primary: card.mode === "show" + foreground: card.foreground + onTapped: Quickshell.execDetached(HwKeyboardModel.modeCommand("show")) + } + + SheetButton { + width: column.width + label: "Hide on-screen keyboard" + primary: card.mode === "hide" + foreground: card.foreground + onTapped: Quickshell.execDetached(HwKeyboardModel.modeCommand("hide")) + } + } +} diff --git a/packages/omamobile-shell/plugins/omamobile.quicksettings/QuickSettings.qml b/packages/omamobile-shell/plugins/omamobile.quicksettings/QuickSettings.qml index a7e21db5e..d4f9ef01f 100644 --- a/packages/omamobile-shell/plugins/omamobile.quicksettings/QuickSettings.qml +++ b/packages/omamobile-shell/plugins/omamobile.quicksettings/QuickSettings.qml @@ -1988,8 +1988,9 @@ Item { readonly property real room: window.height - restingTop - Style.gapsOut readonly property real insets: shade.contentTopInset + shade.contentBottomInset readonly property real listHeight: root.notifications.length > 0 ? shadeList.contentHeight : shadeEmpty.implicitHeight - // The media card and the gap under it, when a player is up. - readonly property real mediaRoom: mediaCard.visible ? mediaCard.height + shadeColumn.spacing : 0 + // The keyboard and media cards and the gaps under them, when they show. + readonly property real mediaRoom: (mediaCard.visible ? mediaCard.height + shadeColumn.spacing : 0) + + (keyboardCard.visible ? keyboardCard.height + shadeColumn.spacing : 0) readonly property real natural: insets + mediaRoom + shadeHeader.height + shadeColumn.spacing + listHeight visible: !root.editing && root.reveal > 0 && room >= insets + mediaRoom + shadeHeader.height @@ -2015,6 +2016,15 @@ Item { anchors.leftMargin: shade.contentLeftInset spacing: Style.spacing.md + // ---------- A hardware keyboard: the on-screen one's mode, Disconnect + KeyboardCard { + id: keyboardCard + objectName: "keyboardCard" + width: parent.width + height: implicitHeight + foreground: root.foreground + } + // ---------- What is playing, above the notifications MediaCard { id: mediaCard diff --git a/packages/omamobile-shell/systemd/user/omamobile-osk-guard.service b/packages/omamobile-shell/systemd/user/omamobile-osk-guard.service index 21191b08a..b178470f2 100644 --- a/packages/omamobile-shell/systemd/user/omamobile-osk-guard.service +++ b/packages/omamobile-shell/systemd/user/omamobile-osk-guard.service @@ -1,9 +1,11 @@ # SPDX-License-Identifier: MIT -# Turns the on-screen keyboard back on when it was left off with no -# screensaver running (TOUCH-PLAN 0.5). Enabled for every user by a vendor +# Owns the on-screen keyboard's auto-show (screen-keyboard-enabled): off while +# a hardware keyboard is connected, and back on when it was left off with no +# screensaver running (TOUCH-PLAN 0.5, OSK-HWKBD-PLAN). Stopping it, or a +# crash, leaves auto-show on. Enabled for every user by a vendor # wants link; runs for the graphical session. [Unit] -Description=Omarchy Mobile on-screen keyboard safety net +Description=Omarchy Mobile on-screen keyboard owner and safety net PartOf=graphical-session.target After=graphical-session.target @@ -11,6 +13,7 @@ After=graphical-session.target ExecStart=/usr/bin/omamobile-osk-guard Restart=always RestartSec=5 +ExecStopPost=/usr/bin/gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled true [Install] WantedBy=graphical-session.target diff --git a/packages/omamobile-shell/test/all b/packages/omamobile-shell/test/all index f2b0c39f2..3b143e8cd 100755 --- a/packages/omamobile-shell/test/all +++ b/packages/omamobile-shell/test/all @@ -377,6 +377,7 @@ if command -v node >/dev/null; then node test/gesture-model.js >/dev/null || { node test/gesture-model.js | grep -v '^ok'; fail "home and drawer gesture rules"; } node test/wifi-model.js || fail "Wi-Fi model" node test/bluetooth-model.js || fail "Bluetooth model" + node test/hwkeyboard-model.js || fail "hardware keyboard card model" node test/sensor-model.js || fail "fingerprint sensor model" node test/tiles-model.js || fail "quick-settings tile layout" node test/notifications-model.js >/dev/null || { node test/notifications-model.js; fail "notification shade model"; } @@ -1084,7 +1085,7 @@ pass "screenshot toast: Loupe, or Tensaku without the on-screen keyboard" bash -n bin/omamobile-setup-user || fail "omamobile-setup-user parses" bash test/setup-user.sh || fail "omamobile-setup-user against a scratch home" -bash -n bin/omamobile-osk-guard || fail "omamobile-osk-guard parses" +python3 -c 'import ast,sys; ast.parse(open(sys.argv[1]).read())' bin/omamobile-osk-guard || fail "omamobile-osk-guard parses" # The widget crash guard counts a shell death inside the same boot as a # crash. A widget still "loading" from another boot (reboot, shutdown, dead # battery, or a system crash it caused) gets one retry as a suspect, and is @@ -1190,6 +1191,8 @@ grep -cx 'ExecStart=/usr/bin/omamobile-setup-user' systemd/user/omamobile-setup- [[ -x $tmp/root/usr/bin/omamobile-osk-guard && -f $u/omamobile-osk-guard.service && $(readlink "$u/graphical-session.target.wants/omamobile-osk-guard.service") == ../omamobile-osk-guard.service ]] \ || fail "the keyboard safety net is staged and enabled for every user's session" +grep -cx 'ExecStopPost=/usr/bin/gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled true' systemd/user/omamobile-osk-guard.service >/dev/null \ + || fail "the keyboard's owner leaves auto-show on when it stops" # Sleep on screen-off: staged and running for every session, but off until # the user's toggle (SUSPEND-PLAN 6.2): nothing in the package turns it on. [[ -x $tmp/root/usr/bin/omamobile-sleepd && -f $u/omamobile-sleepd.service && diff --git a/packages/omamobile-shell/test/hwkeyboard-model.js b/packages/omamobile-shell/test/hwkeyboard-model.js new file mode 100644 index 000000000..9c6c64794 --- /dev/null +++ b/packages/omamobile-shell/test/hwkeyboard-model.js @@ -0,0 +1,35 @@ +// SPDX-License-Identifier: MIT +// Node tests for plugins/omamobile.quicksettings/HwKeyboardModel.js. Run by test/all. +"use strict" +const assert = require("assert") +const path = require("path") +const M = require(path.join(__dirname, "../plugins/omamobile.quicksettings/HwKeyboardModel.js")) + +const dell = { id: "00:00:5e:00:53:01", name: "Dell Keybd Keyboard", uniq: "00:00:5e:00:53:01", bus: "bluetooth" } +const usb = { id: "usb-1", name: "USB Keyboard", uniq: "", bus: "usb" } + +let s = M.parse(JSON.stringify({ keyboards: [dell, usb], mode: "show" })) +assert.strictEqual(s.mode, "show") +assert.deepStrictEqual(s.keyboards.map(k => [k.name, k.bluetooth, k.canDisconnect]), + [["Dell Keybd Keyboard", true, true], ["USB Keyboard", false, false]]) +assert.strictEqual(M.rowText(s.keyboards[0]), "Dell Keybd Keyboard connected") +assert.strictEqual(M.accessibleName(s.keyboards), "2 keyboards connected") +assert.strictEqual(M.accessibleName(s.keyboards.slice(0, 1)), "Dell Keybd Keyboard connected") +assert.deepStrictEqual(M.disconnectCommand(s.keyboards[0]), ["omamobile-osk-guard", "--disconnect", "00:00:5e:00:53:01"]) +assert.strictEqual(M.disconnectCommand(s.keyboards[1]), null) +console.log("ok - rows per keyboard, Disconnect only with a Bluetooth address") + +// A Bluetooth keyboard without a usable uniq: no Disconnect +s = M.parse(JSON.stringify({ keyboards: [{ name: "", uniq: "", bus: "bluetooth" }, { name: "X", uniq: "x; reboot", bus: "bluetooth" }] })) +assert.deepStrictEqual(s.keyboards.map(k => [k.name, k.canDisconnect]), [["Keyboard", false], ["X", false]]) +assert.strictEqual(s.mode, "auto") +console.log("ok - no or a bad uniq hides Disconnect; a nameless keyboard is 'Keyboard'") + +// Missing, empty or broken file: no card +for (const t of ["", "null", "{", "[]", JSON.stringify({ keyboards: "x", mode: "weird" })]) { + assert.deepStrictEqual(M.parse(t), { keyboards: [], mode: "auto" }) +} +assert.strictEqual(M.accessibleName([]), "") +assert.deepStrictEqual(M.modeCommand("show"), ["omamobile-osk-guard", "--mode", "show"]) +assert.deepStrictEqual(M.modeCommand("hide"), ["omamobile-osk-guard", "--mode", "hide"]) +console.log("ok - a missing or broken file shows no card; the mode buttons' commands") diff --git a/packages/omamobile-shell/test/osk-guard.sh b/packages/omamobile-shell/test/osk-guard.sh index 4d657ea9a..9343b1068 100644 --- a/packages/omamobile-shell/test/osk-guard.sh +++ b/packages/omamobile-shell/test/osk-guard.sh @@ -1,14 +1,18 @@ #!/bin/bash # SPDX-License-Identifier: MIT -# omamobile-osk-guard against fake gsettings and pgrep: it turns the keyboard -# back on only when no screensaver runs, waits out one that does, and leaves -# an enabled keyboard alone. +# omamobile-osk-guard against fake gsettings, pgrep, udevadm, omarchy-shell, +# busctl and bluetoothctl and a made-up sysfs: with no keyboard it turns the +# on-screen keyboard back on only when no screensaver runs, waits out one that +# does, and leaves an enabled keyboard alone; a real Bluetooth or USB keyboard +# turns auto-show off (one entry per uniq), the card's "show" mode and a +# password lock keep it on, and a keyboard that went away is dropped after +# its grace with the mode back to auto. set -euo pipefail cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." fail() { printf 'not ok - %s\n' "$1" >&2; exit 1; } pass() { printf 'ok - %s\n' "$1"; } t=$(mktemp -d); trap 'rm -rf "$t"' EXIT -F=$t/fakes; mkdir -p "$F" +F=$t/fakes; mkdir -p "$F" "$t/home" fake() { printf '#!/bin/bash\n%s\n' "$2" >"$F/$1"; chmod +x "$F/$1"; } fake gsettings 'case $1 in get) cat "$T/osk" ;; @@ -17,10 +21,34 @@ fake gsettings 'case $1 in esac' # A screensaver "runs" for as many pgrep calls as $T/screensaver says fake pgrep 'n=$(cat "$T/screensaver" 2>/dev/null || echo 0); ((n > 0)) || exit 1; echo $((n - 1)) >"$T/screensaver"' -fake sleep ':' -guard() { env T="$t" OMAMOBILE_OSK_GUARD_GRACE=0 PATH="$F:/usr/bin:/bin" bash bin/omamobile-osk-guard "$@" >/dev/null; } +fake udevadm 'exec /usr/bin/sleep 30' +fake omarchy-shell 'cat "$T/locked" 2>/dev/null || echo false' +fake busctl 'echo "busctl $*" >>"$T/log"' +fake bluetoothctl 'echo "bluetoothctl $*" >>"$T/log"' +guard() { + env T="$t" HOME="$t/home" OMAMOBILE_OSK_SYSFS="$t/sys" OMAMOBILE_OSK_UDEVDATA="$t/udev" \ + OMAMOBILE_OSK_GUARD_GRACE=0 OMAMOBILE_OSK_POLL=0 OMAMOBILE_OSK_KEYBOARD_GRACE="${KGRACE:-5}" \ + PATH="$F:/usr/bin:/bin" python3 -I bin/omamobile-osk-guard "$@" >/dev/null +} state() { : >"$t/log"; echo "$1" >"$t/osk"; echo "$2" >"$t/screensaver"; } +st=$t/home/.local/state/omamobile/osk-hwkbd.json +mkdir -p "$t/sys/class/input" "$t/udev" +# node N BUS NAME UNIQ [caps] [virtual]: an event node with its udev data +letters="207f07fc3ff0000" # covers Q..P, A..L, Z..M, space +node() { + local n=$1 dev=$t/sys/devices/$1 + [[ ${6:-} == virtual ]] && dev=$t/sys/devices/virtual/input/$1 + mkdir -p "$dev/id" "$dev/capabilities" + mkdir -p "$t/sys/class/input/event$n" + echo "13:$n" >"$t/sys/class/input/event$n/dev" + ln -sfn "$dev" "$t/sys/class/input/event$n/device" + echo "$2" >"$dev/id/bustype"; echo "$3" >"$dev/name"; echo "$4" >"$dev/uniq"; echo "phys-$n" >"$dev/phys" + echo "${5:-$letters}" >"$dev/capabilities/key" + printf 'E:ID_INPUT=1\nE:ID_INPUT_KEYBOARD=1\n' >"$t/udev/c13:$n" +} +unplug() { rm -rf "$t/sys/class/input/event$1"; } +# ---- the safety net, no keyboard state false 0; guard --once [[ $(cat "$t/osk") == true ]] || fail "off with no screensaver: turned back on" state true 0; guard --once @@ -29,7 +57,81 @@ state false 3; guard --once [[ $(cat "$t/osk") == true && $(cat "$t/screensaver") == 0 ]] || fail "a running screensaver is waited out" pass "the keyboard comes back on only once no screensaver runs" -# Watching: the fake monitor turns the keyboard off and reports it; the +# ---- devices that are not keyboards +node 1 0019 gpio-keys "" # the phone's buttons +node 2 0003 "Virtual keyboard" "" "" virtual # squeekboard's +node 3 0005 "YubiKey OTP+FIDO" "aa:bb:cc:dd:ee:01" +node 4 0005 "BT Mouse" "aa:bb:cc:dd:ee:02" "0 0 0 0 0 0 0 0" +state true 0; guard --once +[[ $(cat "$t/osk") == true && ! -s $t/log ]] || fail "buttons, virtual keyboards, keys and mice are no keyboard" +[[ ! -e $st ]] || fail "no keyboard listed (nothing written)" +pass "gpio-keys, squeekboard's virtual keyboard, a security key and a mouse are not keyboards" + +# ---- a Bluetooth keyboard with two nodes, one uniq (the Dell KB7120W) +node 15 0005 "Dell Keybd Keyboard" "00:00:5E:00:53:01" +node 16 0005 "Dell Keybd" "00:00:5e:00:53:01" +state true 0; guard --once +[[ $(cat "$t/osk") == false ]] || fail "a connected keyboard turns auto-show off" +python3 - "$st" <<'EOF' || fail "one entry per uniq, mode auto" +import json, sys +s = json.load(open(sys.argv[1])) +assert s["mode"] == "auto", s +assert [(k["name"], k["uniq"], k["bus"]) for k in s["keyboards"]] == [("Dell Keybd Keyboard", "00:00:5e:00:53:01", "bluetooth")], s +EOF +# Patch 0006's restore wrote true over it: straight back off, screensaver or not +state true 0; guard --once +[[ $(cat "$t/osk") == false ]] || fail "true written over a connected keyboard goes back off" +pass "a Bluetooth keyboard turns auto-show off, listed once by uniq; a restore to true is undone" + +# ---- the card's modes +state false 0; guard --mode show +[[ $(cat "$t/osk") == true ]] && grep -q 'SetVisible b true' "$t/log" || fail "show: auto-show on and the keyboard shown" +state true 0; guard --once +[[ $(cat "$t/osk") == true ]] || fail "show mode is kept by the watcher" +state true 0; guard --mode hide +[[ $(cat "$t/osk") == false ]] && grep -q 'SetVisible b false' "$t/log" || fail "hide: auto-show off and the keyboard hidden" +pass "Show and Hide set the mode, the setting and the keyboard" + +# ---- the lock: a password keeps it showable, a PIN does not +mkdir -p "$t/home/.local/state/omarchy/toggles" +echo true >"$t/locked" +state false 0; guard --once +[[ $(cat "$t/osk") == false ]] || fail "locked with a PIN: auto-show stays off" +: >"$t/home/.local/state/omarchy/toggles/credential-password" +state false 0; guard --once +[[ $(cat "$t/osk") == true ]] || fail "locked with a password: the keyboard can come up" +echo false >"$t/locked" +state true 0; guard --once +[[ $(cat "$t/osk") == false ]] || fail "unlocked: auto-show off again" +pass "while locked with a password the on-screen keyboard stays showable" + +# ---- a USB keyboard; a virtual one never counts +unplug 15; unplug 16 +node 20 0003 "USB Keyboard" "" +state true 0; KGRACE=0 guard --once +[[ $(cat "$t/osk") == false ]] || fail "a USB keyboard turns auto-show off" +python3 -c 'import json,sys; s=json.load(open(sys.argv[1])); assert [k["name"] for k in s["keyboards"]]==["USB Keyboard"], s' "$st" || fail "the Dell is gone after its grace" +pass "a USB keyboard counts" + +# ---- it goes away: kept for its grace, then dropped and the mode back to auto +guard --mode hide +unplug 20 +state false 0; guard --once +[[ $(cat "$t/osk") == false ]] || fail "a keyboard in its grace still counts" +python3 -c 'import json,sys; s=json.load(open(sys.argv[1])); assert s["mode"]=="hide" and len(s["keyboards"])==1' "$st" || fail "kept with its mode in the grace" +state false 0; KGRACE=0 guard --once +[[ $(cat "$t/osk") == true ]] || fail "after the grace, no keyboard: the keyboard is back on" +python3 -c 'import json,sys; s=json.load(open(sys.argv[1])); assert s=={"keyboards":[],"mode":"auto"}, s' "$st" || fail "dropped, mode auto" +pass "a keyboard that went away is kept for its grace, then the mode goes back to auto" + +# ---- disconnect +: >"$t/log"; guard --disconnect 00:00:5e:00:53:01 +grep -qx 'bluetoothctl disconnect 00:00:5E:00:53:01' "$t/log" || fail "disconnect by MAC, upper case" +: >"$t/log"; guard --disconnect 'x; reboot' 2>/dev/null && fail "a bad address is refused" +[[ ! -s $t/log ]] || fail "nothing run for a bad address" +pass "Disconnect runs bluetoothctl for a valid address only" + +# ---- watching: the fake monitor turns the keyboard off and reports it; the # guard turns it back on, and exits non-zero when the monitor ends, so # systemd restarts it state true 0 From 4a901a4614407315d40f8eb5999bb4bba2210e96 Mon Sep 17 00:00:00 2001 From: Lef Date: Tue, 17 Nov 2026 16:13:38 +0200 Subject: [PATCH 12/19] keyboard: switch binds on release and never unbind user keys; guard covers any lock - Alt+Shift / Ctrl+Shift switch binds fire on release, non-consuming, so Alt+Shift+Tab, Ctrl+Shift+C/V keep working. Every switch key is bound once and only the chosen one is enabled; no hl.unbind on key strings. - phone.lua binds the default (Alt+Shift) when Settings never wrote the file. - The switch script does nothing with one layout. - osk-guard: any lock keeps auto-show on (unknown isLocked output counts as locked), no auto-show written over a running screensaver, grace counted from the removal, one process per lock poll (slower with the screen off), setting followed from gsettings monitor, exits when a monitor dies, clears the keyboard list on exit, drops bad state entries. - Keyboard card: no binding loop on the shade's room, reload timer only while the shade is open. Not tested on the phone yet. --- .../omamobile-settings/backends/keyboard.sh | 108 ++++++--- .../test/keyboard-backend.sh | 70 ++++-- packages/omamobile-shell/README.md | 2 +- .../bin/omamobile-keyboard-switch | 4 +- .../omamobile-shell/bin/omamobile-osk-guard | 207 ++++++++++++------ packages/omamobile-shell/hypr/phone.lua | 33 ++- packages/omamobile-shell/plugins/README.md | 2 +- .../omamobile.quicksettings/KeyboardCard.qml | 10 +- .../omamobile.quicksettings/QuickSettings.qml | 3 +- packages/omamobile-shell/test/all | 2 +- .../omamobile-shell/test/keyboard-switch.sh | 7 + packages/omamobile-shell/test/osk-guard.sh | 65 +++++- .../omamobile-shell/test/phone-dictation.lua | 5 +- packages/omamobile-shell/test/phone-rules.lua | 22 +- 14 files changed, 411 insertions(+), 129 deletions(-) diff --git a/packages/omamobile-settings/backends/keyboard.sh b/packages/omamobile-settings/backends/keyboard.sh index 7533c1c80..057ceedb0 100755 --- a/packages/omamobile-settings/backends/keyboard.sh +++ b/packages/omamobile-settings/backends/keyboard.sh @@ -6,9 +6,11 @@ # The switch key is a Hyprland bind, not an xkb grp: option (on the phone, Hyprland 0.57.0, 2026-11-17, a # grp: option never switched; a bind running switchxkblayout did). It is kept in a generated file, # ~/.config/hypr/omamobile-keyboard.lua, that phone.lua loads: its "-- switch-key: NAME" line is the -# choice, and with two or more layouts it binds both key orders (ALT + SHIFT_L and SHIFT + ALT_L) on every -# keyboard but squeekboard's to `omamobile-keyboard-switch next`. The same binds are applied live with -# `hyprctl eval`. Any grp: option left in kb_options from earlier versions is removed on the next set. +# choice. Every switch key is bound once (both key orders, on every keyboard but squeekboard's, to +# `omamobile-keyboard-switch next`) and only the chosen one is enabled; Alt+Shift and Ctrl+Shift fire +# on release. With no file, phone.lua binds the same set with Alt+Shift on, so "get" reports +# alt_shift then. The same Lua is applied live with `hyprctl eval`. Any grp: option left in +# kb_options from earlier versions is removed on the next set. # Prints one line of JSON. # keyboard.sh get {"layouts":[{"layout":"us","variant":""}],"switchKey":"alt_shift","active":0} # keyboard.sh list {"layouts":[{"layout":"us","name":"English (US)"}],"switchKeys":[...]} @@ -68,11 +70,20 @@ import fcntl, hashlib, json, os, re, shutil, subprocess, sys KEYS = ("kb_layout", "kb_variant", "kb_options") NAME_RE = re.compile(r"[a-z][a-z0-9_-]{0,31}") # Switch keys: each name binds these key strings (both orders, so either key can go down first). -# "caps" binds the key by its code (66), as compose:caps may give it another keysym. UNVERIFIED on the -# phone: ctrl_shift and caps (only ALT + SHIFT_L / SHIFT + ALT_L were tried, 2026-11-17). -SWITCH_KEYS = {"alt_shift": ("ALT + SHIFT_L", "SHIFT + ALT_L"), "ctrl_shift": ("CTRL + SHIFT_L", "SHIFT + CTRL_L"), +# Modifier pairs fire on RELEASE and do not consume the key (release = true, non_consuming = true), so +# Alt+Shift+Tab, Ctrl+Shift+C/V and the like reach their own bind or the app and do not switch: in +# Hyprland's KeybindManager (a 0.5x source copy, version not identified) a release bind is shadowed once +# another key is pressed and released or another bind fires while it is held, and the mods are matched +# at release time, when the released modifier is still in them (as in the documented +# `bindr = SUPER, SUPER_L`), hence "ALT + SHIFT + SHIFT_L". UNVERIFIED on the phone (0.57.0): that the +# release binds fire for a lone Alt+Shift and stay quiet for Alt+Shift+Tab; ctrl_shift and caps. +# "caps" binds the key by its code (66) on press, as compose:caps may give it another keysym. +SWITCH_KEYS = {"alt_shift": ("ALT + SHIFT + SHIFT_L", "SHIFT + ALT + ALT_L"), + "ctrl_shift": ("CTRL + SHIFT + SHIFT_L", "SHIFT + CTRL + CTRL_L"), "caps": ("code:66",), "none": ()} +RELEASE = {"alt_shift": True, "ctrl_shift": True, "caps": False, "none": False} SWITCH_NAMES = [("alt_shift", "Alt+Shift"), ("ctrl_shift", "Ctrl+Shift"), ("caps", "Caps Lock"), ("none", "None")] +DESC = "Keyboard: next layout" DEFAULT_KEY = "alt_shift" BINDS = os.environ["KBD_BINDS"] OPTION_RE = re.compile(r"[a-z0-9_]{1,32}:[A-Za-z0-9_]{1,48}") @@ -207,6 +218,7 @@ def active(): return i if isinstance(i, int) and i >= 0 else None def stored_key(): + """The file's choice; with no file, phone.lua binds the default (Alt+Shift), so that is the truth.""" try: with open(BINDS, encoding="utf-8", errors="replace") as f: for line in f: @@ -217,18 +229,29 @@ def stored_key(): pass return DEFAULT_KEY -def bind_lua(name, count): - """The binds for a switch key, as Lua for the file and for hyprctl eval; none with one layout.""" - if count < 2: - return "" - dev = '{ inclusive = false, list = { "hl-virtual-keyboard-squeekboard" } }' - return "".join('hl.bind("%s", hl.dsp.exec_cmd("omamobile-keyboard-switch next"), ' - '{ description = "Keyboard: next layout", device = %s })\n' % (k, dev) - for k in SWITCH_KEYS[name]) +# The binds as Lua, for the file and for hyprctl eval. Every switch key is bound once per Lua state +# (handles kept in the global omamobile_kbd_binds; phone.lua's default for a phone with no file is the +# same code) and only the chosen one is enabled. A disabled bind is skipped by Hyprland and consumes +# nothing. Nothing is ever hl.unbind-ed on a key string (that would take a user's own bind on the key +# too) or removed by handle (Superwhisper's generated config notes that removing a key's press and +# release handles one by one crashed Hyprland 0.56; set_enabled is what it uses live). The binds stay +# with one layout: omamobile-keyboard-switch does nothing then. +def bind_lua(name): + lua = "if not omamobile_kbd_binds then\n omamobile_kbd_binds = {}\n" + for n, keys in SWITCH_KEYS.items(): + for k in keys: + lua += (' omamobile_kbd_binds[#omamobile_kbd_binds + 1] = { "%s", hl.bind("%s", ' + 'hl.dsp.exec_cmd("omamobile-keyboard-switch next"), { description = "%s", ' + 'device = { inclusive = false, list = { "hl-virtual-keyboard-squeekboard" } }%s }) }\n' + % (n, k, DESC, ", release = true, non_consuming = true" if RELEASE[n] else "")) + lua += ('end\n' + 'for _, b in ipairs(omamobile_kbd_binds) do pcall(function() b[2]:set_enabled(b[1] == "%s") end) end\n' + % name) + return lua -def write_binds(name, count): +def write_binds(name): text = ("-- Written by Omarchy Mobile Settings (Keyboard), loaded by phone.lua. Changes here are replaced.\n" - "-- switch-key: %s\n" % name) + bind_lua(name, count) + "-- switch-key: %s\n" % name) + bind_lua(name) tmp = "%s.tmp-omamobile.%d" % (BINDS, os.getpid()) try: os.makedirs(os.path.dirname(BINDS), exist_ok=True) @@ -245,15 +268,48 @@ def write_binds(name, count): return False return True -# Live: drop the old key's binds (and the new key's, so nothing is bound twice), then bind. hl.unbind -# takes every bind on that key string, a user's own too. UNVERIFIED on the phone: hl.unbind and hl.bind -# through `hyprctl eval` (the phone test bound ALT + SHIFT_L live, not through this code). -def apply_binds(old, name, count): - keys = list(dict.fromkeys(SWITCH_KEYS[old] + SWITCH_KEYS[name])) - lua = "".join('pcall(hl.unbind, "%s")\n' % k for k in keys) + bind_lua(name, count) - if not lua: - return True +MODBITS = {"SHIFT": 1, "CAPS": 2, "CTRL": 4, "CONTROL": 4, "ALT": 8, "MOD2": 16, "MOD3": 32, "SUPER": 64, "MOD5": 128} + +def split_key(k): + parts = [p.strip() for p in k.split("+")] + return sum(MODBITS.get(p.upper(), 0) for p in parts[:-1]), parts[-1] + +def ours_count(): + """How many of our binds Hyprland has, or None when it cannot be read.""" + try: + binds = json.loads(run(["hyprctl", "-j", "binds"]) or "x") + except ValueError: + return None + if not isinstance(binds, list): + return None + return sum(1 for b in binds if isinstance(b, dict) and b.get("description") == DESC), binds + +ALL_KEYS = [k for ks in SWITCH_KEYS.values() for k in ks] + +# Live. UNVERIFIED on the phone: that the omamobile_kbd_binds global survives between `hyprctl eval` +# calls and the config, and set_enabled through eval. When it does not (more of our binds than the +# one set afterwards), a key is hl.unbind-ed only when every bind Hyprland lists on it is ours, and +# the set is bound again; a key that also carries a user's bind is left alone and the save reports +# that it did not apply live (the file applies on the next config load). +def apply_binds(name): + lua = bind_lua(name) r = run(["hyprctl", "eval", lua]) + if r is None or "error" in r.lower(): + return False + got = ours_count() + if got is None or got[0] == len(ALL_KEYS): + return True + clean = [] + for k in ALL_KEYS: + mods, key = split_key(k) + on = [b for b in got[1] if isinstance(b, dict) and ( + (key.startswith("code:") and b.get("keycode") == int(key[5:]) and not b.get("modmask")) + or (str(b.get("key", "")).lower() == key.lower() and b.get("modmask") == mods))] + if any(b.get("description") != DESC for b in on): + return False + clean.append(k) + r = run(["hyprctl", "eval", "".join('pcall(hl.unbind, "%s")\n' % k for k in clean) + + "omamobile_kbd_binds = nil\n" + lua]) return r is not None and "error" not in r.lower() def state(layouts, variants, options): @@ -467,9 +523,9 @@ if key == "layouts" or had_grp: write(data, st, text, found, new) osk_ok = key != "layouts" or sync_osk(old_names, lst_names(layouts, variants)) live_ok = apply_live(layouts, variants, options) -if not write_binds(sw, len(layouts)): +if not write_binds(sw): fail("cannot write " + os.path.basename(BINDS)) -live_ok = apply_binds(old_key, sw, len(layouts)) and live_ok +live_ok = apply_binds(sw) and live_ok if not live_ok: fail("saved, but Hyprland did not take it live" + ("" if osk_ok else ", and the on-screen keyboard list was not updated")) diff --git a/packages/omamobile-settings/test/keyboard-backend.sh b/packages/omamobile-settings/test/keyboard-backend.sh index d33260f54..762f90d19 100755 --- a/packages/omamobile-settings/test/keyboard-backend.sh +++ b/packages/omamobile-settings/test/keyboard-backend.sh @@ -11,6 +11,7 @@ cat > "$tmp/bin/hyprctl" <<'EOT' printf '%s\n' "$*" >> "$FAKE_LOG" case "$1 $2" in "-j devices") cat "$FAKE_DEVICES" 2>/dev/null || exit 1 ;; + "-j binds") cat "$FAKE_BINDS" 2>/dev/null || exit 1 ;; "-j getoption") case $3 in input:kb_options) printf '{"option":"input:kb_options","str":"%s","set":true}\n' "${FAKE_OPTIONS:-}" ;; input:kb_layout) printf '{"option":"input:kb_layout","str":"%s","set":true}\n' "${FAKE_LAYOUT:-us}" ;; @@ -76,7 +77,7 @@ hl.config({ }) EOT chmod 640 "$tmp/input.lua" -# no bind file yet: the default switch key +# no bind file yet: phone.lua binds the default, Alt+Shift eq "$(run get)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"alt_shift","active":1}' : > "$tmp/log" @@ -88,10 +89,11 @@ has "$tmp/input.lua" 'kb_options = "compose:caps,grp_led:caps", -- keep me' # both key orders bound on every keyboard but squeekboard's, in the file and live b=$tmp/omamobile-keyboard.lua has "$b" '-- switch-key: alt_shift' -has "$b" 'hl.bind("ALT + SHIFT_L", hl.dsp.exec_cmd("omamobile-keyboard-switch next"), { description = "Keyboard: next layout", device = { inclusive = false, list = { "hl-virtual-keyboard-squeekboard" } } })' -has "$b" 'hl.bind("SHIFT + ALT_L", hl.dsp.exec_cmd("omamobile-keyboard-switch next")' -has "$tmp/log" 'pcall(hl.unbind, "ALT + SHIFT_L")' -has "$tmp/log" 'hl.bind("SHIFT + ALT_L", hl.dsp.exec_cmd("omamobile-keyboard-switch next")' +has "$b" 'hl.bind("ALT + SHIFT + SHIFT_L", hl.dsp.exec_cmd("omamobile-keyboard-switch next"), { description = "Keyboard: next layout", device = { inclusive = false, list = { "hl-virtual-keyboard-squeekboard" } }, release = true, non_consuming = true })' +has "$b" 'hl.bind("SHIFT + ALT + ALT_L", hl.dsp.exec_cmd("omamobile-keyboard-switch next")' +has "$b" 'b[2]:set_enabled(b[1] == "alt_shift")' +has "$tmp/log" 'hl.bind("SHIFT + ALT + ALT_L", hl.dsp.exec_cmd("omamobile-keyboard-switch next")' +hasnt "$tmp/log" 'unbind' hasnt "$tmp/log" 'grp:' has "$tmp/input.lua" '-- kb_layout = "fr", a comment, never touched' has "$tmp/input.lua" 'hl.config({ input = { kb_layout = "de" } })' @@ -112,22 +114,21 @@ cp "$tmp/input.lua" "$tmp/before"; : > "$tmp/log" eq "$(run set switch-key ctrl_shift)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"ctrl_shift","active":1}' cmp -s "$tmp/input.lua" "$tmp/before" || { echo "FAIL: a switch-key change wrote input.lua" >&2; exit 1; } has "$b" '-- switch-key: ctrl_shift' -has "$b" 'hl.bind("CTRL + SHIFT_L",' -has "$b" 'hl.bind("SHIFT + CTRL_L",' -hasnt "$b" 'ALT' -has "$tmp/log" 'pcall(hl.unbind, "ALT + SHIFT_L")' -has "$tmp/log" 'pcall(hl.unbind, "SHIFT + ALT_L")' +has "$b" 'b[2]:set_enabled(b[1] == "ctrl_shift")' +has "$tmp/log" 'b[2]:set_enabled(b[1] == "ctrl_shift")' +hasnt "$tmp/log" 'unbind' hasnt "$tmp/log" 'gsettings' hasnt "$tmp/log" 'kb_options' run set switch-key caps >/dev/null -has "$b" 'hl.bind("code:66",' +has "$b" 'hl.bind("code:66", hl.dsp.exec_cmd("omamobile-keyboard-switch next"), { description = "Keyboard: next layout", device = { inclusive = false, list = { "hl-virtual-keyboard-squeekboard" } } })' +has "$b" 'set_enabled(b[1] == "caps")' eq "$(run set switch-key none | grep -o '"switchKey":"[^"]*"')" '"switchKey":"none"' -hasnt "$b" 'hl.bind' +has "$b" 'set_enabled(b[1] == "none")' has "$b" '-- switch-key: none' run set switch-key alt_shift >/dev/null -# one layout left: no binds (the choice is kept for later); the variant goes; grp_led stays +# one layout left: the binds stay (the switch script does nothing then); the variant goes; grp_led stays eq "$(run set layouts us)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"alt_shift","active":1}' -hasnt "$b" 'hl.bind' +has "$b" 'set_enabled(b[1] == "alt_shift")' has "$b" '-- switch-key: alt_shift' has "$tmp/input.lua" 'kb_options = "compose:caps,grp_led:caps",' has "$tmp/input.lua" 'kb_variant = "",' @@ -252,4 +253,45 @@ eq "$(FAKE_GSETTINGS_FAIL=1 run set layouts us,gr)" '{"error":"saved and applied FAKE_DEVICES=$tmp/none eq "$(FAKE_DEVICES=$tmp/none run get)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":""}],"switchKey":"alt_shift","active":null}' # list: layouts and grp: switch keys from the rules file, other options left out eq "$(run list)" '{"layouts":[{"layout":"us","name":"English (US)"},{"layout":"gr","name":"Greek"},{"layout":"de","name":"German"},{"layout":"ru","name":"Russian"}],"switchKeys":[{"option":"alt_shift","name":"Alt+Shift"},{"option":"ctrl_shift","name":"Ctrl+Shift"},{"option":"caps","name":"Caps Lock"},{"option":"none","name":"None"}]}' +# The bind file under a stub hl: loaded twice in one Lua state (a second hyprctl eval) it binds +# the five keys once and enables only the chosen pair; a fresh state (phone.lua resets the table) +# binds them again +run set switch-key ctrl_shift >/dev/null +cat > "$tmp/stub.lua" <<'EOT' +local binds = {} +hl = { dsp = { exec_cmd = function(c) return c end } } +function hl.bind(k, d, o) + local h = { key = k, enabled = true, opts = o } + function h:set_enabled(v) self.enabled = v end + binds[#binds + 1] = h + return h +end +dofile(arg[1]); dofile(arg[1]) +local on = {} +for _, h in ipairs(binds) do if h.enabled then on[#on + 1] = h.key .. (h.opts.release and "/r" or "") end end +print(#binds, table.concat(on, ";")) +omamobile_kbd_binds = nil; dofile(arg[1]); print(#binds) +EOT +eq "$(lua "$tmp/stub.lua" "$b")" "$(printf '5\tCTRL + SHIFT + SHIFT_L/r;SHIFT + CTRL + CTRL_L/r\n10')" +# phone.lua's default (no file) binds the same five key strings +for k in "ALT + SHIFT + SHIFT_L" "SHIFT + ALT + ALT_L" "CTRL + SHIFT + SHIFT_L" "SHIFT + CTRL + CTRL_L" "code:66"; do + has "$b" "\"$k\""; has "$src/../omamobile-shell/hypr/phone.lua" "\"$k\"" +done + +# The handle table did not survive the eval (more of ours than five): keys with only our binds +# are unbound and bound again; a key that also has a user's bind is left alone and reported +ours='"description":"Keyboard: next layout"' +{ printf '['; for i in 1 2; do printf '{"modmask":9,"key":"Shift_L","keycode":0,%s},{"modmask":9,"key":"Alt_L","keycode":0,%s},' "$ours" "$ours" + printf '{"modmask":5,"key":"Shift_L","keycode":0,%s},{"modmask":5,"key":"Control_L","keycode":0,%s},{"modmask":0,"key":"","keycode":66,%s},' "$ours" "$ours" "$ours"; done + printf '{"modmask":64,"key":"Return","keycode":0,"description":"Terminal"}]\n'; } > "$tmp/binds.json" +: > "$tmp/log" +FAKE_BINDS="$tmp/binds.json" run set switch-key alt_shift | grep -q '"switchKey":"alt_shift"' || { echo "FAIL: duplicate cleanup" >&2; exit 1; } +has "$tmp/log" 'pcall(hl.unbind, "ALT + SHIFT + SHIFT_L")' +has "$tmp/log" 'pcall(hl.unbind, "code:66")' +has "$tmp/log" 'omamobile_kbd_binds = nil' +sed -i 's/"Terminal"/"Terminal"},{"modmask":9,"key":"SHIFT_L","keycode":0,"description":"Mine"/' "$tmp/binds.json" +: > "$tmp/log" +FAKE_BINDS="$tmp/binds.json" run set switch-key alt_shift | grep -q 'did not take it live' || { echo "FAIL: a user's bind on the key is reported" >&2; exit 1; } +hasnt "$tmp/log" 'unbind' + echo "keyboard backend: ok" diff --git a/packages/omamobile-shell/README.md b/packages/omamobile-shell/README.md index 530e621ab..b9cfeea77 100644 --- a/packages/omamobile-shell/README.md +++ b/packages/omamobile-shell/README.md @@ -26,7 +26,7 @@ Omarchy Mobile's phone profile for Omarchy's own shell. It isn't a fork: these a | `bin/omamobile-osk-watch` | Reports squeekboard's visibility (sm.puri.OSK0) to the fingerprint, keyboard and launcher plugins | | `bin/omamobile-screenshot-open` | What a screenshot toast's tap ("Tap to view", patch 0020) opens on a phone (`OMARCHY_SCREENSHOT_EDITOR`, set in `environment.d/30-omamobile-screenshot.conf`; Omarchy passes the saved file's path): the screenshot in Loupe (omamobile-apps), fitted, with touch zoom, pan and swipe, and Loupe's copy, share and delete. Tensaku, Omarchy's default, can't be panned or zoomed by touch; without Loupe it is the fallback, through `omamobile-screenshot-edit` | | `bin/omamobile-screenshot-edit` | Tensaku as Omarchy opens a screenshot in it (`tensaku-edit`), with GTK's simple input-method context so the on-screen keyboard doesn't come up over the image (show it by hand for the text tool). `omamobile-setup-user` gives Tensaku's own entry (drawer, Loupe's Open With) the same context once, and `hypr/phone.lua` maximizes its window, which Omarchy floats by class | -| `bin/omamobile-osk-guard` | Owns the on-screen keyboard's auto-show (`screen-keyboard-enabled`): off while a real Bluetooth or USB keyboard is connected (unless the shade's keyboard card says Show, or the lock wants a password), back on when it was left off with no screensaver running; lists the keyboards for the card in `~/.local/state/omamobile/osk-hwkbd.json`, and runs the card's `--mode show|hide` and `--disconnect MAC` (a user unit for every graphical session) | +| `bin/omamobile-osk-guard` | Owns the on-screen keyboard's auto-show (`screen-keyboard-enabled`): off while a real Bluetooth or USB keyboard is connected (unless the shade's keyboard card says Show, or the session is locked; a polkit prompt is not detected), back on when it was left off with no screensaver running; lists the keyboards for the card in `~/.local/state/omamobile/osk-hwkbd.json`, and runs the card's `--mode show|hide` and `--disconnect MAC` (a user unit for every graphical session) | | `bin/omamobile-doubletap` | Double tap to wake, as on Android: two taps within 0.4 s and about 150 px of each other (14 % of the touchscreen's width) on a dark phone wake it as a short power press does (`omamobile-keys double-tap`, which leaves a lit screen alone). `hypr/phone.lua` turns Hyprland's `misc:mouse_move_enables_dpms` off, so a single touch no longer lights the screen; on the lock no touch wakes it either (patch 0029), and this daemon wakes it through `omamobile-keys double-tap`. With the phone in a pocket (proximity near, through iio-sensor-proxy, claimed only from the first dark tap until 2 s after the last) the double tap is skipped; without a proximity sensor it wakes as before. A screen that goes dark while unlocked (an idle blank, the panel powered off by hand) is locked at once (`omamobile-keys dark-unlocked`), as on Android: Hyprland sends a touch to the window under it whatever the screen's state, so on a dark unlocked phone it reached an app no one could see. It works while the phone is awake: a double tap can't wake it from sleep (with the sleep toggle on, the first 30 s after the screen goes off). It times a double tap from one lift to the next touch, and it only wakes: the lock itself ignores touches while dark (0029). The touchscreen is the first input device with `INPUT_PROP_DIRECT`, `BTN_TOUCH` and `ABS_MT_POSITION_X`, read without a grab (the user is in the `input` group). A user unit for every graphical session | | `bin/omamobile-sleepd` | Sleep (s2idle) once the screen has been off behind a secure lock for `OMAMOBILE_SLEEP_AFTER_OFF` s (30), and again 5 s after a dark resume; `now` for the power key (`omamobile-keys`), `check` to see what holds it awake. Refuses with the screen on, Stay awake on, an SSH session open, a logind sleep block inhibitor (calls, GNSS) or a RUNNING PipeWire sink. A user unit for every graphical session, **off until `omarchy-toggle omamobile-sleep on`** (device/cheetah/SUSPEND-PLAN.md 6.2) | | `bin/omamobile-weather` | The current weather for the lock screen's glance (`~/.local/state/omamobile/weather.json`, with the `source` it used) from Open-Meteo, at login and every 30 minutes (`omamobile-weather.timer`, a user unit for every graphical session). Where, in order: the phone's position from GeoClue at city accuracy, at most every 3 h and only while the Location switch is on and GeoClue has an agent for the user (omamobile-gnss's unit, or any other instance of GeoClue's demo agent the user runs; never a prompt); the setting `~/.config/omamobile/weather.json` (`omamobile-weather set "State College, PA" F`, or `{"latitude", "longitude"}`; `"location": "fixed"` puts it before the position); the home screen's today widget's city, or the weather widget's named place. Unit: the setting's, else the locale's. A failure keeps the old reading; a run that starts before the network is back (login, or the catch-up run on resume) tries again with backoff for up to 75 s and then gives up without failing the unit. `omamobile-weather show` says where it would look | diff --git a/packages/omamobile-shell/bin/omamobile-keyboard-switch b/packages/omamobile-shell/bin/omamobile-keyboard-switch index 3a9c26c23..d762241c7 100755 --- a/packages/omamobile-shell/bin/omamobile-keyboard-switch +++ b/packages/omamobile-shell/bin/omamobile-keyboard-switch @@ -104,8 +104,8 @@ def to(n): if kb is None: return lst = names(kb) - if not lst: - return + if len(lst) < 2: + return # one layout: the switch key does nothing n %= len(lst) switch(n, kbs) diff --git a/packages/omamobile-shell/bin/omamobile-osk-guard b/packages/omamobile-shell/bin/omamobile-osk-guard index d44c44486..8faeeb80d 100755 --- a/packages/omamobile-shell/bin/omamobile-osk-guard +++ b/packages/omamobile-shell/bin/omamobile-osk-guard @@ -8,11 +8,20 @@ # (the setting is false), unless the user chose "Show on-screen keyboard" # on the shade's keyboard card (mode "show"). The keyboards and the mode # are in ~/.local/state/omamobile/osk-hwkbd.json, which the card reads. A -# keyboard that goes away stays listed for a 5 s grace (a Bluetooth -# keyboard waking up comes back as the same uniq and keeps the mode); -# after it, with no keyboard left, the mode goes back to "auto". While the -# session is locked and the credential is a password, the setting stays -# true, so the lock's field can still bring the keyboard up. +# keyboard that goes away stays listed for a 5 s grace counted from when +# it was first found missing (a Bluetooth keyboard waking up comes back as +# the same uniq and keeps the mode); after it, with no keyboard left, the +# mode goes back to "auto". While the session is locked (any credential: +# the password field, or the ABC field next to a PIN pad) the setting +# stays true. The lock is polled with one process (omarchy-shell lock +# isLocked) every 2 s, 10 s with the screen off, and only while a +# keyboard is listed and the mode is not "show"; output other than +# "false" counts as locked. The setting itself is followed through +# `gsettings monitor`, keyboards through `udevadm monitor` (no polling). +# KNOWN LIMIT: a polkit password prompt is not detected (Omarchy's agent +# is inside the shell, no window to see), so with a keyboard listed the +# on-screen keyboard does not pop up there; the card's Show button or +# disconnecting the keyboard brings it back. # 2. The safety net (TOUCH-PLAN 0.5): Omarchy's screensaver launcher turns # the setting off while the screensaver runs (patches/omarchy/0006-*) and # back on after. When it is off and should not be, this waits until no @@ -28,14 +37,13 @@ # setting, and show or hide the keyboard # omamobile-osk-guard --disconnect MAC # bluetoothctl disconnect (the card) -import fcntl, json, os, re, select, signal, struct, subprocess, sys, tempfile, time +import fcntl, glob, json, os, re, select, signal, struct, subprocess, sys, tempfile, time KEY = ["org.gnome.desktop.a11y.applications", "screen-keyboard-enabled"] HOME = os.environ.get("HOME", "/") SYSFS = os.environ.get("OMAMOBILE_OSK_SYSFS", "/sys") UDEV = os.environ.get("OMAMOBILE_OSK_UDEVDATA", "/run/udev/data") STATE = os.environ.get("OMAMOBILE_OSK_STATE", HOME + "/.local/state/omamobile/osk-hwkbd.json") -PASSWORD_TOGGLE = HOME + "/.local/state/omarchy/toggles/credential-password" def num(name, default): @@ -49,6 +57,7 @@ GRACE = num("OMAMOBILE_OSK_GUARD_GRACE", 10) KEYBOARD_GRACE = num("OMAMOBILE_OSK_KEYBOARD_GRACE", 5) SETTLE = num("OMAMOBILE_OSK_SETTLE", 1) POLL = num("OMAMOBILE_OSK_POLL", 2) +POLL_OFF = num("OMAMOBILE_OSK_POLL_OFF", 10) # the lock poll with the screen off MAC = re.compile(r"^([0-9a-f]{2}:){5}[0-9a-f]{2}$", re.I) @@ -128,7 +137,10 @@ def load(): s = {} kbs = s.get("keyboards") if isinstance(s.get("keyboards"), list) else [] mode = s.get("mode") if s.get("mode") in ("auto", "show", "hide") else "auto" - return {"keyboards": [k for k in kbs if isinstance(k, dict)], "mode": mode} + # An entry without a string id and name is dropped (a hand-edited file + # must not stop the guard). + kbs = [k for k in kbs if isinstance(k, dict) and isinstance(k.get("id"), str) and isinstance(k.get("name"), str)] + return {"keyboards": kbs, "mode": mode} def save(s): @@ -148,7 +160,11 @@ def save(s): # ------------------------------------------------------------------ the setting def osk_get(): r = run(["gsettings", "get"] + KEY) - v = r.stdout.strip() if r and r.returncode == 0 else "" + return parse_bool(r.stdout if r and r.returncode == 0 else "") + + +def parse_bool(text): + v = text.strip().rsplit(" ", 1)[-1] if text.strip() else "" return True if v == "true" else False if v == "false" else None @@ -161,15 +177,31 @@ def screensaver_up(): return bool(r and r.returncode == 0) -def password_locked(): - if not os.path.exists(PASSWORD_TOGGLE): return False +def is_locked(): + """One process. Anything but a plain "false" (a timeout, the shell + restarting, odd output) counts as locked: the safe side is a keyboard + that can come up.""" r = run(["omarchy-shell", "lock", "isLocked"], timeout=5) - return bool(r and r.returncode == 0 and r.stdout.strip() == "true") + return not (r and r.returncode == 0 and r.stdout.strip() == "false") + +def screen_off(): + """No process: every backlight reads off (bl_power 4 or brightness 0). + UNVERIFIED on the phone that DPMS off shows there; if not, the screen + simply counts as on and the lock is polled at the faster rate.""" + seen = False + for d in glob.glob(os.path.join(SYSFS, "class/backlight/*")): + seen = True + if read(d + "/bl_power") not in ("4",) and read(d + "/brightness") not in ("0",): return False + return seen -def wanted(state): + +def wanted(state, locked): + """locked: a callable, asked only when it decides the answer.""" if not state["keyboards"] or state["mode"] == "show": return True - return password_locked() + # Locked (any credential): the lock's field, password or the ABC field + # next to a PIN pad, must be able to bring the keyboard up. + return locked() def set_visible(show): @@ -180,42 +212,75 @@ def set_visible(show): # ------------------------------------------------------------------ the watcher class Guard: def __init__(self): - self.seen = {} # id -> (keyboard, last time present) + self.seen = {} # id -> [keyboard, time first found missing or None] self.last_wanted = None + self.actual = None # the setting, from gsettings monitor (None: read it) + self.locked = None # the last lock poll (None: not polled) self.restore_at = None # the safety net's deadline (setting off, wanted on) self.restore_phase = 0 # 0: first grace, 1: screensaver gone, second grace self.scan_at = 0.0 - self.scanned = 0.0 - # A restart keeps what the file lists for one grace (and its mode). + self.poll_at = None + self.state = {"keyboards": [], "mode": "auto"} + # A restart keeps what the file lists for one grace (and its mode): + # counted as missing from now until a scan finds it. start = time.monotonic() for k in load()["keyboards"]: - if isinstance(k.get("id"), str): self.seen[k["id"]] = (k, start) + self.seen[k["id"]] = [k, start] def refresh(self, now): - """Rescan; write the state file when the list or the mode changes.""" - self.scanned = now - for k in keyboards(): - self.seen[k["id"]] = (k, now) + """Rescan; write the state file when the list or the mode changes. + The grace runs from when a keyboard was first found missing, and a + keyboard that comes back within it keeps the mode.""" + present = {k["id"]: k for k in keyboards()} + for key, k in present.items(): + self.seen[key] = [k, None] listed = [] - for key, (k, t) in list(self.seen.items()): - if t == now or now - t < KEYBOARD_GRACE: listed.append(k) + for key, (k, gone) in list(self.seen.items()): + if key not in present and gone is None: + self.seen[key][1] = gone = now + if gone is None or now - gone < KEYBOARD_GRACE: listed.append(k) else: del self.seen[key] listed.sort(key=lambda k: (k["name"], k["id"])) with locked_state(): s = load() new = {"keyboards": listed, "mode": s["mode"] if listed else "auto"} if new != s: save(new) + self.state = new return new - def evaluate(self, now): - s = self.refresh(now) - want = wanted(s) - actual = osk_get() + def lock_matters(self, s): + return bool(s["keyboards"]) and s["mode"] != "show" + + def poll_lock(self): + self.locked = is_locked() + return self.locked + + def get_actual(self): + if self.actual is None: self.actual = osk_get() + return self.actual + + def write(self, value): + osk_set(value) + self.actual = value + + def evaluate(self, now, rescan=True, s=None): + s = s or (self.refresh(now) if rescan else load()) + self.state = s + if not self.lock_matters(s): self.locked = None + want = wanted(s, lambda: self.locked if self.locked is not None else self.poll_lock()) + actual = self.get_actual() if want != self.last_wanted and self.last_wanted is not None: - # Our own change (a keyboard came or went, the lock, the mode): now. - self.restore_at = None + # Our own change (a keyboard came or went, the lock, the mode). self.last_wanted = want - if actual != want: osk_set(want) + self.restore_at = None + if actual == want: return + if want and not self.locked and screensaver_up(): + # A keyboard went away under the screensaver: no keyboard + # over it; the safety net turns it on once it is gone. + self.restore_at = now + POLL + self.restore_phase = 0 + return + self.write(want) return self.last_wanted = want if actual is None or actual == want: @@ -224,7 +289,7 @@ class Guard: if not want: # Someone turned it on over a connected keyboard (0006's restore). self.restore_at = None - osk_set(False) + self.write(False) log("a keyboard is connected; turned the on-screen keyboard's auto-show back off") return if self.restore_at is None: @@ -234,7 +299,7 @@ class Guard: def due(self, now): """The safety net's next step when its deadline came.""" if self.restore_at is None or now < self.restore_at: return - if screensaver_up(): + if screensaver_up() and not (self.lock_matters(self.state) and self.locked): self.restore_at = now + POLL self.restore_phase = 0 return @@ -243,25 +308,41 @@ class Guard: self.restore_at = now + GRACE return self.restore_at = None - if osk_get() is False and wanted(load()) and not screensaver_up(): - osk_set(True) + self.actual = osk_get() + if self.actual is False and wanted(self.state, self.poll_lock) and \ + (self.locked or not screensaver_up()): + self.write(True) log("the on-screen keyboard was off with no screensaver running; turned it back on") - def lock_matters(self): - s = load() - return bool(s["keyboards"]) and s["mode"] != "show" and os.path.exists(PASSWORD_TOGGLE) - def next_deadline(self, now): times = [t for t in (self.restore_at, self.scan_at or None) if t is not None] # A keyboard in its grace: drop it (and maybe the mode) when it ends. - times += [t + KEYBOARD_GRACE for _, t in self.seen.values() if t != self.scanned] - if self.lock_matters(): times.append(now + POLL) + times += [gone + KEYBOARD_GRACE for _, gone in self.seen.values() if gone is not None] + if self.lock_matters(self.state): + if self.poll_at is None: + self.poll_at = now + (POLL_OFF if screen_off() else POLL) + times.append(self.poll_at) + else: + self.poll_at = None return min(times) if times else None + def tick(self, now): + """Deadlines: a rescan, a grace end, the lock poll, the safety net.""" + if self.scan_at and now >= self.scan_at: + self.scan_at = 0.0 + self.evaluate(now) + elif any(gone is not None and now - gone >= KEYBOARD_GRACE for _, gone in self.seen.values()): + self.evaluate(now) + if self.poll_at is not None and now >= self.poll_at: + self.poll_at = None + if self.lock_matters(self.state): + self.poll_lock() + self.evaluate(now, s=self.state) + self.due(now) + def once(): g = Guard() - g.last_wanted = None now = time.monotonic() g.evaluate(now) while g.restore_at is not None: @@ -282,17 +363,13 @@ def watch(): mon = subprocess.Popen(["gsettings", "monitor"] + KEY, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE, text=True) children.append(mon) - try: - udev = subprocess.Popen(["udevadm", "monitor", "--udev", "--subsystem-match=input"], - stdin=subprocess.DEVNULL, stdout=subprocess.PIPE, - stderr=subprocess.DEVNULL, text=True) - children.append(udev) - except OSError: - udev = None - log("udevadm monitor did not start; hardware keyboards are read only on other changes") + udev = subprocess.Popen(["udevadm", "monitor", "--udev", "--subsystem-match=input"], + stdin=subprocess.DEVNULL, stdout=subprocess.PIPE, + stderr=subprocess.DEVNULL, text=True) + children.append(udev) g = Guard() g.evaluate(time.monotonic()) - streams = [mon.stdout] + ([udev.stdout] if udev else []) + streams = [mon.stdout, udev.stdout] while True: now = time.monotonic() deadline = g.next_deadline(now) @@ -302,25 +379,25 @@ def watch(): for r in ready: line = r.readline() if not line: - if r is mon.stdout: - # The monitor ended (the session bus went away): let systemd restart it. - return 1 - streams.remove(r) - continue - if udev and r is udev.stdout: + # A monitor ended (the session bus went away, udevadm + # died): let systemd restart the guard. + return 1 + if r is udev.stdout: g.scan_at = now + SETTLE else: - g.evaluate(now) - if g.scan_at and now >= g.scan_at: - g.scan_at = 0.0 - g.evaluate(now) - elif not ready: - g.evaluate(now) # grace expiry, the lock poll - g.due(now) + g.actual = parse_bool(line) + g.evaluate(now, rescan=False, s=g.state) + g.tick(now) finally: for c in children: try: c.terminate() except OSError: pass + # Nobody watches the keyboards now: an empty list, so the card goes + # and a "hide" cannot leave auto-show off. + try: + with locked_state(): save({"keyboards": [], "mode": "auto"}) + except OSError: + pass # Never leave the phone without its keyboard. if osk_get() is False: osk_set(True) @@ -330,7 +407,7 @@ def set_mode(mode): s = load() s["mode"] = mode save(s) - want = wanted(s) + want = wanted(s, is_locked) if osk_get() != want: osk_set(want) if mode == "show": set_visible(True) elif mode == "hide": set_visible(False) diff --git a/packages/omamobile-shell/hypr/phone.lua b/packages/omamobile-shell/hypr/phone.lua index 17efc59c1..3747f62ef 100644 --- a/packages/omamobile-shell/hypr/phone.lua +++ b/packages/omamobile-shell/hypr/phone.lua @@ -248,14 +248,37 @@ elseif o.cmd_present("voxtype") then }) end --- The hardware keyboard's layout switch key (Settings > Keyboard writes this --- file: binds on every keyboard but squeekboard's to --- `omamobile-keyboard-switch next`). An xkb grp: option never switched on the --- phone (Hyprland 0.57.0); a bind running switchxkblayout did. pcall: a bad --- or half-written file must not stop the rest of the config. +-- The hardware keyboard's layout switch key. Settings > Keyboard writes +-- omamobile-keyboard.lua: every switch key bound once (on every keyboard but +-- squeekboard's, to `omamobile-keyboard-switch next`), only the chosen one +-- enabled. With no file yet, the same binds with Alt+Shift on (keep in step +-- with bind_lua in omamobile-settings/backends/keyboard.sh; test/all checks). +-- Alt+Shift and Ctrl+Shift fire on release and consume nothing, so +-- Alt+Shift+Tab or Ctrl+Shift+C still do their own thing. With one layout +-- the switch does nothing. An xkb grp: option never switched on the phone +-- (Hyprland 0.57.0). The handle table is reset here: a config load drops +-- every bind. pcall: a bad file must not stop the rest of the config. +omamobile_kbd_binds = nil local kbd_binds = (os.getenv("XDG_CONFIG_HOME") or ((os.getenv("HOME") or "") .. "/.config")) .. "/hypr/omamobile-keyboard.lua" local kbd_file = io.open(kbd_binds, "r") if kbd_file then kbd_file:close() pcall(dofile, kbd_binds) end +if not omamobile_kbd_binds then + omamobile_kbd_binds = {} + local not_squeekboard = { inclusive = false, list = { "hl-virtual-keyboard-squeekboard" } } + for _, b in ipairs({ + { "alt_shift", "ALT + SHIFT + SHIFT_L", true }, { "alt_shift", "SHIFT + ALT + ALT_L", true }, + { "ctrl_shift", "CTRL + SHIFT + SHIFT_L", true }, { "ctrl_shift", "SHIFT + CTRL + CTRL_L", true }, + { "caps", "code:66", false }, + }) do + local opts = { description = "Keyboard: next layout", device = not_squeekboard } + if b[3] then opts.release = true; opts.non_consuming = true end + local ok, h = pcall(hl.bind, b[2], hl.dsp.exec_cmd("omamobile-keyboard-switch next"), opts) + if ok and h then + omamobile_kbd_binds[#omamobile_kbd_binds + 1] = { b[1], h } + if b[1] ~= "alt_shift" then pcall(function() h:set_enabled(false) end) end + end + end +end diff --git a/packages/omamobile-shell/plugins/README.md b/packages/omamobile-shell/plugins/README.md index 3a08bcd24..88d08a307 100644 --- a/packages/omamobile-shell/plugins/README.md +++ b/packages/omamobile-shell/plugins/README.md @@ -205,7 +205,7 @@ reads " connected", with Disconnect for a Bluetooth keyboard whose turns auto-show back on and shows it; Hide turns it off and hides it. A keyboard that goes away stays listed for 5 s (a reconnect of the same `uniq` keeps the mode); with none left the mode goes back to auto and auto-show is -on. Locked with a password credential, auto-show stays on. +on. Locked (any credential), auto-show stays on; a polkit prompt is not detected (known limit). ### Media card diff --git a/packages/omamobile-shell/plugins/omamobile.quicksettings/KeyboardCard.qml b/packages/omamobile-shell/plugins/omamobile.quicksettings/KeyboardCard.qml index 1cd2e22ea..2dd642307 100644 --- a/packages/omamobile-shell/plugins/omamobile.quicksettings/KeyboardCard.qml +++ b/packages/omamobile-shell/plugins/omamobile.quicksettings/KeyboardCard.qml @@ -19,11 +19,13 @@ BorderSurface { property color foreground: Commons.Color.popups.text property var keyboards: [] property string mode: "auto" + // The shade is open: only then is the file re-read on a timer. + property bool active: false readonly property int inner: Style.spacing.lg visible: keyboards.length > 0 - implicitHeight: visible ? column.implicitHeight + inner * 2 : 0 + implicitHeight: keyboards.length > 0 ? column.implicitHeight + inner * 2 : 0 radius: Style.cornerRadius color: Style.normalFillFor(card.foreground, Commons.Color.accent) borderSpec: Border.controlSpec("normal", card.foreground, Commons.Color.accent) @@ -48,8 +50,10 @@ BorderSurface { } // The guard replaces the file (rename); each reload watches it again, and - // this catches a watch that was lost. - Timer { interval: 5000; repeat: true; running: true; onTriggered: stateFile.reload() } + // this catches a watch that was lost, while the shade is open (and once + // when it opens). + onActiveChanged: if (active) stateFile.reload() + Timer { interval: 5000; repeat: true; running: card.active; onTriggered: stateFile.reload() } Column { id: column diff --git a/packages/omamobile-shell/plugins/omamobile.quicksettings/QuickSettings.qml b/packages/omamobile-shell/plugins/omamobile.quicksettings/QuickSettings.qml index d4f9ef01f..3d7df1972 100644 --- a/packages/omamobile-shell/plugins/omamobile.quicksettings/QuickSettings.qml +++ b/packages/omamobile-shell/plugins/omamobile.quicksettings/QuickSettings.qml @@ -1990,7 +1990,7 @@ Item { readonly property real listHeight: root.notifications.length > 0 ? shadeList.contentHeight : shadeEmpty.implicitHeight // The keyboard and media cards and the gaps under them, when they show. readonly property real mediaRoom: (mediaCard.visible ? mediaCard.height + shadeColumn.spacing : 0) - + (keyboardCard.visible ? keyboardCard.height + shadeColumn.spacing : 0) + + (keyboardCard.keyboards.length > 0 ? keyboardCard.height + shadeColumn.spacing : 0) readonly property real natural: insets + mediaRoom + shadeHeader.height + shadeColumn.spacing + listHeight visible: !root.editing && root.reveal > 0 && room >= insets + mediaRoom + shadeHeader.height @@ -2020,6 +2020,7 @@ Item { KeyboardCard { id: keyboardCard objectName: "keyboardCard" + active: root.reveal > 0 width: parent.width height: implicitHeight foreground: root.foreground diff --git a/packages/omamobile-shell/test/all b/packages/omamobile-shell/test/all index 3b143e8cd..82bb1723d 100755 --- a/packages/omamobile-shell/test/all +++ b/packages/omamobile-shell/test/all @@ -1036,7 +1036,7 @@ pass "permission sheet" # of Hyprland's Lua API and sets what the layout depends on. lua=$(command -v lua || command -v lua5.4 || command -v luajit || true) if [[ -n $lua ]]; then - out=$("$lua" test/phone-rules.lua) || { grep -v '^ok' <<<"$out"; fail "phone.lua window rules"; } + out=$(XDG_CONFIG_HOME=/nonexistent "$lua" test/phone-rules.lua) || { grep -v '^ok' <<<"$out"; fail "phone.lua window rules"; } pass "phone.lua: edge to edge, opaque, dialogs, picture-in-picture" # Dictation keys under Omarchy 4.5's helpers: four homes, four bindings.lua dk=$(mktemp -d) diff --git a/packages/omamobile-shell/test/keyboard-switch.sh b/packages/omamobile-shell/test/keyboard-switch.sh index 724c244ca..6f934ebcc 100755 --- a/packages/omamobile-shell/test/keyboard-switch.sh +++ b/packages/omamobile-shell/test/keyboard-switch.sh @@ -69,3 +69,10 @@ pass "keyboard-switch main keyboard rule" [[ ! -e $t/osk.log ]] || fail "a hardware switch touched the on-screen keyboard: $(cat "$t/osk.log")" pass "keyboard-switch leaves the on-screen keyboard alone" + +# one layout: the switch key does nothing +printf '{"keyboards":[{"name":"dell-kb7120w","layout":"us","variant":"","active_layout_index":0,"main":true}]}\n' >"$t/devices.json" +rm -f "$t/hypr.log" +python3 -B "$s" next +[[ ! -e $t/hypr.log ]] || fail "one layout: no switch" +pass "keyboard-switch does nothing with one layout" diff --git a/packages/omamobile-shell/test/osk-guard.sh b/packages/omamobile-shell/test/osk-guard.sh index 9343b1068..a5f319c99 100644 --- a/packages/omamobile-shell/test/osk-guard.sh +++ b/packages/omamobile-shell/test/osk-guard.sh @@ -5,7 +5,7 @@ # on-screen keyboard back on only when no screensaver runs, waits out one that # does, and leaves an enabled keyboard alone; a real Bluetooth or USB keyboard # turns auto-show off (one entry per uniq), the card's "show" mode and a -# password lock keep it on, and a keyboard that went away is dropped after +# lock (any credential) keep it on, and a keyboard that went away is dropped after # its grace with the mode back to auto. set -euo pipefail cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." @@ -92,18 +92,28 @@ state true 0; guard --mode hide [[ $(cat "$t/osk") == false ]] && grep -q 'SetVisible b false' "$t/log" || fail "hide: auto-show off and the keyboard hidden" pass "Show and Hide set the mode, the setting and the keyboard" -# ---- the lock: a password keeps it showable, a PIN does not -mkdir -p "$t/home/.local/state/omarchy/toggles" +# ---- the lock: any credential keeps it showable; odd isLocked output counts as locked echo true >"$t/locked" state false 0; guard --once -[[ $(cat "$t/osk") == false ]] || fail "locked with a PIN: auto-show stays off" -: >"$t/home/.local/state/omarchy/toggles/credential-password" -state false 0; guard --once -[[ $(cat "$t/osk") == true ]] || fail "locked with a password: the keyboard can come up" +[[ $(cat "$t/osk") == true ]] || fail "locked (PIN or password): the keyboard can come up" echo false >"$t/locked" state true 0; guard --once [[ $(cat "$t/osk") == false ]] || fail "unlocked: auto-show off again" -pass "while locked with a password the on-screen keyboard stays showable" +echo "Error: no shell" >"$t/locked" +state false 0; guard --once +[[ $(cat "$t/osk") == true ]] || fail "unknown isLocked output: treated as locked" +echo false >"$t/locked" +pass "while locked (any credential, or unknown) the on-screen keyboard stays showable" + +# ---- a state entry without a string name is dropped, not a crash +python3 - "$st" <<'EOF2' +import json, sys +s = json.load(open(sys.argv[1])); s["keyboards"].append({"id": "x"}); s["keyboards"].append({"id": "y", "name": 3}) +json.dump(s, open(sys.argv[1], "w")) +EOF2 +state true 0; guard --once || fail "a bad state entry does not stop the guard" +[[ $(cat "$t/osk") == false ]] || fail "bad entries ignored, the real keyboard still counts" +pass "state entries without a string id and name are ignored" # ---- a USB keyboard; a virtual one never counts unplug 15; unplug 16 @@ -138,3 +148,42 @@ state true 0 guard && fail "the guard exits non-zero when its monitor ends" [[ $(cat "$t/osk") == true && $(grep -c set "$t/log") == 1 ]] || fail "a change the monitor reports is checked" pass "the watch loop restores the keyboard and exits for a restart when the monitor ends" + +# ---- the keyboard goes away under the screensaver: no auto-show written over it +mkdir -p "$t/state2"; st2=$t/state2/osk-hwkbd.json +node 30 0005 "BT Keyboard" "aa:bb:cc:dd:ee:30" +echo '{"keyboards":[],"mode":"auto"}' >"$st2" +python3 - "$t" "$st2" <<'EOF2' || fail "grace and screensaver in the watcher class" +import importlib.util, importlib.machinery, os, sys, time +sys.dont_write_bytecode = True +t, st = sys.argv[1], sys.argv[2] +os.environ.update(T=t, HOME=t + "/home", OMAMOBILE_OSK_SYSFS=t + "/sys", OMAMOBILE_OSK_UDEVDATA=t + "/udev", + OMAMOBILE_OSK_STATE=st, OMAMOBILE_OSK_KEYBOARD_GRACE="5", OMAMOBILE_OSK_GUARD_GRACE="0", + OMAMOBILE_OSK_POLL="2", PATH=t + "/fakes:/usr/bin:/bin") +loader = importlib.machinery.SourceFileLoader("guard", "bin/omamobile-osk-guard") +spec = importlib.util.spec_from_loader("guard", loader); g = importlib.util.module_from_spec(spec); loader.exec_module(g) +open(t + "/osk", "w").write("true\n"); open(t + "/locked", "w").write("false\n") +G = g.Guard(); G.evaluate(100.0) +assert open(t + "/osk").read().strip() == "false", "connected: off" +G.state["mode"] = "hide" +import json; json.dump({"keyboards": G.state["keyboards"], "mode": "hide"}, open(st, "w")) +# Last scan long before the removal: the grace still counts from the removal +os.system("rm -rf " + t + "/sys/class/input/event30") +G.evaluate(200.0) +assert G.state["keyboards"] and G.state["mode"] == "hide", ("kept in its grace", G.state) +G.evaluate(203.0) +assert G.state["keyboards"] and G.state["mode"] == "hide", ("still in the grace 3 s after removal", G.state) +# Screensaver running when the grace ends: nothing written +open(t + "/screensaver", "w").write("5\n") +G.evaluate(205.5) +assert not G.state["keyboards"] and G.state["mode"] == "auto", G.state +assert open(t + "/osk").read().strip() == "false", "no auto-show over the screensaver" +assert G.restore_at is not None, "the safety net waits it out" +EOF2 +pass "the grace runs from the removal; a keyboard gone under the screensaver waits for it to end" + +# ---- stopping the watcher clears the list (the card goes, a hide cannot stick) +state true 0 +guard || true +python3 -c 'import json,sys; s=json.load(open(sys.argv[1])); assert s=={"keyboards":[],"mode":"auto"}, s' "$st" || fail "list cleared on exit" +pass "the watcher clears the keyboard list when it stops" diff --git a/packages/omamobile-shell/test/phone-dictation.lua b/packages/omamobile-shell/test/phone-dictation.lua index 4d646bb78..dce538950 100644 --- a/packages/omamobile-shell/test/phone-dictation.lua +++ b/packages/omamobile-shell/test/phone-dictation.lua @@ -19,7 +19,10 @@ hl = { for _, b in ipairs(binds) do if b.keys ~= keys then kept[#kept + 1] = b end end binds = kept end, - dsp = { window = { cycle_next = dsp("cycle_next"), bring_to_top = dsp("bring_to_top") }, focus = dsp("focus") }, + dsp = { window = { cycle_next = dsp("cycle_next"), bring_to_top = dsp("bring_to_top") }, focus = dsp("focus"), + exec_cmd = function(c) return c end }, + -- the layout switch key's binds (not checked here) + bind = function() return { set_enabled = noop } end, } o = { bind = function(keys, description, dispatcher, opts) diff --git a/packages/omamobile-shell/test/phone-rules.lua b/packages/omamobile-shell/test/phone-rules.lua index 80340ba78..3acaf637f 100644 --- a/packages/omamobile-shell/test/phone-rules.lua +++ b/packages/omamobile-shell/test/phone-rules.lua @@ -28,7 +28,14 @@ hl = { for _, b in ipairs(binds) do if b.keys ~= keys then kept[#kept + 1] = b end end binds = kept end, - dsp = { window = { cycle_next = dsp("cycle_next"), bring_to_top = dsp("bring_to_top") }, focus = dsp("focus") }, + dsp = { window = { cycle_next = dsp("cycle_next"), bring_to_top = dsp("bring_to_top") }, focus = dsp("focus"), + exec_cmd = function(c) return c end }, + bind = function(keys, dispatcher, opts) + local b = { keys = keys, dispatcher = dispatcher, opts = opts or {}, enabled = true } + function b:set_enabled(v) self.enabled = v end + binds[#binds + 1] = b + return b + end, } o = { bind = function(keys, description, dispatcher, opts) @@ -157,5 +164,18 @@ end check(#find("ALT + TAB") == 2 and find("ALT + TAB")[1].dispatcher.dsp == "cycle_next", "Alt + Tab keeps both of Omarchy's actions") local f9 = find("F9", true) check(#f9 == 1 and f9[1].dispatcher == "voxtype record stop", "F9 still stops Voxtype on release") +-- The layout switch key with no Settings file: Alt+Shift on release, nothing consumed, the +-- other switch keys bound but off (HOME points at a directory without the file) +local on, off = {}, 0 +for _, b in ipairs(binds) do + if b.dispatcher == "omamobile-keyboard-switch next" then + if b.enabled then on[#on + 1] = b else off = off + 1 end + end +end +check(#on == 2 and off == 3, "the default switch binds: two on, three off") +for _, b in ipairs(on) do + check(b.keys:find("^ALT %+ SHIFT %+ SHIFT_L$") or b.keys:find("^SHIFT %+ ALT %+ ALT_L$"), "Alt+Shift by default: " .. b.keys) + check(b.opts.release == true and b.opts.non_consuming == true and device_is(b, false), "on release, not consumed, not squeekboard's") +end os.exit(failed and 1 or 0) From 5290a656f50854c66b8f9c7051ff6fd8e39bd878 Mon Sep 17 00:00:00 2001 From: Lef Date: Tue, 17 Nov 2026 18:30:27 +0200 Subject: [PATCH 13/19] keyboard: press binds for Alt/Ctrl+Shift, xkb caps_toggle for Caps Lock Measured on the 8 Pro (Hyprland 0.57.0): the release binds missed 9 of 17 presses and fired ~110 ms late, press binds running switchxkblayout current next switched 11/11, a code:66 bind never fired and grp:caps_toggle switched 12/12. Caps now goes into kb_options (compose:caps dropped then), get reports caps from the effective options, and keyboard-switch next reads devices once. --- .../omamobile-settings/app/KeyboardPage.qml | 2 +- .../omamobile-settings/backends/keyboard.sh | 75 +++++++++++-------- .../test/keyboard-backend.sh | 63 ++++++++++------ .../bin/omamobile-keyboard-switch | 14 ++-- packages/omamobile-shell/hypr/phone.lua | 29 ++++--- packages/omamobile-shell/test/phone-rules.lua | 12 +-- 6 files changed, 112 insertions(+), 83 deletions(-) diff --git a/packages/omamobile-settings/app/KeyboardPage.qml b/packages/omamobile-settings/app/KeyboardPage.qml index 4f1452d66..5fc544ec2 100644 --- a/packages/omamobile-settings/app/KeyboardPage.qml +++ b/packages/omamobile-settings/app/KeyboardPage.qml @@ -136,7 +136,7 @@ Flickable { visible: page.layouts.length > 1 Layout.fillWidth: true; spacing: 8 Repeater { - // From `keyboard.sh list`: Alt+Shift, Ctrl+Shift, Caps Lock, None (Hyprland binds, not xkb grp:) + // From `keyboard.sh list`: Alt+Shift, Ctrl+Shift, Caps Lock, None (Alt/Ctrl+Shift are Hyprland binds, Caps Lock is xkb grp:caps_toggle) model: page.switchKeys delegate: SettingsButton { required property var modelData diff --git a/packages/omamobile-settings/backends/keyboard.sh b/packages/omamobile-settings/backends/keyboard.sh index 057ceedb0..67f8a5f36 100755 --- a/packages/omamobile-settings/backends/keyboard.sh +++ b/packages/omamobile-settings/backends/keyboard.sh @@ -3,14 +3,16 @@ # Keyboard layouts for the Settings app. The hardware keyboard's layouts live in Omarchy's user file # ~/.config/hypr/input.lua (kb_layout, kb_variant); the on-screen keyboard's list is gsettings # org.gnome.desktop.input-sources sources, and a layouts change adds new ones there too. -# The switch key is a Hyprland bind, not an xkb grp: option (on the phone, Hyprland 0.57.0, 2026-11-17, a -# grp: option never switched; a bind running switchxkblayout did). It is kept in a generated file, +# The switch key (measured on the phone, Hyprland 0.57.0, Dell BT keyboard, 2026-11-17): +# Alt+Shift and Ctrl+Shift are Hyprland press binds running `hyprctl switchxkblayout current next` +# (11/11 switched, 14-35 ms after the second key went down). Caps Lock is xkb grp:caps_toggle with +# grp_led:caps in kb_options (12/12, 1-3 ms); a Hyprland bind on code:66 never fired, and +# grp:alt_shift_toggle only worked in one key order. The binds live in a generated file, # ~/.config/hypr/omamobile-keyboard.lua, that phone.lua loads: its "-- switch-key: NAME" line is the -# choice. Every switch key is bound once (both key orders, on every keyboard but squeekboard's, to -# `omamobile-keyboard-switch next`) and only the chosen one is enabled; Alt+Shift and Ctrl+Shift fire -# on release. With no file, phone.lua binds the same set with Alt+Shift on, so "get" reports -# alt_shift then. The same Lua is applied live with `hyprctl eval`. Any grp: option left in -# kb_options from earlier versions is removed on the next set. +# choice. Both pairs are bound once (both key orders, on every keyboard but squeekboard's) and only +# the chosen one is enabled. With no file, phone.lua binds the same set with Alt+Shift on, so "get" +# reports alt_shift then, or caps when grp:caps_toggle is in the effective kb_options. The same Lua +# is applied live with `hyprctl eval`. # Prints one line of JSON. # keyboard.sh get {"layouts":[{"layout":"us","variant":""}],"switchKey":"alt_shift","active":0} # keyboard.sh list {"layouts":[{"layout":"us","name":"English (US)"}],"switchKeys":[...]} @@ -23,7 +25,7 @@ # first entry is not a Latin layout is refused (passwords on the lock screen are typed in layout 1). # input.lua is edited in place: only the last live kb_layout, kb_variant and kb_options strings inside an # `input = { }` table change (per-device blocks and variables are left alone), comments and every other -# option but grp: (grp_led:caps, compose:...) stay, a copy of the old +# option stays but grp:, grp_led:caps (set only with caps) and compose:caps with caps, a copy of the old # file goes to input.lua.bak-omamobile first, and the write is dropped if the file changed meanwhile. # A file with no live kb_layout (Omarchy's stock one has them only in comments) gets one hl.config() block # appended at the end; get then reports Hyprland's effective values. @@ -70,18 +72,16 @@ import fcntl, hashlib, json, os, re, shutil, subprocess, sys KEYS = ("kb_layout", "kb_variant", "kb_options") NAME_RE = re.compile(r"[a-z][a-z0-9_-]{0,31}") # Switch keys: each name binds these key strings (both orders, so either key can go down first). -# Modifier pairs fire on RELEASE and do not consume the key (release = true, non_consuming = true), so -# Alt+Shift+Tab, Ctrl+Shift+C/V and the like reach their own bind or the app and do not switch: in -# Hyprland's KeybindManager (a 0.5x source copy, version not identified) a release bind is shadowed once -# another key is pressed and released or another bind fires while it is held, and the mods are matched -# at release time, when the released modifier is still in them (as in the documented -# `bindr = SUPER, SUPER_L`), hence "ALT + SHIFT + SHIFT_L". UNVERIFIED on the phone (0.57.0): that the -# release binds fire for a lone Alt+Shift and stay quiet for Alt+Shift+Tab; ctrl_shift and caps. -# "caps" binds the key by its code (66) on press, as compose:caps may give it another keysym. -SWITCH_KEYS = {"alt_shift": ("ALT + SHIFT + SHIFT_L", "SHIFT + ALT + ALT_L"), - "ctrl_shift": ("CTRL + SHIFT + SHIFT_L", "SHIFT + CTRL + CTRL_L"), - "caps": ("code:66",), "none": ()} -RELEASE = {"alt_shift": True, "ctrl_shift": True, "caps": False, "none": False} +# Press binds, not release ones: release binds fired only when Shift came up before Alt (8 of 17) +# and ~110 ms late. non_consuming, so the keys still reach apps. Known cost: Alt+Shift+Tab (and +# Ctrl+Shift+C/V) also switch the layout. "caps" has no bind: it is xkb (CAPS_OPTS), and compose:caps +# goes then, as it takes the key. Shift+Caps gives real Caps Lock, but 2 of 4 Shift+Caps presses +# switched the layout instead on the phone (it also had shift:both_capslock_cancel): cause unknown. +SWITCH_KEYS = {"alt_shift": ("ALT + SHIFT_L", "SHIFT + ALT_L"), + "ctrl_shift": ("CTRL + SHIFT_L", "SHIFT + CTRL_L"), + "caps": (), "none": ()} +CAPS_OPTS = ["grp:caps_toggle", "grp_led:caps"] +SWITCH_CMD = "hyprctl switchxkblayout current next" SWITCH_NAMES = [("alt_shift", "Alt+Shift"), ("ctrl_shift", "Ctrl+Shift"), ("caps", "Caps Lock"), ("none", "None")] DESC = "Keyboard: next layout" DEFAULT_KEY = "alt_shift" @@ -231,19 +231,19 @@ def stored_key(): # The binds as Lua, for the file and for hyprctl eval. Every switch key is bound once per Lua state # (handles kept in the global omamobile_kbd_binds; phone.lua's default for a phone with no file is the -# same code) and only the chosen one is enabled. A disabled bind is skipped by Hyprland and consumes +# same set) and only the chosen one is enabled. A disabled bind is skipped by Hyprland and consumes # nothing. Nothing is ever hl.unbind-ed on a key string (that would take a user's own bind on the key # too) or removed by handle (Superwhisper's generated config notes that removing a key's press and # release handles one by one crashed Hyprland 0.56; set_enabled is what it uses live). The binds stay -# with one layout: omamobile-keyboard-switch does nothing then. +# with one layout: switchxkblayout next has nowhere to go then. def bind_lua(name): lua = "if not omamobile_kbd_binds then\n omamobile_kbd_binds = {}\n" for n, keys in SWITCH_KEYS.items(): for k in keys: lua += (' omamobile_kbd_binds[#omamobile_kbd_binds + 1] = { "%s", hl.bind("%s", ' - 'hl.dsp.exec_cmd("omamobile-keyboard-switch next"), { description = "%s", ' - 'device = { inclusive = false, list = { "hl-virtual-keyboard-squeekboard" } }%s }) }\n' - % (n, k, DESC, ", release = true, non_consuming = true" if RELEASE[n] else "")) + 'hl.dsp.exec_cmd("%s"), { description = "%s", ' + 'device = { inclusive = false, list = { "hl-virtual-keyboard-squeekboard" } }, non_consuming = true }) }\n' + % (n, k, SWITCH_CMD, DESC)) lua += ('end\n' 'for _, b in ipairs(omamobile_kbd_binds) do pcall(function() b[2]:set_enabled(b[1] == "%s") end) end\n' % name) @@ -312,8 +312,22 @@ def apply_binds(name): + "omamobile_kbd_binds = nil\n" + lua]) return r is not None and "error" not in r.lower() -def state(layouts, variants, options): +def switch_key(options): + """caps lives in kb_options, the rest in the bind file; a caps file without the option is none.""" + if "grp:caps_toggle" in options: + return "caps" sw = stored_key() + return "none" if sw == "caps" else sw + +def switch_options(options, sw): + """kb_options for switch key sw: every grp: and grp_led:caps out, caps' own back in.""" + keep = [o for o in options if not o.startswith("grp:") and o != "grp_led:caps"] + if sw == "caps": + keep = [o for o in keep if o != "compose:caps"] + CAPS_OPTS + return keep + +def state(layouts, variants, options): + sw = switch_key(options) return {"layouts": [{"layout": l, "variant": v} for l, v in zip(layouts, variants)], "switchKey": sw, "active": active()} @@ -505,16 +519,15 @@ if "kb_layout" not in found: old_names = lst_names(layouts, variants) if "kb_options" not in found: options = effective_options() # keep Omarchy's defaults when input.lua does not set kb_options -old_key = stored_key() -had_grp = any(o.startswith("grp:") for o in options) -options = [o for o in options if not o.startswith("grp:")] # the switch key is a bind now if key == "layouts": layouts, variants = new_l, new_v - sw = old_key + sw = switch_key(options) else: sw = value +old_options = options +options = switch_options(options, sw) live_ok = osk_ok = True -if key == "layouts" or had_grp: +if key == "layouts" or options != old_options: new = {"kb_layout": ",".join(layouts), "kb_options": ",".join(options)} if "kb_options" not in found and not options: del new["kb_options"] diff --git a/packages/omamobile-settings/test/keyboard-backend.sh b/packages/omamobile-settings/test/keyboard-backend.sh index 762f90d19..7c5e761db 100755 --- a/packages/omamobile-settings/test/keyboard-backend.sh +++ b/packages/omamobile-settings/test/keyboard-backend.sh @@ -71,7 +71,7 @@ hl.config({ input = { kb_layout = "de" } }) hl.config({ input = { kb_layout = "us", - kb_options = "compose:caps,grp:caps_toggle,grp_led:caps", -- keep me + kb_options = "compose:caps,grp:alt_shift_toggle,grp_led:caps", -- keep me repeat_rate = 40, }, }) @@ -84,15 +84,17 @@ eq "$(run get)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"alt_shif eq "$(run set layouts us,gr:polytonic)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"alt_shift","active":1}' has "$tmp/input.lua" 'kb_layout = "us,gr",' has "$tmp/input.lua" 'kb_variant = ",polytonic",' -# the old grp: option is removed (it never switched on the phone), grp_led and the rest stay -has "$tmp/input.lua" 'kb_options = "compose:caps,grp_led:caps", -- keep me' +# the old grp: option and grp_led:caps are removed (caps only), the rest stays +has "$tmp/input.lua" 'kb_options = "compose:caps", -- keep me' # both key orders bound on every keyboard but squeekboard's, in the file and live b=$tmp/omamobile-keyboard.lua has "$b" '-- switch-key: alt_shift' -has "$b" 'hl.bind("ALT + SHIFT + SHIFT_L", hl.dsp.exec_cmd("omamobile-keyboard-switch next"), { description = "Keyboard: next layout", device = { inclusive = false, list = { "hl-virtual-keyboard-squeekboard" } }, release = true, non_consuming = true })' -has "$b" 'hl.bind("SHIFT + ALT + ALT_L", hl.dsp.exec_cmd("omamobile-keyboard-switch next")' +has "$b" 'hl.bind("ALT + SHIFT_L", hl.dsp.exec_cmd("hyprctl switchxkblayout current next"), { description = "Keyboard: next layout", device = { inclusive = false, list = { "hl-virtual-keyboard-squeekboard" } }, non_consuming = true })' +has "$b" 'hl.bind("SHIFT + ALT_L", hl.dsp.exec_cmd("hyprctl switchxkblayout current next")' +hasnt "$b" 'release' +hasnt "$b" 'code:66' has "$b" 'b[2]:set_enabled(b[1] == "alt_shift")' -has "$tmp/log" 'hl.bind("SHIFT + ALT + ALT_L", hl.dsp.exec_cmd("omamobile-keyboard-switch next")' +has "$tmp/log" 'hl.bind("SHIFT + ALT_L", hl.dsp.exec_cmd("hyprctl switchxkblayout current next")' hasnt "$tmp/log" 'unbind' hasnt "$tmp/log" 'grp:' has "$tmp/input.lua" '-- kb_layout = "fr", a comment, never touched' @@ -101,7 +103,7 @@ has "$tmp/input.lua" ' kb_options = "grp:caps_toggle" ]]' eq "$(grep -c 'hl.config' "$tmp/input.lua")" 2 eq "$(stat -c %a "$tmp/input.lua")" 640 has "$tmp/input.lua.bak-omamobile" 'kb_layout = "us",' -has "$tmp/log" 'eval hl.config({ input = { kb_layout = "us,gr", kb_variant = ",polytonic", kb_options = "compose:caps,grp_led:caps" } })' +has "$tmp/log" 'eval hl.config({ input = { kb_layout = "us,gr", kb_variant = ",polytonic", kb_options = "compose:caps" } })' has "$tmp/log" "gsettings set org.gnome.desktop.input-sources sources [('xkb', 'us'), ('xkb', 'gr+polytonic')]" # gsettings is written before the live apply g=$(grep -n '^gsettings set' "$tmp/log" | cut -d: -f1); e=$(grep -n '^eval' "$tmp/log" | head -1 | cut -d: -f1) @@ -119,18 +121,28 @@ has "$tmp/log" 'b[2]:set_enabled(b[1] == "ctrl_shift")' hasnt "$tmp/log" 'unbind' hasnt "$tmp/log" 'gsettings' hasnt "$tmp/log" 'kb_options' -run set switch-key caps >/dev/null -has "$b" 'hl.bind("code:66", hl.dsp.exec_cmd("omamobile-keyboard-switch next"), { description = "Keyboard: next layout", device = { inclusive = false, list = { "hl-virtual-keyboard-squeekboard" } } })' +# caps: no bind, xkb grp:caps_toggle + grp_led:caps in kb_options, compose:caps goes (it takes the key) +: > "$tmp/log" +eq "$(run set switch-key caps | grep -o '"switchKey":"[^"]*"')" '"switchKey":"caps"' has "$b" 'set_enabled(b[1] == "caps")' +has "$tmp/input.lua" 'kb_options = "grp:caps_toggle,grp_led:caps", -- keep me' +has "$tmp/log" 'kb_options = "grp:caps_toggle,grp_led:caps" } })' +hasnt "$tmp/log" 'gsettings' +eq "$(run get | grep -o '"switchKey":"[^"]*"')" '"switchKey":"caps"' +# a layouts change keeps caps +eq "$(run set layouts us,gr:polytonic | grep -o '"switchKey":"[^"]*"')" '"switchKey":"caps"' +has "$tmp/input.lua" 'kb_options = "grp:caps_toggle,grp_led:caps", -- keep me' +# away from caps: both options go eq "$(run set switch-key none | grep -o '"switchKey":"[^"]*"')" '"switchKey":"none"' has "$b" 'set_enabled(b[1] == "none")' has "$b" '-- switch-key: none' +has "$tmp/input.lua" 'kb_options = "", -- keep me' run set switch-key alt_shift >/dev/null -# one layout left: the binds stay (the switch script does nothing then); the variant goes; grp_led stays +# one layout left: the binds stay (switchxkblayout next does nothing then); the variant goes eq "$(run set layouts us)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"alt_shift","active":1}' has "$b" 'set_enabled(b[1] == "alt_shift")' has "$b" '-- switch-key: alt_shift' -has "$tmp/input.lua" 'kb_options = "compose:caps,grp_led:caps",' +has "$tmp/input.lua" 'kb_options = "",' has "$tmp/input.lua" 'kb_variant = "",' # a non-Latin first layout is refused, nothing written @@ -183,6 +195,8 @@ printf 'hl.config({\n input = {\n kb_layout = "us,gr",\n },\n})\n' > "$tmp/ FAKE_OPTIONS=compose:caps,grp:alt_shift_toggle run set switch-key alt_shift >/dev/null has "$tmp/input.lua" ' kb_options = "compose:caps",' printf 'hl.config({\n input = {\n kb_layout = "us,gr",\n },\n})\n' > "$tmp/input.lua" +# grp:caps_toggle in Hyprland's effective kb_options: get says caps whatever the file says +eq "$(FAKE_OPTIONS=grp:caps_toggle,grp_led:caps run get | grep -o '"switchKey":"[^"]*"')" '"switchKey":"caps"' # bad input never reaches the file cp "$tmp/input.lua" "$tmp/before" @@ -242,10 +256,10 @@ printf 'hl.config({ input = { kb_layout = [[us]], } })\n' > "$tmp/input.lua" eq "$(run get)" '{"error":"input.lua: kb_layout is not a plain string"}' # eval refused: the keyword fallback; both refused: says which half failed -printf 'hl.config({ input = {\n kb_layout = "us",\n kb_options = "grp_led:caps",\n} })\n' > "$tmp/input.lua" +printf 'hl.config({ input = {\n kb_layout = "us",\n kb_options = "compose:caps",\n} })\n' > "$tmp/input.lua" : > "$tmp/log" FAKE_EVAL_FAIL=1 run set layouts us,gr >/dev/null -has "$tmp/log" '--batch keyword input:kb_variant ; keyword input:kb_options grp_led:caps; keyword input:kb_layout us,gr' +has "$tmp/log" '--batch keyword input:kb_variant ; keyword input:kb_options compose:caps; keyword input:kb_layout us,gr' eq "$(FAKE_EVAL_FAIL=1 FAKE_KEYWORD_FAIL=1 run set layouts us,de)" '{"error":"saved, but Hyprland did not take it live"}' has "$tmp/input.lua" 'kb_layout = "us,de",' eq "$(FAKE_GSETTINGS_FAIL=1 run set layouts us,gr)" '{"error":"saved and applied, but the on-screen keyboard list was not updated"}' @@ -254,7 +268,7 @@ FAKE_DEVICES=$tmp/none eq "$(FAKE_DEVICES=$tmp/none run get)" '{"layouts":[{"lay # list: layouts and grp: switch keys from the rules file, other options left out eq "$(run list)" '{"layouts":[{"layout":"us","name":"English (US)"},{"layout":"gr","name":"Greek"},{"layout":"de","name":"German"},{"layout":"ru","name":"Russian"}],"switchKeys":[{"option":"alt_shift","name":"Alt+Shift"},{"option":"ctrl_shift","name":"Ctrl+Shift"},{"option":"caps","name":"Caps Lock"},{"option":"none","name":"None"}]}' # The bind file under a stub hl: loaded twice in one Lua state (a second hyprctl eval) it binds -# the five keys once and enables only the chosen pair; a fresh state (phone.lua resets the table) +# the four keys once and enables only the chosen pair; a fresh state (phone.lua resets the table) # binds them again run set switch-key ctrl_shift >/dev/null cat > "$tmp/stub.lua" <<'EOT' @@ -268,28 +282,29 @@ function hl.bind(k, d, o) end dofile(arg[1]); dofile(arg[1]) local on = {} -for _, h in ipairs(binds) do if h.enabled then on[#on + 1] = h.key .. (h.opts.release and "/r" or "") end end +for _, h in ipairs(binds) do if h.enabled then on[#on + 1] = h.key .. (h.opts.release and "/r" or "") .. (h.opts.non_consuming and "/n" or "") end end print(#binds, table.concat(on, ";")) omamobile_kbd_binds = nil; dofile(arg[1]); print(#binds) EOT -eq "$(lua "$tmp/stub.lua" "$b")" "$(printf '5\tCTRL + SHIFT + SHIFT_L/r;SHIFT + CTRL + CTRL_L/r\n10')" -# phone.lua's default (no file) binds the same five key strings -for k in "ALT + SHIFT + SHIFT_L" "SHIFT + ALT + ALT_L" "CTRL + SHIFT + SHIFT_L" "SHIFT + CTRL + CTRL_L" "code:66"; do +eq "$(lua "$tmp/stub.lua" "$b")" "$(printf '4\tCTRL + SHIFT_L/n;SHIFT + CTRL_L/n\n8')" +# phone.lua's default (no file) binds the same four key strings and command, and no code:66 +for k in "ALT + SHIFT_L" "SHIFT + ALT_L" "CTRL + SHIFT_L" "SHIFT + CTRL_L" "hyprctl switchxkblayout current next"; do has "$b" "\"$k\""; has "$src/../omamobile-shell/hypr/phone.lua" "\"$k\"" done +hasnt "$src/../omamobile-shell/hypr/phone.lua" '"code:66"' -# The handle table did not survive the eval (more of ours than five): keys with only our binds +# The handle table did not survive the eval (more of ours than four): keys with only our binds # are unbound and bound again; a key that also has a user's bind is left alone and reported ours='"description":"Keyboard: next layout"' -{ printf '['; for i in 1 2; do printf '{"modmask":9,"key":"Shift_L","keycode":0,%s},{"modmask":9,"key":"Alt_L","keycode":0,%s},' "$ours" "$ours" - printf '{"modmask":5,"key":"Shift_L","keycode":0,%s},{"modmask":5,"key":"Control_L","keycode":0,%s},{"modmask":0,"key":"","keycode":66,%s},' "$ours" "$ours" "$ours"; done +{ printf '['; for i in 1 2; do printf '{"modmask":8,"key":"Shift_L","keycode":0,%s},{"modmask":1,"key":"Alt_L","keycode":0,%s},' "$ours" "$ours" + printf '{"modmask":4,"key":"Shift_L","keycode":0,%s},{"modmask":1,"key":"Control_L","keycode":0,%s},' "$ours" "$ours"; done printf '{"modmask":64,"key":"Return","keycode":0,"description":"Terminal"}]\n'; } > "$tmp/binds.json" : > "$tmp/log" FAKE_BINDS="$tmp/binds.json" run set switch-key alt_shift | grep -q '"switchKey":"alt_shift"' || { echo "FAIL: duplicate cleanup" >&2; exit 1; } -has "$tmp/log" 'pcall(hl.unbind, "ALT + SHIFT + SHIFT_L")' -has "$tmp/log" 'pcall(hl.unbind, "code:66")' +has "$tmp/log" 'pcall(hl.unbind, "ALT + SHIFT_L")' +has "$tmp/log" 'pcall(hl.unbind, "SHIFT + CTRL_L")' has "$tmp/log" 'omamobile_kbd_binds = nil' -sed -i 's/"Terminal"/"Terminal"},{"modmask":9,"key":"SHIFT_L","keycode":0,"description":"Mine"/' "$tmp/binds.json" +sed -i 's/"Terminal"/"Terminal"},{"modmask":8,"key":"SHIFT_L","keycode":0,"description":"Mine"/' "$tmp/binds.json" : > "$tmp/log" FAKE_BINDS="$tmp/binds.json" run set switch-key alt_shift | grep -q 'did not take it live' || { echo "FAIL: a user's bind on the key is reported" >&2; exit 1; } hasnt "$tmp/log" 'unbind' diff --git a/packages/omamobile-shell/bin/omamobile-keyboard-switch b/packages/omamobile-shell/bin/omamobile-keyboard-switch index d762241c7..3082fa761 100755 --- a/packages/omamobile-shell/bin/omamobile-keyboard-switch +++ b/packages/omamobile-shell/bin/omamobile-keyboard-switch @@ -7,8 +7,9 @@ omamobile-keyboard-switch lock layout 0 on every real keyboard (lock screen, polkit prompt: passwords are typed in layout 0) -The switch key the Settings page picks is a Hyprland bind running `next` -(~/.config/hypr/omamobile-keyboard.lua, loaded by phone.lua). +The switch key itself does not run this: Alt+Shift and Ctrl+Shift run +`hyprctl switchxkblayout current next` and Caps Lock is xkb grp:caps_toggle +(see omamobile-settings/backends/keyboard.sh). `next` is kept for scripts. Real keyboards are the ones in `hyprctl -j devices` that are not squeekboard's or another virtual keyboard (hl-virtual-keyboard*) or a pseudo-keyboard @@ -98,8 +99,8 @@ def switch(n, kbs): subprocess.run([HYPRCTL, "--batch", "; ".join(cmds)], stdout=subprocess.DEVNULL) -def to(n): - kbs = keyboards() +def to(n, kbs=None): + kbs = keyboards() if kbs is None else kbs kb = main_kb(kbs) if kb is None: return @@ -113,9 +114,10 @@ def to(n): def main(argv): find_hypr() if argv[:1] == ["next"]: - kb = main_kb(keyboards()) + kbs = keyboards() + kb = main_kb(kbs) i = kb.get("active_layout_index", 0) if kb else 0 - to((i if isinstance(i, int) else 0) + 1) + to((i if isinstance(i, int) else 0) + 1, kbs) elif argv[:1] == ["set"] and len(argv) == 2 and argv[1].isdigit(): to(int(argv[1])) elif argv[:1] == ["lock"]: diff --git a/packages/omamobile-shell/hypr/phone.lua b/packages/omamobile-shell/hypr/phone.lua index 3747f62ef..cbc12625a 100644 --- a/packages/omamobile-shell/hypr/phone.lua +++ b/packages/omamobile-shell/hypr/phone.lua @@ -249,15 +249,16 @@ elseif o.cmd_present("voxtype") then end -- The hardware keyboard's layout switch key. Settings > Keyboard writes --- omamobile-keyboard.lua: every switch key bound once (on every keyboard but --- squeekboard's, to `omamobile-keyboard-switch next`), only the chosen one --- enabled. With no file yet, the same binds with Alt+Shift on (keep in step --- with bind_lua in omamobile-settings/backends/keyboard.sh; test/all checks). --- Alt+Shift and Ctrl+Shift fire on release and consume nothing, so --- Alt+Shift+Tab or Ctrl+Shift+C still do their own thing. With one layout --- the switch does nothing. An xkb grp: option never switched on the phone --- (Hyprland 0.57.0). The handle table is reset here: a config load drops --- every bind. pcall: a bad file must not stop the rest of the config. +-- omamobile-keyboard.lua: the Alt+Shift and Ctrl+Shift press binds (both key +-- orders, every keyboard but squeekboard's, running `hyprctl switchxkblayout +-- current next`), only the chosen pair enabled. With no file yet, the same +-- binds with Alt+Shift on (keep in step with bind_lua in +-- omamobile-settings/backends/keyboard.sh; its test checks). Press, not +-- release: on the phone (Hyprland 0.57.0) release binds missed 9 of 17. Not +-- consumed; Alt+Shift+Tab also switches. Caps Lock is xkb grp:caps_toggle in +-- kb_options, not a bind (a code:66 bind never fired). The handle table is +-- reset here: a config load drops every bind. pcall: a bad file must not +-- stop the rest of the config. omamobile_kbd_binds = nil local kbd_binds = (os.getenv("XDG_CONFIG_HOME") or ((os.getenv("HOME") or "") .. "/.config")) .. "/hypr/omamobile-keyboard.lua" local kbd_file = io.open(kbd_binds, "r") @@ -269,13 +270,11 @@ if not omamobile_kbd_binds then omamobile_kbd_binds = {} local not_squeekboard = { inclusive = false, list = { "hl-virtual-keyboard-squeekboard" } } for _, b in ipairs({ - { "alt_shift", "ALT + SHIFT + SHIFT_L", true }, { "alt_shift", "SHIFT + ALT + ALT_L", true }, - { "ctrl_shift", "CTRL + SHIFT + SHIFT_L", true }, { "ctrl_shift", "SHIFT + CTRL + CTRL_L", true }, - { "caps", "code:66", false }, + { "alt_shift", "ALT + SHIFT_L" }, { "alt_shift", "SHIFT + ALT_L" }, + { "ctrl_shift", "CTRL + SHIFT_L" }, { "ctrl_shift", "SHIFT + CTRL_L" }, }) do - local opts = { description = "Keyboard: next layout", device = not_squeekboard } - if b[3] then opts.release = true; opts.non_consuming = true end - local ok, h = pcall(hl.bind, b[2], hl.dsp.exec_cmd("omamobile-keyboard-switch next"), opts) + local opts = { description = "Keyboard: next layout", device = not_squeekboard, non_consuming = true } + local ok, h = pcall(hl.bind, b[2], hl.dsp.exec_cmd("hyprctl switchxkblayout current next"), opts) if ok and h then omamobile_kbd_binds[#omamobile_kbd_binds + 1] = { b[1], h } if b[1] ~= "alt_shift" then pcall(function() h:set_enabled(false) end) end diff --git a/packages/omamobile-shell/test/phone-rules.lua b/packages/omamobile-shell/test/phone-rules.lua index 3acaf637f..d60f8b3eb 100644 --- a/packages/omamobile-shell/test/phone-rules.lua +++ b/packages/omamobile-shell/test/phone-rules.lua @@ -164,18 +164,18 @@ end check(#find("ALT + TAB") == 2 and find("ALT + TAB")[1].dispatcher.dsp == "cycle_next", "Alt + Tab keeps both of Omarchy's actions") local f9 = find("F9", true) check(#f9 == 1 and f9[1].dispatcher == "voxtype record stop", "F9 still stops Voxtype on release") --- The layout switch key with no Settings file: Alt+Shift on release, nothing consumed, the --- other switch keys bound but off (HOME points at a directory without the file) +-- The layout switch key with no Settings file: Alt+Shift on press, nothing consumed, Ctrl+Shift +-- bound but off, no Caps Lock bind (xkb does caps) (HOME points at a directory without the file) local on, off = {}, 0 for _, b in ipairs(binds) do - if b.dispatcher == "omamobile-keyboard-switch next" then + if b.dispatcher == "hyprctl switchxkblayout current next" then if b.enabled then on[#on + 1] = b else off = off + 1 end end end -check(#on == 2 and off == 3, "the default switch binds: two on, three off") +check(#on == 2 and off == 2, "the default switch binds: two on, two off") for _, b in ipairs(on) do - check(b.keys:find("^ALT %+ SHIFT %+ SHIFT_L$") or b.keys:find("^SHIFT %+ ALT %+ ALT_L$"), "Alt+Shift by default: " .. b.keys) - check(b.opts.release == true and b.opts.non_consuming == true and device_is(b, false), "on release, not consumed, not squeekboard's") + check(b.keys:find("^ALT %+ SHIFT_L$") or b.keys:find("^SHIFT %+ ALT_L$"), "Alt+Shift by default: " .. b.keys) + check(b.opts.release ~= true and b.opts.non_consuming == true and device_is(b, false), "on press, not consumed, not squeekboard's") end os.exit(failed and 1 or 0) From e8b5300846745051a02df9fc64a86a99ffb82fd9 Mon Sep 17 00:00:00 2001 From: Lef Date: Tue, 17 Nov 2026 22:21:30 +0200 Subject: [PATCH 14/19] keyboard: put compose:caps back when caps lets go of the switch key, only if it was there --- .../omamobile-settings/backends/keyboard.sh | 25 ++++++++++++++++--- .../test/keyboard-backend.sh | 16 +++++++++++- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/packages/omamobile-settings/backends/keyboard.sh b/packages/omamobile-settings/backends/keyboard.sh index 67f8a5f36..c236b93da 100755 --- a/packages/omamobile-settings/backends/keyboard.sh +++ b/packages/omamobile-settings/backends/keyboard.sh @@ -25,7 +25,8 @@ # first entry is not a Latin layout is refused (passwords on the lock screen are typed in layout 1). # input.lua is edited in place: only the last live kb_layout, kb_variant and kb_options strings inside an # `input = { }` table change (per-device blocks and variables are left alone), comments and every other -# option stays but grp:, grp_led:caps (set only with caps) and compose:caps with caps, a copy of the old +# option stays but grp:, grp_led:caps (set only with caps) and compose:caps with caps +# (put back when caps lets go, only if it was there: "-- compose-caps: restore" in the bind file), a copy of the old # file goes to input.lua.bak-omamobile first, and the write is dropped if the file changed meanwhile. # A file with no live kb_layout (Omarchy's stock one has them only in comments) gets one hl.config() block # appended at the end; get then reports Hyprland's effective values. @@ -217,6 +218,14 @@ def active(): i = pick[0].get("active_layout_index") return i if isinstance(i, int) and i >= 0 else None +def compose_marked(): + """True when the file says compose:caps was in kb_options before caps took the key.""" + try: + with open(BINDS, encoding="utf-8", errors="replace") as f: + return any(re.fullmatch(r"-- compose-caps: restore\s*", line) for line in f) + except OSError: + return False + def stored_key(): """The file's choice; with no file, phone.lua binds the default (Alt+Shift), so that is the truth.""" try: @@ -249,9 +258,9 @@ def bind_lua(name): % name) return lua -def write_binds(name): +def write_binds(name, compose=False): text = ("-- Written by Omarchy Mobile Settings (Keyboard), loaded by phone.lua. Changes here are replaced.\n" - "-- switch-key: %s\n" % name) + bind_lua(name) + "-- switch-key: %s\n" % name + ("-- compose-caps: restore\n" if compose else "")) + bind_lua(name) tmp = "%s.tmp-omamobile.%d" % (BINDS, os.getpid()) try: os.makedirs(os.path.dirname(BINDS), exist_ok=True) @@ -525,7 +534,15 @@ if key == "layouts": else: sw = value old_options = options +# compose:caps goes while caps holds the key; the marker brings it back when caps lets go, and only then +was_caps = "grp:caps_toggle" in options +if sw == "caps": + compose = "compose:caps" in options or (was_caps and compose_marked()) +else: + compose = False options = switch_options(options, sw) +if sw != "caps" and was_caps and compose_marked() and "compose:caps" not in options: + options = options + ["compose:caps"] live_ok = osk_ok = True if key == "layouts" or options != old_options: new = {"kb_layout": ",".join(layouts), "kb_options": ",".join(options)} @@ -536,7 +553,7 @@ if key == "layouts" or options != old_options: write(data, st, text, found, new) osk_ok = key != "layouts" or sync_osk(old_names, lst_names(layouts, variants)) live_ok = apply_live(layouts, variants, options) -if not write_binds(sw): +if not write_binds(sw, compose): fail("cannot write " + os.path.basename(BINDS)) live_ok = apply_binds(sw) and live_ok if not live_ok: diff --git a/packages/omamobile-settings/test/keyboard-backend.sh b/packages/omamobile-settings/test/keyboard-backend.sh index 7c5e761db..ce38141f7 100755 --- a/packages/omamobile-settings/test/keyboard-backend.sh +++ b/packages/omamobile-settings/test/keyboard-backend.sh @@ -132,10 +132,24 @@ eq "$(run get | grep -o '"switchKey":"[^"]*"')" '"switchKey":"caps"' # a layouts change keeps caps eq "$(run set layouts us,gr:polytonic | grep -o '"switchKey":"[^"]*"')" '"switchKey":"caps"' has "$tmp/input.lua" 'kb_options = "grp:caps_toggle,grp_led:caps", -- keep me' -# away from caps: both options go +has "$b" '-- compose-caps: restore' +# away from caps: both options go, compose:caps (there before caps) comes back eq "$(run set switch-key none | grep -o '"switchKey":"[^"]*"')" '"switchKey":"none"' has "$b" 'set_enabled(b[1] == "none")' has "$b" '-- switch-key: none' +hasnt "$b" 'compose-caps' +has "$tmp/input.lua" 'kb_options = "compose:caps", -- keep me' +# caps then alt_shift restores compose:caps too +run set switch-key caps >/dev/null +has "$tmp/input.lua" 'kb_options = "grp:caps_toggle,grp_led:caps", -- keep me' +run set switch-key alt_shift >/dev/null +has "$tmp/input.lua" 'kb_options = "compose:caps", -- keep me' +hasnt "$b" 'compose-caps' +# a user without compose:caps never gets it +sed -i 's/kb_options = "compose:caps", -- keep me/kb_options = "", -- keep me/' "$tmp/input.lua" +run set switch-key caps >/dev/null +hasnt "$b" 'compose-caps' +run set switch-key ctrl_shift >/dev/null has "$tmp/input.lua" 'kb_options = "", -- keep me' run set switch-key alt_shift >/dev/null # one layout left: the binds stay (switchxkblayout next does nothing then); the variant goes From 1cf3fb333a523a693160fe96ca0a610084927d1d Mon Sep 17 00:00:00 2001 From: Lef Date: Tue, 17 Nov 2026 22:36:34 +0200 Subject: [PATCH 15/19] keyboard: no default switch binds under an xkb grp: option, keep the compose marker on a failed write phone.lua reads input:kb_options with hl.get_config and leaves every default Alt+Shift/Ctrl+Shift bind off when it has a grp: switch, so one press doesn't switch twice; get reports none then. keyboard.sh puts the compose-caps marker on disk before input.lua loses compose:caps. Tests for both, known limits in the header. --- .../omamobile-settings/backends/keyboard.sh | 15 +++++++++- .../test/keyboard-backend.sh | 30 +++++++++++++++++-- packages/omamobile-shell/hypr/phone.lua | 14 ++++++++- packages/omamobile-shell/test/all | 6 +++- .../omamobile-shell/test/phone-dictation.lua | 21 +++++++++++-- 5 files changed, 79 insertions(+), 7 deletions(-) diff --git a/packages/omamobile-settings/backends/keyboard.sh b/packages/omamobile-settings/backends/keyboard.sh index c236b93da..1e141dd99 100755 --- a/packages/omamobile-settings/backends/keyboard.sh +++ b/packages/omamobile-settings/backends/keyboard.sh @@ -11,7 +11,8 @@ # ~/.config/hypr/omamobile-keyboard.lua, that phone.lua loads: its "-- switch-key: NAME" line is the # choice. Both pairs are bound once (both key orders, on every keyboard but squeekboard's) and only # the chosen one is enabled. With no file, phone.lua binds the same set with Alt+Shift on, so "get" -# reports alt_shift then, or caps when grp:caps_toggle is in the effective kb_options. The same Lua +# reports alt_shift then, or caps when grp:caps_toggle is in the effective kb_options (none for any other grp:, +# which keeps phone.lua's default binds off). The same Lua # is applied live with `hyprctl eval`. # Prints one line of JSON. # keyboard.sh get {"layouts":[{"layout":"us","variant":""}],"switchKey":"alt_shift","active":0} @@ -37,6 +38,8 @@ # (only ones squeekboard has a layout file for, when that directory exists); removed ones are dropped. # A switch-key change does not touch gsettings. Switching layouts never writes gsettings either (that made # squeekboard send its keymap again, and the app got Latin letters while Hyprland said Greek). +# Known limits: `current` switches only the main/last keyboard when two real keyboards are connected. +# A bind file from earlier unreleased commits of this branch keeps its old binds until the next save. # Test hooks (nothing in the environment sets them): OMAMOBILE_KBD_INPUT is the input.lua path, # OMAMOBILE_KBD_BINDS the generated bind file, # OMAMOBILE_KBD_RULES the xkb rules .lst file, OMAMOBILE_KEYBOARDS_DIR squeekboard's layout files; the test puts a fake hyprctl and gsettings first on PATH. @@ -325,6 +328,8 @@ def switch_key(options): """caps lives in kb_options, the rest in the bind file; a caps file without the option is none.""" if "grp:caps_toggle" in options: return "caps" + if not os.path.exists(BINDS) and any(o.startswith("grp:") for o in options): + return "none" # phone.lua keeps its default binds off under an xkb grp: switch sw = stored_key() return "none" if sw == "caps" else sw @@ -531,6 +536,8 @@ if "kb_options" not in found: if key == "layouts": layouts, variants = new_l, new_v sw = switch_key(options) + if sw == "none" and not os.path.exists(BINDS): + sw = DEFAULT_KEY # the grp: option goes below, so Alt+Shift takes over as before else: sw = value old_options = options @@ -543,6 +550,12 @@ else: options = switch_options(options, sw) if sw != "caps" and was_caps and compose_marked() and "compose:caps" not in options: options = options + ["compose:caps"] +# The marker goes to disk before input.lua loses compose:caps, so a failed write in between can't lose it: +# first the old choice plus the marker (harmless while caps is not on), the new choice after input.lua. +# Leaving caps, input.lua gets compose:caps back first, then the marker goes. +if compose and not compose_marked(): + if not write_binds(switch_key(old_options), True): + fail("cannot write " + os.path.basename(BINDS)) live_ok = osk_ok = True if key == "layouts" or options != old_options: new = {"kb_layout": ",".join(layouts), "kb_options": ",".join(options)} diff --git a/packages/omamobile-settings/test/keyboard-backend.sh b/packages/omamobile-settings/test/keyboard-backend.sh index ce38141f7..79ef4f273 100755 --- a/packages/omamobile-settings/test/keyboard-backend.sh +++ b/packages/omamobile-settings/test/keyboard-backend.sh @@ -77,8 +77,8 @@ hl.config({ }) EOT chmod 640 "$tmp/input.lua" -# no bind file yet: phone.lua binds the default, Alt+Shift -eq "$(run get)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"alt_shift","active":1}' +# no bind file yet, but kb_options has grp:alt_shift_toggle: phone.lua keeps its default binds off +eq "$(run get)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"none","active":1}' : > "$tmp/log" eq "$(run set layouts us,gr:polytonic)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"alt_shift","active":1}' @@ -212,6 +212,32 @@ printf 'hl.config({\n input = {\n kb_layout = "us,gr",\n },\n})\n' > "$tmp/ # grp:caps_toggle in Hyprland's effective kb_options: get says caps whatever the file says eq "$(FAKE_OPTIONS=grp:caps_toggle,grp_led:caps run get | grep -o '"switchKey":"[^"]*"')" '"switchKey":"caps"' +# no bind file and another grp: in kb_options: phone.lua keeps its binds off, so get says none; +# a layouts save then drops the grp: option and Alt+Shift takes over as before +rm -f "$b" +eq "$(FAKE_OPTIONS=grp:alt_shift_toggle run get | grep -o '"switchKey":"[^"]*"')" '"switchKey":"none"' +eq "$(FAKE_OPTIONS=compose:caps,grp:win_space_toggle run set layouts us,gr | grep -o '"switchKey":"[^"]*"')" '"switchKey":"alt_shift"' +has "$tmp/input.lua" ' kb_options = "compose:caps",' +# input.lua cannot be written while caps takes compose:caps: the marker is already on disk, compose:caps stays +printf 'hl.config({\n input = {\n kb_layout = "us,gr",\n kb_options = "compose:caps",\n },\n})\n' > "$tmp/input.lua" +run set switch-key ctrl_shift >/dev/null +hasnt "$b" 'compose-caps' +mkdir -p "$tmp/ro"; mv "$tmp/input.lua" "$tmp/ro/input.lua"; ln -s "$tmp/ro/input.lua" "$tmp/input.lua" +touch "$tmp/ro/input.lua.lock-omamobile"; chmod 555 "$tmp/ro" # the lock opens, the backup copy cannot be made +run set switch-key caps | grep -q error || { echo "FAIL: an unwritable input.lua is not reported" >&2; exit 1; } +chmod 755 "$tmp/ro"; chmod 644 "$tmp/ro/input.lua" +has "$tmp/ro/input.lua" ' kb_options = "compose:caps",' +has "$b" '-- compose-caps: restore' +has "$b" '-- switch-key: ctrl_shift' +eq "$(run get | grep -o '"switchKey":"[^"]*"')" '"switchKey":"ctrl_shift"' +# the retry goes through and later leaving caps brings compose:caps back +run set switch-key caps >/dev/null +has "$tmp/ro/input.lua" 'kb_options = "grp:caps_toggle,grp_led:caps",' +run set switch-key alt_shift >/dev/null +has "$tmp/ro/input.lua" 'kb_options = "compose:caps",' +hasnt "$b" 'compose-caps' +rm "$tmp/input.lua"; mv "$tmp/ro/input.lua" "$tmp/input.lua" + # bad input never reaches the file cp "$tmp/input.lua" "$tmp/before" eq "$(run set layouts us,gr,de,ru,us:intl)" '{"error":"give 1 to 4 layouts"}' diff --git a/packages/omamobile-shell/hypr/phone.lua b/packages/omamobile-shell/hypr/phone.lua index cbc12625a..8b077c8c5 100644 --- a/packages/omamobile-shell/hypr/phone.lua +++ b/packages/omamobile-shell/hypr/phone.lua @@ -266,8 +266,20 @@ if kbd_file then kbd_file:close() pcall(dofile, kbd_binds) end +-- An xkb grp: switch already in kb_options (the owner's own, say +-- grp:caps_toggle) keeps every default bind off, or one press would switch +-- twice; keyboard.sh's switch_key then reports caps or none the same way. +-- Read with hl.get_config("input:kb_options"): Hyprland 0.57's Lua API has +-- it (src/config/lua/bindings/LuaBindingsConfigRules.cpp, hlGetConfig) and it +-- returns the value as parsed so far, which includes input.lua (hyprland.lua +-- requires hypr.input before hypr.looknfeel, which loads this file). +local function kb_has_grp() + local ok, v = pcall(function() return hl.get_config("input:kb_options") end) + return ok and type(v) == "string" and v:find("grp:", 1, true) ~= nil +end if not omamobile_kbd_binds then omamobile_kbd_binds = {} + local grp = kb_has_grp() local not_squeekboard = { inclusive = false, list = { "hl-virtual-keyboard-squeekboard" } } for _, b in ipairs({ { "alt_shift", "ALT + SHIFT_L" }, { "alt_shift", "SHIFT + ALT_L" }, @@ -277,7 +289,7 @@ if not omamobile_kbd_binds then local ok, h = pcall(hl.bind, b[2], hl.dsp.exec_cmd("hyprctl switchxkblayout current next"), opts) if ok and h then omamobile_kbd_binds[#omamobile_kbd_binds + 1] = { b[1], h } - if b[1] ~= "alt_shift" then pcall(function() h:set_enabled(false) end) end + if grp or b[1] ~= "alt_shift" then pcall(function() h:set_enabled(false) end) end end end end diff --git a/packages/omamobile-shell/test/all b/packages/omamobile-shell/test/all index 82bb1723d..f1f1748b9 100755 --- a/packages/omamobile-shell/test/all +++ b/packages/omamobile-shell/test/all @@ -1045,9 +1045,13 @@ if [[ -n $lua ]]; then printf 'if o.dictation_installed and o.dictation_installed() then\n o.bind_hold("F9", "Start dictation (push-to-talk)", "omarchy-dictation start", "Stop dictation (push-to-talk)", "omarchy-dictation stop")\nend\n' > "$dk/migrated/.config/hypr/bindings.lua" printf 'o.bind("F9", "My own key", "my-own-command")\n' > "$dk/own/.config/hypr/bindings.lua" for sc in installed:plain migrated:migrated own-f9:own none:plain; do - out=$(SCENARIO=${sc%%:*} HOME=$dk/${sc##*:} "$lua" test/phone-dictation.lua) || { grep -v '^ok' <<<"$out"; rm -rf "$dk"; fail "phone.lua dictation keys (${sc%%:*})"; } + out=$(SCENARIO=${sc%%:*} HOME=$dk/${sc##*:} env -u XDG_CONFIG_HOME "$lua" test/phone-dictation.lua) || { grep -v '^ok' <<<"$out"; rm -rf "$dk"; fail "phone.lua dictation keys (${sc%%:*})"; } + done + for kbo in grp:caps_toggle,grp_led:caps compose:caps,grp:alt_shift_toggle; do + out=$(SCENARIO=installed HOME=$dk/plain KB_OPTIONS=$kbo env -u XDG_CONFIG_HOME "$lua" test/phone-dictation.lua) || { grep -v '^ok' <<<"$out"; rm -rf "$dk"; fail "phone.lua switch key with kb_options $kbo"; } done rm -rf "$dk" + pass "phone.lua: with no bind file Alt+Shift switches, and no default bind does when kb_options has a grp: switch" pass "phone.lua on Omarchy 4.5: Alt + Space and the migration's F9 are for hardware keyboards; the owner's own F9 is left alone" else pass "phone.lua window rules # SKIP no lua" diff --git a/packages/omamobile-shell/test/phone-dictation.lua b/packages/omamobile-shell/test/phone-dictation.lua index dce538950..871749932 100644 --- a/packages/omamobile-shell/test/phone-dictation.lua +++ b/packages/omamobile-shell/test/phone-dictation.lua @@ -11,6 +11,7 @@ local scenario = os.getenv("SCENARIO") local noop = function() end local binds = {} +local kbd = {} local function dsp(name) return function(arg) return { dsp = name, arg = arg } end end hl = { config = noop, window_rule = noop, layer_rule = noop, device = noop, @@ -21,8 +22,15 @@ hl = { end, dsp = { window = { cycle_next = dsp("cycle_next"), bring_to_top = dsp("bring_to_top") }, focus = dsp("focus"), exec_cmd = function(c) return c end }, - -- the layout switch key's binds (not checked here) - bind = function() return { set_enabled = noop } end, + -- the layout switch key's default binds (no omamobile-keyboard.lua in these homes); KB_OPTIONS + -- stands for Hyprland's effective input:kb_options + bind = function(keys) + local h = { keys = keys, on = true } + h.set_enabled = function(self, v) self.on = v end + kbd[#kbd + 1] = h + return h + end, + get_config = function(k) return k == "input:kb_options" and (os.getenv("KB_OPTIONS") or "") or nil end, } o = { bind = function(keys, description, dispatcher, opts) @@ -75,4 +83,13 @@ else check(#f9 == 1 and f9[1].dispatcher == "my-own-command" and f9[1].opts.device == nil, "the owner's own F9 bind is left as it is") end end +local kb_on = {} +for _, h in ipairs(kbd) do if h.on then kb_on[#kb_on + 1] = h.keys end end +table.sort(kb_on) +if (os.getenv("KB_OPTIONS") or ""):find("grp:", 1, true) then + check(#kbd == 4 and #kb_on == 0, "an xkb grp: switch in kb_options keeps every default switch bind off") +else + check(#kbd == 4 and table.concat(kb_on, " ") == "ALT + SHIFT_L SHIFT + ALT_L", + "with no bind file only Alt+Shift (both key orders) switches the layout") +end os.exit(failed and 1 or 0) From 4026826caaab438a3d7d4bfbb34b7c7faec436fc Mon Sep 17 00:00:00 2001 From: Lef Date: Wed, 18 Nov 2026 11:58:53 +0200 Subject: [PATCH 16/19] keyboard: switch keys through xkb only On the 8 Pro (Hyprland 0.57.0-3.2, Dell KB7120W, 2026-11-18) grp:alt_shift_toggle switched 20/20 in both key orders, 1-2 ms after the second key, and grp:ctrl_shift_toggle 19/19; an Alt+Shift press bind on top of the option switched twice per press. So every switch key is a grp: option in kb_options (caps stays grp:caps_toggle,grp_led:caps with the compose:caps marker) and phone.lua binds nothing. get reads the choice from the effective kb_options; a fresh phone has no grp: option until one is picked. The old bind file is no longer loaded; while there is no grp: option get reports its choice and the next save writes it as xkb (old binds stay until hyprctl reload). A save that needs Hyprland's effective kb_layout/kb_options writes nothing when getoption fails. --- .../omamobile-settings/app/KeyboardPage.qml | 4 +- .../omamobile-settings/backends/keyboard.sh | 266 ++++++++---------- .../test/keyboard-backend.sh | 237 ++++++++-------- .../bin/omamobile-keyboard-switch | 8 +- packages/omamobile-shell/hypr/phone.lua | 51 +--- packages/omamobile-shell/test/all | 6 +- .../omamobile-shell/test/phone-dictation.lua | 14 +- packages/omamobile-shell/test/phone-rules.lua | 18 +- 8 files changed, 258 insertions(+), 346 deletions(-) diff --git a/packages/omamobile-settings/app/KeyboardPage.qml b/packages/omamobile-settings/app/KeyboardPage.qml index 5fc544ec2..fd75daba0 100644 --- a/packages/omamobile-settings/app/KeyboardPage.qml +++ b/packages/omamobile-settings/app/KeyboardPage.qml @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // Keyboard layouts (up to 4) and the hardware switch key, through backends/keyboard.sh. Each change is -// saved and applied at once; new layouts are added to the on-screen keyboard's list, and the switch key is a Hyprland bind. +// saved and applied at once; new layouts are added to the on-screen keyboard's list, and the switch key is an xkb grp: option in kb_options. import QtQuick import QtQuick.Controls import QtQuick.Layouts @@ -136,7 +136,7 @@ Flickable { visible: page.layouts.length > 1 Layout.fillWidth: true; spacing: 8 Repeater { - // From `keyboard.sh list`: Alt+Shift, Ctrl+Shift, Caps Lock, None (Alt/Ctrl+Shift are Hyprland binds, Caps Lock is xkb grp:caps_toggle) + // From `keyboard.sh list`: Alt+Shift, Ctrl+Shift, Caps Lock, None (grp:alt_shift_toggle, grp:ctrl_shift_toggle, grp:caps_toggle, no grp:) model: page.switchKeys delegate: SettingsButton { required property var modelData diff --git a/packages/omamobile-settings/backends/keyboard.sh b/packages/omamobile-settings/backends/keyboard.sh index 1e141dd99..91e8a9d25 100755 --- a/packages/omamobile-settings/backends/keyboard.sh +++ b/packages/omamobile-settings/backends/keyboard.sh @@ -3,22 +3,21 @@ # Keyboard layouts for the Settings app. The hardware keyboard's layouts live in Omarchy's user file # ~/.config/hypr/input.lua (kb_layout, kb_variant); the on-screen keyboard's list is gsettings # org.gnome.desktop.input-sources sources, and a layouts change adds new ones there too. -# The switch key (measured on the phone, Hyprland 0.57.0, Dell BT keyboard, 2026-11-17): -# Alt+Shift and Ctrl+Shift are Hyprland press binds running `hyprctl switchxkblayout current next` -# (11/11 switched, 14-35 ms after the second key went down). Caps Lock is xkb grp:caps_toggle with -# grp_led:caps in kb_options (12/12, 1-3 ms); a Hyprland bind on code:66 never fired, and -# grp:alt_shift_toggle only worked in one key order. The binds live in a generated file, -# ~/.config/hypr/omamobile-keyboard.lua, that phone.lua loads: its "-- switch-key: NAME" line is the -# choice. Both pairs are bound once (both key orders, on every keyboard but squeekboard's) and only -# the chosen one is enabled. With no file, phone.lua binds the same set with Alt+Shift on, so "get" -# reports alt_shift then, or caps when grp:caps_toggle is in the effective kb_options (none for any other grp:, -# which keeps phone.lua's default binds off). The same Lua -# is applied live with `hyprctl eval`. +# The switch key is pure xkb, a grp: option in kb_options, never a Hyprland bind (measured on the phone, +# Hyprland 0.57.0-3.2, Dell KB7120W over Bluetooth): alt_shift = grp:alt_shift_toggle (20/20 on 2026-11-18, +# both key orders, 1-2 ms after the second key), ctrl_shift = grp:ctrl_shift_toggle (19/19, both orders), +# caps = grp:caps_toggle,grp_led:caps (12/12, 1-3 ms, 2026-11-17), none = no grp: option. Press binds on +# top of the xkb option switched twice per press, so phone.lua binds nothing. "get" reads the choice from +# the effective kb_options; any other grp: option (Omarchy's grp:alts_toggle for a non-Latin layout, say) +# reports none, and only a switch-key save replaces it. On a fresh phone nothing switches the hardware +# layout until a key is picked here, unless Omarchy's input.lua already sets a grp: option (it does not +# with Latin layouts only). omamobile-keyboard-switch exists but nothing calls it yet (not the +# quick-settings card either). # Prints one line of JSON. # keyboard.sh get {"layouts":[{"layout":"us","variant":""}],"switchKey":"alt_shift","active":0} # keyboard.sh list {"layouts":[{"layout":"us","name":"English (US)"}],"switchKeys":[...]} # keyboard.sh set layouts us,gr[:variant] 1 to 4 layouts, each a name (and variant) in the xkb rules list -# keyboard.sh set switch-key NAME alt_shift, ctrl_shift, caps or none (default alt_shift) +# keyboard.sh set switch-key NAME alt_shift, ctrl_shift, caps or none # "active" is the index Hyprland reports for the main real keyboard, or null without one. Real = not # hl-virtual-keyboard* and not a pseudo-keyboard (consumer-control, power-button, video-bus, radio-control, # gpio-keys); main = the real one Hyprland marks main, else the first real one with more than one layout, @@ -26,8 +25,9 @@ # first entry is not a Latin layout is refused (passwords on the lock screen are typed in layout 1). # input.lua is edited in place: only the last live kb_layout, kb_variant and kb_options strings inside an # `input = { }` table change (per-device blocks and variables are left alone), comments and every other -# option stays but grp:, grp_led:caps (set only with caps) and compose:caps with caps -# (put back when caps lets go, only if it was there: "-- compose-caps: restore" in the bind file), a copy of the old +# option stays but, on a switch-key save, grp:, grp_led:caps (set only with caps) and compose:caps with caps +# (put back when caps lets go, only if it was there: "-- compose-caps: restore" in a small state file, +# ~/.config/hypr/omamobile-keyboard.lua, which nothing loads; it is removed when not needed), a copy of the old # file goes to input.lua.bak-omamobile first, and the write is dropped if the file changed meanwhile. # A file with no live kb_layout (Omarchy's stock one has them only in comments) gets one hl.config() block # appended at the end; get then reports Hyprland's effective values. @@ -38,10 +38,16 @@ # (only ones squeekboard has a layout file for, when that directory exists); removed ones are dropped. # A switch-key change does not touch gsettings. Switching layouts never writes gsettings either (that made # squeekboard send its keymap again, and the app got Latin letters while Hyprland said Greek). -# Known limits: `current` switches only the main/last keyboard when two real keyboards are connected. -# A bind file from earlier unreleased commits of this branch keeps its old binds until the next save. +# Known limits: xkb keeps a layout per keyboard, so with two real keyboards the switch key moves only the +# one it was pressed on (UNVERIFIED on the phone, only one keyboard tested). +# A bind file from earlier unreleased commits of this branch ("-- switch-key: alt_shift" or ctrl_shift) +# is no longer loaded. While kb_options has no grp: option, get reports its choice and the next save +# writes the matching grp: option and removes the file. Binds it registered stay in Hyprland until +# `hyprctl reload` (or a new login). +# When input.lua has no live kb_layout or kb_options, a save needs Hyprland's effective value; if +# `hyprctl getoption` fails, nothing is written. # Test hooks (nothing in the environment sets them): OMAMOBILE_KBD_INPUT is the input.lua path, -# OMAMOBILE_KBD_BINDS the generated bind file, +# OMAMOBILE_KBD_BINDS the state file, # OMAMOBILE_KBD_RULES the xkb rules .lst file, OMAMOBILE_KEYBOARDS_DIR squeekboard's layout files; the test puts a fake hyprctl and gsettings first on PATH. set -euo pipefail set +x @@ -75,22 +81,15 @@ import fcntl, hashlib, json, os, re, shutil, subprocess, sys KEYS = ("kb_layout", "kb_variant", "kb_options") NAME_RE = re.compile(r"[a-z][a-z0-9_-]{0,31}") -# Switch keys: each name binds these key strings (both orders, so either key can go down first). -# Press binds, not release ones: release binds fired only when Shift came up before Alt (8 of 17) -# and ~110 ms late. non_consuming, so the keys still reach apps. Known cost: Alt+Shift+Tab (and -# Ctrl+Shift+C/V) also switch the layout. "caps" has no bind: it is xkb (CAPS_OPTS), and compose:caps -# goes then, as it takes the key. Shift+Caps gives real Caps Lock, but 2 of 4 Shift+Caps presses -# switched the layout instead on the phone (it also had shift:both_capslock_cancel): cause unknown. -SWITCH_KEYS = {"alt_shift": ("ALT + SHIFT_L", "SHIFT + ALT_L"), - "ctrl_shift": ("CTRL + SHIFT_L", "SHIFT + CTRL_L"), - "caps": (), "none": ()} -CAPS_OPTS = ["grp:caps_toggle", "grp_led:caps"] -SWITCH_CMD = "hyprctl switchxkblayout current next" +# Switch keys as xkb options (see the header). caps takes the key, so compose:caps goes with it. Shift+Caps +# gives real Caps Lock, but 2 of 4 Shift+Caps presses switched the layout instead on the phone (it also +# had shift:both_capslock_cancel): cause unknown. +SWITCH_OPTS = {"alt_shift": ["grp:alt_shift_toggle"], "ctrl_shift": ["grp:ctrl_shift_toggle"], + "caps": ["grp:caps_toggle", "grp_led:caps"], "none": []} SWITCH_NAMES = [("alt_shift", "Alt+Shift"), ("ctrl_shift", "Ctrl+Shift"), ("caps", "Caps Lock"), ("none", "None")] -DESC = "Keyboard: next layout" -DEFAULT_KEY = "alt_shift" BINDS = os.environ["KBD_BINDS"] -OPTION_RE = re.compile(r"[a-z0-9_]{1,32}:[A-Za-z0-9_]{1,48}") +# xkb option names as in base.lst: group:name, the name may hold "-" (compose:caps-altgr, fkeys:basic_13-24) +OPTION_RE = re.compile(r"[a-z0-9_]{1,32}:[A-Za-z0-9_][A-Za-z0-9_-]{0,47}") LATIN = {"us", "gb", "de", "fr", "es", "it", "pt", "nl", "be", "ch", "at", "se", "no", "dk", "fi", "is", "ie", "pl", "cz", "sk", "hu", "ro", "hr", "si", "ee", "lv", "lt", "tr", "br", "latam", "ca", "au", "nz", "za", "epo"} @@ -102,7 +101,14 @@ PSEUDO_RE = re.compile(r"hl-virtual-keyboard|.*(consumer-control|power-button|vi def out(obj): print(json.dumps(obj, separators=(",", ":"))) +MARKER_NEW = False # True while a marker this run wrote has no input.lua write behind it yet + def fail(msg): + if MARKER_NEW: + try: + os.unlink(BINDS) # input.lua still has compose:caps, so the marker would be stale + except OSError: + pass out({"error": msg}) sys.exit(2) @@ -229,41 +235,30 @@ def compose_marked(): except OSError: return False -def stored_key(): - """The file's choice; with no file, phone.lua binds the default (Alt+Shift), so that is the truth.""" +def old_key(): + """alt_shift or ctrl_shift from an earlier commit's bind file, else None.""" try: with open(BINDS, encoding="utf-8", errors="replace") as f: for line in f: - m = re.fullmatch(r"-- switch-key: ([a-z_]+)\s*", line) - if m and m.group(1) in SWITCH_KEYS: + m = re.fullmatch(r"-- switch-key: (alt_shift|ctrl_shift)\s*", line) + if m: return m.group(1) except OSError: pass - return DEFAULT_KEY + return None -# The binds as Lua, for the file and for hyprctl eval. Every switch key is bound once per Lua state -# (handles kept in the global omamobile_kbd_binds; phone.lua's default for a phone with no file is the -# same set) and only the chosen one is enabled. A disabled bind is skipped by Hyprland and consumes -# nothing. Nothing is ever hl.unbind-ed on a key string (that would take a user's own bind on the key -# too) or removed by handle (Superwhisper's generated config notes that removing a key's press and -# release handles one by one crashed Hyprland 0.56; set_enabled is what it uses live). The binds stay -# with one layout: switchxkblayout next has nowhere to go then. -def bind_lua(name): - lua = "if not omamobile_kbd_binds then\n omamobile_kbd_binds = {}\n" - for n, keys in SWITCH_KEYS.items(): - for k in keys: - lua += (' omamobile_kbd_binds[#omamobile_kbd_binds + 1] = { "%s", hl.bind("%s", ' - 'hl.dsp.exec_cmd("%s"), { description = "%s", ' - 'device = { inclusive = false, list = { "hl-virtual-keyboard-squeekboard" } }, non_consuming = true }) }\n' - % (n, k, SWITCH_CMD, DESC)) - lua += ('end\n' - 'for _, b in ipairs(omamobile_kbd_binds) do pcall(function() b[2]:set_enabled(b[1] == "%s") end) end\n' - % name) - return lua - -def write_binds(name, compose=False): - text = ("-- Written by Omarchy Mobile Settings (Keyboard), loaded by phone.lua. Changes here are replaced.\n" - "-- switch-key: %s\n" % name + ("-- compose-caps: restore\n" if compose else "")) + bind_lua(name) +def write_state(compose): + """The compose-caps marker on disk when compose, else no state file.""" + if not compose: + try: + os.unlink(BINDS) + except FileNotFoundError: + pass + except OSError: + return False + return True + text = ("-- Written by Omarchy Mobile Settings (Keyboard); nothing loads it. Changes here are replaced.\n" + "-- compose-caps: restore\n") tmp = "%s.tmp-omamobile.%d" % (BINDS, os.getpid()) try: os.makedirs(os.path.dirname(BINDS), exist_ok=True) @@ -280,68 +275,24 @@ def write_binds(name, compose=False): return False return True -MODBITS = {"SHIFT": 1, "CAPS": 2, "CTRL": 4, "CONTROL": 4, "ALT": 8, "MOD2": 16, "MOD3": 32, "SUPER": 64, "MOD5": 128} - -def split_key(k): - parts = [p.strip() for p in k.split("+")] - return sum(MODBITS.get(p.upper(), 0) for p in parts[:-1]), parts[-1] - -def ours_count(): - """How many of our binds Hyprland has, or None when it cannot be read.""" - try: - binds = json.loads(run(["hyprctl", "-j", "binds"]) or "x") - except ValueError: - return None - if not isinstance(binds, list): - return None - return sum(1 for b in binds if isinstance(b, dict) and b.get("description") == DESC), binds - -ALL_KEYS = [k for ks in SWITCH_KEYS.values() for k in ks] - -# Live. UNVERIFIED on the phone: that the omamobile_kbd_binds global survives between `hyprctl eval` -# calls and the config, and set_enabled through eval. When it does not (more of our binds than the -# one set afterwards), a key is hl.unbind-ed only when every bind Hyprland lists on it is ours, and -# the set is bound again; a key that also carries a user's bind is left alone and the save reports -# that it did not apply live (the file applies on the next config load). -def apply_binds(name): - lua = bind_lua(name) - r = run(["hyprctl", "eval", lua]) - if r is None or "error" in r.lower(): - return False - got = ours_count() - if got is None or got[0] == len(ALL_KEYS): - return True - clean = [] - for k in ALL_KEYS: - mods, key = split_key(k) - on = [b for b in got[1] if isinstance(b, dict) and ( - (key.startswith("code:") and b.get("keycode") == int(key[5:]) and not b.get("modmask")) - or (str(b.get("key", "")).lower() == key.lower() and b.get("modmask") == mods))] - if any(b.get("description") != DESC for b in on): - return False - clean.append(k) - r = run(["hyprctl", "eval", "".join('pcall(hl.unbind, "%s")\n' % k for k in clean) - + "omamobile_kbd_binds = nil\n" + lua]) - return r is not None and "error" not in r.lower() - def switch_key(options): - """caps lives in kb_options, the rest in the bind file; a caps file without the option is none.""" - if "grp:caps_toggle" in options: - return "caps" - if not os.path.exists(BINDS) and any(o.startswith("grp:") for o in options): - return "none" # phone.lua keeps its default binds off under an xkb grp: switch - sw = stored_key() - return "none" if sw == "caps" else sw + """The choice, from kb_options alone; any other grp: option is none.""" + for name in ("alt_shift", "ctrl_shift", "caps"): + if SWITCH_OPTS[name][0] in options: + return name + return "none" def switch_options(options, sw): - """kb_options for switch key sw: every grp: and grp_led:caps out, caps' own back in.""" + """kb_options for switch key sw: every grp: and grp_led:caps out, sw's own back in.""" keep = [o for o in options if not o.startswith("grp:") and o != "grp_led:caps"] if sw == "caps": - keep = [o for o in keep if o != "compose:caps"] + CAPS_OPTS - return keep + keep = [o for o in keep if o != "compose:caps"] + return keep + SWITCH_OPTS[sw] def state(layouts, variants, options): sw = switch_key(options) + if sw == "none" and not any(o.startswith("grp:") for o in options): + sw = old_key() or sw return {"layouts": [{"layout": l, "variant": v} for l, v in zip(layouts, variants)], "switchKey": sw, "active": active()} @@ -389,9 +340,12 @@ def write(data, st, text, found, new): indent = re.match(r"[ \t]*", text[ls:]).group(0) le = text.find("\n", anchor[3]) le = len(text) if le < 0 else le - if not re.fullmatch(r"[ \t]*,[ \t]*(--[^\n]*)?", text[anchor[3]:le]): - fail("input.lua: cannot add %s next to kb_layout" % missing[0]) - text = text[:le] + "".join('\n%s%s = "%s",' % (indent, k, new[k]) for k in missing) + text[le:] + if re.fullmatch(r"[ \t]*,[ \t]*(--[^\n]*)?", text[anchor[3]:le]): + text = text[:le] + "".join('\n%s%s = "%s",' % (indent, k, new[k]) for k in missing) + text[le:] + else: + # kb_layout = "us" } on one line: the keys go right after the string, in the same table + text = (text[:anchor[3]] + "".join(', %s = "%s"' % (k, new[k]) for k in missing) + + text[anchor[3]:]) updated = text.encode("utf-8") if updated == data: return @@ -458,21 +412,26 @@ def apply_live(layouts, variants, options): r = run(["hyprctl", "--batch", batch]) return r is not None and "error" not in r.lower() -def effective(key): - s = run(["hyprctl", "-j", "getoption", "input:" + key]) or "" +def effective(key, need): + """Hyprland's value; None when it cannot say (need: fail then, as a save must not guess).""" + s = run(["hyprctl", "-j", "getoption", "input:" + key]) try: v = json.loads(s).get("str", "") - except (ValueError, AttributeError): - v = "" - return v if isinstance(v, str) else "" - -def effective_options(): - return [o for o in fields(effective("kb_options")) if OPTION_RE.fullmatch(o)] - -# No live kb_layout (the stock file): what Hyprland runs with now, "us" when it cannot say. -def effective_layouts(): - lay = [l for l in fields(effective("kb_layout")) if NAME_RE.fullmatch(l)] or ["us"] - var = fields(effective("kb_variant")) + except (TypeError, ValueError, AttributeError): + v = None + if not isinstance(v, str): + v = None + if v is None and need: + fail("cannot read Hyprland's input:%s, nothing written" % key) + return v + +def effective_options(need=False): + return [o for o in fields(effective("kb_options", need) or "") if OPTION_RE.fullmatch(o)] + +# No live kb_layout (the stock file): what Hyprland runs with now; get says "us" when it cannot say. +def effective_layouts(need=False): + lay = [l for l in fields(effective("kb_layout", need) or "") if NAME_RE.fullmatch(l)] or ["us"] + var = fields(effective("kb_variant", need) or "") var = [v if NAME_RE.fullmatch(v) else "" for v in var][:len(lay)] return lay, var + [""] * (len(lay) - len(var)) @@ -517,7 +476,7 @@ if key == "layouts": if new_l[0] not in LATIN: fail("the first layout must be a Latin one (passwords on the lock screen are typed in it)") else: - if value not in SWITCH_KEYS: + if value not in SWITCH_OPTS: fail("unknown switch key") lockpath = path + ".lock-omamobile" @@ -529,33 +488,34 @@ except OSError: data, st, text = read_file() found, layouts, variants, options = parse(text) if "kb_layout" not in found: - layouts, variants = effective_layouts() + layouts, variants = effective_layouts(True) old_names = lst_names(layouts, variants) if "kb_options" not in found: - options = effective_options() # keep Omarchy's defaults when input.lua does not set kb_options + options = effective_options(True) # keep Omarchy's defaults when input.lua does not set kb_options +old_options = options +compose = None # None: the state file is left as it is (a layouts save) if key == "layouts": layouts, variants = new_l, new_v - sw = switch_key(options) - if sw == "none" and not os.path.exists(BINDS): - sw = DEFAULT_KEY # the grp: option goes below, so Alt+Shift takes over as before + migrate = old_key() + if migrate and not any(o.startswith("grp:") for o in options): + options = switch_options(options, migrate) # the earlier bind file's choice, now as xkb + compose = False else: sw = value -old_options = options -# compose:caps goes while caps holds the key; the marker brings it back when caps lets go, and only then -was_caps = "grp:caps_toggle" in options -if sw == "caps": - compose = "compose:caps" in options or (was_caps and compose_marked()) -else: - compose = False -options = switch_options(options, sw) -if sw != "caps" and was_caps and compose_marked() and "compose:caps" not in options: - options = options + ["compose:caps"] -# The marker goes to disk before input.lua loses compose:caps, so a failed write in between can't lose it: -# first the old choice plus the marker (harmless while caps is not on), the new choice after input.lua. -# Leaving caps, input.lua gets compose:caps back first, then the marker goes. -if compose and not compose_marked(): - if not write_binds(switch_key(old_options), True): - fail("cannot write " + os.path.basename(BINDS)) + # compose:caps goes while caps holds the key; the marker brings it back when caps lets go, and only then + was_caps = "grp:caps_toggle" in options + marked = compose_marked() + compose = sw == "caps" and ("compose:caps" in options or (was_caps and marked)) + options = switch_options(options, sw) + if sw != "caps" and was_caps and marked and "compose:caps" not in options: + options = options + ["compose:caps"] + # The marker goes to disk before input.lua loses compose:caps, so a failed write in between can't + # lose it (harmless while caps is not on); leaving caps, input.lua gets compose:caps back first, + # then the marker goes. + if compose and not marked: + if not write_state(True): + fail("cannot write " + os.path.basename(BINDS)) + MARKER_NEW = True live_ok = osk_ok = True if key == "layouts" or options != old_options: new = {"kb_layout": ",".join(layouts), "kb_options": ",".join(options)} @@ -564,11 +524,11 @@ if key == "layouts" or options != old_options: if any(variants) or "kb_variant" in found: new["kb_variant"] = ",".join(variants) if any(variants) else "" write(data, st, text, found, new) + MARKER_NEW = False osk_ok = key != "layouts" or sync_osk(old_names, lst_names(layouts, variants)) live_ok = apply_live(layouts, variants, options) -if not write_binds(sw, compose): +if compose is not None and not write_state(compose): fail("cannot write " + os.path.basename(BINDS)) -live_ok = apply_binds(sw) and live_ok if not live_ok: fail("saved, but Hyprland did not take it live" + ("" if osk_ok else ", and the on-screen keyboard list was not updated")) diff --git a/packages/omamobile-settings/test/keyboard-backend.sh b/packages/omamobile-settings/test/keyboard-backend.sh index 79ef4f273..937739814 100755 --- a/packages/omamobile-settings/test/keyboard-backend.sh +++ b/packages/omamobile-settings/test/keyboard-backend.sh @@ -11,8 +11,8 @@ cat > "$tmp/bin/hyprctl" <<'EOT' printf '%s\n' "$*" >> "$FAKE_LOG" case "$1 $2" in "-j devices") cat "$FAKE_DEVICES" 2>/dev/null || exit 1 ;; - "-j binds") cat "$FAKE_BINDS" 2>/dev/null || exit 1 ;; - "-j getoption") case $3 in + "-j getoption") [[ -z ${FAKE_GETOPTION_FAIL:-} ]] || exit 1 + case $3 in input:kb_options) printf '{"option":"input:kb_options","str":"%s","set":true}\n' "${FAKE_OPTIONS:-}" ;; input:kb_layout) printf '{"option":"input:kb_layout","str":"%s","set":true}\n' "${FAKE_LAYOUT:-us}" ;; *) printf '{"option":"%s","str":"","set":false}\n' "$3" ;; @@ -56,7 +56,7 @@ export PATH="$tmp/bin:$PATH" FAKE_LOG="$tmp/log" FAKE_DEVICES="$tmp/devices.json export OMAMOBILE_KEYBOARDS_DIR="$tmp/nokeyboards" export XDG_RUNTIME_DIR="$tmp/run" HYPRLAND_INSTANCE_SIGNATURE=test export OMAMOBILE_KBD_INPUT="$tmp/input.lua" OMAMOBILE_KBD_RULES="$tmp/rules.lst" OMAMOBILE_KBD_BINDS="$tmp/omamobile-keyboard.lua" -unset FAKE_OPTIONS FAKE_EVAL_FAIL FAKE_KEYWORD_FAIL FAKE_GSETTINGS_FAIL +unset FAKE_OPTIONS FAKE_GETOPTION_FAIL FAKE_EVAL_FAIL FAKE_KEYWORD_FAIL FAKE_GSETTINGS_FAIL run() { bash "$src/backends/keyboard.sh" "$@" || true; } eq() { [[ $1 == "$2" ]] || { echo "FAIL: got $1, want $2" >&2; exit 1; }; } has() { grep -qF -- "$2" "$1" || { echo "FAIL: $1 lacks $2" >&2; cat "$1" >&2; exit 1; }; } @@ -71,94 +71,86 @@ hl.config({ input = { kb_layout = "de" } }) hl.config({ input = { kb_layout = "us", - kb_options = "compose:caps,grp:alt_shift_toggle,grp_led:caps", -- keep me + kb_options = "compose:caps,grp:win_space_toggle,grp_led:caps", -- keep me repeat_rate = 40, }, }) EOT chmod 640 "$tmp/input.lua" -# no bind file yet, but kb_options has grp:alt_shift_toggle: phone.lua keeps its default binds off +# a grp: option that is none of ours: get says none eq "$(run get)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"none","active":1}' : > "$tmp/log" -eq "$(run set layouts us,gr:polytonic)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"alt_shift","active":1}' +eq "$(run set layouts us,gr:polytonic)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"none","active":1}' has "$tmp/input.lua" 'kb_layout = "us,gr",' has "$tmp/input.lua" 'kb_variant = ",polytonic",' -# the old grp: option and grp_led:caps are removed (caps only), the rest stays -has "$tmp/input.lua" 'kb_options = "compose:caps", -- keep me' -# both key orders bound on every keyboard but squeekboard's, in the file and live +# a layouts save leaves kb_options as it is, writes no state file and binds nothing +has "$tmp/input.lua" 'kb_options = "compose:caps,grp:win_space_toggle,grp_led:caps", -- keep me' b=$tmp/omamobile-keyboard.lua -has "$b" '-- switch-key: alt_shift' -has "$b" 'hl.bind("ALT + SHIFT_L", hl.dsp.exec_cmd("hyprctl switchxkblayout current next"), { description = "Keyboard: next layout", device = { inclusive = false, list = { "hl-virtual-keyboard-squeekboard" } }, non_consuming = true })' -has "$b" 'hl.bind("SHIFT + ALT_L", hl.dsp.exec_cmd("hyprctl switchxkblayout current next")' -hasnt "$b" 'release' -hasnt "$b" 'code:66' -has "$b" 'b[2]:set_enabled(b[1] == "alt_shift")' -has "$tmp/log" 'hl.bind("SHIFT + ALT_L", hl.dsp.exec_cmd("hyprctl switchxkblayout current next")' +[[ ! -e $b ]] || { echo "FAIL: a layouts save wrote the state file" >&2; exit 1; } +hasnt "$tmp/log" 'hl.bind' hasnt "$tmp/log" 'unbind' -hasnt "$tmp/log" 'grp:' has "$tmp/input.lua" '-- kb_layout = "fr", a comment, never touched' has "$tmp/input.lua" 'hl.config({ input = { kb_layout = "de" } })' has "$tmp/input.lua" ' kb_options = "grp:caps_toggle" ]]' eq "$(grep -c 'hl.config' "$tmp/input.lua")" 2 eq "$(stat -c %a "$tmp/input.lua")" 640 has "$tmp/input.lua.bak-omamobile" 'kb_layout = "us",' -has "$tmp/log" 'eval hl.config({ input = { kb_layout = "us,gr", kb_variant = ",polytonic", kb_options = "compose:caps" } })' +has "$tmp/log" 'eval hl.config({ input = { kb_layout = "us,gr", kb_variant = ",polytonic", kb_options = "compose:caps,grp:win_space_toggle,grp_led:caps" } })' has "$tmp/log" "gsettings set org.gnome.desktop.input-sources sources [('xkb', 'us'), ('xkb', 'gr+polytonic')]" # gsettings is written before the live apply g=$(grep -n '^gsettings set' "$tmp/log" | cut -d: -f1); e=$(grep -n '^eval' "$tmp/log" | head -1 | cut -d: -f1) (( g < e )) || { echo "FAIL: gsettings ($g) after the live apply ($e)" >&2; exit 1; } hasnt "$tmp/log" 'reload' -eq "$(run get)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"alt_shift","active":1}' -# the switch key: the old binds go, the new ones come; input.lua and gsettings are not touched -cp "$tmp/input.lua" "$tmp/before"; : > "$tmp/log" -eq "$(run set switch-key ctrl_shift)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"ctrl_shift","active":1}' -cmp -s "$tmp/input.lua" "$tmp/before" || { echo "FAIL: a switch-key change wrote input.lua" >&2; exit 1; } -has "$b" '-- switch-key: ctrl_shift' -has "$b" 'b[2]:set_enabled(b[1] == "ctrl_shift")' -has "$tmp/log" 'b[2]:set_enabled(b[1] == "ctrl_shift")' +# the switch key is an xkb option: every grp: and grp_led:caps go, the chosen one comes, applied +# live; gsettings is not touched and no bind is made +: > "$tmp/log" +eq "$(run set switch-key alt_shift)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"alt_shift","active":1}' +has "$tmp/input.lua" 'kb_options = "compose:caps,grp:alt_shift_toggle", -- keep me' +has "$tmp/log" 'kb_options = "compose:caps,grp:alt_shift_toggle" } })' +eq "$(run get)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"alt_shift","active":1}' +eq "$(run set switch-key ctrl_shift | grep -o '"switchKey":"[^"]*"')" '"switchKey":"ctrl_shift"' +has "$tmp/input.lua" 'kb_options = "compose:caps,grp:ctrl_shift_toggle", -- keep me' +hasnt "$tmp/log" 'hl.bind' hasnt "$tmp/log" 'unbind' hasnt "$tmp/log" 'gsettings' -hasnt "$tmp/log" 'kb_options' -# caps: no bind, xkb grp:caps_toggle + grp_led:caps in kb_options, compose:caps goes (it takes the key) +[[ ! -e $b ]] || { echo "FAIL: a state file without caps" >&2; exit 1; } +# caps: grp:caps_toggle + grp_led:caps, compose:caps goes (it takes the key) : > "$tmp/log" eq "$(run set switch-key caps | grep -o '"switchKey":"[^"]*"')" '"switchKey":"caps"' -has "$b" 'set_enabled(b[1] == "caps")' has "$tmp/input.lua" 'kb_options = "grp:caps_toggle,grp_led:caps", -- keep me' has "$tmp/log" 'kb_options = "grp:caps_toggle,grp_led:caps" } })' hasnt "$tmp/log" 'gsettings' eq "$(run get | grep -o '"switchKey":"[^"]*"')" '"switchKey":"caps"' -# a layouts change keeps caps +# a layouts change keeps caps and the marker eq "$(run set layouts us,gr:polytonic | grep -o '"switchKey":"[^"]*"')" '"switchKey":"caps"' has "$tmp/input.lua" 'kb_options = "grp:caps_toggle,grp_led:caps", -- keep me' has "$b" '-- compose-caps: restore' -# away from caps: both options go, compose:caps (there before caps) comes back +hasnt "$b" 'hl.' +# away from caps to none: both options go, no grp: at all, compose:caps (there before caps) comes back eq "$(run set switch-key none | grep -o '"switchKey":"[^"]*"')" '"switchKey":"none"' -has "$b" 'set_enabled(b[1] == "none")' -has "$b" '-- switch-key: none' -hasnt "$b" 'compose-caps' has "$tmp/input.lua" 'kb_options = "compose:caps", -- keep me' +[[ ! -e $b ]] || { echo "FAIL: the marker stayed after caps" >&2; exit 1; } # caps then alt_shift restores compose:caps too run set switch-key caps >/dev/null has "$tmp/input.lua" 'kb_options = "grp:caps_toggle,grp_led:caps", -- keep me' run set switch-key alt_shift >/dev/null -has "$tmp/input.lua" 'kb_options = "compose:caps", -- keep me' -hasnt "$b" 'compose-caps' +has "$tmp/input.lua" 'kb_options = "grp:alt_shift_toggle,compose:caps", -- keep me' +[[ ! -e $b ]] || { echo "FAIL: the marker stayed after caps" >&2; exit 1; } # a user without compose:caps never gets it -sed -i 's/kb_options = "compose:caps", -- keep me/kb_options = "", -- keep me/' "$tmp/input.lua" +sed -i 's/kb_options = "grp:alt_shift_toggle,compose:caps", -- keep me/kb_options = "", -- keep me/' "$tmp/input.lua" run set switch-key caps >/dev/null -hasnt "$b" 'compose-caps' +[[ ! -e $b ]] || { echo "FAIL: a marker without compose:caps" >&2; exit 1; } run set switch-key ctrl_shift >/dev/null -has "$tmp/input.lua" 'kb_options = "", -- keep me' +has "$tmp/input.lua" 'kb_options = "grp:ctrl_shift_toggle", -- keep me' run set switch-key alt_shift >/dev/null -# one layout left: the binds stay (switchxkblayout next does nothing then); the variant goes +# one layout left: the option stays (xkb has nowhere to switch then); the variant goes eq "$(run set layouts us)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"alt_shift","active":1}' -has "$b" 'set_enabled(b[1] == "alt_shift")' -has "$b" '-- switch-key: alt_shift' -has "$tmp/input.lua" 'kb_options = "",' +has "$tmp/input.lua" 'kb_options = "grp:alt_shift_toggle",' has "$tmp/input.lua" 'kb_variant = "",' + # a non-Latin first layout is refused, nothing written cp "$tmp/input.lua" "$tmp/before"; cp "$tmp/sources" "$tmp/sources.before" eq "$(run set layouts gr,us)" '{"error":"the first layout must be a Latin one (passwords on the lock screen are typed in it)"}' @@ -204,39 +196,84 @@ run set layouts us,de >/dev/null has "$tmp/dots/input.lua" ' kb_layout = "us,de",' rm "$tmp/input.lua"; mv "$tmp/dots/input.lua" "$tmp/input.lua" -# an effective grp: option (input.lua has no kb_options) is dropped by a switch-key change too +# an effective grp: option (input.lua has no kb_options) is replaced by a switch-key change too printf 'hl.config({\n input = {\n kb_layout = "us,gr",\n },\n})\n' > "$tmp/input.lua" -FAKE_OPTIONS=compose:caps,grp:alt_shift_toggle run set switch-key alt_shift >/dev/null -has "$tmp/input.lua" ' kb_options = "compose:caps",' +FAKE_OPTIONS=compose:caps,grp:alts_toggle run set switch-key ctrl_shift >/dev/null +has "$tmp/input.lua" ' kb_options = "compose:caps,grp:ctrl_shift_toggle",' printf 'hl.config({\n input = {\n kb_layout = "us,gr",\n },\n})\n' > "$tmp/input.lua" -# grp:caps_toggle in Hyprland's effective kb_options: get says caps whatever the file says +# get reads the effective kb_options when input.lua has none eq "$(FAKE_OPTIONS=grp:caps_toggle,grp_led:caps run get | grep -o '"switchKey":"[^"]*"')" '"switchKey":"caps"' - -# no bind file and another grp: in kb_options: phone.lua keeps its binds off, so get says none; -# a layouts save then drops the grp: option and Alt+Shift takes over as before -rm -f "$b" -eq "$(FAKE_OPTIONS=grp:alt_shift_toggle run get | grep -o '"switchKey":"[^"]*"')" '"switchKey":"none"' -eq "$(FAKE_OPTIONS=compose:caps,grp:win_space_toggle run set layouts us,gr | grep -o '"switchKey":"[^"]*"')" '"switchKey":"alt_shift"' -has "$tmp/input.lua" ' kb_options = "compose:caps",' -# input.lua cannot be written while caps takes compose:caps: the marker is already on disk, compose:caps stays +eq "$(FAKE_OPTIONS=compose:caps,grp:alt_shift_toggle run get | grep -o '"switchKey":"[^"]*"')" '"switchKey":"alt_shift"' +eq "$(FAKE_OPTIONS=grp:ctrl_shift_toggle run get | grep -o '"switchKey":"[^"]*"')" '"switchKey":"ctrl_shift"' +eq "$(FAKE_OPTIONS=compose:caps run get | grep -o '"switchKey":"[^"]*"')" '"switchKey":"none"' +# xkb option names with "-" (base.lst has compose:caps-altgr, fkeys:basic_13-24) are kept +FAKE_OPTIONS=compose:caps-altgr,fkeys:basic_13-24 run set switch-key alt_shift >/dev/null +has "$tmp/input.lua" ' kb_options = "compose:caps-altgr,fkeys:basic_13-24,grp:alt_shift_toggle",' +printf 'hl.config({\n input = {\n kb_layout = "us,gr",\n },\n})\n' > "$tmp/input.lua" +# Hyprland cannot say its kb_options / kb_layout: a save writes nothing rather than guess +cp "$tmp/input.lua" "$tmp/before" +eq "$(FAKE_GETOPTION_FAIL=1 run set switch-key alt_shift)" '{"error":"cannot read Hyprland'"'"'s input:kb_options, nothing written"}' +eq "$(FAKE_GETOPTION_FAIL=1 run set layouts us,de)" '{"error":"cannot read Hyprland'"'"'s input:kb_options, nothing written"}' +cmp -s "$tmp/input.lua" "$tmp/before" || { echo "FAIL: a save without Hyprland's values wrote" >&2; exit 1; } +printf 'hl.config({\n input = {\n repeat_rate = 40,\n },\n})\n' > "$tmp/before"; cp "$tmp/before" "$tmp/input.lua" +eq "$(FAKE_GETOPTION_FAIL=1 run set switch-key caps)" '{"error":"cannot read Hyprland'"'"'s input:kb_layout, nothing written"}' +cmp -s "$tmp/input.lua" "$tmp/before" || { echo "FAIL: a save without Hyprland's layout wrote" >&2; exit 1; } +[[ ! -e $b ]] || { echo "FAIL: a refused save wrote the marker" >&2; exit 1; } +# a live kb_options and kb_layout need no getoption printf 'hl.config({\n input = {\n kb_layout = "us,gr",\n kb_options = "compose:caps",\n },\n})\n' > "$tmp/input.lua" -run set switch-key ctrl_shift >/dev/null -hasnt "$b" 'compose-caps' -mkdir -p "$tmp/ro"; mv "$tmp/input.lua" "$tmp/ro/input.lua"; ln -s "$tmp/ro/input.lua" "$tmp/input.lua" -touch "$tmp/ro/input.lua.lock-omamobile"; chmod 555 "$tmp/ro" # the lock opens, the backup copy cannot be made -run set switch-key caps | grep -q error || { echo "FAIL: an unwritable input.lua is not reported" >&2; exit 1; } -chmod 755 "$tmp/ro"; chmod 644 "$tmp/ro/input.lua" -has "$tmp/ro/input.lua" ' kb_options = "compose:caps",' -has "$b" '-- compose-caps: restore' -has "$b" '-- switch-key: ctrl_shift' +eq "$(FAKE_GETOPTION_FAIL=1 run set switch-key ctrl_shift | grep -o '"switchKey":"[^"]*"')" '"switchKey":"ctrl_shift"' +# migration: a bind file from earlier commits of this branch, no grp: option. get reports its choice, +# the next save writes the matching xkb option and removes the file +printf 'hl.config({\n input = {\n kb_layout = "us,gr",\n kb_options = "compose:caps",\n },\n})\n' > "$tmp/input.lua" +printf -- '-- switch-key: ctrl_shift\nhl.bind("CTRL + SHIFT_L")\n' > "$b" eq "$(run get | grep -o '"switchKey":"[^"]*"')" '"switchKey":"ctrl_shift"' +eq "$(run set layouts us,gr | grep -o '"switchKey":"[^"]*"')" '"switchKey":"ctrl_shift"' +has "$tmp/input.lua" ' kb_options = "compose:caps,grp:ctrl_shift_toggle",' +[[ ! -e $b ]] || { echo "FAIL: the old bind file stayed after migrating" >&2; exit 1; } +# with a grp: option already there, the old file is not the truth; a switch-key save removes it +printf -- '-- switch-key: alt_shift\nhl.bind("ALT + SHIFT_L")\n' > "$b" +eq "$(FAKE_OPTIONS=grp:alts_toggle run get | grep -o '"switchKey":"[^"]*"')" '"switchKey":"ctrl_shift"' +sed -i 's/grp:ctrl_shift_toggle/grp:alts_toggle/' "$tmp/input.lua" +eq "$(run get | grep -o '"switchKey":"[^"]*"')" '"switchKey":"none"' +run set layouts us,gr >/dev/null +has "$tmp/input.lua" ' kb_options = "compose:caps,grp:alts_toggle",' +has "$b" 'switch-key: alt_shift' +run set switch-key none >/dev/null +[[ ! -e $b ]] || { echo "FAIL: the old bind file stayed" >&2; exit 1; } +# a switch-key save picks over an old file's choice +printf -- '-- switch-key: alt_shift\n' > "$b" +sed -i 's/kb_options = "[^"]*"/kb_options = ""/' "$tmp/input.lua" +eq "$(run set switch-key caps | grep -o '"switchKey":"[^"]*"')" '"switchKey":"caps"' +has "$tmp/input.lua" ' kb_options = "grp:caps_toggle,grp_led:caps",' +[[ ! -e $b ]] || { echo "FAIL: the old bind file stayed" >&2; exit 1; } +run set switch-key none >/dev/null +# input.lua cannot be written (its directory is read-only) while caps takes compose:caps: the error is +# reported, input.lua is unchanged and the marker written for it is removed again (none is left stale) +mkdir -p "$tmp/ro" +printf 'hl.config({\n input = {\n kb_layout = "us,gr",\n kb_options = "compose:caps,grp:ctrl_shift_toggle",\n },\n})\n' > "$tmp/ro/input.lua" +touch "$tmp/ro/input.lua.lock-omamobile"; chmod 555 "$tmp/ro" # the lock opens, the backup copy cannot be made +eq "$(OMAMOBILE_KBD_INPUT=$tmp/ro/input.lua run set switch-key caps)" '{"error":"cannot write input.lua"}' +chmod 755 "$tmp/ro" +has "$tmp/ro/input.lua" ' kb_options = "compose:caps,grp:ctrl_shift_toggle",' +[[ ! -e $tmp/ro/input.lua.bak-omamobile ]] || { echo "FAIL: the write got further than expected" >&2; exit 1; } +[[ ! -e $b ]] || { echo "FAIL: a stale compose marker after a failed write" >&2; exit 1; } +# the marker goes to disk before input.lua loses compose:caps: when it cannot be written, input.lua is +# not touched +mv "$b" "$b.x" 2>/dev/null || true; mkdir "$b" # a directory where the state file goes: it cannot be written +eq "$(OMAMOBILE_KBD_INPUT=$tmp/ro/input.lua run set switch-key caps)" '{"error":"cannot write omamobile-keyboard.lua"}' +has "$tmp/ro/input.lua" ' kb_options = "compose:caps,grp:ctrl_shift_toggle",' +rmdir "$b"; rm -f "$b.x" # the retry goes through and later leaving caps brings compose:caps back +export OMAMOBILE_KBD_INPUT=$tmp/ro/input.lua run set switch-key caps >/dev/null has "$tmp/ro/input.lua" 'kb_options = "grp:caps_toggle,grp_led:caps",' +has "$b" '-- compose-caps: restore' run set switch-key alt_shift >/dev/null -has "$tmp/ro/input.lua" 'kb_options = "compose:caps",' -hasnt "$b" 'compose-caps' -rm "$tmp/input.lua"; mv "$tmp/ro/input.lua" "$tmp/input.lua" +has "$tmp/ro/input.lua" 'kb_options = "grp:alt_shift_toggle,compose:caps",' +[[ ! -e $b ]] || { echo "FAIL: the marker stayed" >&2; exit 1; } +export OMAMOBILE_KBD_INPUT=$tmp/input.lua +mv "$tmp/ro/input.lua" "$tmp/input.lua" + # bad input never reaches the file cp "$tmp/input.lua" "$tmp/before" @@ -266,12 +303,12 @@ hl.config({ EOT FAKE_OPTIONS="compose:caps,shift:both_capslock_cancel" export FAKE_OPTIONS -eq "$(run get)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"alt_shift","active":1}' +eq "$(run get)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"none","active":1}' run set layouts us,gr >/dev/null has "$tmp/input.lua" '-- kb_layout = "us,dk,eu",' has "$tmp/input.lua" ' kb_layout = "us,gr",' has "$tmp/input.lua" ' kb_options = "compose:caps,shift:both_capslock_cancel",' -eq "$(run get)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":""}],"switchKey":"alt_shift","active":1}' +eq "$(run get)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":""}],"switchKey":"none","active":1}' eq "$(grep -c 'hl.config' "$tmp/input.lua")" 2 run set layouts us,de >/dev/null eq "$(grep -c 'hl.config' "$tmp/input.lua")" 2 @@ -282,15 +319,24 @@ eq "$(run get)" '{"error":"input.lua is missing"}' # kb_options and kb_variant absent: added on the kb_layout line's table, Omarchy's effective options kept printf 'hl.config({\n input = {\n kb_layout = "us",\n },\n})\n' > "$tmp/input.lua" -FAKE_OPTIONS='compose:caps' eq "$(FAKE_OPTIONS=compose:caps run set layouts us,gr:polytonic | grep -o '"switchKey":"[^"]*"')" '"switchKey":"alt_shift"' +FAKE_OPTIONS='compose:caps' eq "$(FAKE_OPTIONS=compose:caps run set layouts us,gr:polytonic | grep -o '"switchKey":"[^"]*"')" '"switchKey":"none"' has "$tmp/input.lua" ' kb_layout = "us,gr",' has "$tmp/input.lua" ' kb_variant = ",polytonic",' has "$tmp/input.lua" ' kb_options = "compose:caps",' eq "$(grep -c 'hl.config' "$tmp/input.lua")" 1 -# a kb_layout that is not followed by a comma: refused rather than guessed +# a one-line kb_layout with no comma after it: the keys go right after its string printf 'hl.config({ input = { kb_layout = "us" } })\n' > "$tmp/input.lua" -eq "$(run set layouts us,gr:polytonic)" '{"error":"input.lua: cannot add kb_variant next to kb_layout"}' -eq "$(run set layouts us,gr)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":""}],"switchKey":"alt_shift","active":1}' +eq "$(run set layouts us,gr:polytonic)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":"polytonic"}],"switchKey":"none","active":1}' +has "$tmp/input.lua" 'hl.config({ input = { kb_layout = "us,gr", kb_variant = ",polytonic" } })' +printf 'hl.config({ input = { kb_layout = "us,gr" } })\n' > "$tmp/input.lua" +eq "$(FAKE_OPTIONS=compose:caps run set switch-key caps | grep -o '"switchKey":"[^"]*"')" '"switchKey":"caps"' +has "$tmp/input.lua" 'hl.config({ input = { kb_layout = "us,gr", kb_options = "grp:caps_toggle,grp_led:caps" } })' +has "$b" '-- compose-caps: restore' +eq "$(run set switch-key none | grep -o '"switchKey":"[^"]*"')" '"switchKey":"none"' +has "$tmp/input.lua" 'kb_options = "compose:caps"' +[[ ! -e $b ]] || { echo "FAIL: the marker stayed" >&2; exit 1; } +printf 'hl.config({ input = { kb_layout = "us" } })\n' > "$tmp/input.lua" +eq "$(run set layouts us,gr)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":""}],"switchKey":"none","active":1}' # a value this editor does not handle is refused printf 'hl.config({ input = { kb_layout = [[us]], } })\n' > "$tmp/input.lua" eq "$(run get)" '{"error":"input.lua: kb_layout is not a plain string"}' @@ -304,49 +350,10 @@ eq "$(FAKE_EVAL_FAIL=1 FAKE_KEYWORD_FAIL=1 run set layouts us,de)" '{"error":"sa has "$tmp/input.lua" 'kb_layout = "us,de",' eq "$(FAKE_GSETTINGS_FAIL=1 run set layouts us,gr)" '{"error":"saved and applied, but the on-screen keyboard list was not updated"}' # no Hyprland: active is null -FAKE_DEVICES=$tmp/none eq "$(FAKE_DEVICES=$tmp/none run get)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":""}],"switchKey":"alt_shift","active":null}' +FAKE_DEVICES=$tmp/none eq "$(FAKE_DEVICES=$tmp/none run get)" '{"layouts":[{"layout":"us","variant":""},{"layout":"gr","variant":""}],"switchKey":"none","active":null}' # list: layouts and grp: switch keys from the rules file, other options left out eq "$(run list)" '{"layouts":[{"layout":"us","name":"English (US)"},{"layout":"gr","name":"Greek"},{"layout":"de","name":"German"},{"layout":"ru","name":"Russian"}],"switchKeys":[{"option":"alt_shift","name":"Alt+Shift"},{"option":"ctrl_shift","name":"Ctrl+Shift"},{"option":"caps","name":"Caps Lock"},{"option":"none","name":"None"}]}' -# The bind file under a stub hl: loaded twice in one Lua state (a second hyprctl eval) it binds -# the four keys once and enables only the chosen pair; a fresh state (phone.lua resets the table) -# binds them again -run set switch-key ctrl_shift >/dev/null -cat > "$tmp/stub.lua" <<'EOT' -local binds = {} -hl = { dsp = { exec_cmd = function(c) return c end } } -function hl.bind(k, d, o) - local h = { key = k, enabled = true, opts = o } - function h:set_enabled(v) self.enabled = v end - binds[#binds + 1] = h - return h -end -dofile(arg[1]); dofile(arg[1]) -local on = {} -for _, h in ipairs(binds) do if h.enabled then on[#on + 1] = h.key .. (h.opts.release and "/r" or "") .. (h.opts.non_consuming and "/n" or "") end end -print(#binds, table.concat(on, ";")) -omamobile_kbd_binds = nil; dofile(arg[1]); print(#binds) -EOT -eq "$(lua "$tmp/stub.lua" "$b")" "$(printf '4\tCTRL + SHIFT_L/n;SHIFT + CTRL_L/n\n8')" -# phone.lua's default (no file) binds the same four key strings and command, and no code:66 -for k in "ALT + SHIFT_L" "SHIFT + ALT_L" "CTRL + SHIFT_L" "SHIFT + CTRL_L" "hyprctl switchxkblayout current next"; do - has "$b" "\"$k\""; has "$src/../omamobile-shell/hypr/phone.lua" "\"$k\"" -done -hasnt "$src/../omamobile-shell/hypr/phone.lua" '"code:66"' - -# The handle table did not survive the eval (more of ours than four): keys with only our binds -# are unbound and bound again; a key that also has a user's bind is left alone and reported -ours='"description":"Keyboard: next layout"' -{ printf '['; for i in 1 2; do printf '{"modmask":8,"key":"Shift_L","keycode":0,%s},{"modmask":1,"key":"Alt_L","keycode":0,%s},' "$ours" "$ours" - printf '{"modmask":4,"key":"Shift_L","keycode":0,%s},{"modmask":1,"key":"Control_L","keycode":0,%s},' "$ours" "$ours"; done - printf '{"modmask":64,"key":"Return","keycode":0,"description":"Terminal"}]\n'; } > "$tmp/binds.json" -: > "$tmp/log" -FAKE_BINDS="$tmp/binds.json" run set switch-key alt_shift | grep -q '"switchKey":"alt_shift"' || { echo "FAIL: duplicate cleanup" >&2; exit 1; } -has "$tmp/log" 'pcall(hl.unbind, "ALT + SHIFT_L")' -has "$tmp/log" 'pcall(hl.unbind, "SHIFT + CTRL_L")' -has "$tmp/log" 'omamobile_kbd_binds = nil' -sed -i 's/"Terminal"/"Terminal"},{"modmask":8,"key":"SHIFT_L","keycode":0,"description":"Mine"/' "$tmp/binds.json" -: > "$tmp/log" -FAKE_BINDS="$tmp/binds.json" run set switch-key alt_shift | grep -q 'did not take it live' || { echo "FAIL: a user's bind on the key is reported" >&2; exit 1; } -hasnt "$tmp/log" 'unbind' +# phone.lua binds no switch key and loads no Settings file +for k in "switchxkblayout" "omamobile-keyboard-switch" "omamobile-keyboard.lua" "SHIFT_L" "ALT_L" "CTRL_L" "code:66"; do hasnt "$src/../omamobile-shell/hypr/phone.lua" "$k"; done echo "keyboard backend: ok" diff --git a/packages/omamobile-shell/bin/omamobile-keyboard-switch b/packages/omamobile-shell/bin/omamobile-keyboard-switch index 3082fa761..2d1bd4299 100755 --- a/packages/omamobile-shell/bin/omamobile-keyboard-switch +++ b/packages/omamobile-shell/bin/omamobile-keyboard-switch @@ -7,9 +7,11 @@ omamobile-keyboard-switch lock layout 0 on every real keyboard (lock screen, polkit prompt: passwords are typed in layout 0) -The switch key itself does not run this: Alt+Shift and Ctrl+Shift run -`hyprctl switchxkblayout current next` and Caps Lock is xkb grp:caps_toggle -(see omamobile-settings/backends/keyboard.sh). `next` is kept for scripts. +The hardware switch key does not run this: it is an xkb grp: option in +kb_options (grp:alt_shift_toggle, grp:ctrl_shift_toggle or grp:caps_toggle; see +omamobile-settings/backends/keyboard.sh). Nothing calls this script yet (the +quick-settings card does not); it is kept, with its tests, for scripts and a +later caller. Real keyboards are the ones in `hyprctl -j devices` that are not squeekboard's or another virtual keyboard (hl-virtual-keyboard*) or a pseudo-keyboard diff --git a/packages/omamobile-shell/hypr/phone.lua b/packages/omamobile-shell/hypr/phone.lua index 8b077c8c5..69303c0e2 100644 --- a/packages/omamobile-shell/hypr/phone.lua +++ b/packages/omamobile-shell/hypr/phone.lua @@ -248,48 +248,9 @@ elseif o.cmd_present("voxtype") then }) end --- The hardware keyboard's layout switch key. Settings > Keyboard writes --- omamobile-keyboard.lua: the Alt+Shift and Ctrl+Shift press binds (both key --- orders, every keyboard but squeekboard's, running `hyprctl switchxkblayout --- current next`), only the chosen pair enabled. With no file yet, the same --- binds with Alt+Shift on (keep in step with bind_lua in --- omamobile-settings/backends/keyboard.sh; its test checks). Press, not --- release: on the phone (Hyprland 0.57.0) release binds missed 9 of 17. Not --- consumed; Alt+Shift+Tab also switches. Caps Lock is xkb grp:caps_toggle in --- kb_options, not a bind (a code:66 bind never fired). The handle table is --- reset here: a config load drops every bind. pcall: a bad file must not --- stop the rest of the config. -omamobile_kbd_binds = nil -local kbd_binds = (os.getenv("XDG_CONFIG_HOME") or ((os.getenv("HOME") or "") .. "/.config")) .. "/hypr/omamobile-keyboard.lua" -local kbd_file = io.open(kbd_binds, "r") -if kbd_file then - kbd_file:close() - pcall(dofile, kbd_binds) -end --- An xkb grp: switch already in kb_options (the owner's own, say --- grp:caps_toggle) keeps every default bind off, or one press would switch --- twice; keyboard.sh's switch_key then reports caps or none the same way. --- Read with hl.get_config("input:kb_options"): Hyprland 0.57's Lua API has --- it (src/config/lua/bindings/LuaBindingsConfigRules.cpp, hlGetConfig) and it --- returns the value as parsed so far, which includes input.lua (hyprland.lua --- requires hypr.input before hypr.looknfeel, which loads this file). -local function kb_has_grp() - local ok, v = pcall(function() return hl.get_config("input:kb_options") end) - return ok and type(v) == "string" and v:find("grp:", 1, true) ~= nil -end -if not omamobile_kbd_binds then - omamobile_kbd_binds = {} - local grp = kb_has_grp() - local not_squeekboard = { inclusive = false, list = { "hl-virtual-keyboard-squeekboard" } } - for _, b in ipairs({ - { "alt_shift", "ALT + SHIFT_L" }, { "alt_shift", "SHIFT + ALT_L" }, - { "ctrl_shift", "CTRL + SHIFT_L" }, { "ctrl_shift", "SHIFT + CTRL_L" }, - }) do - local opts = { description = "Keyboard: next layout", device = not_squeekboard, non_consuming = true } - local ok, h = pcall(hl.bind, b[2], hl.dsp.exec_cmd("hyprctl switchxkblayout current next"), opts) - if ok and h then - omamobile_kbd_binds[#omamobile_kbd_binds + 1] = { b[1], h } - if grp or b[1] ~= "alt_shift" then pcall(function() h:set_enabled(false) end) end - end - end -end +-- The hardware keyboard's layout switch key is xkb only, a grp: option in +-- kb_options that Settings > Keyboard writes to input.lua; nothing is bound +-- here. On the phone (Hyprland 0.57.0) grp:alt_shift_toggle and +-- grp:ctrl_shift_toggle switched in both key orders, and a press bind on top +-- of the option switched twice per press. A fresh phone has no grp: option +-- unless Omarchy's input.lua adds one (grp:alts_toggle for a non-Latin layout). diff --git a/packages/omamobile-shell/test/all b/packages/omamobile-shell/test/all index f1f1748b9..76cb70a9b 100755 --- a/packages/omamobile-shell/test/all +++ b/packages/omamobile-shell/test/all @@ -519,7 +519,7 @@ bash test/keyboard-languages.sh >/dev/null || { bash test/keyboard-languages.sh; python3 -B -c 'import ast,sys; ast.parse(open(sys.argv[1]).read())' bin/omamobile-keyboard-switch || fail "omamobile-keyboard-switch parses" bash test/keyboard-switch.sh >/dev/null || { bash test/keyboard-switch.sh; fail "omamobile-keyboard-switch"; } [[ ! -e systemd/user/omamobile-keyboard-switch.service ]] || fail "no layout follower service (it bounced switches back)" -grep -c 'pcall(dofile, kbd_binds)' hypr/phone.lua >/dev/null || fail "phone.lua loads the switch-key binds Settings writes" +if grep -nE 'switchxkblayout|omamobile-keyboard-switch|omamobile-keyboard\.lua|SHIFT_L|ALT_L|CTRL_L|code:66' hypr/phone.lua; then fail "phone.lua binds no switch key (xkb grp: options do it)"; fi if grep -n 'SUPER + ALT + SHIFT + SPACE' hypr/phone.lua; then fail "the old next-layout bind is gone"; fi if [[ -n ${OMAMOBILE_KEYBOARD_RENDER:-} ]]; then bash test/keyboard-render "$OMAMOBILE_KEYBOARD_RENDER" >/dev/null || fail "language sheet render" @@ -1047,11 +1047,7 @@ if [[ -n $lua ]]; then for sc in installed:plain migrated:migrated own-f9:own none:plain; do out=$(SCENARIO=${sc%%:*} HOME=$dk/${sc##*:} env -u XDG_CONFIG_HOME "$lua" test/phone-dictation.lua) || { grep -v '^ok' <<<"$out"; rm -rf "$dk"; fail "phone.lua dictation keys (${sc%%:*})"; } done - for kbo in grp:caps_toggle,grp_led:caps compose:caps,grp:alt_shift_toggle; do - out=$(SCENARIO=installed HOME=$dk/plain KB_OPTIONS=$kbo env -u XDG_CONFIG_HOME "$lua" test/phone-dictation.lua) || { grep -v '^ok' <<<"$out"; rm -rf "$dk"; fail "phone.lua switch key with kb_options $kbo"; } - done rm -rf "$dk" - pass "phone.lua: with no bind file Alt+Shift switches, and no default bind does when kb_options has a grp: switch" pass "phone.lua on Omarchy 4.5: Alt + Space and the migration's F9 are for hardware keyboards; the owner's own F9 is left alone" else pass "phone.lua window rules # SKIP no lua" diff --git a/packages/omamobile-shell/test/phone-dictation.lua b/packages/omamobile-shell/test/phone-dictation.lua index 871749932..d111d56f5 100644 --- a/packages/omamobile-shell/test/phone-dictation.lua +++ b/packages/omamobile-shell/test/phone-dictation.lua @@ -22,15 +22,13 @@ hl = { end, dsp = { window = { cycle_next = dsp("cycle_next"), bring_to_top = dsp("bring_to_top") }, focus = dsp("focus"), exec_cmd = function(c) return c end }, - -- the layout switch key's default binds (no omamobile-keyboard.lua in these homes); KB_OPTIONS - -- stands for Hyprland's effective input:kb_options + -- phone.lua must bind no layout switch key (xkb does it): any hl.bind is counted bind = function(keys) local h = { keys = keys, on = true } h.set_enabled = function(self, v) self.on = v end kbd[#kbd + 1] = h return h end, - get_config = function(k) return k == "input:kb_options" and (os.getenv("KB_OPTIONS") or "") or nil end, } o = { bind = function(keys, description, dispatcher, opts) @@ -83,13 +81,5 @@ else check(#f9 == 1 and f9[1].dispatcher == "my-own-command" and f9[1].opts.device == nil, "the owner's own F9 bind is left as it is") end end -local kb_on = {} -for _, h in ipairs(kbd) do if h.on then kb_on[#kb_on + 1] = h.keys end end -table.sort(kb_on) -if (os.getenv("KB_OPTIONS") or ""):find("grp:", 1, true) then - check(#kbd == 4 and #kb_on == 0, "an xkb grp: switch in kb_options keeps every default switch bind off") -else - check(#kbd == 4 and table.concat(kb_on, " ") == "ALT + SHIFT_L SHIFT + ALT_L", - "with no bind file only Alt+Shift (both key orders) switches the layout") -end +check(#kbd == 0, "no layout switch bind, the switch key is xkb's") os.exit(failed and 1 or 0) diff --git a/packages/omamobile-shell/test/phone-rules.lua b/packages/omamobile-shell/test/phone-rules.lua index d60f8b3eb..b1b23a55a 100644 --- a/packages/omamobile-shell/test/phone-rules.lua +++ b/packages/omamobile-shell/test/phone-rules.lua @@ -164,18 +164,14 @@ end check(#find("ALT + TAB") == 2 and find("ALT + TAB")[1].dispatcher.dsp == "cycle_next", "Alt + Tab keeps both of Omarchy's actions") local f9 = find("F9", true) check(#f9 == 1 and f9[1].dispatcher == "voxtype record stop", "F9 still stops Voxtype on release") --- The layout switch key with no Settings file: Alt+Shift on press, nothing consumed, Ctrl+Shift --- bound but off, no Caps Lock bind (xkb does caps) (HOME points at a directory without the file) -local on, off = {}, 0 +-- The layout switch key is an xkb grp: option, so phone.lua binds nothing for it +local sw = 0 for _, b in ipairs(binds) do - if b.dispatcher == "hyprctl switchxkblayout current next" then - if b.enabled then on[#on + 1] = b else off = off + 1 end - end -end -check(#on == 2 and off == 2, "the default switch binds: two on, two off") -for _, b in ipairs(on) do - check(b.keys:find("^ALT %+ SHIFT_L$") or b.keys:find("^SHIFT %+ ALT_L$"), "Alt+Shift by default: " .. b.keys) - check(b.opts.release ~= true and b.opts.non_consuming == true and device_is(b, false), "on press, not consumed, not squeekboard's") + local d, k = tostring(b.dispatcher), tostring(b.keys) + if d:find("switchxkblayout", 1, true) or d:find("omamobile-keyboard-switch", 1, true) + or k:find("SHIFT_L", 1, true) or k:find("ALT_L", 1, true) or k:find("CTRL_L", 1, true) + or k:find("code:66", 1, true) then sw = sw + 1 end end +check(sw == 0, "no layout switch bind") os.exit(failed and 1 or 0) From da2bdd7635bed4c74c4a342fcdc0f96adec38188 Mon Sep 17 00:00:00 2001 From: Lef Date: Wed, 18 Nov 2026 16:51:15 +0200 Subject: [PATCH 17/19] keyboard: Omarchy 4.5's omarchy:shift_caps_compose goes with a Caps switch key and comes back after Later Omarchy sets Compose on Shift+Caps through omarchy:shift_caps_compose, which redefines the whole Caps Lock key, so a Caps switch key would not switch with it left in. It is handled like compose:caps: removed while caps holds the key and put back when caps lets go. The state file says which one to put back; a bare restore line from before still means compose:caps. --- .../omamobile-settings/backends/keyboard.sh | 33 ++++++++++++------- .../test/keyboard-backend.sh | 11 +++++++ 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/packages/omamobile-settings/backends/keyboard.sh b/packages/omamobile-settings/backends/keyboard.sh index 91e8a9d25..8f7c194ab 100755 --- a/packages/omamobile-settings/backends/keyboard.sh +++ b/packages/omamobile-settings/backends/keyboard.sh @@ -25,7 +25,7 @@ # first entry is not a Latin layout is refused (passwords on the lock screen are typed in layout 1). # input.lua is edited in place: only the last live kb_layout, kb_variant and kb_options strings inside an # `input = { }` table change (per-device blocks and variables are left alone), comments and every other -# option stays but, on a switch-key save, grp:, grp_led:caps (set only with caps) and compose:caps with caps +# option stays but, on a switch-key save, grp:, grp_led:caps (set only with caps) and compose:caps or omarchy:shift_caps_compose with caps # (put back when caps lets go, only if it was there: "-- compose-caps: restore" in a small state file, # ~/.config/hypr/omamobile-keyboard.lua, which nothing loads; it is removed when not needed), a copy of the old # file goes to input.lua.bak-omamobile first, and the write is dropped if the file changed meanwhile. @@ -86,6 +86,9 @@ NAME_RE = re.compile(r"[a-z][a-z0-9_-]{0,31}") # had shift:both_capslock_cancel): cause unknown. SWITCH_OPTS = {"alt_shift": ["grp:alt_shift_toggle"], "ctrl_shift": ["grp:ctrl_shift_toggle"], "caps": ["grp:caps_toggle", "grp_led:caps"], "none": []} +# Compose on Caps Lock: Omarchy 4.0 sets compose:caps, later Omarchy omarchy:shift_caps_compose (Shift+Caps +# is Compose). Both take the Caps key, so a Caps switch key would not switch with either left in. +COMPOSE_OPTS = ("compose:caps", "omarchy:shift_caps_compose") SWITCH_NAMES = [("alt_shift", "Alt+Shift"), ("ctrl_shift", "Ctrl+Shift"), ("caps", "Caps Lock"), ("none", "None")] BINDS = os.environ["KBD_BINDS"] # xkb option names as in base.lst: group:name, the name may hold "-" (compose:caps-altgr, fkeys:basic_13-24) @@ -228,12 +231,17 @@ def active(): return i if isinstance(i, int) and i >= 0 else None def compose_marked(): - """True when the file says compose:caps was in kb_options before caps took the key.""" + """The Compose option that was in kb_options before caps took the key, from the state file, else None. + A bare "restore" line (written before the Omarchy 4.5 name was known) means compose:caps.""" try: with open(BINDS, encoding="utf-8", errors="replace") as f: - return any(re.fullmatch(r"-- compose-caps: restore\s*", line) for line in f) + for line in f: + m = re.fullmatch(r"-- compose-caps: restore(?: (omarchy:shift_caps_compose))?\s*", line) + if m: + return m.group(1) or "compose:caps" except OSError: - return False + pass + return None def old_key(): """alt_shift or ctrl_shift from an earlier commit's bind file, else None.""" @@ -248,7 +256,7 @@ def old_key(): return None def write_state(compose): - """The compose-caps marker on disk when compose, else no state file.""" + """The compose-caps marker for option compose on disk, else (compose falsy) no state file.""" if not compose: try: os.unlink(BINDS) @@ -258,7 +266,7 @@ def write_state(compose): return False return True text = ("-- Written by Omarchy Mobile Settings (Keyboard); nothing loads it. Changes here are replaced.\n" - "-- compose-caps: restore\n") + "-- compose-caps: restore%s\n" % ("" if compose == "compose:caps" else " " + compose)) tmp = "%s.tmp-omamobile.%d" % (BINDS, os.getpid()) try: os.makedirs(os.path.dirname(BINDS), exist_ok=True) @@ -286,7 +294,7 @@ def switch_options(options, sw): """kb_options for switch key sw: every grp: and grp_led:caps out, sw's own back in.""" keep = [o for o in options if not o.startswith("grp:") and o != "grp_led:caps"] if sw == "caps": - keep = [o for o in keep if o != "compose:caps"] + keep = [o for o in keep if o not in COMPOSE_OPTS] return keep + SWITCH_OPTS[sw] def state(layouts, variants, options): @@ -505,15 +513,16 @@ else: # compose:caps goes while caps holds the key; the marker brings it back when caps lets go, and only then was_caps = "grp:caps_toggle" in options marked = compose_marked() - compose = sw == "caps" and ("compose:caps" in options or (was_caps and marked)) + present = next((o for o in COMPOSE_OPTS if o in options), None) + compose = (present or (marked if was_caps else None) or False) if sw == "caps" else False options = switch_options(options, sw) - if sw != "caps" and was_caps and marked and "compose:caps" not in options: - options = options + ["compose:caps"] + if sw != "caps" and was_caps and marked and not any(o in options for o in COMPOSE_OPTS): + options = options + [marked] # The marker goes to disk before input.lua loses compose:caps, so a failed write in between can't # lose it (harmless while caps is not on); leaving caps, input.lua gets compose:caps back first, # then the marker goes. - if compose and not marked: - if not write_state(True): + if compose and compose != marked: + if not write_state(compose): fail("cannot write " + os.path.basename(BINDS)) MARKER_NEW = True live_ok = osk_ok = True diff --git a/packages/omamobile-settings/test/keyboard-backend.sh b/packages/omamobile-settings/test/keyboard-backend.sh index 937739814..8d5c19908 100755 --- a/packages/omamobile-settings/test/keyboard-backend.sh +++ b/packages/omamobile-settings/test/keyboard-backend.sh @@ -144,6 +144,17 @@ run set switch-key caps >/dev/null [[ ! -e $b ]] || { echo "FAIL: a marker without compose:caps" >&2; exit 1; } run set switch-key ctrl_shift >/dev/null has "$tmp/input.lua" 'kb_options = "grp:ctrl_shift_toggle", -- keep me' +# Omarchy 4.5's omarchy:shift_caps_compose takes Caps Lock too: it goes with caps and comes back after +sed -i 's/kb_options = "grp:ctrl_shift_toggle", -- keep me/kb_options = "omarchy:shift_caps_compose", -- keep me/' "$tmp/input.lua" +run set switch-key caps >/dev/null +has "$tmp/input.lua" 'kb_options = "grp:caps_toggle,grp_led:caps", -- keep me' +has "$b" '-- compose-caps: restore omarchy:shift_caps_compose' +run set layouts us,gr >/dev/null +has "$b" '-- compose-caps: restore omarchy:shift_caps_compose' +run set switch-key alt_shift >/dev/null +has "$tmp/input.lua" 'kb_options = "grp:alt_shift_toggle,omarchy:shift_caps_compose", -- keep me' +[[ ! -e $b ]] || { echo "FAIL: the marker stayed after caps" >&2; exit 1; } +sed -i 's/kb_options = "grp:alt_shift_toggle,omarchy:shift_caps_compose", -- keep me/kb_options = "grp:ctrl_shift_toggle", -- keep me/' "$tmp/input.lua" run set switch-key alt_shift >/dev/null # one layout left: the option stays (xkb has nowhere to switch then); the variant goes eq "$(run set layouts us)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"alt_shift","active":1}' From 4f851a33eaa369fa89438c1c6809e07ee9aa49f8 Mon Sep 17 00:00:00 2001 From: Lef Date: Wed, 18 Nov 2026 17:55:49 +0200 Subject: [PATCH 18/19] docs: keyboard page, bar label, keyboard card and switch delay chart from the 8 Pro --- docs/screenshots/keyboard/bar-label.png | Bin 0 -> 11265 bytes docs/screenshots/keyboard/kbd-card.png | Bin 0 -> 49140 bytes docs/screenshots/keyboard/kbd-page.png | Bin 0 -> 132657 bytes docs/screenshots/keyboard/switch-delay.png | Bin 0 -> 51083 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/screenshots/keyboard/bar-label.png create mode 100644 docs/screenshots/keyboard/kbd-card.png create mode 100644 docs/screenshots/keyboard/kbd-page.png create mode 100644 docs/screenshots/keyboard/switch-delay.png diff --git a/docs/screenshots/keyboard/bar-label.png b/docs/screenshots/keyboard/bar-label.png new file mode 100644 index 0000000000000000000000000000000000000000..eedf1c9e45e1c1320e1cf1eee0eeabd7669660b4 GIT binary patch literal 11265 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%0Ay+?BK!WH%5`7a&jnc?Y0x)x#7zY|P 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 Pqim(Btff??XchKfu(;ju literal 0 HcmV?d00001 diff --git a/docs/screenshots/keyboard/kbd-page.png b/docs/screenshots/keyboard/kbd-page.png new file mode 100644 index 0000000000000000000000000000000000000000..ac12d2583d189ce72b9dee76529b26012f3c57b1 GIT binary patch literal 132657 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� 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 literal 0 HcmV?d00001 diff --git a/docs/screenshots/keyboard/switch-delay.png b/docs/screenshots/keyboard/switch-delay.png new file mode 100644 index 0000000000000000000000000000000000000000..1a478a43bf2cdfd1096418768d7035e84c1835c6 GIT binary patch literal 51083 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 Date: Wed, 18 Nov 2026 18:01:25 +0200 Subject: [PATCH 19/19] keyboard: every Compose option on Caps is remembered and put back, a failed save restores the old marker The marker named only the first Compose option it found, so with both compose:caps and omarchy:shift_caps_compose set only compose:caps came back after caps, and an option added by hand while caps was on replaced the one the marker held. It now names every option that was there or is there now, and leaving caps adds back each one that is missing. When input.lua cannot be written after the marker changed, fail() puts the old marker back instead of removing it. The header's counts now match the logged runs. --- .../omamobile-settings/backends/keyboard.sh | 40 +++++++++++-------- .../test/keyboard-backend.sh | 20 +++++++++- 2 files changed, 43 insertions(+), 17 deletions(-) diff --git a/packages/omamobile-settings/backends/keyboard.sh b/packages/omamobile-settings/backends/keyboard.sh index 8f7c194ab..12ee9956b 100755 --- a/packages/omamobile-settings/backends/keyboard.sh +++ b/packages/omamobile-settings/backends/keyboard.sh @@ -5,8 +5,8 @@ # org.gnome.desktop.input-sources sources, and a layouts change adds new ones there too. # The switch key is pure xkb, a grp: option in kb_options, never a Hyprland bind (measured on the phone, # Hyprland 0.57.0-3.2, Dell KB7120W over Bluetooth): alt_shift = grp:alt_shift_toggle (20/20 on 2026-11-18, -# both key orders, 1-2 ms after the second key), ctrl_shift = grp:ctrl_shift_toggle (19/19, both orders), -# caps = grp:caps_toggle,grp_led:caps (12/12, 1-3 ms, 2026-11-17), none = no grp: option. Press binds on +# both key orders, 1-2 ms after the second key), ctrl_shift = grp:ctrl_shift_toggle (41 switches in two runs, both orders, no doubles), +# caps = grp:caps_toggle,grp_led:caps (14 timed presses, 2-3 ms, 2026-11-17), none = no grp: option. Press binds on # top of the xkb option switched twice per press, so phone.lua binds nothing. "get" reads the choice from # the effective kb_options; any other grp: option (Omarchy's grp:alts_toggle for a non-Latin layout, say) # reports none, and only a switch-key save replaces it. On a fresh phone nothing switches the hardware @@ -105,13 +105,18 @@ def out(obj): print(json.dumps(obj, separators=(",", ":"))) MARKER_NEW = False # True while a marker this run wrote has no input.lua write behind it yet +MARKER_PREV = [] # the marker's options before this run rewrote it def fail(msg): if MARKER_NEW: - try: - os.unlink(BINDS) # input.lua still has compose:caps, so the marker would be stale - except OSError: - pass + # input.lua was not written, so the marker goes back to what it said before this run + if MARKER_PREV: + write_state(MARKER_PREV) + else: + try: + os.unlink(BINDS) + except OSError: + pass out({"error": msg}) sys.exit(2) @@ -231,17 +236,18 @@ def active(): return i if isinstance(i, int) and i >= 0 else None def compose_marked(): - """The Compose option that was in kb_options before caps took the key, from the state file, else None. + """The Compose options that were in kb_options before caps took the key, from the state file, else []. A bare "restore" line (written before the Omarchy 4.5 name was known) means compose:caps.""" + names = "|".join(re.escape(o) for o in COMPOSE_OPTS) try: with open(BINDS, encoding="utf-8", errors="replace") as f: for line in f: - m = re.fullmatch(r"-- compose-caps: restore(?: (omarchy:shift_caps_compose))?\s*", line) + m = re.fullmatch(r"-- compose-caps: restore((?: (?:%s))*)\s*" % names, line) if m: - return m.group(1) or "compose:caps" + return m.group(1).split() or ["compose:caps"] except OSError: pass - return None + return [] def old_key(): """alt_shift or ctrl_shift from an earlier commit's bind file, else None.""" @@ -256,7 +262,7 @@ def old_key(): return None def write_state(compose): - """The compose-caps marker for option compose on disk, else (compose falsy) no state file.""" + """The compose-caps marker for the options in compose on disk, else (compose empty) no state file.""" if not compose: try: os.unlink(BINDS) @@ -266,7 +272,7 @@ def write_state(compose): return False return True text = ("-- Written by Omarchy Mobile Settings (Keyboard); nothing loads it. Changes here are replaced.\n" - "-- compose-caps: restore%s\n" % ("" if compose == "compose:caps" else " " + compose)) + "-- compose-caps: restore%s\n" % ("" if compose == ["compose:caps"] else " " + " ".join(compose))) tmp = "%s.tmp-omamobile.%d" % (BINDS, os.getpid()) try: os.makedirs(os.path.dirname(BINDS), exist_ok=True) @@ -513,15 +519,17 @@ else: # compose:caps goes while caps holds the key; the marker brings it back when caps lets go, and only then was_caps = "grp:caps_toggle" in options marked = compose_marked() - present = next((o for o in COMPOSE_OPTS if o in options), None) - compose = (present or (marked if was_caps else None) or False) if sw == "caps" else False + # every Compose option on Caps that is in kb_options now, or that the marker says was there before caps + keep = (marked if was_caps else []) + [o for o in options if o in COMPOSE_OPTS] + compose = [o for o in COMPOSE_OPTS if o in keep] if sw == "caps" else [] options = switch_options(options, sw) - if sw != "caps" and was_caps and marked and not any(o in options for o in COMPOSE_OPTS): - options = options + [marked] + if sw != "caps" and was_caps: + options = options + [o for o in marked if o not in options] # The marker goes to disk before input.lua loses compose:caps, so a failed write in between can't # lose it (harmless while caps is not on); leaving caps, input.lua gets compose:caps back first, # then the marker goes. if compose and compose != marked: + MARKER_PREV = marked if was_caps else [] if not write_state(compose): fail("cannot write " + os.path.basename(BINDS)) MARKER_NEW = True diff --git a/packages/omamobile-settings/test/keyboard-backend.sh b/packages/omamobile-settings/test/keyboard-backend.sh index 8d5c19908..44ac59d07 100755 --- a/packages/omamobile-settings/test/keyboard-backend.sh +++ b/packages/omamobile-settings/test/keyboard-backend.sh @@ -154,7 +154,25 @@ has "$b" '-- compose-caps: restore omarchy:shift_caps_compose' run set switch-key alt_shift >/dev/null has "$tmp/input.lua" 'kb_options = "grp:alt_shift_toggle,omarchy:shift_caps_compose", -- keep me' [[ ! -e $b ]] || { echo "FAIL: the marker stayed after caps" >&2; exit 1; } -sed -i 's/kb_options = "grp:alt_shift_toggle,omarchy:shift_caps_compose", -- keep me/kb_options = "grp:ctrl_shift_toggle", -- keep me/' "$tmp/input.lua" +# both Compose options at once: both go with caps, the marker names both, both come back +sed -i 's/kb_options = "grp:alt_shift_toggle,omarchy:shift_caps_compose", -- keep me/kb_options = "compose:caps,omarchy:shift_caps_compose", -- keep me/' "$tmp/input.lua" +run set switch-key caps >/dev/null +has "$tmp/input.lua" 'kb_options = "grp:caps_toggle,grp_led:caps", -- keep me' +has "$b" '-- compose-caps: restore compose:caps omarchy:shift_caps_compose' +run set switch-key none >/dev/null +has "$tmp/input.lua" 'kb_options = "compose:caps,omarchy:shift_caps_compose", -- keep me' +[[ ! -e $b ]] || { echo "FAIL: the marker stayed after caps" >&2; exit 1; } +# a Compose option added by hand while caps is on joins the marker, the earlier one stays in it +sed -i 's/kb_options = "compose:caps,omarchy:shift_caps_compose", -- keep me/kb_options = "compose:caps", -- keep me/' "$tmp/input.lua" +run set switch-key caps >/dev/null +has "$b" '-- compose-caps: restore' +hasnt "$b" 'omarchy:' +sed -i 's/kb_options = "grp:caps_toggle,grp_led:caps", -- keep me/kb_options = "grp:caps_toggle,grp_led:caps,omarchy:shift_caps_compose", -- keep me/' "$tmp/input.lua" +run set switch-key caps >/dev/null +has "$b" '-- compose-caps: restore compose:caps omarchy:shift_caps_compose' +run set switch-key alt_shift >/dev/null +has "$tmp/input.lua" 'kb_options = "grp:alt_shift_toggle,compose:caps,omarchy:shift_caps_compose", -- keep me' +sed -i 's/kb_options = "grp:alt_shift_toggle,compose:caps,omarchy:shift_caps_compose", -- keep me/kb_options = "grp:ctrl_shift_toggle", -- keep me/' "$tmp/input.lua" run set switch-key alt_shift >/dev/null # one layout left: the option stays (xkb has nowhere to switch then); the variant goes eq "$(run set layouts us)" '{"layouts":[{"layout":"us","variant":""}],"switchKey":"alt_shift","active":1}'