Default laptop key set to capslock. Keys that can be set to fenrir key or script key selectable via checkbox.

internal/app/startup.go

@@ -52,22 +52,22 @@ func (disabledVoice) Toggle_mute() bool           { return true }
 func (disabledVoice) Errors() <-chan error        { return nil }
 func (disabledVoice) Close()                      {}
 
-func Start(ctx context.Context, settings config.Settings, configPath string, bindings []input.Binding) error {
+func Start(ctx context.Context, settings config.Settings, configPath string, bindings input.Layout) error {
 	return Start_with_ready(ctx, settings, configPath, bindings, nil)
 }
 
 // Start_with_ready reports console startup after the first screen and input poll.
 // A failed notification tears down the reader and releases its keyboards.
-func Start_with_ready(ctx context.Context, settings config.Settings, configPath string, bindings []input.Binding, ready func() error) error {
+func Start_with_ready(ctx context.Context, settings config.Settings, configPath string, bindings input.Layout, ready func() error) error {
 	return start(ctx, settings, false, configPath, bindings, ready)
 }
 
 // Start_terminal runs the same reader and command dispatcher in an X11 PTY.
-func Start_terminal(ctx context.Context, settings config.Settings, configPath string, bindings []input.Binding) error {
+func Start_terminal(ctx context.Context, settings config.Settings, configPath string, bindings input.Layout) error {
 	return start(ctx, settings, true, configPath, bindings, nil)
 }
 
-func start(ctx context.Context, settings config.Settings, terminalMode bool, configPath string, bindings []input.Binding, ready func() error) (result error) {
+func start(ctx context.Context, settings config.Settings, terminalMode bool, configPath string, bindings input.Layout, ready func() error) (result error) {
 	if err := settings.Validate(); err != nil {
 		return err
 	}
@@ -80,6 +80,13 @@ func start(ctx context.Context, settings config.Settings, terminalMode bool, con
 	if err != nil {
 		return err
 	}
+	if err := router.Configure_modifiers(settings.Keyboard.FenrirKeys, settings.General.ScriptKeys); err != nil {
+		return err
+	}
+	settings.Keyboard.FenrirKeys = router.Fenrir_keys()
+	if err := settings.Validate(); err != nil {
+		return err
+	}
 	if err := router.Set_multi_press_timeout(time.Duration(settings.Keyboard.MultiPressTimeoutMS) * time.Millisecond); err != nil {
 		return err
 	}
@@ -174,7 +181,7 @@ func start(ctx context.Context, settings config.Settings, terminalMode bool, con
 	}
 	transfers := clipboard.New_worker(ctx, paste)
 	defer transfers.Close()
-	result = Run(ctx, source, keyboards, voices, RunOptions{Ready: ready, Spellcheck: spellChecker, Bindings: bindings, Settings: settings, EffectiveSpeech: effectiveSpeech, Punctuation: punctuationProcessor, Sounds: cues, ConfigPath: configPath, Clipboard: transfers, ClipboardHistory: historyStore, SettingsChoices: preferences.Discover_choices, Scripts: scriptCommands, ScriptRunner: scriptRunner, Remote: remote, TerminalMode: terminalMode})
+	result = Run(ctx, source, keyboards, voices, RunOptions{Ready: ready, Spellcheck: spellChecker, Bindings: bindings.Bindings, Settings: settings, EffectiveSpeech: effectiveSpeech, Punctuation: punctuationProcessor, Sounds: cues, ConfigPath: configPath, Clipboard: transfers, ClipboardHistory: historyStore, SettingsChoices: preferences.Discover_choices, Scripts: scriptCommands, ScriptRunner: scriptRunner, Remote: remote, TerminalMode: terminalMode})
 	if result == nil && player != nil {
 		if err := player.Finish(context.Background()); err != nil {
 			slog.Warn("shutdown sound incomplete", "error", err, "at", time.Now())