diff --git a/internal/app/application_alias_test.go b/internal/app/application_alias_test.go index 4eb190c7..08e29ab5 100644 --- a/internal/app/application_alias_test.go +++ b/internal/app/application_alias_test.go @@ -13,7 +13,7 @@ import ( "time" "git.stormux.org/storm/fenrir/internal/control" - "git.stormux.org/storm/fenrir/internal/interaction" + "git.stormux.org/storm/screenreader-common/internalui" ) func TestApplicationAliasesShellCheck(t *testing.T) { @@ -131,17 +131,17 @@ func TestApplicationsMenuCopiesAliasWithoutSelecting(t *testing.T) { a, voice := persistenceApplication(t, true) overrideRead(t, a, overrideScreen(1, "ninjam")) a.openApplications() - a.ui.handle(interaction.Key{Name: "tab"}) - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "tab"}) + a.ui.handle(internalui.Key{Name: "enter"}) if got := voice.messages[len(voice.messages)-1]; got != "Default has no application alias" { t.Fatal(got) } - a.ui.handle(interaction.Key{Name: "tab", Shift: true}) + a.ui.handle(internalui.Key{Name: "tab", Shift: true}) // Use the list's prefix search, then Tab to the copy button. - a.ui.handle(interaction.Key{Text: "n"}) - a.ui.handle(interaction.Key{Text: "i"}) - a.ui.handle(interaction.Key{Name: "tab"}) - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Text: "n"}) + a.ui.handle(internalui.Key{Text: "i"}) + a.ui.handle(internalui.Key{Name: "tab"}) + a.ui.handle(internalui.Key{Name: "enter"}) if !a.ui.active || len(a.overrides) != 0 { t.Fatal("copy closed menu or selected an override") } @@ -149,5 +149,5 @@ func TestApplicationsMenuCopiesAliasWithoutSelecting(t *testing.T) { if !ok || text != applicationAlias("ninjam", "") { t.Fatal("wrong clipboard contents", text) } - a.ui.handle(interaction.Key{Name: "escape"}) + a.ui.handle(internalui.Key{Name: "escape"}) } diff --git a/internal/app/application_overrides.go b/internal/app/application_overrides.go index c88ae980..edac0ab1 100644 --- a/internal/app/application_overrides.go +++ b/internal/app/application_overrides.go @@ -15,11 +15,11 @@ import ( "git.stormux.org/storm/fenrir/internal/applicationoverrides/rogue" "git.stormux.org/storm/fenrir/internal/config" "git.stormux.org/storm/fenrir/internal/i18n" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/presentation" "git.stormux.org/storm/fenrir/internal/prompt" "git.stormux.org/storm/fenrir/internal/reader" "git.stormux.org/storm/fenrir/internal/screen" + "git.stormux.org/storm/screenreader-common/internalui" ) type overrideSnapshot struct { @@ -362,10 +362,10 @@ func (a *application) openApplications() { if selected := a.overrides[a.lastTerminal]; selected != nil { position = slices.Index(ids, selected.id) } - session, err := interaction.NewSession(interaction.Form{Type: interaction.TabForm, Title: "Applications", Tabs: []interaction.Tab{{ID: "applications", Label: "Applications", Controls: []interaction.Control{ - {ID: "application", Label: "Application", Kind: interaction.List, Items: items, Selected: position, Action: "activate"}, - {ID: "copy_alias", Label: "Copy alias to clipboard", Kind: interaction.Button, Action: "copy_alias"}, - {ID: "cancel", Label: "Cancel", Kind: interaction.Button, Action: "cancel"}, + session, err := newInternalUISession(internalui.Form{Type: internalui.TabForm, Title: "Applications", Tabs: []internalui.Tab{{ID: "applications", Label: "Applications", Controls: []internalui.Control{ + {ID: "application", Label: "Application", Kind: internalui.List, Items: items, Selected: position, Action: "activate"}, + {ID: "copy_alias", Label: "Copy alias to clipboard", Kind: internalui.Button, Action: "copy_alias"}, + {ID: "cancel", Label: "Cancel", Kind: internalui.Button, Action: "cancel"}, }}}}) if err != nil { a.ui.failed("Could not open Applications: {0}", err) @@ -375,9 +375,9 @@ func (a *application) openApplications() { a.ui.failed("Could not open Applications: {0}", err) return } - session.Handle(interaction.Key{Name: "tab"}) // Start on the list, not its tab strip. + session.Handle(internalui.Key{Name: "tab"}) // Start on the list, not its tab strip. a.ui.session = session - a.ui.action = func(action string, session *interaction.Session) { + a.ui.action = func(action string, session *internalui.Session) { if action == "cancel" { a.ui.close() return diff --git a/internal/app/application_overrides_test.go b/internal/app/application_overrides_test.go index 9c241844..b9f7a1af 100644 --- a/internal/app/application_overrides_test.go +++ b/internal/app/application_overrides_test.go @@ -17,9 +17,9 @@ import ( "git.stormux.org/storm/fenrir/internal/command" "git.stormux.org/storm/fenrir/internal/config" "git.stormux.org/storm/fenrir/internal/input" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/screen" "git.stormux.org/storm/fenrir/internal/speech" + "git.stormux.org/storm/screenreader-common/internalui" ) func overrideScreen(terminal int, kind string) screen.Snapshot { @@ -49,11 +49,11 @@ func TestRogueMenuSelectionNamedReadProfileAndShellExit(t *testing.T) { a, voice := persistenceApplication(t, true) overrideRead(t, a, overrideScreen(1, "rogue")) a.openApplications() - a.ui.handle(interaction.Key{Text: "r"}) + a.ui.handle(internalui.Key{Text: "r"}) if got := voice.messages[len(voice.messages)-1]; got != "Rogue" { t.Fatal(got) } - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "enter"}) overrideRead(t, a, overrideScreen(1, "rogue")) if a.overrideCurrent == nil || a.overrideCurrent.id != "rogue" { t.Fatal("Rogue not activated") @@ -228,7 +228,7 @@ func TestApplicationsMenuActivatesOnlyOnEnterAndReleasesCapture(t *testing.T) { {"down", "Codex"}, {"up", "Rogue"}, } { - a.ui.handle(interaction.Key{Name: step.key}) + a.ui.handle(internalui.Key{Name: step.key}) if got := voice.messages[len(voice.messages)-1]; got != step.want { t.Fatalf("%s announcement = %q, want %q", step.key, got, step.want) } @@ -236,14 +236,14 @@ func TestApplicationsMenuActivatesOnlyOnEnterAndReleasesCapture(t *testing.T) { if len(a.overrides) != 0 { t.Fatal("navigation activated override") } - a.ui.handle(interaction.Key{Name: "escape"}) + a.ui.handle(internalui.Key{Name: "escape"}) if len(a.overrides) != 0 || a.ui.active { t.Fatal("cancel activated override") } a.openApplications() - a.ui.handle(interaction.Key{Name: "down"}) - a.ui.handle(interaction.Key{Name: "down"}) - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "down"}) + a.ui.handle(internalui.Key{Name: "down"}) + a.ui.handle(internalui.Key{Name: "enter"}) if a.ui.active || a.overrides[1] == nil || a.overrides[1].id != "ninjam" { t.Fatal("activation failed") } @@ -255,17 +255,17 @@ func TestApplicationsMenuActivatesOnlyOnEnterAndReleasesCapture(t *testing.T) { if a.ui.session.Values()["applications.application"].Selected != 2 { t.Fatal("active item not selected") } - a.ui.handle(interaction.Key{Name: "tab"}) - a.ui.handle(interaction.Key{Name: "tab"}) // Skip Copy alias to reach Cancel. - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "tab"}) + a.ui.handle(internalui.Key{Name: "tab"}) // Skip Copy alias to reach Cancel. + a.ui.handle(internalui.Key{Name: "enter"}) if a.ui.active || a.overrides[1] == nil { t.Fatal("Cancel button changed selection") } a.openApplications() - a.ui.handle(interaction.Key{Name: "down"}) // Rogue - a.ui.handle(interaction.Key{Name: "down"}) // Codex - a.ui.handle(interaction.Key{Name: "down"}) // list wraps to Default - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "down"}) // Rogue + a.ui.handle(internalui.Key{Name: "down"}) // Codex + a.ui.handle(internalui.Key{Name: "down"}) // list wraps to Default + a.ui.handle(internalui.Key{Name: "enter"}) if a.savesUnavailable() || a.engine.TrackingMode() != "cursor" { t.Fatal("default failed") } @@ -276,7 +276,7 @@ func TestApplicationsMenuPrefixSearch(t *testing.T) { overrideRead(t, a, overrideScreen(1, "ninjam")) a.openApplications() for _, step := range []struct{ text, want string }{{"n", "NetworkManager"}, {"i", "Ninjam"}} { - a.ui.handle(interaction.Key{Text: step.text}) + a.ui.handle(internalui.Key{Text: step.text}) if got := voice.messages[len(voice.messages)-1]; got != step.want { t.Fatalf("typed %q: got %q, want %q", step.text, got, step.want) } @@ -284,7 +284,7 @@ func TestApplicationsMenuPrefixSearch(t *testing.T) { t.Fatal("search activated an override or closed the menu") } } - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "enter"}) if a.ui.active || a.overrides[1] == nil || a.overrides[1].id != "ninjam" { t.Fatal("Enter did not activate the search result") } @@ -337,9 +337,9 @@ func TestOverrideSavesOwnDraftAndRestoresSession(t *testing.T) { if control, ok := a.ui.session.FocusedControl(); ok && control.Action == "save" { break } - a.ui.handle(interaction.Key{Name: "tab"}) + a.ui.handle(internalui.Key{Name: "tab"}) } - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "enter"}) finishPersistence(t, a, false) a.ui.close() a.selectOverride("default") @@ -589,9 +589,9 @@ func TestApplicationMenuPreservesSessionTogglesAndLaunchChoices(t *testing.T) { if control, ok := a.ui.session.FocusedControl(); ok && control.Action == "save" { break } - a.ui.handle(interaction.Key{Name: "tab"}) + a.ui.handle(internalui.Key{Name: "tab"}) } - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "enter"}) finishPersistence(t, a, false) if !a.muted || a.engine.AutomaticReading() || a.settings.live.Keyboard.Layout != "desktop" || a.settings.live.Presentation.Speech.Driver != "speech-dispatcher" || a.settings.live.Presentation.Speech.Voice != "" { t.Fatal("menu changed session toggles or launch-only choices") diff --git a/internal/app/attributes_test.go b/internal/app/attributes_test.go index 6eddc163..ee0f6f8a 100644 --- a/internal/app/attributes_test.go +++ b/internal/app/attributes_test.go @@ -15,9 +15,9 @@ import ( "git.stormux.org/storm/fenrir/internal/command" "git.stormux.org/storm/fenrir/internal/config" "git.stormux.org/storm/fenrir/internal/input" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/presentation" "git.stormux.org/storm/fenrir/internal/screen" + "git.stormux.org/storm/screenreader-common/internalui" ) func TestQuickAttributesChoicesMenuCancelSaveAndRestart(t *testing.T) { @@ -57,7 +57,7 @@ func TestQuickAttributesChoicesMenuCancelSaveAndRestart(t *testing.T) { if control.Choices[control.Selected].ID != "both" { t.Fatal("menu lost quick choice", control) } - ui.handle(interaction.Key{Name: "escape"}) + ui.handle(internalui.Key{Name: "escape"}) saved, _, err := config.Load(path, nil) if err != nil || saved.Reading.Attributes != "none" { t.Fatal("cancel saved choice", saved.Reading, err) @@ -174,7 +174,7 @@ func TestMenuAttributesAppliesOnlyAfterSuccessfulSave(t *testing.T) { step := 0 keys.poll = func(_ bool, handle func(input.Decision)) error { step++ - key := func(name string) { handle(input.Decision{UI: &interaction.Key{Name: name}}) } + key := func(name string) { handle(input.Decision{UI: &internalui.Key{Name: name}}) } switch step { case 1: handle(input.Decision{Command: command.FenrirMenu}) diff --git a/internal/app/date_time_test.go b/internal/app/date_time_test.go index 16f85500..c780c92c 100644 --- a/internal/app/date_time_test.go +++ b/internal/app/date_time_test.go @@ -14,9 +14,9 @@ import ( "git.stormux.org/storm/fenrir/internal/command" "git.stormux.org/storm/fenrir/internal/config" "git.stormux.org/storm/fenrir/internal/input" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/screen" "git.stormux.org/storm/screenreader-common/datetime" + "git.stormux.org/storm/screenreader-common/internalui" ) func TestTimeDateMenuAppliesOnlyAfterSave(t *testing.T) { @@ -47,7 +47,7 @@ func TestTimeDateMenuAppliesOnlyAfterSave(t *testing.T) { step := 0 keys.poll = func(_ bool, handle func(input.Decision)) error { step++ - key := func(name string, shift bool) { handle(input.Decision{UI: &interaction.Key{Name: name, Shift: shift}}) } + key := func(name string, shift bool) { handle(input.Decision{UI: &internalui.Key{Name: name, Shift: shift}}) } switch step { case 1: handle(input.Decision{Command: command.FenrirMenu}) diff --git a/internal/app/emoji_menu.go b/internal/app/emoji_menu.go index 4a1cc480..ab3926d5 100644 --- a/internal/app/emoji_menu.go +++ b/internal/app/emoji_menu.go @@ -7,8 +7,8 @@ package app import ( "git.stormux.org/storm/fenrir/internal/emoji" "git.stormux.org/storm/fenrir/internal/i18n" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/presentation" + "git.stormux.org/storm/screenreader-common/internalui" ) func (ui *internalUI) openEmoji(clipboards *clipboardHost) { @@ -23,7 +23,7 @@ func (ui *internalUI) openEmoji(clipboards *clipboardHost) { } ui.configureSession(session) ui.session = session - ui.action = func(action string, session *interaction.Session) { + ui.action = func(action string, session *internalui.Session) { if action != "copy_emoji" { return } diff --git a/internal/app/emoji_menu_test.go b/internal/app/emoji_menu_test.go index ecee2e4e..22c01f2b 100644 --- a/internal/app/emoji_menu_test.go +++ b/internal/app/emoji_menu_test.go @@ -12,7 +12,7 @@ import ( "git.stormux.org/storm/fenrir/internal/clipboard" "git.stormux.org/storm/fenrir/internal/command" - "git.stormux.org/storm/fenrir/internal/interaction" + "git.stormux.org/storm/screenreader-common/internalui" ) func TestEmojiMenuCancellationCopyAndStaleClipboardSync(t *testing.T) { @@ -28,22 +28,22 @@ func TestEmojiMenuCancellationCopyAndStaleClipboardSync(t *testing.T) { if voice.messages[0] != "Emoji Menu. All tab" { t.Fatal(voice.messages) } - ui.handle(interaction.Key{Name: "tab"}) - ui.handle(interaction.Key{Text: query}) - ui.handle(interaction.Key{Name: "escape"}) + ui.handle(internalui.Key{Name: "tab"}) + ui.handle(internalui.Key{Text: query}) + ui.handle(internalui.Key{Name: "escape"}) if got, _ := host.history.Current(); got != "original" || host.revision != stale.Revision { t.Fatal("cancel changed clipboard", got) } ui.openEmoji(host) - ui.handle(interaction.Key{Name: "tab"}) - ui.handle(interaction.Key{Text: query + "zzzz"}) - ui.handle(interaction.Key{Name: "enter"}) + ui.handle(internalui.Key{Name: "tab"}) + ui.handle(internalui.Key{Text: query + "zzzz"}) + ui.handle(internalui.Key{Name: "enter"}) if !ui.active { t.Fatal("empty results closed menu") } - ui.handle(interaction.Key{Name: "backspace", Ctrl: true}) - ui.handle(interaction.Key{Text: query}) - ui.handle(interaction.Key{Name: "enter"}) + ui.handle(internalui.Key{Name: "backspace", Ctrl: true}) + ui.handle(internalui.Key{Text: query}) + ui.handle(internalui.Key{Name: "enter"}) want := map[string]string{"Jack": "🎃", "Black cat": "🐈‍⬛", "United States": "🇺🇸", "Coffin": "⚰️"}[query] if got, _ := host.history.Current(); got != want || ui.active || !host.dirty { t.Fatal("selection not copied", got, ui.active, host.dirty) diff --git a/internal/app/fenrir_menu.go b/internal/app/fenrir_menu.go index 89bcb078..1ebd2bb7 100644 --- a/internal/app/fenrir_menu.go +++ b/internal/app/fenrir_menu.go @@ -22,8 +22,8 @@ import ( "errors" "git.stormux.org/storm/fenrir/internal/config" "git.stormux.org/storm/fenrir/internal/i18n" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/preferences" + "git.stormux.org/storm/screenreader-common/internalui" "strings" ) @@ -43,7 +43,7 @@ func (ui *internalUI) openSettingsContext(settings config.Settings, path string, } if ui.previewSpelling != nil { ui.onClosed = func() { ui.previewSpelling(settings.Reading) } - ui.changed = func(session *interaction.Session) { + ui.changed = func(session *internalui.Session) { values := session.Values() draft := settings.Reading draft.Spellcheck = values["reading.spellcheck"].Checked @@ -92,7 +92,7 @@ func (ui *internalUI) openSettingsContext(settings config.Settings, path string, if ui.discoverChoices != nil { discovery = ui.discoverChoices(doc.Settings) } - var session *interaction.Session + var session *internalui.Session if applicationBase != nil { session, err = preferences.NewApplicationSession(doc.Settings, doc.Order, title, discovery.Choices(doc.Settings)) } else { @@ -107,7 +107,7 @@ func (ui *internalUI) openSettingsContext(settings config.Settings, path string, if applicationBase != nil { baseReadSettings = preferences.ApplicationSettings } - readSettings := func(s *interaction.Session, base config.Settings) (config.Settings, error) { + readSettings := func(s *internalui.Session, base config.Settings) (config.Settings, error) { next, err := baseReadSettings(s, base) next.VoiceProfiles = profileDraft.Clone() return next, err @@ -117,7 +117,7 @@ func (ui *internalUI) openSettingsContext(settings config.Settings, path string, pending := map[string]bool{} var tested config.Speech var testSequence uint64 - previewSpeech := func(session *interaction.Session) { + previewSpeech := func(session *internalui.Session) { if ui.previewSpeech == nil { return } @@ -125,7 +125,7 @@ func (ui *internalUI) openSettingsContext(settings config.Settings, path string, ui.previewSpeech(draft.Presentation.Speech) } } - changed := func(session *interaction.Session) { + changed := func(session *internalui.Session) { if previewChanged != nil { previewChanged(session) } @@ -174,8 +174,8 @@ func (ui *internalUI) openSettingsContext(settings config.Settings, path string, }}) }(previous) } - var action func(string, *interaction.Session) - action = func(name string, session *interaction.Session) { + var action func(string, *internalui.Session) + action = func(name string, session *internalui.Session) { if strings.HasSuffix(name, "-profile") && applicationBase == nil { draft, err := readSettings(session, doc.Settings) if err != nil { diff --git a/internal/app/hardware_form_test.go b/internal/app/hardware_form_test.go index 54d8c0e0..73a49364 100644 --- a/internal/app/hardware_form_test.go +++ b/internal/app/hardware_form_test.go @@ -14,9 +14,9 @@ import ( "time" "git.stormux.org/storm/fenrir/internal/config" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/preferences" "git.stormux.org/storm/fenrir/internal/speech" + "git.stormux.org/storm/screenreader-common/internalui" ) func focusUiControl(t *testing.T, ui *internalUI, id string) { @@ -25,7 +25,7 @@ func focusUiControl(t *testing.T, ui *internalUI, id string) { if control, ok := ui.session.FocusedControl(); ok && control.ID == id { return } - ui.handle(interaction.Key{Name: "tab"}) + ui.handle(internalui.Key{Name: "tab"}) } t.Fatal("control not reachable", id) } @@ -42,11 +42,11 @@ func hardwareFormApplication(t *testing.T) (*application, string, *fakeVoice) { receiveUi(t, a.ui) t.Cleanup(func() { a.ui.close(); a.ui.testWorkers.Wait() }) focusUiControl(t, a.ui, "speech.driver") - a.ui.handle(interaction.Key{Name: "down"}) + a.ui.handle(internalui.Key{Name: "down"}) focusUiControl(t, a.ui, "speech.hardware_device") - a.ui.handle(interaction.Key{Text: "/dev/fixture-synth"}) + a.ui.handle(internalui.Key{Text: "/dev/fixture-synth"}) focusUiControl(t, a.ui, "speech.hardware_baud_rate") - a.ui.handle(interaction.Key{Name: "end"}) + a.ui.handle(internalui.Key{Name: "end"}) return a, path, voice } @@ -64,7 +64,7 @@ func TestHardwarePreviewUsesUnsavedDraftAndSaveKeepsActiveDriver(t *testing.T) { return ctx.Err() } focusUiControl(t, a.ui, "speech.test") - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "enter"}) select { case selected := <-requested: if selected.Driver != "dectalk" || selected.HardwareDevice != "/dev/fixture-synth" || selected.HardwareBaudRate != 115200 { @@ -80,15 +80,15 @@ func TestHardwarePreviewUsesUnsavedDraftAndSaveKeepsActiveDriver(t *testing.T) { t.Fatal("test replaced active driver or closed menu") } focusUiControl(t, a.ui, "speech.hardware_device") - a.ui.handle(interaction.Key{Ctrl: true, Text: "a"}) - a.ui.handle(interaction.Key{Text: "/dev/fixture-updated"}) + a.ui.handle(internalui.Key{Ctrl: true, Text: "a"}) + a.ui.handle(internalui.Key{Text: "/dev/fixture-updated"}) select { case <-stopped: case <-time.After(time.Second): t.Fatal("editing did not cancel preview") } focusUiControl(t, a.ui, "ok") - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "enter"}) finishPersistence(t, a, false) saved, _, err := config.Load(path, nil) if err != nil || saved.Presentation.Speech.HardwareDevice != "/dev/fixture-updated" || saved.Presentation.Speech.HardwareBaudRate != 115200 { @@ -106,7 +106,7 @@ func TestHardwarePreviewFailureAndCloseDoNotWriteOrDeliverStaleFeedback(t *testi return errors.New("fixture port unavailable") } focusUiControl(t, a.ui, "speech.test") - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "enter"}) receiveUi(t, a.ui) if got := voice.messages[len(voice.messages)-1]; !strings.Contains(got, "Voice test failed") || !strings.Contains(got, "fixture port unavailable") { t.Fatal(got) @@ -118,7 +118,7 @@ func TestHardwarePreviewFailureAndCloseDoNotWriteOrDeliverStaleFeedback(t *testi <-release return errors.New("stale fixture failure") } - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "enter"}) select { case <-started: case <-time.After(time.Second): @@ -189,7 +189,7 @@ func TestDriverCatalogArrivesWithoutOverwritingAnotherDriverOrMovingFocus(t *tes receiveUi(t, a.ui) <-queries focusUiControl(t, a.ui, "speech.driver") - a.ui.handle(interaction.Key{Name: "home"}) + a.ui.handle(internalui.Key{Name: "home"}) select { case id := <-queries: if id != "speech-dispatcher" { @@ -198,13 +198,13 @@ func TestDriverCatalogArrivesWithoutOverwritingAnotherDriverOrMovingFocus(t *tes case <-time.After(time.Second): t.Fatal("new driver catalog not requested") } - a.ui.handle(interaction.Key{Name: "down"}) + a.ui.handle(internalui.Key{Name: "down"}) releases <- struct{}{} receiveUi(t, a.ui) if !a.ui.session.Values()["presentation.speech.module"].Hidden { t.Fatal("stale catalog changed driver visibility") } - a.ui.handle(interaction.Key{Name: "home"}) + a.ui.handle(internalui.Key{Name: "home"}) control, _ := a.ui.session.FocusedControl() if control.ID != "speech.driver" || len(a.ui.session.Values()["presentation.speech.module"].Choices) != 2 { t.Fatal("catalog/focus not restored", control) diff --git a/internal/app/indentation_test.go b/internal/app/indentation_test.go index 21b4b06d..64688117 100644 --- a/internal/app/indentation_test.go +++ b/internal/app/indentation_test.go @@ -15,8 +15,8 @@ import ( "git.stormux.org/storm/fenrir/internal/command" "git.stormux.org/storm/fenrir/internal/config" "git.stormux.org/storm/fenrir/internal/input" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/screen" + "git.stormux.org/storm/screenreader-common/internalui" ) type unavailableIndentationSounds struct{ fakeSounds } @@ -103,7 +103,7 @@ func TestQuickIndentationChoicesMenuCancelSaveAndRestart(t *testing.T) { if control.Choices[control.Selected].ID != "both" { t.Fatal("menu lost quick choice", control) } - ui.handle(interaction.Key{Name: "escape"}) + ui.handle(internalui.Key{Name: "escape"}) saved, _, err := config.Load(path, nil) if err != nil || saved.Reading.Indentation != "none" { t.Fatal("cancel saved choice", saved.Reading, err) @@ -161,7 +161,7 @@ func TestMenuIndentationAppliesOnlyAfterSuccessfulSave(t *testing.T) { step := 0 keys.poll = func(_ bool, handle func(input.Decision)) error { step++ - key := func(name string) { handle(input.Decision{UI: &interaction.Key{Name: name}}) } + key := func(name string) { handle(input.Decision{UI: &internalui.Key{Name: name}}) } switch step { case 1: handle(input.Decision{Command: command.FenrirMenu}) diff --git a/internal/app/internal_ui.go b/internal/app/internal_ui.go index 9c839d64..96221a79 100644 --- a/internal/app/internal_ui.go +++ b/internal/app/internal_ui.go @@ -26,8 +26,8 @@ import ( "git.stormux.org/storm/fenrir/internal/config" "git.stormux.org/storm/fenrir/internal/i18n" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/preferences" + "git.stormux.org/storm/screenreader-common/internalui" ) // internalUI is the host boundary for every form type and feature. All state @@ -45,12 +45,12 @@ type internalUI struct { tutorial *tutorialMode name string generation uint64 - session *interaction.Session - action func(string, *interaction.Session) + session *internalui.Session + action func(string, *internalui.Session) updates chan uiUpdate saveSettings func(*config.Document, config.Settings, func(error)) bool discoverChoices func(config.Settings) preferences.Discovery - changed func(*interaction.Session) + changed func(*internalui.Session) returnToParent func() onClosed func() gridSettings func() config.InternalUI @@ -69,13 +69,18 @@ type uiUpdate struct { apply func() // Event-loop-only completion; guarded by menu generation. discovery *preferences.Discovery generation uint64 - session *interaction.Session - action func(string, *interaction.Session) + session *internalui.Session + action func(string, *internalui.Session) speech string - changed func(*interaction.Session) + changed func(*internalui.Session) close bool } +// newInternalUISession opens a shared toolkit session with Fenrir's catalog. +func newInternalUISession(form internalui.Form) (*internalui.Session, error) { + return internalui.NewSession(form, internalui.Messages{Translate: i18n.T}) +} + func newInternalUi(ctx context.Context, keys Keyboards, voice Speaker) *internalUI { ui := &internalUI{ctx: ctx, keys: keys, voice: voice, updates: make(chan uiUpdate, 8)} ui.testSpeech = ui.testSynthesizer @@ -182,14 +187,14 @@ func (ui *internalUI) update(update uiUpdate) { } } -func (ui *internalUI) configureSession(session *interaction.Session) { +func (ui *internalUI) configureSession(session *internalui.Session) { if ui.gridSettings != nil { settings := ui.gridSettings() session.ConfigureGrid(settings.AnnounceGridCoordinates, settings.AnnounceItemPosition) } } -func (ui *internalUI) handle(key interaction.Key) { +func (ui *internalUI) handle(key internalui.Key) { if key.Name == "escape" { if ui.returnToParent != nil { ui.returnToParent() @@ -221,7 +226,7 @@ func (ui *internalUI) handle(key interaction.Key) { } else { result.Speech = i18n.T("Copied") if strings.EqualFold(key.Text, "x") { - result = ui.session.Handle(interaction.Key{Name: "delete"}) + result = ui.session.Handle(internalui.Key{Name: "delete"}) result.Speech = i18n.T("Cut") } } diff --git a/internal/app/internal_ui_clipboard_test.go b/internal/app/internal_ui_clipboard_test.go index 4cafeffd..b8e5eae9 100644 --- a/internal/app/internal_ui_clipboard_test.go +++ b/internal/app/internal_ui_clipboard_test.go @@ -4,19 +4,19 @@ package app import ( "context" - "git.stormux.org/storm/fenrir/internal/interaction" + "git.stormux.org/storm/screenreader-common/internalui" "testing" ) func TestInternalUIClipboardCutFailurePasteAndSecretClose(t *testing.T) { ui := newInternalUi(context.Background(), &fakeKeys{}, &fakeVoice{}) - s, err := interaction.NewSession(interaction.Form{Type: interaction.TabForm, Title: "Edit", Tabs: []interaction.Tab{{ID: "p", Label: "Page", Controls: []interaction.Control{{ID: "e", Label: "Text", Kind: interaction.Entry, Text: "one two"}, {ID: "password", Label: "Password", Kind: interaction.Entry, Secret: true, Text: "private"}}}}}) + s, err := newInternalUISession(internalui.Form{Type: internalui.TabForm, Title: "Edit", Tabs: []internalui.Tab{{ID: "p", Label: "Page", Controls: []internalui.Control{{ID: "e", Label: "Text", Kind: internalui.Entry, Text: "one two"}, {ID: "password", Label: "Password", Kind: internalui.Entry, Secret: true, Text: "private"}}}}}) if err != nil { t.Fatal(err) } ui.active, ui.session = true, s - ui.handle(interaction.Key{Name: "tab"}) - ui.handle(interaction.Key{Name: "left", Ctrl: true, Shift: true}) + ui.handle(internalui.Key{Name: "tab"}) + ui.handle(internalui.Key{Name: "left", Ctrl: true, Shift: true}) copies := 0 ui.writeClipboard = func(text string) bool { copies++ @@ -25,23 +25,23 @@ func TestInternalUIClipboardCutFailurePasteAndSecretClose(t *testing.T) { } return false } - ui.handle(interaction.Key{Ctrl: true, Text: "x"}) + ui.handle(internalui.Key{Ctrl: true, Text: "x"}) if s.Values()["p.e"].Text != "one two" { t.Fatal("failed cut deleted text") } ui.writeClipboard = func(text string) bool { copies++; return text == "two" } - ui.handle(interaction.Key{Ctrl: true, Text: "x"}) + ui.handle(internalui.Key{Ctrl: true, Text: "x"}) if s.Values()["p.e"].Text != "one " { t.Fatal("successful cut failed") } ui.readClipboard = func() (string, bool) { return "猫", true } - ui.handle(interaction.Key{Ctrl: true, Text: "v"}) + ui.handle(internalui.Key{Ctrl: true, Text: "v"}) if s.Values()["p.e"].Text != "one 猫" { t.Fatal("paste failed") } - ui.handle(interaction.Key{Name: "tab"}) - ui.handle(interaction.Key{Ctrl: true, Text: "a"}) - ui.handle(interaction.Key{Ctrl: true, Text: "c"}) + ui.handle(internalui.Key{Name: "tab"}) + ui.handle(internalui.Key{Ctrl: true, Text: "a"}) + ui.handle(internalui.Key{Ctrl: true, Text: "c"}) if copies != 2 { t.Fatal("secret copied") } diff --git a/internal/app/internal_ui_settings_test.go b/internal/app/internal_ui_settings_test.go index 11ab8cc5..0fb1d73a 100644 --- a/internal/app/internal_ui_settings_test.go +++ b/internal/app/internal_ui_settings_test.go @@ -8,7 +8,7 @@ import ( "testing" "git.stormux.org/storm/fenrir/internal/config" - "git.stormux.org/storm/fenrir/internal/interaction" + "git.stormux.org/storm/screenreader-common/internalui" ) func TestInternalUIMenuSaveAndCancel(t *testing.T) { @@ -20,17 +20,17 @@ func TestInternalUIMenuSaveAndCancel(t *testing.T) { if count > 20 { t.Fatal("Internal UI tab missing") } - a.ui.handle(interaction.Key{Name: "right"}) + a.ui.handle(internalui.Key{Name: "right"}) } for range 2 { - a.ui.handle(interaction.Key{Name: "tab"}) - a.ui.handle(interaction.Key{Name: "space"}) + a.ui.handle(internalui.Key{Name: "tab"}) + a.ui.handle(internalui.Key{Name: "space"}) } if save { a.ui.action("save", a.ui.session) a.settingsSaveResult(committedMenuResult(t, a)) } else { - a.ui.handle(interaction.Key{Name: "escape"}) + a.ui.handle(internalui.Key{Name: "escape"}) } loaded, _, err := config.Load(a.options.ConfigPath, nil) want := config.InternalUI{AnnounceGridCoordinates: !save, AnnounceItemPosition: !save} @@ -38,11 +38,11 @@ func TestInternalUIMenuSaveAndCancel(t *testing.T) { t.Fatal("save/cancel diverged", loaded.InternalUI, a.settings.live.InternalUI, err) } a.ui.openEmoji(a.clipboards) - a.ui.handle(interaction.Key{Name: "tab"}) + a.ui.handle(internalui.Key{Name: "tab"}) got := voice.messages[len(voice.messages)-1] if strings.Contains(got, "row 1, column 1") != !save || strings.Contains(got, "1 of ") != !save { t.Fatal("Emoji did not use saved grid preferences", got) } - a.ui.handle(interaction.Key{Name: "escape"}) + a.ui.handle(internalui.Key{Name: "escape"}) } } diff --git a/internal/app/internal_ui_test.go b/internal/app/internal_ui_test.go index 1e0a38c5..f0167511 100644 --- a/internal/app/internal_ui_test.go +++ b/internal/app/internal_ui_test.go @@ -30,8 +30,8 @@ import ( "git.stormux.org/storm/fenrir/internal/command" "git.stormux.org/storm/fenrir/internal/config" "git.stormux.org/storm/fenrir/internal/input" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/screen" + "git.stormux.org/storm/screenreader-common/internalui" ) func settingsUiApplication(t *testing.T, keys *fakeKeys, voice *fakeVoice, path string) *application { @@ -70,12 +70,12 @@ func TestSettingsMenuCancelSaveAndReopen(t *testing.T) { t.Fatal(ui.active, voice.messages) } tabToControl(t, ui, "speech.rate") - ui.handle(interaction.Key{Name: "up"}) + ui.handle(internalui.Key{Name: "up"}) if action == "escape" { - ui.handle(interaction.Key{Name: "escape"}) + ui.handle(internalui.Key{Name: "escape"}) } else { tabToControl(t, ui, map[string]string{"save": "ok", "cancel": "cancel"}[action]) - ui.handle(interaction.Key{Name: "enter"}) + ui.handle(internalui.Key{Name: "enter"}) if action == "save" { finishPersistence(t, a, false) } @@ -130,7 +130,7 @@ func TestMenuSoundVolumeAppliesOnlyAfterSuccessfulSave(t *testing.T) { step := 0 keys.poll = func(_ bool, handle func(input.Decision)) error { step++ - key := func(name string, shift bool) { handle(input.Decision{UI: &interaction.Key{Name: name, Shift: shift}}) } + key := func(name string, shift bool) { handle(input.Decision{UI: &internalui.Key{Name: name, Shift: shift}}) } switch step { case 1: handle(input.Decision{Command: command.FenrirMenu}) @@ -203,8 +203,8 @@ func TestMenuSaveFailureRetainsEditsAndCapture(t *testing.T) { ui := a.ui ui.openSettings(config.Defaults(), path) receiveUi(t, ui) - ui.handle(interaction.Key{Name: "tab"}) - ui.handle(interaction.Key{Name: "space"}) // Speech enabled false. + ui.handle(internalui.Key{Name: "tab"}) + ui.handle(internalui.Key{Name: "space"}) // Speech enabled false. other := config.Defaults() other.Presentation.Speech.Rate = 12 if err := config.Save(path, other); err != nil { @@ -219,7 +219,7 @@ func TestMenuSaveFailureRetainsEditsAndCapture(t *testing.T) { if !strings.Contains(voice.messages[len(voice.messages)-1], "settings changed") { t.Fatal(voice.messages) } - ui.handle(interaction.Key{Name: "escape"}) + ui.handle(internalui.Key{Name: "escape"}) settings, _, err := config.Load(path, nil) if err != nil || settings.Presentation.Speech.Rate != 12 { t.Fatal("external edit overwritten", settings, err) @@ -251,7 +251,7 @@ func TestInternalUICloseUsesTitleWithoutLoadedSessionAndOnlyOnce(t *testing.T) { if _, err := ui.begin(title); err != nil { t.Fatal(err) } - ui.handle(interaction.Key{Name: "escape"}) + ui.handle(internalui.Key{Name: "escape"}) ui.close() if ui.active || !reflect.DeepEqual(voice.messages, []string{title + " closed"}) || !reflect.DeepEqual(keys.captures, []bool{true, false}) { t.Fatal(title, ui.active, voice.messages, keys.captures) @@ -285,7 +285,7 @@ func TestMenuSuppressesBackgroundScreenAndRestoresCommands(t *testing.T) { } if step == 2 { handle(input.Decision{Command: command.PassNext}) // Blocked while UI owns input. - handle(input.Decision{UI: &interaction.Key{Name: "escape"}, Interrupt: true}) + handle(input.Decision{UI: &internalui.Key{Name: "escape"}, Interrupt: true}) handle(input.Decision{Command: command.CurrentLine, Interrupt: true}) handle(input.Decision{Command: command.Quit}) } @@ -355,7 +355,7 @@ func tabToControl(t *testing.T, ui *internalUI, id string) { if control, ok := ui.session.FocusedControl(); ok && control.ID == id { return } - ui.handle(interaction.Key{Name: "tab"}) + ui.handle(internalui.Key{Name: "tab"}) } t.Fatalf("control %s not reached with Tab", id) } diff --git a/internal/app/menu_save_test.go b/internal/app/menu_save_test.go index 03bcd92f..59a048cf 100644 --- a/internal/app/menu_save_test.go +++ b/internal/app/menu_save_test.go @@ -11,7 +11,7 @@ import ( "git.stormux.org/storm/fenrir/internal/command" "git.stormux.org/storm/fenrir/internal/config" "git.stormux.org/storm/fenrir/internal/input" - "git.stormux.org/storm/fenrir/internal/interaction" + "git.stormux.org/storm/screenreader-common/internalui" ) func admitMenuSave(t *testing.T, a *application) { @@ -19,7 +19,7 @@ func admitMenuSave(t *testing.T, a *application) { a.openSettings() receiveUi(t, a.ui) tabToControl(t, a.ui, "speech.rate") - a.ui.handle(interaction.Key{Name: "right"}) // Rate 24 -> 25. + a.ui.handle(internalui.Key{Name: "right"}) // Rate 24 -> 25. a.ui.action("save", a.ui.session) if !a.saver.busy || a.ui.session != nil { t.Fatal("menu save was not admitted") @@ -59,7 +59,7 @@ func TestMenuCommitSurvivesCloseAndHandoff(t *testing.T) { t.Fatal(err) } default: - a.ui.handle(interaction.Key{Name: "escape"}) + a.ui.handle(internalui.Key{Name: "escape"}) } if a.ui.active || a.keyboards.(*fakeKeys).captures[1] { t.Fatal("close did not release capture immediately") diff --git a/internal/app/notifications.go b/internal/app/notifications.go index a7e55e7f..48d45a99 100644 --- a/internal/app/notifications.go +++ b/internal/app/notifications.go @@ -15,10 +15,10 @@ import ( "git.stormux.org/storm/fenrir/internal/diagnostic" "git.stormux.org/storm/fenrir/internal/i18n" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/notifications" "git.stormux.org/storm/fenrir/internal/presentation" "git.stormux.org/storm/screenreader-common/datetime" + "git.stormux.org/storm/screenreader-common/internalui" ) const notificationLimit = notifications.Limit @@ -182,10 +182,10 @@ func (a *application) openNotifications() { timestamp, _ := datetime.FormatTime(a.settings.live.Presentation.DateTime.TimeFormat, entry.received) items = append(items, entry.text+" "+timestamp) } - session, err := interaction.NewSession(interaction.Form{Type: interaction.TabForm, Title: "Notifications", Tabs: []interaction.Tab{ - {ID: "notifications", Label: "Notifications", Controls: []interaction.Control{ - {ID: "history", Label: "Notifications", Kind: interaction.List, Items: items, Action: "repeat_notification"}, - {ID: "close", Label: "Close", Kind: interaction.Button, Action: "cancel"}, + session, err := newInternalUISession(internalui.Form{Type: internalui.TabForm, Title: "Notifications", Tabs: []internalui.Tab{ + {ID: "notifications", Label: "Notifications", Controls: []internalui.Control{ + {ID: "history", Label: "Notifications", Kind: internalui.List, Items: items, Action: "repeat_notification"}, + {ID: "close", Label: "Close", Kind: internalui.Button, Action: "cancel"}, }}, }}) if err != nil { @@ -196,9 +196,9 @@ func (a *application) openNotifications() { a.ui.failed("Could not open Notifications: {0}", err) return } - session.Handle(interaction.Key{Name: "tab"}) + session.Handle(internalui.Key{Name: "tab"}) a.ui.session = session - a.ui.action = func(action string, session *interaction.Session) { + a.ui.action = func(action string, session *internalui.Session) { if action == "repeat_notification" { control := session.Values()["notifications.history"] a.present(control.Items[control.Selected], "") diff --git a/internal/app/notifications_test.go b/internal/app/notifications_test.go index 3fc2a554..81ea65b4 100644 --- a/internal/app/notifications_test.go +++ b/internal/app/notifications_test.go @@ -20,8 +20,8 @@ import ( "git.stormux.org/storm/fenrir/internal/command" "git.stormux.org/storm/fenrir/internal/control" "git.stormux.org/storm/fenrir/internal/input" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/presentation" + "git.stormux.org/storm/screenreader-common/internalui" ) func TestNotificationSoundCooldownBoundaryAndConcurrentAdmission(t *testing.T) { @@ -289,28 +289,28 @@ func TestNotificationHistoryTimesNavigationAndNewArrivals(t *testing.T) { if !a.ui.active || a.ui.session == nil || !strings.HasSuffix(voice.messages[len(voice.messages)-1], "You are transmatting "+trial.first) { t.Fatal("history did not open at newest entry", trial, voice.messages) } - a.ui.handle(interaction.Key{Name: "down"}) - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "down"}) + a.ui.handle(internalui.Key{Name: "enter"}) if got := voice.messages[len(voice.messages)-1]; got != "Hello world "+trial.second { t.Fatal("history order, repeat or received time", trial, got) } - a.ui.handle(interaction.Key{Name: "tab"}) + a.ui.handle(internalui.Key{Name: "tab"}) control, _ := a.ui.session.FocusedControl() if control.ID != "close" { t.Fatal("Tab could not reach Close", control) } - a.ui.handle(interaction.Key{Name: "tab", Shift: true}) + a.ui.handle(internalui.Key{Name: "tab", Shift: true}) control, _ = a.ui.session.FocusedControl() if control.ID != "history" { t.Fatal("Shift+Tab could not return to list", control) } - a.ui.handle(interaction.Key{Name: "escape"}) + a.ui.handle(internalui.Key{Name: "escape"}) if a.ui.active || keys.captures[len(keys.captures)-1] { t.Fatal("history did not release capture") } } a.openNotifications() - a.ui.handle(interaction.Key{Name: "down"}) + a.ui.handle(internalui.Key{Name: "down"}) selected := a.ui.session.Values()["notifications.history"] a.notify("New arrival", time.Now()) if got := a.ui.session.Values()["notifications.history"]; !reflect.DeepEqual(got, selected) { @@ -321,8 +321,8 @@ func TestNotificationHistoryTimesNavigationAndNewArrivals(t *testing.T) { if !strings.Contains(voice.messages[len(voice.messages)-1], "New arrival") { t.Fatal("reopened history missed arrival") } - a.ui.handle(interaction.Key{Name: "tab"}) - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "tab"}) + a.ui.handle(internalui.Key{Name: "enter"}) if a.ui.active { t.Fatal("Close button did not close history") } diff --git a/internal/app/prompt_test.go b/internal/app/prompt_test.go index 218af13f..c3626f25 100644 --- a/internal/app/prompt_test.go +++ b/internal/app/prompt_test.go @@ -13,9 +13,9 @@ import ( "git.stormux.org/storm/fenrir/internal/command" "git.stormux.org/storm/fenrir/internal/config" "git.stormux.org/storm/fenrir/internal/input" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/presentation" "git.stormux.org/storm/fenrir/internal/screen" + "git.stormux.org/storm/screenreader-common/internalui" ) func promptSnapshot(lines ...string) screen.Snapshot { @@ -107,7 +107,7 @@ func TestPromptRestorationDiscardsBatchAndPreservesModes(t *testing.T) { t.Fatal("repeated restoration", voice.messages, sounds.cues) } if mode == "menu" { - handle(input.Decision{UI: &interaction.Key{Name: "escape"}}) + handle(input.Decision{UI: &internalui.Key{Name: "escape"}}) } handle(input.Decision{Command: command.Quit}) } diff --git a/internal/app/quick_settings_test.go b/internal/app/quick_settings_test.go index 3a99234b..9bff67f0 100644 --- a/internal/app/quick_settings_test.go +++ b/internal/app/quick_settings_test.go @@ -29,10 +29,10 @@ import ( "git.stormux.org/storm/fenrir/internal/command" "git.stormux.org/storm/fenrir/internal/config" "git.stormux.org/storm/fenrir/internal/input" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/preferences" "git.stormux.org/storm/fenrir/internal/screen" "git.stormux.org/storm/fenrir/internal/speech" + "git.stormux.org/storm/screenreader-common/internalui" "git.stormux.org/storm/screenreader-common/quicksettings" ) @@ -176,7 +176,7 @@ func TestQuickChangesSurviveMenuCancelAndExplicitSaveThenQuit(t *testing.T) { if got := ui.session.Values()["presentation.speech.pitch"].Number; got != 0 { t.Fatal(got) } - ui.handle(interaction.Key{Name: "escape"}) + ui.handle(internalui.Key{Name: "escape"}) stillSaved, _, err := config.Load(path, nil) if err != nil || !reflect.DeepEqual(saved, stillSaved) { t.Fatal(stillSaved, err) @@ -426,7 +426,7 @@ func TestQuickEchoCombinationsAndMenuCancelOrSave(t *testing.T) { ui.action("save", ui.session) finishPersistence(t, a, false) } else { - ui.handle(interaction.Key{Name: "escape"}) + ui.handle(internalui.Key{Name: "escape"}) } disk, _, err := config.Load(path, nil) if !save { diff --git a/internal/app/speech_preview_test.go b/internal/app/speech_preview_test.go index 93c7576e..26c7f5be 100644 --- a/internal/app/speech_preview_test.go +++ b/internal/app/speech_preview_test.go @@ -8,8 +8,8 @@ import ( "time" "git.stormux.org/storm/fenrir/internal/config" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/speech" + "git.stormux.org/storm/screenreader-common/internalui" ) func previewApplication(t *testing.T) (*application, *selectingVoice, string, chan config.Speech) { @@ -136,11 +136,11 @@ func TestMenuRateChangeIsHeardAndEscapeRestoresIt(t *testing.T) { a.openSettings() receiveUi(t, a.ui) tabToControl(t, a.ui, "speech.rate") - a.ui.handle(interaction.Key{Name: "right"}) + a.ui.handle(internalui.Key{Name: "right"}) if len(voice.parameters) == 0 || voice.parameters[len(voice.parameters)-1].Rate != live.Rate+1 { t.Fatal("menu rate change was not previewed", voice.parameters, live) } - a.ui.handle(interaction.Key{Name: "escape"}) + a.ui.handle(internalui.Key{Name: "escape"}) if got := voice.parameters[len(voice.parameters)-1]; got != live || a.preview.active { t.Fatal("escape did not restore the live voice", got, live) } diff --git a/internal/app/spellcheck_menu.go b/internal/app/spellcheck_menu.go index 59b16e71..995a75c4 100644 --- a/internal/app/spellcheck_menu.go +++ b/internal/app/spellcheck_menu.go @@ -5,9 +5,9 @@ package app import ( "git.stormux.org/storm/fenrir/internal/i18n" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/presentation" "git.stormux.org/storm/fenrir/internal/spellcheck" + "git.stormux.org/storm/screenreader-common/internalui" "strings" "time" ) @@ -24,10 +24,10 @@ type spellcheckMenu struct { busy bool } -func wordChoices(words []string) []interaction.Choice { - choices := make([]interaction.Choice, 0, len(words)) +func wordChoices(words []string) []internalui.Choice { + choices := make([]internalui.Choice, 0, len(words)) for _, word := range words { - choices = append(choices, interaction.Choice{ID: word, Label: word, Literal: true}) + choices = append(choices, internalui.Choice{ID: word, Label: word, Literal: true}) } return choices } @@ -41,16 +41,16 @@ func (h *spellcheckMenu) open(word string) { } h.generation, h.source, h.deleted, h.busy = generation, spellcheck.Word(word), "", false h.revision++ - session, err := interaction.NewSession(interaction.Form{Type: interaction.TabForm, Title: spellcheckTitle, Tabs: []interaction.Tab{ - {ID: "suggestions", Label: "Suggestions", Controls: []interaction.Control{ - {ID: "word", Label: "Word", Kind: interaction.Entry, Text: h.source, Action: "check_word"}, - {ID: "suggestions", Label: "Suggestions", Kind: interaction.Grid, Columns: 6, Action: "copy_word"}, + session, err := newInternalUISession(internalui.Form{Type: internalui.TabForm, Title: spellcheckTitle, Tabs: []internalui.Tab{ + {ID: "suggestions", Label: "Suggestions", Controls: []internalui.Control{ + {ID: "word", Label: "Word", Kind: internalui.Entry, Text: h.source, Action: "check_word"}, + {ID: "suggestions", Label: "Suggestions", Kind: internalui.Grid, Columns: 6, Action: "copy_word"}, }}, - {ID: "exceptions", Label: "Exceptions", Controls: []interaction.Control{ - {ID: "word", Label: "Word", Kind: interaction.Entry, Text: h.source, Action: "add_word"}, - {ID: "add", Label: "Add", Kind: interaction.Button, Action: "add_word"}, - {ID: "exceptions", Label: "Exceptions", Kind: interaction.Grid, Columns: 6, Action: "copy_word", DeleteAction: "remove_word"}, - {ID: "undo", Label: "Undo", Kind: interaction.Button, Action: "undo_remove"}, + {ID: "exceptions", Label: "Exceptions", Controls: []internalui.Control{ + {ID: "word", Label: "Word", Kind: internalui.Entry, Text: h.source, Action: "add_word"}, + {ID: "add", Label: "Add", Kind: internalui.Button, Action: "add_word"}, + {ID: "exceptions", Label: "Exceptions", Kind: internalui.Grid, Columns: 6, Action: "copy_word", DeleteAction: "remove_word"}, + {ID: "undo", Label: "Undo", Kind: internalui.Button, Action: "undo_remove"}, }}, }}) if err != nil { @@ -60,7 +60,7 @@ func (h *spellcheckMenu) open(word string) { } ui.configureSession(session) ui.session, ui.action = session, h.action - ui.changed = func(session *interaction.Session) { + ui.changed = func(session *internalui.Session) { source := session.Values()["suggestions.word"].Text if source != h.source { h.source = source @@ -88,7 +88,7 @@ func (h *spellcheckMenu) poll() { } } -func (h *spellcheckMenu) action(action string, session *interaction.Session) { +func (h *spellcheckMenu) action(action string, session *internalui.Session) { if action == "check_word" { h.revision++ h.due = time.Now() diff --git a/internal/app/spellcheck_menu_test.go b/internal/app/spellcheck_menu_test.go index 394a8ed5..dcd5cba3 100644 --- a/internal/app/spellcheck_menu_test.go +++ b/internal/app/spellcheck_menu_test.go @@ -7,8 +7,8 @@ import ( "context" "errors" "git.stormux.org/storm/fenrir/internal/config" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/spellcheck" + "git.stormux.org/storm/screenreader-common/internalui" "path/filepath" "strings" "testing" @@ -44,33 +44,33 @@ func TestSpellcheckMenuSuggestionsFilterCopyCancelAndEditableSource(t *testing.T menu := &spellcheckMenu{ui: ui, service: service, clipboards: clipboard} menu.open("helo") receiveSpelling(t, menu) - ui.handle(interaction.Key{Name: "tab"}) - ui.handle(interaction.Key{Name: "tab"}) - ui.handle(interaction.Key{Text: "zz"}) - ui.handle(interaction.Key{Name: "enter"}) + ui.handle(internalui.Key{Name: "tab"}) + ui.handle(internalui.Key{Name: "tab"}) + ui.handle(internalui.Key{Text: "zz"}) + ui.handle(internalui.Key{Name: "enter"}) if !ui.active { t.Fatal("empty suggestions closed menu") } - ui.handle(interaction.Key{Name: "escape"}) + ui.handle(internalui.Key{Name: "escape"}) if text, _ := clipboard.history.Current(); text != "original" { t.Fatal(text) } menu.open("helo") receiveSpelling(t, menu) - ui.handle(interaction.Key{Name: "tab"}) - ui.handle(interaction.Key{Name: "tab"}) - ui.handle(interaction.Key{Text: "hel"}) - ui.handle(interaction.Key{Name: "right"}) - ui.handle(interaction.Key{Name: "enter"}) + ui.handle(internalui.Key{Name: "tab"}) + ui.handle(internalui.Key{Name: "tab"}) + ui.handle(internalui.Key{Text: "hel"}) + ui.handle(internalui.Key{Name: "right"}) + ui.handle(internalui.Key{Name: "enter"}) if text, _ := clipboard.history.Current(); text != "help" || ui.active { t.Fatal(text, ui.active) } menu.open("helo") receiveSpelling(t, menu) - ui.handle(interaction.Key{Name: "tab"}) - ui.handle(interaction.Key{Text: "a", Ctrl: true}) - ui.handle(interaction.Key{Text: "hello"}) - ui.handle(interaction.Key{Name: "enter"}) + ui.handle(internalui.Key{Name: "tab"}) + ui.handle(internalui.Key{Text: "a", Ctrl: true}) + ui.handle(internalui.Key{Text: "hello"}) + ui.handle(internalui.Key{Name: "enter"}) if result := receiveSpelling(t, menu); result.Word != "hello" || !result.Correct { t.Fatal(result) } @@ -94,33 +94,33 @@ func TestSpellcheckExceptionAddDeleteUndoAndCopy(t *testing.T) { menu := &spellcheckMenu{ui: ui, service: service, clipboards: clipboard} menu.open("Fenrir") receiveSpelling(t, menu) - ui.handle(interaction.Key{Name: "right"}) - ui.handle(interaction.Key{Name: "tab"}) - ui.handle(interaction.Key{Name: "enter"}) + ui.handle(internalui.Key{Name: "right"}) + ui.handle(internalui.Key{Name: "tab"}) + ui.handle(internalui.Key{Name: "enter"}) if result := receiveSpelling(t, menu); result.Err != nil { t.Fatal(result) } - ui.handle(interaction.Key{Name: "tab"}) - ui.handle(interaction.Key{Name: "tab"}) - ui.handle(interaction.Key{Text: "fen"}) - ui.handle(interaction.Key{Name: "delete", Repeat: true}) + ui.handle(internalui.Key{Name: "tab"}) + ui.handle(internalui.Key{Name: "tab"}) + ui.handle(internalui.Key{Text: "fen"}) + ui.handle(internalui.Key{Name: "delete", Repeat: true}) if menu.busy { t.Fatal("held Delete removed exception") } - ui.handle(interaction.Key{Name: "delete"}) + ui.handle(internalui.Key{Name: "delete"}) receiveSpelling(t, menu) if !ui.active || len(ui.session.Values()["exceptions.exceptions"].Choices) != 0 { t.Fatal("remove did not retain empty grid") } - ui.handle(interaction.Key{Name: "tab"}) - ui.handle(interaction.Key{Name: "enter"}) + ui.handle(internalui.Key{Name: "tab"}) + ui.handle(internalui.Key{Name: "enter"}) receiveSpelling(t, menu) - ui.handle(interaction.Key{Name: "tab", Shift: true}) + ui.handle(internalui.Key{Name: "tab", Shift: true}) control, _ := ui.session.FocusedControl() if control.Text != "fen" || len(control.Choices) != 1 { t.Fatal(control) } - ui.handle(interaction.Key{Name: "enter"}) + ui.handle(internalui.Key{Name: "enter"}) if text, _ := clipboard.history.Current(); text != "Fenrir" || ui.active { t.Fatal(text, ui.active) } @@ -163,29 +163,29 @@ func TestSpellcheckReadingPreviewCancelAndSave(t *testing.T) { if strings.Contains(ui.session.Describe(), "Reading tab") { break } - ui.handle(interaction.Key{Name: "right"}) + ui.handle(internalui.Key{Name: "right"}) } for range 32 { - ui.handle(interaction.Key{Name: "tab"}) + ui.handle(internalui.Key{Name: "tab"}) if control, ok := ui.session.FocusedControl(); ok && control.ID == "spellcheck" { break } } - ui.handle(interaction.Key{Name: "space"}) + ui.handle(internalui.Key{Name: "space"}) if live.Spellcheck { t.Fatal("checkbox preview did not take effect") } if save { for range 32 { - ui.handle(interaction.Key{Name: "tab"}) + ui.handle(internalui.Key{Name: "tab"}) if ui.session.Describe() == "OK button" { break } } - ui.handle(interaction.Key{Name: "enter"}) + ui.handle(internalui.Key{Name: "enter"}) finishPersistence(t, a, false) } else { - ui.handle(interaction.Key{Name: "escape"}) + ui.handle(internalui.Key{Name: "escape"}) } saved, _, err := config.Load(path, nil) if err != nil || live.Spellcheck != !save || saved.Reading.Spellcheck != !save { diff --git a/internal/app/text_processing_test.go b/internal/app/text_processing_test.go index 08132c94..b0efa25e 100644 --- a/internal/app/text_processing_test.go +++ b/internal/app/text_processing_test.go @@ -13,10 +13,10 @@ import ( "git.stormux.org/storm/fenrir/internal/command" "git.stormux.org/storm/fenrir/internal/config" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/presentation" "git.stormux.org/storm/fenrir/internal/punctuation" "git.stormux.org/storm/fenrir/internal/screen" + "git.stormux.org/storm/screenreader-common/internalui" ) func TestTextProcessingMenuCommitCancelAndFailedSave(t *testing.T) { @@ -53,7 +53,7 @@ func TestTextProcessingMenuCommitCancelAndFailedSave(t *testing.T) { focus := func(want string) { t.Helper() for range 40 { - a.ui.handle(interaction.Key{Name: "tab"}) + a.ui.handle(internalui.Key{Name: "tab"}) if voice.messages[len(voice.messages)-1] == want { return } @@ -61,16 +61,16 @@ func TestTextProcessingMenuCommitCancelAndFailedSave(t *testing.T) { t.Fatal("control not found", want, voice.messages) } focus("Emoticons checked") - a.ui.handle(interaction.Key{Name: "space"}) + a.ui.handle(internalui.Key{Name: "space"}) focus("Repeated symbols unchecked") - a.ui.handle(interaction.Key{Name: "space"}) + a.ui.handle(internalui.Key{Name: "space"}) focus("Repeated symbols minimum length 4") - a.ui.handle(interaction.Key{Name: "up"}) + a.ui.handle(internalui.Key{Name: "up"}) if a.settings.live.Reading != settings.Reading { t.Fatal("draft changed runtime processing") } if action == "cancel" { - a.ui.handle(interaction.Key{Name: "escape"}) + a.ui.handle(internalui.Key{Name: "escape"}) } else { if action == "failed save" { if err := os.WriteFile(path, []byte("version=3\n[reading]\nemoticons=false\n"), 0600); err != nil { @@ -78,13 +78,13 @@ func TestTextProcessingMenuCommitCancelAndFailedSave(t *testing.T) { } } focus("OK button") - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "enter"}) finishPersistence(t, a, action == "failed save") if action == "failed save" { if !a.ui.active || !strings.HasPrefix(voice.messages[len(voice.messages)-1], "Could not save settings:") { t.Fatal("failed save lost the draft", voice.messages) } - a.ui.handle(interaction.Key{Name: "escape"}) + a.ui.handle(internalui.Key{Name: "escape"}) } } voice.messages = nil diff --git a/internal/app/voice_profiles.go b/internal/app/voice_profiles.go index 819d9820..44774069 100644 --- a/internal/app/voice_profiles.go +++ b/internal/app/voice_profiles.go @@ -6,13 +6,13 @@ package app import ( "git.stormux.org/storm/fenrir/internal/config" "git.stormux.org/storm/fenrir/internal/i18n" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/preferences" + "git.stormux.org/storm/screenreader-common/internalui" sd "git.stormux.org/storm/screenreader-common/speechdispatcher" "git.stormux.org/storm/screenreader-common/voiceprofiles" ) -func (ui *internalUI) manageProfiles(action string, parent *interaction.Session, draft config.Settings, discovery preferences.Discovery, restore func(config.Settings)) { +func (ui *internalUI) manageProfiles(action string, parent *internalui.Session, draft config.Settings, discovery preferences.Discovery, restore func(config.Settings)) { ui.profileSequence++ sequence := ui.profileSequence index := -1 @@ -63,7 +63,7 @@ func (ui *internalUI) manageProfiles(action string, parent *interaction.Session, } open := func(catalog sd.Catalog) { editor := voiceprofiles.NewEditor(p, voiceprofiles.Drivers(), catalog) - child, err := interaction.NewSession(editor.Form()) + child, err := newInternalUISession(editor.Form()) if err != nil { ui.failed("Could not edit voice profiles: {0}", err) return @@ -71,7 +71,7 @@ func (ui *internalUI) manageProfiles(action string, parent *interaction.Session, parent.Close() ui.session = child ui.returnToParent = func() { restore(draft) } - ui.changed = func(session *interaction.Session) { + ui.changed = func(session *internalui.Session) { editor.RefreshSession(session) if ui.previewSpeech == nil { return @@ -84,7 +84,7 @@ func (ui *internalUI) manageProfiles(action string, parent *interaction.Session, ui.previewSpeech(next.Presentation.Speech) } } - ui.action = func(name string, session *interaction.Session) { + ui.action = func(name string, session *internalui.Session) { if name != "save-profile" { return } diff --git a/internal/app/voice_profiles_test.go b/internal/app/voice_profiles_test.go index bcc2f0f3..0e663047 100644 --- a/internal/app/voice_profiles_test.go +++ b/internal/app/voice_profiles_test.go @@ -6,9 +6,9 @@ import ( "errors" "git.stormux.org/storm/fenrir/internal/command" "git.stormux.org/storm/fenrir/internal/config" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/preferences" "git.stormux.org/storm/fenrir/internal/speech" + "git.stormux.org/storm/screenreader-common/internalui" "git.stormux.org/storm/screenreader-common/voiceprofiles" "os" "path/filepath" @@ -26,23 +26,23 @@ func TestVoiceProfileMenuAddCancelPersistAndRemove(t *testing.T) { if !a.ui.session.FocusControl("voice-profiles", id) { t.Fatal("missing profile control", id) } - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "enter"}) } activate("add") if c, _ := a.ui.session.FocusedControl(); c.ID != "name" { t.Fatal(c) } - a.ui.handle(interaction.Key{Text: "Discarded"}) - a.ui.handle(interaction.Key{Name: "escape"}) + a.ui.handle(internalui.Key{Text: "Discarded"}) + a.ui.handle(internalui.Key{Name: "escape"}) if !a.ui.active || a.ui.session.Values()["voice-profiles.profiles"].ID != "" { t.Fatal("child cancel changed catalog or closed menu") } activate("add") - a.ui.handle(interaction.Key{Text: "Reading"}) + a.ui.handle(internalui.Key{Text: "Reading"}) a.ui.session.FocusControl(voiceprofiles.PageID, "rate") - a.ui.handle(interaction.Key{Name: "right"}) + a.ui.handle(internalui.Key{Name: "right"}) a.ui.session.FocusControl(voiceprofiles.PageID, "save") - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "enter"}) if _, err := os.Stat(path); !errors.Is(err, os.ErrNotExist) { t.Fatal("child dialog saved before parent confirmation", err) } @@ -50,9 +50,9 @@ func TestVoiceProfileMenuAddCancelPersistAndRemove(t *testing.T) { if a.ui.session.Values()[voiceprofiles.PageID+".rate"].Number != 10 { t.Fatal("rate did not survive add") } - a.ui.handle(interaction.Key{Name: "escape"}) + a.ui.handle(internalui.Key{Name: "escape"}) a.ui.session.FocusControl("presentation", "ok") - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "enter"}) finishPersistence(t, a, false) loaded, _, err := config.Load(path, nil) if err != nil || len(loaded.VoiceProfiles.Profiles) != 1 || loaded.VoiceProfiles.Profiles[0].Name != "Reading" { @@ -62,7 +62,7 @@ func TestVoiceProfileMenuAddCancelPersistAndRemove(t *testing.T) { receiveUi(t, a.ui) activate("remove") a.ui.session.FocusControl("presentation", "ok") - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "enter"}) finishPersistence(t, a, false) loaded, _, err = config.Load(path, nil) if err != nil || len(loaded.VoiceProfiles.Profiles) != 0 { @@ -172,7 +172,7 @@ func TestCancelledProfileDiscoveryCannotReplaceNewerEditor(t *testing.T) { } a.ui.manageProfiles("add-profile", a.ui.session, draft, preferences.Discovery{Driver: "dectalk"}, restore) <-requests - a.ui.handle(interaction.Key{Name: "escape"}) + a.ui.handle(internalui.Key{Name: "escape"}) draft.Presentation.Speech.Rate = 20 a.ui.manageProfiles("add-profile", a.ui.session, draft, preferences.Discovery{Driver: "dectalk"}, restore) <-requests @@ -246,17 +246,17 @@ func TestVoiceProfileEditorPreviewsAndRestoresParentDraft(t *testing.T) { if !a.ui.session.FocusControl("voice-profiles", "add") { t.Fatal("missing Add Voice Profile") } - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "enter"}) a.ui.session.FocusControl(voiceprofiles.PageID, "rate") - a.ui.handle(interaction.Key{Name: "right"}) + a.ui.handle(internalui.Key{Name: "right"}) if got := lastParameters(t, voice); got.Rate != 10 { t.Fatal("profile rate was not previewed", got) } // Module changes use the same silent preparation as ordinary settings. control := a.ui.session.Values()[voiceprofiles.PageID+".module"] - control.Choices = append(control.Choices, interaction.Choice{ID: "fixture", Label: "fixture", Literal: true}) + control.Choices = append(control.Choices, internalui.Choice{ID: "fixture", Label: "fixture", Literal: true}) a.ui.session.ReplaceChoices(voiceprofiles.PageID, "module", control.Choices, "fixture") - a.ui.handle(interaction.Key{Name: "tab"}) + a.ui.handle(internalui.Key{Name: "tab"}) if got := <-prepared; got.Module != "fixture" { t.Fatal("profile module was not previewed", got) } @@ -264,7 +264,7 @@ func TestVoiceProfileEditorPreviewsAndRestoresParentDraft(t *testing.T) { if a.settings.live.Presentation.Speech.Rate != 0 || a.settings.live.Presentation.Speech.Module != "" { t.Fatal("preview committed the profile") } - a.ui.handle(interaction.Key{Name: "escape"}) + a.ui.handle(internalui.Key{Name: "escape"}) if got := lastParameters(t, voice); got.Rate != 0 { t.Fatal("cancel did not restore parent rate", got) } @@ -279,16 +279,16 @@ func TestNewVoiceProfileCanBeConfirmedOnItsTabAndSelectedImmediately(t *testing. a.openSettings() receiveUi(t, a.ui) a.ui.session.FocusControl("voice-profiles", "add") - a.ui.handle(interaction.Key{Name: "enter"}) - a.ui.handle(interaction.Key{Text: "Reading"}) + a.ui.handle(internalui.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Text: "Reading"}) a.ui.session.FocusControl(voiceprofiles.PageID, "rate") - a.ui.handle(interaction.Key{Name: "right"}) + a.ui.handle(internalui.Key{Name: "right"}) a.ui.session.FocusControl(voiceprofiles.PageID, "save") - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "enter"}) if !a.ui.session.FocusControl("voice-profiles", "ok") { t.Fatal("profile tab has no way to confirm its changes") } - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "enter"}) finishPersistence(t, a, false) loaded, _, err := config.Load(path, nil) if err != nil || len(loaded.VoiceProfiles.Profiles) != 1 || len(a.settings.live.VoiceProfiles.Profiles) != 1 { @@ -314,7 +314,7 @@ func TestUseVoiceProfilePreviewsWithoutCommittingPrimary(t *testing.T) { a.openSettings() receiveUi(t, a.ui) a.ui.session.FocusControl("voice-profiles", "use") - a.ui.handle(interaction.Key{Name: "enter"}) + a.ui.handle(internalui.Key{Name: "enter"}) if got := <-prepared; got.Module != "fixture" { t.Fatal("Use Voice Profile did not preview the module", got) } @@ -325,7 +325,7 @@ func TestUseVoiceProfilePreviewsWithoutCommittingPrimary(t *testing.T) { if a.settings.live.Presentation.Speech.Module != "" { t.Fatal("Use Voice Profile committed before parent confirmation") } - a.ui.handle(interaction.Key{Name: "escape"}) + a.ui.handle(internalui.Key{Name: "escape"}) if got := <-prepared; got.Module != "" { t.Fatal("menu Cancel did not restore its original module", got) } diff --git a/internal/emoji/catalog.go b/internal/emoji/catalog.go index a9d9a0b6..dc1661e7 100644 --- a/internal/emoji/catalog.go +++ b/internal/emoji/catalog.go @@ -6,33 +6,34 @@ package emoji import ( - "git.stormux.org/storm/fenrir/internal/interaction" + "git.stormux.org/storm/fenrir/internal/i18n" commonemoji "git.stormux.org/storm/screenreader-common/emoji" + "git.stormux.org/storm/screenreader-common/internalui" ) const MenuTitle = "Emoji Menu" // NewSession builds an independent draft. Search is local to each category; // the first All tab searches the complete catalog. -func NewSession() (*interaction.Session, error) { - form := interaction.Form{Type: interaction.TabForm, Title: MenuTitle} +func NewSession() (*internalui.Session, error) { + form := internalui.Form{Type: internalui.TabForm, Title: MenuTitle} for _, tab := range commonemoji.PickerTabs() { - choices := make([]interaction.Choice, len(tab.Entries)) + choices := make([]internalui.Choice, len(tab.Entries)) for index, entry := range tab.Entries { - choices[index] = interaction.Choice{ID: entry.ID, Label: entry.Label} + choices[index] = internalui.Choice{ID: entry.ID, Label: entry.Label} } - form.Tabs = append(form.Tabs, interaction.Tab{ID: tab.ID, Label: tab.Label, Controls: []interaction.Control{{ - ID: "emoji", Label: "Emoji", Kind: interaction.Grid, Choices: choices, Columns: commonemoji.PickerColumns, Action: "copy_emoji", + form.Tabs = append(form.Tabs, internalui.Tab{ID: tab.ID, Label: tab.Label, Controls: []internalui.Control{{ + ID: "emoji", Label: "Emoji", Kind: internalui.Grid, Choices: choices, Columns: commonemoji.PickerColumns, Action: "copy_emoji", }}}) } - return interaction.NewSession(form) + return internalui.NewSession(form, internalui.Messages{Translate: i18n.T}) } // Selection returns the selected Unicode sequence and readable name. It never // returns a selection from another tab or from an empty search. -func Selection(session *interaction.Session) (string, string, bool) { +func Selection(session *internalui.Session) (string, string, bool) { control, ok := session.FocusedControl() - if !ok || control.Kind != interaction.Grid || control.Selected < 0 || control.Selected >= len(control.Choices) { + if !ok || control.Kind != internalui.Grid || control.Selected < 0 || control.Selected >= len(control.Choices) { return "", "", false } choice := control.Choices[control.Selected] diff --git a/internal/emoji/catalog_test.go b/internal/emoji/catalog_test.go index 747ee3cf..ea7e4572 100644 --- a/internal/emoji/catalog_test.go +++ b/internal/emoji/catalog_test.go @@ -9,8 +9,8 @@ import ( "testing" "git.stormux.org/storm/fenrir/internal/i18n" - "git.stormux.org/storm/fenrir/internal/interaction" commonemoji "git.stormux.org/storm/screenreader-common/emoji" + "git.stormux.org/storm/screenreader-common/internalui" ) func TestCategorySelectionAndIndependentSearches(t *testing.T) { @@ -21,24 +21,24 @@ func TestCategorySelectionAndIndependentSearches(t *testing.T) { if _, _, ok := Selection(session); ok { t.Fatal("tab strip has a selection") } - session.Handle(interaction.Key{Name: "tab"}) - session.Handle(interaction.Key{Text: "j"}) - session.Handle(interaction.Key{Name: "right"}) + session.Handle(internalui.Key{Name: "tab"}) + session.Handle(internalui.Key{Text: "j"}) + session.Handle(internalui.Key{Name: "right"}) if value, _, _ := Selection(session); value != "🇯🇵" { t.Fatal("filtered All navigation", value) } - session.Handle(interaction.Key{Name: "tab"}) - session.Handle(interaction.Key{Name: "right"}) - session.Handle(interaction.Key{Name: "right"}) - session.Handle(interaction.Key{Name: "tab"}) - session.Handle(interaction.Key{Text: "c"}) + session.Handle(internalui.Key{Name: "tab"}) + session.Handle(internalui.Key{Name: "right"}) + session.Handle(internalui.Key{Name: "right"}) + session.Handle(internalui.Key{Name: "tab"}) + session.Handle(internalui.Key{Text: "c"}) if value, _, _ := Selection(session); value != "🐱" { t.Fatal("Nature selection came from another tab", value) } - session.Handle(interaction.Key{Name: "tab", Shift: true}) - session.Handle(interaction.Key{Name: "left"}) - session.Handle(interaction.Key{Name: "left"}) - session.Handle(interaction.Key{Name: "tab"}) + session.Handle(internalui.Key{Name: "tab", Shift: true}) + session.Handle(internalui.Key{Name: "left"}) + session.Handle(internalui.Key{Name: "left"}) + session.Handle(internalui.Key{Name: "tab"}) if value, _, _ := Selection(session); value != "🇯🇵" { t.Fatal("All search/selection not retained", value) } @@ -46,7 +46,7 @@ func TestCategorySelectionAndIndependentSearches(t *testing.T) { if err != nil { t.Fatal(err) } - other.Handle(interaction.Key{Name: "tab"}) + other.Handle(internalui.Key{Name: "tab"}) control, controlOK := other.FocusedControl() value, _, selectionOK := Selection(other) if !controlOK || control.Text != "" || !selectionOK || value == "🇯🇵" { @@ -64,8 +64,8 @@ func TestBundledTranslationSearchPreservesEmoji(t *testing.T) { if got := session.Open(); !strings.HasPrefix(got, "Emoji-Menü. Alle Registerkarte") { t.Fatal("untranslated picker", got) } - session.Handle(interaction.Key{Name: "tab"}) - session.Handle(interaction.Key{Text: "Schmetter"}) + session.Handle(internalui.Key{Name: "tab"}) + session.Handle(internalui.Key{Text: "Schmetter"}) if value, label, ok := Selection(session); !ok || value != "🦋" || label != "Butterfly" { t.Fatalf("localized search changed identity: %q %q %v", value, label, ok) } @@ -121,8 +121,8 @@ func TestKissMarkSearch(t *testing.T) { if err != nil { t.Fatal(err) } - session.Handle(interaction.Key{Name: "tab"}) - session.Handle(interaction.Key{Text: "Kiss mark"}) + session.Handle(internalui.Key{Name: "tab"}) + session.Handle(internalui.Key{Text: "Kiss mark"}) if value, label, ok := Selection(session); !ok || value != "💋" || label != "Kiss mark" { t.Fatalf("kiss mark selection = %q %q %v", value, label, ok) } @@ -132,8 +132,8 @@ func TestKissMarkSearch(t *testing.T) { if err != nil { t.Fatal(err) } - localized.Handle(interaction.Key{Name: "tab"}) - localized.Handle(interaction.Key{Text: "Kussabdruck"}) + localized.Handle(internalui.Key{Name: "tab"}) + localized.Handle(internalui.Key{Text: "Kussabdruck"}) if value, _, ok := Selection(localized); !ok || value != "💋" { t.Fatalf("localized kiss mark selection = %q %v", value, ok) } @@ -145,9 +145,9 @@ func TestNewCategoryNavigation(t *testing.T) { t.Fatal(err) } for range 4 { - session.Handle(interaction.Key{Name: "right"}) + session.Handle(internalui.Key{Name: "right"}) } - session.Handle(interaction.Key{Name: "tab"}) + session.Handle(internalui.Key{Name: "tab"}) if value, label, ok := Selection(session); !ok || value != "⚽" || label != "Soccer ball" { t.Fatalf("Activity navigation failed: %q %q %v", value, label, ok) } diff --git a/internal/i18n/locale/de/LC_MESSAGES/fenrir.po b/internal/i18n/locale/de/LC_MESSAGES/fenrir.po index 26f90a37..910f9fa1 100644 --- a/internal/i18n/locale/de/LC_MESSAGES/fenrir.po +++ b/internal/i18n/locale/de/LC_MESSAGES/fenrir.po @@ -429,7 +429,7 @@ msgid "Canada" msgstr "Kanada" #: internal/app/application_overrides.go:368 -#: internal/preferences/settings.go:103 internal/preferences/settings.go:96 +#: internal/preferences/settings.go:104 internal/preferences/settings.go:97 #: screenreader-common/voiceprofiles/editor.go msgid "Cancel" msgstr "Abbrechen" @@ -591,7 +591,7 @@ msgstr "Import aus der Zwischenablage fehlgeschlagen" msgid "Clipboard sync" msgstr "Zwischenablage synchronisieren" -#: internal/app/internal_ui.go:214 +#: internal/app/internal_ui.go:219 msgid "Clipboard text unavailable" msgstr "Text in der Zwischenablage nicht verfügbar" @@ -699,7 +699,7 @@ msgstr "Keks" msgid "Cool" msgstr "Cool" -#: internal/app/internal_ui.go:222 +#: internal/app/internal_ui.go:227 msgid "Copied" msgstr "Kopiert" @@ -711,7 +711,7 @@ msgstr "Alias in die Zwischenablage kopieren" msgid "Copy and cut are unavailable for password fields" msgstr "Kopieren und Ausschneiden sind in Passwortfeldern nicht verfügbar" -#: internal/app/internal_ui.go:220 +#: internal/app/internal_ui.go:225 msgid "Copy failed" msgstr "Kopieren fehlgeschlagen" @@ -845,7 +845,7 @@ msgstr "Pudding" msgid "Custom" msgstr "Benutzerdefiniert" -#: internal/app/internal_ui.go:225 +#: internal/app/internal_ui.go:230 msgid "Cut" msgstr "Ausgeschnitten" @@ -1019,11 +1019,11 @@ msgstr "Elefant" msgid "Elf" msgstr "Elf(e)" -#: internal/emoji/catalog.go:25 +#: internal/emoji/catalog.go:26 msgid "Emoji" msgstr "Emoji" -#: internal/command/descriptions.go:55 internal/emoji/catalog.go:13 +#: internal/command/descriptions.go:55 internal/emoji/catalog.go:14 msgid "Emoji Menu" msgstr "Emoji-Menü" @@ -1118,7 +1118,7 @@ msgstr "Märchenfee" msgid "Fallen Leaf" msgstr "Laub" -#: internal/command/descriptions.go:57 internal/preferences/settings.go:38 +#: internal/command/descriptions.go:57 internal/preferences/settings.go:39 msgid "Fenrir Menu" msgstr "Fenrir-Menü" @@ -1982,7 +1982,7 @@ msgstr "Nicht im Fenstermodus" msgid "Notifications" msgstr "Benachrichtigungen" -#: internal/preferences/settings.go:102 internal/preferences/settings.go:96 +#: internal/preferences/settings.go:103 internal/preferences/settings.go:97 msgid "OK" msgstr "OK" @@ -2970,7 +2970,7 @@ msgstr "Fernseher" msgid "Tennis ball" msgstr "Tennisball" -#: internal/preferences/settings.go:86 +#: internal/preferences/settings.go:87 msgid "Test synthesizer" msgstr "Sprachsynthesizer testen" @@ -4294,7 +4294,7 @@ msgstr "{0} Schaltfläche" msgid "{0} characters" msgstr "{0} Zeichen" -#: internal/app/internal_ui.go:139 +#: internal/app/internal_ui.go:144 msgid "{0} closed" msgstr "{0} geschlossen" diff --git a/internal/i18n/locale/es/LC_MESSAGES/fenrir.po b/internal/i18n/locale/es/LC_MESSAGES/fenrir.po index 6a072463..e254caf9 100644 --- a/internal/i18n/locale/es/LC_MESSAGES/fenrir.po +++ b/internal/i18n/locale/es/LC_MESSAGES/fenrir.po @@ -429,7 +429,7 @@ msgid "Canada" msgstr "Canadá" #: internal/app/application_overrides.go:368 -#: internal/preferences/settings.go:103 internal/preferences/settings.go:96 +#: internal/preferences/settings.go:104 internal/preferences/settings.go:97 #: screenreader-common/voiceprofiles/editor.go msgid "Cancel" msgstr "Cancelar" @@ -591,7 +591,7 @@ msgstr "Error al importar el portapapeles" msgid "Clipboard sync" msgstr "Sincronización del portapapeles" -#: internal/app/internal_ui.go:214 +#: internal/app/internal_ui.go:219 msgid "Clipboard text unavailable" msgstr "Texto del portapapeles no disponible" @@ -701,7 +701,7 @@ msgstr "Galleta" msgid "Cool" msgstr "Genial" -#: internal/app/internal_ui.go:222 +#: internal/app/internal_ui.go:227 msgid "Copied" msgstr "Copiado" @@ -713,7 +713,7 @@ msgstr "Copiar alias al portapapeles" msgid "Copy and cut are unavailable for password fields" msgstr "Copiar y cortar no están disponibles en campos de contraseña" -#: internal/app/internal_ui.go:220 +#: internal/app/internal_ui.go:225 msgid "Copy failed" msgstr "Error al copiar" @@ -847,7 +847,7 @@ msgstr "Flan" msgid "Custom" msgstr "Personalizado" -#: internal/app/internal_ui.go:225 +#: internal/app/internal_ui.go:230 msgid "Cut" msgstr "Cortado" @@ -1021,11 +1021,11 @@ msgstr "Elefante" msgid "Elf" msgstr "Elfo" -#: internal/emoji/catalog.go:25 +#: internal/emoji/catalog.go:26 msgid "Emoji" msgstr "Emoji" -#: internal/command/descriptions.go:55 internal/emoji/catalog.go:13 +#: internal/command/descriptions.go:55 internal/emoji/catalog.go:14 msgid "Emoji Menu" msgstr "Menú de emojis" @@ -1121,7 +1121,7 @@ msgstr "Hada" msgid "Fallen Leaf" msgstr "Hojas caídas" -#: internal/command/descriptions.go:57 internal/preferences/settings.go:38 +#: internal/command/descriptions.go:57 internal/preferences/settings.go:39 msgid "Fenrir Menu" msgstr "Menú de Fenrir" @@ -1993,7 +1993,7 @@ msgstr "No está en modo ventana" msgid "Notifications" msgstr "Notificaciones" -#: internal/preferences/settings.go:102 internal/preferences/settings.go:96 +#: internal/preferences/settings.go:103 internal/preferences/settings.go:97 msgid "OK" msgstr "Aceptar" @@ -2979,7 +2979,7 @@ msgstr "Televisión" msgid "Tennis ball" msgstr "Pelota de tenis" -#: internal/preferences/settings.go:86 +#: internal/preferences/settings.go:87 msgid "Test synthesizer" msgstr "Probar sintetizador" @@ -4302,7 +4302,7 @@ msgstr "{0} botón" msgid "{0} characters" msgstr "{0} caracteres" -#: internal/app/internal_ui.go:139 +#: internal/app/internal_ui.go:144 msgid "{0} closed" msgstr "{0} cerrado" diff --git a/internal/i18n/locale/fenrir.pot b/internal/i18n/locale/fenrir.pot index 20d883f3..ef0d3dcc 100644 --- a/internal/i18n/locale/fenrir.pot +++ b/internal/i18n/locale/fenrir.pot @@ -417,7 +417,7 @@ msgstr "" msgid "Canada" msgstr "" -#: internal/app/application_overrides.go:368 internal/preferences/settings.go:103 internal/preferences/settings.go:96 screenreader-common/voiceprofiles/editor.go +#: internal/app/application_overrides.go:368 internal/preferences/settings.go:104 internal/preferences/settings.go:97 screenreader-common/voiceprofiles/editor.go msgid "Cancel" msgstr "" @@ -577,7 +577,7 @@ msgstr "" msgid "Clipboard sync" msgstr "" -#: internal/app/internal_ui.go:214 +#: internal/app/internal_ui.go:219 msgid "Clipboard text unavailable" msgstr "" @@ -685,7 +685,7 @@ msgstr "" msgid "Cool" msgstr "" -#: internal/app/internal_ui.go:222 +#: internal/app/internal_ui.go:227 msgid "Copied" msgstr "" @@ -697,7 +697,7 @@ msgstr "" msgid "Copy and cut are unavailable for password fields" msgstr "" -#: internal/app/internal_ui.go:220 +#: internal/app/internal_ui.go:225 msgid "Copy failed" msgstr "" @@ -825,7 +825,7 @@ msgstr "" msgid "Custom" msgstr "" -#: internal/app/internal_ui.go:225 +#: internal/app/internal_ui.go:230 msgid "Cut" msgstr "" @@ -997,11 +997,11 @@ msgstr "" msgid "Elf" msgstr "" -#: internal/emoji/catalog.go:25 +#: internal/emoji/catalog.go:26 msgid "Emoji" msgstr "" -#: internal/command/descriptions.go:55 internal/emoji/catalog.go:13 +#: internal/command/descriptions.go:55 internal/emoji/catalog.go:14 msgid "Emoji Menu" msgstr "" @@ -1085,7 +1085,7 @@ msgstr "" msgid "Fallen Leaf" msgstr "" -#: internal/command/descriptions.go:57 internal/preferences/settings.go:38 +#: internal/command/descriptions.go:57 internal/preferences/settings.go:39 msgid "Fenrir Menu" msgstr "" @@ -1941,7 +1941,7 @@ msgstr "" msgid "Notifications" msgstr "" -#: internal/preferences/settings.go:102 internal/preferences/settings.go:96 +#: internal/preferences/settings.go:103 internal/preferences/settings.go:97 msgid "OK" msgstr "" @@ -2921,7 +2921,7 @@ msgstr "" msgid "Tennis ball" msgstr "" -#: internal/preferences/settings.go:86 +#: internal/preferences/settings.go:87 msgid "Test synthesizer" msgstr "" @@ -4177,7 +4177,7 @@ msgstr "" msgid "{0} characters" msgstr "" -#: internal/app/internal_ui.go:139 +#: internal/app/internal_ui.go:144 msgid "{0} closed" msgstr "" diff --git a/internal/i18n/locale/pl/LC_MESSAGES/fenrir.po b/internal/i18n/locale/pl/LC_MESSAGES/fenrir.po index 3b0869d3..f37ff550 100644 --- a/internal/i18n/locale/pl/LC_MESSAGES/fenrir.po +++ b/internal/i18n/locale/pl/LC_MESSAGES/fenrir.po @@ -430,7 +430,7 @@ msgid "Canada" msgstr "Kanada" #: internal/app/application_overrides.go:368 -#: internal/preferences/settings.go:103 internal/preferences/settings.go:96 +#: internal/preferences/settings.go:104 internal/preferences/settings.go:97 #: screenreader-common/voiceprofiles/editor.go msgid "Cancel" msgstr "Anuluj" @@ -592,7 +592,7 @@ msgstr "Importowanie schowka nie powiodło się" msgid "Clipboard sync" msgstr "Synchronizacja schowka" -#: internal/app/internal_ui.go:214 +#: internal/app/internal_ui.go:219 msgid "Clipboard text unavailable" msgstr "Tekst schowka niedostępny" @@ -701,7 +701,7 @@ msgstr "ciastko" msgid "Cool" msgstr "Wyluzowanie" -#: internal/app/internal_ui.go:222 +#: internal/app/internal_ui.go:227 msgid "Copied" msgstr "Skopiowano" @@ -713,7 +713,7 @@ msgstr "Kopiuj alias do schowka" msgid "Copy and cut are unavailable for password fields" msgstr "Kopiowanie i wycinanie są niedostępne w polach hasła" -#: internal/app/internal_ui.go:220 +#: internal/app/internal_ui.go:225 msgid "Copy failed" msgstr "Kopiowanie nie powiodło się" @@ -847,7 +847,7 @@ msgstr "deser typu krem angielski" msgid "Custom" msgstr "Niestandardowy" -#: internal/app/internal_ui.go:225 +#: internal/app/internal_ui.go:230 msgid "Cut" msgstr "Wycięto" @@ -1021,11 +1021,11 @@ msgstr "Słoń" msgid "Elf" msgstr "elf" -#: internal/emoji/catalog.go:25 +#: internal/emoji/catalog.go:26 msgid "Emoji" msgstr "Emoji" -#: internal/command/descriptions.go:55 internal/emoji/catalog.go:13 +#: internal/command/descriptions.go:55 internal/emoji/catalog.go:14 msgid "Emoji Menu" msgstr "Menu emoji" @@ -1120,7 +1120,7 @@ msgstr "wróżka" msgid "Fallen Leaf" msgstr "spadające liście" -#: internal/command/descriptions.go:57 internal/preferences/settings.go:38 +#: internal/command/descriptions.go:57 internal/preferences/settings.go:39 msgid "Fenrir Menu" msgstr "Menu Fenrira" @@ -1987,7 +1987,7 @@ msgstr "Nie znajdujesz się w trybie okna." msgid "Notifications" msgstr "Powiadomienia" -#: internal/preferences/settings.go:102 internal/preferences/settings.go:96 +#: internal/preferences/settings.go:103 internal/preferences/settings.go:97 msgid "OK" msgstr "OK" @@ -2973,7 +2973,7 @@ msgstr "telewizja" msgid "Tennis ball" msgstr "Piłka tenisowa" -#: internal/preferences/settings.go:86 +#: internal/preferences/settings.go:87 msgid "Test synthesizer" msgstr "Testuj syntezator" @@ -4293,7 +4293,7 @@ msgstr "{0} przycisk" msgid "{0} characters" msgstr "Liczba znaków: {0}" -#: internal/app/internal_ui.go:139 +#: internal/app/internal_ui.go:144 msgid "{0} closed" msgstr "{0} zamknięte" diff --git a/internal/i18n/locale/pt/LC_MESSAGES/fenrir.po b/internal/i18n/locale/pt/LC_MESSAGES/fenrir.po index 9a7cfbd1..0294443d 100644 --- a/internal/i18n/locale/pt/LC_MESSAGES/fenrir.po +++ b/internal/i18n/locale/pt/LC_MESSAGES/fenrir.po @@ -428,7 +428,7 @@ msgid "Canada" msgstr "Canadá" #: internal/app/application_overrides.go:368 -#: internal/preferences/settings.go:103 internal/preferences/settings.go:96 +#: internal/preferences/settings.go:104 internal/preferences/settings.go:97 #: screenreader-common/voiceprofiles/editor.go msgid "Cancel" msgstr "Cancelar" @@ -590,7 +590,7 @@ msgstr "Falha ao importar a área de transferência" msgid "Clipboard sync" msgstr "Sincronização da área de transferência" -#: internal/app/internal_ui.go:214 +#: internal/app/internal_ui.go:219 msgid "Clipboard text unavailable" msgstr "Texto da área de transferência indisponível" @@ -699,7 +699,7 @@ msgstr "Biscoito" msgid "Cool" msgstr "Legal" -#: internal/app/internal_ui.go:222 +#: internal/app/internal_ui.go:227 msgid "Copied" msgstr "Copiado" @@ -711,7 +711,7 @@ msgstr "Copiar alias para a área de transferência" msgid "Copy and cut are unavailable for password fields" msgstr "Copiar e recortar não estão disponíveis em campos de senha" -#: internal/app/internal_ui.go:220 +#: internal/app/internal_ui.go:225 msgid "Copy failed" msgstr "Falha ao copiar" @@ -845,7 +845,7 @@ msgstr "Pudim" msgid "Custom" msgstr "Personalizado" -#: internal/app/internal_ui.go:225 +#: internal/app/internal_ui.go:230 msgid "Cut" msgstr "Recortado" @@ -1019,11 +1019,11 @@ msgstr "Elefante" msgid "Elf" msgstr "Elfo" -#: internal/emoji/catalog.go:25 +#: internal/emoji/catalog.go:26 msgid "Emoji" msgstr "Emoji" -#: internal/command/descriptions.go:55 internal/emoji/catalog.go:13 +#: internal/command/descriptions.go:55 internal/emoji/catalog.go:14 msgid "Emoji Menu" msgstr "Menu de emojis" @@ -1120,7 +1120,7 @@ msgstr "Fada" msgid "Fallen Leaf" msgstr "Folhas caídas" -#: internal/command/descriptions.go:57 internal/preferences/settings.go:38 +#: internal/command/descriptions.go:57 internal/preferences/settings.go:39 msgid "Fenrir Menu" msgstr "Menu do Fenrir" @@ -1990,7 +1990,7 @@ msgstr "Não no Modo de Janela" msgid "Notifications" msgstr "Notificações" -#: internal/preferences/settings.go:102 internal/preferences/settings.go:96 +#: internal/preferences/settings.go:103 internal/preferences/settings.go:97 msgid "OK" msgstr "OK" @@ -2977,7 +2977,7 @@ msgstr "Televisão" msgid "Tennis ball" msgstr "Bola de tênis" -#: internal/preferences/settings.go:86 +#: internal/preferences/settings.go:87 msgid "Test synthesizer" msgstr "Testar sintetizador" @@ -4306,7 +4306,7 @@ msgstr "{0} botão" msgid "{0} characters" msgstr "{0} caracteres" -#: internal/app/internal_ui.go:139 +#: internal/app/internal_ui.go:144 msgid "{0} closed" msgstr "{0} fechado" diff --git a/internal/i18n/locale/ru/LC_MESSAGES/fenrir.po b/internal/i18n/locale/ru/LC_MESSAGES/fenrir.po index 4a54ec37..6cb1ed81 100644 --- a/internal/i18n/locale/ru/LC_MESSAGES/fenrir.po +++ b/internal/i18n/locale/ru/LC_MESSAGES/fenrir.po @@ -427,7 +427,7 @@ msgid "Canada" msgstr "Канада" #: internal/app/application_overrides.go:368 -#: internal/preferences/settings.go:103 internal/preferences/settings.go:96 +#: internal/preferences/settings.go:104 internal/preferences/settings.go:97 #: screenreader-common/voiceprofiles/editor.go msgid "Cancel" msgstr "Отмена" @@ -589,7 +589,7 @@ msgstr "Не удалось импортировать буфер обмена" msgid "Clipboard sync" msgstr "Синхронизация буфера обмена" -#: internal/app/internal_ui.go:214 +#: internal/app/internal_ui.go:219 msgid "Clipboard text unavailable" msgstr "Текст буфера обмена недоступен" @@ -698,7 +698,7 @@ msgstr "Печенье" msgid "Cool" msgstr "Круто" -#: internal/app/internal_ui.go:222 +#: internal/app/internal_ui.go:227 msgid "Copied" msgstr "Скопировано" @@ -710,7 +710,7 @@ msgstr "Копировать псевдоним в буфер обмена" msgid "Copy and cut are unavailable for password fields" msgstr "Копирование и вырезание недоступны в полях пароля" -#: internal/app/internal_ui.go:220 +#: internal/app/internal_ui.go:225 msgid "Copy failed" msgstr "Не удалось скопировать" @@ -844,7 +844,7 @@ msgstr "Пудинг" msgid "Custom" msgstr "Пользовательский" -#: internal/app/internal_ui.go:225 +#: internal/app/internal_ui.go:230 msgid "Cut" msgstr "Вырезано" @@ -1018,11 +1018,11 @@ msgstr "Слон" msgid "Elf" msgstr "Эльф" -#: internal/emoji/catalog.go:25 +#: internal/emoji/catalog.go:26 msgid "Emoji" msgstr "Эмодзи" -#: internal/command/descriptions.go:55 internal/emoji/catalog.go:13 +#: internal/command/descriptions.go:55 internal/emoji/catalog.go:14 msgid "Emoji Menu" msgstr "Меню эмодзи" @@ -1116,7 +1116,7 @@ msgstr "Фея" msgid "Fallen Leaf" msgstr "Падающие листья" -#: internal/command/descriptions.go:57 internal/preferences/settings.go:38 +#: internal/command/descriptions.go:57 internal/preferences/settings.go:39 msgid "Fenrir Menu" msgstr "Меню Fenrir" @@ -1982,7 +1982,7 @@ msgstr "Не в режиме окна." msgid "Notifications" msgstr "Уведомления" -#: internal/preferences/settings.go:102 internal/preferences/settings.go:96 +#: internal/preferences/settings.go:103 internal/preferences/settings.go:97 msgid "OK" msgstr "ОК" @@ -2969,7 +2969,7 @@ msgstr "Телевизор" msgid "Tennis ball" msgstr "Теннисный мяч" -#: internal/preferences/settings.go:86 +#: internal/preferences/settings.go:87 msgid "Test synthesizer" msgstr "Проверить синтезатор" @@ -4290,7 +4290,7 @@ msgstr "{0}, кнопка" msgid "{0} characters" msgstr "Символов: {0}" -#: internal/app/internal_ui.go:139 +#: internal/app/internal_ui.go:144 msgid "{0} closed" msgstr "{0} закрыто" diff --git a/internal/input/router.go b/internal/input/router.go index 22aee6b9..ad33da56 100644 --- a/internal/input/router.go +++ b/internal/input/router.go @@ -20,7 +20,7 @@ package input import ( "git.stormux.org/storm/fenrir/internal/command" - "git.stormux.org/storm/fenrir/internal/interaction" + "git.stormux.org/storm/screenreader-common/internalui" "time" ) @@ -78,7 +78,7 @@ type Decision struct { Typing bool // forwarded text key or repeat; the screen supplies its actual text WordBoundary bool // a forwarded Space, rather than cursor navigation Command command.ID - UI *interaction.Key + UI *internalui.Key Learn *LearnKey // captured physical press and its inactive command } diff --git a/internal/input/ui.go b/internal/input/ui.go index 40278e83..b4f73ac5 100644 --- a/internal/input/ui.go +++ b/internal/input/ui.go @@ -18,7 +18,7 @@ package input import ( - "git.stormux.org/storm/fenrir/internal/interaction" + "git.stormux.org/storm/screenreader-common/internalui" "time" ) @@ -42,7 +42,7 @@ func (r *Router) Capture(enabled bool) { func (r *Router) Captured() bool { return r.captured } func (r *Router) uiKey(code uint16) Decision { - key := &interaction.Key{ + key := &internalui.Key{ Shift: r.down(KeyShift) || r.down(KeyRightShift), Ctrl: r.down(KeyCtrl) || r.down(KeyRightCtrl), Alt: r.down(KeyAlt), // Right Alt is text input (AltGr). diff --git a/internal/interaction/choice_test.go b/internal/interaction/choice_test.go deleted file mode 100644 index 002321b1..00000000 --- a/internal/interaction/choice_test.go +++ /dev/null @@ -1,120 +0,0 @@ -// Fenrir console screen reader. -// Copyright (c) 2026 Storm Dragon -// SPDX-License-Identifier: GPL-3.0-or-later -// -// This program is free software: you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by the Free -// Software Foundation, either version 3 of the License, or (at your option) -// any later version. -// -// This program is distributed in the hope that it will be useful, but WITHOUT -// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -// more details. -// -// You should have received a copy of the GNU General Public License along with -// this program. If not, see . - -package interaction - -import ( - "strings" - "testing" -) - -func TestGroupedChoicesTraversalIsolationAndSelection(t *testing.T) { - form := Form{Type: TabForm, Title: "Settings", Tabs: []Tab{{ID: "presentation", Label: "Presentation", Controls: []Control{ - {ID: "speech.driver", Label: "Driver", Group: "Speech", Kind: ComboBox, Choices: []Choice{{ID: "first", Label: "First"}, {ID: "second", Label: "Second", Unavailable: "fixture dependency missing"}}}, - {ID: "speech.enabled", Label: "Speech enabled", Group: "Speech", Kind: CheckBox}, - {ID: "sound.enabled", Label: "Sound enabled", Group: "Sound", Kind: CheckBox}, - {ID: "ok", Label: "OK", Kind: Button, Action: "save"}, - }}}} - session, err := NewSession(form) - if err != nil { - t.Fatal(err) - } - if got := session.Handle(Key{Name: "tab"}).Speech; got != "Speech. Driver combo box First" { - t.Fatal(got) - } - for _, key := range []Key{{Text: "invented"}, {Name: "enter"}, {Name: "space"}, {Ctrl: true, Text: "a"}} { - if result := session.Handle(key); result.Action != "" || result.Cancelled { - t.Fatal(result) - } - } - if got := session.Values()["presentation.speech.driver"].Choices[0].ID; got != "first" { - t.Fatal(got) - } - if got := session.Handle(Key{Name: "down"}).Speech; got != "Second. unavailable: fixture dependency missing" { - t.Fatal(got) - } - session.Handle(Key{Name: "down"}) - if got := session.Values()["presentation.speech.driver"].Selected; got != 1 { - t.Fatal("combo wrapped", got) - } - values := session.Values() - values["presentation.speech.driver"].Choices[1].Label = "altered" - if strings.Contains(session.Describe(), "altered") || form.Tabs[0].Controls[0].Selected != 0 { - t.Fatal("aliased choice state") - } - session.Handle(Key{Name: "home"}) - if got := session.Values()["presentation.speech.driver"].Selected; got != 0 { - t.Fatal(got) - } - if got := session.Handle(Key{Name: "tab"}).Speech; got != "Speech enabled unchecked" { - t.Fatal("repeated group", got) - } - if got := session.Handle(Key{Name: "tab"}).Speech; got != "Sound. Sound enabled unchecked" { - t.Fatal(got) - } - if got := session.Handle(Key{Name: "tab", Shift: true}).Speech; got != "Speech. Speech enabled unchecked" { - t.Fatal(got) - } - if !session.Handle(Key{Name: "escape"}).Cancelled { - t.Fatal("escape trapped") - } -} - -func TestComboChangesSpeakOnlyValueAndFocusRepeatsLabel(t *testing.T) { - form := Form{Type: TabForm, Title: "Settings", Tabs: []Tab{{ID: "settings", Label: "Settings", Controls: []Control{ - {ID: "format", Label: "Format", Kind: ComboBox, Choices: []Choice{{ID: "one", Label: "First"}, {ID: "two", Label: "Second"}, {ID: "three", Label: "Third"}}}, - {ID: "ok", Label: "OK", Kind: Button, Action: "save"}, - }}}} - session, err := NewSession(form) - if err != nil { - t.Fatal(err) - } - if got := session.Handle(Key{Name: "tab"}).Speech; got != "Format combo box First" { - t.Fatal(got) - } - for _, testCase := range []struct{ key, want string }{ - {"down", "Second"}, {"right", "Third"}, {"up", "Second"}, - {"left", "First"}, {"end", "Third"}, {"home", "First"}, - } { - if got := session.Handle(Key{Name: testCase.key}).Speech; got != testCase.want { - t.Fatal(testCase.key, got, testCase.want) - } - } - session.Handle(Key{Name: "tab"}) - if got := session.Handle(Key{Name: "tab", Shift: true}).Speech; got != "Format combo box First" { - t.Fatal("reverse focus omitted label", got) - } - session.Handle(Key{Name: "tab", Shift: true}) - if got := session.Handle(Key{Name: "tab"}).Speech; got != "Format combo box First" { - t.Fatal("forward focus omitted label", got) - } -} - -func TestChoiceDefinitionsRejectMissingAndDuplicateSelections(t *testing.T) { - for _, control := range []Control{ - {Choices: nil}, - {Choices: []Choice{{ID: "one", Label: "One"}}, Selected: 1}, - {Choices: []Choice{{ID: "one", Label: "One"}, {ID: "one", Label: "Duplicate"}}}, - {Choices: []Choice{{ID: "one"}}}, - } { - control.ID, control.Label, control.Kind = "driver", "Driver", ComboBox - form := Form{Type: TabForm, Title: "Settings", Tabs: []Tab{{ID: "presentation", Label: "Presentation", Controls: []Control{control}}}} - if _, err := NewSession(form); err == nil { - t.Fatal("invalid combo accepted", control) - } - } -} diff --git a/internal/interaction/dynamic_grid_test.go b/internal/interaction/dynamic_grid_test.go deleted file mode 100644 index 71fab4f8..00000000 --- a/internal/interaction/dynamic_grid_test.go +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (c) 2026 Storm Dragon -// SPDX-License-Identifier: GPL-3.0-or-later - -package interaction - -import ( - "strings" - "testing" -) - -func TestEmptyAndRefreshedGridKeepsFocusSearchAndLiteralWords(t *testing.T) { - form := gridForm() - form.Tabs[0].Controls[0].Choices = nil - form.Tabs[0].Controls[0].DeleteAction = "remove" - session, err := NewSession(form) - if err != nil { - t.Fatal(err) - } - session.Handle(Key{Name: "tab"}) - if got := session.Handle(Key{Name: "enter"}); got.Action != "" || got.Speech != "No matches" { - t.Fatal(got) - } - session.Handle(Key{Text: "c"}) - session.SetChoices("one", "grid", []Choice{{ID: "cat", Label: "cat", Literal: true}, {ID: "car", Label: "car", Literal: true}}) - session.Handle(Key{Name: "right"}) - session.SetChoices("one", "grid", []Choice{{ID: "car", Label: "car", Literal: true}, {ID: "cat", Label: "cat", Literal: true}}) - control, _ := session.FocusedControl() - if control.Text != "c" || control.Choices[control.Selected].ID != "car" { - t.Fatal(control) - } - if got := session.Handle(Key{Name: "delete", Repeat: true}); got.Action != "" { - t.Fatal(got) - } - if got := session.Handle(Key{Name: "delete"}); got.Action != "remove" { - t.Fatal(got) - } - session.SetChoices("one", "grid", nil) - if !strings.Contains(session.Describe(), "No matches") { - t.Fatal(session.Describe()) - } - // Updating a grid must own its choices, independently of worker buffers. - choices := []Choice{{ID: "cat", Label: "cat", Literal: true}} - session.SetChoices("one", "grid", choices) - choices[0].Label = "wrong" - if !strings.Contains(session.Describe(), "cat") { - t.Fatal(session.Describe()) - } -} diff --git a/internal/interaction/grid_test.go b/internal/interaction/grid_test.go deleted file mode 100644 index 5c70e07f..00000000 --- a/internal/interaction/grid_test.go +++ /dev/null @@ -1,128 +0,0 @@ -// Fenrir console screen reader. -// Copyright (c) 2026 Storm Dragon -// SPDX-License-Identifier: GPL-3.0-or-later - -package interaction - -import ( - "strings" - "testing" -) - -func gridForm() Form { - return Form{Type: TabForm, Title: "Picker", Tabs: []Tab{{ID: "one", Label: "One", Controls: []Control{{ - ID: "grid", Label: "Items", Kind: Grid, Columns: 3, Action: "choose", - Choices: []Choice{{ID: "a", Label: "Apple"}, {ID: "b", Label: "Bat"}, {ID: "c", Label: "Cat"}, - {ID: "d", Label: "Dog"}, {ID: "j", Label: "Jack o'lantern"}, {ID: "jp", Label: "Japan"}, {ID: "é", Label: "Éclair"}}, - }}}}} -} - -func TestGridNavigationRaggedRowsAndActivation(t *testing.T) { - session, err := NewSession(gridForm()) - if err != nil { - t.Fatal(err) - } - session.Handle(Key{Name: "tab"}) - for _, trial := range []struct{ key, want string }{ - {"right", "b"}, {"up", "b"}, {"down", "j"}, {"down", "é"}, {"down", "é"}, - {"up", "d"}, {"left", "c"}, {"home", "a"}, {"left", "a"}, {"end", "é"}, {"right", "é"}, - } { - session.Handle(Key{Name: trial.key}) - control, _ := session.FocusedControl() - if got := control.Choices[control.Selected].ID; got != trial.want { - t.Fatalf("%s: got %s, want %s", trial.key, got, trial.want) - } - } - // XLookupString supplies carriage return alongside the named Enter key. - if got := session.Handle(Key{Name: "enter", Text: "\r"}); got.Action != "choose" { - t.Fatal(got) - } -} - -func TestGridPrefixEmptyResultsUnicodeAndIsolation(t *testing.T) { - form := gridForm() - session, err := NewSession(form) - if err != nil { - t.Fatal(err) - } - session.Handle(Key{Name: "tab"}) - if got := session.Handle(Key{Text: "J"}); !strings.Contains(got.Speech, "Jack o'lantern") || !strings.Contains(got.Speech, "1 of 2") { - t.Fatal(got) - } - session.Handle(Key{Name: "right"}) - control, _ := session.FocusedControl() - if control.Selected != 5 { - t.Fatal("filtered selection lost catalog index", control) - } - control.Choices[5].Label = "changed" - if got := session.Handle(Key{Text: "z"}); !strings.Contains(got.Speech, "No matches") { - t.Fatal(got) - } - if got := session.Handle(Key{Name: "enter"}); got.Action != "" { - t.Fatal("empty results activated", got) - } - session.Handle(Key{Name: "backspace"}) - if got := session.Handle(Key{Name: "right"}); !strings.Contains(got.Speech, "Japan") { - t.Fatal("focused value aliased session", got) - } - session.Handle(Key{Name: "backspace", Ctrl: true}) - if got := session.Handle(Key{Text: "é"}); !strings.Contains(got.Speech, "Éclair") { - t.Fatal(got) - } - session.Handle(Key{Name: "backspace"}) - control, _ = session.FocusedControl() - if control.Text != "" || form.Tabs[0].Controls[0].Selected != 0 || form.Tabs[0].Controls[0].Text != "" { - t.Fatal("Unicode deletion or form isolation failed", control) - } - if got := session.Handle(Key{Name: "escape"}); !got.Cancelled { - t.Fatal(got) - } -} - -func TestGridValidation(t *testing.T) { - form := gridForm() - form.Tabs[0].Controls[0].Columns = 0 - if _, err := NewSession(form); err == nil { - t.Fatal("zero-width grid accepted") - } - form = gridForm() - form.Tabs[0].Controls[0].Choices[1].ID = "a" - if _, err := NewSession(form); err == nil { - t.Fatal("duplicate values accepted") - } -} - -func TestGridSpeechDetailOptions(t *testing.T) { - for _, trial := range []struct { - coordinates, position bool - want, filtered string - }{ - {true, true, "Bat. row 1, column 2. 2 of 7", "Japan. row 1, column 2. 2 of 2"}, - {true, false, "Bat. row 1, column 2", "Japan. row 1, column 2"}, - {false, true, "Bat. 2 of 7", "Japan. 2 of 2"}, - {false, false, "Bat", "Japan"}, - } { - session, err := NewSession(gridForm()) - if err != nil { - t.Fatal(err) - } - session.ConfigureGrid(trial.coordinates, trial.position) - session.Handle(Key{Name: "tab"}) - if got := session.Handle(Key{Name: "right"}).Speech; got != trial.want { - t.Fatalf("%+v: %q", trial, got) - } - if got := session.Describe(); got != "Items grid. "+trial.want { - t.Fatal(got) - } - session.Handle(Key{Text: "j"}) - if got := session.Handle(Key{Name: "right"}).Speech; got != trial.filtered { - t.Fatal(got) - } - if got := session.Handle(Key{Name: "enter"}).Action; got != "choose" { - t.Fatal(got) - } - if got := session.Handle(Key{Text: "zzz"}).Speech; got != "Search jzzz. No matches" { - t.Fatal(got) - } - } -} diff --git a/internal/interaction/list_test.go b/internal/interaction/list_test.go deleted file mode 100644 index a287c615..00000000 --- a/internal/interaction/list_test.go +++ /dev/null @@ -1,53 +0,0 @@ -// Fenrir console screen reader. -// Copyright (c) 2026 Storm Dragon -// SPDX-License-Identifier: GPL-3.0-or-later - -package interaction - -import "testing" - -func TestListPrefixSearch(t *testing.T) { - session, err := NewSession(Form{Type: TabForm, Title: "Picker", Tabs: []Tab{{ID: "items", Label: "Items", Controls: []Control{ - {ID: "list", Label: "Item", Kind: List, Items: []string{"Default", "NetworkManager", "Ninjam", "Éclair"}, Action: "choose"}, - {ID: "cancel", Label: "Cancel", Kind: Button, Action: "cancel"}, - }}}}) - if err != nil { - t.Fatal(err) - } - session.Handle(Key{Name: "tab"}) - for _, step := range []struct { - key Key - want, prefix string - selected int - }{ - {Key{Text: "N"}, "NetworkManager", "N", 1}, - {Key{Text: "i"}, "Ninjam", "Ni", 2}, - {Key{Text: "z"}, "No matches", "Ni", 2}, - {Key{Text: "n"}, "Ninjam", "Nin", 2}, - {Key{Name: "backspace"}, "Ninjam", "Ni", 2}, - {Key{Name: "backspace"}, "NetworkManager", "N", 1}, - {Key{Name: "backspace", Ctrl: true}, "Default", "", 0}, - {Key{Text: "é"}, "Éclair", "é", 3}, - {Key{Name: "down"}, "Éclair", "", 3}, - {Key{Text: "ni"}, "Ninjam", "ni", 2}, - {Key{Name: "up"}, "NetworkManager", "", 1}, - {Key{Text: "d"}, "Default", "d", 0}, - {Key{Text: "n", Ctrl: true}, "", "d", 0}, - {Key{Text: "n", Alt: true}, "", "d", 0}, - {Key{Text: "\n"}, "", "d", 0}, - } { - got := session.Handle(step.key) - control := session.Values()["items.list"] - if got.Speech != step.want || got.Action != "" || control.Text != step.prefix || control.Selected != step.selected { - t.Fatalf("key %+v: result %+v, prefix %q, selection %d; want %q, %q, %d", step.key, got, control.Text, control.Selected, step.want, step.prefix, step.selected) - } - } - session.Handle(Key{Name: "tab"}) - session.Handle(Key{Name: "tab", Shift: true}) - if got := session.Handle(Key{Text: "ni"}).Speech; got != "Ninjam" { - t.Fatal("focus change did not clear search", got) - } - if got := session.Handle(Key{Name: "enter"}).Action; got != "choose" { - t.Fatal("search prevented activation", got) - } -} diff --git a/internal/interaction/session_test.go b/internal/interaction/session_test.go deleted file mode 100644 index bd37a9b0..00000000 --- a/internal/interaction/session_test.go +++ /dev/null @@ -1,162 +0,0 @@ -// Fenrir console screen reader. -// Copyright (c) 2026 Storm Dragon -// SPDX-License-Identifier: GPL-3.0-or-later -// -// This program is free software: you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by the Free -// Software Foundation, either version 3 of the License, or (at your option) -// any later version. -// -// This program is distributed in the hope that it will be useful, but WITHOUT -// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -// more details. -// -// You should have received a copy of the GNU General Public License along with -// this program. If not, see . - -package interaction - -import ( - "math" - "testing" -) - -func TestInvalidNumberUpDownStepRejected(t *testing.T) { - for _, step := range []float64{-1, math.NaN(), math.Inf(1), math.Inf(-1)} { - form := testForm() - form.Tabs[0].Controls[1].UpDownStep = step - if _, err := NewSession(form); err == nil { - t.Fatalf("invalid Up/Down step %v accepted", step) - } - } -} - -func testForm() Form { - return Form{Type: TabForm, Title: "Settings", Tabs: []Tab{ - {ID: "speech", Label: "Speech", Controls: []Control{ - {ID: "enabled", Label: "Speech enabled", Kind: CheckBox, Checked: true}, - {ID: "range", Label: "Range", Kind: Number, Number: 2.5, Min: -5, Max: 5, Step: 0.1}, - {ID: "text", Label: "Text", Kind: Entry, Text: "a界c"}, - {ID: "ok", Label: "OK", Kind: Button, Action: "save"}, - {ID: "cancel", Label: "Cancel", Kind: Button, Action: "cancel"}, - }}, - {ID: "sound", Label: "Sound"}, - }} -} - -func TestTabFormTraversalControlsAndIsolation(t *testing.T) { - form := testForm() - session, err := NewSession(form) - if err != nil { - t.Fatal(err) - } - if session.Open() != "Settings. Speech tab" { - t.Fatal(session.Open()) - } - for _, name := range []string{"right", "left", "down", "up"} { - result := session.Handle(Key{Name: name}) - if result.Speech == "" { - t.Fatal("silent tab", name) - } - } - if session.Describe() != "Speech tab" { - t.Fatal(session.Describe()) - } - if got := session.Handle(Key{Name: "tab"}).Speech; got != "Speech enabled checked" { - t.Fatal(got) - } - if got := session.Handle(Key{Name: "space"}).Speech; got != "Speech enabled unchecked" { - t.Fatal(got) - } - if !form.Tabs[0].Controls[0].Checked { - t.Fatal("form mutated outside session") - } - session.Handle(Key{Name: "tab"}) - for _, fixture := range []struct { - name string - want float64 - }{ - {"up", 3.5}, {"right", 3.6}, {"left", 3.5}, {"down", 2.5}, - } { - session.Handle(Key{Name: fixture.name}) - if got := session.Values()["speech.range"].Number; got != fixture.want { - t.Fatal(fixture, got) - } - } - for range 100 { - session.Handle(Key{Name: "up"}) - } - if got := session.Values()["speech.range"].Number; got != 5 { - t.Fatal("upper bound", got) - } - for range 100 { - session.Handle(Key{Name: "down"}) - } - if got := session.Values()["speech.range"].Number; got != -5 { - t.Fatal("lower bound", got) - } - session.Handle(Key{Name: "tab"}) - session.Handle(Key{Name: "home"}) - session.Handle(Key{Name: "right"}) - session.Handle(Key{Name: "delete"}) - session.Handle(Key{Text: "é"}) - if got := session.Values()["speech.text"].Text; got != "aéc" { - t.Fatal("Unicode editing", got) - } - session.Handle(Key{Ctrl: true, Text: "a"}) - session.Handle(Key{Text: "replacement"}) - if got := session.Values()["speech.text"].Text; got != "replacement" { - t.Fatal("select all", got) - } - if got := session.Handle(Key{Name: "tab"}).Speech; got != "OK button" { - t.Fatal(got) - } - if got := session.Handle(Key{Name: "enter"}).Action; got != "save" { - t.Fatal(got) - } - if got := session.Handle(Key{Name: "tab"}).Speech; got != "Cancel button" { - t.Fatal(got) - } - if got := session.Handle(Key{Name: "enter"}).Action; got != "cancel" { - t.Fatal(got) - } - if got := session.Handle(Key{Name: "tab"}).Speech; got != "Speech tab" { - t.Fatal("tab cycle", got) - } - if got := session.Handle(Key{Name: "tab", Shift: true}).Speech; got != "Cancel button" { - t.Fatal("reverse cycle", got) - } - if !session.Handle(Key{Name: "escape"}).Cancelled { - t.Fatal("escape did not cancel") - } -} - -func TestListCategoryFormReturnsSelectionWithoutSideEffects(t *testing.T) { - form := Form{Type: TabForm, Title: "Picker", Tabs: []Tab{{ID: "category", Label: "Category", Controls: []Control{{ID: "items", Label: "Items", Kind: List, Items: []string{"First", "Second"}, Action: "choose"}}}}} - session, err := NewSession(form) - if err != nil { - t.Fatal(err) - } - session.Handle(Key{Name: "tab"}) - if got := session.Handle(Key{Name: "up"}).Speech; got != "First" { - t.Fatal(got) - } - session.Handle(Key{Name: "down"}) - if got := session.Handle(Key{Name: "enter"}).Action; got != "choose" { - t.Fatal(got) - } - values := session.Values() - values["category.items"].Items[1] = "changed" - if got := session.Describe(); got != "Items Second" { - t.Fatal("values aliased", got) - } -} - -func TestUnknownFormTypeRejected(t *testing.T) { - form := testForm() - form.Type = "unknown" - if _, err := NewSession(form); err == nil { - t.Fatal("unknown form type accepted") - } -} diff --git a/internal/interaction/shared.go b/internal/interaction/shared.go deleted file mode 100644 index a06722e2..00000000 --- a/internal/interaction/shared.go +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) 2026 Storm Dragon -// SPDX-License-Identifier: GPL-3.0-or-later - -// Package interaction connects the shared UI toolkit to Fenrir's catalog. -package interaction - -import ( - "git.stormux.org/storm/fenrir/internal/i18n" - shared "git.stormux.org/storm/screenreader-common/internalui" -) - -type Kind = shared.Kind -type Control = shared.Control -type Choice = shared.Choice -type Tab = shared.Tab -type FormType = shared.FormType -type Form = shared.Form -type Key = shared.Key -type Result = shared.Result -type Session = shared.Session - -const ( - CheckBox = shared.CheckBox - Number = shared.Number - Entry = shared.Entry - List = shared.List - Button = shared.Button - ComboBox = shared.ComboBox - Grid = shared.Grid - TabForm = shared.TabForm - FlatForm = shared.FlatForm -) - -func NewSession(form Form) (*Session, error) { - return shared.NewSession(form, shared.Messages{Translate: i18n.T}) -} diff --git a/internal/interaction/visibility_test.go b/internal/interaction/visibility_test.go deleted file mode 100644 index 941b2844..00000000 --- a/internal/interaction/visibility_test.go +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) 2026 Storm Dragon -// SPDX-License-Identifier: GPL-3.0-or-later - -package interaction - -import "testing" - -func TestHiddenControlsRetainDraftAndRemainOutsideBothTabOrders(t *testing.T) { - session, err := NewSession(testForm()) - if err != nil { - t.Fatal(err) - } - session.SetHidden("speech", "range", true) - for _, want := range []string{"enabled", "text", "ok", "cancel", ""} { - session.Handle(Key{Name: "tab"}) - got, focused := session.FocusedControl() - if focused != (want != "") || got.ID != want { - t.Fatal(got, want) - } - } - for _, want := range []string{"cancel", "ok", "text", "enabled", ""} { - session.Handle(Key{Name: "tab", Shift: true}) - got, focused := session.FocusedControl() - if focused != (want != "") || got.ID != want { - t.Fatal(got, want) - } - } - session.Handle(Key{Name: "tab"}) - session.Handle(Key{Name: "tab"}) - session.Handle(Key{Ctrl: true, Text: "a"}) - session.Handle(Key{Text: "draft"}) - session.SetHidden("speech", "text", true) - if got, _ := session.FocusedControl(); got.ID != "ok" { - t.Fatal("hidden focus retained", got) - } - session.SetHidden("speech", "text", false) - session.Handle(Key{Name: "tab", Shift: true}) - if got := session.Values()["speech.text"]; got.Text != "draft" || got.Hidden { - t.Fatal(got) - } - for _, id := range []string{"enabled", "range", "text", "ok", "cancel"} { - session.SetHidden("speech", id, true) - } - if got := session.Handle(Key{Name: "tab"}).Speech; got != "Speech tab" { - t.Fatal("all-hidden tab trapped focus", got) - } -} diff --git a/internal/preferences/application_test.go b/internal/preferences/application_test.go index 221eb136..2bbf5853 100644 --- a/internal/preferences/application_test.go +++ b/internal/preferences/application_test.go @@ -5,7 +5,7 @@ package preferences import ( "git.stormux.org/storm/fenrir/internal/config" - "git.stormux.org/storm/fenrir/internal/interaction" + "git.stormux.org/storm/screenreader-common/internalui" "testing" ) @@ -25,7 +25,7 @@ func TestApplicationSettingsOnlyExposeRestorableControls(t *testing.T) { t.Fatal("voice control missing") } tabToControl(t, session, "speech.rate") - session.Handle(interaction.Key{Name: "up"}) + session.Handle(internalui.Key{Name: "up"}) saved, err := ApplicationSettings(session, base) if err != nil || saved.Presentation.Speech.Rate != base.Presentation.Speech.Rate+10 || saved.Keyboard.Layout != base.Keyboard.Layout { t.Fatal(saved, err) diff --git a/internal/preferences/discovery.go b/internal/preferences/discovery.go index 003dee39..fe4f35d3 100644 --- a/internal/preferences/discovery.go +++ b/internal/preferences/discovery.go @@ -8,8 +8,8 @@ import ( "strings" "git.stormux.org/storm/fenrir/internal/config" - "git.stormux.org/storm/fenrir/internal/interaction" "git.stormux.org/storm/fenrir/internal/speech" + "git.stormux.org/storm/screenreader-common/internalui" ) type Discovery struct { @@ -109,7 +109,7 @@ func preserveChoice(choices []config.Choice, saved string, err error) []config.C // RefreshSpeech updates driver visibility and dependent choices. Driver changes // keep hidden edits; module/language changes clear their dependent selections. // The result tells the host when a different driver's catalog may be needed. -func (d Discovery) RefreshSpeech(session *interaction.Session, previous *config.Settings) bool { +func (d Discovery) RefreshSpeech(session *internalui.Session, previous *config.Settings) bool { next := *previous values := session.Values() for path, target := range map[string]*string{ @@ -161,7 +161,7 @@ func (d Discovery) RefreshSpeech(session *interaction.Session, previous *config. // RefreshCatalog applies a worker result to the current selector draft. It // never moves focus or resets a selection made while discovery was pending. -func (d Discovery) RefreshCatalog(session *interaction.Session, selected config.Settings) { +func (d Discovery) RefreshCatalog(session *internalui.Session, selected config.Settings) { choices := d.Choices(selected) for path, value := range map[string]string{ "presentation.speech.module": selected.Presentation.Speech.Module, @@ -172,10 +172,10 @@ func (d Discovery) RefreshCatalog(session *interaction.Session, selected config. } } -func interactionChoices(choices []config.Choice) []interaction.Choice { - result := make([]interaction.Choice, 0, len(choices)) +func interactionChoices(choices []config.Choice) []internalui.Choice { + result := make([]internalui.Choice, 0, len(choices)) for _, choice := range choices { - result = append(result, interaction.Choice{ID: choice.ID, Label: choice.Label, Unavailable: choice.Unavailable}) + result = append(result, internalui.Choice{ID: choice.ID, Label: choice.Label, Unavailable: choice.Unavailable}) } return result } diff --git a/internal/preferences/hardware_form_test.go b/internal/preferences/hardware_form_test.go index ddf57e1c..91302aad 100644 --- a/internal/preferences/hardware_form_test.go +++ b/internal/preferences/hardware_form_test.go @@ -7,16 +7,16 @@ import ( "testing" "git.stormux.org/storm/fenrir/internal/config" - "git.stormux.org/storm/fenrir/internal/interaction" + "git.stormux.org/storm/screenreader-common/internalui" ) -func focusSetting(t *testing.T, session *interaction.Session, id string) { +func focusSetting(t *testing.T, session *internalui.Session, id string) { t.Helper() for range 100 { if control, ok := session.FocusedControl(); ok && control.ID == id { return } - session.Handle(interaction.Key{Name: "tab"}) + session.Handle(internalui.Key{Name: "tab"}) } t.Fatal("control not reachable", id) } @@ -35,7 +35,7 @@ func TestHardwareControlsUpdateImmediatelyAndKeepDraftEdits(t *testing.T) { } } focusSetting(t, session, "speech.driver") - session.Handle(interaction.Key{Name: "down"}) + session.Handle(internalui.Key{Name: "down"}) if !discovery.RefreshSpeech(session, &previous) { t.Fatal("driver change not detected") } @@ -43,15 +43,15 @@ func TestHardwareControlsUpdateImmediatelyAndKeepDraftEdits(t *testing.T) { t.Fatal("driver change moved focus", control) } focusSetting(t, session, "speech.hardware_device") - session.Handle(interaction.Key{Text: "/dev/fixture-synth"}) + session.Handle(internalui.Key{Text: "/dev/fixture-synth"}) focusSetting(t, session, "speech.hardware_baud_rate") - session.Handle(interaction.Key{Name: "end"}) + session.Handle(internalui.Key{Name: "end"}) draft, err := Settings(session, base) if err != nil || draft.Presentation.Speech.HardwareDevice != "/dev/fixture-synth" || draft.Presentation.Speech.HardwareBaudRate != 115200 { t.Fatal(draft, err) } focusSetting(t, session, "speech.driver") - session.Handle(interaction.Key{Name: "down"}) + session.Handle(internalui.Key{Name: "down"}) discovery.RefreshSpeech(session, &previous) for _, path := range []string{"presentation.speech.hardware_device", "presentation.speech.hardware_baud_rate", "presentation.speech.module", "presentation.speech.language", "presentation.speech.voice"} { if !session.Values()[path].Hidden { @@ -61,13 +61,13 @@ func TestHardwareControlsUpdateImmediatelyAndKeepDraftEdits(t *testing.T) { if session.Values()["presentation.speech.test"].Hidden { t.Fatal("USB test button hidden") } - session.Handle(interaction.Key{Name: "up"}) + session.Handle(internalui.Key{Name: "up"}) discovery.RefreshSpeech(session, &previous) draft, err = Settings(session, base) if err != nil || draft.Presentation.Speech.HardwareDevice != "/dev/fixture-synth" || draft.Presentation.Speech.HardwareBaudRate != 115200 { t.Fatal("driver round trip lost edits", draft, err) } - session.Handle(interaction.Key{Name: "home"}) + session.Handle(internalui.Key{Name: "home"}) discovery.RefreshSpeech(session, &previous) if !session.Values()["presentation.speech.test"].Hidden || session.Values()["presentation.speech.module"].Hidden { t.Fatal("Speech Dispatcher controls not restored") @@ -85,11 +85,11 @@ func TestEveryHardwareFormCanSavePortAndTypedBaud(t *testing.T) { } if driver != "dectalk-usb" { focusSetting(t, session, "speech.hardware_device") - session.Handle(interaction.Key{Ctrl: true, Text: "a"}) - session.Handle(interaction.Key{Text: "/dev/fixture-updated"}) + session.Handle(internalui.Key{Ctrl: true, Text: "a"}) + session.Handle(internalui.Key{Text: "/dev/fixture-updated"}) focusSetting(t, session, "speech.hardware_baud_rate") - session.Handle(interaction.Key{Name: "home"}) - session.Handle(interaction.Key{Name: "down"}) + session.Handle(internalui.Key{Name: "home"}) + session.Handle(internalui.Key{Name: "down"}) } draft, err := Settings(session, base) if err != nil { diff --git a/internal/preferences/modifiers.go b/internal/preferences/modifiers.go index be481dd4..0f10f1a6 100644 --- a/internal/preferences/modifiers.go +++ b/internal/preferences/modifiers.go @@ -10,7 +10,7 @@ import ( "git.stormux.org/storm/fenrir/internal/config" "git.stormux.org/storm/fenrir/internal/input" - "git.stormux.org/storm/fenrir/internal/interaction" + "git.stormux.org/storm/screenreader-common/internalui" ) type modifierOption struct{ name, Label string } @@ -53,8 +53,8 @@ func modifierChecked(names []string, name string) bool { return false } -func modifierControls(settings config.Settings) []interaction.Control { - var controls []interaction.Control +func modifierControls(settings config.Settings) []internalui.Control { + var controls []internalui.Control for _, role := range []struct { id, Label string names []string @@ -67,13 +67,13 @@ func modifierControls(settings config.Settings) []interaction.Control { options = append(options, modifierOption{name: "KEY_COMPOSE", Label: "Compose"}) } for _, option := range options { - controls = append(controls, interaction.Control{ID: role.id + option.name, Label: option.Label, Group: role.Label, Kind: interaction.CheckBox, Checked: modifierChecked(role.names, option.name)}) + controls = append(controls, internalui.Control{ID: role.id + option.name, Label: option.Label, Group: role.Label, Kind: internalui.CheckBox, Checked: modifierChecked(role.names, option.name)}) } } return controls } -func selectedModifiers(values map[string]interaction.Control, prefix string, names []string, options []modifierOption) ([]string, bool, error) { +func selectedModifiers(values map[string]internalui.Control, prefix string, names []string, options []modifierOption) ([]string, bool, error) { selected := slices.Clone(names) changed := false for _, option := range options { @@ -94,7 +94,7 @@ func selectedModifiers(values map[string]interaction.Control, prefix string, nam return selected, changed, nil } -func modifierSettings(values map[string]interaction.Control, base *config.Settings) error { +func modifierSettings(values map[string]internalui.Control, base *config.Settings) error { reader, changed, err := selectedModifiers(values, "fenrir_key.", readerNames(*base), modifierOptions) if err != nil { return err diff --git a/internal/preferences/modifiers_test.go b/internal/preferences/modifiers_test.go index 9b24f6ae..335a94f5 100644 --- a/internal/preferences/modifiers_test.go +++ b/internal/preferences/modifiers_test.go @@ -9,16 +9,16 @@ import ( "testing" "git.stormux.org/storm/fenrir/internal/config" - "git.stormux.org/storm/fenrir/internal/interaction" + "git.stormux.org/storm/screenreader-common/internalui" ) -func focusModifier(t *testing.T, s *interaction.Session, id string) { +func focusModifier(t *testing.T, s *internalui.Session, id string) { t.Helper() for range 40 { if control, ok := s.FocusedControl(); ok && control.ID == id { return } - s.Handle(interaction.Key{Name: "tab"}) + s.Handle(internalui.Key{Name: "tab"}) } t.Fatal("could not focus", id) } @@ -35,17 +35,17 @@ func TestModifierCheckboxesRejectConflictAndSaveSelections(t *testing.T) { } for _, role := range []string{"fenrir_key.", "script_key."} { control := session.Values()["keyboard."+role+key] - if control.Kind != interaction.CheckBox || control.Checked != (role == "fenrir_key.") { + if control.Kind != internalui.CheckBox || control.Checked != (role == "fenrir_key.") { t.Fatal(control) } } focusModifier(t, session, "script_key."+key) - session.Handle(interaction.Key{Name: "space"}) + session.Handle(internalui.Key{Name: "space"}) if _, err := Settings(session, base); err == nil { t.Fatal("overlapping checkbox roles saved", key) } focusModifier(t, session, "fenrir_key."+key) - session.Handle(interaction.Key{Name: "space"}) + session.Handle(internalui.Key{Name: "space"}) if _, err := Settings(session, base); err == nil { t.Fatal("all reader keys unchecked accepted") } @@ -54,7 +54,7 @@ func TestModifierCheckboxesRejectConflictAndSaveSelections(t *testing.T) { replacement = "KEY_CAPSLOCK" } focusModifier(t, session, "fenrir_key."+replacement) - session.Handle(interaction.Key{Name: "space"}) + session.Handle(internalui.Key{Name: "space"}) draft, err := Settings(session, base) if err != nil || !modifierChecked(draft.General.ScriptKeys, key) || !modifierChecked(draft.Keyboard.FenrirKeys, replacement) || modifierChecked(draft.Keyboard.FenrirKeys, key) { t.Fatal(draft.Keyboard, draft.General, err) diff --git a/internal/preferences/settings.go b/internal/preferences/settings.go index f5898b37..cc201b2d 100644 --- a/internal/preferences/settings.go +++ b/internal/preferences/settings.go @@ -28,8 +28,9 @@ import ( "strings" "git.stormux.org/storm/fenrir/internal/config" - "git.stormux.org/storm/fenrir/internal/interaction" + "git.stormux.org/storm/fenrir/internal/i18n" "git.stormux.org/storm/fenrir/internal/speech" + "git.stormux.org/storm/screenreader-common/internalui" "github.com/pelletier/go-toml/v2" ) @@ -37,24 +38,24 @@ type Choices map[string][]config.Choice const MenuTitle = "Fenrir Menu" -func NewSession(settings config.Settings, order []string, discovered ...Choices) (*interaction.Session, error) { +func NewSession(settings config.Settings, order []string, discovered ...Choices) (*internalui.Session, error) { return newSession(settings, order, MenuTitle, false, discovered...) } -func NewApplicationSession(settings config.Settings, order []string, title string, discovered ...Choices) (*interaction.Session, error) { +func NewApplicationSession(settings config.Settings, order []string, title string, discovered ...Choices) (*internalui.Session, error) { return newSession(settings, order, title, true, discovered...) } -func newSession(settings config.Settings, order []string, title string, application bool, discovered ...Choices) (*interaction.Session, error) { +func newSession(settings config.Settings, order []string, title string, application bool, discovered ...Choices) (*internalui.Session, error) { if err := settings.Validate(); err != nil { return nil, err } - form := interaction.Form{Type: interaction.TabForm, Title: title} + form := internalui.Form{Type: internalui.TabForm, Title: title} for _, section := range config.OrderedSections(config.Sections(), order) { if section.Label == "" { continue } - tab := interaction.Tab{ID: section.ID, Label: section.Label} + tab := internalui.Tab{ID: section.ID, Label: section.Label} var appendSection func(config.Section, string) error appendSection = func(section config.Section, group string) error { for _, definition := range section.Settings { @@ -83,7 +84,7 @@ func newSession(settings config.Settings, order []string, title string, applicat } if section.ID == "presentation.speech" { driver, _ := speech.FindDriver(settings.Presentation.Speech.Driver) - tab.Controls = append(tab.Controls, interaction.Control{ID: "speech.test", Label: "Test synthesizer", Group: "Speech", Kind: interaction.Button, Action: "test-synthesizer", Hidden: !driver.Hardware}) + tab.Controls = append(tab.Controls, internalui.Control{ID: "speech.test", Label: "Test synthesizer", Group: "Speech", Kind: internalui.Button, Action: "test-synthesizer", Hidden: !driver.Hardware}) } return nil } @@ -93,21 +94,21 @@ func newSession(settings config.Settings, order []string, title string, applicat if len(tab.Controls) == 0 { continue } - tab.Controls = append(tab.Controls, interaction.Control{ID: "ok", Label: "OK", Kind: interaction.Button, Action: "save"}, interaction.Control{ID: "cancel", Label: "Cancel", Kind: interaction.Button, Action: "cancel"}) + tab.Controls = append(tab.Controls, internalui.Control{ID: "ok", Label: "OK", Kind: internalui.Button, Action: "save"}, internalui.Control{ID: "cancel", Label: "Cancel", Kind: internalui.Button, Action: "cancel"}) form.Tabs = append(form.Tabs, tab) } if !application { profiles := settings.VoiceProfiles.Tab() profiles.Controls = append(profiles.Controls, - interaction.Control{ID: "ok", Label: "OK", Kind: interaction.Button, Action: "save"}, - interaction.Control{ID: "cancel", Label: "Cancel", Kind: interaction.Button, Action: "cancel"}) + internalui.Control{ID: "ok", Label: "OK", Kind: internalui.Button, Action: "save"}, + internalui.Control{ID: "cancel", Label: "Cancel", Kind: internalui.Button, Action: "cancel"}) form.Tabs = append(form.Tabs, profiles) } - return interaction.NewSession(form) + return internalui.NewSession(form, internalui.Messages{Translate: i18n.T}) } -func makeControl(definition config.Definition, settings config.Settings, discovered []Choices) (interaction.Control, error) { - control := interaction.Control{Label: definition.Label, Hidden: !definition.Available(settings)} +func makeControl(definition config.Definition, settings config.Settings, discovered []Choices) (internalui.Control, error) { + control := internalui.Control{Label: definition.Label, Hidden: !definition.Available(settings)} value := definition.Value(settings) if definition.ChoiceSource != "" { choices := definition.Choices(settings) @@ -118,10 +119,10 @@ func makeControl(definition config.Definition, settings config.Settings, discove choices = supplied } } - control.Kind = interaction.ComboBox + control.Kind = internalui.ComboBox control.Selected = -1 for index, choice := range choices { - control.Choices = append(control.Choices, interaction.Choice{ID: choice.ID, Label: choice.Label, Unavailable: choice.Unavailable}) + control.Choices = append(control.Choices, internalui.Choice{ID: choice.ID, Label: choice.Label, Unavailable: choice.Unavailable}) if choice.ID == fmt.Sprint(value) { control.Selected = index } @@ -133,9 +134,9 @@ func makeControl(definition config.Definition, settings config.Settings, discove } switch definition.Kind { case reflect.Bool: - control.Kind, control.Checked = interaction.CheckBox, value.(bool) + control.Kind, control.Checked = internalui.CheckBox, value.(bool) case reflect.Int, reflect.Float64: - control.Kind = interaction.Number + control.Kind = internalui.Number if definition.Kind == reflect.Int { control.Number = float64(value.(int)) } else { @@ -146,7 +147,7 @@ func makeControl(definition config.Definition, settings config.Settings, discove control.UpDownStep = 10 } case reflect.String: - control.Kind, control.Text = interaction.Entry, value.(string) + control.Kind, control.Text = internalui.Entry, value.(string) case reflect.Slice: devices := value.([]string) if devices == nil { @@ -156,22 +157,22 @@ func makeControl(definition config.Definition, settings config.Settings, discove if err != nil { return control, err } - control.Kind, control.Text = interaction.Entry, string(encoded) + control.Kind, control.Text = internalui.Entry, string(encoded) default: return control, fmt.Errorf("unsupported control for %s", definition.Path) } return control, nil } -func Settings(session *interaction.Session, base config.Settings) (config.Settings, error) { +func Settings(session *internalui.Session, base config.Settings) (config.Settings, error) { return settingsValues(session, base, false) } -func ApplicationSettings(session *interaction.Session, base config.Settings) (config.Settings, error) { +func ApplicationSettings(session *internalui.Session, base config.Settings) (config.Settings, error) { return settingsValues(session, base, true) } -func settingsValues(session *interaction.Session, base config.Settings, application bool) (config.Settings, error) { +func settingsValues(session *internalui.Session, base config.Settings, application bool) (config.Settings, error) { values := session.Values() // Visibility follows the form's selected driver, including unsaved switches. driver, hasDriver := values["presentation.speech.driver"] diff --git a/internal/preferences/settings_test.go b/internal/preferences/settings_test.go index f8e0a925..910ea298 100644 --- a/internal/preferences/settings_test.go +++ b/internal/preferences/settings_test.go @@ -24,7 +24,7 @@ import ( "testing" "git.stormux.org/storm/fenrir/internal/config" - "git.stormux.org/storm/fenrir/internal/interaction" + "git.stormux.org/storm/screenreader-common/internalui" ) func TestSettingsFormCoversSchemaAndReturnsIsolatedDraft(t *testing.T) { @@ -48,10 +48,10 @@ func TestSettingsFormCoversSchemaAndReturnsIsolatedDraft(t *testing.T) { if err != nil || !reflect.DeepEqual(unchanged, base) { t.Fatal(unchanged, err) } - session.Handle(interaction.Key{Name: "tab"}) - session.Handle(interaction.Key{Name: "space"}) + session.Handle(internalui.Key{Name: "tab"}) + session.Handle(internalui.Key{Name: "space"}) tabToControl(t, session, "speech.rate") - session.Handle(interaction.Key{Name: "up"}) + session.Handle(internalui.Key{Name: "up"}) draft, err := Settings(session, base) if err != nil { t.Fatal(err) @@ -83,7 +83,7 @@ func TestSpeechRateArrowSteps(t *testing.T) { t.Fatal(err) } tabToControl(t, session, "speech.rate") - result := session.Handle(interaction.Key{Name: trial.key}) + result := session.Handle(internalui.Key{Name: trial.key}) if want := "Rate " + strconv.Itoa(trial.want); result.Speech != want { t.Fatalf("application=%v, rate=%d, key=%s: speech=%q, want %q", application, trial.start, trial.key, result.Speech, want) } @@ -106,12 +106,12 @@ func TestReadingModeIsConstrainedAndSavedInDraft(t *testing.T) { if err != nil { t.Fatal(err) } - session.Handle(interaction.Key{Name: "tab"}) - session.Handle(interaction.Key{Name: "tab"}) - if got := session.Handle(interaction.Key{Name: "tab"}).Speech; got != "Tracking mode combo box cursor tracking" { + session.Handle(internalui.Key{Name: "tab"}) + session.Handle(internalui.Key{Name: "tab"}) + if got := session.Handle(internalui.Key{Name: "tab"}).Speech; got != "Tracking mode combo box cursor tracking" { t.Fatal(got) } - session.Handle(interaction.Key{Name: "down"}) + session.Handle(internalui.Key{Name: "down"}) draft, err := Settings(session, base) if err != nil || draft.Reading.Mode != "table" || base.Reading.Mode != "cursor" { t.Fatal("mode not saved or draft leaked", draft, err) @@ -134,14 +134,14 @@ func TestCapitalCheckboxesRoundTripIndependently(t *testing.T) { "reading.beep_for_capitals": base.Reading.BeepForCapitals, "reading.say_cap_for_capitals": base.Reading.SayCapForCapitals, } { - if got := values[path]; got.Kind != interaction.CheckBox || got.Checked != want { + if got := values[path]; got.Kind != internalui.CheckBox || got.Checked != want { t.Fatal(path, got) } } for range 6 { - session.Handle(interaction.Key{Name: "tab"}) + session.Handle(internalui.Key{Name: "tab"}) } - session.Handle(interaction.Key{Name: "space"}) + session.Handle(internalui.Key{Name: "space"}) draft, err := Settings(session, base) if err != nil || draft.Reading.RaisePitchForCapitals == base.Reading.RaisePitchForCapitals || draft.Reading.BeepForCapitals != base.Reading.BeepForCapitals || draft.Reading.SayCapForCapitals != base.Reading.SayCapForCapitals { t.Fatal(draft.Reading, err) @@ -154,9 +154,9 @@ func TestInvalidDeviceEntryDoesNotSubmit(t *testing.T) { if err != nil { t.Fatal(err) } - session.Handle(interaction.Key{Name: "tab"}) - session.Handle(interaction.Key{Ctrl: true, Text: "a"}) - session.Handle(interaction.Key{Text: "invalid value"}) + session.Handle(internalui.Key{Name: "tab"}) + session.Handle(internalui.Key{Ctrl: true, Text: "a"}) + session.Handle(internalui.Key{Text: "invalid value"}) if _, err := Settings(session, config.Defaults()); err == nil { t.Fatal("invalid devices accepted") } @@ -171,19 +171,19 @@ func TestKeyboardLayoutComboBox(t *testing.T) { t.Fatal(err) } control := session.Values()["keyboard.layout"] - if control.Kind != interaction.ComboBox || control.Choices[0].ID != "desktop" || control.Choices[1].ID != "laptop" || control.Choices[control.Selected].ID != saved { + if control.Kind != internalui.ComboBox || control.Choices[0].ID != "desktop" || control.Choices[1].ID != "laptop" || control.Choices[control.Selected].ID != saved { t.Fatal(control) } - session.Handle(interaction.Key{Name: "tab"}) - session.Handle(interaction.Key{Name: "tab"}) - session.Handle(interaction.Key{Ctrl: true, Text: "a"}) - session.Handle(interaction.Key{Text: "old.conf"}) + session.Handle(internalui.Key{Name: "tab"}) + session.Handle(internalui.Key{Name: "tab"}) + session.Handle(internalui.Key{Ctrl: true, Text: "a"}) + session.Handle(internalui.Key{Text: "old.conf"}) draft, err := Settings(session, base) if err != nil || draft.Keyboard.Layout != saved { t.Fatal(draft.Keyboard.Layout, err) } if saved == "desktop" { - session.Handle(interaction.Key{Name: "down"}) + session.Handle(internalui.Key{Name: "down"}) draft, err = Settings(session, base) if err != nil || draft.Keyboard.Layout != "laptop" { t.Fatal(draft.Keyboard.Layout, err) @@ -202,15 +202,15 @@ func TestKeyboardEchoCheckboxesSaveIndependently(t *testing.T) { t.Fatal(err) } for _, want := range []string{"Devices", "Layout", "Character echo checked"} { - if got := session.Handle(interaction.Key{Name: "tab"}).Speech; !strings.Contains(got, want) { + if got := session.Handle(internalui.Key{Name: "tab"}).Speech; !strings.Contains(got, want) { t.Fatal("echo checkbox traversal", got, want) } } for _, want := range []string{"Character echo unchecked", "Word echo checked", "Echo on CapsLock checked"} { - if got := session.Handle(interaction.Key{Name: "space"}).Speech; got != want { + if got := session.Handle(internalui.Key{Name: "space"}).Speech; got != want { t.Fatal("echo checkbox did not toggle", got, want) } - session.Handle(interaction.Key{Name: "tab"}) + session.Handle(internalui.Key{Name: "tab"}) } draft, err := Settings(session, base) if err != nil || draft.Keyboard.CharacterEcho || !draft.Keyboard.WordEcho || !draft.Keyboard.EchoOnCapsLock || !draft.Reading.CursorEcho || !base.Keyboard.CharacterEcho { @@ -225,10 +225,10 @@ func TestClipboardSyncCheckboxPreservesAdvancedSettings(t *testing.T) { if err != nil { t.Fatal(err) } - if got := session.Handle(interaction.Key{Name: "tab"}).Speech; got != "Clipboard sync unchecked" { + if got := session.Handle(internalui.Key{Name: "tab"}).Speech; got != "Clipboard sync unchecked" { t.Fatal(got) } - session.Handle(interaction.Key{Name: "space"}) + session.Handle(internalui.Key{Name: "space"}) settings, err := Settings(session, base) if err != nil || !settings.Clipboard.Sync || settings.Clipboard.SyncDisplay != ":42" || settings.Clipboard.ExportPath != base.Clipboard.ExportPath || settings.Clipboard.NumberOfClipboards != 3 { t.Fatal(settings, err) @@ -244,16 +244,16 @@ func TestPresentationGroupsFollowSchemaAndFileOrder(t *testing.T) { if session.Open() != "Fenrir Menu. Reading tab" { t.Fatal(session.Open()) } - if got := session.Handle(interaction.Key{Name: "right"}).Speech; got != "Presentation tab" { + if got := session.Handle(internalui.Key{Name: "right"}).Speech; got != "Presentation tab" { t.Fatal(got) } - if got := session.Handle(interaction.Key{Name: "tab"}).Speech; got != "Sound. Sound enabled checked" { + if got := session.Handle(internalui.Key{Name: "tab"}).Speech; got != "Sound. Sound enabled checked" { t.Fatal(got) } for range 3 { - session.Handle(interaction.Key{Name: "tab"}) + session.Handle(internalui.Key{Name: "tab"}) } - if got := session.Handle(interaction.Key{Name: "tab"}).Speech; got != "Speech. Speech enabled checked" { + if got := session.Handle(internalui.Key{Name: "tab"}).Speech; got != "Speech. Speech enabled checked" { t.Fatal(got) } values := session.Values() @@ -275,9 +275,9 @@ func TestConstrainedChoicesKeepStableIDsAndIgnoreTextEditing(t *testing.T) { t.Fatal(err) } tabToControl(t, session, "speech.driver") - session.Handle(interaction.Key{Ctrl: true, Text: "a"}) - session.Handle(interaction.Key{Text: "invented-driver"}) - session.Handle(interaction.Key{Name: "tab"}) + session.Handle(internalui.Key{Ctrl: true, Text: "a"}) + session.Handle(internalui.Key{Text: "invented-driver"}) + session.Handle(internalui.Key{Name: "tab"}) if !strings.Contains(session.Describe(), "Fixture module. unavailable: fixture server offline") { t.Fatal(session.Describe()) } @@ -285,7 +285,7 @@ func TestConstrainedChoicesKeepStableIDsAndIgnoreTextEditing(t *testing.T) { if err != nil || !reflect.DeepEqual(unchanged, base) { t.Fatal(unchanged, err) } - session.Handle(interaction.Key{Name: "home"}) + session.Handle(internalui.Key{Name: "home"}) draft, err := Settings(session, base) if err != nil || draft.Presentation.Speech.Module != "" || draft.Presentation.Speech.Driver != "speech-dispatcher" { t.Fatal(draft, err) @@ -301,12 +301,12 @@ func TestSoundChoicesPreserveUnavailableThemeAndFileOnlyDevice(t *testing.T) { t.Fatal(err) } for range 3 { - session.Handle(interaction.Key{Name: "tab"}) + session.Handle(internalui.Key{Name: "tab"}) } if got := session.Values()["presentation.sound.driver"]; got.Selected != 0 { t.Fatal(got) } - session.Handle(interaction.Key{Name: "down"}) + session.Handle(internalui.Key{Name: "down"}) draft, err := Settings(session, base) if err != nil || draft.Presentation.Sound.Driver != "alsa" || draft.Presentation.Sound.Theme != base.Presentation.Sound.Theme || draft.Presentation.Sound.Device != base.Presentation.Sound.Device { t.Fatal(draft.Presentation.Sound, err) @@ -323,10 +323,10 @@ func TestInternalUIOptionsAndApplicationIsolation(t *testing.T) { t.Fatal(session.Describe()) } for _, label := range []string{"Announce grid row and column", "Announce item position"} { - if got := session.Handle(interaction.Key{Name: "tab"}).Speech; got != label+" checked" { + if got := session.Handle(internalui.Key{Name: "tab"}).Speech; got != label+" checked" { t.Fatal(got) } - session.Handle(interaction.Key{Name: "space"}) + session.Handle(internalui.Key{Name: "space"}) draft, err := Settings(session, base) if err != nil { t.Fatal(err) @@ -347,13 +347,13 @@ func TestInternalUIOptionsAndApplicationIsolation(t *testing.T) { } // tabToControl moves focus with Tab, as a user would, until id is focused. -func tabToControl(t *testing.T, session *interaction.Session, id string) { +func tabToControl(t *testing.T, session *internalui.Session, id string) { t.Helper() for range 64 { if control, ok := session.FocusedControl(); ok && control.ID == id { return } - session.Handle(interaction.Key{Name: "tab"}) + session.Handle(internalui.Key{Name: "tab"}) } t.Fatalf("control %s not reached with Tab", id) }