Add option to change shutdown/reboot keys (#487)

Include options in the configuration to change which function keys to use for shutdown and reboot. Fix config.map_len size in src/config.c. Add missing defaults in config_defaults() in src/config.c.
2025-12-20 19:24:53 +00:00 · 2023-06-20 11:22:38 +00:00
parent 0edb0012ab
commit 42bf929756
23 changed files with 150 additions and 86 deletions
--- a/res/config.ini
+++ b/res/config.ini
@@ -3,7 +3,7 @@

 # The active animation
 # 0 -> PSX DOOM fire (default)
-# 1 -> CMatrix 
+# 1 -> CMatrix
 #animation = 0

 # format string for clock in top right corner (see strftime specification)
@@ -29,12 +29,12 @@
 #define TB_CYAN    0x07
 #define TB_WHITE   0x08
 #
-# Setting both to zero makes `bg` black and `fg` white. To set the actual color palette you are encouraged to use another tool 
-# such as [mkinitcpio-colors](https://github.com/evanpurkhiser/mkinitcpio-colors). Note that the color palette defined with 
-# `mkinitcpio-colors` takes 16 colors (0-15), only values 0-8 are valid for `ly` config and these values do not correspond 
-# exactly. For instance, in defining palettes with `mkinitcpio-colors` the order is black, dark red, dark green, brown, dark 
-# blue, dark purple, dark cyan, light gray, dark gray, bright red, bright green, yellow, bright blue, bright purple, bright 
-# cyan, and white, indexed in that order 0 through 15. For example, the color defined for white (indexed at 15 in the mkinitcpio 
+# Setting both to zero makes `bg` black and `fg` white. To set the actual color palette you are encouraged to use another tool
+# such as [mkinitcpio-colors](https://github.com/evanpurkhiser/mkinitcpio-colors). Note that the color palette defined with
+# `mkinitcpio-colors` takes 16 colors (0-15), only values 0-8 are valid for `ly` config and these values do not correspond
+# exactly. For instance, in defining palettes with `mkinitcpio-colors` the order is black, dark red, dark green, brown, dark
+# blue, dark purple, dark cyan, light gray, dark gray, bright red, bright green, yellow, bright blue, bright purple, bright
+# cyan, and white, indexed in that order 0 through 15. For example, the color defined for white (indexed at 15 in the mkinitcpio
 # config) will be used by `ly` for `fg = 8`.

 # Background color id
@@ -76,13 +76,19 @@
 #save_file = /etc/ly/save


-# Remove F1/F2 command hints
-#hide_f1_commands = false
+# Remove power management command hints
+#hide_key_hints = false

-# Command executed when pressing F1
+# Specifies the key used for shutdown
+#shutdown_key = F1
+
+# Specifies the key used for restart
+#restart_key = F2
+
+# Command executed when pressing shutdown_key
 #shutdown_cmd = /sbin/shutdown -a now

-# Command executed when pressing F2
+# Command executed when pressing restart_key
 #restart_cmd = /sbin/shutdown -r now


--- a/res/lang/cat.ini
+++ b/res/lang/cat.ini
@@ -1,5 +1,5 @@
 capslock = Bloq Majús
-err_alloc = falla d'assignació de memòria 
+err_alloc = falla d'assignació de memòria
 err_bounds = índex fora de límit
 err_chdir = error al obrir carpeta home
 err_console_dev = error al accedir a la consola
@@ -34,12 +34,12 @@ err_user_init = error al inicialitzar usuari
 err_user_uid = error al establir el UID de l'usuari
 err_xsessions_dir = error al cercar la carpeta de sessions
 err_xsessions_open = error al obrir la carpeta de sessions
-f1 = F1 aturar
-f2 = F2 reiniciar
 login = iniciar sessió
 logout = tancar sessió
 numlock = Bloq Num
 password = Clau
+restart = reiniciar
 shell = shell
+shutdown = aturar
 wayland = wayland
 xinitrc = xinitrc
--- a/res/lang/cs.ini
+++ b/res/lang/cs.ini
@@ -34,12 +34,12 @@ err_user_init = inicializace uživatele selhala
 err_user_uid = nastavení UID uživateli selhalo
 err_xsessions_dir = nepodařilo se najít složku relací
 err_xsessions_open = nepodařilo se otevřít složku relací
-f1 = F1 vypnout
-f2 = F2 restartovat
 login = uživatel
 logout = odhlášen
 numlock = numlock
 password = heslo
+restart = restartovat
 shell = příkazový řádek
+shutdown = vypnout
 wayland = wayland
 xinitrc = xinitrc
--- a/res/lang/de.ini
+++ b/res/lang/de.ini
@@ -34,12 +34,12 @@ err_user_init = Initialisierung des Nutzers fehlgeschlagen
 err_user_uid = Setzen der Benutzer Id fehlgeschlagen
 err_xsessions_dir = Fehler beim finden des Sitzungsordners
 err_xsessions_open = Fehler beim öffnen des Sitzungsordners
-f1 = F1 Herunterfahren
-f2 = F2 Neustarten
 login = Anmelden
 logout = Abgemeldet
 numlock = Numtaste
 password = Passwort
+restart = Neustarten
 shell = shell
+shutdown = Herunterfahren
 wayland = wayland
 xinitrc = xinitrc
--- a/res/lang/en.ini
+++ b/res/lang/en.ini
@@ -34,12 +34,12 @@ err_user_init = failed to initialize user
 err_user_uid = failed to set user UID
 err_xsessions_dir = failed to find sessions folder
 err_xsessions_open = failed to open sessions folder
-f1 = F1 shutdown
-f2 = F2 reboot
 login = login
 logout = logged out
 numlock = numlock
 password = password
+restart = reboot
 shell = shell
+shutdown = shutdown
 wayland = wayland
 xinitrc = xinitrc
--- a/res/lang/es.ini
+++ b/res/lang/es.ini
@@ -34,12 +34,12 @@ err_user_init = error al inicializar usuario
 err_user_uid = error al establecer el UID del usuario
 err_xsessions_dir = error al buscar la carpeta de sesiones
 err_xsessions_open = error al abrir la carpeta de sesiones
-f1 = F1 apagar
-f2 = F2 reiniciar
 login = iniciar sesión
 logout = cerrar sesión
-numlock = Bloq Num 
+numlock = Bloq Num
 password = contraseña
+restart = reiniciar
 shell = shell
+shutdown = apagar
 wayland = wayland
 xinitrc = xinitrc
--- a/res/lang/fr.ini
+++ b/res/lang/fr.ini
@@ -20,7 +20,7 @@ err_pam_cred_expired = identifiants expirés
 err_pam_cred_insufficient = identifiants insuffisants
 err_pam_cred_unavail = échec de l'obtention des identifiants
 err_pam_maxtries = limite d'essais atteinte
-err_pam_perm_denied = permission refusée 
+err_pam_perm_denied = permission refusée
 err_pam_session = erreur de session
 err_pam_sys = erreur système
 err_pam_user_unknown = utilisateur inconnu
@@ -34,12 +34,12 @@ err_user_init = échec d'initialisation de l'utilisateur
 err_user_uid = échec de modification du UID
 err_xsessions_dir = échec de la recherche du dossier de sessions
 err_xsessions_open = échec de l'ouverture du dossier de sessions
-f1 = F1 éteindre
-f2 = F2 redémarrer
 login = identifiant
 logout = déconnection
 numlock = verr.num
 password = mot de passe
+restart = redémarrer
 shell = shell
+shutdown = éteindre
 wayland = wayland
 xinitrc = xinitrc
--- a/res/lang/it.ini
+++ b/res/lang/it.ini
@@ -34,12 +34,12 @@ err_user_init = impossibile inizializzare utente
 err_user_uid = impossible impostare UID utente
 err_xsessions_dir = impossibile localizzare cartella sessioni
 err_xsessions_open = impossibile aprire cartella sessioni
-f1 = F1 arresto
-f2 = F2 riavvio
 login = username
 logout = scollegato
 numlock = numlock
 password = password
+restart = riavvio
 shell = shell
+shutdown = arresto
 wayland = wayland
 xinitrc = xinitrc
--- a/res/lang/pl.ini
+++ b/res/lang/pl.ini
@@ -34,12 +34,12 @@ err_user_init = nie udało się zainicjalizować użytkownika
 err_user_uid = nie udało się ustawić UID użytkownika
 err_xsessions_dir = nie udało się znaleźć folderu sesji
 err_xsessions_open = nie udało się otworzyć folderu sesji
-f1 = F1 wyłącz
-f2 = F2 uruchom ponownie
 login = login
 logout = wylogowano
 numlock = numlock
 password = hasło
+restart = uruchom ponownie
 shell = powłoka
+shutdown = wyłącz
 wayland = wayland
 xinitrc = xinitrc
--- a/res/lang/pt.ini
+++ b/res/lang/pt.ini
@@ -34,12 +34,12 @@ err_user_init = erro ao iniciar o utilizador
 err_user_uid = erro ao definir o UID do utilizador
 err_xsessions_dir = erro ao localizar a pasta das sessões
 err_xsessions_open = erro ao abrir a pasta das sessões
-f1 = F1 encerrar
-f2 = F2 reiniciar
 login = iniciar sessão
 logout = terminar sessão
 numlock = numlock
 password = palavra-passe
+restart = reiniciar
 shell = shell
+shutdown = encerrar
 wayland = wayland
 xinitrc = xinitrc
--- a/res/lang/pt_BR.ini
+++ b/res/lang/pt_BR.ini
@@ -34,12 +34,12 @@ err_user_init = não foi possível iniciar o usuário
 err_user_uid = não foi possível definir o UID do usuário
 err_xsessions_dir = não foi possível encontrar a pasta das sessões
 err_xsessions_open = não foi possível abrir a pasta das sessões
-f1 = F1 desligar
-f2 = F2 reiniciar
 login = conectar
 logout = desconectado
 numlock = numlock
 password = senha
+restart = reiniciar
 shell = shell
+shutdown = desligar
 wayland = wayland
 xinitrc = xinitrc
--- a/res/lang/ro.ini
+++ b/res/lang/ro.ini
@@ -34,12 +34,12 @@ err_perm_user = nu s-a putut face downgrade permisiunilor de utilizator



-f1 = F1 opreşte sistemul
-f2 = F2 resetează
 login = utilizator
 logout = opreşte sesiunea
 numlock = numlock
 password = parolă
+restart = resetează
 shell = shell
+shutdown = opreşte sistemul
 wayland = wayland
 xinitrc = xinitrc
--- a/res/lang/ru.ini
+++ b/res/lang/ru.ini
@@ -34,12 +34,12 @@ err_user_init = не удалось инициализировать польз
 err_user_uid = не удалось установить UID пользователя
 err_xsessions_dir = не удалось найти сессионную папку
 err_xsessions_open = не удалось открыть сессионную папку
-f1 = F1 выключить
-f2 = F2 перезагрузить
 login = логин
 logout = logged out
 numlock = numlock
 password = пароль
+restart = перезагрузить
 shell = shell
+shutdown = выключить
 wayland = wayland
 xinitrc = xinitrc
--- a/res/lang/sr.ini
+++ b/res/lang/sr.ini
@@ -25,7 +25,7 @@ err_pam_session = greska sesije
 err_pam_sys = greska sistema
 err_pam_user_unknown = nepoznat korisnik
 err_path = neuspjelo postavljanje path-a
-err_perm_dir = neuspjelo mijenjanje foldera 
+err_perm_dir = neuspjelo mijenjanje foldera
 err_perm_group = neuspjesno snizavanje dozvola grupe
 err_perm_user = neuspijesno snizavanje dozvola korisnika
 err_pwnam = neuspijesno skupljanje informacija o korisniku
@@ -33,13 +33,13 @@ err_user_gid = neuspijesno postavljanje korisničkog GID-a
 err_user_init = neuspijensa inicijalizacija korisnika
 err_user_uid = neuspijesno postavljanje UID-a korisnika
 err_xsessions_dir = neuspijesno pronalazenje foldera sesija
-err_xsessions_open = neuspijesno otvaranje foldera sesija 
-f1 = F1 ugasi
-f2 = F2 ponovo pokreni
+err_xsessions_open = neuspijesno otvaranje foldera sesija
 login = korisnik
 logout = izlogovan
 numlock = numlock
 password = lozinka
+restart = ponovo pokreni
 shell = shell
+shutdown = ugasi
 wayland = wayland
 xinitrc = xinitrc
--- a/res/lang/sv.ini
+++ b/res/lang/sv.ini
@@ -6,7 +6,7 @@ err_console_dev = misslyckades att komma åt konsol
 err_dgn_oob = loggmeddelande
 err_domain = okänd domän
 err_hostname = misslyckades att hämta värdnamn
-err_mlock = misslyckades att låsa lösenordsminne 
+err_mlock = misslyckades att låsa lösenordsminne
 err_null = nullpekare
 err_pam = pam-transaktion misslyckades
 err_pam_abort = pam-transaktion avbröts
@@ -34,12 +34,12 @@ err_user_init = misslyckades att initialisera användaren
 err_user_uid = misslyckades att ställa in användar-UID
 err_xsessions_dir = misslyckades att hitta sessionskatalog
 err_xsessions_open = misslyckades att öppna sessionskatalog
-f1 = F1 stäng av
-f2 = F2 starta om
 login = inloggning
 logout = utloggad
 numlock = numlock
 password = lösenord
+restart = starta om
 shell = skal
+shutdown = stäng av
 wayland = wayland
 xinitrc = xinitrc
--- a/res/lang/tr.ini
+++ b/res/lang/tr.ini
@@ -34,12 +34,12 @@ err_user_init = kullanici oturumu baslatilamadi
 err_user_uid = kullanici icin UID ayarlanamadi
 err_xsessions_dir = oturumlar klasoru bulunamadi
 err_xsessions_open = oturumlar klasoru acilamadi
-f1 = F1 makineyi kapat
-f2 = F2 yeniden baslat
 login = kullanici
 logout = oturumdan cikis yapildi
 numlock = numlock
 password = sifre
+restart = yeniden baslat
 shell = shell
+shutdown = makineyi kapat
 wayland = wayland
 xinitrc = xinitrc
--- a/res/lang/uk.ini
+++ b/res/lang/uk.ini
@@ -34,12 +34,12 @@ err_user_init = не вдалося ініціалізувати користу
 err_user_uid = не вдалося змінити UID користувача
 err_xsessions_dir = не вдалося знайти каталог сесій
 err_xsessions_open = не вдалося відкрити каталог сесій
-f1 = F1 вимкнути
-f2 = F2 перезавантажити
 login = логін
 logout = вийти
 numlock = numlock
 password = пароль
+restart = перезавантажити
 shell = оболонка
+shutdown = вимкнути
 wayland = wayland
 xinitrc = xinitrc