Merge remote-tracking branch 'origin/quattro' into unified-input-method-setup

This commit is contained in:
David Heinemeier Hansson committed 2026-10-11 07:16:39 +09:00
commit b673d9e942
6 files changed
+152 -12

No files matched your search

+2 -3
View File
@@ -630,15 +630,14 @@ confirm_reboot() {
# XKB settings for the form's keymaps that kbd-model-map lacks, as its rows for
# the nearest keymap give them, so the desktop types what the console does:
# kbd's cz is QWERTY, bg-cp1251 phonetic and azerty French AZERTY. Non-Latin
# layouts keep a US layout to switch to, so the shared password stays typeable.
# kbd's cz is QWERTY and bg-cp1251 phonetic. Non-Latin layouts keep a US layout
# to switch to, so the shared password stays typeable.
keyboard_xkb_settings() {
local layout variant="" options=terminate:ctrl_alt_bksp
local switch=terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
case $1 in
colemak) layout=us variant=colemak ;;
azerty) layout=fr ;;
bg-cp1251) layout=bg,us variant=phonetic, options=$switch ;;
cz) layout=cz,us variant=qwerty, options=$switch ;;
de_CH-latin1) layout=ch ;;