Port the UI onto the craft framework (#7101)

* canvas-w21: net change of 3 commits

- canvas-w21: written from its sheet
- canvas-w21: repair 1
- canvas-w21: review fixes (review-1)

* chrome-w8: net change of 2 commits

- chrome-w8: repair 1
- chrome-w8: review fixes (review-1)

* mini_toolbar tests: import egui pos2 and Vec2 the tests use directly (production imports only Rect, Ui)

* App compile: open context_menu, font_box and ribbon::common to their callers; Label and Value import from their framework homes; balloons read command_enabled; wordart test runs fired commands through WordApp::run_fired; delete rtl.rs, which has no reader

* Fix imports (palette, picker, icons, color), expose find helpers, drop old keytip phase state per S-L365

* keytip_places: removed with the old keytip phase machine (S-L365); WordApp, WindowUi and the destructurings no longer carry it

* ribbon submodule imports: Value, Target, Remember, egui geometry, Label, TypeRole, DisclosureGlyph and kittest Node come from their own modules, not the ribbon.rs re-exports ribbon-w8 dropped

* context menu: CanvasState keeps the open point so the menu anchors where it was asked

* Palette derives Default: dialog forms hold an empty palette until prepare fills it

* ribbon: Stack/Row/Menu show need ShowContainer in scope

* canvas Read Mode: reading metrics come from a probe component measured under the theme (S-L355)

* Dialog and mini toolbar call sites follow the framework: Mode into style previews, owned colour key, non-exhaustive DialogResult, struct EditEvent variants, IconButton::command, Props::command on bound toggles

* canvas: the mini toolbar shows inside the page view body, where it maps its anchor through the canvas view

* ribbon: runtime labels as owned Strings, Props in scope for MenuItem::label, RibbonGroup icon 'static

* Tests read the canvas zoom through CanvasState::zoom and pass the context to qat_enabled

* More Colors settle hook returns Settle (S-L280) so it registers as a DialogHooks settle

* ribbon: wordart/shapes galleries take the menu body cx; TextRun built with its builders; symbol tile paints centred by the run's alignment; paint_style gets the content painter cx

* math pictures: MathSource takes an aspect and sizes its layout box from the thumbnail request, with thumb_aspect for the tile or button (S-L393)

* CatalogRef: Debug says whether a catalog is held, since the framework's Catalog has no Debug

* mini toolbar tests: read accessibility labels and popups through kittest's NodeT::accesskit_node

* tests.rs: readers move to the framework and canvas accessors that exist (ScriptedFiles held/queue/answer_to, Host::builder, page_rects()/canvas_rect(), drain_inbox, DefaultAppError, pixel-sized auto_scale_limit_over, ClipItem::Image, DropTarget::Elsewhere, dialogs::close_all)

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* Reading probe returns an Outcome output; context menu rows label via MenuItem::new; colour preview matches cover non_exhaustive Preview; mini toolbar toggle icon is static

* fu2-app: app batch 2 rulings on batch 1 sets (S-L412, S-L365, S-L410, S-L411, S-L414, S-L419, S-L372, S-L368, S-L364)

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* Ribbon menu rows take owned labels: framework Label is String or 'static str, not a borrowed &str

* QAT command menu request drops the removed opener field

* Colour child answer: DialogResult is non_exhaustive, so any other result is ignored

* Thickness menu face: Button has no icon_only, so it shows icon and label

* Tests: By filter helper with an explicit lifetime; accessibility label compared as Option<String>

* lead: last compile fixes (menu label lifetime; perf test reads the page view's resident pictures, S-L352)

* lead: binary compile fixes (egui DroppedFile trait, Lang accessor, print test binding)

* lead: dropped file bytes as Arc

* lead: examples reach the framework through craft:: (S-L230)

* lead: examples reach the framework through craft::ui::shell::embed (S-L230)

* lead: ui_shot example runs its main under the test build cl uses (harness = false)

* rr-app-ribbon: the ribbon slots are sized by their content (SlotSize::Content)

The default top slot is one options bar high with a one-line layout: the ribbon's groups landed beside the tabs and all
collapsed. Needs the framework's SlotSize::Content (branch red/ribbon-place).

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* app tests: one harness that installs the craft runtime before the first frame

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* lead: WordApp::new registers the app icon set (ribbon-w13 icons::register had no caller)

* red app-t2 g4: tests step with the app's command input; print preview is a group; neutral SmartArt error

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t2 g6: tests step with the app's frame input; integrated frame for the title-bar test; undo list caps rows; table press hold released; test clipboard answers files

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t2 g3: dialog collections cap their rows, tests give dialogs their context and focus, glyph scan skips test data

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t2 g5: tests step frames through frame_input; split-button arrows named; collections capped; stale premises rewritten

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t2 g8: closing guard outlives window swaps, root focus/close, web save undo, collections natural height, test premises

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t2 g2 (lead commit)

* red app-t2 g1 (lead commit)

* red app-t2 g7 (lead commit)

* lead: backstage test row query borrows the name as long as the harness

* red app-t4 g2: key tests step through the app's frame hook; draw paths read format state without running a command

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t4 g8: custom dictionary caps its rows; chrome/language-pack tests press as a person does; sources test steps through the frame hook; audit and pane tests follow the framework's layout

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t4 g3: dialog test premises and Custom Properties labels, colors route, macro names, bookmark delete

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t4 g6: md_source focus waits for a non-measuring pass; window rig reports inner rects; smoke sends a close request; switch windows label; i18n tests

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t4 g5: table borders above selection areas, ruler markers follow drags, proofing list click-activates, test premises (focus, Enter=OK, extra buttons stay open)

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t4 g7: failed web save keeps clean state, symbol dialog fields, table margin hold release, object release keeps Alt placement, test premises (toggle off, Escape chord, CJK glyphs, palette swatches, frame gesture)

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t4 g4: frame hook in keytips tests, held list previews, crop keys and handles, read-mode context menu, keyboard overrides notes

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t4 g1: frames run the app's input hook and close path; page focus survives measuring runs; stale prompt dropped; recipients/styles collections capped

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* look-backstage: File pages as production: menu rows at the reading start, Discord above About, page titles over sections, Info property labels, Print preview fills the page

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* look-dialogs-b: TOC levels label, Options/Modify row and sample card metrics; watermark layouts in a row; About listed layout and version line

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* look-ribbon-1b: Styles gallery tiles are 2:1 and named under the sample; Paragraph shows whole at 1440 pt

The style gallery asks the framework gallery for 2:1 pictures (the sample crop, STYLE_TILE_W, at the
medium thumbnail height) with the style's name under each, instead of square tiles that shrank the
sample. A test pins the Home tab showing the Paragraph group whole in a 1440 pt window (framework:
red/ribbon-look's ribbon place, short font and size boxes, flat close ribbon buttons).

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* look-backstage: the File side menu is as tall as the window (Sizing::FillHeight), About and the community link at its foot

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* look-chrome: title in a native frame; status bar view icons, fonts warning icon, plain zoom rail

The title bar shows the document title under the OS's title bar too
(TitleBar::title_when_native), as the old bar always did. The status bar's
view buttons are icon-only toggles in the old order (Read Mode, Print Layout,
Web Layout) with the current view pressed; the missing-fonts item has its
warning icon; the zoom slider has no fill up to the thumb. Tests
the_title_shows_in_a_native_frame and
status_bar_view_buttons_are_icons_with_the_view_pressed.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* look-backstage: File page controls at stacked-row spacing, as production's

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* look-backstage: one contract import in pages.rs

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* look-dialogs-a: Zoom opens on the view's percent (fraction x100), radios in a row, slider with its field inline, fit buttons in the body; Word Count as a plain label/count table over Close and Cancel; Font dialog as the old framed boxes: label table, kerning size and Points and above on the check box's line, Effects two to a line, preview at its own size; tests

* backstage test: import NodeT for accesskit_node

* red app-t5 g6: window rig reports the real child, ruler drags free of the framework snap

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t5 g4: smoke drops texture deltas, md_source tests step the hook frame, font list rows are tree items, Escape closes bar then menu, symbol pick confirms twice

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t5 g5: rotate objects about their centre, CJK stand-in in ribbon fit test, caret blink restart, Switch Windows node pair

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t5 g7: nav lists take natural height; menu/keytip tests step the frames the runtime needs

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t5 g8: Size dialog tests step through the app frame hook, Styles pane test scrolls its capped list, pack tests end the agent's injection

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t5 g3: dialog tests read the page's preview, the input hook, framework About key; Alert on refused custom property; Text Pane focus via framework stop

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t5 g1: harness hands app input before the pass; confirm via passes; pane/close/clipboard test premises

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t5 g2: keys tests follow the framework's IME ordering, interrupt and reset; undo folds an open SmartArt run; join survives a later pass

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* look-rest-2: File side menu rows in the side menu place at the side menu's width (production's 200 pt rail of 38 pt rows); Print settings column wraps its notes at the column width

* look-rest-2: side menu imports formatted; test pins the rail's width and row height

* panes test: MouseWheel carries its source

* red app-t6 g8: ribbon end order, cjk stand-in any family, capped findings list

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t6 g6: smoke finds the platform's answer button, info/side-menu tests use the framework's mechanisms, pack-bar click settles

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t6 g3: menus open from their opener, view buttons given, caret test animation time, switch windows rows

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t6 g2: icons dialog owns its scroll, effects grid fills, search opens in place, macros press runs once

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t6 g5: symbol pick OK, md pane Undo/Redo enabled by the field, live rotation pixel preview, text-box turn tolerance

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t6 g7: mini_toolbar and table_resize tests settle on the framework's layer and marker timing

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t6 g4: Alt+Q row follows the engine's build-time binding

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t6 g1: CJK stand-in in the shared harness, late-paste test clipboard, web-layout gutter, search dropped in Focus, split-button and held-Return tests

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* look-rest-3: Print settings column as production's: one Pages heading over both page lists, the page count muted, a rule above the export formats; Word Count rows a control's height apart

* look-ribbon-3: Design's style-set tiles and Home's style samples at the large thumbnail size (Gallery::thumb), as large as the old ribbon's; the samples show unscaled

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* Ribbon: the Zotero tab is called Citations; Zotero is its provider

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* Citations: a Provider menu with Zotero as its one provider

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* citations tests: hold the layout the tabs borrow; import NodeT

* red app-t7 g6: settle the Install button before the person's click; wait for the caret glide; coverage check skips symbols kept from the English source

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t7 g5: smart-art category list natural height, print panel FillHeight, ribbon fit test checks on-screen controls

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t7 g2: Alt+Q test back on the Focus dialog, Tab hand-off owned by the framework, macros name read from the box, effects as pair rows, caret test waits for focus

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t7 g4: Size dialog fields take edit events, font list opens from the field, test keys release

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t7 g3: keymap test assigns through the keymap's Steal policy; smoke finds the prompt button by its resolved name

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* red app-t7 g1: Escape reaches select.collapse and the window's untaken Cancel (File page, Focus, Full Screen); web width settles after a drag; prompt helper asks the shown window; chord tests step the framework's frames

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

* look-ribbon-4: the tab row's Comments and Editing are outlined and Share a filled accent button, as the old strip drew them (StripEnd::variant)

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* look-rest-4: Font dialog's Effects columns as wide as their check boxes (production's table, Italic just past Superscript); File page section headings in the heading role (production's 15 pt) and page titles, Options' too, a step above them

* look-5: Home's Font and Paragraph button rows close up as the old ribbon's; Layout's Paragraph group as two label/field grids of small fields, indents to two decimals, a section gap before Spacing

* red stub g2: caret glide compares the view, which the page view reports on every pass

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g2: crop overlay takes the box as given so a drag survives to its commit

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g1: Alt+Q to Search Commands off macOS, ui.print state, scripts open no dialogs, equation state read without a command, size and New Label tests on the framework fields

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g2: collections in scrolling bodies cap their rows or take their natural height, as production shows them

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g2: Escape on the page dismisses an open text menu first

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g1: format.enclose gives a script an error without a shape, as the engine always has

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g2: the caret marks are shown over the view, so their strokes are not clipped to an empty rect

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g2: header/footer presses keep their release; the caret follow settles after a page jump; a wheel zoom keeps its exact zoom

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g2: tests find the framework's controls by their real roles and names; the ribbon group check covers the ribbon's groups

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g2: the canvas keeps the whole layout's page rects; the side-by-side test reads every page as production did

* red stub g2: the perf wheel helper sends point travel over the touchpad factor the framework now applies, as production's host did

* red stub g2: the alignment test steps once more for the fired command to run, as the port's command board does

* red stub g2: the Zoom dialog's programmatic OK answers with the percent it shows

* red stub g1: tests install no gallery story command sets (they took Mod+F from Find); the Navigation pane keeps its focus request until a pass takes it; Field Code opens before the first frame; report rows of the input-dialog test expect the report's data

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g2: a WordArt style pick hands the keyboard to the page

* red stub g1: the language pack bar's slot takes the bar's height, so a failure's line no longer clips Install out of reach

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g2: a tab click and a dismissed status-bar language menu give the page the keyboard back after the pass; the test reads the framework's open menus

* red stub g2: the caret follow waits for the page's settled rect and places an unplaced page's caret from the whole layout

* red stub g2: the canvas reports the area the pages show in; the wheel-zoom test points at its centre, as production's canvas rect was

* look-6: a script's launcher command (format.fontDialog, Zoom, Page Setup) opens its dialog as production did; commands lacking input still open none

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* look-6: the File page body stands on the window background (production's #f9f9f9), not the white panel

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g2: the app's Host carries the embedded catalogs, so framework words translate; catalog labels and command hints are translated; the canvas's zoom chords are dropped for Word's

* red stub g2: the caret glide test catches the caret the frame after it sets off, as on main (the set-off frame draws it where it was)

* red stub g2: Manage Styles and Customize Ribbon lists scroll their own rows (row caps as main's boxes); the Arabic Go To check compares the targets with the framework dialog's button column

* red stub g1: Alt chords fire from the page (PlainKeysWait; Alt+F7/Alt+F8 left to Word's commands), Macros reopened keeps its hooks, the recipient grid holds its rows through the click that ends an edit, ui.clickText maps page points by the page's scale; chrome tests read the title bar outside the File page and open the desktop chooser as its pump does

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g2: watermark, citation style, TOC level, Zotero, caption, cross-reference and icon category labels are translated; the audit reads a wrapped marked label's second line as marked, and allows a hover hint's shortcut and separators, listed or cut-short names and trimmed licence texts

* red stub g1: the Print page decides what an opening holds back in the opening frame's first pass, as appeared() now holds through all of that frame's passes

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g1: tests give a key and its text (or one IME batch) one frame, as kittest's event runs a frame per event; Paste Formatting's key reads its chord when the modifiers are already up; ⌘Q is the runtime's close (S-L332); Search's Escape meets the draft rule first

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g1: wrap the command board's import at the repository width

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g1: the PDF bytes test expects the equation's x the math face can draw (plain x on a host with no math font, as in the pre-port baseline)

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g1: the smoke test turns AccessKit on for its own context, so the Save Changes prompt's buttons are in the tree it searches

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* look-7b: Custom Watermark's text field asks for 38 characters (Param::field_chars), about the old dialog's 280 pt; the field length gave about 195 pt

* look-7a: File pages: titles at production's 26 pt (WordCraft's display size), the page's 40 pt margin clearing the move band, the rail's footer in the side menu place (white ink), Protect Document a section apart on Info, the Print settings a frameless 380 pt column with chevrons for the sheets; tests

* red stub g2: Shift+Delete cuts the selection and does nothing without one (EditorInput::Delete.shift); the page reports its marked text (EditorState::marked); one-frame input back in the refused-delete and disabled Alt chord tests; a Delete after a commit waits out the framework's composition-key guard; a user binding reaches the keymap a harness frame later; window.move/size keep their defaults

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g2: Ctrl+wheel zoom test keeps the place under the pointer at each notch: a reflow centres the rows, so the page under the pointer is taken when the notch comes, and a pointer over the centre gutter moves onto a page first

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* merge app-ui: resolve production main into the port's UI

- ribbon/home.rs (4e8c9d55, #3172): the Paste face is named "Paste"; its tooltip adds
  edit.paste's chord as the platform writes it (commands::resolve + tooltip::with_chord).
  tests.rs: the_paste_button_is_named_without_a_mac_key rewritten on the port harness.
- dialogs/paragraph.rs (32b4ab57): the framework ParagraphDialog's Special box does the work;
  intersect leaves By blank when the paragraphs' kinds differ, so a kind picked then starts at
  the half inch. dialogs/tests.rs: the three Special-box tests rewritten on the dialog host.
- dialogs/dialogs_review.rs (bce64c0e): the port's Compare form already names its fields.
- canvas.rs, canvas/tests.rs (07c0a893): keep the port's composition painter and state;
  production's egui composition painter, its fields and its tests are dropped (framework items).

* merge app-shell: resolve production main into the port

- engine lib.rs: export set_bookmark_error/set_reference_error beside system_locale
  (the port dropped the KeyMap re-export; it stays dropped).
- app.rs: logic() sets the PAGEREF/REF error texts in the interface language.
- file_dialogs.rs: Save As starts in the open file's folder, made absolute
  (#4143), through PickRequest::directory; tests carried to ScriptedFiles.
- window_geometry.rs: 600 pt minimum width (#5886) and its test.
- chrome/status_bar.rs: Page item bound to edit.goto so its tooltip shows the
  platform's Go To key (#3172); language tooltip names the language in full.
- chrome/tests.rs: narrow-window title bar and status bar tests rewritten
  against the app harness.
- a11y.rs: test expects zero-based AccessKit levels (#3173); the mapping
  fix is the framework's.
- chrome.rs, theme.rs, app/fonts.rs, windows.rs, windows/tests.rs,
  keytips/tests.rs: production's replaced egui code and cut tests dropped.

* land sync: canvas.rs declares its tests module again (dropped in canvas-w9, so canvas/tests.rs, markup.rs and overlays.rs never compiled)

* land sync: the app takes craft gpu-startup (the sync moved craft::gpu::configure behind it)

* red stub g1: canvas tests compile against the ported canvas (imports, kurbo/Env/commands paths, equation_frame sizes, page_grid)

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g1: canvas tests step through the app's input hook; caret reports the editor from an off-screen page

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g1: candidate window at the composition cursor; page keeps its keyboard across a document switch; IME, tip and Hide White Space tests on the ported mechanisms

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g1: a pass whose input edits the document runs again so its frame paints the edit; read-only balloons open no edit; balloon tests type in the card's field

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g1: a right click selects what it clicked before its menu opens; the page under a point is the nearest shown band; the status bar's page in view measures from the view's top edge

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g1: Hide White Space gets the page bodies; a refused balloon draft stays when the balloon is left; context menu, crop and ruler tests on the ported mechanisms

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g1: comment drafts stay with their document across a window switch; Hide White Space test probes the overlap inside the text areas

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g2: rotated effect-extent fixtures use Word's exchanged-frame measure (craft-libs #2227)

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* red stub g1: the title bar's search and Discord and the status bar's zoom slider and Focus give way in a narrow window (#5886 fit, measured per step); the IME composition draws in the text's face, size and baseline through Draw::face_run; narrow-window tests read the bar row and the painted texts; production's three composition tests

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* land sync: a refused input-method edit asks the framework for the interrupt (ToolPass::ime_interrupt), so the commit keeps its InputMethod cause

* port build loop: craft-i18n and craft-fonts come from the environment (CRAFT_I18N_DIR, CRAFT_FONTS_DIR), not machine paths in the manifest

* Resolve the craft framework from https://github.com/storytold/craft-libs next at 362eb2820996b475e6f21967c561219dbde24343

Every framework path dependency and patch is now a git dependency at that revision.
Cargo.lock is regenerated against it separately.

* Cargo.lock: resolve against craft-libs next at 362eb2820996b475e6f21967c561219dbde24343

* port: cargo fmt

* fonts: drop the face_names re-export the ported UI fallback no longer uses

* Restore the [patch.crates-io] block: the egui and winit forks and the vendored crates the framework builds with

* Workspace clippy: dead code and unused imports the port left, test-only helpers under cfg(test), the examples report a failed install

* Tests: headings read in tree order, not egui id-map order; the picker Install is aimed after downloading goes off, which adds a licence line to each row and moves it

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* Ribbon: own icons under wordcraft.* names so the catalog no longer shadows them; 32/17-pt ribbon icons and corner launcher

* Ribbon: filled menu arrows right after the label, as the old ribbon

* Ribbon: 22-point small-row pitch (20-point rows a tight gap apart), RibbonLook

* Ribbon: Draw colour/thickness and Layout align/group/rotate show icons alone; Window collapses to the more icon, as the old ribbon

* Styles gallery: sample letters on the ribbon with no white paper box, as the old ribbon

* Title bar: tool-size QAT icons, the filled undo-list arrow and the small AutoSave switch, as the old title bar

* Ribbon: tabs in the text colour over a 3-point underline

* Ribbon: body on the old lighter band with its rules

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Claude-Session: https://claude.ai/code/session_01FypgCZhHKRuRB5wZUiw6BE

* Ribbon: framed Styles gallery; Style Sets drop their buttons while all show

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Claude-Session: https://claude.ai/code/session_01FypgCZhHKRuRB5wZUiw6BE

* wasm: gate native-only craft features (dialogs, update, automation client, default app) off wasm32

craft-dialogs (rfd folder picker, file paths) and craft-update (ureq/ring, getrandom 0.2) are
documented native-only, as are craft::automation's client/security/args/dialogs and
craft::platform::default_app. ui-egui takes `dialogs` and `update` through a
non-wasm32 `craft` dependency; wordcraft-mcp's `Remote` bridge moves to backend/remote.rs,
native only. The code that used them is gated the way production main gated its
native-only paths, with a plain fallback on the web. Also drops dead-code/unused-import
warnings on wasm32 and keeps chrono's parser available there.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* MCP: pin the shared server refusing a request without the JSON-RPC version (craft-libs #2444)

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* Resolve the craft framework from https://github.com/storytold/craft-libs next at a5f6cd7f6ccd560438e3bbeb1209aa117ba957dc

Every framework path dependency and patch is now a git dependency at that revision.
Cargo.lock is regenerated against it separately.

* Cargo.lock: resolve against craft-libs next at a5f6cd7f6ccd560438e3bbeb1209aa117ba957dc

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* port: the default-chords rows stay mutable only where the off-macOS rows extend them (macOS clippy)

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* port: the web build embeds its Japanese interface face when the craft-fonts checkout has one, CRAFT_FONTS_REQUIRED binds the native build

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* port: wordcraft-web builds against the ported UI: the host takes the framework language, the legacy prefs parser is imported, no native-window hook on the page

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* ui-egui: use the framework constructors for non_exhaustive types

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* port test: the files clipboard keeps any absolute path from a uri-list, so the copied-files trials run on Windows

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* Resolve the craft framework from https://github.com/storytold/craft-libs next at 1e48c0807e18c5f5ae25b6227fde52281942f288

Every framework path dependency and patch is now a git dependency at that revision.
Cargo.lock is regenerated against it separately.

* Cargo.lock: resolve against craft-libs next at 1e48c0807e18c5f5ae25b6227fde52281942f288

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* port test: on macOS the smoke close goes to the platform quit, so Don't Save shows as no second prompt

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* Resolve the craft framework from https://github.com/storytold/craft-libs next at 1e48c0807e18c5f5ae25b6227fde52281942f288

Every framework path dependency and patch is now a git dependency at that revision.
Cargo.lock is regenerated against it separately.

* Cargo.lock: resolve against craft-libs next at 1e48c0807e18c5f5ae25b6227fde52281942f288

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* Resolve the craft framework from https://github.com/storytold/craft-libs next at 27c1c0ebb1d16adf97d09952bb781e69f9962e46

Every framework path dependency and patch is now a git dependency at that revision.
Cargo.lock is regenerated against it separately.

* Cargo.lock: resolve against craft-libs next at 27c1c0ebb1d16adf97d09952bb781e69f9962e46

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* Resolve the craft framework from https://github.com/storytold/craft-libs next at 243d68e12d05e89122db6d154924bf1992e10d38

Every framework path dependency and patch is now a git dependency at that revision.
Cargo.lock is regenerated against it separately.

* Cargo.lock: resolve against craft-libs next at 243d68e12d05e89122db6d154924bf1992e10d38

Co-Authored-By: Claude Opus 5.5 <[email protected]>

---------

Co-authored-by: Claude Sonnet 5.5 <[email protected]>
This commit is contained in:
Martin Ball
2026-11-20 14:02:07 +00:00
committed by GitHub
co-authored by Claude Opus 5.5
parent 09faec42ec
commit b5e0be7879
644 changed files with 52267 additions and 77528 deletions
+2 -2
View File
@@ -71,8 +71,8 @@ WordCraft is a Rust word processor targeting Microsoft Word parity, for macOS, W
- Commands: each is a `CommandSpec` in `crates/engine/src/cmd/*.rs` (id, label, ribbon place, shortcut, params doc, `enabled`, `run`). UI-only commands (`ui.*`) are in `crates/ui-egui/src/lib.rs`. Colours come from `theme::Tokens`. `crates/engine/src/catalog.rs` lists Word's features with command ids; `cargo xtask parity` writes `docs/parity-checklist.md`.
- Checks for the crates you changed: `cargo fmt --all --check`, `cargo clippy -p <crate> --all-targets -- -D warnings`, `cargo test -p <crate>`, `cargo xtask layers`, `cargo xtask wasm`, `cargo xtask assets` when assets change. `cargo xtask ci` runs all of them for the whole workspace.
- `unsafe`: none; the workspace forbids it. Typing behaviour is pinned by `crates/engine/src/tests/typing.rs` and described in `docs/typing-parity.md`.
- Attribution: `ATTRIBUTION.md`, a row per asset file, checked by `cargo xtask assets`. Icons are drawn in code in `crates/ui-egui/src/icons.rs`; sample content is in `crates/engine/src/sample.rs` and `cmd/design.rs`.
- Attribution: `ATTRIBUTION.md`, a row per asset file, checked by `cargo xtask assets`. Icons are our own SVG set in `crates/ui-egui/icons/` (draw new icons there); sample content is in `crates/engine/src/sample.rs` and `cmd/design.rs`.
- Fonts and language data come from other repositories as optional build inputs: craft-fonts through `CRAFT_FONTS_DIR`, and craft-i18n's `language-data/` through `CRAFT_I18N_DIR` (pinned by `craft-i18n.rev`; CI checks it out). Without craft-i18n the app builds with fallback spelling and no pattern hyphenation, so proofing tests need it. Proprietary font requests use installed fonts or the open substitutes in `crates/fonts/src/word.rs`. Layout tests use the fixed fonts in `assets/fonts/` ([docs/testing.md](docs/testing.md)).
- Run: `cargo run --release -p wordcraft -- --sample --control 7981` starts the app with a sample document and the control channel. It takes JSON lines on `127.0.0.1:7981`, each with the window's key from `~/.config/wordcraft/control-key.local-7981` (macOS: `~/Library/Application Support/WordCraft/`); methods are in `crates/ui-egui/src/control.rs`, docs in `docs/control-protocol.md`. Headless screenshots: `cargo run --release -p wordcraft-ui-egui --example ui_shot -- script.jsonl`. CLI: `wordcraft-cli convert|run|commands|parity`. MCP: `wordcraft-cli mcp` (add `--connect 127.0.0.1:7981` to drive the app), see `docs/mcp.md`.
- Run: `cargo run --release -p wordcraft -- --sample --control 7981` starts the app with a sample document and the control channel. It takes JSON lines on `127.0.0.1:7981`: authenticate once per connection with the token from `~/.config/wordcraft/control-key.local-7981` (macOS: `~/Library/Application Support/WordCraft/`), `{"id":1,"method":"auth","params":{"token":"…"}}`, then send requests without a token; methods are in `crates/ui-egui/src/control.rs`, docs in `docs/control-protocol.md` (Token). Headless screenshots: `cargo run --release -p wordcraft-ui-egui --example ui_shot -- script.jsonl`. CLI: `wordcraft-cli convert|run|commands|parity`. MCP: `wordcraft-cli mcp` (add `--connect 127.0.0.1:7981` to drive the app), see `docs/mcp.md`.
- Notes and progress: `plan/` is an optional gitignored notebook. Committed: `ROADMAP.md` (progress log), `docs/gaps.md`, `docs/roadmap.md`, `docs/target-app-parity.md`, `docs/architecture.md` and the parity checklists.
- Contributor credits: `docs/contributors.md`.
+327 -1
View File
@@ -4,7 +4,7 @@ Every non-code asset in this repository (fonts, icons, images, example documents
**Policy (mandatory):** WordCraft contains **no Microsoft, Adobe, Avid or Autodesk iconography, images, templates, themes, clip art, fonts or other assets**. Every asset is original work by WordCraft contributors or third-party material under an open licence (OSI open source, public domain / CC0, or a Creative Commons licence that allows redistribution). Screenshots of other vendors' software are never committed. New font files go to [storytold/craft-fonts](https://github.com/storytold/craft-fonts), not this repo. The one exception is the ArtCraft brand files in `docs/brand/`: ArtCraft trademarks, not open source, used under `docs/brand/LICENSE-brand.txt`.
Generated-in-code art is original and has no file to list: the UI icon set (`crates/ui-egui/src/icons.rs`), the sample documents and templates (`crates/engine/src/sample.rs`), the table and style previews, and theme colours (`crates/engine/src/cmd/design.rs`).
The UI icons are SVG files in `crates/ui-egui/icons/`, one row each below. Generated-in-code art is original and has no file to list: the sample documents and templates (`crates/engine/src/sample.rs`), the table and style previews, and theme colours (`crates/engine/src/cmd/design.rs`).
| Asset | Author | Source | Licence | Notes |
|---|---|---|---|---|
@@ -59,6 +59,332 @@ Generated-in-code art is original and has no file to list: the UI icon set (`cra
| `docs/brand/artcraft-mark-black.svg` | ArtCraft Team | ArtCraft brand kit (project owner) | ArtCraft trademark, `docs/brand/LICENSE-brand.txt` | Not open source; usable unmodified only |
| `docs/brand/artcraft-mark.png` | ArtCraft Team | ArtCraft brand kit (project owner) | ArtCraft trademark, `docs/brand/LICENSE-brand.txt` | Not open source; usable unmodified only |
| `docs/brand/artcraft-mark.svg` | ArtCraft Team | ArtCraft brand kit (project owner) | ArtCraft trademark, `docs/brand/LICENSE-brand.txt` | Not open source; usable unmodified only |
| `crates/ui-egui/icons/accept.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/accessibility.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/addNote.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/addPen.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/addShape.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/addText.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/addins.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/addressBlock.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/align.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/alignCenter.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/alignLeft.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/alignRight.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/alignText.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/altText.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/arrangeAll.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/autofit.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/bibliography.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/blankPage.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/blockAuthors.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/bold.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/bookmark.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/borderPainter.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/borders.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/breaks.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/bringForward.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/bullets.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/canvas.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/caption.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/case.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/ccCheckBox.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/ccComboBox.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/ccDate.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/ccDropDown.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/ccGallery.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/ccPicture.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/ccPlainText.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/ccRepeat.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/ccRichText.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/cellAlign.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/cellMargins.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/changeChartType.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/charborder.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/chart.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/chartData.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/chartTitle.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/check.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/checkErrors.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/chevronDoubleRight.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/chevronDown.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/chevronLeft.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/chevronRight.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/chevronUp.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/citation.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/clear.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/close.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/closeOutline.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/colWidth.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/colors.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/columns.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/combine.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/comment.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/compare.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/copy.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/coverPage.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/crop.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/crossRef.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/cut.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/darkMode.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/dataLabels.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/dateTime.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/deleteComment.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/deleteTable.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/demote.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/designMode.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/dictate.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/discord.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/distributeCols.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/distributeRows.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/docPrefs.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/documentTemplate.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/draft.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/draw.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/drawTable.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/dropCap.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/dropdown.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/editRecipients.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/editor.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/effects.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/effectsDesign.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/enclose.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/endnote.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/envelope.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/equation.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/eraser.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/export.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/file.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/find.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/finish.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/first.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/fitOnePage.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/focus.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/folder.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/fontMissing.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/fontcolor.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/fontdialog.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/fonts.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/footer.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/footnote.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/formula.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/fullScreen.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/greetingLine.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/gridlines.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/group.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/grow.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/header.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/help.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/hideInk.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/highlight.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/highlightFields.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/highlightNoColor.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/homeFolder.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/hyphenation.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/icons.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/immersive.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/indent.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/indentLeft.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/indentRight.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/index.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/info.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/inkToMath.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/inkToShape.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/insertAbove.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/insertBelow.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/insertLeft.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/insertRight.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/interfaceTheme.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/italic.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/justify.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/labels.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/language.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/lasso.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/last.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/launcher.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/legend.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/lineNumbers.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/lineSpacing.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/link.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/macros.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/mailMerge.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/margins.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/markCitation.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/markEntry.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/markdownSource.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/markup.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/matchFields.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/merge.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/mergeField.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/minus.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/models3d.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/more.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/multilevel.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/multiplePages.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/navPane.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/newComment.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/newWindow.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/next.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/nextChange.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/nextComment.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/nextFootnote.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/numbering.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/object.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/onePage.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/onlinePicture.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/open.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/options.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/orientation.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/outdent.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/outline.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/outlineBody.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/outlineCollapse.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/outlineDemote.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/outlineDown.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/outlineExpand.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/outlinePromote.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/outlineTop.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/outlineUp.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/pageBorders.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/pageBreak.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/pageColor.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/pageNumber.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/pageWidth.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/painter.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/paraSpacing.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/pastCitation.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/paste.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/pen.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/pencil.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/phonetic.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/picture.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/pilcrow.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/pin.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/plus.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/position.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/prevChange.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/prevComment.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/preview.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/previous.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/print.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/printLayout.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/promote.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/properties.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/protect.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/quickParts.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/readAloud.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/readMode.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/recipients.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/recover.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/redo.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/reject.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/repeatHeader.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/replace.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/replay.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/replayForward.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/replayPause.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/replayPlay.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/replayRewind.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/researcher.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/resetGraphic.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/resolve.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/restrict.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/reviewingPane.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/rotate.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/rowHeight.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/ruler.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/rules.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/save.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/saveAs.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/screenshot.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/search.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/select.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/selectTable.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/selectionPane.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/sendBackward.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/setDefault.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/shading.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/shadingNoBar.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/shape.arrow.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/shape.curvedArrowConnector.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/shape.curvedConnector.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/shape.diamond.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/shape.elbowArrowConnector.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/shape.elbowConnector.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/shape.ellipse.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/shape.heart.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/shape.line.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/shape.rectangle.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/shape.roundedRectangle.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/shape.star.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/shape.straightArrowConnector.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/shape.straightConnector.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/shape.triangle.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/shapeEffects.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/shapes.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/share.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/showComments.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/showNotes.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/shrink.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/sideBySide.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/sideToSide.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/signature.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/size.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/smartArt.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/smartArtColors.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/sort.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/sources.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/spaceAfter.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/spaceBefore.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/spelling.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/split.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/splitCells.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/splitTable.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/strike.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/styles.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/stylesPane.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/subscript.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/superscript.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/switchWindows.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/symbol.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/syncScroll.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/table.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/tableOfAuthorities.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/tableOfFigures.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/textBox.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/textBoxLink.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/textBoxUnlink.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/textDirection.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/textFill.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/textLtr.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/textOutline.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/textPane.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/textRtl.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/themes.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/thesaurus.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/thickness.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/toText.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/toc.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/trackChanges.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/transform.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/translate.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/underline.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/undo.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/unlinkCitations.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/update.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/updateTable.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/user.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/vertical.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/video.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/watermark.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/webLayout.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/wordArt.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/wordCount.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/wrapText.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/zoom.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/zoom100.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/zoomIn.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| `crates/ui-egui/icons/zoomOut.svg` | WordCraft contributors | original: exported from WordCraft's own code-drawn icons (`crates/ui-egui/src/icons.rs` before the craft port), text glyphs redrawn as paths | MIT OR Apache-2.0 | UI icon |
| craft-fonts (optional build input, not files in this repo): BIZ UDPGothic, BIZ UDMincho, Shippori Mincho, Noto Sans CJK SC, Noto Sans Arabic | see https://github.com/storytold/craft-fonts/blob/main/ATTRIBUTION.md | embedded only when built with `CRAFT_FONTS_DIR` (all official releases) | OFL-1.1 | Japanese and Chinese UI, Japanese document fallback |
| craft-i18n (optional build input, not files in this repo): the interface translations | see https://github.com/storytold/craft-i18n/blob/main/ATTRIBUTION.md, which credits every translator of WordCraft's former in-repo catalogs (`crates/ui-egui/src/i18n/*.tsv`, migrated at `wordcraft@806a945`) | embedded only when built with `CRAFT_I18N_DIR`, at the commit in `craft-i18n.rev` (all official releases) | MIT OR Apache-2.0 | Interface languages other than English; clean-room translations from the English interface labels |
| craft-i18n Language data (optional build input, not files in this repo): the spelling word lists and hyphenation patterns (`language-data/`: the Moby Hyphenator II list and our patterns for English, `en-extra.txt`, `en-variants.txt`, `ru-extra.txt`, and the hyph-utf8 German, Polish, Portuguese and Italian patterns) | see the Language data section of https://github.com/storytold/craft-i18n/blob/main/ATTRIBUTION.md (authors, upstream sources with SHA-256, licences); moved there from `assets/hyphenation/` and `assets/spelling/` byte for byte | embedded by craft-proof (storytold/craft-libs) only when built with `CRAFT_I18N_DIR`, at the commit in `craft-i18n.rev` (all official releases) | Public Domain / CC0-1.0, MIT, BSD-3-Clause, MIT OR Apache-2.0 (per file; see NOTICE) | Spelling and hyphenation; without it English spelling falls back to an installed Hunspell English or craft-proof's built-in Moby list, and pattern hyphenation is off |
Generated
+1941 -164
View File
File diff suppressed because it is too large Load Diff
+65 -44
View File
@@ -3,6 +3,15 @@ resolver = "3"
members = ["crates/*", "apps/*", "xtask"]
default-members = ["crates/*", "apps/wordcraft", "apps/wordcraft-cli", "xtask"]
[workspace.metadata.cl]
# Port build loop (craft-ui-port-kit): every member but xtask, so the baseline covers the
# non-UI crates whose framework dependencies the next pin moves too.
selection = ["wordcraft", "wordcraft-ui-egui", "wordcraft-web", "wordcraft-cli", "wordcraft-control-key", "wordcraft-doc", "wordcraft-docbin", "wordcraft-docx", "wordcraft-engine", "wordcraft-fonts", "wordcraft-formats", "wordcraft-geom", "wordcraft-layout", "wordcraft-mcp", "wordcraft-pdf", "wordcraft-render", "wordcraft-zotero"]
tracked = ["egui", "eframe", "wordcraft-ui-egui"]
unset_env = ["CARGO_INCREMENTAL", "WORDCRAFT_REQUIRE_WINRES", "CRAFT_FONTS_REQUIRED", "CRAFT_I18N_REQUIRED", "CRAFT_PROOF_EMBED"]
run_slots = 3
test_threads = 4
[workspace.package]
version = "0.18.1"
edition = "2024"
@@ -28,17 +37,20 @@ wordcraft-pdf = { path = "crates/pdf" }
# reads the ca-valencia pack), #589 (French elision suggestions first), #497 (flag-based
# compounding), #496 (review follow-ups, en-AU) and the merged #482–#490/#495 stack; the font
# store's `language-pack` kind is #486 (CP4.1).
wordcraft-proof = { package = "craft-proof", git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-font-store = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-font-catalog = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-ssip = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
wordcraft-proof = { package = "craft-proof", git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft-font-store = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft-font-catalog = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft-ssip = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
wordcraft-engine = { path = "crates/engine" }
wordcraft-mcp = { path = "crates/mcp" }
wordcraft-zotero = { path = "crates/zotero" }
wordcraft-control-key = { path = "crates/control-key" }
wordcraft-ui-egui = { path = "crates/ui-egui" }
craft-codepage = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-metafile = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-codepage = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0", default-features = false }
craft-ui-test-kit = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft-keymap = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft-metafile = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
# foundation
kurbo = { version = "0.13", features = ["serde"] }
@@ -69,29 +81,28 @@ wuff = "0.2.9"
brotli-decompressor = "5"
vello_cpu = "0.2"
image = { version = "0.25", default-features = false }
craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-tiff = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0", default-features = false, features = ["write"] }
# craft-update: app-specific pretend versions apply to startup and manual checks.
craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", features = ["egui"] }
craft-wordmodel = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-docx = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-mcp-server = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-rtf = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0", features = ["doc"] }
craft-doc-binary = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-flow = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-odf = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0", features = ["text"] }
craft-markdown = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-html = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0", features = ["flow"] }
craft-latex = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-math = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-mime = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0", features = ["detect"] }
craft-sheet = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-ods = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-xls = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-xlsx = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-zip = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "=0.1.0" }
craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft-tiff = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0", default-features = false, features = ["write"] }
craft-wordmodel = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft-docx = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft-mcp-server = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft-rtf = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0", features = ["doc"] }
craft-doc-binary = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft-flow = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft-odf = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0", features = ["text"] }
craft-markdown = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft-html = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0", features = ["flow"] }
craft-latex = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft-math = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft-mime = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0", features = ["detect"] }
craft-sheet = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft-ods = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft-xls = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft-xlsx = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
craft-zip = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", version = "=0.1.0" }
# zlib streams (compressed metafile pictures in `.doc` drawings); already in the lock as a dependency of other crates.
miniz_oxide = "0.9"
cfb = "0.15"
@@ -156,20 +167,30 @@ codegen-units = 16
debug = 0
# Required by craft-pdf: the backend rejects writers that failed during unwinding.
# The framework's patches, which Cargo does not carry over to dependents: its vendored crates from craft-libs,
# and the egui and winit forks it builds with.
[patch.crates-io]
krilla = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a" }
ecolor = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
emath = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
epaint = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
epaint_default_fonts = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
egui = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
egui-winit = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
egui-wgpu = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
egui_glow = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
egui_extras = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
egui_kittest = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
egui_system_font_provider = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
eframe = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
egui_demo_lib = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
egui_inspection = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
krilla = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38" }
hayro = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38" }
hayro-interpret = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38" }
hayro-syntax = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38" }
hayro-jbig2 = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38" }
hayro-cmap = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38" }
hayro-postscript = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38" }
linesweeper = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38" }
ecolor = { git = "https://github.com/storytold/egui.git", rev = "7e1c30d142bc7879d043e74b5ceb3ecfe7f51329" }
emath = { git = "https://github.com/storytold/egui.git", rev = "7e1c30d142bc7879d043e74b5ceb3ecfe7f51329" }
epaint = { git = "https://github.com/storytold/egui.git", rev = "7e1c30d142bc7879d043e74b5ceb3ecfe7f51329" }
epaint_default_fonts = { git = "https://github.com/storytold/egui.git", rev = "7e1c30d142bc7879d043e74b5ceb3ecfe7f51329" }
egui = { git = "https://github.com/storytold/egui.git", rev = "7e1c30d142bc7879d043e74b5ceb3ecfe7f51329" }
egui-winit = { git = "https://github.com/storytold/egui.git", rev = "7e1c30d142bc7879d043e74b5ceb3ecfe7f51329" }
egui-wgpu = { git = "https://github.com/storytold/egui.git", rev = "7e1c30d142bc7879d043e74b5ceb3ecfe7f51329" }
egui_glow = { git = "https://github.com/storytold/egui.git", rev = "7e1c30d142bc7879d043e74b5ceb3ecfe7f51329" }
egui_extras = { git = "https://github.com/storytold/egui.git", rev = "7e1c30d142bc7879d043e74b5ceb3ecfe7f51329" }
egui_kittest = { git = "https://github.com/storytold/egui.git", rev = "7e1c30d142bc7879d043e74b5ceb3ecfe7f51329" }
egui_system_font_provider = { git = "https://github.com/storytold/egui.git", rev = "7e1c30d142bc7879d043e74b5ceb3ecfe7f51329" }
eframe = { git = "https://github.com/storytold/egui.git", rev = "7e1c30d142bc7879d043e74b5ceb3ecfe7f51329" }
egui_demo_lib = { git = "https://github.com/storytold/egui.git", rev = "7e1c30d142bc7879d043e74b5ceb3ecfe7f51329" }
egui_inspection = { git = "https://github.com/storytold/egui.git", rev = "7e1c30d142bc7879d043e74b5ceb3ecfe7f51329" }
winit = { git = "https://github.com/storytold/winit.git", rev = "a517b3846ee8457d84ee4975110bfda6797c44dc" }
+9 -6
View File
@@ -16,10 +16,9 @@ path = "src/main.rs"
[dependencies]
wordcraft-engine = { workspace = true }
wordcraft-ui-egui = { workspace = true }
# The host messages (storytold/craft-libs): one contract and one bridge for the web builds.
# The page command API (storytold/craft-libs#413): window.wordcraft over the control channel.
craft-web-api = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "0.1.0" }
craft-web-host = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", version = "0.1.0" }
# The Craft libraries through the facade (storytold/craft-libs): the host messages and bridge, the page command API,
# browser files, clipboard and appearance, print, settings and the UI shell.
craft = { workspace = true, features = ["web-api", "web-host", "platform-browser", "platform-appearance", "platform-clipboard", "automation", "print", "settings", "ui", "window"] }
egui = { workspace = true }
log = { workspace = true }
serde_json = { workspace = true }
@@ -29,8 +28,12 @@ wordcraft-fonts = { workspace = true }
[target.'cfg(target_arch = "wasm32")'.dependencies]
# `wgpu` pulls egui-wgpu's defaults: WebGPU plus the WebGL2 fallback.
eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit"] }
rfd = { workspace = true }
web-time = "1.1"
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
js-sys = "0.3"
web-sys = { version = "0.3", features = ["Window", "Document", "Element", "HtmlElement", "HtmlCanvasElement", "HtmlAnchorElement", "HtmlIFrameElement", "Blob", "BlobPropertyBag", "Url", "Location", "CssStyleDeclaration", "Event", "EventTarget", "BeforeUnloadEvent", "ClipboardEvent", "DataTransfer", "FileList", "File", "DomStringList", "IdbFactory", "IdbOpenDbRequest", "IdbRequest", "IdbDatabase", "IdbObjectStore", "IdbTransaction", "IdbTransactionMode", "MediaQueryList", "Storage", "MessageEvent", "UrlSearchParams", "CustomEvent", "CustomEventInit"] }
web-sys = { version = "0.3", features = ["Window", "Document", "Element", "HtmlElement", "HtmlCanvasElement", "Blob", "Location", "CssStyleDeclaration", "Event", "EventTarget", "BeforeUnloadEvent", "ClipboardEvent", "DataTransfer", "FileList", "File", "DomStringList", "IdbFactory", "IdbOpenDbRequest", "IdbRequest", "IdbDatabase", "IdbObjectStore", "IdbTransaction", "IdbTransactionMode", "MessageEvent", "UrlSearchParams", "CustomEvent", "CustomEventInit"] }
[dev-dependencies]
# The in-memory settings files the host-author trial runs over.
craft = { workspace = true, features = ["settings-testing"] }
+6 -6
View File
@@ -4,17 +4,17 @@
//! The crate owns the JavaScript side (`request`, `execute`, `commands`, `docInspect`, `uiInspect`,
//! `screenshot`, as promises with a timeout). This module is WordCraft's part: a [`Request`] that
//! queues a [`ControlRequest`] for the app, which answers it on its next frame, and waits for the
//! reply. WordCraft's control request has no abandon state, so a call the page gave up on still runs
//! when the app reaches it, as it does for a desktop client that timed out.
//! reply. A call the page gave up on still runs when the app reaches it, as it does for a desktop
//! client that timed out.
use std::rc::Rc;
use std::sync::mpsc::{Receiver, TryRecvError, channel};
use craft_web_api::methods::Methods;
use craft_web_api::page::{PageApi, Request};
use craft::automation::control::ControlRequest;
use craft::web_api::methods::Methods;
use craft::web_api::page::{PageApi, Request};
use serde_json::{Value, json};
use wasm_bindgen_futures::JsFuture;
use wordcraft_ui_egui::ControlRequest;
/// The app id in `window.<app>`.
const APP: &str = "wordcraft";
@@ -23,7 +23,7 @@ const APP: &str = "wordcraft";
const POLL_MS: i32 = 16;
/// Put `window.wordcraft` on the page and return the queue the app drains each frame (hand it to
/// `WordApp::with_control`). An existing `window.wordcraft` keeps the functions it already has.
/// `ControlChannel::new`). An existing `window.wordcraft` keeps the functions it already has.
pub fn install(ctx: egui::Context) -> Receiver<ControlRequest> {
let (queue, requests) = channel::<ControlRequest>();
let request: Request = Rc::new(move |method, params| {
+112 -23
View File
@@ -30,10 +30,18 @@
//! to the host rather than downloaded, the host guards leaving the page, and `?author=` names the
//! user for comments and tracked changes.
use std::cell::RefCell;
use std::collections::HashMap;
use std::path::{Path, PathBuf};
use std::rc::Rc;
use std::sync::Arc;
use std::sync::Mutex;
use craft_web_host::web::{FileData, Host, Message};
use wordcraft_ui_egui::{Inbox, Services, WordApp};
use craft::host::{FileError, Files, PickId, PickRequest, Picked};
use craft::platform::browser_files::BrowserFiles;
use craft::platform::open::{DropTarget, DroppedFile, IntakeSender};
use craft::web_host::web::{FileData, Host, Message};
use wordcraft_ui_egui::{Services, WordApp};
/// The app id in the host messages (`wordcraft:ready`).
const APP: &str = "wordcraft";
@@ -47,6 +55,12 @@ const MAX_OPEN_BYTES: u64 = 512 << 20;
/// The longest user name taken from `?author=`.
const MAX_AUTHOR_CHARS: usize = 200;
thread_local! {
/// The page's bridge, for [`HostedFiles`]: `Files` is `Send + Sync` but the page host is not. The browser
/// runs everything on one thread, so a save, called in the pass of the user's gesture, reaches it here.
static BRIDGE: RefCell<Option<Bridge>> = const { RefCell::new(None) };
}
#[derive(Clone)]
pub struct Bridge {
host: Rc<Host>,
@@ -60,17 +74,11 @@ impl Bridge {
Some(Self { host: Rc::new(Host::connect(APP, canvas)?) })
}
/// Hand saved and exported files to the host instead of downloading them, report unsaved
/// changes to it, and hear the files it sends.
pub fn connect(&self, services: &mut Services, inbox: Inbox, ctx: egui::Context) {
self.listen(inbox, ctx);
let bridge = self.clone();
services.host_save = Some(Box::new(move |name: &str, bytes: &[u8], save_as: bool| bridge.post_save(name, bytes, save_as)));
// Anything else that would download goes to the host too.
let bridge = self.clone();
services.download = Some(Box::new(move |name: &str, bytes: &[u8]| bridge.post_save(name, bytes, false)));
// The browser's save picker is never used, so no save finishes later.
services.async_saves = None;
/// Report unsaved changes to the host page, hear the files it sends, and let [`HostedFiles`]
/// hand it the saves.
pub fn connect(&self, services: &mut Services, intake: IntakeSender) {
self.listen(intake);
BRIDGE.with(|b| *b.borrow_mut() = Some(self.clone()));
// The crate does not repeat a state it already reported.
let host = self.host.clone();
services.on_dirty = Some(Box::new(move |dirty: bool| host.post_dirty(dirty)));
@@ -94,25 +102,25 @@ impl Bridge {
}
fn post_save(&self, path: &str, bytes: &[u8], save_as: bool) -> Result<(), String> {
let name = std::path::Path::new(path).file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| path.to_string());
let name = Path::new(path).file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| path.to_string());
self.host.post_save(&name, bytes, None, save_as)
}
/// Hear `wordcraft:open` and queue the file like a dropped one.
fn listen(&self, inbox: Inbox, ctx: egui::Context) {
fn listen(&self, intake: IntakeSender) {
self.host.listen(move |message| {
if let Message::Open { name, data } = message {
deliver_open(&inbox, &ctx, &name, &data);
deliver_open(&intake, &name, &data);
}
});
}
}
/// The file an open message carries, pushed onto the inbox for the next frame, like a dropped
/// file. A host's file is untrusted input: an oversized one is refused before it is copied into
/// the app's memory (the data's own length, not the host's claim). The crate has cleaned the name
/// (and cut it to 255 characters); a blank one comes as `document` and becomes `Document.docx`.
fn deliver_open(inbox: &Inbox, ctx: &egui::Context, name: &str, data: &FileData) {
/// The file an open message carries, queued for the next frame like a dropped file. A host's file
/// is untrusted input: an oversized one is refused before it is copied into the app's memory (the
/// data's own length, not the host's claim). The crate has cleaned the name (and cut it to 255
/// characters); a blank one comes as `document` and becomes `Document.docx`.
fn deliver_open(intake: &IntakeSender, name: &str, data: &FileData) {
let name = if name == "document" { DEFAULT_NAME } else { name }.to_string();
let FileData::Bytes(array) = data else {
log::warn!("host file {name} came as a File; WordCraft reads bytes only; not opened");
@@ -122,6 +130,87 @@ fn deliver_open(inbox: &Inbox, ctx: &egui::Context, name: &str, data: &FileData)
log::warn!("host file is {} bytes, over the {} MiB host open limit; not opened", data.size(), MAX_OPEN_BYTES >> 20);
return;
}
inbox.lock().unwrap_or_else(|e| e.into_inner()).push((name, array.to_vec()));
ctx.request_repaint();
let file = DroppedFile { path: None, name, bytes: Some(Arc::from(array.to_vec())) };
intake.dropped(vec![file], DropTarget::Elsewhere);
}
/// The files of a hosted page: reads go to the browser's files, but a save goes to the host page,
/// which stores it, so it answers at once.
pub struct HostedFiles {
inner: Arc<BrowserFiles>,
/// Save answers by the id the inner files issued for them.
answers: Mutex<HashMap<u64, Picked>>,
}
impl HostedFiles {
/// Hosted files over the browser's.
pub fn new(inner: Arc<BrowserFiles>) -> Self {
Self { inner, answers: Mutex::new(HashMap::new()) }
}
}
impl Files for HostedFiles {
fn pick(&self, request: PickRequest) -> PickId {
self.inner.pick(request)
}
fn take_answer(&self, id: PickId) -> Option<Picked> {
if let Some(answer) = self.answers.lock().unwrap_or_else(|e| e.into_inner()).remove(&id.0) {
return Some(answer);
}
self.inner.take_answer(id)
}
fn forget(&self, id: PickId) {
if self.answers.lock().unwrap_or_else(|e| e.into_inner()).remove(&id.0).is_none() {
self.inner.forget(id);
}
}
fn pick_pending(&self) -> bool {
self.inner.pick_pending()
}
fn read(&self, path: &Path) -> Result<Vec<u8>, FileError> {
self.inner.read(path)
}
fn write(&self, path: &Path, bytes: &[u8]) -> Result<(), FileError> {
self.inner.write(path, bytes)
}
fn last_folder(&self, purpose: &str) -> Option<PathBuf> {
self.inner.last_folder(purpose)
}
fn save(&self, request: PickRequest, bytes: Vec<u8>) -> PickId {
let name = request.file_name.clone().unwrap_or_else(|| DEFAULT_NAME.to_string());
let sent = BRIDGE.with(|b| match b.borrow().as_ref() {
Some(bridge) => bridge.post_save(&name, &bytes, request.save_as),
None => Err("no host page".to_string()),
});
let answer = match sent {
// A Save As or first Save makes the page hold the document as this file: the answer
// names it, and the next Save posts the name with `save_as` false.
Ok(()) if request.save_as => Picked::Paths(vec![PathBuf::from(&name)]),
// An overwrite of the opened file, or a copy: the document's file stays as it is.
Ok(()) => Picked::Downloaded(name),
Err(error) => Picked::Failed(error),
};
// The inner files own the id space: a Folder pick is answered `Unavailable` at once, so it
// opens no picker and only yields an id, which is released and reused for this answer.
let id = self.inner.pick(PickRequest::folder("hosted-save"));
self.inner.forget(id);
self.answers.lock().unwrap_or_else(|e| e.into_inner()).insert(id.0, answer);
id
}
/// The host page opens documents, so no picker is offered.
fn can_pick(&self) -> bool {
false
}
fn browser_saves(&self) -> bool {
true
}
}
+3 -4
View File
@@ -5,8 +5,9 @@
//! directory (output in `dist/web`).
//!
//! Differences from the desktop app: no TCP control channel; Open and Insert › Pictures use the
//! browser file picker (bytes arrive through `Services::inbox`); Save and Export download.
//! Preferences (theme, interface size, editing options…) are kept in `localStorage` (`prefs`).
//! browser file picker (bytes arrive through the host's `Files`); Save and Export download.
//! Preferences (theme, interface size, editing options…) are kept by the settings store in
//! `localStorage` (`prefs`).
//! URL flags: `?webgl` forces WebGL2; `?sample` opens the sample document.
//! `?host=parent` (inside an `<iframe>`) talks to a same-origin parent page instead: it sends the
//! document to open and stores what WordCraft saves (`host`). A page can also host WordCraft in
@@ -17,8 +18,6 @@
#[cfg(any(target_arch = "wasm32", test))]
mod prefs;
#[cfg(any(target_arch = "wasm32", test))]
mod save_fallback;
#[cfg(target_arch = "wasm32")]
mod api;
+69 -104
View File
@@ -1,129 +1,94 @@
//! Preferences between visits (#2132): the same [`UiState`] the desktop app keeps in `ui.json`
//! (theme, interface size, recent symbols, editing options…), kept in the browser's
//! `localStorage` under [`KEY`]. Restored at startup; written back whenever it changes, so a
//! reload or a closed tab keeps the last setting (browsers don't reliably run exit code).
//! Preferences between visits (#2132): the same [`Prefs`] the desktop app keeps in its settings
//! file (theme, interface size, recent symbols, editing options…), kept by the settings store in the
//! browser's `localStorage`. A value stored by an earlier build under `wordcraft.ui` is imported once.
use wordcraft_ui_egui::{UiState, WordApp};
use craft::settings::SharedSettings;
use wordcraft_ui_egui::prefs::Prefs;
/// The `localStorage` key.
#[cfg_attr(not(target_arch = "wasm32"), allow(dead_code))]
pub const KEY: &str = "wordcraft.ui";
/// Largest stored value read back (`localStorage` holds about 5 MB per site).
const MAX_STORED: usize = 4 << 20;
/// Opens the settings store over the browser's `localStorage`. Changes are written at once on the
/// next tick: a reload or closed tab never runs exit code.
#[cfg(target_arch = "wasm32")]
pub fn open() -> (SharedSettings<Prefs>, craft::settings::LoadReport) {
use std::sync::Arc;
use std::time::Duration;
/// Apply preferences stored on an earlier visit. Missing, oversized or unreadable values leave
/// the defaults.
pub fn restore(app: &mut WordApp, stored: Option<&str>) {
if let Some(s) = stored.filter(|s| s.len() <= MAX_STORED)
&& let Some(ui) = UiState::from_json(s.as_bytes())
{
app.apply_prefs(ui);
}
use craft::settings::{LegacyFile, LocalStorageFiles, Location, OpenOptions, SettingsStore};
use wordcraft_ui_egui::prefs::legacy_ui_json;
/// Largest stored value read back (`localStorage` holds about 5 MB per site).
const MAX_STORED: usize = 4 << 20;
let options = OpenOptions::new(Location::Dir("wordcraft".into()))
.files(Arc::new(LocalStorageFiles::new(MAX_STORED)))
.debounce(Duration::ZERO)
.legacy(vec![LegacyFile { path: "wordcraft.ui".into(), parse: legacy_ui_json }]);
let (store, report) = SettingsStore::open_with(options);
(SharedSettings::new(store), report)
}
/// Tracks what was last written, so the store is written only when a preference changed.
#[derive(Default)]
pub struct PrefsSync {
last: Option<String>,
/// A host page's name for the user (`?author=`) and the user's own, which is stored in its
/// place while the user keeps the host's.
host_author: Option<(String, String)>,
/// A host page's name for the user (`?author=`) and the user's own. The session signs with the
/// host's name, but the store keeps the user's own, which a visit outside the host would restore.
pub struct HostAuthor {
host: String,
own: String,
}
impl PrefsSync {
/// Starts from what is already stored, so restoring doesn't write it straight back.
pub fn new(stored: Option<String>) -> Self {
Self { last: stored, host_author: None }
}
/// The session signs with `host`, a host page's name for the user, but `own` stays the
/// stored name. A name the user then chooses in File › Options is stored as usual.
impl HostAuthor {
/// The rule for a session that signs with `host` while `own` stays stored; `None` when they are
/// the same name.
#[cfg_attr(not(target_arch = "wasm32"), allow(dead_code))]
pub fn keep_own_author(&mut self, host: &str, own: &str) {
if host != own {
self.host_author = Some((host.to_string(), own.to_string()));
}
pub fn new(host: &str, own: &str) -> Option<Self> {
(host != own).then(|| Self { host: host.to_string(), own: own.to_string() })
}
/// The JSON to store when the app's preferences differ from what was last written.
pub fn changed(&mut self, app: &WordApp) -> Option<String> {
let mut prefs = app.prefs();
if let Some((host, own)) = &self.host_author
&& prefs.author.as_deref() == Some(host.as_str())
{
prefs.author = Some(own.clone());
/// The name to keep in the store in place of `stored`: the user's own when `stored` is the
/// host's, `None` when `stored` stays as it is. A name the user chose in File › Options differs
/// from the host's and is stored as usual.
pub fn stored_author(&self, stored: Option<&str>) -> Option<&str> {
(stored == Some(self.host.as_str())).then_some(self.own.as_str())
}
/// Puts the user's own name back into the store where the app wrote the host's.
#[cfg_attr(not(target_arch = "wasm32"), allow(dead_code))]
pub fn keep_own_author(&self, settings: &SharedSettings<Prefs>) {
let mut store = settings.lock();
if let Some(own) = self.stored_author(store.get().author.as_deref()).map(str::to_string) {
store.update(|prefs| prefs.author = Some(own));
}
let json = match serde_json::to_string(&prefs) {
Ok(j) => j,
Err(e) => {
log::warn!("preferences: cannot serialize: {e}");
return None;
}
};
if self.last.as_deref() == Some(json.as_str()) {
return None;
}
self.last = Some(json.clone());
Some(json)
}
}
#[cfg(test)]
mod tests {
use super::*;
use serde_json::json;
use wordcraft_ui_egui::Services;
use std::sync::Arc;
use std::time::Duration;
fn app() -> WordApp {
WordApp::new(wordcraft_engine::Session::new(wordcraft_engine::sample::sample_document()), Services::default())
use craft::settings::testing::MemoryFiles;
use craft::settings::{Location, OpenOptions, SettingsStore};
use super::*;
fn store() -> SharedSettings<Prefs> {
let options: OpenOptions<Prefs> =
OpenOptions::new(Location::Dir("wordcraft".into())).files(Arc::new(MemoryFiles::new())).debounce(Duration::ZERO);
let (store, _report) = SettingsStore::<Prefs>::open_with(options);
SharedSettings::new(store)
}
/// A host page's name for the user signs the visit but isn't stored; a name the user then
/// chooses is.
#[test]
fn host_author_is_not_stored() {
let mut a = app();
a.session.author = "Grace Hopper".into();
let mut sync = PrefsSync::new(None);
let stored = sync.changed(&a).unwrap();
a.session.author = "rob".into();
sync.keep_own_author("rob", "Grace Hopper");
a.run("ui.theme", json!({"value": "dark"})).unwrap();
let json = sync.changed(&a).expect("the theme changed");
assert_ne!(json, stored);
let mut next = app();
restore(&mut next, Some(&json));
assert_eq!(next.session.author, "Grace Hopper");
a.session.author = "Rob Hones".into();
let json = sync.changed(&a).expect("the user chose a name");
let mut next = app();
restore(&mut next, Some(&json));
assert_eq!(next.session.author, "Rob Hones");
}
/// #2132: dark mode chosen on one visit is there after a reload.
#[test]
fn dark_mode_survives_reload() {
let mut first = app();
let mut sync = PrefsSync::new(None);
let initial = sync.changed(&first);
assert!(initial.is_some(), "first frame stores the preferences");
assert_eq!(sync.changed(&first), None, "unchanged preferences are not rewritten");
first.run("ui.theme", json!({"value": "dark"})).unwrap();
let stored = sync.changed(&first).expect("the theme change is stored");
let mut reloaded = app();
restore(&mut reloaded, Some(&stored));
assert_eq!(reloaded.ui.theme, wordcraft_ui_egui::theme::Appearance::Dark);
assert_eq!(PrefsSync::new(Some(stored)).changed(&reloaded), None, "restoring doesn't write back");
}
#[test]
fn junk_storage_keeps_defaults() {
for junk in [None, Some(""), Some("not json"), Some("[1,2]"), Some("{\"theme\":42}")] {
let mut a = app();
restore(&mut a, junk);
assert_eq!(a.ui.theme, wordcraft_ui_egui::theme::Appearance::System, "junk keeps the default appearance");
}
let settings = store();
settings.lock().update(|p| p.author = Some("Grace Hopper".into()));
let rule = HostAuthor::new("rob", "Grace Hopper").unwrap();
// The app writes the session's author, the host's name, into the store.
settings.lock().update(|p| p.author = Some("rob".into()));
rule.keep_own_author(&settings);
assert_eq!(settings.lock().get().author.as_deref(), Some("Grace Hopper"));
// The user chooses a name of their own.
settings.lock().update(|p| p.author = Some("Rob Hones".into()));
rule.keep_own_author(&settings);
assert_eq!(settings.lock().get().author.as_deref(), Some("Rob Hones"));
assert!(HostAuthor::new("same", "same").is_none());
}
}
-46
View File
@@ -1,46 +0,0 @@
//! Save-picker rejection policy, shared with native tests of the browser fallback.
use wordcraft_ui_egui::async_saves::SaveOutcome;
/// A cancelled picker ends the save. Other picker failures try the browser download path.
/// Write/close errors do not pass through this function: they retain their own failure.
pub(crate) fn picker_rejected(name: &str, download: impl FnOnce() -> Result<(), String>) -> SaveOutcome {
if name == "AbortError" {
SaveOutcome::Cancelled
} else {
match download() {
Ok(()) => SaveOutcome::Saved,
Err(error) => SaveOutcome::Failed(error),
}
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn unavailable_picker_downloads_once() {
for name in ["SecurityError", "NotSupportedError", "TypeError", ""] {
let mut calls = 0;
let outcome = picker_rejected(name, || {
calls += 1;
Ok(())
});
assert_eq!(outcome, SaveOutcome::Saved);
assert_eq!(calls, 1);
}
}
#[test]
fn cancelled_picker_never_downloads() {
let outcome = picker_rejected("AbortError", || panic!("cancel must not download"));
assert_eq!(outcome, SaveOutcome::Cancelled);
}
#[test]
fn failed_fallback_remains_a_failed_save() {
let outcome = picker_rejected("SecurityError", || Err("download unavailable".into()));
assert_eq!(outcome, SaveOutcome::Failed("download unavailable".into()));
}
}
+132 -380
View File
@@ -1,18 +1,26 @@
//! The browser shell: web `Services`, drag-and-drop, the unsaved-changes guard and the eframe
//! web runner.
//! The browser shell: the framework host (files, intake, clipboard, print, settings), the
//! unsaved-changes guard and the eframe web runner.
use std::cell::{Cell, RefCell};
use std::rc::Rc;
use std::sync::Arc;
use craft::automation::control::ControlChannel;
use craft::host::{Files, Host, Wake};
use craft::platform::appearance::SystemReader;
use craft::platform::browser_files::BrowserFiles;
use craft::platform::clipboard::{Clipboard, ClipboardError, EventClipboard, Flavor, LateOffers, TEXT};
use craft::platform::open::{DropTarget, DroppedFile, FileIntake, IntakeSender};
use craft::print::spool::Spool;
use craft::settings::SharedSettings;
use craft::ui::InstallSpec;
use craft::ui::shell::embed;
use craft::window::system::NoWindows;
use wasm_bindgen::JsCast as _;
use wordcraft_engine::Session;
use wordcraft_ui_egui::async_saves::{AsyncSaves, SaveOutcome};
use wordcraft_ui_egui::{Inbox, Services, WordApp};
use wordcraft_ui_egui::prefs::Prefs;
use wordcraft_ui_egui::{Services, WordApp};
const DOC_EXTS: &[&str] =
&["docx", "docm", "dotx", "dotm", "doc", "dot", "odt", "ott", "fodt", "rtf", "txt", "md", "html", "htm", "mht", "mhtml", "tex", "json", "xml"];
const IMAGE_EXTS: &[&str] = &["png", "jpg", "jpeg", "gif", "webp", "bmp", "wmf", "emf"];
const RECIPIENT_EXTS: &[&str] = wordcraft_engine::cmd::mailings::RECIPIENT_EXTENSIONS;
mod font_store;
const CANVAS_ID: &str = "wordcraft_canvas";
const LOADING_ID: &str = "wordcraft_loading";
@@ -36,12 +44,6 @@ pub fn start() {
let bridge = crate::host::Bridge::detect(&canvas);
let app_bridge = bridge.clone();
let dirty = Rc::new(Cell::new(false));
let saves = AsyncSaves::default();
if bridge.is_none()
&& let Err(e) = guard_unload(dirty.clone(), saves.clone())
{
log::error!("no unsaved-changes guard: {e}");
}
let mut options = eframe::WebOptions::default();
if query().contains("webgl")
&& let eframe::egui_wgpu::WgpuSetup::CreateNew(create) = &mut options.wgpu_options.wgpu_setup
@@ -56,56 +58,97 @@ pub fn start() {
if let Some(rs) = &cc.wgpu_render_state {
log::info!("wordcraft-web: wgpu backend {:?}", rs.adapter.get_info().backend);
}
let ctx = cc.egui_ctx.clone();
// Fonts the user added on an earlier visit (#582); the app notices them arrive.
font_store::load_all(cc.egui_ctx.clone());
let inbox: Inbox = Inbox::default();
let pasted: Inbox = Inbox::default();
if let Err(e) = listen_for_pasted_pictures(pasted.clone(), cc.egui_ctx.clone()) {
font_store::load_all(ctx.clone());
// The clipboard: the browser's paste event feeds it; a late paste (a picture read
// asynchronously) arrives through `late_offers`. The pass clock counts frames, so a late
// offer is readable in every pass of its frame.
let frame_ctx = ctx.clone();
let copy_ctx = ctx.clone();
let event_clipboard = EventClipboard::new(move || frame_ctx.cumulative_frame_nr(), move |flavors| copy_out(&copy_ctx, flavors))
.with_wake(waker(&ctx));
let late_offers = event_clipboard.late_offers();
if let Err(e) = listen_for_pasted_pictures(late_offers) {
log::error!("pasting pictures is unavailable: {e}");
}
// The browser's locale picks the new document's paper, the units and the
// decimal separator (#838).
let region = wordcraft_ui_egui::i18n::system_region();
// The stored interface language picks the fonts' script coverage, so the settings open first.
let (settings, report) = crate::prefs::open();
if report.has_problems() {
log::warn!("preferences: {report:?}");
}
let lang = wordcraft_ui_egui::i18n::Lang::from_pref(&settings.lock().get().language);
let spec = InstallSpec::new(craft::host::target::ShellInfo::current(), Arc::new(NoWindows))
.app_id("wordcraft")
.system(SystemReader::start(waker(&ctx)))
.clipboard(Clipboard::new(event_clipboard));
if let Err(e) = embed::install(&ctx, spec, &wordcraft_ui_egui::ui_fonts(lang)) {
log::error!("wordcraft-web: the UI runtime did not install: {e:?}");
}
// Files: the browser's pickers and downloads; a host page stores what is saved instead.
let browser = Arc::new(BrowserFiles::new(waker(&ctx)));
if app_bridge.is_none()
&& let Err(e) = guard_unload(dirty.clone(), browser.clone())
{
log::error!("no unsaved-changes guard: {e}");
}
let files: Arc<dyn Files> =
if app_bridge.is_some() { Arc::new(crate::host::HostedFiles::new(browser.clone())) } else { browser.clone() };
let host = Arc::new(
Host::builder(wordcraft_ui_egui::APP)
.i18n(wordcraft_ui_egui::i18n::catalogs())
.files(files)
.settings(Arc::new(settings.clone()))
.lang(lang.craft_lang())
.build(),
);
let (intake, sender) = FileIntake::new(Wake::new(waker(&ctx)));
// In host mode the parent sends the document to edit; no sample meanwhile.
let sample = app_bridge.is_none() && query().contains("sample");
let doc = if sample { wordcraft_engine::sample::sample_document() } else { wordcraft_engine::blank_document(&region) };
let mut session = Session::new(doc);
session.system_region = region;
let messages = Rc::new(RefCell::new(Vec::new()));
let mut services = services(inbox.clone(), cc.egui_ctx.clone(), dirty, saves.clone(), messages.clone());
let mut services = services(&host, ctx.clone(), dirty, messages.clone(), intake);
if let Some(bridge) = &app_bridge {
bridge.connect(&mut services, inbox.clone(), cc.egui_ctx.clone());
bridge.connect(&mut services, sender.clone());
}
let control = crate::api::install(cc.egui_ctx.clone());
let mut app = WordApp::new(session, services).with_control(control);
// Pasted pictures wait apart from dropped files: the app inserts one only when the page is the edit target (#1349).
app.services.pasted = Some(pasted);
let requests = crate::api::install(ctx.clone());
let mut app =
WordApp::new(session, services).with_host(host).with_settings(settings.clone()).with_control(ControlChannel::new(requests));
app.autosave = false;
app.tell_about_font_downloads();
// Preferences from an earlier visit (#2132), as the desktop app reads `ui.json`.
let stored = stored_prefs();
crate::prefs::restore(&mut app, stored.as_deref());
// A region chosen in File › Options replaces the browser's for the first blank
// document too (#838).
if !sample && app.session.prefs.region.is_some() {
let doc = app.session.blank_document();
app.session.set_document(doc);
}
let mut prefs = crate::prefs::PrefsSync::new(stored);
// No document to show: start on File › Home, as the desktop app does (#766).
if !sample {
app.start_screen();
}
// The host's name for the user signs this visit's work, but isn't stored as the
// browser's own preference, which a visit outside the host would restore.
let mut author = None;
if app_bridge.is_some()
&& let Some(author) = query_param("author")
&& let Some(name) = query_param("author")
{
let own = app.session.author.clone();
crate::host::Bridge::set_author(&mut app, &author);
prefs.keep_own_author(&app.session.author, &own);
crate::host::Bridge::set_author(&mut app, &name);
author = crate::prefs::HostAuthor::new(&app.session.author, &own);
}
Ok(Box::new(WebShell { app, inbox, messages, prefs }))
Ok(Box::new(WebShell { app, sender, messages, settings, author }))
}),
)
.await;
@@ -133,75 +176,69 @@ fn query_param(key: &str) -> Option<String> {
web_sys::UrlSearchParams::new_with_str(&query()).ok()?.get(key)
}
/// A wake that asks `ctx` for a frame; callable from any task.
fn waker(ctx: &egui::Context) -> impl Fn() + Send + Sync + Clone + 'static {
let ctx = ctx.clone();
move || ctx.request_repaint()
}
/// The clipboard's copy path: eframe's own text copy is the browser's only write.
fn copy_out(ctx: &egui::Context, flavors: &[Flavor]) -> Result<usize, ClipboardError> {
let (index, text) = flavors.iter().enumerate().find(|(_, f)| f.mime == TEXT).ok_or(ClipboardError::NoFormat)?;
ctx.copy_text(String::from_utf8_lossy(&text.data).into_owned());
Ok(index)
}
/// Wraps the app to read dropped files asynchronously (browsers can't read them synchronously)
/// and feed them through the inbox.
/// and feed them through the intake.
struct WebShell {
app: WordApp,
inbox: Inbox,
sender: IntakeSender,
messages: Rc<RefCell<Vec<String>>>,
prefs: crate::prefs::PrefsSync,
}
fn local_storage() -> Option<web_sys::Storage> {
web_sys::window()?.local_storage().ok()?
}
/// The preferences stored on an earlier visit, if the browser allows storage.
fn stored_prefs() -> Option<String> {
local_storage()?.get_item(crate::prefs::KEY).ok()?
settings: SharedSettings<Prefs>,
/// Set when a host page named the user: its name is not kept in the stored preferences.
author: Option<crate::prefs::HostAuthor>,
}
impl eframe::App for WebShell {
/// Runs one browser frame: forwards queued host messages to the status bar, advances the app,
/// then writes changed preferences to browser storage immediately, because a reload or closed
/// tab never runs the exit path.
/// then ticks the settings store, which writes changed preferences to browser storage at once
/// (a reload or closed tab never runs an exit path). The browser has no window-close path.
fn logic(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
let msgs = std::mem::take(&mut *self.messages.borrow_mut());
for msg in msgs {
self.app.status(msg);
}
self.app.logic(ctx);
// Store changed preferences straight away: a reload or closed tab runs no exit code (#2132).
if let Some(json) = self.prefs.changed(&self.app) {
match local_storage() {
Some(store) => {
if let Err(e) = store.set_item(crate::prefs::KEY, &json) {
log::warn!("preferences: cannot save: {e:?}");
}
}
None => log::warn!("preferences: browser storage is unavailable"),
}
if let Some(author) = &self.author {
author.keep_own_author(&self.settings);
}
self.settings.lock().tick(web_time::Instant::now());
}
/// Forwards this frame's raw browser input to the app before widgets run.
/// Takes the browser's dropped files once per frame, before any pass, and spawns asynchronous
/// byte reads into the intake (browsers can't read them synchronously); then hands the runtime's
/// output to the app and gives the coming passes the app's input.
fn raw_input_hook(&mut self, ctx: &egui::Context, raw: &mut egui::RawInput) {
self.app.raw_input_hook(ctx, raw);
for f in std::mem::take(&mut raw.dropped_files) {
let sender = self.sender.clone();
wasm_bindgen_futures::spawn_local(async move {
let name = f.path().file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| "dropped".into());
match f.bytes_async().await {
Ok(bytes) => {
let file = DroppedFile { path: None, name, bytes: Some(Arc::from(bytes)) };
sender.dropped(vec![file], DropTarget::Elsewhere);
}
Err(e) => log::error!("couldn't read dropped file {name}: {e}"),
}
});
}
embed::before_input(ctx, |out| self.app.frame_input(out));
}
/// Draws the app. On the first pass of a visible frame it takes the browser's dropped files and
/// spawns asynchronous byte reads into the inbox; later passes only draw.
/// Draws the app.
fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
// Browser drops are input: take them only in the first real UI pass, never in a hidden
// `run_logic` tick that still sees the previous shown frame's RawInput.
if ui.ctx().current_pass_index() == 0 {
let ctx = ui.ctx().clone();
let dropped = ctx.input_mut(|i| std::mem::take(&mut i.raw.dropped_files));
for f in dropped {
let inbox = self.inbox.clone();
let ctx = ctx.clone();
wasm_bindgen_futures::spawn_local(async move {
let name = f.path().file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| "dropped".into());
match f.bytes_async().await {
Ok(bytes) => {
inbox.lock().unwrap_or_else(|e| e.into_inner()).push((name, bytes));
ctx.request_repaint();
}
Err(e) => log::error!("couldn't read dropped file {name}: {e}"),
}
});
}
}
// No `embed::before_ui`: it fits and routes a native window, and the page's canvas is neither.
self.app.ui(ui);
}
}
@@ -212,10 +249,12 @@ const MAX_PASTED_BYTES: f64 = (200u32 << 20) as f64;
const MAX_PASTED_PICTURES: u32 = 20;
/// Pasting a picture (#45): eframe's paste handler only reads text, so a clipboard holding just
/// pictures (a screenshot, a browser's Copy Image) is read here and the pictures arrive through
/// the app's `pasted` queue, which inserts them only when the page is the edit target (#1349). A clipboard with text is left to eframe.
fn listen_for_pasted_pictures(inbox: Inbox, ctx: egui::Context) -> Result<(), String> {
/// pictures (a screenshot, a browser's Copy Image) is read here and offered to the clipboard as a
/// late paste; the app inserts it only when the page is the edit target (#1349). A clipboard with
/// text is left to eframe.
fn listen_for_pasted_pictures(late: LateOffers) -> Result<(), String> {
let document = web_sys::window().and_then(|w| w.document()).ok_or("no document")?;
let late = Rc::new(late);
let on_paste = wasm_bindgen::closure::Closure::<dyn FnMut(web_sys::ClipboardEvent)>::new(move |e: web_sys::ClipboardEvent| {
// The target is always eframe's hidden text input while the page has focus; the app decides (#1349).
let Some(data) = e.clipboard_data() else { return };
@@ -232,15 +271,13 @@ fn listen_for_pasted_pictures(inbox: Inbox, ctx: egui::Context) -> Result<(), St
log::warn!("pasted picture is larger than 200 MB; not inserted");
continue;
}
let inbox = inbox.clone();
let ctx = ctx.clone();
let late = late.clone();
let mime = file.type_();
wasm_bindgen_futures::spawn_local(async move {
match wasm_bindgen_futures::JsFuture::from(file.array_buffer()).await {
Ok(buf) => {
let bytes = js_sys::Uint8Array::new(&buf).to_vec();
// The engine reads the format from the bytes; the name is ignored.
inbox.lock().unwrap_or_else(|e| e.into_inner()).push(("pasted.png".into(), bytes));
ctx.request_repaint();
late.offer(vec![Flavor::new(mime, bytes)]);
}
Err(e) => log::error!("couldn't read the pasted picture: {e:?}"),
}
@@ -254,51 +291,13 @@ fn listen_for_pasted_pictures(inbox: Inbox, ctx: egui::Context) -> Result<(), St
}
/// `dirty` is the flag the `beforeunload` guard reads ([`guard_unload`]).
fn services(inbox: Inbox, ctx: egui::Context, dirty: Rc<Cell<bool>>, saves: AsyncSaves, messages: Rc<RefCell<Vec<String>>>) -> Services {
let open_inbox = inbox.clone();
let save_ctx = ctx.clone();
let font_ctx = ctx.clone();
let font_messages = messages.clone();
fn services(host: &Host, ctx: egui::Context, dirty: Rc<Cell<bool>>, messages: Rc<RefCell<Vec<String>>>, intake: FileIntake) -> Services {
let font_ctx = ctx;
let font_messages = messages;
Services {
open_async: Some(Box::new(move |purpose: &str| {
let inbox = open_inbox.clone();
let ctx = ctx.clone();
let dialog = if purpose == "picture" {
rfd::AsyncFileDialog::new().add_filter("Pictures", IMAGE_EXTS)
} else if purpose == "font" {
rfd::AsyncFileDialog::new().add_filter("Fonts", wordcraft_fonts::FONT_FILE_EXTS)
} else if purpose == "recipients" {
rfd::AsyncFileDialog::new().add_filter("Recipient lists", RECIPIENT_EXTS)
} else {
rfd::AsyncFileDialog::new().add_filter("Documents", DOC_EXTS)
};
let many = purpose == "font";
wasm_bindgen_futures::spawn_local(async move {
// Add Font takes every selected file (#1789); the others one.
let files = if many { dialog.pick_files().await.unwrap_or_default() } else { dialog.pick_file().await.into_iter().collect() };
for file in files.into_iter().take(MAX_PICKED_FILES) {
let mut bytes = file.read().await;
let mut pending = inbox.lock().unwrap_or_else(|e| e.into_inner());
// Fonts waiting for the app to drain them stay under a byte cap. A file
// over it is queued empty, so Add Font reports that file on its own.
let held: usize = pending.iter().map(|(_, b)| b.len()).fold(0, usize::saturating_add);
if many && held.saturating_add(bytes.len()) > MAX_PENDING_PICKED_BYTES {
bytes = Vec::new();
}
pending.push((file.file_name(), bytes));
drop(pending);
ctx.request_repaint();
}
});
})),
// Exports ask for a name; the browser decides where the download goes.
pick_save: Some(Box::new(|name: &str| Some(name.to_string()))),
async_saves: Some(saves.clone()),
download: Some(Box::new(move |path: &str, bytes: &[u8]| download(&saves, &save_ctx, path, bytes))),
print: Some(Box::new(print_pdf)),
inbox: Some(inbox),
print: Some(Spool::new(host.jobs_shared().clone())),
intake: Some(intake),
on_dirty: Some(Box::new(move |d| dirty.set(d))),
animations_enabled: Some(animations_enabled()),
store_font: Some(Box::new(font_store::store)),
forget_font: Some(Box::new(font_store::forget)),
load_system_fonts: Some(Box::new(move || {
@@ -308,10 +307,6 @@ fn services(inbox: Inbox, ctx: egui::Context, dirty: Rc<Cell<bool>>, saves: Asyn
}
}
/// Most files one multi-select pick (Add Font) reads.
const MAX_PICKED_FILES: usize = 2000;
/// Most bytes of picked fonts held in the inbox before the app drains them.
const MAX_PENDING_PICKED_BYTES: usize = 256 << 20;
/// Most local fonts one Load System Installed Fonts installs (a designer's machine has thousands).
const MAX_SYSTEM_FONTS: usize = 500;
/// Most font bytes one Load System Installed Fonts reads into memory (wasm memory is small).
@@ -411,21 +406,13 @@ fn load_system_fonts(ctx: egui::Context, messages: Rc<RefCell<Vec<String>>>) {
});
}
/// Whether the system has animation effects on, as the browser passes it on: off while the
/// `prefers-reduced-motion: reduce` media query matches. `None` when the browser can't say. The
/// query is made once and asked every frame; it follows the system's setting by itself.
fn animations_enabled() -> Box<dyn Fn() -> Option<bool>> {
let reduce = web_sys::window().and_then(|w| w.match_media("(prefers-reduced-motion: reduce)").ok().flatten());
Box::new(move || reduce.as_ref().map(|query| !query.matches()))
}
/// Closing, reloading or leaving the tab with unsaved changes asks first. Browsers show their own
/// confirmation (a page can only ask for it), so there is no Save button: Cancel, then File › Save.
fn guard_unload(dirty: Rc<Cell<bool>>, saves: AsyncSaves) -> Result<(), String> {
fn guard_unload(dirty: Rc<Cell<bool>>, files: Arc<BrowserFiles>) -> Result<(), String> {
let window = web_sys::window().ok_or("no window")?;
let on_unload = wasm_bindgen::closure::Closure::<dyn FnMut(web_sys::BeforeUnloadEvent)>::new(move |e: web_sys::BeforeUnloadEvent| {
// A save still in the browser's picker hasn't written anything yet.
if dirty.get() || saves.pending() > 0 {
if dirty.get() || files.pick_pending() {
e.prevent_default();
// Older browsers ask only when `returnValue` is set.
e.set_return_value("unsaved changes");
@@ -436,238 +423,3 @@ fn guard_unload(dirty: Rc<Cell<bool>>, saves: AsyncSaves) -> Result<(), String>
on_unload.forget();
Ok(())
}
/// Trigger a browser save dialog or download of `bytes` named after the last component of `path`.
fn download(saves: &AsyncSaves, ctx: &egui::Context, path: &str, bytes: &[u8]) -> Result<(), String> {
let name = std::path::Path::new(path).file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| "document".into());
let window = web_sys::window().ok_or("no window")?;
// On browsers supporting the File System Access API (Chromium: Chrome, Edge, etc.),
// `showSaveFilePicker` lets the user choose the save location and filename natively.
if let Ok(picker_val) = js_sys::Reflect::get(&window, &wasm_bindgen::JsValue::from_str("showSaveFilePicker"))
&& let Ok(picker_fn) = picker_val.dyn_into::<js_sys::Function>()
{
match trigger_save_file_picker(saves, ctx, &window, &picker_fn, &name, bytes) {
Ok(()) => return Ok(()),
Err(e) => {
log::warn!("showSaveFilePicker failed: {e}; falling back to anchor download");
}
}
}
// Fallback for browsers without showSaveFilePicker (e.g. Firefox, Safari):
trigger_anchor_download(&window, &name, bytes)
}
fn trigger_save_file_picker(
saves: &AsyncSaves,
ctx: &egui::Context,
window: &web_sys::Window,
picker_fn: &js_sys::Function,
name: &str,
bytes: &[u8],
) -> Result<(), String> {
let js = |e: wasm_bindgen::JsValue| format!("{e:?}");
let ext = std::path::Path::new(name).extension().and_then(std::ffi::OsStr::to_str).unwrap_or("docx").to_ascii_lowercase();
let dot_ext = format!(".{ext}");
let mime = mime_for(name);
let accept_obj = js_sys::Object::new();
let exts_arr = js_sys::Array::new();
exts_arr.push(&wasm_bindgen::JsValue::from_str(&dot_ext));
let _ = js_sys::Reflect::set(&accept_obj, &wasm_bindgen::JsValue::from_str(mime), &exts_arr);
// Our own neutral description: the format's name, as its extension says it.
let type_desc = match ext.as_str() {
"htm" => "HTML".to_string(),
"txt" => "Text".to_string(),
e if !e.is_empty() && e.len() <= 8 && e.chars().all(|c| c.is_ascii_alphanumeric()) => e.to_ascii_uppercase(),
_ => "Document".to_string(),
};
let type_obj = js_sys::Object::new();
let _ = js_sys::Reflect::set(&type_obj, &wasm_bindgen::JsValue::from_str("description"), &wasm_bindgen::JsValue::from_str(&type_desc));
let _ = js_sys::Reflect::set(&type_obj, &wasm_bindgen::JsValue::from_str("accept"), &accept_obj);
let types_arr = js_sys::Array::new();
types_arr.push(&type_obj);
let picker_opts = js_sys::Object::new();
let _ = js_sys::Reflect::set(&picker_opts, &wasm_bindgen::JsValue::from_str("suggestedName"), &wasm_bindgen::JsValue::from_str(name));
let _ = js_sys::Reflect::set(&picker_opts, &wasm_bindgen::JsValue::from_str("types"), &types_arr);
// Call showSaveFilePicker synchronously while transient user activation is active:
let prom_val = picker_fn.call1(window, &picker_opts).map_err(js)?;
let prom: js_sys::Promise = prom_val.dyn_into().map_err(|_| "not a promise".to_string())?;
let bytes_vec = bytes.to_vec();
let window = window.clone();
let saves = saves.clone();
let ctx = ctx.clone();
let name = name.to_string();
// The app holds back a Save Changes prompt's New/Open until this ticket ends (#1315).
let ticket = saves.start();
wasm_bindgen_futures::spawn_local(async move {
// The document counts as saved only once the file is written and closed.
let outcome = match wasm_bindgen_futures::JsFuture::from(prom).await {
Ok(handle_val) => match write_file_handle(&handle_val, &bytes_vec).await {
Ok(()) => {
log::info!("saved {name} through the save picker");
SaveOutcome::Saved
}
Err(e) => {
log::error!("couldn't write {name}: {e}");
SaveOutcome::Failed(e)
}
},
Err(e) => {
let err_name =
js_sys::Reflect::get(&e, &wasm_bindgen::JsValue::from_str("name")).ok().and_then(|v| v.as_string()).unwrap_or_default();
// A browser can expose the picker but reject its promise (for example in
// a cross-origin iframe). Use the same download path as an absent API;
// cancelling a picker must never start an unwanted download (#1246).
crate::save_fallback::picker_rejected(&err_name, || trigger_anchor_download(&window, &name, &bytes_vec))
}
};
saves.finish(ticket, outcome);
ctx.request_repaint();
});
Ok(())
}
async fn write_file_handle(handle: &wasm_bindgen::JsValue, bytes: &[u8]) -> Result<(), String> {
let js = |e: wasm_bindgen::JsValue| format!("{e:?}");
let create_fn: js_sys::Function = js_sys::Reflect::get(handle, &wasm_bindgen::JsValue::from_str("createWritable"))
.map_err(js)?
.dyn_into()
.map_err(|_| "createWritable is not a function".to_string())?;
let stream_prom: js_sys::Promise = create_fn.call0(handle).map_err(js)?.dyn_into().map_err(|_| "not a promise".to_string())?;
let stream = wasm_bindgen_futures::JsFuture::from(stream_prom).await.map_err(js)?;
let write_fn: js_sys::Function = js_sys::Reflect::get(&stream, &wasm_bindgen::JsValue::from_str("write"))
.map_err(js)?
.dyn_into()
.map_err(|_| "write is not a function".to_string())?;
let uint8 = js_sys::Uint8Array::from(bytes);
let write_prom: js_sys::Promise = write_fn.call1(&stream, &uint8).map_err(js)?.dyn_into().map_err(|_| "not a promise".to_string())?;
wasm_bindgen_futures::JsFuture::from(write_prom).await.map_err(js)?;
let close_fn: js_sys::Function = js_sys::Reflect::get(&stream, &wasm_bindgen::JsValue::from_str("close"))
.map_err(js)?
.dyn_into()
.map_err(|_| "close is not a function".to_string())?;
let close_prom: js_sys::Promise = close_fn.call0(&stream).map_err(js)?.dyn_into().map_err(|_| "not a promise".to_string())?;
wasm_bindgen_futures::JsFuture::from(close_prom).await.map_err(js)?;
Ok(())
}
fn trigger_anchor_download(window: &web_sys::Window, name: &str, bytes: &[u8]) -> Result<(), String> {
let js = |e: wasm_bindgen::JsValue| format!("{e:?}");
let document = window.document().ok_or("no document")?;
let parts = js_sys::Array::of1(&js_sys::Uint8Array::from(bytes));
let opts = web_sys::BlobPropertyBag::new();
opts.set_type(mime_for(name));
let blob = web_sys::Blob::new_with_u8_array_sequence_and_options(&parts, &opts).map_err(js)?;
let url = web_sys::Url::create_object_url_with_blob(&blob).map_err(js)?;
let a: web_sys::HtmlAnchorElement = document.create_element("a").map_err(js)?.dyn_into().map_err(|_| "not an anchor".to_string())?;
a.set_href(&url);
a.set_download(name);
a.style().set_property("display", "none").map_err(js)?;
let body = document.body().ok_or("no body")?;
body.append_child(&a).map_err(js)?;
a.click();
a.remove();
// Revoke after the click has been dispatched; the download keeps its own reference.
let revoke = wasm_bindgen::closure::Closure::once_into_js(move || {
web_sys::Url::revoke_object_url(&url).ok();
});
window.set_timeout_with_callback_and_timeout_and_arguments_0(revoke.unchecked_ref(), 10_000).map_err(js)?;
Ok(())
}
/// The hidden iframe the last print loaded its PDF into.
const PRINT_FRAME_ID: &str = "wordcraft-print-frame";
/// Opens `bytes` (a PDF) as an object URL in a hidden iframe and calls the
/// iframe's own `print()` once it has finished loading — this is the
/// standard way to drive the browser's native print dialog on a PDF without
/// a download or a popup window the browser might block. The previous
/// print's iframe and object URL are removed first, so only one copy of the
/// document's PDF stays in the page (the last one may still be printing).
fn print_pdf(bytes: &[u8]) -> Result<(), String> {
let js = |e: wasm_bindgen::JsValue| format!("{e:?}");
let window = web_sys::window().ok_or("no window")?;
let document = window.document().ok_or("no document")?;
if let Some(old) = document.get_element_by_id(PRINT_FRAME_ID) {
if let Ok(frame) = old.clone().dyn_into::<web_sys::HtmlIFrameElement>() {
let src = frame.src();
if src.starts_with("blob:") {
web_sys::Url::revoke_object_url(&src).ok();
}
}
old.remove();
}
let parts = js_sys::Array::of1(&js_sys::Uint8Array::from(bytes));
let opts = web_sys::BlobPropertyBag::new();
opts.set_type("application/pdf");
let blob = web_sys::Blob::new_with_u8_array_sequence_and_options(&parts, &opts).map_err(js)?;
let url = web_sys::Url::create_object_url_with_blob(&blob).map_err(js)?;
let iframe: web_sys::HtmlIFrameElement =
match document.create_element("iframe").map_err(js).and_then(|e| e.dyn_into().map_err(|_| "not an iframe".to_string())) {
Ok(f) => f,
Err(e) => {
web_sys::Url::revoke_object_url(&url).ok();
return Err(e);
}
};
iframe.set_id(PRINT_FRAME_ID);
let attached = iframe
.style()
.set_property("display", "none")
.map_err(js)
.and_then(|()| document.body().ok_or_else(|| "no body".to_string()))
.and_then(|body| body.append_child(&iframe).map_err(js));
if let Err(e) = attached {
iframe.remove();
web_sys::Url::revoke_object_url(&url).ok();
return Err(e);
}
// `onload` fires once the PDF has actually rendered inside the iframe;
// printing before that would show a blank page. Set the handler BEFORE
// `src` so a fast/cached load can't fire before we're listening.
let iframe_for_load = iframe.clone();
let on_load = wasm_bindgen::closure::Closure::once_into_js(move || {
if let Some(w) = iframe_for_load.content_window() {
// Ignore errors: some browsers (notably Firefox with a built-in
// PDF viewer) print fine but report a benign cross-origin-style
// error back on this call.
let _ = w.print();
}
});
iframe.set_onload(Some(on_load.unchecked_ref()));
iframe.set_src(&url);
Ok(())
}
fn mime_for(name: &str) -> &'static str {
match name.rsplit('.').next().map(str::to_ascii_lowercase).as_deref() {
Some("png") => "image/png",
Some("jpg" | "jpeg") => "image/jpeg",
Some("pdf") => "application/pdf",
Some("docx") => "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
Some("odt") => "application/vnd.oasis.opendocument.text",
Some("ott") => "application/vnd.oasis.opendocument.text-template",
Some("fodt") => "application/vnd.oasis.opendocument.text-flat-xml",
Some("rtf") => "application/rtf",
Some("html") => "text/html",
Some("md" | "txt") => "text/plain",
Some("tex") => "application/x-tex",
Some("json") => "application/json",
Some("xml") => "application/xml",
_ => "application/octet-stream",
}
}
+28 -59
View File
@@ -17,15 +17,35 @@ wordcraft-proof = { workspace = true }
# Fonts the user added (#582) load from the settings folder at start-up.
wordcraft-fonts = { workspace = true }
wordcraft-ui-egui = { workspace = true }
# The clipboard's PNG decoder.
wordcraft-geom = { workspace = true, features = ["image"] }
# The control key file's location (shared with the MCP bridge).
wordcraft-control-key = { workspace = true }
eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit", "clipboard", "wayland", "x11", "links"] }
egui = { workspace = true }
serde_json = { workspace = true }
serde = { workspace = true }
tempfile = "3"
log = { workspace = true }
chrono = { workspace = true }
# The suite's shared libraries: the runtime hooks (`ui`, `ui-app`), file dialogs, the control
# channel's arguments, the GPU choice, printing, settings and window placement, the OS appearance
# reader and the system clipboard.
craft = { workspace = true, features = [
"ui",
"ui-app",
"dialogs",
"automation",
"gpu-startup",
"print",
"settings",
"window",
"platform-appearance",
"platform-clipboard-system",
] }
[dev-dependencies]
# Temporary settings folders for the `prefs` tests.
tempfile = "3"
# The frame driver of the `smoke` test.
craft = { workspace = true, features = ["ui-testing"] }
[build-dependencies]
# Icon + VERSIONINFO for wordcraft.exe; build.rs only uses it when the target is Windows.
@@ -33,69 +53,18 @@ winresource = "0.1"
[target.'cfg(target_os = "macos")'.dependencies]
# Finder double-click, Open With, Dock drops and `open -a WordCraft letter.docx` arrive as a
# kAEOpenDocuments Apple event, which winit 0.30 doesn't handle (#27). This audited crate (also used
# by PdfCraft and PhotoCraft) registers the handler (Objective-C interop needs unsafe, which our
# workspace forbids) behind a safe API. Pinned exactly: review the diff before bumping.
fmv-macos-events = "=0.1.0"
# The system's Reduce motion setting (System Settings › Accessibility › Display), read through
# NSWorkspace: a safe call in these bindings. Already in the build through eframe, rfd and arboard,
# at this version; this adds the `NSAccessibility` bindings and, to fit the title bar around the
# traffic lights, the window, button and view ones; and `NSPasteboard` for the clipboard's RTF.
objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSWorkspace", "NSAccessibility", "NSApplication", "NSWindow", "NSButton", "NSControl", "NSView", "NSResponder", "NSPasteboard"] }
objc2 = "0.6"
# A copied equation's MathML goes on the pasteboard as `public.mathml.presentation` beside
# arboard's HTML and text (#1297), through NSPasteboard's safe `setString:forType:`. Already in
# the build through arboard, at this version; this adds only the NSString bindings, and NSData
# for the clipboard's RTF (`public.rtf`).
objc2-foundation = { version = "0.3", default-features = false, features = ["std", "NSString", "NSData"] }
# Closing the window must quit through NSApplication rather than by dropping the NSWindow
# inside the AppKit run loop (see `schedule_macos_terminate`).
dispatch2 = "0.3"
# kAEOpenDocuments Apple event, which winit doesn't handle (#27).
craft = { workspace = true, features = ["platform-apple-events"] }
[target.'cfg(all(unix, not(target_os = "macos")))'.dependencies]
winit = { version = "0.30", default-features = false, features = ["x11"] }
# The desktop's animation setting on Linux and the BSDs, read from the XDG settings portal over
# D-Bus. Already in the build through AccessKit, at this version; this adds only its blocking API.
zbus = { version = "5", default-features = false, features = ["async-io", "blocking-api"] }
# Wayland's clipboard through the data-control protocol (#687, #833): the RTF and other picture
# types that arboard doesn't read, and the formats offered. Already in the build through arboard's
# `wayland-data-control` feature, at this version.
wl-clipboard-rs = "0.9"
# Another program's RTF on X11 (`text/rtf`), which arboard doesn't read. Already in the build
# through arboard, at this version.
x11rb = "0.13"
# Check that the libraries winit's X11 backend opens are installed before choosing XWayland (see
# `x11_libraries` in main.rs). Both are already in the build through winit's `x11` feature, at
# these versions and with this feature.
x11-dl = "2.21"
xkbcommon-dl = { version = "0.4.2", features = ["x11"] }
[target.'cfg(target_os = "windows")'.dependencies]
# The upstream default-apps button opens Windows Settings; printing uses craft-print instead.
open = "5"
# The system's Animation effects setting (Settings › Accessibility › Visual effects), read through
# the Windows Runtime's UISettings: a safe API, where the Win32 call needs unsafe, which our
# workspace forbids. Already in the build through wgpu and AccessKit, at this version; this adds
# only the `UI_ViewManagement` bindings, and `System_UserProfile` for the home region new
# documents take their paper and units from (#838).
windows = { version = "0.62", features = ["UI_ViewManagement", "System_UserProfile"] }
# The clipboard's "Rich Text Format" and the names of its formats (#687, #833), which arboard
# doesn't read. Already in the build through arboard, at this version.
clipboard-win = { version = "5.4", features = ["std"] }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
# At the same craft-libs commit as the workspace's crates: `printer_queues`, the printer list that
# asks no driver (#5710, storytold/craft-libs#618), and `submit_cancellable` (storytold/craft-libs#622).
craft-print = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a" }
rfd = { workspace = true }
# Waits for an `rfd::AsyncFileDialog` on a background thread (the dialogs don't block the UI, #94);
# rfd itself already depends on it.
pollster = "1"
# Pictures and copied files on the system clipboard (#45); egui's paste only carries text. Already
# in the build through egui-winit, with the same features.
arboard = { workspace = true, features = ["image-data"] }
# The control server's random key.
getrandom = "0.3"
[target.'cfg(windows)'.dependencies]
craft-update = { workspace = true }
# The update helper: a copy of this program started with `--finish-update`
# (`craft::update::self_update::finish`).
craft = { workspace = true, features = ["update"] }
-99
View File
@@ -1,99 +0,0 @@
//! The system's animation setting, which File › Options › Accessibility › Animation effects
//! follows when set to "Use system setting" (`Services::animations_enabled`).
//!
//! - Windows: Settings › Accessibility › Visual effects › Animation effects, read through the
//! Windows Runtime's `UISettings`.
//! - macOS: System Settings › Accessibility › Display › Reduce motion, read through `NSWorkspace`.
//! - Linux and the BSDs: the desktop's setting, read through the settings portal ([`desktop`]).
//!
//! All three are safe APIs of crates already in the build (our workspace forbids unsafe). The UI
//! asks every frame, so the answer always comes from memory: Windows and macOS are asked again at
//! most once a second, and the Linux/BSD side keeps its answer up to date on a thread of its own.
#[cfg(any(all(unix, not(target_os = "macos")), test))]
mod desktop;
/// The answer to "does the system have animation effects on?" for the UI: `None` when the system
/// doesn't say. `ctx` is asked to redraw when an answer that arrives later changes it.
pub fn hook(ctx: &egui::Context) -> Box<dyn Fn() -> Option<bool>> {
#[cfg(any(target_os = "windows", target_os = "macos"))]
{
let _ = ctx;
Box::new(remembered(system_enabled, REFRESH))
}
#[cfg(all(unix, not(target_os = "macos")))]
{
Box::new(desktop::watch(ctx.clone()))
}
#[cfg(not(any(target_os = "windows", unix)))]
{
let _ = ctx;
Box::new(|| None)
}
}
/// How long an answer from Windows or macOS is kept before the system is asked again.
#[cfg(any(target_os = "windows", target_os = "macos"))]
const REFRESH: std::time::Duration = std::time::Duration::from_secs(1);
/// `read`, asked at most once per `every` and answered from memory in between.
#[cfg(any(target_os = "windows", target_os = "macos", test))]
fn remembered(read: impl Fn() -> Option<bool>, every: std::time::Duration) -> impl Fn() -> Option<bool> {
let last = std::cell::Cell::new(None::<(std::time::Instant, Option<bool>)>);
move || {
if let Some((at, answer)) = last.get()
&& at.elapsed() < every
{
return answer;
}
let answer = read();
last.set(Some((std::time::Instant::now(), answer)));
answer
}
}
/// Whether Windows has animation effects on; `None` when it can't be asked.
#[cfg(target_os = "windows")]
fn system_enabled() -> Option<bool> {
windows::UI::ViewManagement::UISettings::new()
.and_then(|settings| settings.AnimationsEnabled())
.map_err(|e| log::debug!("system animation setting: {e}"))
.ok()
}
/// Whether macOS plays animations: Reduce motion is off.
#[cfg(target_os = "macos")]
fn system_enabled() -> Option<bool> {
Some(!objc2_app_kit::NSWorkspace::sharedWorkspace().accessibilityDisplayShouldReduceMotion())
}
#[cfg(test)]
mod tests {
use std::cell::Cell;
use std::time::Duration;
use super::remembered;
/// The UI asks every frame; the system is asked once per interval and the answer kept between.
#[test]
fn the_system_is_asked_once_per_interval() {
let asked = Cell::new(0);
let system = Cell::new(Some(false));
let read = || {
asked.set(asked.get() + 1);
system.get()
};
let kept = remembered(read, Duration::from_secs(3600));
assert_eq!((kept(), kept(), kept()), (Some(false), Some(false), Some(false)));
system.set(Some(true));
assert_eq!(kept(), Some(false), "within the interval the remembered answer stands");
assert_eq!(asked.get(), 1);
// Once the interval has passed (here: at once) the system is asked again.
let fresh = remembered(read, Duration::ZERO);
assert_eq!(fresh(), Some(true));
system.set(None);
assert_eq!(fresh(), None);
assert_eq!(asked.get(), 3);
}
}
-305
View File
@@ -1,305 +0,0 @@
//! The desktop's animation setting on Linux and the BSDs.
//!
//! Asked of the XDG settings portal over D-Bus (`org.freedesktop.portal.Settings`), which GNOME,
//! KDE Plasma and the other desktops with a portal answer, inside Flatpak too. Three settings say
//! whether animations play ([`KEYS`]); any one of them saying no turns them off. Where no portal
//! answers, or it knows none of the three (a bare window manager), the user's own KDE and GTK
//! settings files are read instead, once.
//!
//! A thread asks at start-up and then follows the portal's change signal, so the UI's question is
//! always answered from memory and a change in the desktop's settings shows without a restart.
/// What a setting holds, whichever way it was stored.
#[derive(Clone, Debug, PartialEq)]
pub enum Reading {
Bool(bool),
Number(f64),
Text(String),
}
/// A setting as the portal names it: (namespace, key).
type Key = (&'static str, &'static str);
/// The cross-desktop preference: 1 asks for reduced motion; 0, and values not defined yet, are
/// no preference.
const REDUCED_MOTION: Key = ("org.freedesktop.appearance", "reduced-motion");
/// GNOME's switch, the one GTK follows.
const GNOME_ANIMATIONS: Key = ("org.gnome.desktop.interface", "enable-animations");
/// KDE Plasma's animation speed, a factor on every animation's length: 0 makes them instant.
const KDE_ANIMATION_SPEED: Key = ("org.kde.kdeglobals.KDE", "AnimationDurationFactor");
/// The settings that say whether animations play.
pub const KEYS: [Key; 3] = [REDUCED_MOTION, GNOME_ANIMATIONS, KDE_ANIMATION_SPEED];
/// Whether animations play according to one of [`KEYS`]; `None` for any other setting, or a
/// value that isn't one it holds.
pub fn says(namespace: &str, key: &str, value: &Reading) -> Option<bool> {
match (namespace, key) {
k if k == REDUCED_MOTION => number(value).map(|n| n != 1.0),
k if k == GNOME_ANIMATIONS => truth(value),
k if k == KDE_ANIMATION_SPEED => number(value).map(|n| n > 0.0),
_ => None,
}
}
fn number(value: &Reading) -> Option<f64> {
let n = match value {
Reading::Number(n) => *n,
Reading::Text(t) => t.trim().parse().ok()?,
Reading::Bool(_) => return None,
};
n.is_finite().then_some(n)
}
fn truth(value: &Reading) -> Option<bool> {
match value {
Reading::Bool(b) => Some(*b),
Reading::Number(n) => n.is_finite().then_some(*n != 0.0),
Reading::Text(t) => match t.trim().to_ascii_lowercase().as_str() {
"true" | "1" => Some(true),
"false" | "0" => Some(false),
_ => None,
},
}
}
/// Several settings' answers as one: off as soon as one says off, on when at least one says on,
/// `None` when none says anything.
pub fn combine(answers: impl IntoIterator<Item = Option<bool>>) -> Option<bool> {
let mut any = None;
for on in answers.into_iter().flatten() {
if !on {
return Some(false);
}
any = Some(true);
}
any
}
/// The value of `key` in `[section]` of a settings file in INI form (KDE's `kdeglobals`, GTK's
/// `settings.ini`). The last one wins, as the toolkits read it.
pub fn ini_value<'a>(text: &'a str, section: &str, key: &str) -> Option<&'a str> {
let mut inside = false;
let mut found = None;
for line in text.lines().map(str::trim) {
if let Some(name) = line.strip_prefix('[').and_then(|l| l.strip_suffix(']')) {
inside = name.trim() == section;
} else if inside
&& !line.starts_with(['#', ';'])
&& let Some((k, v)) = line.split_once('=')
&& k.trim() == key
{
found = Some(v.trim());
}
}
found
}
/// What the user's own settings files say, given their text (`None` for a file that isn't
/// there): KDE Plasma's `kdeglobals` and GTK's `settings.ini`s.
pub fn files_say(kdeglobals: Option<&str>, gtk_settings: [Option<&str>; 2]) -> Option<bool> {
let (namespace, key) = KDE_ANIMATION_SPEED;
let kde = kdeglobals.and_then(|text| ini_value(text, "KDE", key)).and_then(|v| says(namespace, key, &Reading::Text(v.to_string())));
let gtk = gtk_settings
.into_iter()
.map(|text| text.and_then(|t| ini_value(t, "Settings", "gtk-enable-animations")).and_then(|v| truth(&Reading::Text(v.to_string()))));
combine(std::iter::once(kde).chain(gtk))
}
#[cfg(all(unix, not(target_os = "macos")))]
pub use watching::watch;
#[cfg(all(unix, not(target_os = "macos")))]
mod watching {
use std::path::{Path, PathBuf};
use std::sync::Arc;
use std::sync::atomic::{AtomicU8, Ordering};
use zbus::blocking::{Connection, Proxy};
use zbus::zvariant::{OwnedValue, Value};
use super::{KEYS, Reading, combine, files_say, says};
// The latest answer, as one byte the UI thread reads without waiting.
const UNKNOWN: u8 = 0;
const ON: u8 = 1;
const OFF: u8 = 2;
/// Start following the desktop's animation setting. The returned function gives the latest
/// answer from memory (`None` until the first one arrives, and when the desktop says nothing);
/// `ctx` is asked to redraw when the answer changes.
pub fn watch(ctx: egui::Context) -> impl Fn() -> Option<bool> {
let latest = Arc::new(AtomicU8::new(UNKNOWN));
let shared = latest.clone();
let spawned = std::thread::Builder::new().name("animation-setting".into()).spawn(move || {
let publish = |answer: Option<bool>| {
let code = match answer {
Some(true) => ON,
Some(false) => OFF,
None => UNKNOWN,
};
if shared.swap(code, Ordering::Relaxed) != code {
ctx.request_repaint();
}
};
if let Err(e) = follow_portal(&publish) {
log::debug!("desktop animation setting: no settings portal ({e}); reading the settings files");
publish(read_files());
}
});
if let Err(e) = spawned {
log::warn!("desktop animation setting: {e}");
}
move || match latest.load(Ordering::Relaxed) {
ON => Some(true),
OFF => Some(false),
_ => None,
}
}
/// Publish what the settings portal says, now and after every change it announces, until the
/// connection ends; an error when there is no session bus to ask on. While the portal knows
/// none of the settings, the files' answer stands.
fn follow_portal(publish: &dyn Fn(Option<bool>)) -> zbus::Result<()> {
let connection = Connection::session()?;
let portal = Proxy::new(&connection, "org.freedesktop.portal.Desktop", "/org/freedesktop/portal/desktop", "org.freedesktop.portal.Settings")?;
// Listen before the first read, so a change between the two isn't missed.
let changes = portal.receive_signal("SettingChanged")?;
// The files are read once, the first time the portal has nothing to say.
let mut files = None;
let mut ask = || ask_portal(&portal).or_else(|| *files.get_or_insert_with(read_files));
publish(ask());
// A setting can turn up later (KDE's has no value while the speed is at its default), so
// the changes are followed whatever the portal knew at first. Every setting is asked
// again, not just the one announced: KDE announces a new animation speed only as the
// cross-desktop preference, and its own setting must not be left at the old value.
for change in changes {
let ours = change
.body()
.deserialize::<(String, String, OwnedValue)>()
.is_ok_and(|(namespace, key, _)| KEYS.contains(&(namespace.as_str(), key.as_str())));
if ours {
publish(ask());
}
}
Ok(())
}
/// What the portal's settings come to; `None` when it has none of them.
fn ask_portal(portal: &Proxy<'_>) -> Option<bool> {
combine(KEYS.map(|(namespace, key)| read_setting(portal, namespace, key).and_then(|value| says(namespace, key, &value))))
}
/// One setting from the portal; `None` when it doesn't have it.
fn read_setting(portal: &Proxy<'_>, namespace: &str, key: &str) -> Option<Reading> {
// `ReadOne` is the current call; portals from before it only have `Read`.
let value: OwnedValue = portal.call("ReadOne", &(namespace, key)).or_else(|_| portal.call("Read", &(namespace, key))).ok()?;
reading(&value, 0)
}
fn reading(value: &Value<'_>, depth: u8) -> Option<Reading> {
Some(match value {
Value::Bool(b) => Reading::Bool(*b),
Value::U8(n) => Reading::Number(f64::from(*n)),
Value::I16(n) => Reading::Number(f64::from(*n)),
Value::U16(n) => Reading::Number(f64::from(*n)),
Value::I32(n) => Reading::Number(f64::from(*n)),
Value::U32(n) => Reading::Number(f64::from(*n)),
Value::I64(n) => Reading::Number(*n as f64),
Value::U64(n) => Reading::Number(*n as f64),
Value::F64(n) => Reading::Number(*n),
Value::Str(s) => Reading::Text(s.as_str().to_string()),
// `Read` wraps its answer in a second variant.
Value::Value(inner) if depth < 4 => return reading(inner, depth + 1),
_ => return None,
})
}
/// What the user's settings files say (see [`files_say`]).
fn read_files() -> Option<bool> {
let config = std::env::var_os("XDG_CONFIG_HOME")
.filter(|dir| !dir.is_empty())
.map(PathBuf::from)
.or_else(|| std::env::var_os("HOME").map(|home| PathBuf::from(home).join(".config")))?;
let text = |file: &str| read_capped(&config.join(file));
let (kdeglobals, gtk4, gtk3) = (text("kdeglobals"), text("gtk-4.0/settings.ini"), text("gtk-3.0/settings.ini"));
files_say(kdeglobals.as_deref(), [gtk4.as_deref(), gtk3.as_deref()])
}
/// A settings file's text: at most 256 KiB of it (they are a few kilobytes).
fn read_capped(path: &Path) -> Option<String> {
use std::io::Read as _;
let mut text = String::new();
std::fs::File::open(path).ok()?.take(256 * 1024).read_to_string(&mut text).ok()?;
Some(text)
}
}
#[cfg(test)]
mod tests {
use super::*;
fn text(s: &str) -> Reading {
Reading::Text(s.to_string())
}
/// Each desktop's setting, as the portal hands it over, comes to animations on or off.
#[test]
fn each_desktop_setting_says_on_or_off() {
let ((appearance, reduced), (gnome, enable), (kde, factor)) = (REDUCED_MOTION, GNOME_ANIMATIONS, KDE_ANIMATION_SPEED);
assert_eq!(KEYS, [REDUCED_MOTION, GNOME_ANIMATIONS, KDE_ANIMATION_SPEED]);
// The cross-desktop preference: only 1 asks for reduced motion.
assert_eq!(says(appearance, reduced, &Reading::Number(1.0)), Some(false));
assert_eq!(says(appearance, reduced, &Reading::Number(0.0)), Some(true));
assert_eq!(says(appearance, reduced, &Reading::Number(7.0)), Some(true), "a value not defined yet is no preference");
assert_eq!(says(appearance, reduced, &Reading::Bool(true)), None);
// GNOME's switch.
assert_eq!(says(gnome, enable, &Reading::Bool(false)), Some(false));
assert_eq!(says(gnome, enable, &Reading::Bool(true)), Some(true));
assert_eq!(says(gnome, enable, &text("nonsense")), None);
// KDE Plasma's animation speed arrives as text: 0 is instant.
assert_eq!(says(kde, factor, &text("0")), Some(false));
assert_eq!(says(kde, factor, &text(" 0.5 ")), Some(true));
assert_eq!(says(kde, factor, &Reading::Number(1.0)), Some(true));
for junk in [text(""), text("fast"), Reading::Number(f64::NAN), text("inf")] {
assert_eq!(says(kde, factor, &junk), None, "{junk:?}");
}
// Any other setting says nothing.
assert_eq!(says(gnome, "color-scheme", &Reading::Bool(false)), None);
assert_eq!(says("org.example", enable, &Reading::Bool(false)), None);
}
/// One setting saying off is enough; none saying anything is no answer.
#[test]
fn any_setting_saying_off_turns_animations_off() {
assert_eq!(combine([]), None);
assert_eq!(combine([None, None]), None);
assert_eq!(combine([None, Some(true)]), Some(true));
assert_eq!(combine([Some(true), None, Some(false)]), Some(false));
assert_eq!(combine([Some(false), Some(true)]), Some(false));
}
/// Without a portal the user's own settings files answer: KDE's animation speed and GTK's
/// `gtk-enable-animations`.
#[test]
fn settings_files_answer_without_a_portal() {
let kde_instant = "[General]\nColorScheme=Breeze\n\n[KDE]\nAnimationDurationFactor=0\nSingleClick=false\n";
let kde_slow = "[KDE]\nAnimationDurationFactor = 2\n";
let gtk_off = "[Settings]\ngtk-theme-name=Adwaita\ngtk-enable-animations=0\n";
let gtk_on = "# written by hand\n[Settings]\ngtk-enable-animations=true\n";
assert_eq!(files_say(None, [None, None]), None);
assert_eq!(files_say(Some("[KDE]\nSingleClick=false\n"), [Some("[Settings]\n"), None]), None, "files that don't mention it");
assert_eq!(files_say(Some(kde_instant), [None, None]), Some(false));
assert_eq!(files_say(Some(kde_slow), [None, None]), Some(true));
assert_eq!(files_say(None, [Some(gtk_off), None]), Some(false));
assert_eq!(files_say(None, [None, Some(gtk_on)]), Some(true));
assert_eq!(files_say(Some(kde_slow), [Some(gtk_on), Some(gtk_off)]), Some(false), "one file saying off is enough");
// The key counts only in its own section, comments don't, and the last value wins.
assert_eq!(ini_value("[Other]\nAnimationDurationFactor=0\n[KDE]\nSingleClick=true\n", "KDE", "AnimationDurationFactor"), None);
assert_eq!(ini_value("[KDE]\n#AnimationDurationFactor=0\n;AnimationDurationFactor=0\n", "KDE", "AnimationDurationFactor"), None);
assert_eq!(ini_value("[KDE]\r\nAnimationDurationFactor=0\r\nAnimationDurationFactor=1\r\n", "KDE", "AnimationDurationFactor"), Some("1"));
assert_eq!(ini_value("AnimationDurationFactor=0\n", "KDE", "AnimationDurationFactor"), None, "outside any section");
assert_eq!(ini_value("", "KDE", "AnimationDurationFactor"), None);
}
}
-66
View File
@@ -1,66 +0,0 @@
//! macOS open-documents and quit Apple events (#27).
//!
//! Finder double-clicks, Open With, drops on the Dock icon and `open -a WordCraft letter.docx` don't
//! pass paths on the command line: LaunchServices sends the running (or just-launched) app a
//! `kAEOpenDocuments` ('odoc') Apple event. winit 0.30 doesn't handle it and owns the
//! `NSApplicationDelegate`, so AppKit answered "WordCraft cannot open files in the Word Document
//! format". Handling it ourselves needs Objective-C class declarations, i.e. `unsafe`, which this
//! workspace forbids. The `fmv-macos-events` crate (also used by PdfCraft and PhotoCraft)
//! wraps exactly that, an `NSAppleEventManager` handler registered before Finder's launch event
//! that leaves winit's delegate alone, behind a safe main-thread API.
use fmv_macos_events::{Event, Inbox, Registration};
use wordcraft_ui_egui::WordApp;
/// Keeps the Apple-event handlers registered; hold it until the event loop returns.
pub struct AppleEvents {
_registration: Registration,
inbox: Inbox,
}
impl AppleEvents {
/// Register the handlers. Call on the main thread before the event loop starts, so the event
/// that launched the app (a Finder double-click) is caught too.
pub fn install() -> Self {
let (registration, inbox) = Registration::install();
Self { _registration: registration, inbox }
}
/// The queue the app drains every frame ([`poll`]); events arriving later wake `ctx`.
pub fn connect(&self, ctx: &egui::Context) -> Inbox {
let ctx = ctx.clone();
self.inbox.set_wake(move || ctx.request_repaint());
self.inbox.clone()
}
}
/// Open the documents and act on the quit requests that arrived since the last frame. A document
/// opens like File › Open: beside the open ones, in place of an untouched blank one, or, when it
/// is already open, by showing it; a Word template starts a new document based on it, as Word's
/// default verb for one does (#3433). Quitting closes the window, which asks about every document
/// with unsaved changes.
pub fn poll(inbox: &Inbox, app: &mut WordApp, ctx: &egui::Context) {
for e in inbox.drain() {
match e {
Event::Open(paths) => {
for p in paths.iter().filter_map(|p| p.to_str()) {
match app.open_from_platform(p, None) {
// Leave Backstage, as opening from the Open dialog does.
Ok(_) => app.ui.backstage = false,
Err(e) => {
app.report_open_failure(p, &e);
// Backstage hides the status bar, so leave it to show the error.
app.ui.backstage = false;
}
}
}
}
// Quitting asks about every document with unsaved changes, each in its window; the
// app closes once that's done (`quit_requested`).
Event::Quit => {
app.quit();
ctx.request_repaint();
}
}
}
}
-852
View File
@@ -1,852 +0,0 @@
//! The system clipboard beyond egui's text (#45, #584, #687, #833): text for the ribbon's Paste,
//! another program's formatted copy (HTML, and RTF where the platform offers it), pictures and
//! copied files, and the names of the formats there for a paste that finds nothing it can use.
//!
//! On Linux, arboard talks to Wayland compositors through the data-control protocol (KDE Plasma,
//! wlroots compositors); without it, a native Wayland window only sees what the compositor copies
//! over to Xwayland, which KWin does only while an X11 window has focus — so pictures copied in a
//! browser or Spectacle never arrived (#833). Compositors without the protocol fall back to X11.
//!
//! Everything read here comes from other programs: sizes are capped as it is read.
//!
//! Written here: a copy puts HTML beside its text, so other programs keep its formatting (#1523),
//! with equations as MathML (#816). arboard sets HTML with a text alternative on every desktop
//! platform. A copy of one equation alone also goes in the platform's MathML formats (#1297),
//! added beside arboard's: on Windows "MathML" and "MathML Presentation" (UTF-16LE), on macOS
//! `public.mathml.presentation` and `public.mathml` — the names W3C MathML 3 §6.2.4 registers
//! for transferring MathML, and the ones Microsoft documents its Office apps reading first when
//! they paste math (learn.microsoft.com/office/math/mathml, "Clipboard support"). Pasting into
//! Word and LibreOffice is not yet verified. Linux and the BSDs have no Word, and arboard can't
//! add MIME types of other names, so there the HTML carries the MathML alone.
//!
//! RTF goes beside them where we can add it: Windows ("Rich Text Format") and macOS
//! (`public.rtf`) after arboard's HTML, Wayland (`text/rtf`) in one offer with the text and HTML.
//! On X11 arboard owns the selection and serves only its own targets, so a copy there carries text
//! and HTML only; reading another program's RTF works on all four.
use wordcraft_engine::cmd::paste::MAX_PASTE_BYTES;
use wordcraft_ui_egui::paste_picture::ClipboardPicture;
fn open() -> Option<arboard::Clipboard> {
arboard::Clipboard::new().map_err(|e| log::warn!("clipboard: {e}")).ok()
}
thread_local! {
/// The clipboard copies are set through, kept open: on X11 the contents are served from it.
static WRITER: std::cell::RefCell<Option<arboard::Clipboard>> = const { std::cell::RefCell::new(None) };
}
/// Put a copy on the clipboard: `text`, with `html` and `rtf` beside it where the platform takes
/// them (an empty one isn't offered), and `mathml` (a copy of one equation alone; empty for any
/// other copy) in the platform's MathML formats. `false` when the text and HTML couldn't be set
/// (the caller copies the text alone), including a Wayland session without the data-control
/// protocol, where arboard would fall back to X11 and native Wayland programs might not see it.
/// RTF or MathML that can't be added is logged: the HTML still carries the copy.
pub fn set_rich(text: &str, html: &str, rtf: &str, mathml: &str) -> bool {
// Wayland: one offer with the text, HTML and RTF (no MathML formats there; see above).
if platform::set_rich(text, html, rtf) {
return true;
}
if !platform::can_set() {
return false;
}
let set = set_html_text(html, text);
if set && !rtf.is_empty() {
platform::add_rtf(rtf);
}
if set && !mathml.is_empty() && mathml.len() <= MAX_PASTE_BYTES {
platform::add_mathml(mathml);
}
set
}
/// Write HTML and plain text to the system clipboard via the cached writer slot, recording ownership.
fn set_html_text(html: &str, text: &str) -> bool {
WRITER.with(|w| {
let Ok(mut slot) = w.try_borrow_mut() else { return false };
if slot.is_none() {
*slot = open();
}
let set = slot.as_mut().map(|c| if html.is_empty() { c.set_text(text) } else { c.set().html(html, Some(text)) });
match set {
Some(Ok(())) => {
platform::record_own();
true
}
Some(Err(e)) => {
log::warn!("clipboard: {e}");
*slot = None;
false
}
None => false,
}
})
}
/// Put a copied picture on the clipboard: its pixels, with HTML and text beside it where the
/// platform takes them. `false` when it couldn't be set.
pub fn set_image(image: &wordcraft_ui_egui::system_clipboard::CopyImage, html: &str, text: &str) -> bool {
if platform::set_image(image, html, text) {
return true;
}
if !platform::can_set() {
return false;
}
let set = set_image_arboard(image);
if set {
platform::after_set_image(image, html, text);
}
set
}
/// Write image pixels to the clipboard through arboard.
fn set_image_arboard(image: &wordcraft_ui_egui::system_clipboard::CopyImage) -> bool {
WRITER.with(|w| {
let Ok(mut slot) = w.try_borrow_mut() else { return false };
if slot.is_none() {
*slot = open();
}
let img = arboard::ImageData { width: image.width, height: image.height, bytes: std::borrow::Cow::Borrowed(&image.rgba) };
let set = slot.as_mut().map(|c| c.set().image(img));
match set {
Some(Ok(())) => {
platform::record_own();
true
}
Some(Err(e)) => {
log::warn!("clipboard image: {e}");
*slot = None;
false
}
None => false,
}
})
}
/// Whether the system clipboard still holds WordCraft's last copy.
pub fn is_own() -> bool {
platform::is_own()
}
/// Wrap HTML in the Windows CF_HTML header format required by clipboard readers.
///
/// Offsets are byte offsets from the start of the payload; `EndHTML` excludes the trailing NUL.
#[cfg(any(target_os = "windows", test))]
fn wrap_cf_html(ctn: &str) -> Vec<u8> {
let h_version = "Version:0.9";
let h_start_html = "\r\nStartHTML:";
let h_end_html = "\r\nEndHTML:";
let h_start_frag = "\r\nStartFragment:";
let h_end_frag = "\r\nEndFragment:";
let c_start_frag = "\r\n<html>\r\n<body>\r\n<!--StartFragment-->\r\n";
let c_end_frag = "\r\n<!--EndFragment-->\r\n</body>\r\n</html>\0";
let h_len = h_version.len() + h_start_html.len() + 10 + h_end_html.len() + 10 + h_start_frag.len() + 10 + h_end_frag.len() + 10;
let n_start_html = h_len + 2;
let n_start_frag = h_len + c_start_frag.len();
let n_end_frag = n_start_frag + ctn.len();
let n_end_html = n_end_frag + c_end_frag.len() - 1;
let header = format!(
"{h_version}{h_start_html}{n_start_html:010}{h_end_html}{n_end_html:010}{h_start_frag}{n_start_frag:010}{h_end_frag}{n_end_frag:010}{c_start_frag}{ctn}{c_end_frag}"
);
header.into_bytes()
}
/// The clipboard's text.
pub fn text() -> Option<String> {
open()?.get_text().ok()
}
/// The clipboard's HTML (Windows: the fragment of its "HTML Format"), if not too large.
pub fn html() -> Option<String> {
open()?.get().html().ok().filter(|h| h.len() <= MAX_PASTE_BYTES)
}
/// The clipboard's RTF: Windows ("Rich Text Format"), macOS (`public.rtf`), Wayland and X11
/// (`text/rtf`); not offered by arboard, so read here.
pub fn rtf() -> Option<String> {
let bytes = platform::rtf()?;
if bytes.len() > MAX_PASTE_BYTES {
return None;
}
// RTF is 7-bit by the spec; stray 8-bit bytes become replacement characters.
let s = String::from_utf8_lossy(&bytes).trim_end_matches('\0').to_string();
s.trim_start().starts_with("{\\rtf").then_some(s)
}
/// The names of the formats on the clipboard, where the platform lists them (Wayland, Windows).
pub fn formats() -> Vec<String> {
platform::formats()
}
/// The picture on the clipboard: copied files, else image pixels, else (Wayland) an encoded
/// picture in a format arboard doesn't decode. A picture that is there but can't be read says
/// why (#833). The UI checks the sizes before inserting anything; on Windows and Wayland they are
/// checked from the header before anything is decoded (#3623).
pub fn picture() -> Option<ClipboardPicture> {
let mut clipboard = match arboard::Clipboard::new() {
Ok(c) => c,
Err(e) => {
log::warn!("clipboard: {e}");
return Some(ClipboardPicture::Unreadable(format!("the system clipboard couldn't be opened ({e})")));
}
};
if let Ok(files) = clipboard.get().file_list()
&& !files.is_empty()
{
return Some(ClipboardPicture::Files(files));
}
decoded_picture(&mut clipboard)
}
/// The clipboard's picture on Windows, read past arboard, which decodes the PNG and DIB formats
/// with no size limits (#3623).
#[cfg(target_os = "windows")]
fn decoded_picture(_: &mut arboard::Clipboard) -> Option<ClipboardPicture> {
platform::picture()
}
/// The picture arboard decodes from the clipboard, else an encoded one read past it.
#[cfg(not(target_os = "windows"))]
fn decoded_picture(clipboard: &mut arboard::Clipboard) -> Option<ClipboardPicture> {
#[cfg(all(unix, not(any(target_os = "macos", target_os = "android", target_os = "emscripten"))))]
if let Some(picture) = platform::picture() {
return Some(picture);
}
match clipboard.get_image() {
Ok(image) => Some(ClipboardPicture::Pixels { width: image.width, height: image.height, rgba: image.bytes.into_owned() }),
Err(arboard::Error::ContentNotAvailable) => platform::encoded_picture().map(ClipboardPicture::Encoded),
Err(arboard::Error::ConversionFailure) => Some(
platform::encoded_picture()
.map(ClipboardPicture::Encoded)
.unwrap_or_else(|| ClipboardPicture::Unreadable("WordCraft can't decode its format".into())),
),
Err(e) => {
log::warn!("clipboard picture: {e}");
platform::encoded_picture().map(ClipboardPicture::Encoded).or(Some(ClipboardPicture::Unreadable(e.to_string())))
}
}
}
/// Picture types read straight from Wayland when arboard (PNG only) finds none, best first.
#[cfg(all(unix, not(any(target_os = "macos", target_os = "android", target_os = "emscripten"))))]
const PICTURE_MIMES: [&str; 6] = ["image/png", "image/jpeg", "image/gif", "image/webp", "image/bmp", "image/x-bmp"];
#[cfg(all(unix, not(any(target_os = "macos", target_os = "android", target_os = "emscripten"))))]
mod platform {
use std::io::Read;
use wl_clipboard_rs::paste::{ClipboardType, MimeType, Seat, get_contents, get_mime_types_ordered};
use wordcraft_ui_egui::paste_picture::ClipboardPicture;
fn wayland() -> bool {
std::env::var_os("WAYLAND_DISPLAY").is_some()
}
/// One MIME type's bytes, at most `cap`; `None` when absent or larger.
fn read(mime: &str, cap: u64) -> Option<Vec<u8>> {
let (pipe, _) = get_contents(ClipboardType::Regular, Seat::Unspecified, MimeType::Specific(mime)).ok()?;
let mut out = Vec::new();
pipe.take(cap.saturating_add(1)).read_to_end(&mut out).ok()?;
(out.len() as u64 <= cap).then_some(out)
}
pub fn formats() -> Vec<String> {
if !wayland() {
return Vec::new();
}
get_mime_types_ordered(ClipboardType::Regular, Seat::Unspecified).unwrap_or_default()
}
const OWNER_MIME: &str = "application/x-wordcraft-owner";
/// Process-unique ownership token placed into Wayland clipboard offers.
fn owner_token() -> [u8; 16] {
static TOKEN: std::sync::OnceLock<[u8; 16]> = std::sync::OnceLock::new();
*TOKEN.get_or_init(|| {
let mut b = [0u8; 16];
let _ = getrandom::fill(&mut b);
b
})
}
static X11_OWNER: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0);
/// Record clipboard ownership for X11 selection tracking.
pub fn record_own() {
if !wayland() {
let win = x11::owner_window().unwrap_or(0);
X11_OWNER.store(win, std::sync::atomic::Ordering::Relaxed);
}
}
/// Whether WordCraft still owns the Wayland offer or X11 selection.
pub fn is_own() -> bool {
if wayland() {
if formats().iter().any(|m| m == OWNER_MIME) { read(OWNER_MIME, 16).is_some_and(|b| b == owner_token()) } else { false }
} else {
let current = x11::owner_window().unwrap_or(0);
let recorded = X11_OWNER.load(std::sync::atomic::Ordering::Relaxed);
recorded != 0 && current == recorded
}
}
/// Whether arboard sets the clipboard natively: X11, or Wayland with data-control.
pub fn can_set() -> bool {
!wayland()
|| !matches!(
get_mime_types_ordered(ClipboardType::Regular, Seat::Unspecified),
Err(wl_clipboard_rs::paste::Error::MissingProtocol { .. } | wl_clipboard_rs::paste::Error::WaylandConnection(_))
)
}
/// Put the copy on a Wayland clipboard in one offer: the text (with the usual plain-text
/// aliases), HTML and RTF, served from a background thread until something else is copied.
/// `false` outside Wayland (X11 goes through arboard) or without the data-control protocol.
pub fn set_rich(text: &str, html: &str, rtf: &str) -> bool {
use wl_clipboard_rs::copy::{MimeSource, MimeType, Options, Source};
if !wayland() {
return false;
}
let offer = |mime: &str, data: &str| MimeSource { source: Source::Bytes(data.as_bytes().into()), mime_type: MimeType::Specific(mime.into()) };
// The text first: the plain-text aliases serve the first text type offered.
let mut sources = vec![offer("text/plain;charset=utf-8", text)];
for (mime, data) in [("text/html", html), ("text/rtf", rtf)] {
if !data.is_empty() {
sources.push(offer(mime, data));
}
}
sources.push(MimeSource { source: Source::Bytes(owner_token().to_vec().into()), mime_type: MimeType::Specific(OWNER_MIME.into()) });
match Options::new().copy_multi(sources) {
Ok(()) => true,
Err(e) => {
log::warn!("clipboard: {e}");
false
}
}
}
/// Put a copied picture on the Wayland clipboard alongside HTML, text, and ownership token.
pub fn set_image(image: &wordcraft_ui_egui::system_clipboard::CopyImage, html: &str, text: &str) -> bool {
use wl_clipboard_rs::copy::{MimeSource, MimeType, Options, Source};
if !wayland() {
return false;
}
let Ok(png) = wordcraft_ui_egui::paste_picture::png_from_rgba(image.width, image.height, image.rgba.clone()) else {
return false;
};
let offer = |mime: &str, data: &str| MimeSource { source: Source::Bytes(data.as_bytes().into()), mime_type: MimeType::Specific(mime.into()) };
let mut sources = vec![MimeSource { source: Source::Bytes(png.into()), mime_type: MimeType::Specific("image/png".into()) }];
if !text.is_empty() {
sources.push(offer("text/plain;charset=utf-8", text));
}
if !html.is_empty() {
sources.push(offer("text/html", html));
}
sources.push(MimeSource { source: Source::Bytes(owner_token().to_vec().into()), mime_type: MimeType::Specific(OWNER_MIME.into()) });
match Options::new().copy_multi(sources) {
Ok(()) => true,
Err(e) => {
log::warn!("clipboard image: {e}");
false
}
}
}
/// Additional formats to register after setting image via arboard on Unix.
pub fn after_set_image(_image: &wordcraft_ui_egui::system_clipboard::CopyImage, _html: &str, _text: &str) {}
/// Wayland copies carry their RTF already; X11 ones can't (see the module docs).
pub fn add_rtf(_rtf: &str) {}
/// RTF types a clipboard may offer, best first.
const RTF_MIMES: [&str; 3] = ["text/rtf", "application/rtf", "text/richtext"];
/// The RTF type to ask for among those `offered`.
fn rtf_target(offered: &[String]) -> Option<&'static str> {
RTF_MIMES.into_iter().find(|m| offered.iter().any(|o| o == m))
}
/// arboard serves its own MIME types only; Word, which reads the MathML formats, isn't here.
pub fn add_mathml(_mathml: &str) {}
pub fn rtf() -> Option<Vec<u8>> {
if !wayland() {
return std::env::var_os("DISPLAY").is_some().then(|| x11::rtf(super::MAX_PASTE_BYTES)).flatten();
}
let mime = rtf_target(&formats())?;
read(mime, super::MAX_PASTE_BYTES as u64)
}
pub fn encoded_picture() -> Option<Vec<u8>> {
if !wayland() {
return None;
}
let offered = formats();
let mime = super::PICTURE_MIMES.into_iter().find(|m| offered.iter().any(|o| o == m))?;
read(mime, wordcraft_ui_egui::paste_picture::MAX_FILE_BYTES)
}
/// Whether a property read of `len` bytes, with `bytes_after` left unread, is the whole value
/// and at most `cap` bytes.
fn complete(len: usize, bytes_after: u32, cap: usize) -> bool {
bytes_after == 0 && len <= cap
}
/// Reading another program's RTF on X11, which arboard doesn't offer: ask the CLIPBOARD
/// selection's owner for its targets, then for its RTF, into a property of a hidden window.
mod x11 {
use std::time::{Duration, Instant};
use x11rb::connection::Connection;
use x11rb::protocol::Event;
use x11rb::protocol::xproto::{Atom, AtomEnum, ConnectionExt as _, CreateWindowAux, GetPropertyReply, Window, WindowClass};
use x11rb::rust_connection::RustConnection;
/// How long a paste waits for the selection's owner, in all.
const TIMEOUT: Duration = Duration::from_secs(1);
/// Most targets looked at.
const MAX_TARGETS: usize = 128;
struct Reader {
conn: RustConnection,
win: Window,
clipboard: Atom,
prop: Atom,
deadline: Instant,
}
fn atom(conn: &RustConnection, name: &str) -> Option<Atom> {
conn.intern_atom(false, name.as_bytes()).ok()?.reply().ok().map(|r| r.atom)
}
impl Reader {
fn new() -> Option<Self> {
let (conn, screen) = x11rb::connect(None).ok()?;
let root = conn.setup().roots.get(screen)?.root;
let win = conn.generate_id().ok()?;
conn.create_window(0, win, root, 0, 0, 1, 1, 0, WindowClass::INPUT_ONLY, x11rb::COPY_FROM_PARENT, &CreateWindowAux::new()).ok()?;
let clipboard = atom(&conn, "CLIPBOARD")?;
let prop = atom(&conn, "WORDCRAFT_PASTE")?;
Some(Self { conn, win, clipboard, prop, deadline: Instant::now() + TIMEOUT })
}
/// The selection converted to `target`, at most `cap` bytes; `None` when the owner
/// refuses or doesn't answer in time. A longer value is `None` when `whole`, else
/// its first `cap` bytes.
fn convert(&self, target: Atom, cap: usize, whole: bool) -> Option<GetPropertyReply> {
self.conn.convert_selection(self.win, self.clipboard, target, self.prop, x11rb::CURRENT_TIME).ok()?;
self.conn.flush().ok()?;
loop {
// Checked every time round, so a stream of other events can't keep us here.
if Instant::now() >= self.deadline {
return None;
}
match self.conn.poll_for_event().ok()? {
Some(Event::SelectionNotify(e)) if e.requestor == self.win => {
if e.property == x11rb::NONE {
return None;
}
break;
}
Some(_) => {}
None => std::thread::sleep(Duration::from_millis(5)),
}
}
// In 32-bit units; for a whole value one more than the cap, so a larger one shows
// as `bytes_after`.
let units = u32::try_from(cap / 4 + usize::from(whole)).unwrap_or(u32::MAX);
let r = self.conn.get_property(true, self.win, self.prop, AtomEnum::ANY, 0, units).ok()?.reply().ok()?;
(!whole || super::complete(r.value.len(), r.bytes_after, cap)).then_some(r)
}
}
impl Drop for Reader {
fn drop(&mut self) {
let _ = self.conn.destroy_window(self.win);
let _ = self.conn.flush();
}
}
/// The CLIPBOARD selection's RTF, at most `cap` bytes. Copies too large to send at once
/// arrive in pieces (INCR), which aren't read: `None` then.
pub fn rtf(cap: usize) -> Option<Vec<u8>> {
let r = Reader::new()?;
// The first targets only: a longer list is cut short, not refused.
let targets = r.convert(atom(&r.conn, "TARGETS")?, MAX_TARGETS.saturating_mul(4), false)?;
let cookies: Vec<_> = targets.value32()?.take(MAX_TARGETS).filter_map(|a| r.conn.get_atom_name(a).ok()).collect();
let names: Vec<String> =
cookies.into_iter().filter_map(|c| c.reply().ok()).map(|n| String::from_utf8_lossy(&n.name).into_owned()).collect();
let target = atom(&r.conn, super::rtf_target(&names)?)?;
let incr = atom(&r.conn, "INCR")?;
let reply = r.convert(target, cap, true)?;
(reply.type_ != incr).then_some(reply.value)
}
/// Query X11 for the current window id owning the CLIPBOARD selection.
pub fn owner_window() -> Option<Window> {
let (conn, _) = x11rb::connect(None).ok()?;
let clipboard = atom(&conn, "CLIPBOARD")?;
let reply = conn.get_selection_owner(clipboard).ok()?.reply().ok()?;
(reply.owner != x11rb::NONE).then_some(reply.owner)
}
}
/// The Wayland clipboard's picture, read encoded under the paste's byte cap and refused from
/// its header when a paste can't take its size, before anything decodes it. arboard decodes
/// and converts the PNG to RGBA with no size limits. `None` when Wayland offers no picture
/// (or isn't reachable): arboard is asked then, which also covers X11.
pub fn picture() -> Option<ClipboardPicture> {
if !wayland() {
return None;
}
let offered = formats();
let mime = super::PICTURE_MIMES.into_iter().find(|m| offered.iter().any(|o| o == m))?;
Some(match read(mime, wordcraft_ui_egui::paste_picture::MAX_FILE_BYTES) {
Some(bytes) => wordcraft_ui_egui::paste_picture::encoded_picture(bytes),
None => ClipboardPicture::Unreadable("the clipboard picture is larger than 200 MB, or couldn't be read".into()),
})
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn rtf_target_prefers_text_rtf() {
let names = |n: &[&str]| n.iter().map(|s| s.to_string()).collect::<Vec<_>>();
assert_eq!(rtf_target(&names(&["TARGETS", "text/richtext", "application/rtf", "text/rtf"])), Some("text/rtf"));
assert_eq!(rtf_target(&names(&["text/richtext", "UTF8_STRING"])), Some("text/richtext"));
assert_eq!(rtf_target(&names(&["text/html", "text/rtf;charset=x"])), None);
assert_eq!(rtf_target(&[]), None);
}
#[test]
fn property_reads_must_be_whole_and_capped() {
assert!(complete(10, 0, 10));
assert!(!complete(11, 0, 10), "over the cap");
assert!(!complete(8, 4, 10), "more left to read");
assert!(complete(0, 0, 0));
}
}
}
#[cfg(target_os = "windows")]
mod platform {
use clipboard_win::{Clipboard, EnumFormats, raw};
use wordcraft_ui_egui::paste_picture::{self, ClipboardPicture};
pub fn formats() -> Vec<String> {
let Ok(_open) = Clipboard::new_attempts(10) else { return Vec::new() };
// Standard formats are named too (CF_BITMAP, CF_UNICODETEXT…).
EnumFormats::new().take(64).filter_map(raw::format_name_big).collect()
}
pub fn rtf() -> Option<Vec<u8>> {
let format = raw::register_format("Rich Text Format")?;
let _open = Clipboard::new_attempts(10).ok()?;
if raw::size(format.get()).is_none_or(|n| n.get() > super::MAX_PASTE_BYTES) {
return None;
}
let mut out = Vec::new();
raw::get_vec(format.get(), &mut out).ok()?;
Some(out)
}
/// The clipboard's picture, read without arboard: its "PNG" format as it is, else a DIB as
/// pixels, each refused from its header when a paste can't take its size (#3623). None when
/// it holds neither.
pub fn picture() -> Option<ClipboardPicture> {
use clipboard_win::formats::{CF_DIB, CF_DIBV5};
let Ok(_open) = Clipboard::new_attempts(10) else {
return Some(ClipboardPicture::Unreadable("the system clipboard couldn't be opened".into()));
};
if let Some(png) = raw::register_format("PNG").map(|f| f.get()).filter(|&f| raw::is_format_avail(f)) {
return Some(read(png).map_or_else(ClipboardPicture::Unreadable, paste_picture::encoded_picture));
}
let dib = [CF_DIBV5, CF_DIB].into_iter().find(|&f| raw::is_format_avail(f))?;
Some(read(dib).map_or_else(ClipboardPicture::Unreadable, paste_picture::dib_picture))
}
/// A clipboard format's bytes, refused past the largest picture a paste takes.
fn read(format: u32) -> Result<Vec<u8>, String> {
match raw::size(format) {
Some(n) if n.get() as u64 <= paste_picture::MAX_FILE_BYTES => {}
Some(_) => return Err("the clipboard picture is larger than 200 MB".into()),
None => return Err("the clipboard picture is empty".into()),
}
let mut out = Vec::new();
raw::get_vec(format, &mut out).map_err(|e| e.to_string())?;
Ok(out)
}
const OWNER_FORMAT: &str = "WordCraft Copy Owner";
/// Process-unique ownership token placed into Windows clipboard marker.
fn owner_token() -> [u8; 16] {
static TOKEN: std::sync::OnceLock<[u8; 16]> = std::sync::OnceLock::new();
*TOKEN.get_or_init(|| {
let mut b = [0u8; 16];
let _ = getrandom::fill(&mut b);
b
})
}
/// Record clipboard ownership for Windows clipboard.
pub fn record_own() {
let Some(format) = raw::register_format(OWNER_FORMAT) else { return };
let Ok(_open) = Clipboard::new_attempts(10) else { return };
let _ = raw::set_without_clear(format.get(), &owner_token());
}
/// Whether WordCraft still owns the Windows clipboard contents.
pub fn is_own() -> bool {
let Some(format) = raw::register_format(OWNER_FORMAT) else { return false };
let Ok(_open) = Clipboard::new_attempts(10) else { return false };
if !raw::is_format_avail(format.get()) {
return false;
}
let mut out = Vec::new();
if raw::get_vec(format.get(), &mut out).is_err() {
return false;
}
out == owner_token()
}
/// Windows supports clipboard setting via arboard and clipboard_win.
pub fn can_set() -> bool {
true
}
/// arboard sets the text and HTML.
pub fn set_rich(_text: &str, _html: &str, _rtf: &str) -> bool {
false
}
/// Windows sets the primary image through arboard and supplements via [`after_set_image`].
pub fn set_image(_image: &wordcraft_ui_egui::system_clipboard::CopyImage, _html: &str, _text: &str) -> bool {
false
}
/// Add PNG and CF_HTML formats alongside arboard's image, then mark ownership.
pub fn after_set_image(image: &wordcraft_ui_egui::system_clipboard::CopyImage, html: &str, _text: &str) {
if let Ok(png) = wordcraft_ui_egui::paste_picture::png_from_rgba(image.width, image.height, image.rgba.clone())
&& let Some(format) = raw::register_format("PNG")
&& let Ok(_open) = Clipboard::new_attempts(10)
{
let _ = raw::set_without_clear(format.get(), &png);
}
if !html.is_empty()
&& let Some(format) = raw::register_format("HTML Format")
&& let Ok(_open) = Clipboard::new_attempts(10)
{
let cf = super::wrap_cf_html(html);
let _ = raw::set_without_clear(format.get(), &cf);
}
record_own();
}
/// Add "Rich Text Format" to what arboard just set, NUL-terminated as is usual.
pub fn add_rtf(rtf: &str) {
let Some(format) = raw::register_format("Rich Text Format") else { return };
let Ok(_open) = Clipboard::new_attempts(10) else { return };
let mut bytes = Vec::with_capacity(rtf.len().saturating_add(1));
bytes.extend_from_slice(rtf.as_bytes());
bytes.push(0);
if let Err(e) = raw::set_without_clear(format.get(), &bytes) {
log::warn!("clipboard RTF: {e}");
}
}
/// Add the MathML to what arboard just set, as "MathML" and "MathML Presentation": UTF-16LE
/// text (with its terminating NUL, as Windows text formats have).
pub fn add_mathml(mathml: &str) {
let Ok(_open) = Clipboard::new_attempts(10) else {
log::warn!("clipboard: couldn't open it to add MathML");
return;
};
let bytes: Vec<u8> = mathml.encode_utf16().chain(std::iter::once(0)).flat_map(u16::to_le_bytes).collect();
for name in super::MATHML_FORMATS {
let Some(format) = raw::register_format(name) else { continue };
if let Err(e) = raw::set_without_clear(format.get(), &bytes) {
log::warn!("clipboard: {name}: {e}");
}
}
}
}
/// The clipboard format names for MathML that Windows programs read (W3C MathML 3 §6.2.4; Office
/// reads and writes both).
#[cfg(target_os = "windows")]
const MATHML_FORMATS: [&str; 2] = ["MathML", "MathML Presentation"];
#[cfg(target_os = "macos")]
mod platform {
use objc2_app_kit::NSPasteboard;
use objc2_foundation::{NSData, NSString};
/// RTF's pasteboard type (`NSPasteboardTypeRTF`, whose extern static needs unsafe to read).
const RTF: &str = "public.rtf";
/// Formats offered on macOS pasteboard.
pub fn formats() -> Vec<String> {
Vec::new()
}
/// Read RTF data from macOS pasteboard.
pub fn rtf() -> Option<Vec<u8>> {
let data = NSPasteboard::generalPasteboard().dataForType(&NSString::from_str(RTF))?;
(data.len() <= super::MAX_PASTE_BYTES).then(|| data.to_vec())
}
/// Read encoded picture data from macOS pasteboard.
pub fn encoded_picture() -> Option<Vec<u8>> {
None
}
static LAST_CHANGE_COUNT: std::sync::atomic::AtomicIsize = std::sync::atomic::AtomicIsize::new(-1);
/// Record pasteboard changeCount on macOS to verify ownership.
pub fn record_own() {
let count = NSPasteboard::generalPasteboard().changeCount();
LAST_CHANGE_COUNT.store(count, std::sync::atomic::Ordering::Relaxed);
}
/// Whether WordCraft still owns the macOS pasteboard.
pub fn is_own() -> bool {
let count = NSPasteboard::generalPasteboard().changeCount();
let recorded = LAST_CHANGE_COUNT.load(std::sync::atomic::Ordering::Relaxed);
recorded >= 0 && count == recorded
}
/// Whether macOS supports setting the pasteboard.
pub fn can_set() -> bool {
true
}
/// arboard sets the text and HTML.
pub fn set_rich(_text: &str, _html: &str, _rtf: &str) -> bool {
false
}
/// macOS sets the primary image through arboard and supplements via [`after_set_image`].
pub fn set_image(_image: &wordcraft_ui_egui::system_clipboard::CopyImage, _html: &str, _text: &str) -> bool {
false
}
/// Set supplemental PNG and HTML representations on macOS pasteboard.
pub fn after_set_image(image: &wordcraft_ui_egui::system_clipboard::CopyImage, html: &str, _text: &str) {
let board = NSPasteboard::generalPasteboard();
if let Ok(png) = wordcraft_ui_egui::paste_picture::png_from_rgba(image.width, image.height, image.rgba.clone()) {
let _ = board.setData_forType(Some(&NSData::with_bytes(&png)), &NSString::from_str("public.png"));
}
if !html.is_empty() {
let _ = board.setString_forType(&NSString::from_str(html), &NSString::from_str("public.html"));
}
record_own();
}
/// Add RTF to the pasteboard item arboard just wrote (it cleared the pasteboard first).
pub fn add_rtf(rtf: &str) {
if !NSPasteboard::generalPasteboard().setData_forType(Some(&NSData::with_bytes(rtf.as_bytes())), &NSString::from_str(RTF)) {
log::warn!("clipboard: the RTF couldn't be added");
}
}
/// Add the MathML to the pasteboard item arboard just wrote, as the MathML types (W3C MathML 3
/// §6.2.4): presentation markup, and the generic type for readers that only know that one.
pub fn add_mathml(mathml: &str) {
let board = NSPasteboard::generalPasteboard();
let text = NSString::from_str(mathml);
for name in ["public.mathml.presentation", "public.mathml"] {
if !board.setString_forType(&text, &NSString::from_str(name)) {
log::warn!("clipboard: couldn't add {name}");
}
}
}
}
#[cfg(not(any(
target_os = "windows",
target_os = "macos",
all(unix, not(any(target_os = "macos", target_os = "android", target_os = "emscripten")))
)))]
mod platform {
/// Formats on the clipboard.
pub fn formats() -> Vec<String> {
Vec::new()
}
/// The RTF bytes on the clipboard.
pub fn rtf() -> Option<Vec<u8>> {
None
}
/// Encoded picture bytes on the clipboard.
pub fn encoded_picture() -> Option<Vec<u8>> {
None
}
/// Whether the fallback platform can set the clipboard.
pub fn can_set() -> bool {
true
}
/// Record clipboard ownership on the fallback platform.
pub fn record_own() {}
/// Whether WordCraft owns the clipboard on the fallback platform.
pub fn is_own() -> bool {
false
}
/// Set rich text on the fallback platform.
pub fn set_rich(_text: &str, _html: &str, _rtf: &str) -> bool {
false
}
/// Set image on the fallback platform.
pub fn set_image(_image: &wordcraft_ui_egui::system_clipboard::CopyImage, _html: &str, _text: &str) -> bool {
false
}
/// Post-image set hook on the fallback platform.
pub fn after_set_image(_image: &wordcraft_ui_egui::system_clipboard::CopyImage, _html: &str, _text: &str) {}
/// Add RTF to the clipboard on the fallback platform.
pub fn add_rtf(_rtf: &str) {}
/// Add MathML to the clipboard on the fallback platform.
pub fn add_mathml(_mathml: &str) {}
}
#[cfg(test)]
mod cf_html_tests {
use super::wrap_cf_html;
fn field(data: &[u8], name: &str) -> usize {
let at = data.windows(name.len()).position(|w| w == name.as_bytes()).expect("field") + name.len();
std::str::from_utf8(&data[at..at + 10]).expect("offset digits").parse().expect("offset")
}
#[test]
fn cf_html_offsets_delimit_the_fragment_bytes() {
let fragment = "<p>Olá, 世界 — café</p>";
let data = wrap_cf_html(fragment);
let start_html = field(&data, "StartHTML:");
let end_html = field(&data, "EndHTML:");
let start_fragment = field(&data, "StartFragment:");
let end_fragment = field(&data, "EndFragment:");
assert!(start_html < start_fragment, "HTML starts before its fragment");
assert!(start_fragment < end_fragment, "fragment has a positive length");
assert!(end_fragment < end_html, "fragment ends inside the document");
assert_eq!(&data[start_html..start_html + "<html>".len()], b"<html>");
assert_eq!(&data[start_fragment..end_fragment], fragment.as_bytes());
assert_eq!(end_fragment - start_fragment, fragment.len(), "offsets count UTF-8 bytes");
assert_eq!(&data[end_html..], b"\0", "EndHTML excludes the trailing NUL");
assert_eq!(end_html, data.len() - 1);
}
}
+77 -694
View File
@@ -1,84 +1,50 @@
//! Loopback JSON-lines control server: one request per line, one reply per line.
//! This is the transport the MCP server (`wordcraft-cli mcp --connect`) wraps.
//! The control server: craft-automation's loopback JSON-lines transport, started on the port the
//! user asked for.
//!
//! Every request needs the window's key (`docs/control-protocol.md`, Keys): once the port is
//! bound, the app writes a random key to `<settings>/control-key.<instance>` (mode 0600) and
//! removes the file when the window closes.
//! A connection authenticates once with the token (`docs/control-protocol.md`, Token). When no
//! token or token file is supplied, the app generates a token and writes it to
//! `<settings>/control-key.<instance>` (mode 0600) after the port is bound, and removes the file
//! when the window closes.
use std::io::{BufRead, BufReader, Read, Write};
use std::net::{TcpListener, TcpStream};
use std::net::TcpListener;
use std::path::{Path, PathBuf};
use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::mpsc::{Receiver, Sender, channel};
use std::time::{Duration, Instant};
use std::sync::mpsc::Receiver;
use serde_json::{Value, json};
use wordcraft_ui_egui::ControlRequest;
use craft::automation::args::ControlOptions;
use craft::automation::control::ControlRequest;
use craft::automation::server::{Listening, serve};
use craft::ui::runtime::windows::WindowHost;
/// Longer request lines are refused (and the connection closed).
const MAX_LINE: usize = 1 << 20;
/// A running control server. [`Control::shut_down`] it when the window closes.
pub struct Control {
/// Dropping it stops accepting connections and frees the port.
listening: Listening,
/// The default token file this run wrote; a token file the user supplied is never removed.
created: Option<PathBuf>,
}
/// A connection that sends no authorised request in this time is closed.
const FIRST_REQUEST: Duration = Duration::from_secs(30);
/// How long a caller waits for the UI to answer a request. A request still queued after this
/// is cancelled and never runs.
const REPLY_WAIT: Duration = Duration::from_secs(60);
/// Connections that have not yet sent an authorised request are limited to this many; more are
/// closed at once. Each one holds a thread until its first request or [`FIRST_REQUEST`].
const MAX_UNAUTHENTICATED: usize = 64;
/// Counts one unauthenticated connection until it authenticates or ends.
struct Admission(Option<Arc<AtomicUsize>>);
impl Admission {
fn enter(count: &Arc<AtomicUsize>, max: usize) -> Option<Self> {
if count.fetch_add(1, Ordering::SeqCst) >= max {
count.fetch_sub(1, Ordering::SeqCst);
return None;
}
Some(Self(Some(count.clone())))
}
fn release(&mut self) {
if let Some(c) = self.0.take() {
c.fetch_sub(1, Ordering::SeqCst);
}
impl Control {
/// Stop accepting connections and remove the token file this run wrote, if any.
pub fn shut_down(self) {
let Self { listening, created } = self;
drop(listening);
remove(created.as_deref());
}
}
impl Drop for Admission {
fn drop(&mut self) {
self.release();
fn remove(path: Option<&Path>) {
if let Some(path) = path {
let _ = std::fs::remove_file(path);
}
}
/// The key file of a running control server; [`KeyFile::remove`] it when the window closes.
pub struct KeyFile(PathBuf);
impl KeyFile {
pub fn path(&self) -> &Path {
&self.0
}
pub fn remove(&self) {
let _ = std::fs::remove_file(&self.0);
}
}
/// Bind `127.0.0.1:port`, write the key file into `settings` and serve. `None` when the port
/// cannot be bound or there is no random key (the control channel is off); the key file is
/// `None` when it could not be written (requests are then refused).
pub fn start(port: u16, ctx: egui::Context, settings: Option<&Path>) -> Option<(Receiver<ControlRequest>, Option<KeyFile>)> {
start_with(port, ctx, settings, |listener, ctx, key| serve_on(listener, ctx, key, FIRST_REQUEST))
}
fn start_with(
port: u16,
ctx: egui::Context,
settings: Option<&Path>,
serve: impl FnOnce(TcpListener, egui::Context, String) -> std::io::Result<Receiver<ControlRequest>>,
) -> Option<(Receiver<ControlRequest>, Option<KeyFile>)> {
/// Bind `127.0.0.1:port`, settle the token and serve. `None` when the port cannot be bound or
/// the token cannot be set up (the control channel is off); a taken port leaves no token file.
///
/// With no token and no token file in `options`, the token is kept in the default file for
/// `port` in `settings`; a file left by a run that did not exit cleanly is replaced. Without a
/// settings folder a fresh token is generated and reported by the log.
pub fn start(options: &ControlOptions, port: u16, host: WindowHost, settings: Option<&Path>) -> Option<(Receiver<ControlRequest>, Control)> {
let listener = match TcpListener::bind(("127.0.0.1", port)) {
Ok(l) => l,
Err(e) => {
@@ -86,255 +52,28 @@ fn start_with(
return None;
}
};
let key = match random_key() {
Ok(k) => k,
let created = settings.filter(|_| options.token.is_none() && options.token_file.is_none()).map(|dir| wordcraft_control_key::key_path(dir, port));
// The port was free, so no other run owns a file left here.
remove(created.as_deref());
let effective = ControlOptions { token_file: created.clone().or_else(|| options.token_file.clone()), ..options.clone() };
let token = match effective.server_token() {
Ok(t) => t,
Err(e) => {
log::error!("control server off: no random key ({e})");
remove(created.as_deref());
log::error!("control server off: {e}");
return None;
}
};
let key_file = match settings {
Some(dir) => {
let p = wordcraft_control_key::key_path(dir, port);
match write_key_file(&p, &key) {
Ok(()) => Some(KeyFile(p)),
Err(e) => {
log::error!("control key file not written ({e}): requests will be refused");
None
}
}
let notice = effective.token_notice(&token);
match serve(listener, token, host) {
Ok((rx, listening)) => {
log::info!("control server listening on {}, {notice}", listening.addr);
Some((rx, Control { listening, created }))
}
None => {
log::error!("no settings folder for the control key file: requests will be refused");
None
}
};
let rx = match serve(listener, ctx, key) {
Ok(rx) => rx,
Err(e) => {
if let Some(f) = &key_file {
f.remove();
}
remove(created.as_deref());
log::error!("control server off: cannot start the accept thread ({e})");
return None;
}
};
match &key_file {
Some(f) => log::info!("control server listening on 127.0.0.1:{port}, key in {}", f.path().display()),
None => log::info!("control server listening on 127.0.0.1:{port}"),
}
Some((rx, key_file))
}
/// A new key: 32 random bytes from the operating system, as hex.
fn random_key() -> Result<String, String> {
let mut b = [0u8; 32];
getrandom::fill(&mut b).map_err(|e| e.to_string())?;
Ok(b.iter().map(|x| format!("{x:02x}")).collect())
}
/// Write the key file: a stale one (from a run that did not exit cleanly) is replaced; on Unix
/// the new file is created with mode 0600.
fn write_key_file(p: &Path, key: &str) -> Result<(), String> {
if let Some(d) = p.parent() {
std::fs::create_dir_all(d).map_err(|e| format!("cannot create {}: {e}", d.display()))?;
}
let _ = std::fs::remove_file(p);
let mut open = std::fs::OpenOptions::new();
open.write(true).create_new(true);
#[cfg(unix)]
std::os::unix::fs::OpenOptionsExt::mode(&mut open, 0o600);
let mut f = open.open(p).map_err(|e| format!("cannot create {}: {e}", p.display()))?;
f.write_all(key.as_bytes()).map_err(|e| format!("cannot write {}: {e}", p.display()))
}
/// Compare a key with the window's in time that does not depend on where they differ. An
/// empty key never matches.
fn keys_match(given: &str, key: &str) -> bool {
let (a, b) = (given.as_bytes(), key.as_bytes());
!b.is_empty() && a.len() == b.len() && a.iter().zip(b).fold(0u8, |acc, (x, y)| acc | (x ^ y)) == 0
}
fn serve_on(listener: TcpListener, ctx: egui::Context, key: String, first: Duration) -> std::io::Result<Receiver<ControlRequest>> {
serve_with(listener, ctx, key, Limits { first, wait: REPLY_WAIT, max_unauthenticated: MAX_UNAUTHENTICATED })
}
/// The time and count budgets of a server (small ones in tests).
#[derive(Clone, Copy)]
struct Limits {
first: Duration,
wait: Duration,
max_unauthenticated: usize,
}
fn serve_with(listener: TcpListener, ctx: egui::Context, key: String, limits: Limits) -> std::io::Result<Receiver<ControlRequest>> {
serve_with_spawner(listener, ctx, key, limits, |accept| std::thread::Builder::new().name("control-accept".into()).spawn(accept).map(|_| ()))
}
fn serve_with_spawner(
listener: TcpListener,
ctx: egui::Context,
key: String,
limits: Limits,
spawn: impl FnOnce(Box<dyn FnOnce() + Send>) -> std::io::Result<()>,
) -> std::io::Result<Receiver<ControlRequest>> {
let (tx, rx) = channel::<ControlRequest>();
let key: Arc<str> = key.into();
let unauthenticated = Arc::new(AtomicUsize::new(0));
let accept = move || {
for stream in listener.incoming().flatten() {
let Some(admission) = Admission::enter(&unauthenticated, limits.max_unauthenticated) else {
log::warn!("control server: too many unauthenticated connections, one closed");
continue;
};
let (tx, ctx, key) = (tx.clone(), ctx.clone(), key.clone());
// A thread that cannot start closes this connection only (the guard releases its slot).
if let Err(e) = std::thread::Builder::new().name("control-conn".into()).spawn(move || serve(stream, tx, ctx, &key, limits, admission)) {
log::warn!("control server: no thread for a connection: {e}");
}
}
};
spawn(Box::new(accept))?;
Ok(rx)
}
/// The read side of a connection with an optional overall deadline: each read waits only for
/// the time left, so blank lines, bad JSON or a slow drip of bytes cannot extend it.
struct Timed {
s: TcpStream,
deadline: Option<Instant>,
}
impl Read for Timed {
fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
if let Some(d) = self.deadline {
let left = d.checked_duration_since(Instant::now()).filter(|l| !l.is_zero()).ok_or(std::io::ErrorKind::TimedOut)?;
self.s.set_read_timeout(Some(left))?;
}
self.s.read(buf)
}
}
impl Timed {
fn set_deadline(&mut self, d: Option<Instant>) {
self.deadline = d;
if d.is_none() {
let _ = self.s.set_read_timeout(None);
}
}
}
/// The next line (trimmed), `None` at the end of the stream or after a read error.
fn read_line(r: &mut BufReader<Timed>) -> Option<Result<String, &'static str>> {
let mut buf = Vec::new();
let n = r.by_ref().take(MAX_LINE as u64 + 1).read_until(b'\n', &mut buf).ok()?;
if n == 0 {
return None;
}
if buf.len() > MAX_LINE {
return Some(Err("line too long"));
}
Some(String::from_utf8(buf).map(|s| s.trim().to_string()).map_err(|_| "not UTF-8"))
}
/// Read and drop the rest of an oversize line, so closing the socket does not reset the
/// connection before the client has read the error. At most 64 MiB, within 2 s.
fn discard_rest_of_line(r: &mut BufReader<Timed>) {
r.get_mut().set_deadline(Some(Instant::now() + Duration::from_secs(2)));
let mut left: usize = 64 << 20;
while left > 0 {
let (used, done) = match r.fill_buf() {
Ok([]) | Err(_) => return,
Ok(b) => match b.iter().position(|&c| c == b'\n') {
Some(i) => (i + 1, true),
None => (b.len(), false),
},
};
r.consume(used);
if done {
return;
}
left = left.saturating_sub(used);
}
}
fn serve(stream: TcpStream, tx: Sender<ControlRequest>, ctx: egui::Context, key: &str, limits: Limits, mut admission: Admission) {
let Ok(read) = stream.try_clone() else { return };
let mut out = stream;
// One overall deadline from accept to the first authorised request; after it, none.
let mut reader = BufReader::new(Timed { s: read, deadline: Some(Instant::now() + limits.first) });
let mut authorised = false;
// The key an `auth` request gave this connection.
let mut conn_key: Option<String> = None;
while let Some(line) = read_line(&mut reader) {
let line = match line {
Ok(l) => l,
Err(e) => {
let _ = writeln!(out, "{}", json!({"ok": false, "error": e}));
if e == "line too long" {
discard_rest_of_line(&mut reader);
}
break;
}
};
if line.is_empty() {
continue;
}
let msg = match serde_json::from_str::<Value>(&line) {
Ok(m) => m,
// Close on a line that isn't JSON: an HTTP request (say, a web page's `fetch` to this
// port) starts with a request line that never parses, so it can't carry a command in
// its body, even before the key is checked.
Err(e) => {
let _ = writeln!(out, "{}", json!({"ok": false, "error": format!("bad JSON: {e}; closing the connection")}));
break;
}
};
let id = msg.get("id").cloned().unwrap_or(Value::Null);
let method = msg.get("method").and_then(Value::as_str).unwrap_or("").to_string();
let params = msg.get("params").cloned().unwrap_or(json!({}));
// The top-level `key`; `auth` may carry it in its params. For other methods `params.key`
// is an ordinary parameter (`ui.key {"key": "Enter"}`).
let given =
msg.get("key").and_then(Value::as_str).or_else(|| if method == "auth" { params.get("key").and_then(Value::as_str) } else { None });
let mut reply = |mut v: Value| -> bool {
if let Some(o) = v.as_object_mut() {
o.insert("id".into(), id.clone());
}
writeln!(out, "{v}").is_ok()
};
// Checked on every request.
let k = given.or(conn_key.as_deref()).unwrap_or("");
if !keys_match(k, key) {
let _ = reply(json!({"ok": false, "error": "unauthorized"}));
break;
}
if !authorised {
authorised = true;
admission.release();
reader.get_mut().set_deadline(None);
}
if method == "auth" {
conn_key = Some(k.to_string());
if !reply(json!({"ok": true, "result": {}})) {
break;
}
continue;
}
let (req, rrx, waiter) = ControlRequest::with_waiter(method, params);
if tx.send(req).is_err() {
break;
}
ctx.request_repaint();
let r = rrx.recv_timeout(limits.wait).unwrap_or_else(|_| {
if waiter.cancel() {
json!({"ok": false, "error": "timeout before execution: the request was not run and never will be"})
} else {
json!({"ok": false, "error": "timeout: outcome unknown, the request had started when the wait ended; inspect the document to check"})
}
});
if !reply(r) {
break;
None
}
}
}
@@ -342,402 +81,46 @@ fn serve(stream: TcpStream, tx: Sender<ControlRequest>, ctx: egui::Context, key:
#[cfg(test)]
mod tests {
use super::*;
use std::io::{BufRead, BufReader, Write};
use std::net::TcpStream;
use craft::automation::client::ControlClient;
const KEY: &str = "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef";
fn boot_with(first: Duration) -> (u16, Receiver<ControlRequest>) {
let listener = TcpListener::bind(("127.0.0.1", 0)).unwrap();
let port = listener.local_addr().unwrap().port();
(port, serve_on(listener, egui::Context::default(), KEY.to_string(), first).unwrap())
}
fn boot() -> (u16, Receiver<ControlRequest>) {
boot_with(FIRST_REQUEST)
}
/// Answer the next request that reaches the UI with `ok`, and return it.
fn answer(rx: &Receiver<ControlRequest>) -> ControlRequest {
let req = rx.recv_timeout(Duration::from_secs(5)).unwrap();
let _ = req.reply.send(json!({"ok": true, "result": {}}));
req
}
/// One connection, several lines.
struct Conn(BufReader<TcpStream>, TcpStream);
impl Conn {
fn open(port: u16) -> Self {
Self::open_within(port, Duration::from_secs(5))
}
fn open_within(port: u16, read_timeout: Duration) -> Self {
let s = TcpStream::connect(("127.0.0.1", port)).unwrap();
s.set_read_timeout(Some(read_timeout)).unwrap();
Self(BufReader::new(s.try_clone().unwrap()), s)
}
fn send(&mut self, line: &str) {
writeln!(self.1, "{line}").unwrap();
}
fn recv(&mut self) -> Value {
let mut r = String::new();
let _ = self.0.read_line(&mut r);
serde_json::from_str(&r).unwrap_or_default()
}
fn call(&mut self, line: &str) -> Value {
self.send(line);
self.recv()
}
/// The server closed the connection.
fn closed(&mut self) -> bool {
let mut r = String::new();
closed_by_peer(self.0.read_line(&mut r))
}
}
/// Whether a read means the peer closed the connection. End of stream does; so does a reset,
/// which is how Windows can deliver a close when the writer had nothing to read back (the
/// Windows Print job failed here). Any other error, such as `InvalidData` for bytes that are
/// not UTF-8, leaves the connection open.
fn closed_by_peer(read: std::io::Result<usize>) -> bool {
match read {
Ok(n) => n == 0,
Err(e) => matches!(
e.kind(),
std::io::ErrorKind::ConnectionReset
| std::io::ErrorKind::ConnectionAborted
| std::io::ErrorKind::NotConnected
| std::io::ErrorKind::BrokenPipe
),
}
fn host() -> WindowHost {
WindowHost::of(&egui::Context::default())
}
#[test]
fn a_request_without_the_key_is_refused_and_closed() {
let (port, rx) = boot();
let mut c = Conn::open(port);
let r = c.call(r#"{"id":1,"method":"document.inspect"}"#);
assert_eq!((r["ok"].clone(), r["error"].clone(), r["id"].clone()), (json!(false), json!("unauthorized"), json!(1)));
assert!(c.closed());
assert!(rx.try_recv().is_err(), "nothing reached the UI");
}
#[test]
fn a_wrong_key_is_refused_and_closed() {
let (port, rx) = boot();
for key in ["nope", &KEY[..63], &format!("{KEY}0"), &KEY.to_uppercase()] {
let mut c = Conn::open(port);
assert_eq!(c.call(&format!(r#"{{"id":1,"key":"{key}","method":"document.inspect"}}"#))["error"], "unauthorized", "{key}");
assert!(c.closed());
}
assert!(rx.try_recv().is_err());
}
#[test]
fn the_key_on_each_request() {
let (port, rx) = boot();
let mut c = Conn::open(port);
c.send(&format!(r#"{{"id":7,"key":"{KEY}","method":"document.inspect","params":{{"text":true}}}}"#));
let req = answer(&rx);
assert_eq!((req.method.as_str(), &req.params), ("document.inspect", &json!({"text": true})));
let r = c.recv();
assert_eq!((r["ok"].clone(), r["id"].clone()), (json!(true), json!(7)));
// Every request needs it: one without the key is refused, also after good ones.
assert_eq!(c.call(r#"{"id":8,"method":"document.inspect"}"#)["error"], "unauthorized");
assert!(c.closed());
}
#[test]
fn auth_once_per_connection() {
let (port, rx) = boot();
let mut c = Conn::open(port);
assert_eq!(c.call(&format!(r#"{{"id":1,"method":"auth","key":"{KEY}"}}"#))["ok"], true);
for id in 2..4 {
c.send(&format!(r#"{{"id":{id},"method":"document.inspect"}}"#));
answer(&rx);
assert_eq!(c.recv()["ok"], true);
}
// `params.key` works for `auth` too.
let mut c = Conn::open(port);
assert_eq!(c.call(&format!(r#"{{"id":1,"method":"auth","params":{{"key":"{KEY}"}}}}"#))["ok"], true);
// A wrong key on an authenticated connection is still refused, and closes it.
assert_eq!(c.call(r#"{"id":2,"key":"nope","method":"document.inspect"}"#)["error"], "unauthorized");
assert!(c.closed());
// A failed auth closes the connection.
let mut c = Conn::open(port);
assert_eq!(c.call(r#"{"id":1,"method":"auth","key":"nope"}"#)["error"], "unauthorized");
assert!(c.closed());
}
#[test]
fn params_key_is_only_a_secret_for_auth() {
let (port, rx) = boot();
// `params.key` does not authenticate other methods.
let mut c = Conn::open(port);
assert_eq!(c.call(&format!(r#"{{"id":1,"method":"document.inspect","params":{{"key":"{KEY}"}}}}"#))["error"], "unauthorized");
// It is an ordinary parameter for them (`ui.key` presses a key).
let mut c = Conn::open(port);
c.send(&format!(r#"{{"id":1,"key":"{KEY}","method":"ui.key","params":{{"key":"Enter"}}}}"#));
let req = answer(&rx);
assert_eq!((req.method.as_str(), &req.params), ("ui.key", &json!({"key": "Enter"})));
assert_eq!(c.recv()["ok"], true);
}
#[test]
fn a_line_over_1_mib_is_refused_and_closed() {
let (port, rx) = boot();
let mut c = Conn::open(port);
let big = format!(r#"{{"id":1,"key":"{KEY}","method":"document.inspect","pad":"{}"}}"#, "x".repeat(MAX_LINE));
assert_eq!(c.call(&big)["error"], "line too long");
assert!(c.closed());
assert!(rx.try_recv().is_err());
}
#[test]
fn only_closure_errors_mean_the_peer_closed() {
use std::io::{Error, ErrorKind};
assert!(closed_by_peer(Ok(0)), "end of stream");
for kind in [ErrorKind::ConnectionReset, ErrorKind::ConnectionAborted, ErrorKind::NotConnected, ErrorKind::BrokenPipe] {
assert!(closed_by_peer(Err(Error::new(kind, "closed"))), "{kind:?}");
}
assert!(!closed_by_peer(Ok(1)), "a reply arrived");
// Not UTF-8, a timeout or a would-block leave the socket open.
for kind in [ErrorKind::InvalidData, ErrorKind::TimedOut, ErrorKind::WouldBlock] {
assert!(!closed_by_peer(Err(Error::new(kind, "still open"))), "{kind:?}");
}
}
#[test]
fn a_silent_connection_is_closed() {
let (port, rx) = boot_with(Duration::from_millis(300));
// A loaded Windows CI runner can take seconds to schedule the connection thread. The
// production deadline is 30 s, so 10 s still proves the server's own budget fired.
let mut quiet = Conn::open_within(port, Duration::from_secs(20));
let t0 = Instant::now();
assert!(quiet.closed());
assert!(t0.elapsed() < Duration::from_secs(10), "{:?}", t0.elapsed());
// After an authorised request the connection may stay idle.
let mut busy = Conn::open(port);
assert_eq!(busy.call(&format!(r#"{{"id":1,"method":"auth","key":"{KEY}"}}"#))["ok"], true);
std::thread::sleep(Duration::from_millis(600));
busy.send(r#"{"id":2,"method":"document.inspect"}"#);
answer(&rx);
assert_eq!(busy.recv()["ok"], true);
}
#[test]
fn the_first_request_limit_is_one_overall_deadline() {
// Blank lines and bad JSON do not keep a connection without the key open.
let (port, _rx) = boot_with(Duration::from_millis(300));
let s = TcpStream::connect(("127.0.0.1", port)).unwrap();
let mut w = s.try_clone().unwrap();
let feeder = std::thread::spawn(move || {
for i in 0..40 {
if w.write_all(if i % 2 == 0 { b"\n" } else { b"not json\n" }).is_err() {
return;
}
std::thread::sleep(Duration::from_millis(50));
}
});
let t0 = Instant::now();
let mut r = BufReader::new(s);
r.get_ref().set_read_timeout(Some(Duration::from_secs(5))).unwrap();
let mut line = String::new();
loop {
line.clear();
if matches!(r.read_line(&mut line), Ok(0) | Err(_)) {
break;
}
assert!(line.contains("bad JSON"), "{line}");
}
let _ = feeder.join();
assert!(t0.elapsed() < Duration::from_millis(1500), "{:?}", t0.elapsed());
}
#[test]
fn bad_json_closes_the_connection() {
let (port, rx) = boot();
let mut c = Conn::open(port);
assert_eq!(c.call("not json")["ok"], false);
assert!(c.closed());
assert!(rx.try_recv().is_err());
}
#[test]
fn http_request_cannot_smuggle_a_command() {
// What a web page's `fetch("http://127.0.0.1:<port>/", {method: "POST", body})` sends,
// even with the key in the body.
let (port, rx) = boot();
let body = format!("\n{{\"key\":\"{KEY}\",\"method\":\"file.saveAs\",\"params\":{{\"path\":\"/tmp/x.docx\"}}}}\n");
let req = format!("POST / HTTP/1.1\r\nHost: 127.0.0.1:7981\r\nContent-Type: text/plain\r\nContent-Length: {}\r\n\r\n{body}", body.len());
let mut c = Conn::open(port);
c.1.write_all(req.as_bytes()).unwrap();
let _ = c.recv();
assert!(c.closed());
assert!(rx.recv_timeout(Duration::from_millis(300)).is_err());
}
#[test]
fn keys_compare_whole() {
assert!(keys_match(KEY, KEY));
assert!(!keys_match(KEY, &KEY[..63]));
assert!(!keys_match(&KEY[..63], KEY));
assert!(!keys_match(KEY, &KEY.replace('f', "e")));
assert!(!keys_match("", ""), "an empty key never matches");
}
#[test]
fn random_keys_are_256_bits() {
let (a, b) = (random_key().unwrap(), random_key().unwrap());
assert_eq!(a.len(), 64);
assert!(a.bytes().all(|c| c.is_ascii_hexdigit()));
assert_ne!(a, b);
}
fn temp_dir(name: &str) -> std::path::PathBuf {
let dir = std::env::temp_dir().join(format!("wordcraft-control-{name}-{}", std::process::id()));
fn the_token_file_is_written_after_the_bind_and_removed_on_exit() {
let dir = std::env::temp_dir().join(format!("wordcraft-control-life-{}", std::process::id()));
let _ = std::fs::remove_dir_all(&dir);
dir
}
let options = ControlOptions::default();
#[test]
fn the_key_file_is_written_after_the_bind_and_removed_on_exit() {
let dir = temp_dir("life");
// The port is taken: no key file.
// The port is taken: no token file.
let taken = TcpListener::bind(("127.0.0.1", 0)).unwrap();
let port = taken.local_addr().unwrap().port();
assert!(start(port, egui::Context::default(), Some(&dir)).is_none());
assert!(!dir.exists() || std::fs::read_dir(&dir).unwrap().next().is_none(), "no key file after a failed bind");
assert!(start(&options, port, host(), Some(&dir)).is_none());
assert!(!dir.exists() || std::fs::read_dir(&dir).unwrap().next().is_none(), "no token file after a failed bind");
drop(taken);
// Bound: the key file holds the key that opens the port.
let mut free_port = port.wrapping_add(1).max(1024);
let mut started = None;
for _ in 0..100 {
if let Some(res) = start(free_port, egui::Context::default(), Some(&dir)) {
started = Some((res, free_port));
break;
}
free_port = free_port.wrapping_add(1).max(1024);
}
let ((rx, key_file), port) = started.unwrap();
let key_file = key_file.unwrap();
assert_eq!(key_file.path(), wordcraft_control_key::key_path(&dir, port));
let key = std::fs::read_to_string(key_file.path()).unwrap();
assert_eq!(key.len(), 64);
// Bound: the default file holds the token that opens the port.
let (_rx, control) = start(&options, 0, host(), Some(&dir)).unwrap();
let path = control.created.clone().unwrap();
assert_eq!(path, wordcraft_control_key::key_path(&dir, 0));
let token = std::fs::read_to_string(&path).unwrap();
#[cfg(unix)]
{
use std::os::unix::fs::PermissionsExt;
assert_eq!(std::fs::metadata(key_file.path()).unwrap().permissions().mode() & 0o777, 0o600);
assert_eq!(std::fs::metadata(&path).unwrap().permissions().mode() & 0o777, 0o600);
}
let mut c = Conn::open(port);
c.send(&format!(r#"{{"id":1,"key":"{key}","method":"document.inspect"}}"#));
answer(&rx);
assert_eq!(c.recv()["ok"], true);
key_file.remove();
assert!(!key_file.path().exists());
assert!(ControlClient::connect(control.listening.addr, token.trim()).is_ok());
control.shut_down();
assert!(!path.exists());
// A token file the user supplied stays.
let supplied = dir.join("supplied-token");
let options = ControlOptions { token_file: Some(supplied.clone()), ..ControlOptions::default() };
let (_rx, control) = start(&options, 0, host(), Some(&dir)).unwrap();
assert!(control.created.is_none());
control.shut_down();
assert!(supplied.exists());
let _ = std::fs::remove_dir_all(&dir);
}
#[test]
fn an_accept_thread_spawn_failure_aborts_start_and_removes_the_key() {
let dir = temp_dir("spawn-failure");
let path = wordcraft_control_key::key_path(&dir, 0);
let mut bound = None;
let result = start_with(0, egui::Context::default(), Some(&dir), |listener, ctx, key| {
bound = Some(listener.local_addr().unwrap());
assert_eq!(std::fs::read_to_string(&path).unwrap(), key, "startup wrote the key before spawning");
serve_with_spawner(listener, ctx, key, small(150, 8), |accept| {
drop(accept);
Err(std::io::Error::other("injected accept thread spawn failure"))
})
});
assert!(result.is_none(), "a server without its accept thread must not report success");
assert!(!path.exists(), "failed startup must remove its published key");
let _listener = TcpListener::bind(bound.unwrap()).unwrap();
let _ = std::fs::remove_dir_all(&dir);
}
#[test]
fn a_complete_json_request_at_eof_can_reach_the_ui() {
// This is why a bridge write failure before the newline is outcome-unknown.
let (port, rx) = boot();
let mut c = Conn::open(port);
let body = json!({"id": 1, "key": KEY, "method": "engine.execute", "params": {"command": "text.insert", "params": {"text": "once"}}});
c.1.write_all(body.to_string().as_bytes()).unwrap();
c.1.shutdown(std::net::Shutdown::Write).unwrap();
let req = answer(&rx);
assert_eq!(req.params["params"]["text"], "once");
assert_eq!(c.recv()["ok"], true);
assert!(c.closed());
assert!(rx.try_recv().is_err());
}
#[test]
fn a_stale_key_file_is_replaced() {
let dir = temp_dir("stale");
std::fs::create_dir_all(&dir).unwrap();
let p = dir.join("control-key.test");
std::fs::write(&p, "old").unwrap();
#[cfg(unix)]
{
use std::os::unix::fs::PermissionsExt;
std::fs::set_permissions(&p, std::fs::Permissions::from_mode(0o644)).unwrap();
}
write_key_file(&p, KEY).unwrap();
assert_eq!(std::fs::read_to_string(&p).unwrap(), KEY);
#[cfg(unix)]
{
use std::os::unix::fs::PermissionsExt;
assert_eq!(std::fs::metadata(&p).unwrap().permissions().mode() & 0o777, 0o600);
}
let _ = std::fs::remove_dir_all(&dir);
}
fn boot_limits(limits: Limits) -> (u16, Receiver<ControlRequest>) {
let listener = TcpListener::bind(("127.0.0.1", 0)).unwrap();
let port = listener.local_addr().unwrap().port();
(port, serve_with(listener, egui::Context::default(), KEY.to_string(), limits).unwrap())
}
fn small(wait_ms: u64, max_unauthenticated: usize) -> Limits {
Limits { first: FIRST_REQUEST, wait: Duration::from_millis(wait_ms), max_unauthenticated }
}
#[test]
fn a_request_that_timed_out_in_the_queue_never_runs() {
let (port, rx) = boot_limits(small(150, 8));
let mut c = Conn::open(port);
let r = c.call(&format!(r#"{{"id":1,"key":"{KEY}","method":"engine.execute","params":{{"command":"text.insert"}}}}"#));
assert_eq!(r["ok"], false);
assert!(r["error"].as_str().unwrap_or("").starts_with("timeout before execution"), "{r}");
// The UI gets to it late: it must not run it.
let req = rx.recv_timeout(Duration::from_secs(5)).unwrap();
assert!(!req.start(), "a cancelled request was started");
}
#[test]
fn a_request_that_started_before_the_timeout_reports_an_unknown_outcome() {
let (port, rx) = boot_limits(small(150, 8));
let mut c = Conn::open(port);
c.send(&format!(r#"{{"id":1,"key":"{KEY}","method":"engine.execute","params":{{"command":"text.insert"}}}}"#));
let req = rx.recv_timeout(Duration::from_secs(5)).unwrap();
assert!(req.start());
let r = c.recv();
assert!(r["error"].as_str().unwrap_or("").contains("outcome unknown"), "{r}");
}
#[test]
fn unauthenticated_connections_are_limited() {
let (port, rx) = boot_limits(small(5_000, 2));
let mut idle = [Conn::open(port), Conn::open(port)];
// Give the server time to count both.
std::thread::sleep(Duration::from_millis(200));
assert!(Conn::open(port).closed(), "the third idle connection was admitted");
// One authenticates: its slot is free again.
assert_eq!(idle[0].call(&format!(r#"{{"id":1,"method":"auth","key":"{KEY}"}}"#))["ok"], true);
std::thread::sleep(Duration::from_millis(200));
let mut again = Conn::open(port);
assert_eq!(again.call(&format!(r#"{{"id":1,"method":"auth","key":"{KEY}"}}"#))["ok"], true);
assert!(rx.try_recv().is_err());
}
}
+15 -131
View File
@@ -2,10 +2,10 @@
//!
//! The installers register WordCraft for Word, RTF and ODT files without taking over the
//! defaults (`packaging/windows/wordcraft.wxs`, the `.desktop` file's `MimeType=`, `Info.plist`).
//! This is the button that makes it the default when the user asks:
//! This is the button that makes it the default when the user asks; the work is
//! `craft::platform::default_app::make_default`, which this file gives WordCraft's identity:
//! - **Windows** doesn't let apps set defaults: it opens Settings › Default apps on WordCraft's
//! page (`ms-settings:defaultapps?registeredAppMachine=WordCraft`; Windows 10 ignores the query
//! and shows the Default apps list), where the user picks WordCraft per type.
//! registered page, where the user picks WordCraft per type.
//! - **Linux and BSD**: `xdg-mime default ai.storyteller.wordcraft.desktop <types>` for
//! [`WORD_MIME_TYPES`], which writes the user's `mimeapps.list`. Only when the desktop entry is
//! installed (deb, rpm, Flatpak; a bare AppImage has none), and not from inside the Flatpak
@@ -14,24 +14,11 @@
//!
//! [`WORD_MIME_TYPES`]: self::WORD_MIME_TYPES
use wordcraft_ui_egui::DefaultApp;
/// The `Services::make_default_app` hook.
pub type Hook = Box<dyn Fn() -> Result<DefaultApp, String>>;
/// The hook for this platform; `None` where there is no button (macOS).
pub fn hook() -> Option<Hook> {
#[cfg(target_os = "windows")]
let hook: Option<Hook> = Some(Box::new(windows::open_default_apps));
#[cfg(all(unix, not(target_os = "macos")))]
let hook: Option<Hook> = Some(Box::new(xdg::make_default));
#[cfg(not(any(target_os = "windows", all(unix, not(target_os = "macos")))))]
let hook: Option<Hook> = None;
hook
}
#[cfg(any(unix, windows, test))]
use craft::platform::default_app::AppIdentity;
/// The desktop entry the Linux packages install, and the Flatpak's app id.
#[cfg(any(all(unix, not(target_os = "macos")), test))]
#[cfg(any(unix, windows, test))]
const DESKTOP_ID: &str = "ai.storyteller.wordcraft.desktop";
/// The types the button makes WordCraft the default for on Linux and BSD: Word documents and
@@ -39,7 +26,7 @@ const DESKTOP_ID: &str = "ai.storyteller.wordcraft.desktop";
/// lists under WordCraft's Capabilities; Markdown is only offered under Open With, and plain
/// text only on Windows and macOS (the `.desktop` file leaves it out, #4137).
/// Every one is in the `.desktop` file's `MimeType=` (a test checks).
#[cfg(any(all(unix, not(target_os = "macos")), test))]
#[cfg(any(unix, windows, test))]
const WORD_MIME_TYPES: &[&str] = &[
"application/vnd.openxmlformats-officedocument.wordprocessingml.document", // .docx
"application/vnd.ms-word.document.macroEnabled.12", // .docm
@@ -52,107 +39,21 @@ const WORD_MIME_TYPES: &[&str] = &[
"application/vnd.oasis.opendocument.text", // .odt
];
/// The arguments for `xdg-mime` that make `desktop_id` the default for [`WORD_MIME_TYPES`]: one
/// call sets them all.
#[cfg(any(all(unix, not(target_os = "macos")), test))]
fn xdg_mime_args(desktop_id: &str) -> Vec<String> {
["default", desktop_id].into_iter().chain(WORD_MIME_TYPES.iter().copied()).map(str::to_string).collect()
}
/// The `applications` folders the desktop looks for entries in, from `XDG_DATA_HOME` (default
/// `~/.local/share`) and `XDG_DATA_DIRS` (default `/usr/local/share:/usr/share`). Relative paths
/// are ignored, as the XDG Base Directory spec says.
#[cfg(all(unix, any(not(target_os = "macos"), test)))]
fn application_dirs(data_home: Option<&str>, data_dirs: Option<&str>, home: Option<&str>) -> Vec<std::path::PathBuf> {
use std::path::{Path, PathBuf};
let absolute = |s: &&str| Path::new(s).is_absolute();
let home_dir = data_home
.filter(|s| !s.is_empty())
.filter(absolute)
.map(PathBuf::from)
.or_else(|| home.filter(|s| !s.is_empty()).filter(absolute).map(|h| Path::new(h).join(".local/share")));
let system = data_dirs.filter(|s| !s.is_empty()).unwrap_or("/usr/local/share:/usr/share");
home_dir
.into_iter()
.chain(system.split(':').filter(|s| !s.is_empty()).filter(absolute).map(PathBuf::from))
.map(|d| d.join("applications"))
.collect()
}
#[cfg(target_os = "windows")]
mod windows {
use wordcraft_ui_egui::DefaultApp;
/// Settings › Default apps, on the page of the app registered as `WordCraft` under
/// `HKLM\Software\RegisteredApplications` (the MSI writes it).
const SETTINGS_URI: &str = "ms-settings:defaultapps?registeredAppMachine=WordCraft";
pub(super) fn open_default_apps() -> Result<DefaultApp, String> {
open::that_detached(SETTINGS_URI).map_err(|e| format!("couldn't open Settings: {e}"))?;
Ok(DefaultApp::SettingsOpened)
}
}
#[cfg(all(unix, not(target_os = "macos")))]
mod xdg {
use std::process::Command;
use wordcraft_ui_egui::DefaultApp;
use super::{DESKTOP_ID, application_dirs, xdg_mime_args};
/// The longest error text from `xdg-mime` shown in the status bar.
const MAX_ERROR: usize = 200;
pub(super) fn make_default() -> Result<DefaultApp, String> {
if std::env::var_os("FLATPAK_ID").is_some() || std::path::Path::new("/.flatpak-info").exists() {
return Err(
"the Flatpak sandbox can't change default apps; choose WordCraft under Open With in your file manager or system settings".into()
);
}
let var = |k: &str| std::env::var(k).ok();
let dirs = application_dirs(var("XDG_DATA_HOME").as_deref(), var("XDG_DATA_DIRS").as_deref(), var("HOME").as_deref());
if !dirs.iter().any(|d| d.join(DESKTOP_ID).is_file()) {
return Err(format!("{DESKTOP_ID} isn't installed (an AppImage needs desktop integration first)"));
}
let out = Command::new("xdg-mime").args(xdg_mime_args(DESKTOP_ID)).output().map_err(|e| match e.kind() {
std::io::ErrorKind::NotFound => "xdg-mime isn't installed (it comes with xdg-utils)".to_string(),
_ => format!("couldn't run xdg-mime: {e}"),
})?;
if out.status.success() {
return Ok(DefaultApp::MadeDefault);
}
let stderr = String::from_utf8_lossy(&out.stderr);
let first = stderr.lines().map(str::trim).find(|l| !l.is_empty()).unwrap_or("");
let message: String = first.chars().take(MAX_ERROR).collect();
Err(if message.is_empty() { format!("xdg-mime failed ({})", out.status) } else { format!("xdg-mime failed: {message}") })
/// Who WordCraft is to the system: the name the MSI registers under `RegisteredApplications`, the
/// desktop entry, and the types the button claims.
#[cfg(any(unix, windows, test))]
pub fn identity() -> AppIdentity {
AppIdentity {
registered_name: "WordCraft".to_string(),
desktop_id: DESKTOP_ID.to_string(),
mime_types: WORD_MIME_TYPES.iter().map(|t| (*t).to_string()).collect(),
}
}
#[cfg(test)]
mod tests {
#[cfg(unix)]
use std::path::PathBuf;
use super::*;
#[test]
fn xdg_mime_sets_every_word_type_in_one_call() {
let args = xdg_mime_args(DESKTOP_ID);
assert_eq!(args.first().map(String::as_str), Some("default"));
assert_eq!(args.get(1).map(String::as_str), Some("ai.storyteller.wordcraft.desktop"));
assert_eq!(&args[2..], WORD_MIME_TYPES);
for t in [
"application/vnd.openxmlformats-officedocument.wordprocessingml.document",
"application/msword",
"application/rtf",
"application/vnd.oasis.opendocument.text",
] {
assert!(args.iter().any(|a| a == t), "{t}");
}
assert!(!args.iter().any(|a| a == "text/plain" || a == "text/markdown"), "plain text and Markdown are never claimed");
}
/// Every type the button claims is one the desktop entry declares, or desktops ignore it.
#[test]
fn the_desktop_entry_declares_every_claimed_type() {
@@ -174,21 +75,4 @@ mod tests {
assert!(!declared.is_empty(), "MimeType= line not found");
assert!(!declared.contains(&"text/plain"), "text/plain must not be declared");
}
#[cfg(unix)]
#[test]
fn application_dirs_follow_the_xdg_spec() {
let p = |s: &str| PathBuf::from(s);
assert_eq!(
application_dirs(None, None, Some("/home/a")),
[p("/home/a/.local/share/applications"), p("/usr/local/share/applications"), p("/usr/share/applications")]
);
assert_eq!(
application_dirs(Some("/data"), Some("/opt/share::relative:/usr/share"), Some("/home/a")),
[p("/data/applications"), p("/opt/share/applications"), p("/usr/share/applications")]
);
// Empty or relative values fall back to the defaults; no home at all is fine.
assert_eq!(application_dirs(Some(""), Some(""), None), [p("/usr/local/share/applications"), p("/usr/share/applications")]);
assert_eq!(application_dirs(Some("rel"), None, Some("also-rel")), [p("/usr/local/share/applications"), p("/usr/share/applications")]);
}
}
-473
View File
@@ -1,473 +0,0 @@
//! Native file dialogs (Open, Save As, Export, pictures) that don't freeze the window (#94).
//!
//! The blocking `rfd::FileDialog` ran on the UI thread: on Linux the xdg-desktop-portal call
//! blocked the event loop until the dialog closed, and with no parent window the dialog could open
//! behind WordCraft, which then sat there frozen. Now the app's request ([`Services::file_dialog`])
//! is queued; the frame (which has the window) builds an `rfd::AsyncFileDialog` parented to the
//! window, and a background thread waits for the answer, hands it to the app and wakes the UI.
//!
//! On Linux and the BSDs rfd asks the xdg-desktop-portal FileChooser and, failing that, runs
//! `zenity`; with neither (a minimal Wayland compositor such as labwc with only
//! xdg-desktop-portal-wlr, #576) it answers "cancelled" and nothing ever shows. So the waiting
//! thread first checks that one of them is there and otherwise answers with an error, and the app
//! shows its built-in file browser. `WORDCRAFT_FILE_DIALOG=builtin` always uses the built-in one.
//!
//! On Linux and the BSDs, rfd reports a portal that failed to show its dialog as a cancel (#2999).
//! There a cancel quicker than anyone could dismiss a dialog is taken as that failure: the dialog
//! is asked for once more without a parent window, and if that also comes back at once the
//! built-in browser shows. Windows and macOS always show their dialog, so a quick cancel there is
//! the person's and is answered as one.
//!
//! [`Services::file_dialog`]: wordcraft_ui_egui::Services::file_dialog
use std::future::Future;
use std::pin::Pin;
use std::sync::mpsc::{Receiver, Sender, channel};
#[cfg(all(unix, not(target_os = "macos")))]
use std::sync::{Arc, Mutex};
use wordcraft_ui_egui::{FileDialogAnswer, FileDialogRequest};
/// A dialog the app asked for, with the channel its answer goes back through.
type Request = (FileDialogRequest, Sender<FileDialogAnswer>);
/// The `Services::file_dialog` hook.
pub type Hook = Box<dyn Fn(FileDialogRequest) -> Receiver<FileDialogAnswer>>;
/// Cancels the portal Save dialog the launcher is waiting on, if any.
///
/// The portal's dialog lives outside the app's window, so a portal that stops answering cannot be
/// dismissed from WordCraft. Giving the dialog up (File › Open › Browse in WordCraft…) cancels the
/// request: the waiting thread closes it and reports a cancellation, and the built-in browser
/// opens instead. A no-op where Save As doesn't ask the portal (macOS and Windows).
#[derive(Clone, Default)]
pub struct CancelHandle {
#[cfg(all(unix, not(target_os = "macos")))]
armed: Arc<Mutex<Option<Armed>>>,
#[cfg(all(unix, not(target_os = "macos")))]
next_id: Arc<std::sync::atomic::AtomicU64>,
}
/// The token a request installed in [`CancelHandle`], with the identity that owns it.
#[cfg(all(unix, not(target_os = "macos")))]
struct Armed {
id: u64,
token: crate::portal_save::CancelToken,
}
impl CancelHandle {
/// Cancels the pending portal request, if there is one.
pub fn cancel(&self) {
#[cfg(all(unix, not(target_os = "macos")))]
{
let mut slot = self.armed.lock().unwrap_or_else(|e| e.into_inner());
if let Some(armed) = slot.take() {
armed.token.cancel();
}
}
}
/// Arms the handle for the portal request about to wait, returning its token and identity.
#[cfg(all(unix, not(target_os = "macos")))]
fn arm(&self) -> Armed {
let id = self.next_id.fetch_add(1, std::sync::atomic::Ordering::Relaxed).wrapping_add(1);
let token = crate::portal_save::CancelToken::new();
*self.armed.lock().unwrap_or_else(|e| e.into_inner()) = Some(Armed { id, token: token.clone() });
Armed { id, token }
}
/// Disarms the handle once the request with `id` has answered, leaving a newer request's
/// token alone: an abandoned request finishing late must not make the next one uncancellable.
#[cfg(all(unix, not(target_os = "macos")))]
fn disarm(&self, id: u64) {
let mut slot = self.armed.lock().unwrap_or_else(|e| e.into_inner());
if slot.as_ref().is_some_and(|armed| armed.id == id) {
*slot = None;
}
}
}
/// A picker's answer, waited for off the UI thread.
type Picking = Pin<Box<dyn Future<Output = Vec<rfd::FileHandle>> + Send>>;
/// Shows the dialogs the app queued; lives in the eframe app, which has the window.
pub struct Launcher {
queue: Receiver<Request>,
ctx: egui::Context,
cancel: CancelHandle,
}
/// The hook for [`Services::file_dialog`](wordcraft_ui_egui::Services::file_dialog) and the
/// launcher that shows what it queues.
pub fn hook(ctx: &egui::Context) -> (Hook, Launcher) {
let (queue_tx, queue) = channel::<Request>();
let hook: Hook = Box::new(move |req| {
let (answer, rx) = channel();
// If the launcher is gone, the dropped answer reads as "cancelled" in the app.
let _ = queue_tx.send((req, answer));
rx
});
(hook, Launcher { queue, ctx: ctx.clone(), cancel: CancelHandle::default() })
}
impl Launcher {
/// A handle that cancels the portal Save dialog the launcher is waiting on, if any.
pub fn cancel_handle(&self) -> CancelHandle {
self.cancel.clone()
}
/// Show the queued dialogs with the window as their parent, so the portal (or the system)
/// keeps them on top of it. Call after every pass that may ask for one.
pub fn show(&self, parent: &eframe::Frame) {
while let Ok((req, answer)) = self.queue.try_recv() {
// Built here, on the UI thread: macOS shows the panel as a sheet on the window now.
let picking = picker(rfd::AsyncFileDialog::new().set_parent(parent), &req);
#[cfg(all(unix, not(target_os = "macos")))]
let unparented = picker(rfd::AsyncFileDialog::new(), &req);
#[cfg(all(unix, not(target_os = "macos")))]
let parent_id = {
use eframe::wgpu::rwh::HasWindowHandle;
crate::portal_save::parent_id(parent.window_handle().ok().map(|h| h.as_raw()))
};
// Armed before the thread starts, so giving the dialog up cannot race its start.
#[cfg(all(unix, not(target_os = "macos")))]
let portal_arm = matches!(&req, FileDialogRequest::Save { .. }).then(|| self.cancel.arm());
#[cfg(all(unix, not(target_os = "macos")))]
let portal_id = portal_arm.as_ref().map(|armed| armed.id);
#[cfg(all(unix, not(target_os = "macos")))]
let cancel_handle = self.cancel.clone();
let ctx = self.ctx.clone();
let waiting = std::thread::Builder::new().name("file dialog".into()).spawn(move || {
// The pickers only start when first polled: without a system dialog they never do.
let picked = match no_system_dialog() {
Some(reason) => Err(reason),
None => {
#[cfg(all(unix, not(target_os = "macos")))]
{
if let FileDialogRequest::Save { name, dir } = &req {
let cancel = portal_arm.as_ref().map(|armed| armed.token.clone());
let portal_req = crate::portal_save::SaveRequest {
parent: parent_id,
name: Some(name.clone()),
suggested: Some(name.clone()),
folder: dir.clone().map(std::path::PathBuf::from),
filters: save_filters(name),
current: Some(0),
cancel,
timeout: None,
};
let portal_res = zbus::blocking::Connection::session()
.map_err(|e| e.to_string())
.and_then(|conn| crate::portal_save::save_as(&conn, portal_req));
match portal_res {
Ok(Some(path)) => Ok(vec![path.to_string_lossy().into_owned()]),
Ok(None) => Ok(Vec::new()),
Err(e) if crate::portal_save::is_cancelled_error(&e) => Ok(Vec::new()),
Err(e) if crate::portal_save::is_ambiguous_filter_error(&e) => {
log::warn!("portal save format ambiguous ({e}); cancelling save without explicit format choice");
Ok(Vec::new())
}
Err(e) => {
// Giving the dialog up cancels the request. A portal that then
// fails with another error must not open the rfd dialog, which
// nothing would be waiting for.
if portal_arm.as_ref().is_some_and(|armed| armed.token.is_cancelled()) {
log::info!("portal save dialog given up ({e})");
Ok(Vec::new())
} else {
log::info!("portal save dialog unavailable ({e}), using rfd");
let picked = pick(picking, unparented, TOO_QUICK);
picked.map(|f| f.iter().map(|f| f.path().to_string_lossy().to_string()).collect())
}
}
}
} else {
// Only the portal folds a failure into "cancelled" (#2999).
let picked = pick(picking, unparented, TOO_QUICK);
picked.map(|f| f.iter().map(|f| f.path().to_string_lossy().to_string()).collect())
}
}
#[cfg(not(all(unix, not(target_os = "macos"))))]
{
let picked: Result<_, String> = Ok(pollster::block_on(picking));
picked.map(|f| f.iter().map(|f| f.path().to_string_lossy().to_string()).collect())
}
}
};
#[cfg(all(unix, not(target_os = "macos")))]
if let Some(armed) = &portal_arm {
cancel_handle.disarm(armed.id);
}
let _ = answer.send(picked);
ctx.request_repaint();
});
// The answer's sender went with the closure, so the app sees the dialog as cancelled.
if let Err(e) = waiting {
log::error!("couldn't wait for the file dialog: {e}");
#[cfg(all(unix, not(target_os = "macos")))]
if let Some(id) = portal_id {
self.cancel.disarm(id);
}
}
}
}
}
/// The picker for `req` on `dialog`.
fn picker(dialog: rfd::AsyncFileDialog, req: &FileDialogRequest) -> Picking {
match req.clone() {
FileDialogRequest::Open { purpose } => Box::pin(async move { open_filters(dialog, &purpose).pick_file().await.into_iter().collect() }),
FileDialogRequest::OpenMany { purpose } => Box::pin(async move { open_filters(dialog, &purpose).pick_files().await.unwrap_or_default() }),
FileDialogRequest::Save { name, dir } => {
let mut dialog = dialog.set_file_name(name.clone());
// Save as Word Template starts in the user templates folder (#2852).
if let Some(dir) = dir.filter(|d| std::path::Path::new(d).is_dir()) {
dialog = dialog.set_directory(dir);
}
for (label, exts) in save_filters(&name) {
dialog = dialog.add_filter(label, &exts);
}
Box::pin(async move { dialog.save_file().await.into_iter().collect() })
}
}
}
/// Quicker than anyone can see a dialog and dismiss it.
// ponytail: a timing heuristic, as rfd folds the portal's failure code into "cancelled". A portal
// failing slower than this still reads as a cancel; ask rfd for the response code if it matters.
#[cfg(all(unix, not(target_os = "macos")))]
const TOO_QUICK: std::time::Duration = std::time::Duration::from_millis(300);
/// Wait for `picking`. Nothing picked within `too_quick` is a portal that failed to show its
/// dialog (#2999), not a person cancelling: try `unparented`, as a portal may fail on the parent
/// window; if that too comes back at once, an error, so the app shows its built-in browser.
/// Linux and the BSDs only (built everywhere for its test).
#[cfg(any(test, all(unix, not(target_os = "macos"))))]
fn pick<T>(
picking: impl Future<Output = Vec<T>>,
unparented: impl Future<Output = Vec<T>>,
too_quick: std::time::Duration,
) -> Result<Vec<T>, String> {
fn timed<T>(f: impl Future<Output = Vec<T>>, too_quick: std::time::Duration) -> (Vec<T>, bool) {
let start = std::time::Instant::now();
let picked = pollster::block_on(f);
let quick = picked.is_empty() && start.elapsed() < too_quick;
(picked, quick)
}
match timed(picking, too_quick) {
(_, true) => log::warn!("the system file dialog closed at once; asking again without a parent window"),
(picked, false) => return Ok(picked),
}
match timed(unparented, too_quick) {
(_, true) => Err("the system file dialog closed at once".into()),
(picked, false) => Ok(picked),
}
}
/// The file types Open offers (shared with the built-in browser).
fn open_filters(mut d: rfd::AsyncFileDialog, purpose: &str) -> rfd::AsyncFileDialog {
for (name, exts) in wordcraft_ui_egui::open_filters(purpose) {
d = d.add_filter(*name, exts);
}
d
}
/// Why no system file dialog can be shown, if it can't (#576); run off the UI thread.
fn no_system_dialog() -> Option<String> {
if std::env::var_os("WORDCRAFT_FILE_DIALOG").is_some_and(|v| v == "builtin") {
return Some("WORDCRAFT_FILE_DIALOG=builtin".into());
}
portal_or_zenity_missing()
}
/// Linux and the BSDs: rfd needs a file chooser portal or zenity. When `dbus-send` can't ask
/// the session bus, the answer is unknown and rfd gets to try.
#[cfg(all(unix, not(target_os = "macos")))]
fn portal_or_zenity_missing() -> Option<String> {
if on_path("zenity") {
return None;
}
let portal = std::process::Command::new("dbus-send")
.args([
"--session",
"--print-reply=literal",
"--reply-timeout=10000",
"--dest=org.freedesktop.portal.Desktop",
"/org/freedesktop/portal/desktop",
"org.freedesktop.DBus.Properties.Get",
"string:org.freedesktop.portal.FileChooser",
"string:version",
])
.stdin(std::process::Stdio::null())
.stdout(std::process::Stdio::null())
.stderr(std::process::Stdio::null())
.status();
match portal {
Ok(status) if !status.success() => Some("no xdg-desktop-portal FileChooser on the session bus and no zenity".into()),
Ok(_) => None,
Err(e) => {
log::debug!("couldn't ask D-Bus for the file chooser portal: {e}");
None
}
}
}
/// Windows and macOS always have their system dialog.
#[cfg(not(all(unix, not(target_os = "macos"))))]
fn portal_or_zenity_missing() -> Option<String> {
None
}
/// Whether an executable named `program` is in a `PATH` folder.
#[cfg(all(unix, not(target_os = "macos")))]
fn on_path(program: &str) -> bool {
std::env::var_os("PATH").is_some_and(|paths| std::env::split_paths(&paths).any(|dir| dir.join(program).is_file()))
}
/// The file types Save As offers: every format the engine saves, with the suggested name's own
/// format first. rfd makes a filter's first extension the dialog's default, which the Windows,
/// macOS and Linux panels append to a file name the user typed without one; with no filter at
/// all the name came back bare and the save failed, since the format is chosen by extension
/// (#689).
fn save_exts(name: &str) -> Vec<String> {
let suggested = std::path::Path::new(name)
.extension()
.and_then(std::ffi::OsStr::to_str)
.map(str::to_ascii_lowercase)
// A .markdown file is under Markdown's one entry in the list.
.map(|e| if e == "markdown" { "md".to_string() } else { e })
.filter(|e| wordcraft_engine::io::SAVE_EXTS.contains(&e.as_str()))
.unwrap_or_else(|| "docx".to_string());
let mut exts: Vec<String> = Vec::with_capacity(wordcraft_engine::io::SAVE_EXTS.len());
exts.push(suggested.clone());
exts.extend(wordcraft_engine::io::SAVE_EXTS.iter().filter(|e| **e != suggested).map(|e| (*e).to_string()));
exts
}
/// The "Save as type" list (#1399): one named entry per format, the suggested one first (see
/// [`save_exts`] for why the order matters).
///
/// On Linux and the BSDs, [`crate::portal_save`] asks the portal directly over D-Bus and gives a
/// name the dialog left alone the chosen type's extension (#6180). When falling back to `rfd`, the
/// extension in the name wins, as `rfd` doesn't report which entry the user picked.
fn save_filters(name: &str) -> Vec<(String, Vec<String>)> {
save_exts(name).into_iter().map(|e| (format!("{} (*.{e})", format_name(&e)), vec![e])).collect()
}
/// A readable name for a save format's extension.
fn format_name(ext: &str) -> String {
match ext {
"docx" => "Word Document".into(),
"docm" => "Word Macro-Enabled Document".into(),
"dotx" => "Word Template".into(),
"dotm" => "Word Macro-Enabled Template".into(),
"pdf" => "PDF".into(),
"txt" => "Plain Text".into(),
"md" => "Markdown".into(),
"html" => "Web Page".into(),
"rtf" => "Rich Text Format".into(),
"odt" => "OpenDocument Text".into(),
"ott" => "OpenDocument Text Template".into(),
"fodt" => "Flat OpenDocument Text".into(),
"tex" => "LaTeX".into(),
"png" => "PNG Image".into(),
"json" => "JSON".into(),
"xml" => "XML".into(),
other => other.to_ascii_uppercase(),
}
}
#[cfg(test)]
mod tests {
use super::{pick, save_exts, save_filters};
use std::time::Duration;
/// #2999: a dialog that "cancels" at once is a portal that failed: asked again without a
/// parent, then the built-in browser. A pick, or a cancel after a while, is the answer.
#[test]
fn an_instant_cancel_retries_then_falls_back() {
let quick = Duration::from_millis(200);
let slow_cancel = || async {
// The test polls this future by hand, with no async runtime, so a blocking sleep
// models a slow portal response.
std::thread::sleep(Duration::from_millis(250)); // NOSONAR
Vec::<u8>::new()
};
assert_eq!(pick(async { vec![1u8] }, async { vec![2] }, quick), Ok(vec![1]));
assert_eq!(pick(async { vec![] }, async { vec![2u8] }, quick), Ok(vec![2]), "asked again without a parent");
assert!(pick(async { Vec::<u8>::new() }, async { vec![] }, quick).is_err(), "the built-in browser");
assert_eq!(pick(slow_cancel(), async { vec![2u8] }, quick), Ok(vec![]), "a real cancel isn't asked again");
assert_eq!(pick(async { vec![] }, slow_cancel(), quick), Ok(vec![]), "the second dialog cancelled for real");
}
/// Giving the portal Save dialog up cancels the request the launcher armed, and a request
/// that has already answered is not affected by a later cancel.
#[cfg(all(unix, not(target_os = "macos")))]
#[test]
fn cancelling_a_pending_portal_request_marks_its_token() {
let handle = super::CancelHandle::default();
let armed = handle.arm();
assert!(!armed.token.is_cancelled());
handle.cancel();
assert!(armed.token.is_cancelled());
let answered = handle.arm();
handle.disarm(answered.id);
handle.cancel();
assert!(!answered.token.is_cancelled(), "an answered request is no longer cancelled");
}
/// A request that finishes late must not disarm the token of a request started after it:
/// otherwise the newer Save dialog would become uncancellable.
#[cfg(all(unix, not(target_os = "macos")))]
#[test]
fn a_late_answer_keeps_the_newer_requests_token() {
let handle = super::CancelHandle::default();
let abandoned = handle.arm();
let newer = handle.arm();
handle.disarm(abandoned.id);
handle.cancel();
assert!(newer.token.is_cancelled(), "the newer request is still armed");
assert!(!abandoned.token.is_cancelled(), "only the armed request is cancelled");
}
/// #1399: the Save dialog's type list has one named entry per format, the suggested one first,
/// every savable extension exactly once.
#[test]
fn save_dialog_lists_one_named_type_per_format() {
let filters = save_filters("report.odt");
assert_eq!(filters.len(), wordcraft_engine::io::SAVE_EXTS.len());
assert_eq!(filters[0].1, vec!["odt".to_string()]);
assert!(filters[0].0.contains("OpenDocument"), "{}", filters[0].0);
let all: Vec<&String> = filters.iter().flat_map(|(_, e)| e).collect();
for e in wordcraft_engine::io::SAVE_EXTS {
assert_eq!(all.iter().filter(|x| x.as_str() == *e).count(), 1, "{e}");
}
assert!(filters.iter().all(|(l, e)| !l.trim().is_empty() && e.len() == 1));
let mut labels: Vec<&String> = filters.iter().map(|(l, _)| l).collect();
labels.sort();
labels.dedup();
assert_eq!(labels.len(), filters.len(), "labels are distinct");
// Unknown names fall back to Word's format first.
assert_eq!(save_filters("no extension")[0].1, vec!["docx".to_string()]);
}
/// #689: the Save dialog's default extension is the suggested name's own format, so a file
/// name the user types without one is saved in the document's format instead of coming back
/// bare and failing.
#[test]
fn save_dialog_defaults_to_the_suggested_format() {
assert_eq!(save_exts("novel.docx")[0], "docx");
assert_eq!(save_exts("report.odt")[0], "odt");
assert_eq!(save_exts("annual report.pdf")[0], "pdf");
assert_eq!(save_exts("notes.md")[0], "md");
assert_eq!(save_exts("notes.markdown")[0], "md");
// A suggested name always has an extension; anything unreadable falls back to Word's.
assert_eq!(save_exts("no extension")[0], "docx");
assert_eq!(save_exts("mystery.rtf2")[0], "docx");
// Every savable format is still offered, once.
let exts = save_exts("novel.docx");
assert!(wordcraft_engine::io::SAVE_EXTS.iter().all(|e| exts.iter().any(|x| x == e)));
assert_eq!(exts.len(), wordcraft_engine::io::SAVE_EXTS.len());
}
}
-330
View File
@@ -1,330 +0,0 @@
//! Graphics instance configuration applied before wgpu can initialize any driver: Windows
//! backends and the DirectX 12 shader compiler, and the Intel Mac indirect-validation skip.
// On macOS only the indirect-validation items are used outside tests. Elsewhere it is the other
// way round, so those two carry their own `allow`.
#![cfg_attr(target_os = "macos", allow(dead_code))]
use eframe::{
NativeOptions,
egui_wgpu::WgpuSetup,
wgpu::{Backends, DeviceType, Dx12Compiler, InstanceFlags},
};
/// wgpu compiles its indirect-call validation compute shaders inside `request_device`. On old
/// Intel Macs (HD Graphics 5000 on Big Sur, #2652) Metal's Intel
/// compiler aborts on them, the device is lost and eframe exits before the window opens. WordCraft
/// issues no indirect draws or dispatches, so Intel Macs skip them; every other GPU keeps wgpu's
/// default. Same fix as PhotoCraft's storytold/PhotoCraft#3171.
///
/// `x86_64` is the build's architecture. An x86_64 build also runs on Apple silicon under Rosetta
/// (#5199), so it skips only when the machine itself isn't Apple silicon.
#[cfg_attr(not(target_os = "macos"), allow(dead_code))]
pub fn skips_indirect_validation(macos: bool, x86_64: bool) -> bool {
// Short-circuits: only x86_64 macOS builds ask the system.
macos && x86_64 && !runs_on_apple_silicon()
}
/// Whether the machine is Apple silicon, also when this process is translated by Rosetta:
/// `hw.optional.arm64` describes the hardware, not the process. Assumes not (an Intel Mac) when
/// the system can't tell.
#[cfg_attr(not(target_os = "macos"), allow(dead_code))]
fn runs_on_apple_silicon() -> bool {
cfg!(target_os = "macos")
&& std::process::Command::new("/usr/sbin/sysctl")
.args(["-n", "hw.optional.arm64"])
.output()
.is_ok_and(|out| out.status.success() && out.stdout.trim_ascii() == b"1")
}
/// Leaves wgpu's indirect-call validation out of the instance eframe creates when `skip`.
/// `WGPU_VALIDATION_INDIRECT_CALL=1` still turns it back on.
#[cfg_attr(not(target_os = "macos"), allow(dead_code))]
pub fn configure_indirect_validation(options: &mut NativeOptions, skip: bool) {
if !skip {
return;
}
if let WgpuSetup::CreateNew(create) = &mut options.wgpu_options.wgpu_setup {
create.instance_descriptor.flags = create.instance_descriptor.flags.difference(InstanceFlags::VALIDATION_INDIRECT_CALL).with_env();
}
}
/// What the start-up probe learned about one DirectX 12 adapter.
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub struct Dx12Adapter {
/// `Cpu` is WARP (Microsoft's software rasteriser): it works, but every frame is drawn on the
/// processor, which makes the app lag on older machines (#316).
pub device_type: DeviceType,
/// Whether the adapter offers the limits eframe will ask for when it creates the device.
pub meets_limits: bool,
}
/// The backends to initialize on Windows.
///
/// An explicit `backend_override` (normally `Backends::from_env()`, i.e. `WGPU_BACKEND`) always
/// wins. Otherwise DirectX 12 only, as long as `dx12_graphics` is set and `dx12_adapters` (what a
/// DirectX 12-only probe found) contains a usable hardware GPU. Without one, OpenGL is the way to
/// the GPU: graphics chips whose driver has no DirectX 12 support (Intel 4th generation on Windows
/// 11, #316) still have an OpenGL driver, and GL can't reach the AMD driver crash described in
/// [`configure_backends`], because an AMD GPU with a driver shows up as a DirectX 12 adapter and
/// keeps us on DirectX 12. When DirectX 12 offers only WARP, it stays enabled next to GL as a last
/// resort for machines without an OpenGL driver either (virtual machines): wgpu prefers any GPU
/// over a software adapter, so it's only picked when GL has nothing better.
///
/// `dx12_graphics` is false on 32-bit Windows. wgpu creates the graphics pipeline through
/// `ID3D12Device2::CreatePipelineState`, and that stream is aligned to 8 bytes. The 32-bit runtime
/// expects pointer alignment (4), so creation returns `E_INVALIDARG` ("The parameter is incorrect")
/// and the process exits before the first frame. Compute pipelines use the older API and succeed,
/// which is why startup gets as far as the egui pipeline and then quits. OpenGL does not use that
/// stream.
pub fn choose_backends(backend_override: Option<Backends>, dx12_adapters: &[Dx12Adapter], dx12_graphics: bool) -> Backends {
if let Some(backends) = backend_override {
return backends;
}
if !dx12_graphics {
return Backends::GL;
}
let hardware = |a: &&Dx12Adapter| a.device_type != DeviceType::Cpu;
if dx12_adapters.iter().filter(hardware).any(|a| a.meets_limits) {
Backends::DX12
} else if !dx12_adapters.is_empty() && !dx12_adapters.iter().any(|a| hardware(&a)) {
Backends::DX12 | Backends::GL
} else {
// No DirectX 12 adapter at all, or only GPUs that can't run the app: GL alone, so a
// DirectX 12 GPU that would fail device creation isn't picked over the OpenGL one.
Backends::GL
}
}
/// Restricts the wgpu instance eframe creates to `backends`.
pub fn configure_backends(options: &mut NativeOptions, backends: Backends) {
if let WgpuSetup::CreateNew(create) = &mut options.wgpu_options.wgpu_setup {
// eframe's default includes GL. Creating that backend can crash inside AMD's
// atio6axx.dll before adapter selection or any Rust error handling runs, so the
// window never appears. Choosing an adapter afterwards is too late: only leaving GL
// out of the instance avoids it. This matches the verified WGPU_BACKEND=dx12
// workaround without mutating process environment variables.
create.instance_descriptor.backends = backends;
}
}
/// The DirectX 12 shader compiler: FXC (`d3dcompiler_47.dll`, part of Windows) unless `env`
/// (normally `WGPU_DX12_COMPILER`, wgpu's own variable: `fxc`, `dxc`, `auto`…) names another.
///
/// #603: wgpu's default (`Auto`) uses DXC, loading whichever `dxcompiler.dll` the DLL search path
/// finds first. WordCraft ships none, so that copy belongs to another program. Without a matching
/// `dxil.dll` beside it, DXC warns that the DXIL is unsigned; wgpu takes the warning for a compile
/// error, its own indirect-validation pipeline fails, the device is lost and eframe exits before
/// the first frame. FXC is always there and compiles everything egui's shaders need.
pub fn dx12_compiler(env: Option<&str>) -> Dx12Compiler {
let Some(value) = env else { return Dx12Compiler::Fxc };
value.parse().unwrap_or_else(|e| {
log::warn!("graphics: WGPU_DX12_COMPILER={value:?} ignored ({e}), using FXC");
Dx12Compiler::Fxc
})
}
/// Makes the wgpu instance eframe creates compile DirectX 12 shaders with `compiler`.
pub fn configure_dx12_compiler(options: &mut NativeOptions, compiler: Dx12Compiler) {
if let WgpuSetup::CreateNew(create) = &mut options.wgpu_options.wgpu_setup {
create.instance_descriptor.backend_options.dx12.shader_compiler = compiler;
}
}
/// Chooses the backends ([`choose_backends`]) and applies them to `options`. Without a
/// `backend_override` this first probes DirectX 12 with a short-lived instance of its own, which
/// is dropped before eframe creates the real one.
#[cfg(target_os = "windows")]
pub fn configure(options: &mut NativeOptions, backend_override: Option<Backends>) {
// First, so the probe's instance doesn't load a stray `dxcompiler.dll` either.
let compiler = dx12_compiler(std::env::var("WGPU_DX12_COMPILER").ok().as_deref());
log::info!("graphics: DirectX 12 shader compiler {compiler:?}");
configure_dx12_compiler(options, compiler);
let backends = match backend_override {
Some(backends) => {
log::info!("graphics: WGPU_BACKEND override, backends {backends:?}");
backends
}
None => {
// 32-bit: skip the DirectX 12 probe. A capable GPU would be selected, then
// CreatePipelineState fails and the app exits with no window.
let dx12_graphics = cfg!(not(target_arch = "x86"));
let adapters = if dx12_graphics { probe_dx12(options) } else { Vec::new() };
let backends = choose_backends(None, &adapters, dx12_graphics);
if dx12_graphics {
log::info!("graphics: {} DirectX 12 adapter(s) {adapters:?}, backends {backends:?}", adapters.len());
} else {
log::info!("graphics: 32-bit Windows uses OpenGL; DirectX 12 graphics pipeline creation fails");
}
backends
}
};
configure_backends(options, backends);
}
/// Lists the DirectX 12 adapters, checking each against the limits eframe's device descriptor
/// will require. Empty when this build has no DirectX 12 backend.
#[cfg(target_os = "windows")]
fn probe_dx12(options: &NativeOptions) -> Vec<Dx12Adapter> {
use eframe::wgpu::{Instance, InstanceDescriptor};
// `Instance::new` panics when the build has no backend for the platform.
if !Instance::enabled_backend_features().contains(Backends::DX12) {
return Vec::new();
}
let WgpuSetup::CreateNew(create) = &options.wgpu_options.wgpu_setup else {
return Vec::new();
};
let instance = Instance::new(InstanceDescriptor {
backends: Backends::DX12,
backend_options: create.instance_descriptor.backend_options.clone(),
..InstanceDescriptor::new_without_display_handle()
});
pollster::block_on(instance.enumerate_adapters(Backends::DX12))
.iter()
.map(|adapter| {
let info = adapter.get_info();
let required = (create.device_descriptor)(adapter).required_limits;
let meets_limits = required.check_limits(&adapter.limits());
log::info!("graphics: DirectX 12 adapter {:?} ({:?}, driver {:?}), limits ok: {meets_limits}", info.name, info.device_type, info.driver);
Dx12Adapter { device_type: info.device_type, meets_limits }
})
.collect()
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn intel_macs_skip_the_indirect_validation_shaders() {
// #2652: Metal's Intel compiler aborted on them, losing the device before the window opened.
// An x86_64 build on Apple silicon (Rosetta) isn't an Intel Mac (#5199).
assert_eq!(skips_indirect_validation(true, true), !host_is_apple_silicon());
// Apple silicon, Windows and Linux keep wgpu's validation.
for (macos, intel) in [(true, false), (false, true), (false, false)] {
assert!(!skips_indirect_validation(macos, intel), "macos={macos} intel={intel}");
}
let mut options = NativeOptions::default();
let WgpuSetup::CreateNew(before) = &options.wgpu_options.wgpu_setup else {
panic!("default native options must create a wgpu instance");
};
let before = before.instance_descriptor.flags;
configure_indirect_validation(&mut options, false);
let WgpuSetup::CreateNew(create) = &options.wgpu_options.wgpu_setup else {
panic!("default native options must create a wgpu instance");
};
assert_eq!(create.instance_descriptor.flags, before, "flags untouched when not skipping");
if std::env::var_os("WGPU_VALIDATION_INDIRECT_CALL").is_none() {
configure_indirect_validation(&mut options, true);
let WgpuSetup::CreateNew(create) = &options.wgpu_options.wgpu_setup else {
panic!("default native options must create a wgpu instance");
};
assert!(!create.instance_descriptor.flags.contains(InstanceFlags::VALIDATION_INDIRECT_CALL));
}
}
/// Whether the machine running the tests is Apple silicon, whatever this build's architecture.
fn host_is_apple_silicon() -> bool {
cfg!(target_os = "macos")
&& std::process::Command::new("/usr/sbin/sysctl")
.args(["-n", "hw.optional.arm64"])
.output()
.is_ok_and(|out| out.status.success() && out.stdout.trim_ascii() == b"1")
}
/// #5199: an x86_64 build running under Rosetta on Apple silicon isn't an Intel Mac and keeps
/// wgpu's indirect-call validation.
#[test]
fn x86_64_builds_on_apple_silicon_keep_indirect_validation() {
if !host_is_apple_silicon() {
return;
}
// What main.rs passes from an x86_64 build.
assert!(!skips_indirect_validation(true, true), "Rosetta build on Apple silicon must keep validation");
let mut options = NativeOptions::default();
let WgpuSetup::CreateNew(before) = &options.wgpu_options.wgpu_setup else {
panic!("default native options must create a wgpu instance");
};
let before = before.instance_descriptor.flags;
configure_indirect_validation(&mut options, skips_indirect_validation(true, true));
let WgpuSetup::CreateNew(create) = &options.wgpu_options.wgpu_setup else {
panic!("default native options must create a wgpu instance");
};
assert_eq!(create.instance_descriptor.flags, before, "indirect-call validation kept");
}
fn configured_backends(backends: Backends) -> Backends {
let mut options = NativeOptions::default();
configure_backends(&mut options, backends);
let WgpuSetup::CreateNew(create) = options.wgpu_options.wgpu_setup else {
panic!("default native options must create a wgpu instance");
};
create.instance_descriptor.backends
}
const fn adapter(device_type: DeviceType, meets_limits: bool) -> Dx12Adapter {
Dx12Adapter { device_type, meets_limits }
}
#[test]
fn windows_default_initializes_only_dx12() {
// eframe's own default (PRIMARY | GL) would initialize OpenGL as well.
let WgpuSetup::CreateNew(eframe_default) = NativeOptions::default().wgpu_options.wgpu_setup else {
panic!("default native options must create a wgpu instance");
};
assert!(eframe_default.instance_descriptor.backends.contains(Backends::GL));
let gpu = [adapter(DeviceType::IntegratedGpu, true)];
assert_eq!(configured_backends(choose_backends(None, &gpu, true)), Backends::DX12);
}
#[test]
fn explicit_backend_override_is_preserved() {
let warp_only = [adapter(DeviceType::Cpu, true)];
for backends in [Backends::VULKAN, Backends::GL, Backends::DX12, Backends::VULKAN | Backends::DX12, Backends::empty()] {
// Whatever the probe would have found, the override wins (the probe doesn't run then).
assert_eq!(choose_backends(Some(backends), &[], true), backends);
assert_eq!(choose_backends(Some(backends), &warp_only, true), backends);
assert_eq!(configured_backends(backends), backends);
}
}
/// #603: DirectX 12 shaders compile with FXC, never a `dxcompiler.dll` found on the search
/// path, unless `WGPU_DX12_COMPILER` asks for it.
#[test]
fn dx12_compiles_with_fxc_unless_asked() {
assert!(matches!(dx12_compiler(None), Dx12Compiler::Fxc));
assert!(matches!(dx12_compiler(Some("bogus")), Dx12Compiler::Fxc));
assert!(matches!(dx12_compiler(Some("FXC")), Dx12Compiler::Fxc));
assert!(matches!(dx12_compiler(Some("dxc")), Dx12Compiler::DynamicDxc { .. }));
assert!(matches!(dx12_compiler(Some("auto")), Dx12Compiler::Auto));
let mut options = NativeOptions::default();
configure_dx12_compiler(&mut options, dx12_compiler(None));
let WgpuSetup::CreateNew(create) = options.wgpu_options.wgpu_setup else {
panic!("default native options must create a wgpu instance");
};
assert!(matches!(create.instance_descriptor.backend_options.dx12.shader_compiler, Dx12Compiler::Fxc));
}
#[test]
fn gl_when_dx12_has_no_usable_gpu() {
// #316: no DirectX 12 driver, so DirectX 12 offers only WARP (or nothing) and lags.
let warp_only = [adapter(DeviceType::Cpu, true)];
assert_eq!(choose_backends(None, &warp_only, true), Backends::GL | Backends::DX12);
assert_eq!(choose_backends(None, &[], true), Backends::GL);
// A GPU that can't create eframe's device: GL alone, so it isn't picked over the GL one.
let weak_gpu = [adapter(DeviceType::IntegratedGpu, false), adapter(DeviceType::Cpu, true)];
assert_eq!(choose_backends(None, &weak_gpu, true), Backends::GL);
// Any usable GPU keeps DirectX 12 only, next to WARP or a weaker GPU.
let mixed = [adapter(DeviceType::Cpu, true), adapter(DeviceType::IntegratedGpu, false), adapter(DeviceType::DiscreteGpu, true)];
assert_eq!(choose_backends(None, &mixed, true), Backends::DX12);
}
/// 32-bit Windows: a usable DirectX 12 GPU still starts on OpenGL. `WGPU_BACKEND` still wins.
#[test]
fn x86_uses_opengl_even_with_a_usable_gpu() {
let gpu = [adapter(DeviceType::IntegratedGpu, true)];
assert_eq!(choose_backends(None, &gpu, false), Backends::GL);
assert_eq!(choose_backends(Some(Backends::DX12), &gpu, false), Backends::DX12);
assert_eq!(choose_backends(Some(Backends::VULKAN), &[], false), Backends::VULKAN);
assert_eq!(configured_backends(choose_backends(None, &gpu, false)), Backends::GL);
}
}
-298
View File
@@ -1,298 +0,0 @@
//! Linux: draw on the GPU that drives the screen.
//!
//! egui-wgpu picks the discrete GPU by default (`PowerPreference::HighPerformance`). On a laptop
//! whose integrated GPU drives the panel, every frame drawn on the discrete one is copied across
//! to it, and the discrete GPU leaves its idle state whenever the window redraws: on an Intel HD
//! 530 + NVIDIA Quadro M4000M laptop, from 7 W at P8 to over 20 W at P0/P1. Forcing the integrated
//! GPU instead breaks desktops whose screen is on the discrete card (storytold/pdfcraft#96), and a
//! desktop with a monitor on each card needs the discrete one (storytold/pdfcraft#445). So the
//! choice follows the connected displays, as in craft-anything (storytold/craft-anything#571):
//!
//! 1. `WGPU_ADAPTER_NAME` (part of the adapter's name) or `WGPU_POWER_PREF` (`high`, `low`,
//! `none`), when set, decide;
//! 2. a connected built-in panel: the GPU behind it;
//! 3. displays on only one GPU: that GPU;
//! 4. otherwise (displays on several GPUs, or nothing readable): the discrete GPU, as before.
mod drm;
use drm::DisplayCard;
use eframe::wgpu::{DeviceType, PowerPreference};
/// What we know of one adapter wgpu offers.
#[derive(Debug, Clone, PartialEq, Eq)]
pub(crate) struct Candidate {
pub name: String,
pub vendor: u32,
pub device: u32,
/// `0000:05:00.0`, lowercase; empty when the driver doesn't say (always, under GL).
pub pci_slot: String,
pub device_type: DeviceType,
pub gl: bool,
}
/// What the person asked for through wgpu's environment variables.
#[derive(Debug, Clone, Default, PartialEq, Eq)]
pub(crate) struct Asked {
pub adapter_name: Option<String>,
pub power: Option<PowerPreference>,
}
/// Why an adapter was chosen, for the log.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub(crate) enum Why {
AskedByName,
AskedPower,
BuiltInPanel,
OnlyGpuWithDisplays,
Fallback,
}
/// The index of the adapter to draw with, and why; `None` when there is none.
pub(crate) fn choose(candidates: &[Candidate], cards: &[DisplayCard], asked: &Asked) -> Option<(usize, Why)> {
if let Some(want) = asked.adapter_name.as_deref().map(str::to_lowercase).filter(|w| !w.is_empty()) {
// As wgpu's own `WGPU_ADAPTER_NAME`: part of the name, any case. No match: the usual choice.
if let Some(i) = candidates.iter().position(|c| c.name.to_lowercase().contains(&want)) {
return Some((i, Why::AskedByName));
}
log::warn!("WGPU_ADAPTER_NAME={want}: no graphics adapter has that in its name");
}
if let Some(power) = asked.power {
return by_kind(candidates, power).map(|i| (i, Why::AskedPower));
}
let panels: Vec<&DisplayCard> = cards.iter().filter(|c| c.built_in_panel).collect();
let with_displays: Vec<&DisplayCard> = cards.iter().filter(|c| c.displays > 0).collect();
let target = if !panels.is_empty() {
Some((panels, Why::BuiltInPanel))
} else if with_displays.len() == 1 {
Some((with_displays, Why::OnlyGpuWithDisplays))
} else {
None
};
if let Some((wanted, why)) = target {
// Vulkan before GL for the same card; otherwise wgpu's order.
let found = candidates.iter().enumerate().filter(|(_, c)| wanted.iter().any(|card| drives(card, c, cards))).min_by_key(|(_, c)| c.gl);
if let Some((i, _)) = found {
return Some((i, why));
}
}
by_kind(candidates, PowerPreference::HighPerformance).map(|i| (i, Why::Fallback))
}
/// Whether `card` is the GPU behind `adapter`: by PCI address when the driver gives one, else by
/// PCI ids, which count only when no other card has the same ids (two cards of one model); GL
/// gives only a vendor, which counts only when no other card has that vendor.
fn drives(card: &DisplayCard, adapter: &Candidate, all: &[DisplayCard]) -> bool {
if !adapter.pci_slot.is_empty() && !card.pci_slot.is_empty() {
return adapter.pci_slot == card.pci_slot;
}
if adapter.device != 0 {
return adapter.vendor == card.vendor
&& adapter.device == card.device
&& all.iter().filter(|c| c.vendor == card.vendor && c.device == card.device).count() == 1;
}
adapter.vendor != 0 && adapter.vendor == card.vendor && all.iter().filter(|c| c.vendor == card.vendor).count() == 1
}
/// The first adapter in wgpu's own order for that power preference.
fn by_kind(candidates: &[Candidate], power: PowerPreference) -> Option<usize> {
let rank = |t: DeviceType| match (power, t) {
(PowerPreference::None, _) => 0,
(PowerPreference::LowPower, DeviceType::IntegratedGpu) | (PowerPreference::HighPerformance, DeviceType::DiscreteGpu) => 1,
(_, DeviceType::IntegratedGpu | DeviceType::DiscreteGpu) => 2,
(_, DeviceType::Other) => 3,
(_, DeviceType::VirtualGpu) => 4,
(_, DeviceType::Cpu) => 5,
};
candidates.iter().enumerate().min_by_key(|(_, c)| rank(c.device_type)).map(|(i, _)| i)
}
#[cfg(target_os = "linux")]
impl Candidate {
fn of(info: &eframe::wgpu::AdapterInfo) -> Self {
Candidate {
name: info.name.clone(),
vendor: info.vendor,
device: info.device,
pci_slot: info.device_pci_bus_id.to_ascii_lowercase(),
device_type: info.device_type,
gl: info.backend == eframe::wgpu::Backend::Gl,
}
}
}
#[cfg(target_os = "linux")]
impl Asked {
fn from_env() -> Self {
Asked { adapter_name: std::env::var("WGPU_ADAPTER_NAME").ok(), power: PowerPreference::from_env() }
}
}
/// The adapter that draws the window, among those that can draw to it.
#[cfg(target_os = "linux")]
pub(crate) fn pick_adapter(adapters: &[eframe::wgpu::Adapter], surface: Option<&eframe::wgpu::Surface<'_>>) -> Result<eframe::wgpu::Adapter, String> {
let usable: Vec<&eframe::wgpu::Adapter> = adapters.iter().filter(|a| surface.is_none_or(|s| a.is_surface_supported(s))).collect();
let candidates: Vec<Candidate> = usable.iter().map(|a| Candidate::of(&a.get_info())).collect();
let cards = drm::display_cards();
let picked = choose(&candidates, &cards, &Asked::from_env()).and_then(|(i, why)| Some((*usable.get(i)?, why)));
match picked {
Some((a, why)) => {
log::info!("drawing with {:?} ({why:?}); displays: {cards:?}", a.get_info());
Ok(a.clone())
}
None => Err(format!("None of the {} graphics adapters found can draw this window.", adapters.len())),
}
}
#[cfg(test)]
mod tests {
use super::*;
const AMD: (u32, u32, &str) = (0x1002, 0x1638, "0000:05:00.0");
const NVIDIA: (u32, u32, &str) = (0x10de, 0x25a2, "0000:01:00.0");
const INTEL: (u32, u32, &str) = (0x8086, 0xa780, "0000:00:02.0");
fn vulkan(name: &str, (vendor, device, slot): (u32, u32, &str), device_type: DeviceType) -> Candidate {
Candidate { name: name.into(), vendor, device, pci_slot: slot.into(), device_type, gl: false }
}
fn gl(name: &str, vendor: u32, device_type: DeviceType) -> Candidate {
Candidate { name: name.into(), vendor, device: 0, pci_slot: String::new(), device_type, gl: true }
}
fn card((vendor, device, slot): (u32, u32, &str), displays: u32, built_in_panel: bool) -> DisplayCard {
DisplayCard { vendor, device, pci_slot: slot.into(), displays, built_in_panel }
}
/// What wgpu offers on a laptop whose AMD iGPU drives the panel, in its order (Vulkan, then GL).
fn laptop_adapters() -> Vec<Candidate> {
vec![
vulkan("AMD Radeon Graphics (RADV RENOIR)", AMD, DeviceType::IntegratedGpu),
vulkan("NVIDIA GeForce RTX 3050 Laptop GPU", NVIDIA, DeviceType::DiscreteGpu),
gl("AMD Radeon Graphics (radeonsi, renoir)", 0x1002, DeviceType::IntegratedGpu),
]
}
/// The iGPU drives the panel; egui-wgpu's default drew on the discrete GPU.
#[test]
fn a_laptop_draws_on_the_gpu_behind_its_panel() {
let cards = [card(NVIDIA, 0, false), card(AMD, 1, true)];
assert_eq!(choose(&laptop_adapters(), &cards, &Asked::default()), Some((0, Why::BuiltInPanel)));
// The same with the discrete GPU listed first.
let mut swapped = laptop_adapters();
swapped.swap(0, 1);
assert_eq!(choose(&swapped, &cards, &Asked::default()), Some((1, Why::BuiltInPanel)));
}
/// The panel's GPU stays the choice with an external monitor on the discrete card as well.
#[test]
fn the_panel_wins_over_a_monitor_on_the_other_card() {
let cards = [card(NVIDIA, 1, false), card(AMD, 1, true)];
assert_eq!(choose(&laptop_adapters(), &cards, &Asked::default()), Some((0, Why::BuiltInPanel)));
}
/// A desktop with its monitor on the discrete card and the iGPU left on (a low-power default
/// draws on the iGPU there, and the window can't start: the case the panel rule must not break).
#[test]
fn a_desktop_draws_on_the_only_card_with_a_monitor() {
let adapters =
[vulkan("Intel(R) Graphics (RPL-S)", INTEL, DeviceType::IntegratedGpu), vulkan("NVIDIA GeForce RTX", NVIDIA, DeviceType::DiscreteGpu)];
let cards = [card(INTEL, 0, false), card(NVIDIA, 1, false)];
assert_eq!(choose(&adapters, &cards, &Asked::default()), Some((1, Why::OnlyGpuWithDisplays)));
// And on the iGPU when that's where the only monitor is.
let cards = [card(INTEL, 2, false), card(NVIDIA, 0, false)];
assert_eq!(choose(&adapters, &cards, &Asked::default()), Some((0, Why::OnlyGpuWithDisplays)));
}
/// A desktop with a monitor on each card: the discrete GPU, as before (an iGPU choice there
/// lost its surface as soon as it was set up).
#[test]
fn monitors_on_two_cards_keep_the_discrete_gpu() {
let adapters =
[vulkan("Intel(R) Graphics (RPL-S)", INTEL, DeviceType::IntegratedGpu), vulkan("NVIDIA GeForce RTX", NVIDIA, DeviceType::DiscreteGpu)];
let cards = [card(INTEL, 1, false), card(NVIDIA, 1, false)];
assert_eq!(choose(&adapters, &cards, &Asked::default()), Some((1, Why::Fallback)));
}
/// Nothing readable (no `/sys`, or a card the drivers don't name): the discrete GPU, as before.
#[test]
fn without_display_facts_the_old_choice_stands() {
assert_eq!(choose(&laptop_adapters(), &[], &Asked::default()), Some((1, Why::Fallback)));
let unknown = [card((0x1234, 0x1, "0000:09:00.0"), 1, true)];
assert_eq!(choose(&laptop_adapters(), &unknown, &Asked::default()), Some((1, Why::Fallback)));
assert_eq!(choose(&[], &[card(AMD, 1, true)], &Asked::default()), None);
}
/// The environment variables still decide: prime-run style requests reach the NVIDIA card.
#[test]
fn wgpu_environment_variables_decide_when_set() {
let cards = [card(NVIDIA, 0, false), card(AMD, 1, true)];
let asked = |name: Option<&str>, power: Option<PowerPreference>| Asked { adapter_name: name.map(Into::into), power };
assert_eq!(choose(&laptop_adapters(), &cards, &asked(None, Some(PowerPreference::HighPerformance))), Some((1, Why::AskedPower)));
assert_eq!(choose(&laptop_adapters(), &cards, &asked(None, Some(PowerPreference::LowPower))), Some((0, Why::AskedPower)));
assert_eq!(choose(&laptop_adapters(), &cards, &asked(None, Some(PowerPreference::None))), Some((0, Why::AskedPower)));
assert_eq!(choose(&laptop_adapters(), &cards, &asked(Some("nvidia"), None)), Some((1, Why::AskedByName)));
assert_eq!(choose(&laptop_adapters(), &cards, &asked(Some("RadeonSI"), Some(PowerPreference::HighPerformance))), Some((2, Why::AskedByName)));
// A name nothing has: the usual choice, not a failure.
assert_eq!(choose(&laptop_adapters(), &cards, &asked(Some("matrox"), None)), Some((0, Why::BuiltInPanel)));
assert_eq!(choose(&laptop_adapters(), &cards, &asked(Some(""), None)), Some((0, Why::BuiltInPanel)));
}
/// Under `WGPU_BACKEND=gl` there's no PCI address or device id: the vendor alone finds the
/// card, but only when no other card shares it.
#[test]
fn gl_adapters_are_matched_by_vendor_only_when_unambiguous() {
let adapters =
[gl("NVIDIA GeForce RTX 3050", 0x10de, DeviceType::Other), gl("AMD Radeon Graphics (radeonsi)", 0x1002, DeviceType::IntegratedGpu)];
let cards = [card(NVIDIA, 0, false), card(AMD, 1, true)];
assert_eq!(choose(&adapters, &cards, &Asked::default()), Some((1, Why::BuiltInPanel)));
// Two AMD cards: the vendor can't tell them apart, so the old choice stands.
let two_amd = [card((0x1002, 0x73df, "0000:03:00.0"), 0, false), card(AMD, 1, true)];
let adapters = [gl("AMD Radeon RX 6700", 0x1002, DeviceType::Other), gl("AMD Radeon Graphics", 0x1002, DeviceType::IntegratedGpu)];
assert_eq!(choose(&adapters, &two_amd, &Asked::default()), Some((1, Why::Fallback)));
}
/// Two adapters for the panel's card (Vulkan and GL): Vulkan, whatever the order.
#[test]
fn vulkan_comes_before_gl_for_the_same_card() {
let adapters = [
gl("AMD Radeon Graphics (radeonsi)", 0x1002, DeviceType::IntegratedGpu),
vulkan("AMD Radeon Graphics (RADV RENOIR)", AMD, DeviceType::IntegratedGpu),
];
assert_eq!(choose(&adapters, &[card(AMD, 1, true)], &Asked::default()), Some((1, Why::BuiltInPanel)));
}
/// A laptop with the lid closed and a monitor on the NVIDIA card: the switched-off panel isn't
/// read as one (`drm` skips it), so the card with the monitor draws.
#[test]
fn a_closed_laptop_draws_on_the_card_with_the_monitor() {
let cards = [card(NVIDIA, 1, false), card(AMD, 0, false)];
assert_eq!(choose(&laptop_adapters(), &cards, &Asked::default()), Some((1, Why::OnlyGpuWithDisplays)));
}
/// Two cards of one model have the same PCI ids: only the PCI address tells them apart. Without
/// one from the driver the display rule gives way to the old choice instead of guessing.
#[test]
fn identical_cards_are_told_apart_only_by_pci_address() {
const SECOND: (u32, u32, &str) = (0x10de, 0x25a2, "0000:02:00.0");
let cards = [card(NVIDIA, 0, false), card(SECOND, 1, false)];
let with_slots = [vulkan("NVIDIA A", NVIDIA, DeviceType::DiscreteGpu), vulkan("NVIDIA B", SECOND, DeviceType::DiscreteGpu)];
assert_eq!(choose(&with_slots, &cards, &Asked::default()), Some((1, Why::OnlyGpuWithDisplays)));
let without: Vec<Candidate> = with_slots.iter().cloned().map(|c| Candidate { pci_slot: String::new(), ..c }).collect();
assert_eq!(choose(&without, &cards, &Asked::default()), Some((0, Why::Fallback)));
}
/// The laptop this was measured on: Intel HD 530 behind the panel (`card2-eDP-1`), a Quadro
/// M4000M with nothing connected, and the Quadro offered first by wgpu.
#[test]
fn an_intel_and_nvidia_laptop_draws_on_intel() {
const HD530: (u32, u32, &str) = (0x8086, 0x191b, "0000:00:02.0");
const M4000M: (u32, u32, &str) = (0x10de, 0x13f9, "0000:01:00.0");
let adapters = [
vulkan("Quadro M4000M", M4000M, DeviceType::DiscreteGpu),
vulkan("Intel(R) HD Graphics 530 (SKL GT2)", HD530, DeviceType::IntegratedGpu),
];
let cards = [card(M4000M, 0, false), card(HD530, 1, true)];
assert_eq!(choose(&adapters, &cards, &Asked::default()), Some((1, Why::BuiltInPanel)));
}
}
-237
View File
@@ -1,237 +0,0 @@
//! Which graphics cards drive displays, as the system reports them (Linux: `/sys/class/drm`).
//!
//! A window drawn on one card and shown on a screen attached to another is copied across on every
//! frame, so the app draws on the card that drives the screen (see the parent module).
use std::io::Read as _;
use std::path::Path;
/// A graphics card and the displays connected to it.
#[derive(Debug, Clone, PartialEq, Eq)]
pub(crate) struct DisplayCard {
/// PCI vendor id: 0x1002 AMD, 0x10de NVIDIA, 0x8086 Intel.
pub vendor: u32,
/// PCI device id.
pub device: u32,
/// PCI address in the form `0000:05:00.0`, lowercase; empty when the system doesn't give one.
pub pci_slot: String,
/// Connected displays that are switched on, of any kind, built-in panel included.
pub displays: u32,
/// A connected, switched-on built-in panel (eDP, LVDS or DSI): this card drives a laptop's
/// own screen.
pub built_in_panel: bool,
}
/// Connector kinds that are a computer's own screen rather than a monitor plugged into it.
const BUILT_IN_PANELS: &[&str] = &["eDP", "LVDS", "DSI"];
/// At most this many entries are read from the DRM folder.
const MAX_ENTRIES: usize = 512;
/// At most this many bytes are read from one sysfs file.
const MAX_FILE: u64 = 4096;
/// The graphics cards on this computer and what's connected to them. Empty where the system
/// doesn't say (a sandbox without `/sys`).
#[cfg(target_os = "linux")]
pub(crate) fn display_cards() -> Vec<DisplayCard> {
display_cards_in(Path::new("/sys/class/drm"))
}
/// [`display_cards`] read from a DRM folder laid out like `/sys/class/drm`: a `cardN` entry per
/// card, with the card's PCI ids in `cardN/device/uevent`, and a `cardN-<kind>-<n>` entry per
/// connector, with `connected` or `disconnected` in its `status` and, where the kernel gives it,
/// `enabled` or `disabled` in its `enabled`. Cards without PCI ids (a firmware framebuffer) are
/// left out.
pub(crate) fn display_cards_in(drm: &Path) -> Vec<DisplayCard> {
let Ok(entries) = std::fs::read_dir(drm) else {
return Vec::new();
};
let mut names: Vec<String> = entries.take(MAX_ENTRIES).filter_map(|e| e.ok()?.file_name().into_string().ok()).collect();
names.sort();
let cards = names.iter().filter(|n| is_card(n));
cards
.filter_map(|card| {
let uevent = read_small(&drm.join(card).join("device").join("uevent"))?;
let (vendor, device) = pci_ids(&uevent)?;
let pci_slot = uevent_value(&uevent, "PCI_SLOT_NAME").unwrap_or_default().to_ascii_lowercase();
let prefix = format!("{card}-");
let mut out = DisplayCard { vendor, device, pci_slot, displays: 0, built_in_panel: false };
for connector in names.iter().filter_map(|n| n.strip_prefix(&prefix)) {
let dir = drm.join(format!("{prefix}{connector}"));
let status = read_small(&dir.join("status")).unwrap_or_default();
// A panel can be connected but switched off (a closed lid with a monitor in use):
// `enabled` then reads `disabled`, and it drives nothing. No `enabled`: as before.
let enabled = read_small(&dir.join("enabled")).unwrap_or_default();
if status.trim() != "connected" || enabled.trim() == "disabled" {
continue;
}
out.displays = out.displays.saturating_add(1);
if BUILT_IN_PANELS.contains(&connector_kind(connector)) {
out.built_in_panel = true;
}
}
Some(out)
})
.collect()
}
/// `card0`, `card12`: a card, not a connector (`card0-eDP-1`) or a render node.
fn is_card(name: &str) -> bool {
name.strip_prefix("card").is_some_and(|n| !n.is_empty() && n.bytes().all(|b| b.is_ascii_digit()))
}
/// `eDP-1` → `eDP`, `HDMI-A-1` → `HDMI-A`: the connector's name without its number.
fn connector_kind(connector: &str) -> &str {
match connector.rsplit_once('-') {
Some((kind, n)) if !n.is_empty() && n.bytes().all(|b| b.is_ascii_digit()) => kind,
_ => connector,
}
}
/// `PCI_ID=1002:1638` → (0x1002, 0x1638).
fn pci_ids(uevent: &str) -> Option<(u32, u32)> {
let (vendor, device) = uevent_value(uevent, "PCI_ID")?.split_once(':')?;
Some((u32::from_str_radix(vendor.trim(), 16).ok()?, u32::from_str_radix(device.trim(), 16).ok()?))
}
fn uevent_value<'a>(uevent: &'a str, key: &str) -> Option<&'a str> {
uevent.lines().find_map(|l| l.strip_prefix(key)?.strip_prefix('=')).map(str::trim)
}
fn read_small(path: &Path) -> Option<String> {
let mut text = String::new();
std::fs::File::open(path).ok()?.take(MAX_FILE).read_to_string(&mut text).ok()?;
Some(text)
}
#[cfg(test)]
mod tests {
use super::*;
use std::fs;
use std::path::PathBuf;
use std::sync::atomic::{AtomicUsize, Ordering};
/// A folder of its own under the system's temporary folder, removed when dropped.
struct TempDir(PathBuf);
impl TempDir {
fn new() -> Self {
static NEXT: AtomicUsize = AtomicUsize::new(0);
let n = NEXT.fetch_add(1, Ordering::Relaxed);
let dir = std::env::temp_dir().join(format!("wordcraft-drm-test-{}-{n}", std::process::id()));
let _ = fs::remove_dir_all(&dir);
fs::create_dir_all(&dir).expect("temp dir");
TempDir(dir)
}
fn path(&self) -> &Path {
&self.0
}
}
impl Drop for TempDir {
fn drop(&mut self) {
let _ = fs::remove_dir_all(&self.0);
}
}
/// A fake `/sys/class/drm`: cards as (name, PCI_ID, PCI_SLOT_NAME), connectors as
/// (name, status).
fn drm(cards: &[(&str, &str, &str)], connectors: &[(&str, &str)]) -> TempDir {
let dir = TempDir::new();
for (card, id, slot) in cards {
let device = dir.path().join(card).join("device");
fs::create_dir_all(&device).expect("card folder");
fs::write(device.join("uevent"), format!("DRIVER=x\nPCI_CLASS=30000\nPCI_ID={id}\nPCI_SLOT_NAME={slot}\n")).expect("uevent");
}
for (connector, status) in connectors {
let c = dir.path().join(connector);
fs::create_dir_all(&c).expect("connector folder");
fs::write(c.join("status"), format!("{status}\n")).expect("status");
}
fs::create_dir_all(dir.path().join("renderD128")).expect("render node");
fs::write(dir.path().join("version"), "drm 1.1.0\n").expect("version");
dir
}
/// A laptop whose AMD iGPU drives the panel, with an NVIDIA card that has no outputs.
#[test]
fn a_laptop_panel_is_found_on_the_integrated_gpu() {
let d = drm(
&[("card0", "10DE:25A2", "0000:01:00.0"), ("card1", "1002:1638", "0000:05:00.0")],
&[("card1-DP-1", "disconnected"), ("card1-eDP-1", "connected"), ("card1-HDMI-A-1", "disconnected")],
);
let cards = display_cards_in(d.path());
assert_eq!(
cards,
vec![
DisplayCard { vendor: 0x10de, device: 0x25a2, pci_slot: "0000:01:00.0".into(), displays: 0, built_in_panel: false },
DisplayCard { vendor: 0x1002, device: 0x1638, pci_slot: "0000:05:00.0".into(), displays: 1, built_in_panel: true },
]
);
}
/// A desktop with a monitor on each card: displays on both, no built-in panel.
#[test]
fn monitors_on_two_cards_are_counted_on_each() {
let d = drm(
&[("card0", "8086:A780", "0000:00:02.0"), ("card1", "10de:2206", "0000:01:00.0")],
&[("card0-HDMI-A-1", "connected"), ("card1-DP-1", "connected"), ("card1-DP-2", "connected"), ("card1-DP-3", "disconnected")],
);
let cards = display_cards_in(d.path());
assert_eq!(cards.iter().map(|c| (c.displays, c.built_in_panel)).collect::<Vec<_>>(), vec![(1, false), (2, false)]);
}
/// `card10` is a different card from `card1`, and its connectors aren't `card1`'s.
#[test]
fn card_numbers_are_not_prefixes_of_each_other() {
let d = drm(&[("card1", "1002:1638", "0000:05:00.0"), ("card10", "10de:25a2", "0000:01:00.0")], &[("card10-DP-1", "connected")]);
let cards = display_cards_in(d.path());
assert_eq!(cards.iter().map(|c| (c.vendor, c.displays)).collect::<Vec<_>>(), vec![(0x1002, 0), (0x10de, 1)]);
}
/// LVDS and DSI panels are built in too; HDMI-A is a monitor, whatever its number.
#[test]
fn built_in_panels_are_told_from_monitors_by_connector_kind() {
assert_eq!(connector_kind("eDP-1"), "eDP");
assert_eq!(connector_kind("HDMI-A-1"), "HDMI-A");
assert_eq!(connector_kind("DSI-12"), "DSI");
assert_eq!(connector_kind("Virtual"), "Virtual");
let d = drm(&[("card0", "8086:9a49", "0000:00:02.0")], &[("card0-LVDS-1", "connected")]);
assert!(display_cards_in(d.path()).iter().all(|c| c.built_in_panel));
}
/// A firmware framebuffer has no PCI ids; unreadable or odd entries are skipped, never a panic.
#[test]
fn what_cant_be_read_is_left_out() {
let d = drm(&[("card0", "nonsense", ""), ("card1", "1002:", "")], &[("card0-Virtual-1", "connected")]);
fs::create_dir_all(d.path().join("card2")).expect("card without device");
fs::create_dir_all(d.path().join("card")).expect("bare name");
assert!(display_cards_in(d.path()).is_empty());
assert!(display_cards_in(&d.path().join("missing")).is_empty());
assert_eq!(pci_ids("PCI_ID=10de:25a2"), Some((0x10de, 0x25a2)));
assert_eq!(pci_ids("PCI_IDX=10de:25a2"), None);
}
/// A status of `unknown` (some virtual outputs) isn't a connected display.
#[test]
fn only_connected_counts() {
let d = drm(&[("card0", "1af4:1050", "0000:00:01.0")], &[("card0-Virtual-1", "unknown")]);
assert_eq!(display_cards_in(d.path()).first().map(|c| c.displays), Some(0));
}
/// A laptop with its lid closed and a monitor on the discrete card: the panel still reads
/// `connected` but is switched off, so it neither counts nor marks its card as the panel's.
#[test]
fn a_switched_off_panel_does_not_count() {
let d = drm(
&[("card0", "10de:25a2", "0000:01:00.0"), ("card1", "1002:1638", "0000:05:00.0")],
&[("card0-HDMI-A-1", "connected"), ("card1-eDP-1", "connected")],
);
fs::write(d.path().join("card0-HDMI-A-1").join("enabled"), "enabled\n").expect("enabled");
fs::write(d.path().join("card1-eDP-1").join("enabled"), "disabled\n").expect("enabled");
let cards = display_cards_in(d.path());
assert_eq!(cards.iter().map(|c| (c.vendor, c.displays, c.built_in_panel)).collect::<Vec<_>>(), vec![(0x10de, 1, false), (0x1002, 0, false)]);
}
}
-349
View File
@@ -1,349 +0,0 @@
//! The desktop app's logger: `log::` records go to standard error and to a log file.
//!
//! Without a logger every `log::warn!`/`log::error!` in the workspace (an unreadable part of a
//! .docx, a picture or font a PDF export had to leave out, a PNG that would not encode) vanished. A
//! launch from a desktop menu has no terminal, so the file is what a bug report can attach:
//! `<settings dir>/logs/wordcraft.log`, next to the preferences (`prefs_path` in `main.rs`). Each
//! start moves the previous log to `wordcraft.1.log` (and that one to `.2`), so the log of a run
//! that crashed survives the next launch. Runs without preferences (`WORDCRAFT_NO_PREFS`) log to
//! standard error only.
//!
//! Levels: `info` for WordCraft's own crates, `warn` for everything else (wgpu and naga are
//! chatty). `RUST_LOG` replaces that with env_logger-style directives: `debug`,
//! `warn,wordcraft_docx=trace`, `wgpu_core=info`. A directive ending in `*` matches every target
//! that starts with it (`wordcraft*=debug`).
//!
//! Records logged before the settings directory is known are kept (up to [`MAX_PENDING`]) and
//! written once the file is attached. Writing never panics: a file that can't be created or
//! written leaves standard error as the only sink.
//!
//! The panic hook ([`install_panic_hook`]) reports every panic, caught by `Session::run`'s guard or
//! not, through this logger. Text a panic message quotes between backticks (a slice of a string,
//! which can be the user's writing) is left out.
use std::fs::File;
use std::io::Write;
use std::path::{Path, PathBuf};
use std::sync::{Mutex, OnceLock, PoisonError};
use std::time::SystemTime;
use log::LevelFilter;
/// The current log file's name inside the log directory.
pub const LOG_FILE: &str = "wordcraft.log";
/// How many previous logs are kept (`wordcraft.1.log` … `wordcraft.<KEEP>.log`).
pub const KEEP: usize = 2;
/// The log file stops growing past this size (a runaway warning can't fill the disk).
pub const MAX_FILE_BYTES: u64 = 16 * 1024 * 1024;
/// Records kept in memory until the log file is attached.
pub const MAX_PENDING: usize = 512;
/// The built-in filter when `RUST_LOG` is unset or empty.
pub const DEFAULT_FILTER: &str = "warn,wordcraft*=info";
/// Per-target level filter parsed from env_logger-style directives.
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct Filter {
default: LevelFilter,
directives: Vec<(String, LevelFilter)>,
}
impl Filter {
/// Parse `spec`; unknown levels and empty parts are skipped. Without a bare level, targets no
/// directive names log errors only.
pub fn parse(spec: &str) -> Filter {
let mut f = Filter { default: LevelFilter::Error, directives: Vec::new() };
for part in spec.split(',').map(str::trim).filter(|p| !p.is_empty()) {
match part.split_once('=') {
Some((name, level)) => {
let name = name.trim();
if let (false, Some(level)) = (name.is_empty(), parse_level(level)) {
f.directives.push((name.to_owned(), level));
}
}
None => match parse_level(part) {
Some(level) => f.default = level,
// A bare target name: everything from it (env_logger does the same).
None => f.directives.push((part.to_owned(), LevelFilter::Trace)),
},
}
}
f
}
/// The level that applies to `target` (the most specific matching directive wins).
pub fn level_for(&self, target: &str) -> LevelFilter {
self.directives.iter().filter(|(name, _)| matches(name, target)).max_by_key(|(name, _)| name.len()).map_or(self.default, |(_, level)| *level)
}
/// The most verbose level any target can reach (for `log::set_max_level`).
pub fn max(&self) -> LevelFilter {
self.directives.iter().map(|(_, level)| *level).fold(self.default, Ord::max)
}
}
fn parse_level(s: &str) -> Option<LevelFilter> {
s.trim().parse().ok()
}
/// `name` matches `target` itself and its submodules (`a` matches `a` and `a::b`, not `ab`);
/// `name*` matches every target starting with `name`.
fn matches(name: &str, target: &str) -> bool {
match name.strip_suffix('*') {
Some(prefix) => target.starts_with(prefix),
None => target.strip_prefix(name).is_some_and(|rest| rest.is_empty() || rest.starts_with("::")),
}
}
/// `2026-10-08T07:59:17.728Z` (UTC, milliseconds). A clock before 1970 reads as the epoch (the
/// `duration_since` clamp); past the last date chrono can represent (year 262143) the proleptic
/// Gregorian date is kept via the 400-year cycle rather than falling back to the epoch, so the
/// output never changes for a value the old formatter accepted and logging never panics.
pub fn timestamp(t: SystemTime) -> String {
let since = t.duration_since(std::time::UNIX_EPOCH).unwrap_or_default();
let secs = since.as_secs();
let (days, rem) = (secs / 86_400, secs % 86_400);
let (y, m, d) = civil_from_days(days);
format!("{y:04}-{m:02}-{d:02}T{:02}:{:02}:{:02}.{:03}Z", rem / 3600, rem % 3600 / 60, rem % 60, since.subsec_millis())
}
/// Days since 1970-01-01 → proleptic Gregorian (year, month, day).
///
/// `timestamp` clamps a pre-1970 clock to the epoch, so `days` is an unsigned count that can run
/// past `NaiveDate`'s ±262143-year range. The Gregorian calendar repeats every 400 years
/// (146_097 days), so chrono converts the day within one cycle and whole cycles go back into the
/// year (an `i128`, then saturated into `i64`), keeping chrono as the only calendar logic and
/// reproducing the old `civil_from_days` result exactly without hand-rolled day math. 1970-01-01
/// is `num_days_from_ce` 719_163.
fn civil_from_days(days: u64) -> (i64, u32, u32) {
use chrono::Datelike;
let (cycles, rest) = (days / 146_097, days % 146_097);
// `rest + 719_163` is 719_163..865_259, always a valid CE day.
match i32::try_from(rest + 719_163).ok().and_then(chrono::NaiveDate::from_num_days_from_ce_opt) {
Some(d) => {
let y = i128::from(d.year()) + i128::from(cycles) * 400;
(i64::try_from(y).unwrap_or(i64::MAX), d.month(), d.day())
}
None => (1970, 1, 1), // unreachable
}
}
fn numbered(dir: &Path, n: usize) -> PathBuf {
if n == 0 { dir.join(LOG_FILE) } else { dir.join(format!("wordcraft.{n}.log")) }
}
/// Shift the previous logs up one (`.log` → `.1.log` → … → `.<KEEP>.log`, the oldest dropped)
/// and create a fresh, empty log file in `dir` (created if missing).
pub fn rotate(dir: &Path) -> std::io::Result<(PathBuf, File)> {
std::fs::create_dir_all(dir)?;
for n in (1..=KEEP).rev() {
match std::fs::rename(numbered(dir, n - 1), numbered(dir, n)) {
Err(e) if e.kind() != std::io::ErrorKind::NotFound => return Err(e),
_ => {}
}
}
let path = numbered(dir, 0);
let file = File::create(&path)?;
Ok((path, file))
}
/// One formatted log line: `<timestamp> <LEVEL> [<thread>] <target>: <message>\n`.
pub fn format_line(ts: &str, level: log::Level, thread: &str, target: &str, message: &str) -> String {
let message = message.strip_suffix('\n').unwrap_or(message);
format!("{ts} {level:<5} [{thread}] {target}: {message}\n")
}
/// Where formatted lines go besides standard error: kept in memory until a file is attached,
/// then appended to it until it reaches its size cap.
pub struct Sink {
file: Option<File>,
pending: Vec<String>,
dropped: usize,
written: u64,
max_bytes: u64,
capped: bool,
}
impl Sink {
pub fn new(max_bytes: u64) -> Sink {
Sink { file: None, pending: Vec::new(), dropped: 0, written: 0, max_bytes, capped: false }
}
/// Append `line` to the file, or keep it until [`Sink::attach`].
pub fn write(&mut self, line: &str) {
if self.file.is_none() {
if self.capped {
// No file is coming ([`Sink::no_file`]): standard error had the line.
} else if self.pending.len() < MAX_PENDING {
self.pending.push(line.to_owned());
} else {
self.dropped = self.dropped.saturating_add(1);
}
return;
}
self.append(line);
}
/// Start writing to `file` (a fresh one: the size cap starts over), first the lines kept so far.
pub fn attach(&mut self, file: File) {
self.file = Some(file);
self.written = 0;
self.capped = false;
for line in std::mem::take(&mut self.pending) {
self.append(&line);
}
if self.dropped > 0 {
let note = format!("{} earlier log lines were dropped before the log file was opened\n", self.dropped);
self.dropped = 0;
self.append(&note);
}
}
/// There will be no log file: forget the lines kept for it and keep no more.
pub fn no_file(&mut self) {
self.file = None;
self.pending = Vec::new();
self.dropped = 0;
self.capped = true;
}
fn append(&mut self, line: &str) {
if self.capped {
return;
}
let Some(file) = self.file.as_mut() else { return };
let len = u64::try_from(line.len()).unwrap_or(u64::MAX);
let text = if self.written.saturating_add(len) > self.max_bytes {
self.capped = true;
format!("log file reached {} bytes; later records go to standard error only\n", self.max_bytes)
} else {
self.written = self.written.saturating_add(len);
line.to_owned()
};
// A full disk or a vanished file must not take the app down: drop the file sink.
if file.write_all(text.as_bytes()).is_err() {
self.file = None;
self.capped = true;
}
}
}
/// The installed logger: a [`Filter`], standard error and a [`Sink`].
pub struct AppLogger {
filter: Filter,
stderr: bool,
sink: Mutex<Sink>,
}
impl AppLogger {
pub fn new(filter: Filter, stderr: bool) -> AppLogger {
AppLogger { filter, stderr, sink: Mutex::new(Sink::new(MAX_FILE_BYTES)) }
}
/// Rotate the logs in `dir` and send records to the fresh file; returns its path. On an error
/// standard error stays the only sink.
pub fn attach_dir(&self, dir: &Path) -> Result<PathBuf, String> {
// A thread that panicked while logging leaves the sink usable: take it back.
let mut sink = self.sink.lock().unwrap_or_else(PoisonError::into_inner);
match rotate(dir) {
Ok((path, file)) => {
sink.attach(file);
Ok(path)
}
Err(e) => {
sink.no_file();
Err(format!("{}: {e}", dir.display()))
}
}
}
/// No log file for this run (runs without preferences): log to standard error only.
pub fn no_file(&self) {
self.sink.lock().unwrap_or_else(PoisonError::into_inner).no_file();
}
}
impl log::Log for AppLogger {
fn enabled(&self, metadata: &log::Metadata<'_>) -> bool {
metadata.level() <= self.filter.level_for(metadata.target())
}
fn log(&self, record: &log::Record<'_>) {
if !self.enabled(record.metadata()) {
return;
}
// Formatted before the sink is locked, so a message that logs while it is formatted can't deadlock.
let thread = std::thread::current();
let line =
format_line(&timestamp(SystemTime::now()), record.level(), thread.name().unwrap_or("?"), record.target(), &record.args().to_string());
if self.stderr {
// No terminal (a Windows GUI build, a closed pipe) is not an error worth reporting.
let _ = std::io::stderr().write_all(line.as_bytes());
}
self.sink.lock().unwrap_or_else(PoisonError::into_inner).write(&line);
}
fn flush(&self) {}
}
/// Install the logger (filter from `RUST_LOG`, else [`DEFAULT_FILTER`]); `None` when another
/// logger was installed first. Call [`AppLogger::attach_dir`] once the settings directory is known.
pub fn install() -> Option<&'static AppLogger> {
static LOGGER: OnceLock<AppLogger> = OnceLock::new();
let spec = std::env::var("RUST_LOG").ok().filter(|s| !s.trim().is_empty());
let filter = Filter::parse(spec.as_deref().unwrap_or(DEFAULT_FILTER));
let max = filter.max();
let logger = LOGGER.get_or_init(|| AppLogger::new(filter, true));
log::set_logger(logger).ok()?;
log::set_max_level(max);
Some(logger)
}
/// Replace text a panic message quotes between backticks with `…`: std quotes the string it was
/// slicing (`byte index 5 is not a char boundary; … of `<the string>``), and that string can be
/// the user's writing. An unpaired backtick leaves the rest of the message out too.
pub fn redact_quoted(message: &str) -> String {
let mut out = String::with_capacity(message.len());
for (i, part) in message.split('`').enumerate() {
if i % 2 == 1 {
out.push_str("`…");
} else {
if i > 0 {
out.push('`');
}
out.push_str(part);
}
}
out
}
/// The text the panic hook logs: where it happened, the redacted message and, when captured
/// (`RUST_BACKTRACE`), the backtrace.
pub fn panic_report(location: Option<&str>, message: Option<&str>, backtrace: Option<&str>) -> String {
let message = message.map_or_else(|| "(no message)".to_owned(), redact_quoted);
let mut report = format!("panic at {}: {message}", location.unwrap_or("an unknown place"));
if let Some(trace) = backtrace {
report.push('\n');
report.push_str(trace.trim_end());
}
report
}
/// Report every panic (caught by `Session::run`'s guard or not) through the logger, so it reaches
/// the log file too; standard error alone when `RUST_LOG` turned errors off.
pub fn install_panic_hook() {
std::panic::set_hook(Box::new(|info| {
let location = info.location().map(ToString::to_string);
let trace = std::backtrace::Backtrace::capture();
let trace = (trace.status() == std::backtrace::BacktraceStatus::Captured).then(|| trace.to_string());
let report = panic_report(location.as_deref(), info.payload_as_str(), trace.as_deref());
if log::log_enabled!(log::Level::Error) {
log::error!("{report}");
} else {
// `eprintln!` panics on a broken stderr pipe, and a panic inside the panic hook aborts.
let _ = std::io::Write::write_fmt(&mut std::io::stderr(), format_args!("wordcraft: {report}\n"));
}
}));
}
#[cfg(test)]
mod tests;
-332
View File
@@ -1,332 +0,0 @@
use super::*;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::time::{Duration, UNIX_EPOCH};
fn temp_dir(tag: &str) -> PathBuf {
static N: AtomicUsize = AtomicUsize::new(0);
let d = std::env::temp_dir().join(format!("wordcraft-logging-{tag}-{}-{}", std::process::id(), N.fetch_add(1, Ordering::Relaxed)));
let _ = std::fs::remove_dir_all(&d);
d
}
fn read(path: &Path) -> String {
std::fs::read_to_string(path).expect("read log")
}
#[test]
fn the_default_filter_shows_wordcraft_info_and_other_crates_warnings() {
let f = Filter::parse(DEFAULT_FILTER);
assert_eq!(f.level_for("wordcraft"), LevelFilter::Info);
assert_eq!(f.level_for("wordcraft::control_server"), LevelFilter::Info);
assert_eq!(f.level_for("wordcraft_docx::package"), LevelFilter::Info);
assert_eq!(f.level_for("wordcraft_ui_egui"), LevelFilter::Info);
assert_eq!(f.level_for("wgpu_core::device"), LevelFilter::Warn);
assert_eq!(f.level_for("naga"), LevelFilter::Warn);
assert_eq!(f.max(), LevelFilter::Info);
}
#[test]
fn directives_follow_env_logger_and_the_most_specific_one_wins() {
let f = Filter::parse("info,wgpu_core=error,wordcraft_pdf=trace,wordcraft_pdf::fonts=off");
assert_eq!(f.level_for("eframe"), LevelFilter::Info);
assert_eq!(f.level_for("wgpu_core::instance"), LevelFilter::Error);
assert_eq!(f.level_for("wordcraft_pdf::images"), LevelFilter::Trace);
assert_eq!(f.level_for("wordcraft_pdf::fonts"), LevelFilter::Off);
assert_eq!(f.max(), LevelFilter::Trace);
// A module name is matched at `::` boundaries, not as a bare prefix.
assert_eq!(f.level_for("wgpu_core_extra"), LevelFilter::Info);
// A trailing `*` is a prefix.
assert_eq!(Filter::parse("wordcraft*=debug").level_for("wordcraft_layout::lines"), LevelFilter::Debug);
assert_eq!(Filter::parse("wordcraft*=debug").level_for("eframe"), LevelFilter::Error);
// A bare target name sets that target to the most verbose level, as env_logger does.
assert_eq!(Filter::parse("naga").level_for("naga::front"), LevelFilter::Trace);
assert_eq!(Filter::parse("naga").level_for("eframe"), LevelFilter::Error);
// Levels are case-insensitive and surrounding blanks are ignored.
assert_eq!(Filter::parse(" WARN , wordcraft = Debug ").level_for("wordcraft"), LevelFilter::Debug);
assert_eq!(Filter::parse(" WARN , wordcraft = Debug ").level_for("eframe"), LevelFilter::Warn);
}
#[test]
fn hostile_specs_never_panic_and_fall_back_sensibly() {
let long = "x".repeat(100_000);
let many = "a=info,".repeat(10_000);
for spec in [
"",
",,,",
"=",
"==",
"=debug",
"wordcraft=",
"nonsense=loud",
"🦀=info",
"*",
"*=",
"=*",
"a=b=c",
"warn,,wordcraft=DEBUG",
"\0",
"é::ü=trace",
&long,
&many,
] {
let f = Filter::parse(spec);
for target in ["", "wordcraft", "🦀", "a::b", "*"] {
let _ = f.level_for(target);
}
let _ = f.max();
}
assert_eq!(Filter::parse("warn,,wordcraft=DEBUG").level_for("wordcraft"), LevelFilter::Debug);
// An unknown level is skipped: that target keeps the default.
assert_eq!(Filter::parse("nonsense=loud").level_for("nonsense"), LevelFilter::Error);
assert_eq!(Filter::parse("wordcraft=").level_for("wordcraft"), LevelFilter::Error);
assert_eq!(Filter::parse("=debug").max(), LevelFilter::Error);
assert_eq!(Filter::parse("🦀=info").level_for("🦀::claw"), LevelFilter::Info);
}
#[test]
fn timestamps_are_utc_with_milliseconds() {
assert_eq!(timestamp(UNIX_EPOCH), "1970-01-01T00:00:00.000Z");
assert_eq!(timestamp(UNIX_EPOCH + Duration::from_millis(1_791_446_357_728)), "2026-10-08T07:59:17.728Z");
// Leap day, and the day after it.
assert_eq!(timestamp(UNIX_EPOCH + Duration::from_secs(1_709_164_800)), "2024-02-29T00:00:00.000Z");
assert_eq!(timestamp(UNIX_EPOCH + Duration::from_secs(1_709_251_199)), "2024-02-29T23:59:59.000Z");
assert_eq!(timestamp(UNIX_EPOCH + Duration::from_secs(1_709_251_200)), "2024-03-01T00:00:00.000Z");
// 2000 is a leap year (divisible by 400), 2100 is not.
assert_eq!(timestamp(UNIX_EPOCH + Duration::from_secs(951_782_400)), "2000-02-29T00:00:00.000Z");
assert_eq!(timestamp(UNIX_EPOCH + Duration::from_secs(4_107_542_400)), "2100-03-01T00:00:00.000Z");
// Before the epoch (a clock set wrong) clamps to the epoch instead of panicking.
assert_eq!(timestamp(UNIX_EPOCH - Duration::from_secs(5)), "1970-01-01T00:00:00.000Z");
// Past chrono's range (a clock set absurdly far ahead) keeps the proleptic Gregorian date
// the old formatter gave, rather than falling back to the epoch. FredApps' counterexample:
// UNIX_EPOCH + 10_000_000_000_000 s was 318857-05-20T17:46:40.000Z and must stay so.
// Windows' SystemTime holds only up to about year 30828, so this is checked where it fits.
if let Some(far) = UNIX_EPOCH.checked_add(Duration::from_secs(10_000_000_000_000)) {
assert_eq!(timestamp(far), "318857-05-20T17:46:40.000Z");
}
// Windows' SystemTime can't hold u64::MAX / 2 seconds, so it is only checked where it exists.
if let Some(far) = UNIX_EPOCH.checked_add(Duration::from_secs(u64::MAX / 2)) {
assert_eq!(timestamp(far), "292277026596-12-04T15:30:07.000Z");
}
// Years past 9999 keep the plain zero-padded year (no `+`).
assert_eq!(timestamp(UNIX_EPOCH + Duration::from_secs(253_402_300_800)), "10000-01-01T00:00:00.000Z");
}
#[test]
fn a_line_carries_time_level_thread_target_and_message() {
assert_eq!(
format_line("2026-10-08T07:59:17.728Z", log::Level::Warn, "main", "wordcraft_docx::package", "skipping unreadable zip entry 3"),
"2026-10-08T07:59:17.728Z WARN [main] wordcraft_docx::package: skipping unreadable zip entry 3\n"
);
// A multi-line message keeps its lines; the record still ends in one newline.
assert!(format_line("t", log::Level::Error, "w", "x", "a\nb\n").ends_with("x: a\nb\n"));
}
#[test]
fn rotation_keeps_the_previous_logs_and_starts_an_empty_file() {
let dir = temp_dir("rotate");
for run in 1..=4 {
let (path, _file) = rotate(&dir).expect("rotate");
assert_eq!(path, dir.join(LOG_FILE));
assert_eq!(read(&path), "");
std::fs::write(&path, format!("run {run}")).expect("write");
}
assert_eq!(read(&dir.join(LOG_FILE)), "run 4");
assert_eq!(read(&dir.join("wordcraft.1.log")), "run 3");
assert_eq!(read(&dir.join("wordcraft.2.log")), "run 2");
assert!(!dir.join("wordcraft.3.log").exists(), "only {KEEP} old logs are kept");
let _ = std::fs::remove_dir_all(&dir);
}
#[test]
fn rotation_into_an_unusable_directory_is_an_error_not_a_panic() {
let dir = temp_dir("blocked");
std::fs::create_dir_all(dir.parent().expect("parent")).expect("tmp");
std::fs::write(&dir, "a file where the directory should be").expect("block");
assert!(rotate(&dir).is_err());
let _ = std::fs::remove_file(&dir);
}
#[test]
fn lines_logged_before_the_file_exists_are_written_when_it_is_attached() {
let dir = temp_dir("pending");
let (path, file) = rotate(&dir).expect("rotate");
let mut sink = Sink::new(MAX_FILE_BYTES);
sink.write("early 1\n");
sink.write("early 2\n");
sink.attach(file);
sink.write("late\n");
assert_eq!(read(&path), "early 1\nearly 2\nlate\n");
let _ = std::fs::remove_dir_all(&dir);
}
#[test]
fn the_pending_buffer_is_bounded_and_says_how_much_it_dropped() {
let dir = temp_dir("bounded");
let (path, file) = rotate(&dir).expect("rotate");
let mut sink = Sink::new(MAX_FILE_BYTES);
for i in 0..MAX_PENDING + 5 {
sink.write(&format!("line {i}\n"));
}
sink.attach(file);
let text = read(&path);
assert_eq!(text.lines().filter(|l| l.starts_with("line ")).count(), MAX_PENDING);
assert!(text.contains("5 earlier log lines were dropped"), "{text}");
assert!(text.contains("line 0\n") && !text.contains(&format!("line {MAX_PENDING}\n")));
let _ = std::fs::remove_dir_all(&dir);
}
#[test]
fn exactly_a_full_pending_buffer_drops_nothing() {
let dir = temp_dir("full");
let (path, file) = rotate(&dir).expect("rotate");
let mut sink = Sink::new(MAX_FILE_BYTES);
for i in 0..MAX_PENDING {
sink.write(&format!("line {i}\n"));
}
sink.attach(file);
let text = read(&path);
assert_eq!(text.lines().count(), MAX_PENDING);
assert!(!text.contains("dropped"), "{text}");
let _ = std::fs::remove_dir_all(&dir);
}
#[test]
fn without_a_file_nothing_is_kept_in_memory() {
let mut sink = Sink::new(MAX_FILE_BYTES);
sink.write("early\n");
sink.no_file();
sink.write("late\n");
assert!(sink.pending.is_empty() && sink.dropped == 0);
}
#[test]
fn the_file_stops_at_its_size_cap_with_one_note() {
let dir = temp_dir("cap");
let (path, file) = rotate(&dir).expect("rotate");
let mut sink = Sink::new(100);
sink.attach(file);
for i in 0..50 {
sink.write(&format!("line {i:02} with some padding\n"));
}
let text = read(&path);
assert_eq!(text.lines().filter(|l| l.starts_with("line ")).count(), 3, "{text}");
assert_eq!(text.matches("log file reached").count(), 1, "{text}");
let _ = std::fs::remove_dir_all(&dir);
}
#[test]
fn the_logger_filters_records_and_writes_them_to_the_attached_file() {
use log::Log;
let dir = temp_dir("logger");
let logger = AppLogger::new(Filter::parse(DEFAULT_FILTER), false);
let record = |level, target: &'static str, msg: &'static str| {
logger.log(&log::Record::builder().level(level).target(target).args(format_args!("{msg}")).build());
};
record(log::Level::Info, "wordcraft", "before the settings directory");
record(log::Level::Info, "wgpu_core::device", "too chatty");
let path = logger.attach_dir(&dir).expect("attach");
assert_eq!(path, dir.join(LOG_FILE));
record(log::Level::Warn, "wgpu_hal::vulkan", "a real warning");
record(log::Level::Error, "wordcraft_render", "PNG encode: bad size 0×0");
record(log::Level::Debug, "wordcraft", "below info");
let text = read(&path);
let lines: Vec<&str> = text.lines().collect();
assert_eq!(lines.len(), 3, "{text}");
assert!(lines[0].contains(" INFO [") && lines[0].ends_with("wordcraft: before the settings directory"), "{text}");
assert!(lines[1].ends_with("wgpu_hal::vulkan: a real warning"), "{text}");
assert!(lines[2].contains(" ERROR [") && lines[2].ends_with("wordcraft_render: PNG encode: bad size 0×0"), "{text}");
assert!(logger.enabled(&log::Metadata::builder().level(log::Level::Info).target("wordcraft_ui_egui").build()));
assert!(!logger.enabled(&log::Metadata::builder().level(log::Level::Info).target("naga").build()));
// Attaching again rotates: the first log becomes `.1`.
logger.attach_dir(&dir).expect("attach again");
assert_eq!(read(&dir.join("wordcraft.1.log")), text);
let _ = std::fs::remove_dir_all(&dir);
}
#[test]
fn records_from_many_threads_are_whole_lines() {
use log::Log;
let dir = temp_dir("threads");
let logger = std::sync::Arc::new(AppLogger::new(Filter::parse("info"), false));
let path = logger.attach_dir(&dir).expect("attach");
let workers: Vec<_> = (0..8)
.map(|t| {
let l = std::sync::Arc::clone(&logger);
std::thread::spawn(move || {
for i in 0..100 {
l.log(&log::Record::builder().level(log::Level::Info).target("wordcraft").args(format_args!("thread {t} record {i}")).build());
}
})
})
.collect();
for w in workers {
w.join().expect("worker");
}
let text = read(&path);
assert_eq!(text.lines().count(), 800);
assert!(text.lines().all(|l| l.contains(" wordcraft: thread ")), "{text}");
let _ = std::fs::remove_dir_all(&dir);
}
#[test]
fn attaching_to_an_unusable_directory_reports_an_error_and_keeps_logging() {
use log::Log;
let dir = temp_dir("unusable");
std::fs::create_dir_all(dir.parent().expect("parent")).expect("tmp");
std::fs::write(&dir, "not a directory").expect("block");
let logger = AppLogger::new(Filter::parse("info"), false);
logger.log(&log::Record::builder().level(log::Level::Error).target("x").args(format_args!("early")).build());
assert!(logger.attach_dir(&dir).is_err());
logger.log(&log::Record::builder().level(log::Level::Error).target("x").args(format_args!("still fine")).build());
// Nothing waits in memory for a file that won't come.
let sink = logger.sink.lock().expect("sink");
assert!(sink.pending.is_empty() && sink.file.is_none());
drop(sink);
let _ = std::fs::remove_file(&dir);
}
#[test]
fn a_poisoned_sink_still_logs() {
use log::Log;
let dir = temp_dir("poison");
let logger = std::sync::Arc::new(AppLogger::new(Filter::parse("info"), false));
let l = std::sync::Arc::clone(&logger);
let _ = std::thread::spawn(move || {
let _guard = l.sink.lock().expect("lock");
panic!("poison the sink");
})
.join();
assert!(logger.sink.is_poisoned());
let path = logger.attach_dir(&dir).expect("attach");
logger.log(&log::Record::builder().level(log::Level::Warn).target("wordcraft").args(format_args!("after the poison")).build());
assert!(read(&path).contains("wordcraft: after the poison"));
let _ = std::fs::remove_dir_all(&dir);
}
#[test]
fn panic_messages_leave_out_quoted_text() {
// What std says when a string is sliced inside a character: the string is the user's text.
let msg = "byte index 5 is not a char boundary; it is inside 'é' (bytes 4..6) of `Dear Ms Smith, my secret`";
assert_eq!(redact_quoted(msg), "byte index 5 is not a char boundary; it is inside 'é' (bytes 4..6) of `…`");
assert_eq!(redact_quoted("byte index 99 is out of range of `my diary`[...]"), "byte index 99 is out of range of `…`[...]");
assert_eq!(redact_quoted("a `b` c `d` e"), "a `…` c `…` e");
// An unpaired backtick hides the rest rather than risk leaking it.
assert_eq!(redact_quoted("of `half a sentence"), "of `…");
assert_eq!(
redact_quoted("no quotes: index out of bounds: the len is 3 but the index is 5"),
"no quotes: index out of bounds: the len is 3 but the index is 5"
);
assert_eq!(redact_quoted(""), "");
assert_eq!(redact_quoted("``"), "`…`");
assert_eq!(redact_quoted("🦀`🦀`🦀"), "🦀`…`🦀");
}
#[test]
fn a_panic_report_names_the_place_and_the_redacted_message() {
assert_eq!(
panic_report(Some("crates/engine/src/cmd/edit.rs:12:5"), Some("of `secret`"), None),
"panic at crates/engine/src/cmd/edit.rs:12:5: of `…`"
);
assert_eq!(panic_report(None, None, None), "panic at an unknown place: (no message)");
assert_eq!(panic_report(Some("a.rs:1:1"), Some("boom"), Some(" 0: main\n")), "panic at a.rs:1:1: boom\n 0: main");
}
+440 -545
View File
File diff suppressed because it is too large Load Diff
-906
View File
@@ -1,906 +0,0 @@
//! File › Save As through the XDG desktop portal on Linux and BSDs (#6180).
//!
//! The GTK file chooser behind the portal keeps the typed name when the user picks another file
//! type, and `rfd` 0.17 reads only the file name from the portal's answer, so `Document1.docx`
//! with PDF picked in the dropdown came back as `Document1.docx` and was saved as a Word document.
//! The portal's answer does say which type was picked (`current_filter`), so Save As asks the portal
//! itself over D-Bus via `zbus` and gives a name the dialog left alone that type's extension
//! ([`with_chosen_type`]). `rfd` stays the fallback (zenity, or no portal), and this can go once an
//! `rfd` release reads the picked type (upstream PolyMeilex/rfd#341).
//!
//! The dialog is attached to the window on X11 (`x11:<xid>`). On Wayland it has no parent: naming the
//! window to the portal needs an xdg-foreign handle, which takes `unsafe` code the workspace forbids.
use std::collections::HashMap;
use std::path::{Path, PathBuf};
use std::sync::atomic::{AtomicU32, Ordering};
use std::time::Duration;
use zbus::blocking::{MessageIterator, Proxy};
use zbus::zvariant::{OwnedObjectPath, OwnedValue, Value};
/// One file type in the dialog: its label and extensions (`("PDF (*.pdf)", ["pdf"])`).
pub type Filter = (String, Vec<String>);
/// Quicker than anyone can see a dialog and dismiss it (#2999).
const TOO_QUICK: Duration = Duration::from_millis(300);
/// A thread-safe cancellation token to signal cancellation of an ongoing save request.
#[derive(Clone, Debug, Default)]
pub struct CancelToken(std::sync::Arc<std::sync::atomic::AtomicBool>);
impl CancelToken {
/// Creates a new cancellation token in the active (not cancelled) state.
pub fn new() -> Self {
Self(std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false)))
}
/// Signals that the active save request should be cancelled.
pub fn cancel(&self) {
self.0.store(true, std::sync::atomic::Ordering::Relaxed);
}
/// Returns `true` if cancellation has been requested.
pub fn is_cancelled(&self) -> bool {
self.0.load(std::sync::atomic::Ordering::Relaxed)
}
}
impl PartialEq for CancelToken {
/// Compares two cancellation tokens by their current cancellation status.
fn eq(&self, other: &Self) -> bool {
self.is_cancelled() == other.is_cancelled()
}
}
impl Eq for CancelToken {}
/// A Save dialog request to pass to the desktop portal.
#[derive(Clone, Debug, Default, PartialEq, Eq)]
pub struct SaveRequest {
/// The portal's parent window identifier (`x11:<xid>`), or empty.
pub parent: String,
/// The name the dialog shows: the suggested file name (`Document1.docx`).
pub name: Option<String>,
/// The suggested file's name (`Document1.docx`): a name that comes back with its extension still
/// takes the extension of the type picked ([`with_chosen_type`]).
pub suggested: Option<String>,
/// The initial folder to open in, if any.
pub folder: Option<PathBuf>,
/// The list of filters offered in the dropdown.
pub filters: Vec<Filter>,
/// The index of the filter the dialog starts on.
pub current: Option<usize>,
/// Optional cancellation token allowing the caller to cancel a pending save request.
pub cancel: Option<CancelToken>,
/// Optional timeout after which a request waiting for a response is considered stalled.
pub timeout: Option<Duration>,
}
/// What the portal dialog returned: the path, as typed, and the filter chosen in the dropdown.
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct Saved {
/// The filesystem path chosen in the dialog.
pub path: PathBuf,
/// The filter chosen in the dropdown, if reported by the portal: `(label, extensions)`.
pub filter: Option<Filter>,
}
/// The portal's parent window identifier for `window`: `x11:<xid>` on X11, empty elsewhere.
///
/// On Wayland, exporting an xdg-foreign handle requires `unsafe` code forbidden by workspace rules
/// (`#![forbid(unsafe_code)]`, Rust Rule 1), so Wayland dialogs remain unparented, matching
/// PhotoCraft and VectorCraft.
pub fn parent_id(window: Option<eframe::wgpu::rwh::RawWindowHandle>) -> String {
use eframe::wgpu::rwh::RawWindowHandle;
match window {
Some(RawWindowHandle::Xlib(h)) => format!("x11:{:x}", h.window),
Some(RawWindowHandle::Xcb(h)) => format!("x11:{:x}", h.window.get()),
_ => String::new(),
}
}
/// Converts a filter tuple into the portal's wire format: label and a list of `(0, "*.ext")` glob pairs.
fn wire(filter: &Filter) -> (String, Vec<(u32, String)>) {
let globs = filter.1.iter().map(|e| (0u32, if e.is_empty() || e == "*" { "*".to_string() } else { format!("*.{e}") })).collect();
(filter.0.clone(), globs)
}
/// The `SaveFile` options dictionary for `req`, answering on `token`.
fn options<'a>(req: &'a SaveRequest, token: &'a str) -> HashMap<&'static str, Value<'a>> {
let mut o: HashMap<&'static str, Value<'a>> = HashMap::from([("handle_token", Value::from(token)), ("modal", Value::from(true))]);
if let Some(name) = &req.name {
o.insert("current_name", Value::from(name.as_str()));
}
if let Some(folder) = &req.folder {
// A byte string with its terminating NUL, as the portal specifies.
use std::os::unix::ffi::OsStrExt;
let mut bytes = folder.as_os_str().as_bytes().to_vec();
bytes.push(0);
o.insert("current_folder", Value::from(bytes));
}
if !req.filters.is_empty() {
let wired = req.filters.iter().map(wire).collect::<Vec<_>>();
o.insert("filters", Value::from(wired));
}
if let Some(f) = req.current.and_then(|i| req.filters.get(i)).or_else(|| req.filters.first()) {
o.insert("current_filter", Value::from(wire(f)));
}
o
}
/// Reads the portal's `Response`: code 0 with the first `uris` entry. 1 is Cancel, and 2 a dialog
/// closed some other way (e.g. Esc in GNOME): no file either. When code 2 arrives quicker than
/// [`TOO_QUICK`], the portal failed to show its dialog (#2999) and an error is returned so the
/// caller can fall back.
fn answer(code: u32, results: &HashMap<String, OwnedValue>, elapsed: Duration) -> Result<Option<Saved>, String> {
match code {
0 => {}
1 => return Ok(None),
2 if elapsed < TOO_QUICK => return Err("the save dialog closed at once".to_string()),
2 => return Ok(None),
_ => return Err(format!("the save dialog failed (portal response {code})")),
}
let uris: Vec<String> = results
.get("uris")
.ok_or_else(|| "no file in the portal's answer".to_string())?
.try_clone()
.map_err(|e| e.to_string())?
.try_into()
.map_err(|e: zbus::zvariant::Error| e.to_string())?;
let uri = uris.first().ok_or_else(|| "no file in the portal's answer".to_string())?;
let path = file_uri_path(uri).ok_or_else(|| format!("not a local file: {uri}"))?;
let filter = results.get("current_filter").and_then(|v| {
let val = v.try_clone().ok()?;
if let Ok((label, globs)) = <(String, Vec<(u32, String)>)>::try_from(val.clone()) {
let mut exts = Vec::new();
for (_, g) in globs {
let s = g.trim_start_matches('*').trim_start_matches('.');
if !s.is_empty() && s != "*" {
exts.push(s.to_ascii_lowercase());
}
}
if exts.is_empty() {
exts.extend(extract_exts_from_label(&label));
}
Some((label, exts))
} else if let Ok((label, exts)) = <(String, Vec<String>)>::try_from(val.clone()) {
Some((label, exts.into_iter().map(|s| s.to_ascii_lowercase()).collect()))
} else if let Ok(label) = String::try_from(val) {
let exts = extract_exts_from_label(&label);
Some((label, exts))
} else {
None
}
});
Ok(Some(Saved { path, filter }))
}
/// Extracts file extensions from a filter label such as `"PDF (*.pdf)"` or `"*.pdf"`.
fn extract_exts_from_label(label: &str) -> Vec<String> {
let text = if let Some(inside) = label.split('(').nth(1).and_then(|s| s.split(')').next()) { inside } else { label };
text.split(|c: char| c == ';' || c == ',' || c.is_whitespace())
.filter_map(|part| {
let s = part.trim().trim_start_matches('*').trim_start_matches('.');
if s.is_empty() || s == "*" || s.contains('/') || s.contains('\\') { None } else { Some(s.to_ascii_lowercase()) }
})
.collect()
}
/// Converts a `file://` URI from the portal into a local `PathBuf`.
/// Returns `None` for non-local URIs or invalid percent-encoding.
pub fn file_uri_path(uri: &str) -> Option<PathBuf> {
let rest = uri.strip_prefix("file://")?;
// Only local files: `file:///…` or `file://localhost/…`.
let rest = rest.strip_prefix("localhost").unwrap_or(rest);
if !rest.starts_with('/') {
return None;
}
let bytes = rest.as_bytes();
let mut out = Vec::with_capacity(bytes.len());
let mut i = 0;
while i < bytes.len() {
if bytes.get(i) == Some(&b'%') {
let hex = bytes.get(i + 1..i + 3).and_then(|h| std::str::from_utf8(h).ok()).and_then(|h| u8::from_str_radix(h, 16).ok())?;
out.push(hex);
i = i.saturating_add(3);
} else if let Some(&b) = bytes.get(i) {
out.push(b);
i = i.saturating_add(1);
} else {
break;
}
}
use std::os::unix::ffi::OsStringExt;
Some(PathBuf::from(std::ffi::OsString::from_vec(out)))
}
/// Returns the index of the chosen filter in `filters` by matching the picked index, or the first filter
/// if only one was offered.
fn chosen_type(filters: &[Filter], picked: Option<usize>) -> Option<usize> {
match picked {
Some(i) if i < filters.len() => Some(i),
None if filters.len() == 1 => Some(0),
_ => None,
}
}
/// Returns `path` with the extension of the file type picked in the save dialog (`chosen`),
/// where the dialog left the suggested name's extension alone (#6180).
///
/// The GTK file chooser keeps the typed name when another type is picked. Only a name that
/// still has the extension the dialog opened with (`opened_with`, e.g. `Document1.docx` with
/// PDF picked) or none gets the type's extension, as PolyMeilex/rfd#341 does. An extension the
/// user explicitly typed that WordCraft saves (e.g. `art.txt` with PDF untouched) is kept,
/// and so does one of the type's own extensions. Any extension that WordCraft does not save
/// (e.g. `scan.2024`) is treated as part of the stem, and the type's extension is added.
pub fn with_chosen_type(path: &Path, opened_with: Option<&str>, chosen: &[String]) -> PathBuf {
let Some(first) = chosen.first() else { return path.to_path_buf() };
let ext = path.extension().and_then(|e| e.to_str()).map(str::to_ascii_lowercase);
let opened_ext = opened_with
.and_then(|n| Path::new(n).extension())
.and_then(|e| e.to_str())
.map(str::to_ascii_lowercase)
.filter(|e| wordcraft_engine::io::SAVE_EXTS.contains(&e.as_str()));
match ext {
Some(ext) if chosen.contains(&ext) => path.to_path_buf(),
Some(ext) if opened_ext.as_ref() == Some(&ext) => path.with_extension(first),
Some(ext) if wordcraft_engine::io::SAVE_EXTS.contains(&ext.as_str()) => path.to_path_buf(),
_ => {
let mut name = path.as_os_str().to_owned();
name.push(".");
name.push(first);
PathBuf::from(name)
}
}
}
/// Returns true if `path` exists as a file, directory, or symlink on disk.
fn entry_exists(path: &Path) -> bool {
match path.symlink_metadata() {
Ok(_) => true,
Err(e) => e.kind() != std::io::ErrorKind::NotFound,
}
}
/// Closes the active portal request handle by calling `org.freedesktop.portal.Request.Close`.
pub fn close_request(conn: &zbus::blocking::Connection, portal: Option<&str>, handle: &OwnedObjectPath) {
const DESKTOP: &str = "org.freedesktop.portal.Desktop";
const REQUEST: &str = "org.freedesktop.portal.Request";
let dest = portal.unwrap_or(DESKTOP);
if let Ok(proxy) = Proxy::new(conn, dest, handle.as_str(), REQUEST) {
let _ = proxy.call_method("Close", &());
}
}
/// RAII guard that closes an open portal request handle if dropped before being disarmed.
struct RequestGuard<'a> {
conn: &'a zbus::blocking::Connection,
portal: Option<String>,
handle: Option<OwnedObjectPath>,
}
impl<'a> RequestGuard<'a> {
/// Creates a new guard for the given request `handle`.
fn new(conn: &'a zbus::blocking::Connection, portal: Option<String>, handle: OwnedObjectPath) -> Self {
Self { conn, portal, handle: Some(handle) }
}
/// Disarms the guard when a response has been successfully received, preventing `Close` from being called on drop.
fn disarm(&mut self) {
self.handle = None;
}
/// Returns a reference to the request handle, if still active.
fn handle(&self) -> Option<&OwnedObjectPath> {
self.handle.as_ref()
}
}
impl<'a> Drop for RequestGuard<'a> {
/// Closes the active portal request handle when dropped unless disarmed.
fn drop(&mut self) {
if let Some(handle) = self.handle.take() {
close_request(self.conn, self.portal.as_deref(), &handle);
}
}
}
/// Asks the XDG desktop portal on `conn` for the `SaveFile` dialog of `req` and waits for its answer.
pub fn save_file(conn: &zbus::blocking::Connection, req: &SaveRequest) -> Result<Option<Saved>, String> {
const DESKTOP: &str = "org.freedesktop.portal.Desktop";
const REQUEST: &str = "org.freedesktop.portal.Request";
static NEXT: AtomicU32 = AtomicU32::new(0);
let token = format!("wordcraft_save_{}_{}", std::process::id(), NEXT.fetch_add(1, Ordering::Relaxed));
// Listen before asking, on every request path: a portal older than version 0.9 ignores
// `handle_token` and answers on the request path it returns, and its answer can come before
// the call's reply. The stream keeps every `Response` from the time it is registered.
let dbus = zbus::blocking::fdo::DBusProxy::new(conn).map_err(|e| e.to_string())?;
let rule = zbus::MatchRule::builder()
.msg_type(zbus::message::Type::Signal)
.sender(DESKTOP)
.and_then(|b| b.interface(REQUEST))
.and_then(|b| b.member("Response"))
.map_err(|e| e.to_string())?
.build();
dbus.add_match_rule(rule).map_err(|e| e.to_string())?;
let owner_rule = zbus::MatchRule::builder()
.msg_type(zbus::message::Type::Signal)
.sender("org.freedesktop.DBus")
.and_then(|b| b.interface("org.freedesktop.DBus"))
.and_then(|b| b.member("NameOwnerChanged"))
.map_err(|e| e.to_string())?
.build();
dbus.add_match_rule(owner_rule).map_err(|e| e.to_string())?;
let responses = MessageIterator::from(conn);
let chooser = Proxy::new(conn, DESKTOP, "/org/freedesktop/portal/desktop", "org.freedesktop.portal.FileChooser").map_err(|e| e.to_string())?;
let start = std::time::Instant::now();
let call = chooser.call_method("SaveFile", &(req.parent.as_str(), "Save As", options(req, &token))).map_err(|e| e.to_string())?;
let handle: OwnedObjectPath = call.body().deserialize().map_err(|e| e.to_string())?;
let portal = call.header().sender().map(|s| s.as_str().to_string());
let mut guard = RequestGuard::new(conn, portal.clone(), handle);
let (tx, rx) = std::sync::mpsc::channel();
let _listener = std::thread::Builder::new().name("portal save listener".into()).spawn(move || {
for msg in responses.filter_map(Result::ok) {
if tx.send(msg).is_err() {
break;
}
}
});
let reply = loop {
if req.cancel.as_ref().is_some_and(CancelToken::is_cancelled) {
return Err(ERR_CANCELLED.to_string());
}
match rx.recv_timeout(Duration::from_millis(100)) {
Ok(m) => {
let header = m.header();
if header.path().map(|p| p.as_str()) == guard.handle().map(|h| h.as_str()) && header.sender().map(|s| s.as_str()) == portal.as_deref()
{
break Ok(m);
}
#[allow(clippy::collapsible_if)]
if header.interface().map(|i| i.as_str()) == Some("org.freedesktop.DBus")
&& header.member().map(|m| m.as_str()) == Some("NameOwnerChanged")
{
if let Ok((name, old_owner, "")) = m.body().deserialize::<(&str, &str, &str)>() {
if (name == DESKTOP || portal.as_deref() == Some(name)) && (portal.is_none() || portal.as_deref() == Some(old_owner)) {
break Err("the desktop portal terminated while the save dialog was open".to_string());
}
if name.starts_with("org.freedesktop.impl.portal.desktop") {
break Err("the desktop portal backend terminated while the save dialog was open".to_string());
}
}
}
}
Err(std::sync::mpsc::RecvTimeoutError::Timeout) => {
if req.timeout.is_some_and(|t| start.elapsed() >= t) {
break Err("the save dialog request timed out".to_string());
}
}
Err(std::sync::mpsc::RecvTimeoutError::Disconnected) => {
break Err("the save dialog closed without an answer".to_string());
}
}
}?;
guard.disarm();
let elapsed = start.elapsed();
let (code, results): (u32, HashMap<String, OwnedValue>) = reply.body().deserialize().map_err(|e| e.to_string())?;
answer(code, &results, elapsed)
}
/// Returns true if `path` is located in the XDG document portal (`/run/user/<uid>/doc/…`, or
/// `/run/flatpak/doc/…` inside a Flatpak sandbox).
fn is_document_portal(path: &Path) -> bool {
let s = path.to_string_lossy();
((s.starts_with("/run/user/") || s.starts_with("/var/run/user/")) && s.contains("/doc/")) || s.starts_with("/run/flatpak/doc/")
}
/// Error message returned when a pending save request was cancelled by the caller.
pub const ERR_CANCELLED: &str = "the save dialog request was cancelled";
/// Returns true if `err` represents a save request cancelled by the caller (not a cancel in the
/// dialog itself, which is `Ok(None)`).
pub fn is_cancelled_error(err: &str) -> bool {
err == ERR_CANCELLED
}
/// Error message returned when the portal dialog does not report the selected filter and
/// the saved filename does not explicitly specify a distinct format.
pub const ERR_AMBIGUOUS_FILTER: &str = "the save dialog did not report which file type was picked";
/// Returns true if `err` represents an ambiguous filter error from the desktop portal.
pub fn is_ambiguous_filter_error(err: &str) -> bool {
err == ERR_AMBIGUOUS_FILTER
}
/// Finds the index of the filter in `filters` matching `saved_filter`, first by exact label,
/// then by unambiguous match against the filter's extensions.
fn match_filter(filters: &[Filter], saved_filter: Option<&Filter>) -> Option<usize> {
let (label, exts) = saved_filter?;
if let Some(pos) = filters.iter().position(|(l, _)| l == label) {
return Some(pos);
}
if !exts.is_empty() {
let matching: Vec<usize> = filters
.iter()
.enumerate()
.filter(|(_, (_, f_exts))| exts.iter().any(|e| f_exts.iter().any(|fe| fe.eq_ignore_ascii_case(e))))
.map(|(i, _)| i)
.collect();
if matching.len() == 1 {
return matching.first().copied();
}
}
None
}
/// Returns true if the portal did not provide a unique matching filter when multiple filters were offered
/// and the user did not explicitly type a filename with a distinct supported format extension.
pub fn is_ambiguous_filter(saved: &Saved, req: &SaveRequest) -> bool {
if req.filters.len() <= 1 {
return false;
}
if match_filter(&req.filters, saved.filter.as_ref()).is_some() {
return false;
}
let ext = saved.path.extension().and_then(|e| e.to_str()).map(str::to_ascii_lowercase);
let suggested_ext = req
.suggested
.as_deref()
.and_then(|n| Path::new(n).extension())
.and_then(|e| e.to_str())
.map(str::to_ascii_lowercase)
.filter(|e| wordcraft_engine::io::SAVE_EXTS.contains(&e.as_str()));
match ext {
Some(ext) if wordcraft_engine::io::SAVE_EXTS.contains(&ext.as_str()) => suggested_ext.as_ref() == Some(&ext),
_ => true,
}
}
/// Save As on Linux and BSDs: the portal's dialog, with the file name given the extension of the
/// file type picked in the dropdown. When that changes the name to one that already exists on disk,
/// the dialog opens again under the new name, so the portal asks before replacing it (it asked only
/// about the typed name).
pub fn save_as(conn: &zbus::blocking::Connection, mut req: SaveRequest) -> Result<Option<PathBuf>, String> {
loop {
let Some(saved) = save_file(conn, &req)? else { return Ok(None) };
if is_ambiguous_filter(&saved, &req) {
return Err(ERR_AMBIGUOUS_FILTER.to_string());
}
let picked = match_filter(&req.filters, saved.filter.as_ref());
let exts: &[String] = match chosen_type(&req.filters, picked) {
Some(i) => req.filters.get(i).map(|(_, e)| e.as_slice()).unwrap_or(&[]),
None => &[],
};
let path = with_chosen_type(&saved.path, req.suggested.as_deref(), exts);
let needs_reopen = entry_exists(&path) || (path != saved.path && is_document_portal(&saved.path));
if path == saved.path || !needs_reopen {
return Ok(Some(path));
}
req.name = path.file_name().map(|n| n.to_string_lossy().into_owned());
req.suggested = req.name.clone();
req.folder = path.parent().map(Path::to_path_buf);
req.current = picked;
}
}
#[cfg(test)]
mod tests {
use super::*;
/// #6180: the file type picked in the save dialog gives the name its extension where the
/// dialog left the one it opened with, and only there.
#[test]
fn the_picked_file_type_gives_the_name_its_extension() {
let exts = |e: &[&str]| e.iter().map(|s| s.to_string()).collect::<Vec<_>>();
let (pdf, docx) = (exts(&["pdf"]), exts(&["docx", "docm"]));
let opened = Some("Document1.docx");
let cases = [
// PDF picked, the name as the dialog opened (or renamed, its extension kept).
("/docs/Document1.docx", opened, &pdf, "/docs/Document1.pdf"),
("/docs/letter.docx", opened, &pdf, "/docs/letter.pdf"),
("/docs/LETTER.DOCX", opened, &pdf, "/docs/LETTER.pdf"),
// No extension: takes the picked type's extension.
("/docs/report", opened, &pdf, "/docs/report.pdf"),
// An extension WordCraft doesn't save is part of the name.
("/docs/scan.2024", opened, &pdf, "/docs/scan.2024.pdf"),
// An opened extension WordCraft doesn't save (e.g. .5 in Report 1.5) is kept as part of the stem.
("/docs/Report 1.5", Some("Report 1.5"), &docx, "/docs/Report 1.5.docx"),
// Typed, an extension WordCraft saves is the user's: kept, whatever the type says.
("/docs/notes.txt", opened, &pdf, "/docs/notes.txt"),
("/docs/page.html", opened, &pdf, "/docs/page.html"),
("/docs/file.rtf", opened, &pdf, "/docs/file.rtf"),
// Already the type's: kept.
("/docs/letter.pdf", opened, &pdf, "/docs/letter.pdf"),
("/docs/letter.PDF", opened, &pdf, "/docs/letter.PDF"),
// The dialog opened on a .dotx template: that is the extension the type replaces.
("/docs/memo.dotx", Some("memo.dotx"), &pdf, "/docs/memo.pdf"),
("/docs/doc.docx", Some("memo.dotx"), &pdf, "/docs/doc.docx"),
// Word document picked for a file named without extension.
("/docs/contract", opened, &docx, "/docs/contract.docx"),
];
for (typed, opened_with, chosen, want) in cases {
assert_eq!(
with_chosen_type(Path::new(typed), opened_with, chosen),
PathBuf::from(want),
"failed for typed={typed}, opened_with={opened_with:?}"
);
}
// No type picked: the name as typed is kept.
assert_eq!(with_chosen_type(Path::new("/docs/report.docx"), opened, &[]), PathBuf::from("/docs/report.docx"));
}
#[test]
fn file_uris_become_local_paths() {
assert_eq!(file_uri_path("file:///home/me/Document1.docx"), Some(PathBuf::from("/home/me/Document1.docx")));
assert_eq!(file_uri_path("file:///home/me/A%20b%C3%A9.pdf"), Some(PathBuf::from("/home/me/A bé.pdf")));
assert_eq!(file_uri_path("file://localhost/tmp/x.pdf"), Some(PathBuf::from("/tmp/x.pdf")));
assert_eq!(file_uri_path("file:///tmp/a%ZZ.pdf"), None);
assert_eq!(file_uri_path("file:///tmp/a%"), None);
assert_eq!(file_uri_path("file:///tmp/a%2"), None);
assert_eq!(file_uri_path("sftp://host/x.pdf"), None);
assert_eq!(file_uri_path("file://host/x.pdf"), None);
assert_eq!(file_uri_path("http://example.com/doc.pdf"), None);
}
#[test]
fn x11_windows_are_named_to_the_portal() {
use eframe::wgpu::rwh::{RawWindowHandle, XlibWindowHandle};
assert_eq!(parent_id(Some(RawWindowHandle::Xlib(XlibWindowHandle::new(0x3a0000f)))), "x11:3a0000f");
assert_eq!(parent_id(None), "");
}
#[test]
fn answer_parses_portal_response_or_errors_on_quick_failure() {
let mut results = HashMap::new();
let uris: Vec<String> = vec!["file:///tmp/doc.docx".to_string()];
results.insert("uris".to_string(), OwnedValue::try_from(Value::from(uris)).unwrap());
let globs: Vec<(u32, String)> = vec![(0u32, "*.docx".to_string())];
let filter: (String, Vec<(u32, String)>) = ("Word Document (*.docx)".to_string(), globs);
results.insert("current_filter".to_string(), OwnedValue::try_from(Value::from(filter)).unwrap());
// Code 0 with filter
let ans = answer(0, &results, Duration::from_millis(1000)).unwrap();
assert_eq!(
ans,
Some(Saved { path: PathBuf::from("/tmp/doc.docx"), filter: Some(("Word Document (*.docx)".to_string(), vec!["docx".to_string()])) })
);
// Code 0 without filter
let mut results_no_filter = HashMap::new();
results_no_filter.insert("uris".to_string(), results.get("uris").unwrap().clone());
let ans_no_filter = answer(0, &results_no_filter, Duration::from_millis(1000)).unwrap();
assert_eq!(ans_no_filter, Some(Saved { path: PathBuf::from("/tmp/doc.docx"), filter: None }));
// Code 1 (Cancel)
assert_eq!(answer(1, &results, Duration::from_millis(50)).unwrap(), None);
// Code 2 quick (< TOO_QUICK)
assert!(answer(2, &results, Duration::from_millis(100)).is_err());
// Code 2 slow (>= TOO_QUICK)
assert_eq!(answer(2, &results, Duration::from_millis(500)).unwrap(), None);
// Code 3 (failure)
assert!(answer(3, &results, Duration::from_millis(1000)).is_err());
}
struct KillOnDrop(std::process::Child);
impl Drop for KillOnDrop {
fn drop(&mut self) {
let _ = self.0.kill();
let _ = self.0.wait();
}
}
/// Configuration for spawning a mock portal daemon.
struct MockPortalConfig {
code: u32,
delay_reply: Option<Duration>,
exit_after_reply: bool,
send_response: bool,
close_called: Option<std::sync::Arc<std::sync::atomic::AtomicBool>>,
emit_backend_owner_loss: bool,
}
impl Default for MockPortalConfig {
fn default() -> Self {
Self { code: 0, delay_reply: None, exit_after_reply: false, send_response: true, close_called: None, emit_backend_owner_loss: false }
}
}
/// Spawns a mock portal daemon that answers `SaveFile` and handles `Close` according to `config`.
fn mock_portal_with_config(config: MockPortalConfig) -> Option<(zbus::blocking::Connection, KillOnDrop)> {
use std::io::BufRead as _;
let daemon = std::process::Command::new("dbus-daemon")
.args(["--session", "--nofork", "--print-address=1"])
.stdout(std::process::Stdio::piped())
.spawn()
.ok()?;
let mut guard = KillOnDrop(daemon);
let mut address = String::new();
std::io::BufReader::new(guard.0.stdout.take()?).read_line(&mut address).ok()?;
let address = address.trim().to_string();
let server =
zbus::blocking::connection::Builder::address(address.as_str()).ok()?.name("org.freedesktop.portal.Desktop").ok()?.build().ok()?;
let incoming = zbus::blocking::MessageIterator::from(&server);
let thread_address = address.clone();
std::thread::spawn(move || {
for msg in incoming {
let Ok(msg) = msg else { break };
let header = msg.header();
if header.message_type() != zbus::message::Type::MethodCall {
continue;
}
if header.member().map(|m| m.as_str()) == Some("Close") {
if let Some(flag) = &config.close_called {
flag.store(true, Ordering::Relaxed);
}
let _ = server.reply(&header, &());
continue;
}
if header.member().map(|m| m.as_str()) != Some("SaveFile") {
continue;
}
let Ok((_parent, _title, options)) = msg.body().deserialize::<(String, String, HashMap<String, OwnedValue>)>() else {
break;
};
let text = |key: &str| options.get(key).and_then(|v| String::try_from(v.try_clone().ok()?).ok());
let Some(sender) = header.sender().map(|s| s.as_str().trim_start_matches(':').replace('.', "_")) else { break };
let token = text("handle_token").unwrap_or_default();
let path = format!("/org/freedesktop/portal/desktop/request/{sender}/{token}");
let Ok(handle) = OwnedObjectPath::try_from(path.as_str()) else { break };
if config.exit_after_reply {
let _ = server.reply(&header, &handle);
drop(server);
break;
}
if config.emit_backend_owner_loss {
let _ = server.reply(&header, &handle);
let addr = thread_address.clone();
std::thread::spawn(move || {
std::thread::sleep(Duration::from_millis(50));
if let Ok(backend) = zbus::blocking::connection::Builder::address(addr.as_str())
.and_then(|b| b.name("org.freedesktop.impl.portal.desktop.gtk"))
.and_then(|b| b.build())
{
std::thread::sleep(Duration::from_millis(50));
drop(backend);
}
});
continue;
}
if config.send_response {
let to = header.sender().cloned().map(zbus::names::BusName::from);
let results: HashMap<&str, Value<'_>> = HashMap::new();
let _ = server.emit_signal(to, path.as_str(), "org.freedesktop.portal.Request", "Response", &(config.code, &results));
}
if let Some(delay) = config.delay_reply {
std::thread::sleep(delay);
}
if server.reply(&header, &handle).is_err() {
break;
}
}
});
let client = zbus::blocking::connection::Builder::address(address.as_str()).ok()?.build().ok()?;
Some((client, guard))
}
/// Spawns a mock portal daemon that answers `SaveFile`.
/// If `delay_reply` is set, it emits the Response signal immediately and delays the method
/// reply by that duration. If `exit_after_reply` is set, it replies to `SaveFile` and exits
/// without sending a `Response`.
fn mock_portal(code: u32, delay_reply: Option<Duration>, exit_after_reply: bool) -> Option<(zbus::blocking::Connection, KillOnDrop)> {
mock_portal_with_config(MockPortalConfig {
code,
delay_reply,
exit_after_reply,
send_response: true,
close_called: None,
emit_backend_owner_loss: false,
})
}
/// A delayed SaveFile method reply with an already-queued response code 2 measures elapsed time
/// from before calling SaveFile, so it is treated as a user cancellation rather than a quick
/// portal failure that re-opens another dialog.
#[test]
fn delayed_method_reply_with_queued_cancel_is_not_treated_as_quick_failure() {
let Some((client, _daemon)) = mock_portal(2, Some(Duration::from_millis(350)), false) else {
eprintln!("no dbus-daemon: skipped");
return;
};
let req = SaveRequest {
name: Some("test.docx".to_string()),
suggested: Some("test.docx".to_string()),
filters: vec![("Word Document (*.docx)".to_string(), vec!["docx".to_string()])],
..Default::default()
};
let res = save_file(&client, &req);
assert_eq!(res, Ok(None));
}
/// If the desktop portal terminates while a save dialog is open (e.g. crashing after replying
/// to SaveFile), save_file detects NameOwnerChanged and returns an error immediately.
#[test]
fn portal_terminating_while_open_returns_error() {
let Some((client, _daemon)) = mock_portal(0, None, true) else {
eprintln!("no dbus-daemon: skipped");
return;
};
let req = SaveRequest {
name: Some("test.docx".to_string()),
suggested: Some("test.docx".to_string()),
filters: vec![("Word Document (*.docx)".to_string(), vec!["docx".to_string()])],
..Default::default()
};
let res = save_file(&client, &req);
assert!(res.is_err(), "portal termination returns an error so rfd fallback runs: got {res:?}");
}
/// If the desktop portal backend implementation (e.g. GTK, GNOME, KDE) terminates while the
/// dialog is open, save_file detects NameOwnerChanged on the implementation service and returns
/// an error immediately so the rfd fallback can run.
#[test]
fn portal_backend_terminating_while_open_returns_error() {
let Some((client, _daemon)) =
mock_portal_with_config(MockPortalConfig { emit_backend_owner_loss: true, send_response: false, ..Default::default() })
else {
eprintln!("no dbus-daemon: skipped");
return;
};
let req = SaveRequest {
name: Some("test.docx".to_string()),
suggested: Some("test.docx".to_string()),
filters: vec![("Word Document (*.docx)".to_string(), vec!["docx".to_string()])],
..Default::default()
};
let res = save_file(&client, &req);
assert!(res.is_err(), "backend termination returns an error so rfd fallback runs: got {res:?}");
assert!(res.as_ref().unwrap_err().contains("backend terminated"), "expected backend termination error: got {res:?}");
}
/// When a save request is cancelled via `CancelToken`, save_file aborts waiting for the response,
/// calls Close on the portal request object path, and returns a cancellation error immediately.
#[test]
fn save_file_cancellation_closes_request_and_returns_error() {
let close_called = std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false));
let Some((client, _daemon)) =
mock_portal_with_config(MockPortalConfig { send_response: false, close_called: Some(close_called.clone()), ..Default::default() })
else {
eprintln!("no dbus-daemon: skipped");
return;
};
let cancel = CancelToken::new();
let cancel_thread = cancel.clone();
std::thread::spawn(move || {
std::thread::sleep(Duration::from_millis(50));
cancel_thread.cancel();
});
let req = SaveRequest {
name: Some("test.docx".to_string()),
suggested: Some("test.docx".to_string()),
filters: vec![("Word Document (*.docx)".to_string(), vec!["docx".to_string()])],
cancel: Some(cancel),
..Default::default()
};
let res = save_file(&client, &req);
assert!(res.is_err(), "cancelled request returns error: got {res:?}");
assert!(res.as_ref().unwrap_err().contains("cancelled"), "expected cancellation error: got {res:?}");
std::thread::sleep(Duration::from_millis(50));
assert!(close_called.load(Ordering::Relaxed), "Close must be called on portal request handle");
}
/// When a save request times out waiting for a stalled portal backend response, save_file aborts,
/// calls Close on the portal request object path, and returns a timeout error.
#[test]
fn save_file_timeout_closes_request_and_returns_error() {
let close_called = std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false));
let Some((client, _daemon)) =
mock_portal_with_config(MockPortalConfig { send_response: false, close_called: Some(close_called.clone()), ..Default::default() })
else {
eprintln!("no dbus-daemon: skipped");
return;
};
let req = SaveRequest {
name: Some("test.docx".to_string()),
suggested: Some("test.docx".to_string()),
filters: vec![("Word Document (*.docx)".to_string(), vec!["docx".to_string()])],
timeout: Some(Duration::from_millis(50)),
..Default::default()
};
let res = save_file(&client, &req);
assert!(res.is_err(), "timed out request returns error: got {res:?}");
assert!(res.as_ref().unwrap_err().contains("timed out"), "expected timeout error: got {res:?}");
std::thread::sleep(Duration::from_millis(50));
assert!(close_called.load(Ordering::Relaxed), "Close must be called on portal request handle");
}
/// `entry_exists` detects existing files and dangling symlinks, distinguishing them from
/// absent entries.
#[test]
fn entry_exists_detects_dangling_symlinks() {
let dir = tempfile::tempdir().unwrap();
let target = dir.path().join("nonexistent_target.txt");
let link = dir.path().join("dangling_link.txt");
#[cfg(unix)]
{
std::os::unix::fs::symlink(&target, &link).unwrap();
assert!(!link.exists(), "target does not exist so exists() is false");
assert!(entry_exists(&link), "symlink entry exists so entry_exists() is true");
}
assert!(!entry_exists(&target), "nonexistent file does not exist");
}
/// `is_document_portal` identifies paths within the XDG document portal mount, including the
/// `/run/flatpak/doc` mount a Flatpak sandbox sees.
#[test]
fn is_document_portal_detects_portal_fuse_paths() {
assert!(is_document_portal(Path::new("/run/user/1000/doc/1234abcd/test.docx")));
assert!(is_document_portal(Path::new("/var/run/user/1000/doc/by-app/app/test.docx")));
assert!(is_document_portal(Path::new("/run/flatpak/doc/1234abcd/test.docx")));
assert!(!is_document_portal(Path::new("/home/user/Documents/test.docx")));
assert!(!is_document_portal(Path::new("/tmp/doc/test.docx")));
assert!(!is_document_portal(Path::new("/run/flatpak/other/test.docx")));
}
/// When the portal omits `current_filter`, ambiguous saves (unchanged suggested extension or bare name)
/// are rejected, while an explicitly typed different format is accepted.
#[test]
fn ambiguous_filters_require_explicit_format() {
let exts = |e: &[&str]| e.iter().map(|s| s.to_string()).collect::<Vec<_>>();
let filters = vec![("Word Document (*.docx)".into(), exts(&["docx"])), ("PDF (*.pdf)".into(), exts(&["pdf"]))];
let req = SaveRequest { filters: filters.clone(), suggested: Some("Document1.docx".into()), ..Default::default() };
// Reported filter with matching label is not ambiguous.
let with_filter = Saved { path: PathBuf::from("/docs/Document1.docx"), filter: Some(("Word Document (*.docx)".into(), exts(&["docx"]))) };
assert_eq!(match_filter(&filters, with_filter.filter.as_ref()), Some(0));
assert!(!is_ambiguous_filter(&with_filter, &req));
// Reported filter with unmatched label but unambiguous extension (e.g. KDE *.pdf) is not ambiguous.
let kde_pdf_filter = Saved { path: PathBuf::from("/docs/Document1.docx"), filter: Some(("*.pdf".into(), exts(&["pdf"]))) };
assert_eq!(match_filter(&filters, kde_pdf_filter.filter.as_ref()), Some(1));
assert!(!is_ambiguous_filter(&kde_pdf_filter, &req));
// Reported filter with unrecognized extensions and unchanged suggested extension is ambiguous.
let unknown_filter = Saved { path: PathBuf::from("/docs/Document1.docx"), filter: Some(("Custom (*.xyz)".into(), exts(&["xyz"]))) };
assert_eq!(match_filter(&filters, unknown_filter.filter.as_ref()), None);
assert!(is_ambiguous_filter(&unknown_filter, &req));
// Multiple filters matching same extension is ambiguous when label doesn't match.
let duplicate_filters = vec![("Plain Text (*.txt)".into(), exts(&["txt"])), ("Text Document (*.txt)".into(), exts(&["txt"]))];
let dup_filter = ("*.txt".to_string(), exts(&["txt"]));
assert_eq!(match_filter(&duplicate_filters, Some(&dup_filter)), None);
// Missing filter with unchanged suggested extension is ambiguous.
let unchanged = Saved { path: PathBuf::from("/docs/Document1.docx"), filter: None };
assert!(is_ambiguous_filter(&unchanged, &req));
// Missing filter with bare filename is ambiguous.
let bare = Saved { path: PathBuf::from("/docs/Document1"), filter: None };
assert!(is_ambiguous_filter(&bare, &req));
// Missing filter but user explicitly typed a different format is NOT ambiguous.
let explicit = Saved { path: PathBuf::from("/docs/Document1.pdf"), filter: None };
assert!(!is_ambiguous_filter(&explicit, &req));
// Single filter offered is never ambiguous even if filter is omitted.
let single_req =
SaveRequest { filters: vec![("PDF (*.pdf)".into(), exts(&["pdf"]))], suggested: Some("Document1.docx".into()), ..Default::default() };
assert!(!is_ambiguous_filter(&unchanged, &single_req));
}
}
+169
View File
@@ -0,0 +1,169 @@
//! Where WordCraft keeps its settings and the files beside them: the settings store (with the
//! one-time import of the old `ui.json`), the custom dictionary and the user's fonts.
//!
//! Every path comes from [`wordcraft_control_key::settings_dir`], the one settings-folder rule,
//! so `config.toml`, `window.json`, logs, recovery, fonts and templates share a folder. Runs
//! without preferences (`WORDCRAFT_NO_PREFS`, agents' test runs) neither read nor write any of it.
use std::io::Read;
use std::path::{Path, PathBuf};
use craft::settings::{LegacyFile, LoadReport, Location, OpenOptions, SettingsStore, SharedSettings, Source};
use craft::window::restore::Store;
use wordcraft_ui_egui::prefs::{Prefs, import_legacy_window, legacy_ui_json};
/// The most of an old `ui.json` read for its window entry; the file is a few kilobytes.
const LEGACY_LIMIT: u64 = 8 << 20;
/// Whether this run reads and writes preferences. `WORDCRAFT_NO_PREFS` turns them off.
pub fn enabled() -> bool {
std::env::var_os("WORDCRAFT_NO_PREFS").is_none()
}
/// `custom-dictionary.txt` in the settings folder: the words Add to Dictionary kept (#40).
pub fn user_dict_path() -> Option<PathBuf> {
wordcraft_control_key::settings_dir().map(|b| b.join(wordcraft_engine::Session::USER_DICT_FILE))
}
/// Opens the settings store in the settings folder, or in memory when `enabled` is false or there
/// is no folder. On a first run after the move from `ui.json` the old file's settings are
/// imported, and its window entry goes into `placement`, which `LegacyFile::parse` cannot reach.
pub fn open(enabled: bool, placement: &mut Store) -> (SharedSettings<Prefs>, LoadReport) {
open_in(wordcraft_control_key::settings_dir().filter(|_| enabled), placement)
}
/// [`open`] over an explicit settings folder (`None` keeps everything in memory).
fn open_in(dir: Option<PathBuf>, placement: &mut Store) -> (SharedSettings<Prefs>, LoadReport) {
let mut options = match &dir {
Some(dir) => OpenOptions::new(Location::Dir(dir.clone())),
None => OpenOptions::new(Location::Memory),
};
if let Some(dir) = &dir {
options = options.legacy(vec![LegacyFile { path: dir.join("ui.json"), parse: legacy_ui_json }]);
}
let (store, report) = SettingsStore::<Prefs>::open_with(options);
if let Source::Legacy(path) = &report.source {
import_window(path, placement);
}
(SharedSettings::new(store), report)
}
/// Moves the window place of the legacy file at `path` into `placement` and saves it.
fn import_window(path: &Path, placement: &mut Store) {
let mut bytes = Vec::new();
if let Err(e) = std::fs::File::open(path).and_then(|f| f.take(LEGACY_LIMIT).read_to_end(&mut bytes)) {
log::debug!("preferences: cannot read {} for its window place: {e}", path.display());
return;
}
import_legacy_window(&bytes, placement);
if let Err(e) = placement.save() {
log::warn!("window place: {e}");
}
}
/// Loads the words of the custom dictionary file at `path` into the spell checker, and counts them
/// as loaded settings: the words only the file has are in `Prefs::dictionary`, so the app's
/// preferences list is the whole dictionary (#3773).
pub fn load_user_dictionary(settings: &SharedSettings<Prefs>, path: &Path) {
let words = wordcraft_proof::load_user_dictionary(path);
settings.lock().update(|prefs| {
for word in words {
if !prefs.dictionary.contains(&word) {
prefs.dictionary.push(word);
}
}
});
}
/// Fonts the user added (#582) live in `fonts` in the settings folder: load them, and store fonts
/// added later there. Runs without preferences neither read nor keep them.
pub fn load_user_fonts() {
if !enabled() {
return;
}
let Some(dir) = wordcraft_control_key::settings_dir().map(|d| d.join("fonts")) else { return };
let (loaded, skipped) = wordcraft_fonts::FontDb::global().load_user_fonts(&dir);
if !loaded.is_empty() || !skipped.is_empty() {
log::info!("user fonts: {} loaded, {} skipped from {}", loaded.len(), skipped.len(), dir.display());
}
}
#[cfg(test)]
mod tests {
use super::*;
/// A store over `dir`, as another WordCraft process opens it.
fn process(dir: &Path) -> SharedSettings<Prefs> {
open_in(Some(dir.to_path_buf()), &mut Store::in_memory()).0
}
/// The settings the next process loads from `dir`.
fn reloaded(dir: &Path) -> Prefs {
process(dir).lock().get().clone()
}
#[test]
fn the_loaded_preferences_include_the_words_of_the_dictionary_file() {
// A word only `custom-dictionary.txt` has is loaded, not added here: it is in the
// preferences' list like the words `ui.json` held, so a save keeps both.
let dir = tempfile::tempdir().unwrap();
let dict = dir.path().join("custom-dictionary.txt");
std::fs::write(dir.path().join("ui.json"), br#"{"dictionary": ["zqxinjson"]}"#).unwrap();
std::fs::write(&dict, "zqxinfile\n").unwrap();
let (settings, report) = open_in(Some(dir.path().to_path_buf()), &mut Store::in_memory());
assert!(matches!(report.source, Source::Legacy(_)), "ui.json is imported: {:?}", report.source);
load_user_dictionary(&settings, &dict);
let words = settings.lock().get().dictionary.clone();
for word in ["zqxinjson", "zqxinfile"] {
assert!(words.iter().any(|w| w == word), "{word}: {words:?}");
}
wordcraft_engine::proof::remove_word("zqxinjson");
wordcraft_engine::proof::remove_word("zqxinfile");
}
#[test]
fn autocorrect_entries_and_exceptions_from_both_processes_are_kept() {
let dir = tempfile::tempdir().unwrap();
// Both processes start from the same file.
let first = process(dir.path());
first.lock().update(|p| {
p.editing.autocorrect.entries = vec![("teh".into(), "the".into())];
p.editing.autocorrect.exceptions = vec!["approx.".into()];
});
first.lock().flush().unwrap();
let (a, b) = (process(dir.path()), process(dir.path()));
// B adds an entry and an exception and exits first; A adds another entry and removes `approx.`.
b.lock().update(|p| {
p.editing.autocorrect.entries.push(("teh2".into(), "the".into()));
p.editing.autocorrect.exceptions.push("fig.".into());
});
b.lock().flush().unwrap();
a.lock().update(|p| {
p.editing.autocorrect.entries.push(("adn".into(), "and".into()));
p.editing.autocorrect.exceptions.retain(|e| e != "approx.");
});
a.lock().flush().unwrap();
let ac = reloaded(dir.path()).editing.autocorrect;
for from in ["teh", "teh2", "adn"] {
assert!(ac.entries.iter().any(|(f, _)| f == from), "{from}: {:?}", ac.entries);
}
assert_eq!(ac.exceptions, ["fig."], "A's removal stays and B's addition is kept");
}
#[test]
fn a_toolbar_reset_by_one_process_stays_reset() {
let dir = tempfile::tempdir().unwrap();
let first = process(dir.path());
first.lock().update(|p| p.ribbon.qat = Some(vec!["file.save".into(), "format.bold".into()]));
first.lock().flush().unwrap();
let (a, b) = (process(dir.path()), process(dir.path()));
// B resets the toolbar to the default; A, which left it alone, changes something else.
b.lock().update(|p| p.ribbon.qat = None);
b.lock().flush().unwrap();
a.lock().update(|p| p.dictionary.push("zqxtoolbar".into()));
a.lock().flush().unwrap();
let now = reloaded(dir.path());
assert_eq!(now.ribbon.qat, None, "A's old copy of the toolbar does not bring it back");
assert!(now.dictionary.iter().any(|w| w == "zqxtoolbar"), "A's own change is kept");
}
}
-550
View File
@@ -1,550 +0,0 @@
//! Several WordCraft processes share one `ui.json` (opening a file from the file manager starts
//! another). Each reads it at start-up and writes it at exit (and when a change must survive a
//! crash, like taking a document off the recent list), so without a merge the process that writes
//! last writes back what it loaded and loses the others' changes (#3773).
//!
//! The policy: when saving, read `ui.json` again as this version reads it ([`as_read`]: a setting
//! of the wrong type reads as its default, and keys it doesn't know or reads only to migrate are
//! left out), and write it with only what this process changed since it last loaded or saved its
//! preferences (`base`). Every other setting keeps what the file holds now, including the absence
//! of one another process removed (a shortcut, a task pane's place).
//!
//! - A setting both changed takes this process's value.
//! - Groups of settings (editing options, AutoCorrect's switches, keyboard shortcuts, the ribbon,
//! task pane places) merge entry by entry ([`rule`]). Any other object is one setting: the
//! window's size and place, or one task pane's place, are never mixed from two processes.
//! - Lists of user entries (AutoCorrect entries by the text they replace, its exceptions, removed
//! built-in shortcuts, ribbon tabs by name, Quick Access Toolbar commands, caption labels, pens,
//! custom dictionary words) merge entry by entry too ([`merge_entries`]): entries either process
//! added are kept, entries either process removed stay removed, and an entry both changed takes
//! this process's version. A ribbon or toolbar left as it comes counts as its default entries.
//! - Recent lists (documents, symbols, colours, fonts) take the entries this process added or used
//! again first, then the file's, without duplicates, without the entries this process removed,
//! and within each list's limit ([`merge_recent`]).
//! - Any other list (the task panes' order, a floating pane's rectangle) is one setting.
//!
//! What this process changed is found by comparing with `base`, not by recording each change: a
//! setting changed and then changed back counts as untouched, so the file's value stays, and a
//! recent entry used again without moving (it was already first) counts as not used.
use std::collections::{HashMap, HashSet};
use serde_json::{Map, Value};
use wordcraft_engine::ribbon::{DEFAULT_QAT, RibbonLayout};
use wordcraft_ui_egui::{MAX_RECENT, MAX_RECENT_FONTS, UiState, colors, dialogs_insert};
/// Whether two entries of a recent list are the same entry.
type Same = fn(&Value, &Value) -> bool;
/// What tells an entry of a list of user entries from the others. Entries with the same key are
/// told apart by their order ([`ids`]).
type Key = fn(&Value) -> String;
/// How a setting this process changed merges with the file's.
#[derive(Clone, Copy)]
enum Rule {
/// A group of settings: each entry on its own.
Group,
/// A recent list, most recent first: how many entries it keeps, and when two are the same.
Recent(usize, Same),
/// A list of user entries: each entry on its own.
Entries(Key),
/// One setting: this process's value.
Whole,
}
/// The rule for the setting at `path` (`ui.json`'s keys from the top).
fn rule(path: &[&str]) -> Rule {
match path {
[] | ["editing" | "keyboard" | "ribbon" | "panePlaces"] | ["editing", "markup" | "marks" | "autocorrect"] | ["keyboard", "assigned"] => {
Rule::Group
}
["recent"] => Rule::Recent(MAX_RECENT, same_entry),
["recentSymbols"] => Rule::Recent(dialogs_insert::RECENT_SYMBOLS, same_entry),
["recentColors"] => Rule::Recent(colors::RECENT_MAX, same_entry),
["recentFonts"] => Rule::Recent(MAX_RECENT_FONTS, same_font),
["editing", "autocorrect", "entries"] => Rule::Entries(replaced_text),
["ribbon", "tabs"] => Rule::Entries(tab_name),
["editing", "autocorrect", "removed" | "exceptions" | "exceptionsRemoved" | "initialCapsExceptions"]
| ["keyboard", "removed"]
| ["ribbon", "qat"]
| ["captionLabels" | "inkPens" | "dictionary"] => Rule::Entries(whole_entry),
_ => Rule::Whole,
}
}
/// What a setting saved only when it isn't its default stands for when it is missing: the
/// default ribbon tabs and Quick Access Toolbar, so that two processes customizing them from the
/// default merge entry by entry.
fn when_missing(path: &[&str]) -> Option<Value> {
match path {
["ribbon", "tabs"] => serde_json::to_value(RibbonLayout::default().tabs()).ok(),
["ribbon", "qat"] => serde_json::to_value(DEFAULT_QAT).ok(),
_ => None,
}
}
/// Entries saved alike (colours are saved normalised, `colors::push_recent`).
fn same_entry(a: &Value, b: &Value) -> bool {
a == b
}
/// Font names ignoring case, as `push_recent_font` compares them.
fn same_font(a: &Value, b: &Value) -> bool {
match (a.as_str(), b.as_str()) {
(Some(a), Some(b)) => a.to_lowercase() == b.to_lowercase(),
_ => a == b,
}
}
/// The entry as saved.
fn whole_entry(v: &Value) -> String {
v.to_string()
}
/// An AutoCorrect entry `[from, to]` by the text it replaces.
fn replaced_text(v: &Value) -> String {
v.get(0).unwrap_or(v).to_string()
}
/// A ribbon tab by its name, ignoring case as the ribbon does.
fn tab_name(v: &Value) -> String {
v.get("name").and_then(Value::as_str).map_or_else(|| v.to_string(), str::to_lowercase)
}
/// `ui.json`'s bytes as this version reads them, saved again: `None` when they aren't
/// preferences at all.
pub fn as_read(bytes: &[u8]) -> Option<Value> {
serde_json::to_value(UiState::from_json(bytes)?).ok()
}
/// The preferences to write: `ours` (this process's, now), with every value it left as it was in
/// `base` (what it last loaded or saved) taken from `disk` (what `ui.json` holds now, [`as_read`]).
pub fn merge(base: &Value, ours: Value, disk: &Value) -> Value {
let fallback = ours.clone();
merge_setting(&mut Vec::new(), Some(base), Some(ours), Some(disk)).unwrap_or(fallback)
}
/// One setting, at `path`. `None` for a setting left out (this process removed it, or it left it
/// alone and another process removed it).
fn merge_setting(path: &mut Vec<String>, base: Option<&Value>, ours: Option<Value>, disk: Option<&Value>) -> Option<Value> {
if base == ours.as_ref() {
// Unchanged here: whatever the file holds now.
return disk.cloned();
}
let ours = ours?;
let keys: Vec<&str> = path.iter().map(String::as_str).collect();
Some(match (rule(&keys), ours, base, disk) {
(Rule::Group, Value::Object(ours), Some(Value::Object(base)), Some(Value::Object(disk))) => {
Value::Object(merge_group(path, base, ours, disk))
}
(Rule::Recent(cap, same), Value::Array(ours), Some(Value::Array(base)), Some(Value::Array(disk))) => {
Value::Array(merge_recent(base, ours, disk, cap, same))
}
(Rule::Entries(key), Value::Array(ours), Some(Value::Array(base)), Some(Value::Array(disk))) => {
Value::Array(merge_entries(base, &ours, disk, key))
}
(_, ours, ..) => ours,
})
}
/// A group of settings, entry by entry: this process's entries in their order, then those only
/// the file or `base` has.
fn merge_group(path: &mut Vec<String>, base: &Map<String, Value>, mut ours: Map<String, Value>, disk: &Map<String, Value>) -> Map<String, Value> {
let mut names: Vec<String> = ours.keys().cloned().collect();
let mut seen: HashSet<String> = names.iter().cloned().collect();
for k in disk.keys().chain(base.keys()) {
if seen.insert(k.clone()) {
names.push(k.clone());
}
}
let mut merged = Map::new();
for k in names {
path.push(k.clone());
let keys: Vec<&str> = path.iter().map(String::as_str).collect();
let missing = when_missing(&keys);
let base_v = base.get(&k).cloned().or_else(|| missing.clone());
let disk_v = disk.get(&k).cloned().or_else(|| missing.clone());
let ours_v = ours.remove(&k).or_else(|| missing.clone());
let v = merge_setting(path, base_v.as_ref(), ours_v, disk_v.as_ref());
path.pop();
// A setting saved only when it isn't its default is left out when it is.
if let Some(v) = v.filter(|v| Some(v) != missing.as_ref()) {
merged.insert(k, v);
}
}
merged
}
/// A list entry: its key, and how many entries before it have the same key.
type Id = (String, usize);
/// The entries of `list` told apart by `key`, in order.
fn ids(list: &[Value], key: Key) -> Vec<Id> {
let mut seen: HashMap<String, usize> = HashMap::new();
list.iter()
.map(|v| {
let k = key(v);
let n = seen.entry(k.clone()).or_default();
*n += 1;
(k, *n - 1)
})
.collect()
}
/// A list of user entries, entry by entry. An entry either process added is kept, one either
/// removed stays removed, and one this process changed takes its version (else the file's). The
/// order is this process's if it reordered the entries it loaded, else the file's; an entry only
/// the other list has goes after the entry it follows there.
fn merge_entries(base: &[Value], ours: &[Value], disk: &[Value], key: Key) -> Vec<Value> {
let (base_ids, ours_ids, disk_ids) = (ids(base, key), ids(ours, key), ids(disk, key));
let index = |ids: &[Id], list: &[Value]| -> HashMap<Id, Value> { ids.iter().cloned().zip(list.iter().cloned()).collect() };
let (b, o, d) = (index(&base_ids, base), index(&ours_ids, ours), index(&disk_ids, disk));
let value = |id: &Id| -> Option<&Value> {
match (b.get(id), o.get(id), d.get(id)) {
// Left alone here: the file's, or gone if the other process removed it.
(Some(b), Some(o), d) if b == o => d,
// Added or changed here.
(_, Some(o), _) => Some(o),
// Removed here.
(Some(_), None, _) => None,
// Added there.
(None, None, d) => d,
}
};
let common = |ids: &[Id], other: &HashMap<Id, Value>| -> Vec<Id> { ids.iter().filter(|id| other.contains_key(*id)).cloned().collect() };
let reordered = common(&ours_ids, &b) != common(&base_ids, &o);
let (first, second) = if reordered { (&ours_ids, &disk_ids) } else { (&disk_ids, &ours_ids) };
let in_first: HashSet<&Id> = first.iter().collect();
let kept: HashSet<&Id> = first.iter().filter(|id| value(id).is_some()).collect();
// Entries only `second` has, by the kept entry they follow there (`None`: at the start).
let mut after: HashMap<Option<&Id>, Vec<&Id>> = HashMap::new();
let mut anchor = None;
for id in second {
if kept.contains(id) {
anchor = Some(id);
} else if !in_first.contains(id) && value(id).is_some() {
after.entry(anchor).or_default().push(id);
}
}
let mut merged = Vec::new();
let mut emit = |ids: &[&Id]| merged.extend(ids.iter().filter_map(|id| value(id).cloned()));
emit(after.get(&None).map_or(&[], Vec::as_slice));
for id in first.iter().filter(|id| kept.contains(id)) {
emit(&[id]);
emit(after.get(&Some(id)).map_or(&[], Vec::as_slice));
}
merged
}
/// The entries this process put at the front of `ours` ([`touched_len`]), then `disk`'s, leaving
/// out what this process removed (in `base` but no longer in `ours`), without duplicates and at
/// most `cap` entries. Entries are told apart by `same`.
fn merge_recent(base: &[Value], ours: Vec<Value>, disk: &[Value], cap: usize, same: Same) -> Vec<Value> {
let has = |list: &[Value], v: &Value| list.iter().any(|x| same(x, v));
let removed = |v: &Value| has(base, v) && !has(&ours, v);
let touched = &ours[..touched_len(base, &ours, same)];
let mut merged: Vec<Value> = Vec::new();
for v in touched.iter().cloned().chain(disk.iter().filter(|v| !removed(v)).cloned()) {
if merged.len() == cap {
break;
}
if !has(&merged, &v) {
merged.push(v);
}
}
merged
}
/// How many of `ours`'s first entries this process added or used again. Each use moves an entry
/// to the front of a recent list, so what it left alone is a tail of `ours` in `base`'s order: the
/// longest such tail is untouched, and everything before it (new entries, and entries that moved
/// ahead of one loaded before them) was touched. A use that leaves the order as it was loaded
/// (the first entry used again) can't be told from no use, and merges as none.
fn touched_len(base: &[Value], ours: &[Value], same: Same) -> usize {
let mut end = base.len();
for (i, v) in ours.iter().enumerate().rev() {
match base[..end].iter().rposition(|b| same(b, v)) {
Some(at) => end = at,
None => return i + 1,
}
}
0
}
#[cfg(test)]
mod tests {
use serde_json::{Value, json};
use wordcraft_ui_egui::UiState;
use super::{as_read, merge};
/// The preferences a process holds after loading a `ui.json` with `settings` (every other
/// setting at its default), as it saves them.
fn prefs(settings: Value) -> Value {
as_read(&serde_json::to_vec(&settings).unwrap()).unwrap()
}
/// What the next process loads from the merged preferences.
fn reloaded(merged: &Value) -> UiState {
UiState::from_json(&serde_json::to_vec(merged).unwrap()).unwrap()
}
/// `ui.json` after B and then A, which both loaded `loaded`, save `b` and `a`.
fn b_then_a(loaded: &Value, b: Value, a: Value) -> Value {
let after_b = merge(loaded, b, loaded);
merge(loaded, a, &after_b)
}
#[test]
fn two_processes_keep_each_others_changes() {
// #3773: A and B both start from the same file.
let loaded =
json!({"theme": "light", "author": "Ann", "recent": ["a.docx", "b.docx"], "editing": {"smartQuotes": true, "autoCapitalize": true}});
// B changes the theme and opens c.docx, then exits first.
let b = json!({"theme": "dark", "author": "Ann", "recent": ["c.docx", "a.docx", "b.docx"], "editing": {"smartQuotes": false, "autoCapitalize": true}});
// A changes the author name and opens d.docx, then exits.
let a = json!({"theme": "light", "author": "Bo", "recent": ["d.docx", "a.docx", "b.docx"], "editing": {"smartQuotes": true, "autoCapitalize": false}});
assert_eq!(
b_then_a(&loaded, b, a),
json!({"theme": "dark", "author": "Bo", "recent": ["d.docx", "c.docx", "a.docx", "b.docx"], "editing": {"smartQuotes": false, "autoCapitalize": false}})
);
}
#[test]
fn a_process_that_changed_nothing_writes_the_file_back_as_it_is() {
let loaded = json!({"theme": "light", "recent": ["a.docx"]});
let disk = json!({"theme": "dark", "recent": ["b.docx", "a.docx"]});
assert_eq!(merge(&loaded, loaded.clone(), &disk), disk);
}
#[test]
fn this_process_wins_a_setting_both_changed() {
let loaded = json!({"theme": "light"});
assert_eq!(merge(&loaded, json!({"theme": "system"}), &json!({"theme": "dark"})), json!({"theme": "system"}));
}
#[test]
fn a_setting_changed_and_changed_back_counts_as_untouched() {
// Changes are found by comparing with what was loaded: A switched to dark and back.
let loaded = json!({"theme": "light"});
assert_eq!(merge(&loaded, json!({"theme": "light"}), &json!({"theme": "dark"})), json!({"theme": "dark"}));
}
#[test]
fn a_recent_entry_removed_here_stays_removed() {
let loaded = json!({"recent": ["a.docx", "b.docx"]});
let ours = json!({"recent": ["b.docx"]});
let disk = json!({"recent": ["c.docx", "a.docx", "b.docx"]});
assert_eq!(merge(&loaded, ours, &disk), json!({"recent": ["c.docx", "b.docx"]}));
// Clear Recent clears what the other process had added too only if it was loaded here.
assert_eq!(merge(&loaded, json!({"recent": []}), &json!({"recent": ["c.docx", "a.docx", "b.docx"]})), json!({"recent": ["c.docx"]}));
}
#[test]
fn a_recent_entry_used_again_here_moves_to_the_front() {
// Applying a font already in Recently Used Fonts moves it to the front without adding one.
let loaded = json!({"recentFonts": ["A", "B"]});
assert_eq!(merge(&loaded, json!({"recentFonts": ["B", "A"]}), &loaded), json!({"recentFonts": ["B", "A"]}));
// Here C was used again, D opened and A removed; the other process used B again and added E.
let loaded = json!({"recent": ["a.docx", "b.docx", "c.docx"]});
let ours = json!({"recent": ["d.docx", "c.docx", "b.docx"]});
let disk = json!({"recent": ["e.docx", "b.docx", "a.docx", "c.docx"]});
assert_eq!(merge(&loaded, ours, &disk), json!({"recent": ["d.docx", "c.docx", "e.docx", "b.docx"]}));
// Entries this process only kept, in the order it loaded them, don't override the file's order.
let loaded = json!({"recentSymbols": ["x", "y", "z"]});
let ours = json!({"recentSymbols": ["w", "x", "z"]});
let disk = json!({"recentSymbols": ["z", "x", "y"]});
assert_eq!(merge(&loaded, ours, &disk), json!({"recentSymbols": ["w", "z", "x"]}));
}
#[test]
fn recent_fonts_are_one_entry_whatever_their_case() {
// Recently Used Fonts ignores case (`push_recent_font`): Arial applied here as `arial` and
// there as `ARIAL` is one entry, and doesn't push a distinct font out of the ten.
let loaded = json!({"recentFonts": ["A", "B", "C", "D", "E", "F", "G", "H", "I", "Arial"]});
let ours = json!({"recentFonts": ["arial", "A", "B", "C", "D", "E", "F", "G", "H", "I"]});
let disk = json!({"recentFonts": ["ARIAL", "A", "B", "C", "D", "E", "F", "G", "H", "I"]});
assert_eq!(merge(&loaded, ours, &disk), json!({"recentFonts": ["arial", "A", "B", "C", "D", "E", "F", "G", "H", "I"]}));
// Other lists compare their entries as saved.
let loaded = json!({"recent": ["a.docx"]});
assert_eq!(merge(&loaded, json!({"recent": ["A.docx", "a.docx"]}), &loaded), json!({"recent": ["A.docx", "a.docx"]}));
}
#[test]
fn merged_recent_lists_keep_their_limit() {
// Recently Used Fonts keeps ten.
let loaded = json!({"recentFonts": ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J"]});
let ours = json!({"recentFonts": ["X", "A", "B", "C", "D", "E", "F", "G", "H", "I"]});
let disk = json!({"recentFonts": ["Y", "A", "B", "C", "D", "E", "F", "G", "H", "I"]});
assert_eq!(merge(&loaded, ours, &disk), json!({"recentFonts": ["X", "Y", "A", "B", "C", "D", "E", "F", "G", "H"]}));
}
#[test]
fn a_bad_recent_entry_in_the_file_is_not_carried_forward() {
// A non-string entry makes the whole list read as empty (`options::lenient` falls back per
// setting). Merging it in would keep Recent empty in every later session; instead the
// list reads as this version reads it, and the next save heals it.
let loaded = prefs(json!({"recent": []}));
let ours = prefs(json!({"recent": ["x.docx"]}));
let disk = as_read(br#"{"recent": [{"path": "y.docx"}, "z.docx"]}"#).unwrap();
let merged = merge(&loaded, ours, &disk);
assert_eq!(merged["recent"], json!(["x.docx"]));
assert_eq!(loaded_recent(&merged), ["x.docx"]);
// Same for recent symbols.
let ours = prefs(json!({"recentSymbols": [{"ch": "§", "font": "Arial"}]}));
let disk = as_read(r#"{"recentSymbols": [{"ch": "¶", "font": "Arial"}, 7]}"#.as_bytes()).unwrap();
assert_eq!(reloaded(&merge(&prefs(json!({})), ours, &disk)).recent_symbols.len(), 1);
}
/// The recent documents the next process loads.
fn loaded_recent(merged: &Value) -> Vec<String> {
reloaded(merged).recent
}
#[test]
fn only_keys_this_version_writes_are_kept() {
// A legacy key read once to migrate, and junk, are not written back, even from the file.
let loaded = prefs(json!({"theme": "light"}));
let disk = as_read(br#"{"theme": "light", "dark": true, "interfaceSize": 120, "junk": 1}"#).unwrap();
let merged = merge(&loaded, loaded.clone(), &disk);
for gone in ["dark", "interfaceSize", "junk"] {
assert!(merged.get(gone).is_none(), "{gone}");
}
assert_eq!(merged["theme"], "light");
}
#[test]
fn a_file_another_process_damaged_gives_way_to_ours() {
let loaded = json!({"theme": "light", "recent": ["a.docx"]});
let ours = json!({"theme": "dark", "recent": ["a.docx"]});
// Not preferences at all: everything comes from this process.
assert_eq!(as_read(b"\"garbage\""), None);
assert_eq!(merge(&loaded, ours.clone(), &json!("garbage")), ours);
// A list replaced by something else keeps ours.
assert_eq!(merge(&loaded, json!({"recent": ["b.docx", "a.docx"]}), &json!({"recent": 3})), json!({"recent": ["b.docx", "a.docx"]}));
}
#[test]
fn autocorrect_entries_and_exceptions_from_both_processes_are_kept() {
let loaded = prefs(json!({"editing": {"autocorrect": {"entries": [["teh", "the"]], "exceptions": ["approx."]}}}));
// B adds an entry and an exception; A adds another entry, changes `teh`'s replacement and
// removes `approx.`. Each added entry follows the entry it was added after.
let b = prefs(json!({"editing": {"autocorrect": {"entries": [["teh", "the"], ["teh2", "the"]], "exceptions": ["approx.", "fig."]}}}));
let a = prefs(json!({"editing": {"autocorrect": {"entries": [["teh", "THE"], ["adn", "and"]], "exceptions": []}}}));
let ac = reloaded(&b_then_a(&loaded, b, a)).editing.autocorrect;
let entries: Vec<(&str, &str)> = ac.entries.iter().map(|(f, t)| (f.as_str(), t.as_str())).collect();
assert_eq!(entries, [("teh", "THE"), ("adn", "and"), ("teh2", "the")]);
assert_eq!(ac.exceptions, ["fig."]);
}
#[test]
fn keyboard_customisations_merge_key_by_key() {
let loaded = prefs(json!({"keyboard": {"assigned": {"Mod+Shift+K": "format.bold"}, "removed": []}}));
// B takes Ctrl+B off Bold and deletes its own Mod+Shift+K; A takes Ctrl+I off Italic and
// assigns Mod+Shift+J.
let b = prefs(json!({"keyboard": {"assigned": {}, "removed": ["Mod+B"]}}));
let a = prefs(json!({"keyboard": {"assigned": {"Mod+Shift+K": "format.bold", "Mod+Shift+J": "format.italic"}, "removed": ["Mod+I"]}}));
let keys = reloaded(&b_then_a(&loaded, b, a)).keyboard;
assert_eq!(keys.assigned.into_iter().collect::<Vec<_>>(), [("Mod+Shift+J".to_string(), "format.italic".to_string())]);
assert_eq!(keys.removed.into_iter().collect::<Vec<_>>(), ["Mod+B", "Mod+I"]);
}
#[test]
fn ribbon_changes_from_both_processes_are_kept() {
// Both start from the default ribbon. B hides Draw; A adds a custom tab after Home.
let loaded = prefs(json!({}));
let b = prefs(json!({"ribbon": {"tabs": hide(default_tabs(), "Draw")}}));
let mut a_tabs = default_tabs();
a_tabs.insert(1, json!({"name": "Mine", "custom": true}));
let a = prefs(json!({"ribbon": {"tabs": a_tabs}}));
let mut want = hide(default_tabs(), "Draw");
want.insert(1, json!({"name": "Mine", "custom": true}));
assert_eq!(serde_json::to_value(loaded_ribbon(&b_then_a(&loaded, b, a)).tabs).unwrap(), Value::Array(want));
}
#[test]
fn a_toolbar_reset_by_one_process_stays_reset() {
// B resets its custom Quick Access Toolbar to the default; A, which left it alone, adds a
// custom tab. The toolbar stays the default.
let loaded = prefs(json!({"ribbon": {"qat": ["file.save", "format.bold"]}}));
let b = prefs(json!({}));
let mut a_tabs = default_tabs();
a_tabs.push(json!({"name": "Mine", "custom": true}));
let a = prefs(json!({"ribbon": {"tabs": a_tabs, "qat": ["file.save", "format.bold"]}}));
let merged = b_then_a(&loaded, b, a);
assert!(merged["ribbon"].get("qat").is_none(), "{}", merged["ribbon"]);
let ribbon = loaded_ribbon(&merged);
assert_eq!(ribbon.qat, None);
assert!(ribbon.tabs.iter().any(|t| t.name == "Mine"));
// Two processes customizing the default toolbar: both commands, Save removed by A gone.
let loaded = prefs(json!({}));
let b = prefs(json!({"ribbon": {"qat": ["file.save", "edit.undo", "edit.redo", "format.bold"]}}));
let a = prefs(json!({"ribbon": {"qat": ["edit.undo", "edit.redo", "format.italic"]}}));
assert_eq!(loaded_ribbon(&b_then_a(&loaded, b, a)).qat.unwrap(), ["edit.undo", "edit.redo", "format.italic", "format.bold"]);
}
/// The default ribbon tabs, as saved once the ribbon is customized.
fn default_tabs() -> Vec<Value> {
serde_json::from_value(serde_json::to_value(wordcraft_engine::RibbonLayout::default().tabs()).unwrap()).unwrap()
}
/// `tabs` with the tab `name` hidden.
fn hide(mut tabs: Vec<Value>, name: &str) -> Vec<Value> {
for t in &mut tabs {
if t["name"] == name {
t["hidden"] = json!(true);
}
}
tabs
}
/// The ribbon the next process loads.
fn loaded_ribbon(merged: &Value) -> wordcraft_engine::RibbonLayout {
reloaded(merged).ribbon
}
#[test]
fn a_pane_order_changed_by_the_other_process_is_kept() {
// `paneOrder` is saved only when it isn't the default. B reorders; A leaves it alone and
// switches to dark.
let loaded = prefs(json!({}));
let order = json!(["styles", "navigation"]);
let b = prefs(json!({"paneOrder": order}));
let merged = b_then_a(&loaded, b, prefs(json!({"theme": "dark"})));
assert_eq!((&merged["paneOrder"], &merged["theme"]), (&order, &json!("dark")));
// B goes back to the default order; A, which loaded B's order and left it, doesn't bring
// it back.
let loaded = prefs(json!({"paneOrder": order}));
let merged = b_then_a(&loaded, prefs(json!({})), prefs(json!({"paneOrder": order, "theme": "dark"})));
assert!(merged.get("paneOrder").is_none(), "{merged}");
assert_eq!(merged["theme"], "dark");
}
#[test]
fn the_window_and_a_pane_place_are_one_setting_each() {
// A moved its window and B resized its own: the window is A's, not A's place with B's size.
let window = |x: f32, width: f32| json!({"window": {"position": [x, 10.0], "width": width, "height": 600.0, "maximized": false}});
let loaded = prefs(window(0.0, 800.0));
let merged = b_then_a(&loaded, prefs(window(0.0, 1000.0)), prefs(window(300.0, 800.0)));
assert_eq!(merged["window"], prefs(window(300.0, 800.0))["window"]);
}
#[test]
fn pens_labels_and_dictionary_words_from_both_processes_are_kept() {
let pen = |color: &str| json!({"kind": "pen", "color": color, "width": 1.0});
let loaded = prefs(json!({"inkPens": [pen("FF0000"), pen("FF0000")], "captionLabels": ["Plate"], "dictionary": ["foo", "bar"]}));
// B adds a third red pen, a label and a word; A adds a blue pen, removes `bar` and adds a
// label of its own. Identical pens stay apart, by their order.
let b = prefs(
json!({"inkPens": [pen("FF0000"), pen("FF0000"), pen("FF0000")], "captionLabels": ["Plate", "Chart"], "dictionary": ["foo", "bar", "baz"]}),
);
let a = prefs(json!({"inkPens": [pen("FF0000"), pen("FF0000"), pen("0000FF")], "captionLabels": ["Plate", "Map"], "dictionary": ["foo"]}));
let merged = b_then_a(&loaded, b, a);
let ui = reloaded(&merged);
let colors: Vec<String> = ui.ink_pens.iter().map(|p| serde_json::to_value(p).unwrap()["color"].as_str().unwrap().to_string()).collect();
assert_eq!(colors, ["FF0000", "FF0000", "0000FF", "FF0000"]);
assert_eq!(ui.caption_labels, ["Plate", "Map", "Chart"]);
assert_eq!(merged["dictionary"], json!(["foo", "baz"]));
}
}
-179
View File
@@ -1,179 +0,0 @@
//! Desktop spooler adapter. Discovery and submission never run on the UI thread.
#[cfg(any(windows, test))]
pub(crate) mod isolated;
use wordcraft_ui_egui::printing::{Discover, Duplex, Printer, Settings, Submit};
/// Returns a discovery callback that enumerates spooler printers on a named worker thread and
/// sends the list through a channel, keeping spooler calls off the UI thread.
///
/// The Print panel needs only names and the default, so the list comes from
/// `craft_print::printer_queues`, which asks no printer driver anything: on Windows a networked
/// printer in power save can hold a driver's capability query for a long time, and the list must
/// not wait on it (#5710). Submission still checks the job's options with the driver.
pub fn discover() -> Discover {
Box::new(|| {
let (sender, receiver) = std::sync::mpsc::channel();
let _ = std::thread::Builder::new().name("print-discovery".into()).spawn(move || {
let printers = craft_print::printer_queues()
.into_iter()
.map(|printer| Printer { name: printer.name, label: printer.description, default: printer.default })
.collect();
let _ = sender.send(printers);
});
receiver
})
}
/// A submission worker and how to stop its job: `true` when it will never be sent, `false` when
/// it was already being sent.
struct Job {
worker: std::thread::JoinHandle<()>,
cancel: Box<dyn Fn() -> bool + Send>,
// Acknowledged helper cancellation permits joining it to reap the process and its input PDF.
isolated: bool,
}
// Keep submission workers reachable until normal app shutdown; dropping a JoinHandle would
// let process exit end an in-process Windows job or the CUPS hand-off before the spooler has it.
static JOBS: std::sync::Mutex<Vec<Job>> = std::sync::Mutex::new(Vec::new());
fn jobs() -> std::sync::MutexGuard<'static, Vec<Job>> {
JOBS.lock().unwrap_or_else(std::sync::PoisonError::into_inner)
}
/// Waits for the jobs already being sent, so the spooler has them before the process exits. A
/// job still waiting (on a sleeping printer's driver, say: #5710) is cancelled instead, so it is
/// never sent and quitting doesn't wait on the driver.
pub fn finish_pending_jobs() {
let pending = std::mem::take(&mut *jobs());
// Cancel them all first: a job left waiting while another is joined could start sending.
let finishing: Vec<_> = pending
.into_iter()
.filter(|job| {
let cancelled = (job.cancel)();
job.isolated || !cancelled
})
.collect();
for job in finishing {
if job.worker.join().is_err() {
log::error!("the print worker stopped unexpectedly during shutdown");
}
}
}
/// The Print page's Cancel: stops the job being submitted (the Print page submits one at a
/// time, the latest) unless it has started reaching the spooler. `true` when it will never be
/// sent. A job that has finished sending answers `false`, so its receipt is still shown.
pub fn cancel() -> Box<dyn Fn() -> bool> {
Box::new(|| jobs().last().is_none_or(|job| (job.cancel)()))
}
/// Submit off the UI thread, isolating Windows drivers while retaining CUPS token cancellation.
pub fn submit() -> Submit {
Box::new(|bytes, settings: Settings, collate, options| {
let (sender, receiver) = std::sync::mpsc::channel();
#[cfg(not(windows))]
let cancel = craft_print::Cancel::new();
#[cfg(windows)]
let cancel = isolated::Submission::new();
let token = cancel.clone();
let worker = std::thread::Builder::new().name("print-submit".into()).spawn(move || {
let job = craft_print::Job {
printer: Some(settings.printer),
copies: settings.copies.clamp(1, 999),
collate,
duplex: settings.duplex.map(|value| match value {
Duplex::LongEdge => craft_print::Duplex::LongEdge,
Duplex::ShortEdge => craft_print::Duplex::ShortEdge,
Duplex::Off => craft_print::Duplex::Off,
}),
grayscale: settings.grayscale,
grey_pages: false,
scaling: craft_print::Scaling::ShrinkToFit,
title: "WordCraft document".into(),
options,
driver_settings: None,
};
#[cfg(not(windows))]
let sent = craft_print::submit_cancellable(&bytes, &job, &mut |_, _| {}, &token).map_err(|error| error.to_string());
#[cfg(windows)]
let sent = token.submit(&bytes, &job);
let _ = sender.send(sent);
});
if let Ok(worker) = worker {
let mut jobs = jobs();
jobs.retain(|job| !job.worker.is_finished());
jobs.push(Job { worker, cancel: Box::new(move || cancel.cancel()), isolated: cfg!(windows) });
}
receiver
})
}
#[cfg(test)]
mod tests {
use super::*;
/// A worker that waits until released, then reports that it finished.
fn worker() -> (std::thread::JoinHandle<()>, std::sync::mpsc::Sender<()>, std::sync::mpsc::Receiver<()>) {
let (release, wait) = std::sync::mpsc::channel();
let (completed, completion) = std::sync::mpsc::channel();
let worker = std::thread::spawn(move || {
let _ = wait.recv();
let _ = completed.send(());
});
(worker, release, completion)
}
/// A cancel action that records when it was asked and answers `stops`.
fn asked(stops: bool) -> (Box<dyn Fn() -> bool + Send>, std::sync::Arc<std::sync::atomic::AtomicBool>) {
let flag = std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false));
let set = flag.clone();
let cancel = Box::new(move || {
set.store(true, std::sync::atomic::Ordering::SeqCst);
stops
});
(cancel, flag)
}
/// Shutdown waits for a job already being sent, so the spooler has it before the process
/// exits, but not for one still waiting on a driver (a sleeping printer, #5710): that one is
/// cancelled, so it is never sent, and quitting doesn't hang on it. Every job is cancelled
/// before any is waited for, so a waiting job can't start sending meanwhile. The Print page's
/// Cancel asks only the latest job. One test, because JOBS is global.
#[test]
fn shutdown_waits_for_jobs_being_sent_and_cancels_the_rest() {
let (sending, release_sending, sent) = worker();
let (stuck, release_stuck, _) = worker();
let (stop_sending, sending_asked) = asked(false);
let (stop_stuck, cancelled) = asked(true);
// The job being sent comes first, so a one-at-a-time shutdown would join it before
// cancelling the waiting one.
*JOBS.lock().unwrap() =
vec![Job { worker: sending, cancel: stop_sending, isolated: false }, Job { worker: stuck, cancel: stop_stuck, isolated: false }];
// Cancel from the Print page asks the latest job only.
assert!(cancel()(), "the latest job was still waiting: never sent");
assert!(!sending_asked.load(std::sync::atomic::Ordering::SeqCst), "an earlier job isn't the one being submitted");
cancelled.store(false, std::sync::atomic::Ordering::SeqCst);
let (finished, shutdown) = std::sync::mpsc::channel();
std::thread::spawn(move || {
finish_pending_jobs();
let _ = finished.send(());
});
let wait = std::time::Duration::from_millis(200);
assert!(shutdown.recv_timeout(wait).is_err(), "shutdown waits for the job being sent");
assert!(cancelled.load(std::sync::atomic::Ordering::SeqCst), "the waiting job was cancelled before the wait");
release_sending.send(()).unwrap();
assert!(shutdown.recv_timeout(std::time::Duration::from_secs(10)).is_ok(), "shutdown doesn't wait for the stuck job");
sent.recv().unwrap();
assert!(JOBS.lock().unwrap().is_empty(), "shutdown took every job");
// A job that has already been sent answers false, so the Print page keeps its receipt.
let (done, release_done, finished) = worker();
release_done.send(()).unwrap();
finished.recv().unwrap();
*JOBS.lock().unwrap() = vec![Job { worker: done, cancel: Box::new(|| false), isolated: false }];
assert!(!cancel()(), "a sent job isn't reported as cancelled");
JOBS.lock().unwrap().clear();
// The stuck worker was left behind without blocking shutdown; let it end.
release_stuck.send(()).unwrap();
}
}
-624
View File
@@ -1,624 +0,0 @@
//! One Windows driver submission per process: a cancelled driver cannot retain another
//! job's provider lock. The child acknowledges its Cancel token before it exits.
use std::{
io::{BufRead, BufReader, Read, Write},
path::Path,
process::{Child, ChildStdin, Command, Stdio},
sync::{Arc, Condvar, Mutex},
time::Duration,
};
use serde::{Deserialize, Serialize};
#[cfg(windows)]
const FLAG: &str = "--wordcraft-print-worker";
const PREFIX: &str = "WORDCRAFT_PRINT:";
const MAX_MESSAGE: u64 = 64 * 1024;
/// The job's options, and a driver's settings of up to 1 MiB written as hex.
const MAX_REQUEST: u64 = MAX_MESSAGE + 2 * 1024 * 1024;
const MAX_PDF: u64 = 512 * 1024 * 1024;
const CANCELLED: &str = "the print job was cancelled before anything was sent to the printer";
#[derive(Serialize, Deserialize)]
enum Duplex {
Off,
LongEdge,
ShortEdge,
}
#[derive(Serialize, Deserialize)]
struct Request {
printer: Option<String>,
copies: u32,
collate: bool,
duplex: Option<Duplex>,
grayscale: bool,
grey_pages: bool,
shrink: bool,
title: String,
options: Vec<(String, String)>,
/// The printer the driver's settings were chosen for, and their DEVMODE as hex.
driver_settings: Option<(String, String)>,
}
impl Request {
/// Preserve all spooler options in a platform-independent wire representation.
fn from_job(job: &craft_print::Job) -> Self {
Self {
printer: job.printer.clone(),
copies: job.copies,
collate: job.collate,
duplex: job.duplex.map(|d| match d {
craft_print::Duplex::Off => Duplex::Off,
craft_print::Duplex::LongEdge => Duplex::LongEdge,
craft_print::Duplex::ShortEdge => Duplex::ShortEdge,
}),
grayscale: job.grayscale,
grey_pages: job.grey_pages,
shrink: job.scaling == craft_print::Scaling::ShrinkToFit,
title: job.title.clone(),
options: job.options.clone(),
driver_settings: job.driver_settings.as_ref().map(|settings| (settings.printer().to_owned(), settings.dev_mode().to_hex())),
}
}
/// Restore the job without substituting printer defaults or changing copy semantics.
fn job(self) -> Result<craft_print::Job, String> {
let driver_settings = match self.driver_settings {
Some((printer, hex)) => Some(craft_print::DriverSettings::new(printer, craft_print::rgb::DevMode::from_hex(&hex).map_err(error)?)),
None => None,
};
Ok(craft_print::Job {
printer: self.printer,
copies: self.copies,
collate: self.collate,
duplex: self.duplex.map(|d| match d {
Duplex::Off => craft_print::Duplex::Off,
Duplex::LongEdge => craft_print::Duplex::LongEdge,
Duplex::ShortEdge => craft_print::Duplex::ShortEdge,
}),
grayscale: self.grayscale,
grey_pages: self.grey_pages,
scaling: if self.shrink { craft_print::Scaling::ShrinkToFit } else { craft_print::Scaling::Exact },
title: self.title,
options: self.options,
driver_settings,
})
}
}
#[derive(Serialize, Deserialize)]
enum Event {
Ready,
Cancelled,
Sending,
Done(Result<String, String>),
}
enum State {
Starting,
Waking(Arc<Mutex<Child>>),
Running(ChildStdin),
Sending(ChildStdin),
Cancelled,
Finished,
}
#[derive(Clone)]
pub(crate) struct Submission(Arc<(Mutex<State>, Condvar)>);
impl Submission {
/// Create one submission whose driver cannot run until the parent grants startup.
pub(crate) fn new() -> Self {
Self(Arc::new((Mutex::new(State::Starting), Condvar::new())))
}
/// Recover the lifecycle state after poisoning without invoking another driver call.
fn state(&self) -> std::sync::MutexGuard<'_, State> {
self.0.0.lock().unwrap_or_else(std::sync::PoisonError::into_inner)
}
/// Only an acknowledgement of the child's token can cancel a running helper. A timeout
/// is a refusal, never permission to kill a process that may already be sending.
pub(crate) fn cancel(&self) -> bool {
let mut state = self.state();
match &mut *state {
State::Starting => {
*state = State::Cancelled;
return true;
}
State::Waking(child) => {
let _ = child.lock().unwrap_or_else(std::sync::PoisonError::into_inner).kill();
*state = State::Cancelled;
return true;
}
State::Cancelled => return true,
State::Finished | State::Sending(_) => return false,
State::Running(input) => {
if input.write_all(b"cancel\n").and_then(|_| input.flush()).is_err() {
return false;
}
}
}
let (state, _) = self
.0
.1
.wait_timeout_while(state, Duration::from_secs(1), |s| matches!(s, State::Running(_)))
.unwrap_or_else(std::sync::PoisonError::into_inner);
matches!(*state, State::Cancelled)
}
#[cfg(windows)]
/// Submit through this executable's private helper mode and await its final receipt.
pub(crate) fn submit(&self, pdf: &[u8], job: &craft_print::Job) -> Result<String, String> {
self.submit_with(pdf, job, |directory| {
let mut command = Command::new(std::env::current_exe()?);
command.arg(FLAG).arg(directory);
Ok(command)
})
}
/// Publish a terminal state on every result, waking a cancellation caller awaiting an ack.
fn submit_with(&self, pdf: &[u8], job: &craft_print::Job, command: impl FnOnce(&Path) -> std::io::Result<Command>) -> Result<String, String> {
let result = self.run(pdf, job, command);
let mut state = self.state();
if !matches!(*state, State::Cancelled) {
*state = State::Finished;
}
self.0.1.notify_all();
if matches!(*state, State::Cancelled) { Err(CANCELLED.into()) } else { result }
}
/// Own the private inputs and child until receipt, acknowledged cancellation or failure.
fn run(&self, pdf: &[u8], job: &craft_print::Job, command: impl FnOnce(&Path) -> std::io::Result<Command>) -> Result<String, String> {
if matches!(*self.state(), State::Cancelled) {
return Err(CANCELLED.into());
}
if pdf.len() as u64 > MAX_PDF {
return Err("the print PDF exceeds the 512 MiB helper limit".into());
}
let request = serde_json::to_vec(&Request::from_job(job)).map_err(error)?;
if request.len() as u64 > MAX_REQUEST {
return Err("the print settings exceed the helper message limit".into());
}
let directory = tempfile::tempdir().map_err(error)?;
std::fs::write(directory.path().join("job.json"), request).map_err(error)?;
std::fs::write(directory.path().join("input.pdf"), pdf).map_err(error)?;
let child =
command(directory.path()).map_err(error)?.stdin(Stdio::piped()).stdout(Stdio::piped()).stderr(Stdio::null()).spawn().map_err(error)?;
let child = Arc::new(Mutex::new(child));
let outcome = (|| {
let (input, output) = {
let mut process = child.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
(process.stdin.take().ok_or("print helper has no input pipe")?, process.stdout.take().ok_or("print helper has no output pipe")?)
};
{
let mut state = self.state();
if matches!(*state, State::Cancelled) {
return Err(CANCELLED.into());
}
*state = State::Waking(child.clone());
}
let mut output = BufReader::new(output);
loop {
let message = line(&mut output)?.ok_or("the print helper stopped before it was ready")?;
let Some((_, json)) = message.split_once(PREFIX) else { continue };
if !matches!(serde_json::from_str::<Event>(json).map_err(error)?, Event::Ready) {
return Err("the print helper did not acknowledge startup".into());
}
break;
}
{
let mut state = self.state();
if matches!(*state, State::Cancelled) {
return Err(CANCELLED.into());
}
*state = State::Running(input);
if let State::Running(input) = &mut *state {
input.write_all(b"start\n").and_then(|_| input.flush()).map_err(error)?;
}
}
while let Some(line) = line(&mut output)? {
let Some((_, json)) = line.split_once(PREFIX) else { continue };
match serde_json::from_str::<Event>(json).map_err(error)? {
Event::Ready => return Err("the print helper repeated its startup acknowledgement".into()),
Event::Cancelled => {
*self.state() = State::Cancelled;
self.0.1.notify_all();
return Err(CANCELLED.into());
}
Event::Sending => {
let mut state = self.state();
let previous = std::mem::replace(&mut *state, State::Finished);
*state = match previous {
State::Running(input) | State::Sending(input) => State::Sending(input),
other => other,
};
self.0.1.notify_all();
}
Event::Done(result) => return result,
}
}
Err("the print helper stopped without a receipt".into())
})();
// A cancelled child has acknowledged that it cannot send. Other outcomes are terminal
// receipts or a broken protocol/pipe; reap the process and its private input files.
if outcome.is_err() {
let _ = child.lock().unwrap_or_else(std::sync::PoisonError::into_inner).kill();
}
let status = child.lock().unwrap_or_else(std::sync::PoisonError::into_inner).wait().map_err(error)?;
if outcome.is_ok() && !status.success() {
return Err("the print helper failed after its receipt".into());
}
outcome
}
}
/// Keep helper transport failures distinct from a printer's own error message.
fn error(error: impl std::fmt::Display) -> String {
format!("print helper: {error}")
}
/// Read at most one byte beyond the cap so oversized files fail without unbounded allocation.
fn bounded(mut input: impl Read, limit: u64) -> Result<Vec<u8>, String> {
let mut bytes = Vec::new();
input.by_ref().take(limit.saturating_add(1)).read_to_end(&mut bytes).map_err(error)?;
if bytes.len() as u64 > limit { Err("print helper input exceeds its limit".into()) } else { Ok(bytes) }
}
/// Read one bounded UTF-8 protocol record, distinguishing EOF from an oversized message.
fn line(input: &mut impl BufRead) -> Result<Option<String>, String> {
let mut bytes = Vec::new();
input.take(MAX_MESSAGE + 1).read_until(b'\n', &mut bytes).map_err(error)?;
if bytes.len() as u64 > MAX_MESSAGE {
return Err("print helper message exceeds its limit".into());
}
if bytes.is_empty() { Ok(None) } else { String::from_utf8(bytes).map(|s| Some(s.trim_end().to_owned())).map_err(error) }
}
/// Serialize complete events under stdout's lock so the driver and listener cannot interleave.
fn emit(event: &Event) -> Result<(), String> {
let mut output = std::io::stdout().lock();
write!(output, "{PREFIX}").map_err(error)?;
serde_json::to_writer(&mut output, event).map_err(error)?;
writeln!(output).and_then(|_| output.flush()).map_err(error)
}
/// Remove both plaintext inputs even when one fails; already-removed inputs count as success.
fn remove_inputs(directory: &Path) -> Result<(), String> {
let mut first_error = None;
for name in ["job.json", "input.pdf"] {
if let Err(failure) = std::fs::remove_file(directory.join(name))
&& failure.kind() != std::io::ErrorKind::NotFound
{
first_error.get_or_insert_with(|| error(format!("could not remove {name}: {failure}")));
}
}
first_error.map_or(Ok(()), Err)
}
/// Load and erase the private inputs before driver work, while an independent listener can cancel.
fn helper(
directory: &Path,
cancel_request: impl Fn(&craft_print::Cancel) -> bool + Send + 'static,
submit: impl FnOnce(&[u8], &craft_print::Job, &craft_print::Cancel) -> Result<String, String>,
) -> Result<(), String> {
let mut input = BufReader::new(std::io::stdin());
emit(&Event::Ready)?;
if line(&mut input)?.as_deref() != Some("start") {
return Err("print helper requires a start acknowledgement".into());
}
let cancel = craft_print::Cancel::new();
let listener = cancel.clone();
std::thread::Builder::new()
.name("print-cancel".into())
.spawn(move || {
loop {
match line(&mut input) {
Ok(Some(command)) if command == "cancel" => {
if cancel_request(&listener) {
let _ = emit(&Event::Cancelled);
std::process::exit(0);
}
if emit(&Event::Sending).is_err() {
break;
}
}
_ => break,
}
}
// If the parent disappears, never leave a waiting driver process behind. Sending
// jobs finish normally so the OS gets their pages even if the UI has gone away.
if cancel_request(&listener) {
std::process::exit(0);
}
})
.map_err(error)?;
let request: Request =
serde_json::from_slice(&bounded(std::fs::File::open(directory.join("job.json")).map_err(error)?, MAX_REQUEST)?).map_err(error)?;
let pdf = bounded(std::fs::File::open(directory.join("input.pdf")).map_err(error)?, MAX_PDF)?;
remove_inputs(directory)?;
let result = submit(&pdf, &request.job()?, &cancel);
emit(&Event::Done(result))
}
#[cfg(windows)]
/// Handle only the private first-argument flag, before logging or GUI initialization.
pub(crate) fn helper_mode() -> Option<i32> {
let mut args = std::env::args_os().skip(1);
if args.next().as_deref() != Some(std::ffi::OsStr::new(FLAG)) {
return None;
}
let result = args.next().ok_or_else(|| "print helper directory missing".to_owned()).and_then(|dir| {
helper(Path::new(&dir), craft_print::Cancel::cancel, |pdf, job, cancel| {
craft_print::submit_cancellable(pdf, job, &mut |_, _| {}, cancel).map_err(error)
})
});
if let Err(message) = &result {
let _ = emit(&Event::Done(Err(message.clone())));
}
Some(i32::from(result.is_err()))
}
#[cfg(test)]
mod tests {
use super::*;
/// A real test child exercises production pipes, token handling and process cleanup.
#[test]
#[ignore = "launched by the process protocol tests"]
fn helper_process() {
let Some(directory) = std::env::var_os("WORDCRAFT_TEST_PRINT_DIR") else { return };
if std::env::var("WORDCRAFT_TEST_PRINT_MODE").as_deref() == Ok("waking") {
std::fs::write(Path::new(&directory).join("waking"), b"starting").unwrap();
loop {
std::thread::park();
}
}
let result = helper(
Path::new(&directory),
|token| {
if std::env::var("WORDCRAFT_TEST_PRINT_MODE").as_deref() == Ok("sending") { false } else { token.cancel() }
},
|pdf, job, _token| {
assert_eq!(pdf, b"synthetic PDF");
assert_eq!(job.printer.as_deref(), Some("test queue"));
match std::env::var("WORDCRAFT_TEST_PRINT_MODE").as_deref() {
Ok("held") => {
let _provider = Mutex::new(());
let _held = _provider.lock().unwrap();
std::fs::write(Path::new(&directory).join("held"), b"driver entered").unwrap();
loop {
std::thread::park();
}
}
Ok("crash") => std::process::exit(7),
Ok("sending") => {
std::fs::write(Path::new(&directory).join("sending"), b"sending").unwrap();
while !Path::new(&directory).join("release").exists() {
std::thread::sleep(Duration::from_millis(5));
}
Ok("spooled synthetic job".into())
}
_ => Ok("spooled synthetic job".into()),
}
},
);
std::process::exit(i32::from(result.is_err()));
}
/// Launch just the ignored helper entry, without invoking printer hardware.
fn command(directory: &Path, mode: &str) -> std::io::Result<Command> {
let mut command = Command::new(std::env::current_exe()?);
let name = module_path!().split_once("::").map_or(module_path!(), |(_, name)| name);
command.args(["--ignored", "--exact", &format!("{name}::helper_process"), "--nocapture"]);
command.env("WORDCRAFT_TEST_PRINT_DIR", directory).env("WORDCRAFT_TEST_PRINT_MODE", mode);
Ok(command)
}
/// Give the child a literal printer identity to verify transport.
fn job() -> craft_print::Job {
craft_print::Job { printer: Some("test queue".into()), ..Default::default() }
}
#[test]
/// Cancelling before submission cannot launch a driver process.
fn cancelled_start_never_launches_a_helper() {
let submission = Submission::new();
assert!(submission.cancel());
let result = submission.submit_with(b"synthetic PDF", &job(), |_| Err(std::io::Error::other("must not launch")));
assert_eq!(result, Err(CANCELLED.into()));
}
#[test]
/// A cancellation during creation withholds the start grant and removes private inputs.
fn cancellation_during_startup_never_starts_the_driver() {
let submission = Submission::new();
let worker = submission.clone();
let (started, starting) = std::sync::mpsc::channel();
let (release, wait) = std::sync::mpsc::channel();
let running = std::thread::spawn(move || {
worker.submit_with(b"synthetic PDF", &job(), |directory| {
started.send(directory.to_path_buf()).unwrap();
wait.recv().unwrap();
command(directory, "held")
})
});
let directory = starting.recv_timeout(Duration::from_secs(10)).unwrap();
assert!(submission.cancel());
release.send(()).unwrap();
assert_eq!(running.join().unwrap(), Err(CANCELLED.into()));
assert!(!directory.exists(), "startup cancellation reaps the child and removes its inputs");
}
#[test]
/// A hung startup has no permission to send and can be killed without a token ack.
fn an_unresponsive_starting_process_can_be_stopped_without_an_acknowledgement() {
let submission = Submission::new();
let worker = submission.clone();
let (path_tx, path_rx) = std::sync::mpsc::channel();
let running = std::thread::spawn(move || {
worker.submit_with(b"synthetic PDF", &job(), |dir| {
path_tx.send(dir.to_path_buf()).unwrap();
command(dir, "waking")
})
});
let directory = path_rx.recv_timeout(Duration::from_secs(10)).unwrap();
let deadline = std::time::Instant::now() + Duration::from_secs(10);
while !directory.join("waking").exists() && std::time::Instant::now() < deadline {
std::thread::sleep(Duration::from_millis(5));
}
assert!(directory.join("waking").exists());
assert!(submission.cancel(), "a process without a start grant cannot send anything");
assert_eq!(running.join().unwrap(), Err(CANCELLED.into()));
assert!(!directory.exists());
}
#[test]
/// Job transport preserves every explicit setting, including Unicode, duplex direction and the
/// driver's own settings.
fn job_options_survive_the_process_boundary() {
// A DEVMODEW header of 156 bytes (`dmSize` at 68) and a 4-byte private part (`dmDriverExtra` at 70).
let mut dev_mode = vec![0u8; 160];
dev_mode[68..70].copy_from_slice(&156u16.to_le_bytes());
dev_mode[70..72].copy_from_slice(&4u16.to_le_bytes());
dev_mode[156..].copy_from_slice(&[1, 2, 3, 4]);
let dev_mode = craft_print::rgb::DevMode::from_bytes(dev_mode).unwrap();
let expected = craft_print::Job {
printer: Some("Office λ".into()),
copies: 3,
collate: false,
duplex: Some(craft_print::Duplex::ShortEdge),
grayscale: true,
grey_pages: true,
scaling: craft_print::Scaling::ShrinkToFit,
title: "A document".into(),
options: vec![("media".into(), "iso_a4_210x297mm".into())],
driver_settings: Some(craft_print::DriverSettings::new("Office λ", dev_mode)),
};
let bytes = serde_json::to_vec(&Request::from_job(&expected)).unwrap();
let received: Request = serde_json::from_slice(&bytes).unwrap();
assert_eq!(received.job(), Ok(expected));
}
#[test]
/// Damaged driver settings on the wire are an error, not a job printed with other settings.
fn damaged_driver_settings_are_refused() {
for hex in ["", "0", "zz", "00"] {
let mut request = Request::from_job(&job());
request.driver_settings = Some(("Office".into(), hex.into()));
assert!(request.job().is_err(), "{hex:?}");
}
}
#[test]
/// Retry succeeds immediately after cancellation, before joining the old worker.
fn cancelled_driver_does_not_block_the_next_process() {
let submission = Submission::new();
let worker = submission.clone();
let (path_tx, path_rx) = std::sync::mpsc::channel();
let running = std::thread::spawn(move || {
worker.submit_with(b"synthetic PDF", &job(), |dir| {
path_tx.send(dir.to_path_buf()).unwrap();
command(dir, "held")
})
});
let directory = path_rx.recv_timeout(Duration::from_secs(10)).unwrap();
let deadline = std::time::Instant::now() + Duration::from_secs(10);
while !directory.join("held").exists() && std::time::Instant::now() < deadline {
std::thread::sleep(Duration::from_millis(5));
}
assert!(directory.join("held").exists(), "the child is held inside its driver");
assert!(!directory.join("input.pdf").exists(), "the stalled driver retains no plaintext PDF");
assert!(!directory.join("job.json").exists(), "loaded settings were erased before driver work");
assert!(submission.cancel(), "a stalled driver still acknowledges cancellation");
let next = Submission::new();
assert_eq!(next.submit_with(b"synthetic PDF", &job(), |dir| command(dir, "ready")), Ok("spooled synthetic job".into()));
assert_eq!(running.join().unwrap(), Err(CANCELLED.into()));
assert!(!directory.exists(), "the reaped helper's PDF and settings were removed");
assert!(!next.cancel(), "a completed job keeps its receipt");
}
#[test]
/// A refused cancellation keeps the sending process alive until its receipt.
fn cancellation_refusal_preserves_the_sending_job() {
let submission = Submission::new();
let worker = submission.clone();
let (path_tx, path_rx) = std::sync::mpsc::channel();
let running = std::thread::spawn(move || {
worker.submit_with(b"synthetic PDF", &job(), |dir| {
path_tx.send(dir.to_path_buf()).unwrap();
command(dir, "sending")
})
});
let directory = path_rx.recv_timeout(Duration::from_secs(10)).unwrap();
let deadline = std::time::Instant::now() + Duration::from_secs(10);
while !directory.join("sending").exists() && std::time::Instant::now() < deadline {
std::thread::sleep(Duration::from_millis(5));
}
assert!(directory.join("sending").exists());
assert!(!submission.cancel(), "a sending job refuses cancellation");
assert!(matches!(*submission.state(), State::Sending(_)));
assert!(!running.is_finished(), "the child is retained until it finishes sending");
std::fs::write(directory.join("release"), b"continue").unwrap();
assert_eq!(running.join().unwrap(), Ok("spooled synthetic job".into()));
assert!(!directory.exists());
}
#[test]
/// Closing the parent's pipe stops a waiting driver and permits parent-side cleanup.
fn parent_disconnect_stops_a_waiting_driver() {
let submission = Submission::new();
let worker = submission.clone();
let (path_tx, path_rx) = std::sync::mpsc::channel();
let running = std::thread::spawn(move || {
worker.submit_with(b"synthetic PDF", &job(), |dir| {
path_tx.send(dir.to_path_buf()).unwrap();
command(dir, "held")
})
});
let directory = path_rx.recv_timeout(Duration::from_secs(10)).unwrap();
let deadline = std::time::Instant::now() + Duration::from_secs(10);
while !directory.join("held").exists() && std::time::Instant::now() < deadline {
std::thread::sleep(Duration::from_millis(5));
}
assert!(directory.join("held").exists());
*submission.state() = State::Finished; // Drops the parent's pipe as on process exit.
assert_eq!(running.join().unwrap(), Err("the print helper stopped without a receipt".into()));
assert!(!directory.exists());
}
#[test]
/// Helper failure removes its input directory; input limits reject oversize data.
fn helper_crashes_are_errors_and_inputs_are_bounded() {
let submission = Submission::new();
let mut inputs = None;
assert_eq!(
submission.submit_with(b"synthetic PDF", &job(), |dir| {
inputs = Some(dir.to_path_buf());
command(dir, "crash")
}),
Err("the print helper stopped without a receipt".into())
);
assert!(!inputs.unwrap().exists(), "a helper crash removes the PDF and settings");
assert_eq!(bounded(&b"abcd"[..], 3), Err("print helper input exceeds its limit".into()));
assert_eq!(bounded(&b"abc"[..], 3), Ok(b"abc".to_vec()));
}
/// Cleanup is repeatable and reports real failures while still attempting both inputs.
#[test]
fn input_cleanup_tolerates_missing_files_and_reports_failures() {
let directory = tempfile::tempdir().unwrap();
std::fs::write(directory.path().join("job.json"), b"settings").unwrap();
std::fs::write(directory.path().join("input.pdf"), b"private PDF").unwrap();
assert_eq!(remove_inputs(directory.path()), Ok(()));
assert_eq!(remove_inputs(directory.path()), Ok(()));
assert!(!directory.path().join("input.pdf").exists());
std::fs::create_dir(directory.path().join("job.json")).unwrap();
std::fs::write(directory.path().join("input.pdf"), b"private PDF").unwrap();
let error = remove_inputs(directory.path()).unwrap_err();
assert!(error.contains("could not remove job.json"), "{error}");
assert!(!directory.path().join("input.pdf").exists(), "a settings cleanup failure does not retain the PDF");
}
}
+7 -18
View File
@@ -1,30 +1,19 @@
//! The system region new documents follow (#838): the paper File › New starts on, the default
//! measurement unit and the decimal separator.
//!
//! - Windows: the preferred language with the home location from Settings › Time & language ›
//! Region (`GlobalizationPreferences.HomeGeographicRegion`, a safe Windows Runtime API), since
//! the language list alone says `en-US` for an English interface in Poland.
//! - Elsewhere: the locale the UI crate reads ([`wordcraft_ui_egui::i18n::system_region`]).
//! `WORDCRAFT_REGION` names a region outright; otherwise it is the system's regional format,
//! read once for desktop and web by [`wordcraft_ui_egui::i18n::system_region`].
/// The system region.
pub fn system() -> wordcraft_engine::Region {
let named = std::env::var("WORDCRAFT_REGION").ok().filter(|v| !v.trim().is_empty());
// Runs without preferences (agents' and screenshot runs) behave the same on every machine:
// en-US unless `WORDCRAFT_REGION` says otherwise.
if std::env::var_os("WORDCRAFT_NO_PREFS").is_some() && std::env::var_os("WORDCRAFT_REGION").is_none() {
if std::env::var_os("WORDCRAFT_NO_PREFS").is_some() && named.is_none() {
return wordcraft_engine::Region::default();
}
let region = wordcraft_ui_egui::i18n::system_region();
#[cfg(target_os = "windows")]
{
if std::env::var_os("WORDCRAFT_REGION").is_none() {
return match windows::System::UserProfile::GlobalizationPreferences::HomeGeographicRegion() {
Ok(home) => region.with_territory(&home.to_string()),
Err(e) => {
log::debug!("system home region: {e}");
region
}
};
}
if let Some(tag) = named {
return wordcraft_engine::Region::from_tag(&tag);
}
region
wordcraft_ui_egui::i18n::system_region()
}
-26
View File
@@ -1,26 +0,0 @@
//! Where AppKit puts the traffic lights, so the integrated title bar fits around them (macOS).
//!
//! The lights' size and position change between macOS versions (they grew in macOS 26), so the
//! title bar measures the real buttons instead of assuming the old 28 pt layout. These calls are
//! safe in the `objc2-app-kit` bindings (our workspace forbids unsafe).
use objc2::MainThreadMarker;
use objc2_app_kit::{NSApplication, NSWindowButton};
use wordcraft_ui_egui::chrome::MacTitleBar;
/// The title bar around the app window's traffic lights, or `None` before the window exists or
/// when AppKit has no zoom button to measure (the caller keeps the standard layout).
pub fn title_bar() -> Option<MacTitleBar> {
let mtm = MainThreadMarker::new()?;
let window = NSApplication::sharedApplication(mtm).windows().firstObject()?;
let zoom = window.standardWindowButton(NSWindowButton::ZoomButton)?;
// In window coordinates, which count up from the bottom.
let frame = zoom.convertRect_toView(zoom.bounds(), None);
let window_height = window.frame().size.height;
let right = frame.origin.x + frame.size.width;
let centre_from_top = window_height - (frame.origin.y + frame.size.height / 2.0);
if !(right.is_finite() && centre_from_top.is_finite() && right > 0.0 && centre_from_top > 0.0) {
return None;
}
Some(MacTitleBar::around_lights(right as f32, centre_from_top as f32, frame.size.height as f32))
}
+3 -12
View File
@@ -31,21 +31,12 @@ fn app(args: &[&str]) -> Output {
#[test]
fn a_bad_port_is_an_error_naming_it() {
let cases: [(&[&str], &str); 8] = [
(&["--control", "-99999999999999999999"], ", got \"-99999999999999999999\""),
(&["--control", "abc"], ", got \"abc\""),
(&["--control", "79811"], ", got \"79811\""),
(&["--control", "0"], ", got \"0\""),
(&["--control", "-5"], ", got \"-5\""),
(&["--control", "abc", "--control", "7981"], ", got \"abc\""),
(&["--control"], ""),
(&["--control", "--sample"], ""),
];
for (args, got) in cases {
let cases: [&[&str]; 4] = [&["--control", "abc"], &["--control", "0"], &["--control"], &["--control", "--sample"]];
for args in cases {
let out = app(args);
let stderr = String::from_utf8_lossy(&out.stderr);
assert_eq!(out.status.code(), Some(2), "{args:?}: stderr: {stderr}");
assert_eq!(stderr, format!("wordcraft: --control needs a port number from 1 to 65535{got}\n"), "{args:?}");
assert!(stderr.contains("--control"), "{args:?}: stderr: {stderr}");
}
}
+5 -13
View File
@@ -1,10 +1,10 @@
//! The control channel's key file, one rule for the app (which writes it) and the MCP bridge
//! (which reads it): `<settings>/control-key.<instance>`. See `docs/control-protocol.md`, Keys.
//! The control channel's token file, one rule for the app (which writes it) and the MCP bridge
//! (which reads it): `<settings>/control-key.<instance>`. See `docs/control-protocol.md`, Token.
#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
use std::path::{Path, PathBuf};
/// The app's settings folder (preferences, logs, key files): macOS
/// The app's settings folder (preferences, logs, token files): macOS
/// `~/Library/Application Support/WordCraft`, Windows `%APPDATA%\WordCraft`, otherwise
/// `$XDG_CONFIG_HOME/wordcraft` or `~/.config/wordcraft`.
/// `WORDCRAFT_PROFILE_DIR` overrides the entire folder for isolated runs.
@@ -36,8 +36,8 @@ pub fn instance_id() -> Option<String> {
parse_instance_id(&std::fs::read_to_string("/.flatpak-info").ok()?)
}
/// `<settings>/control-key.<instance>`, with `<instance>` the Flatpak instance id or
/// `local-<port>`.
/// The token file `<settings>/control-key.<instance>`, with `<instance>` the Flatpak instance id
/// or `local-<port>`.
pub fn key_path(settings: &Path, port: u16) -> PathBuf {
key_path_for(settings, instance_id().as_deref(), port)
}
@@ -77,12 +77,4 @@ mod tests {
assert_eq!(key_path(dir, 7981), dir.join("control-key.local-7981"));
}
}
#[test]
fn settings_dir_is_the_apps_folder() {
if let Some(d) = settings_dir() {
let name = d.file_name().and_then(|n| n.to_str()).unwrap_or("");
assert!(name == "wordcraft" || name == "WordCraft", "{}", d.display());
}
}
}
+5 -4
View File
@@ -2124,9 +2124,10 @@ fn rotated_ole_objects_round_trip() {
let body = text(&unzip(&out), "word/document.xml");
assert_eq!(attr_values(&body, "a:xfrm", "rot"), ["5400000"]);
assert_eq!(attr_values(&body, "a:xfrm", "flipH"), ["1"]);
// 72 × 36 pt turned 90°: 18 pt narrower each side, 18 pt taller each side.
assert_eq!(attr_values(&body, "wp:effectExtent", "l"), ["-228600"]);
assert_eq!(attr_values(&body, "wp:effectExtent", "t"), ["228600"]);
// 72 × 36 pt turned 90°: Word measures that against the frame turned with it, so a quarter
// turn adds no effect extent.
assert_eq!(attr_values(&body, "wp:effectExtent", "l"), ["0"]);
assert_eq!(attr_values(&body, "wp:effectExtent", "t"), ["0"]);
let back = wordcraft_docx::read(&out).unwrap();
let o = &paras(&back)[0].objects[0];
assert!(matches!(o, InlineObject::Image { ole: Some(_), .. }), "{o:?}");
@@ -3316,7 +3317,7 @@ fn native_ink_markup_limit_does_not_write_a_dangling_reference() {
fn native_ink_preserves_inner_transform_and_rotation_padding_on_unrelated_saves() {
let mut files = unzip(&ink_docx(false, false));
let body = text(&files, "word/document.xml")
.replace("<wp:docPr", r#"<wp:effectExtent l="55468" t="512668" r="55468" b="512668"/><wp:docPr"#)
.replace("<wp:docPr", r#"<wp:effectExtent l="512668" t="55468" r="512668" b="55468"/><wp:docPr"#)
.replace("<q:xfrm>", r#"<q:xfrm rot="2700000">"#)
.replace(r#"<a:off x="0" y="0"/><a:ext cx="1828800" cy="914400"/>"#, r#"<a:off x="127000" y="254000"/><a:ext cx="914400" cy="457200"/>"#);
files.insert("word/document.xml".into(), body.into_bytes());
+2
View File
@@ -16,6 +16,8 @@ test-support = []
[dependencies]
craft-mime.workspace = true
craft-keymap.workspace = true
craft-codepage.workspace = true
wordcraft-geom = { workspace = true, features = ["image"] }
wordcraft-doc = { workspace = true }
wordcraft-fonts = { workspace = true }
+3 -27
View File
@@ -910,7 +910,7 @@ fn paste_format(s: &mut Session, _: &Value) -> CmdResult {
#[cfg(test)]
mod shortcut_tests {
use super::*;
use crate::{KeyMap, Registry};
use crate::Registry;
#[test]
fn copy_format_web_alias_is_unique_and_keeps_existing_shortcuts() {
@@ -921,34 +921,10 @@ mod shortcut_tests {
let registry = Registry::new(commands);
let mut seen = std::collections::BTreeSet::new();
for command in registry.all() {
for key in command.shortcut.split(" / ").filter_map(crate::keymap::normalize) {
assert!(seen.insert(key.clone()), "duplicate binding: {key}");
for key in command.shortcut.split(" / ").filter_map(|k| craft_keymap::Chord::parse(k).ok()) {
assert!(seen.insert(key), "duplicate binding: {key:?}");
}
}
let keys = KeyMap::default();
let resolve = |key| keys.resolve(&registry, key).map(|c| c.id);
assert_eq!(resolve("Mod+Shift+C"), Some("edit.copyFormat"));
assert_eq!(resolve("Mod+Alt+Shift+C"), web.then_some("edit.copyFormat"));
assert_eq!(resolve("Mod+Shift+V"), Some("edit.pasteFormat"));
assert_eq!(resolve("Mod+Alt+Shift+V"), Some("edit.pasteText"));
if !cfg!(target_os = "macos") {
assert_eq!(resolve("Mod+Alt+C"), Some("text.copyright"));
}
}
}
#[test]
fn copy_format_web_alias_respects_user_removal_and_reassignment() {
let mut commands = super::super::registry().all().to_vec();
commands.iter_mut().find(|c| c.id == "edit.copyFormat").unwrap().shortcut = copy_format_shortcut(true);
let registry = Registry::new(commands);
let mut keys = KeyMap::default();
assert_eq!(keys.keys_for(&registry, "edit.copyFormat").first().map(String::as_str), Some("Mod+Alt+Shift+C"));
assert!(keys.remove(&registry, "edit.copyFormat", "Mod+Alt+Shift+C").unwrap());
assert!(keys.resolve(&registry, "Mod+Alt+Shift+C").is_none());
keys.assign(&registry, "format.bold", "Mod+Alt+Shift+C").unwrap();
let restored = KeyMap::from_value(&serde_json::to_value(&keys).unwrap());
assert_eq!(restored.resolve(&registry, "Mod+Alt+Shift+C").map(|c| c.id), Some("format.bold"));
assert_eq!(restored.resolve(&registry, "Mod+Shift+C").map(|c| c.id), Some("edit.copyFormat"));
}
}
+12
View File
@@ -774,6 +774,18 @@ fn set(s: &mut Session, v: &Value) -> CmdResult {
result(s)
}
/// The equation at the caret (the one being edited, else one beside the caret) as `(display, linear)`, read without
/// running a command. A surface that shows the equation's state every frame reads this: a command, even a query,
/// would consume the replacement an input method's deletion promised (`Session::join_next_equation_edit`), whose
/// commit can arrive in a later frame.
pub fn at_caret(s: &Session) -> Option<(bool, &str)> {
let at = equation_at_caret(s)?;
match s.doc.para_at(&at).and_then(|p| p.object_at(at.off)) {
Some(InlineObject::Equation { linear, display, .. }) => Some((*display, linear.as_str())),
_ => None,
}
}
fn get(s: &mut Session, _: &Value) -> CmdResult {
let at = equation_at_caret(s).ok_or_else(|| CmdError::Disabled("no equation at the caret".into()))?;
let Some(InlineObject::Equation { linear, display, math }) = s.doc.para_at(&at).and_then(|p| p.object_at(at.off)) else {
-22
View File
@@ -398,28 +398,6 @@ mod tests {
assert!(!page_text(&mut s).contains("{ AUTHOR }"));
}
/// #980: F11 is full screen, as people expect of a desktop app; the field walk keeps Word's
/// other keys, Alt+F1 and Alt+Shift+F1 (and Shift+F11).
#[test]
fn f11_is_full_screen_and_alt_f1_walks_fields() {
let s = Session::new(wordcraft_doc::Document::new());
let key = |k: &str| s.keymap.resolve(&s.registry, k).map(|c| c.id);
assert_eq!(key("F11"), Some("view.fullScreen"));
assert_eq!(key("Alt+F1"), Some("fields.next"));
assert_eq!(key("Alt+Shift+F1"), Some("fields.previous"));
assert_eq!(key("Shift+F11"), Some("fields.previous"));
assert_eq!(key("Mod+F11"), Some("fields.lock"));
// ⌃⌘F is macOS' own full-screen key; elsewhere Mod is Ctrl, so "Mod+Ctrl+F" would read
// Ctrl+Ctrl+F: F11 only there.
let shortcut = s.registry.get("view.fullScreen").map(|c| c.shortcut);
if cfg!(target_os = "macos") {
assert_eq!(shortcut, Some("Mod+Ctrl+F / F11"));
assert_eq!(key("Mod+Ctrl+F"), Some("view.fullScreen"));
} else {
assert_eq!(shortcut, Some("F11"));
}
}
/// Editing a code changes the instruction and the result; lock keeps a result through updates;
/// unlink turns the field into its text in one undo step; Alt+F1/Shift+F11 walk the fields.
#[test]
+1 -1
View File
@@ -26,7 +26,7 @@ pub fn specs() -> Vec<CommandSpec> {
.params(r#"{"value"?: bool}"#)
.pure(),
CommandSpec::new("readAloud.status", "Read Aloud Status", "Review › Speech", status).pure(),
CommandSpec::new("caret.pastCitation", "Move Past Citation", "Zotero › Citations", past_citation).pure(),
CommandSpec::new("caret.pastCitation", "Move Past Citation", "Citations › Citations", past_citation).pure(),
]
}
+80 -56
View File
@@ -17,7 +17,7 @@ use wordcraft_doc::{Document, Path, Pos, StoryRef, Table};
use wordcraft_geom::{Point, Rect};
use wordcraft_layout::{DocLayout, Placed};
use super::table_resize::{self, CellBox, Edge, REACH, ResizeTarget};
use super::table_resize::{self, CellBox, DrawnRow, Edge, REACH, ResizeTarget, clean_reach, span};
use super::{sel_result, table};
use crate::{CellRange, CmdError, CmdResult, CommandSpec, Selection, Session, p};
@@ -106,20 +106,6 @@ fn starts_here(geom: &ResizeTarget) -> bool {
geom.rows.first().is_some_and(|r| r.row == 0)
}
fn on_handle(geom: &ResizeTarget, x: f32, y: f32, reach: f32) -> bool {
let h = handle(geom);
starts_here(geom) && x >= h.x - reach / 2.0 && x <= h.right() + reach / 2.0 && y >= h.y - reach / 2.0 && y <= h.bottom() + reach / 2.0
}
fn clean_reach(reach: f32) -> f32 {
if reach.is_finite() { reach.clamp(0.5, 24.0) } else { REACH }
}
/// Of `lines` (index, position), the one nearest `at` within `reach`.
fn nearest(lines: impl Iterator<Item = (usize, f32)>, at: f32, reach: f32) -> Option<usize> {
lines.map(|(i, v)| (i, (at - v).abs())).filter(|(_, d)| *d <= reach).min_by(|a, b| a.1.total_cmp(&b.1)).map(|(i, _)| i)
}
/// The grid column at page x `x` (the first or the last beyond the table); a right-to-left
/// table's count from the right.
fn column_at(geom: &ResizeTarget, x: f32) -> usize {
@@ -133,60 +119,99 @@ fn row_at(geom: &ResizeTarget, y: f32) -> usize {
geom.rows.iter().find(|r| y < r.bottom).or(geom.rows.last()).map_or(0, |r| r.row)
}
/// The spot of one table at (`x`, `y`): the handle, then the insert buttons, then the selection
/// areas. `cells` are its cell boxes on the page.
fn spot_in(geom: &ResizeTarget, cells: &[&CellBox], x: f32, y: f32, reach: f32, bar: Option<(f32, f32)>) -> Option<Spot> {
if on_handle(geom, x, y, reach) {
return Some(Spot::Handle);
/// The areas of one table, in the order they win where they overlap: the handle, the insert buttons and column
/// areas above the table, the insert buttons and row areas left of it, the selection bar beside it, then the cells'
/// left edges. `cells` are its cell boxes on the page. Areas keep clear of the row and column borders only as far
/// as `reach` asks; a border wins over any of them (`target_at`).
fn table_spots(l: &DocLayout, doc: &Document, page: usize, geom: &ResizeTarget, cells: &[&CellBox], reach: f32) -> Vec<(Rect, Spot)> {
let mut out = Vec::new();
let (left, right, top) = (geom.left(), geom.right(), geom.top());
if starts_here(geom) {
let h = handle(geom);
out.push((span(h.x - reach / 2.0, h.y - reach / 2.0, h.right() + reach / 2.0, h.bottom() + reach / 2.0), Spot::Handle));
}
let (left, right, top, bottom) = (geom.left(), geom.right(), geom.top(), geom.bottom());
// Above the table: the insert buttons over its column borders, and the column areas.
if y >= top - INSERT_OUT && y <= top + COLUMN_BELOW && x >= left - INSERT_REACH && x <= right + INSERT_REACH {
let lines = geom.cols.iter().copied().enumerate().filter(|(i, _)| geom.rows.iter().any(|r| r.edges.contains(i)));
if y < top
&& let Some(line) = nearest(lines, x, INSERT_REACH)
{
return Some(Spot::InsertColumn(geom.grid_line(line)));
}
if y >= top - COLUMN_ABOVE && x >= left && x <= right {
return Some(Spot::Column(column_at(geom, x)));
for (i, cx) in geom.cols.iter().copied().enumerate() {
if geom.rows.iter().any(|r| r.edges.contains(&i)) {
out.push((span(cx - INSERT_REACH, top - INSERT_OUT, cx + INSERT_REACH, top), Spot::InsertColumn(geom.grid_line(i))));
}
}
let n = geom.cols.len().saturating_sub(1);
for d in 0..n {
let (Some(x0), Some(x1)) = (geom.cols.get(d), geom.cols.get(d + 1)) else { continue };
let g = if geom.rtl { n.saturating_sub(1).saturating_sub(d) } else { d };
out.push((span(*x0, top - COLUMN_ABOVE, *x1, top + COLUMN_BELOW), Spot::Column(g)));
}
// Left of the table: the insert buttons beside its row borders, and the row areas.
if x >= left - ROW_LEFT && x < left && y >= top - INSERT_REACH && y <= bottom + INSERT_REACH {
let borders = geom.rows.iter().flat_map(|r| [(r.row, r.top), (r.row + 1, r.bottom)]);
if let Some(line) = nearest(borders, y, INSERT_REACH) {
return Some(Spot::InsertRow(line));
}
if let Some(r) = geom.rows.iter().find(|r| y >= r.top && y <= r.bottom) {
return Some(Spot::Row(r.row));
let beside = left - 0.01;
let mut seen: Vec<usize> = Vec::new();
for (line, y) in geom.rows.iter().flat_map(|r| [(r.row, r.top), (r.row.saturating_add(1), r.bottom)]) {
if !seen.contains(&line) {
seen.push(line);
out.push((span(left - ROW_LEFT, y - INSERT_REACH, beside, y + INSERT_REACH), Spot::InsertRow(line)));
}
}
for r in &geom.rows {
out.push((span(left - ROW_LEFT, r.top, beside, r.bottom), Spot::Row(r.row)));
}
// The page margin beside the table is the selection bar: a row's area too.
if let Some((x0, x1)) = bar
&& x >= x0
&& x <= x1
&& let Some(r) = geom.rows.iter().find(|r| y >= r.top && y <= r.bottom)
{
return Some(Spot::Row(r.row));
for r in &geom.rows {
if let Some((x0, x1)) = row_bar(l, doc, page, geom, r) {
out.push((span(x0, r.top, x1, r.bottom), Spot::Row(r.row)));
}
}
// Inside a cell, along its left edge.
let edge = CELL_EDGE.max(reach + 2.5);
cells.iter().find(|b| x >= b.rect.x && x <= b.rect.x + edge && y >= b.rect.y && y <= b.rect.bottom()).map(|b| Spot::Cell(b.row, b.cell))
for b in cells {
out.push((span(b.rect.x, b.rect.y, b.rect.x + edge, b.rect.bottom()), Spot::Cell(b.row, b.cell)));
}
let _ = right;
out
}
/// The x range of the selection bar beside the table's row at page height `y`: the page margin
/// A selection area, insert button or move handle and the page rectangle it answers in.
#[derive(Clone, Debug, PartialEq)]
pub struct SpotArea {
/// Where the spot answers (page points).
pub area: Rect,
/// The spot and its table's drawn geometry.
pub target: Target,
}
impl SpotArea {
/// Whether page point (`x`, `y`) is in the area.
pub fn holds(&self, x: f32, y: f32) -> bool {
x >= self.area.x && x <= self.area.right() && y >= self.area.y && y <= self.area.bottom()
}
}
/// Every spot of the tables of `story` on `page`, nested tables included, each table's in the order they win.
/// `reach` is the column borders' resize reach. The one rule [`target_at`] answers from, so the app can declare a
/// part per area.
pub fn spots(l: &DocLayout, doc: &Document, story: StoryRef, page: usize, reach: f32) -> Vec<SpotArea> {
let reach = clean_reach(reach);
let boxes = table_resize::cell_boxes(l, page);
let mut out = Vec::new();
for geom in table_resize::tables_on(l, doc, page).into_iter().filter(|g| g.story == story) {
let cells: Vec<&CellBox> = boxes.iter().filter(|b| b.story == geom.story && b.table == geom.table).collect();
for (area, spot) in table_spots(l, doc, page, &geom, &cells, reach) {
out.push(SpotArea { area, target: Target { spot, geom: geom.clone() } });
}
}
out
}
/// The x range of the selection bar beside table row `row`: the page margin
/// on the table's leading side (left, or right for a right-to-left table). Only a non-floating
/// table of the main text has one, and only where it is what stands beside that margin: no line
/// of the text (another column, text wrapped round the table) lies between the two at that
/// height. A nested table's rows are the outermost table's.
fn row_bar(l: &DocLayout, doc: &Document, page: usize, geom: &ResizeTarget, y: f32) -> Option<(f32, f32)> {
fn row_bar(l: &DocLayout, doc: &Document, page: usize, geom: &ResizeTarget, row: &DrawnRow) -> Option<(f32, f32)> {
let p = l.pages.get(page)?;
if geom.story != StoryRef::Body || geom.table.0.len() != 1 {
return None;
}
let t = doc.table(geom.story, &geom.table)?;
let row = geom.rows.iter().find(|r| y >= r.top && y <= r.bottom)?;
if t.props.float.is_some() {
return None;
}
@@ -214,15 +239,14 @@ pub fn target_at(l: &DocLayout, doc: &Document, story: StoryRef, page: usize, x:
if table_resize::resize_target(l, doc, page, x, y, reach).is_some() {
return None;
}
let boxes = table_resize::cell_boxes(l, page);
table_resize::tables_on(l, doc, page)
.into_iter()
.filter(|g| g.story == story)
.filter_map(|geom| {
let cells: Vec<&CellBox> = boxes.iter().filter(|b| b.story == geom.story && b.table == geom.table).collect();
spot_in(&geom, &cells, x, y, reach, row_bar(l, doc, page, &geom, y)).map(|spot| Target { spot, geom })
})
.max_by_key(|t| t.geom.table.0.len())
// Within a table the first area holding the point wins; of nested tables the innermost.
let mut best: Option<SpotArea> = None;
for s in spots(l, doc, story, page, reach) {
if s.holds(x, y) && best.as_ref().is_none_or(|b| s.target.geom.table.0.len() > b.target.geom.table.0.len()) {
best = Some(s);
}
}
best.map(|s| s.target)
}
/// The table whose move handle shows with the pointer at (`x`, `y`): the innermost table of
+68 -36
View File
@@ -481,51 +481,83 @@ pub fn table_under(l: &DocLayout, doc: &Document, page: usize, x: f32, y: f32, r
.max_by_key(|t| t.table.0.len())
}
/// A page-point rectangle from its corners, never inverted.
pub(crate) fn span(x0: f32, y0: f32, x1: f32, y1: f32) -> Rect {
Rect::new(x0, y0, (x1 - x0).max(0.0), (y1 - y0).max(0.0))
}
/// A reach as every table query takes it: finite, and neither a hair nor a page.
pub(crate) fn clean_reach(reach: f32) -> f32 {
if reach.is_finite() { reach.clamp(0.5, 24.0) } else { REACH }
}
/// Every grabbable border on `page`: one strip per border (a column border's strip runs along the rows that have
/// it, the left edge's lies outside the table), each with the table's geometry and the border as its `edge`. The one
/// rule [`resize_target`] answers from, so the app can declare a part per strip.
pub fn borders(l: &DocLayout, doc: &Document, page: usize, reach: f32) -> Vec<(Rect, ResizeTarget)> {
let reach = clean_reach(reach);
let mut out = Vec::new();
for target in tables_on(l, doc, page) {
let mut add = |area: Rect, edge: Edge| {
let mut t = target.clone();
t.edge = edge;
out.push((area, t));
};
let (left, right) = (target.left(), target.right());
if target.ends_here && target.resizable_columns() {
let h = target.handle();
add(span(h.x - reach / 2.0, h.y - reach / 2.0, h.right() + reach / 2.0, h.bottom() + reach / 2.0), Edge::Corner);
}
// Column borders: only along the rows where the line is a cell border (none of a right-to-left table's yet,
// `resizable_columns`). The table's left edge is grabbed from outside it, a point in at most.
if target.resizable_columns() {
for (line, cx) in target.cols.iter().copied().enumerate() {
let x1 = if line == 0 { cx + reach.min(1.0) } else { cx + reach };
let mut run: Option<(f32, f32)> = None;
for r in &target.rows {
if r.edges.contains(&line) {
run = Some(run.map_or((r.top, r.bottom), |(a, _)| (a, r.bottom)));
} else if let Some((a, b)) = run.take() {
add(span(cx - reach, a, x1, b), Edge::Column(line));
}
}
if let Some((a, b)) = run {
add(span(cx - reach, a, x1, b), Edge::Column(line));
}
}
}
// Row borders: the bottom of each drawn row.
for r in &target.rows {
add(span(left, r.bottom - reach, right, r.bottom + reach), Edge::Row(r.row));
}
}
out
}
/// How far page point (`x`, `y`) is from the border `t` names.
fn border_distance(t: &ResizeTarget, x: f32, y: f32) -> f32 {
match t.edge {
Edge::Column(line) => t.cols.get(line).map_or(f32::INFINITY, |c| (x - c).abs()),
Edge::Row(row) => t.rows.iter().find(|r| r.row == row).map_or(f32::INFINITY, |r| (y - r.bottom).abs()),
Edge::Corner => 0.0,
}
}
/// The table border or resize handle within `reach` points of page point (`x`, `y`): the
/// nearest, and of nested tables the innermost.
pub fn resize_target(l: &DocLayout, doc: &Document, page: usize, x: f32, y: f32, reach: f32) -> Option<ResizeTarget> {
if !x.is_finite() || !y.is_finite() {
return None;
}
let reach = if reach.is_finite() { reach.clamp(0.5, 24.0) } else { REACH };
let reach = clean_reach(reach);
let mut best: Option<(f32, usize, ResizeTarget)> = None;
for mut target in tables_on(l, doc, page) {
let depth = target.table.0.len();
let mut offer = |d: f32, edge: Edge, target: &mut ResizeTarget| {
if d <= reach && best.as_ref().is_none_or(|(bd, bdepth, _)| d < *bd - 0.01 || (d <= *bd + 0.01 && depth > *bdepth)) {
target.edge = edge;
best = Some((d, depth, target.clone()));
}
};
if on_handle(&target, x, y, reach) {
offer(0.0, Edge::Corner, &mut target);
}
let (left, right, top, bottom) = (target.left(), target.right(), target.top(), target.bottom());
if x < left - reach || x > right + reach || y < top - reach || y > bottom + reach {
for (area, target) in borders(l, doc, page, reach) {
if x < area.x || x > area.right() || y < area.y || y > area.bottom() {
continue;
}
// Column borders: in the row under the pointer, only lines that are cell borders there
// (none of a right-to-left table's yet, `resizable_columns`).
let row_here = target.rows.iter().find(|r| y >= r.top && y <= r.bottom).cloned();
if let Some(r) = &row_here
&& target.resizable_columns()
{
for line in 0..target.cols.len() {
// The table's left edge is grabbed from outside it (a point in, for the border's
// width): inside starts the first cell.
if r.edges.contains(&line)
&& (line > 0 || x <= left + 1.0)
&& let Some(cx) = target.cols.get(line).copied()
{
offer((x - cx).abs(), Edge::Column(line), &mut target);
}
}
}
// Row borders: the bottom of each drawn row.
if x >= left && x <= right {
for r in target.rows.clone() {
offer((y - r.bottom).abs(), Edge::Row(r.row), &mut target);
}
let (d, depth) = (border_distance(&target, x, y), target.table.0.len());
if d <= reach && best.as_ref().is_none_or(|(bd, bdepth, _)| d < *bd - 0.01 || (d <= *bd + 0.01 && depth > *bdepth)) {
best = Some((d, depth, target));
}
}
best.map(|b| b.2)
+1 -1
View File
@@ -17,8 +17,8 @@ use autoformat::insert;
use delete::{backspace, delete, delete_sentence_back, delete_word_back, delete_word_fwd};
pub use enter_tab::MAX_TYPED_PARAGRAPHS;
use enter_tab::{back_tab, new_paragraph, tab};
pub use unicode::{alt_code_char, oem_code_page, system_code_pages, system_oem_code_page, windows_code_pages};
use unicode::{ins_char, insert_code, toggle_unicode};
pub use unicode::{oem_code_page, system_code_pages, system_oem_code_page};
/// The text-entry commands: typing, Enter, breaks, Tab, deleting and typed symbols.
pub fn specs() -> Vec<CommandSpec> {
+5 -70
View File
@@ -58,7 +58,7 @@ pub(super) fn insert_code(s: &mut Session, v: &Value) -> CmdResult {
};
let ansi = page("ansi", &SINGLE_BYTE_CODE_PAGES, 1252)?;
let oem = page("oem", &OEM_CODE_PAGES, system_oem_code_page())?;
let c = alt_code_char(code, ansi, oem).ok_or_else(|| CmdError::Failed(format!("{code:?} isn't a character code")))?;
let c = craft_codepage::alt_code_char(code, ansi, oem).ok_or_else(|| CmdError::Failed(format!("{code:?} isn't a character code")))?;
let mut r = insert(s, &serde_json::json!({"text": c.to_string()}))?;
if let Value::Object(m) = &mut r {
m.insert("char".into(), Value::String(c.to_string()));
@@ -66,92 +66,27 @@ pub(super) fn insert_code(s: &mut Session, v: &Value) -> CmdResult {
Ok(r)
}
/// The character Word on Windows types for an Alt+numpad code (decimal digits, as typed):
/// - with a leading 0 and a value up to 255, the ANSI code page's character (`ansi`, one of
/// [`wordcraft_doc::encoding::SINGLE_BYTE_CODE_PAGES`]): `0233` → é and `0128` → € in
/// Windows-1252, `0185` → ą in 1250;
/// - without one, 1–255 is the OEM code page's character (`oem`, one of
/// [`wordcraft_doc::encoding::OEM_CODE_PAGES`]): `233` → Θ in 437, Ú in 850 (é is `130` in
/// both), `165` → ą in 852; 1–31 and 127 are the code page's glyphs (`1` → ☺, `7` → •);
/// - above 255, with or without the 0, the Unicode character with that decimal value
/// (`8364` → €), as Word inserts it.
///
/// `None` for an empty or non-numeric code, 0, a control character, a byte the code page leaves
/// unassigned or a value past Unicode.
pub fn alt_code_char(code: &str, ansi: u16, oem: u16) -> Option<char> {
if code.is_empty() || !code.bytes().all(|b| b.is_ascii_digit()) {
return None;
}
let digits = code.trim_start_matches('0');
// More than seven significant digits is past U+10FFFF (1114111).
if digits.len() > 7 {
return None;
}
let value: u32 = if digits.is_empty() { 0 } else { digits.parse().ok()? };
let c = match u8::try_from(value) {
Ok(0) => return None,
Ok(b) if code.starts_with('0') => wordcraft_doc::encoding::windows_byte(ansi, b),
Ok(b) => wordcraft_doc::encoding::oem_byte(oem, b),
Err(_) => char::from_u32(value)?,
};
Some(c).filter(|c| codeable(*c) && *c != '\u{FFFD}')
}
/// The OEM code page for the system locale the shell reported (437 headless).
pub fn system_oem_code_page() -> u16 {
oem_code_page(crate::session::system_locale())
}
/// The (ANSI, OEM) code pages of the system locale the shell reported, as Windows sets them
/// ([`windows_code_pages`]).
/// ([`craft_codepage::windows_code_pages`]).
pub fn system_code_pages() -> (u16, u16) {
windows_code_pages(crate::session::system_locale())
craft_codepage::windows_code_pages(crate::session::system_locale())
}
/// The OEM code page `text.typeCode` assumes for a locale (BCP 47 tag) when the shell names
/// none: 850 for Western European languages and English outside the US, 437 otherwise. The
/// other pages come only from the shell (Windows passes [`windows_code_pages`]).
/// other pages come only from the shell (Windows passes [`craft_codepage::windows_code_pages`]).
pub fn oem_code_page(locale: Option<&str>) -> u16 {
match windows_code_pages(locale) {
match craft_codepage::windows_code_pages(locale) {
(_, 850) => 850,
_ => 437,
}
}
/// The (ANSI, OEM) code pages Windows uses for a locale (BCP 47 tag or POSIX name), limited to
/// the pages `text.typeCode` decodes: Windows-1252 and OEM 437 for US English, unknown locales
/// and those with other pages (Asian double-byte pages, OEM 775/720/862…).
pub fn windows_code_pages(locale: Option<&str>) -> (u16, u16) {
let Some(tag) = locale else { return (1252, 437) };
let parts: Vec<&str> = tag.split(['-', '_', '.', '@']).collect();
let lang = parts.first().copied().unwrap_or_default().to_ascii_lowercase();
let rest = parts.get(1..).unwrap_or_default();
let region = rest.iter().find(|p| p.len() == 2 && p.chars().all(|c| c.is_ascii_alphabetic())).map(|r| r.to_ascii_uppercase());
let script = rest.iter().find(|p| p.len() == 4 && p.chars().all(|c| c.is_ascii_alphabetic())).map(|r| r.to_ascii_lowercase());
const WESTERN: [&str; 18] = ["ca", "da", "de", "es", "eu", "fi", "fo", "fr", "ga", "gl", "is", "it", "nb", "nl", "nn", "no", "pt", "sv"];
match lang.as_str() {
"en" => match region.as_deref() {
None | Some("US") => (1252, 437),
Some(_) => (1252, 850),
},
l if WESTERN.contains(&l) => (1252, 850),
"pl" | "cs" | "sk" | "hu" | "sl" | "hr" | "ro" | "sq" | "bs" => (1250, 852),
"sr" if script.as_deref() == Some("latn") => (1250, 852),
"ru" | "uk" | "be" | "bg" => (1251, 866),
// Macedonian and Cyrillic Serbian use OEM 855, which isn't decoded.
"sr" | "mk" => (1251, 437),
"el" => (1253, 737),
"az" if script.as_deref() == Some("cyrl") => (1251, 866),
"tr" | "az" => (1254, 857),
"he" => (1255, 437),
"ar" | "fa" | "ur" => (1256, 437),
"et" | "lv" | "lt" => (1257, 437),
"vi" => (1258, 437),
"th" => (874, 437),
_ => (1252, 437),
}
}
/// The character a hex code (1–6 digits) names, if it is one Alt+X makes.
fn hex_char(code: &str) -> Option<char> {
if code.is_empty() || code.len() > 6 || !code.chars().all(|c| c.is_ascii_hexdigit()) {
+45 -18
View File
@@ -280,46 +280,73 @@ pub(super) fn select_similar(s: &mut Session, _: &Value) -> CmdResult {
Ok(json!({"runs": count}))
}
/// Tools › Customize Keyboard: read and change the custom keyboard shortcuts ([`crate::KeyMap`]).
/// Without params it opens the dialog; with any, it only does what they ask (no dialog).
/// Tools › Customize Keyboard: read and change the custom keyboard shortcuts (the session's
/// [`craft_keymap::Overrides`] over the registry's keys). Without params it opens the dialog; with
/// any, it only does what they ask (no dialog).
pub(super) fn customize_keyboard(s: &mut Session, v: &Value) -> CmdResult {
let reg = s.registry.clone();
let pair = |x: &Value| -> Result<(String, String), CmdError> { Ok((p::req_str(x, "command")?.to_string(), p::req_str(x, "key")?.to_string())) };
let mut keymap = crate::keymap::registry_keymap(&reg, s.keymap());
let mut out = serde_json::Map::new();
let asked = keyboard_changes(&mut keymap, &reg, v, &mut out);
// Each part is a request of its own: what the parts before a failing one changed stays.
*s.keymap_mut() = keymap.overrides().clone();
let asked = asked?;
out.insert("custom".into(), serde_json::to_value(s.keymap()).unwrap_or(Value::Null));
if !asked {
s.push_ui_request(json!({"open": "customizeKeyboard"}));
}
Ok(Value::Object(out))
}
/// The parts of a `tools.customizeKeyboard` call, applied to `keymap` in order, with their results
/// in `out`. Returns whether any part was asked for.
fn keyboard_changes(
keymap: &mut craft_keymap::Keymap,
reg: &crate::Registry,
v: &Value,
out: &mut serde_json::Map<String, Value>,
) -> Result<bool, CmdError> {
use craft_keymap::{AssignError, Binding, Chord, CommandRef, Policy, Scope};
let not_a_key = |key: &str| CmdError::Params(format!("`{key}` isn't a key (e.g. Mod+Shift+K, Alt+F7, F2)"));
let pair = |x: &Value| -> Result<(CommandRef, Binding), CmdError> {
let key = p::req_str(x, "key")?;
let binding = Binding::parse(key).map_err(|_| not_a_key(key))?;
Ok((CommandRef::new(p::req_str(x, "command")?), binding))
};
let mut asked = false;
if p::bool(v, "reset") == Some(true) {
asked = true;
s.keymap.reset();
keymap.reset_all();
}
if let Some(a) = v.get("assign") {
asked = true;
let (id, key) = pair(a)?;
let previous = s.keymap.assign(&reg, &id, &key).map_err(CmdError::Params)?;
out.insert("replaced".into(), json!(previous));
let (command, binding) = pair(a)?;
let assigned = keymap.assign(&command, binding, Policy::Steal).map_err(|e| match e {
AssignError::UnknownCommand => CmdError::Params(format!("unknown command `{}`", command.id)),
e => CmdError::Params(e.to_string()),
})?;
out.insert("replaced".into(), json!(assigned.taken_from.first().map(|h| h.command.id.as_str())));
}
if let Some(r) = v.get("remove") {
asked = true;
let (id, key) = pair(r)?;
out.insert("removed".into(), json!(s.keymap.remove(&reg, &id, &key).map_err(CmdError::Params)?));
let (command, binding) = pair(r)?;
out.insert("removed".into(), json!(keymap.remove(&command, &binding)));
}
if let Some(id) = p::str(v, "command") {
asked = true;
if reg.get(id).is_none() {
return Err(CmdError::Params(format!("unknown command `{id}`")));
}
out.insert("keys".into(), json!(s.keymap.keys_for(&reg, id)));
let keys: Vec<String> = keymap.bindings(&CommandRef::new(id)).iter().map(|b| b.text(&Scope::app())).collect();
out.insert("keys".into(), json!(keys));
}
if let Some(key) = p::str(v, "key") {
asked = true;
let key = crate::keymap::normalize(key).ok_or_else(|| CmdError::Params(format!("`{key}` isn't a key (e.g. Mod+Shift+K, Alt+F7, F2)")))?;
out.insert("assignedTo".into(), json!(s.keymap.resolve(&reg, &key).map(|c| c.id)));
out.insert("key".into(), json!(key));
let chord = Chord::parse(key).map_err(|_| not_a_key(key))?;
out.insert("assignedTo".into(), json!(keymap.holder(&chord).map(|c| c.id)));
out.insert("key".into(), json!(chord.portable()));
}
out.insert("custom".into(), serde_json::to_value(&s.keymap).unwrap_or(Value::Null));
if !asked {
s.push_ui_request(json!({"open": "customizeKeyboard"}));
}
Ok(Value::Object(out))
Ok(asked)
}
/// `tools.search`: the commands whose label, location or id hold every word of `query`, or,
+158 -219
View File
@@ -1,205 +1,111 @@
//! Custom keyboard shortcuts (Tools › Customize Keyboard, `tools.customizeKeyboard`): keys the
//! user assigned to commands and built-in keys the user removed. The user's map is consulted
//! before the registry's built-in `shortcut`s, so an assignment overrides a built-in key and a
//! removed built-in key does nothing.
//! Custom keyboard shortcuts (Tools › Customize Keyboard, `tools.customizeKeyboard`). The user's
//! changes are craft-keymap [`Overrides`]: a command's entry is the full list of keys that
//! replaces its registry `shortcut`s, so an assignment that takes a built-in key gives the losing
//! command an entry of its own.
//!
//! Keys are written like the registry's shortcuts (`Mod+Shift+K`, `Alt+F7`, `F2`; `Mod` is Ctrl,
//! or ⌘ on macOS) and compared in one canonical form ([`normalize`]). The map is saved with the
//! front end's preferences; reading a saved map never fails: entries that aren't a valid key or
//! command are dropped.
//! The registry writes keys as `Mod+Shift+K`, `Alt+F7` or `F2` (`Mod` is Ctrl, or ⌘ on macOS); the
//! keymap reads that spelling. The overrides are saved with the front end's preferences.
use std::collections::{BTreeMap, BTreeSet};
use std::collections::BTreeMap;
use serde::{Deserialize, Serialize};
use craft_keymap::{Binding, Chord, CommandDef, CommandRef, Keymap, Overrides, Platform, Scope, Scopes};
use serde_json::Value;
use crate::{CommandSpec, Registry};
/// At most this many saved entries are read (a hand-edited settings file can't balloon memory).
/// At most this many entries of an old saved map are read (a hand-edited settings file can't
/// balloon memory).
const MAX_ENTRIES: usize = 2000;
/// Longest key text accepted.
/// Longest key text an old saved map may hold.
const MAX_KEY_LEN: usize = 48;
/// Longest command id an old saved map may hold.
const MAX_ID_LEN: usize = 128;
/// Named (non-character) keys, in their canonical spelling.
const NAMED: &[&str] =
&["Left", "Right", "Up", "Down", "Home", "End", "PageUp", "PageDown", "Enter", "Tab", "Backspace", "Delete", "Escape", "Space", "Insert"];
/// Custom keyboard shortcuts. `assigned` maps a key to the command it runs; `removed` holds
/// built-in keys that were taken away (removed, or reassigned to another command).
#[derive(Clone, Debug, Default, PartialEq, Serialize)]
pub struct KeyMap {
pub assigned: BTreeMap<String, String>,
pub removed: BTreeSet<String>,
/// A command's built-in keys as the registry writes them.
fn pieces(spec: &CommandSpec) -> impl Iterator<Item = &'static str> {
spec.shortcut.split(" / ").filter(|piece| !piece.is_empty())
}
/// A key in canonical form: modifiers in the order `Mod+Ctrl+Alt+Shift+`, then the key (a single
/// character upper-cased, a named key, or `F1`–`F24`). `None` when it isn't a key.
pub fn normalize(key: &str) -> Option<String> {
let key = key.trim();
if key.is_empty() || key.len() > MAX_KEY_LEN {
/// The keymap of every engine command with its registry keys, under `overrides`. Off macOS,
/// Alt+Q is the interface's command search key, so it never reaches an engine command.
pub(crate) fn registry_keymap(reg: &Registry, overrides: &Overrides) -> Keymap {
let catalog: Vec<CommandDef> = reg
.all()
.iter()
.map(|spec| {
pieces(spec)
.filter_map(|piece| Binding::parse(piece).ok())
.fold(CommandDef::new(CommandRef::new(spec.id), spec.label, Scope::app()), CommandDef::with_default)
})
.collect();
let platform = Platform::current();
let reserved: Vec<Chord> = if platform == Platform::Mac { Vec::new() } else { Chord::parse("Alt+Q").ok().into_iter().collect() };
Keymap::new(catalog, Scopes::new(), platform).with_reserved(reserved).with_overrides(overrides.clone())
}
/// A key of an old saved map: its canonical text and the chord it is on `platform`.
fn legacy_chord(text: &str, platform: Platform) -> Option<(String, Chord)> {
if text.len() > MAX_KEY_LEN {
return None;
}
// `Mod++` is the plus key with Mod.
let (mods, name) = match key.strip_suffix("++") {
Some(m) => (m, "+"),
None => match key.rsplit_once('+') {
Some((m, n)) => (m, n),
None => ("", key),
},
};
let (mut cmd, mut ctrl, mut alt, mut shift) = (false, false, false, false);
for m in mods.split('+').filter(|m| !m.is_empty()) {
match m.to_ascii_lowercase().as_str() {
"mod" => cmd = true,
"ctrl" => ctrl = true,
"alt" => alt = true,
"shift" => shift = true,
_ => return None,
}
}
let name = canonical_name(name)?;
let mut out = String::new();
for (on, m) in [(cmd, "Mod+"), (ctrl, "Ctrl+"), (alt, "Alt+"), (shift, "Shift+")] {
if on {
out.push_str(m);
}
}
out.push_str(&name);
Some(out)
let chord = Chord::parse(text.trim()).ok()?;
Some((chord.portable(), chord.effective(platform)))
}
fn canonical_name(name: &str) -> Option<String> {
let mut chars = name.chars();
if let (Some(c), None) = (chars.next(), chars.next()) {
return (!c.is_whitespace() && !c.is_control()).then(|| c.to_uppercase().collect());
}
if let Some(n) = NAMED.iter().find(|n| n.eq_ignore_ascii_case(name)) {
return Some((*n).to_string());
}
let f = name.strip_prefix('F').or_else(|| name.strip_prefix('f'))?;
let n: u8 = f.parse().ok()?;
(1..=24).contains(&n).then(|| format!("F{n}"))
/// A command's built-in keys: the registry's text and the chord on `platform`.
fn default_chords(spec: &CommandSpec, platform: Platform) -> Vec<(String, Chord)> {
pieces(spec).filter_map(|piece| Some((piece.to_string(), Chord::parse(piece).ok()?.effective(platform)))).collect()
}
/// A command's built-in keys, normalized.
fn builtin_keys(spec: &CommandSpec) -> impl Iterator<Item = String> + '_ {
spec.shortcut.split(" / ").filter_map(normalize)
/// The command that has `chord` among its built-in keys (the first in the registry).
fn default_holder(reg: &Registry, chord: Chord, platform: Platform) -> Option<&CommandSpec> {
reg.all().iter().find(|spec| default_chords(spec, platform).iter().any(|(_, c)| *c == chord))
}
/// The command a key runs without customization (the first command listing it).
fn builtin<'a>(reg: &'a Registry, key: &str) -> Option<&'a CommandSpec> {
reg.all().iter().find(|s| !s.shortcut.is_empty() && builtin_keys(s).any(|k| k == key))
/// The key list being built for `spec`, starting from its built-in keys.
fn entry<'a>(lists: &'a mut BTreeMap<&'static str, Vec<(String, Chord)>>, spec: &CommandSpec, platform: Platform) -> &'a mut Vec<(String, Chord)> {
lists.entry(spec.id).or_insert_with(|| default_chords(spec, platform))
}
impl KeyMap {
/// Read a saved map, keeping only well-formed entries (never fails).
pub fn from_value(v: &Value) -> KeyMap {
let mut map = KeyMap::default();
if let Some(a) = v.get("assigned").and_then(Value::as_object) {
for (k, id) in a.iter().take(MAX_ENTRIES) {
if let (Some(k), Some(id)) = (normalize(k), id.as_str().filter(|id| !id.is_empty() && id.len() <= 128)) {
map.assigned.insert(k, id.to_string());
}
/// The overrides an old saved `{"assigned": {key: command}, "removed": [key]}` map stands for: an
/// assigned key joins its command's keys and leaves the command that had it built in; a removed
/// built-in key leaves its command. Only commands whose keys differ from their built-in ones get
/// an entry. Entries that aren't a key or a known command are dropped, and any JSON value reads.
pub fn overrides_from_legacy(reg: &Registry, saved: &Value) -> Overrides {
let platform = Platform::current();
let mut lists: BTreeMap<&'static str, Vec<(String, Chord)>> = BTreeMap::new();
// Removals first: a key both removed and assigned (taken from a built-in command) ends with
// the command it was assigned to.
if let Some(removed) = saved.get("removed").and_then(Value::as_array) {
for (_, chord) in removed.iter().take(MAX_ENTRIES).filter_map(Value::as_str).filter_map(|t| legacy_chord(t, platform)) {
if let Some(spec) = default_holder(reg, chord, platform) {
entry(&mut lists, spec, platform).retain(|(_, c)| *c != chord);
}
}
if let Some(r) = v.get("removed").and_then(Value::as_array) {
map.removed.extend(r.iter().take(MAX_ENTRIES).filter_map(Value::as_str).filter_map(normalize));
}
map
}
/// Whether nothing is customized.
pub fn is_empty(&self) -> bool {
self.assigned.is_empty() && self.removed.is_empty()
}
/// Drop entries for commands that don't exist and removals of keys that aren't built in.
pub fn retain_known(&mut self, reg: &Registry) {
self.assigned.retain(|_, id| reg.get(id).is_some());
self.removed.retain(|k| builtin(reg, k).is_some());
}
/// The command a key runs: the user's assignment, else the built-in one unless removed.
pub fn resolve<'a>(&self, reg: &'a Registry, key: &str) -> Option<&'a CommandSpec> {
let key = normalize(key)?;
if let Some(spec) = self.assigned.get(&key).and_then(|id| reg.get(id)) {
return Some(spec);
}
if self.removed.contains(&key) {
return None;
}
builtin(reg, &key)
}
/// The keys that run a command now: its built-in keys still in effect, then the user's.
pub fn keys_for(&self, reg: &Registry, id: &str) -> Vec<String> {
let mut keys: Vec<String> = Vec::new();
if let Some(spec) = reg.get(id) {
for k in builtin_keys(spec) {
// Uncustomized (the usual case, every frame for tooltips): no registry scan.
if !keys.contains(&k) && (self.is_empty() || self.resolve(reg, &k).is_some_and(|s| s.id == id)) {
keys.push(k);
}
if let Some(assigned) = saved.get("assigned").and_then(Value::as_object) {
for (key, id) in assigned.iter().take(MAX_ENTRIES) {
let Some((text, chord)) = legacy_chord(key, platform) else { continue };
let Some(spec) = id.as_str().filter(|id| !id.is_empty() && id.len() <= MAX_ID_LEN).and_then(|id| reg.get(id)) else { continue };
if let Some(holder) = default_holder(reg, chord, platform).filter(|h| h.id != spec.id) {
entry(&mut lists, holder, platform).retain(|(_, c)| *c != chord);
}
let list = entry(&mut lists, spec, platform);
if !list.iter().any(|(_, c)| *c == chord) {
list.push((text, chord));
}
}
for (k, owner) in &self.assigned {
if owner == id && !keys.contains(k) {
keys.push(k.clone());
}
}
keys
}
/// Assign `key` to command `id`; the key leaves whatever command had it. Returns that command.
pub fn assign(&mut self, reg: &Registry, id: &str, key: &str) -> Result<Option<String>, String> {
if reg.get(id).is_none() {
return Err(format!("unknown command `{id}`"));
let mut overrides = Overrides::new();
for (id, list) in lists {
let Some(spec) = reg.get(id) else { continue };
let defaults = default_chords(spec, platform);
let unchanged = list.len() == defaults.len() && list.iter().zip(&defaults).all(|((_, a), (_, b))| a == b);
if !unchanged {
let _ = overrides.insert(CommandRef::new(id).key(), list.into_iter().map(|(text, _)| text).collect());
}
let key = normalize(key).ok_or_else(|| format!("`{key}` isn't a key (e.g. Mod+Shift+K, Alt+F7, F2)"))?;
let previous = self.resolve(reg, &key).map(|s| s.id.to_string()).filter(|p| p != id);
match builtin(reg, &key) {
// Back to its own built-in key: no custom entry needed.
Some(b) if b.id == id => {
self.assigned.remove(&key);
self.removed.remove(&key);
}
// Taken from a built-in command: it loses the key for good.
Some(_) => {
self.assigned.insert(key.clone(), id.to_string());
self.removed.insert(key);
}
None => {
self.assigned.insert(key, id.to_string());
}
}
Ok(previous)
}
/// Take `key` away from command `id`. Returns whether it had the key.
pub fn remove(&mut self, reg: &Registry, id: &str, key: &str) -> Result<bool, String> {
let key = normalize(key).ok_or_else(|| format!("`{key}` isn't a key"))?;
if self.resolve(reg, &key).is_none_or(|s| s.id != id) {
return Ok(false);
}
self.assigned.remove(&key);
if builtin(reg, &key).is_some() {
self.removed.insert(key);
}
Ok(true)
}
/// Back to the built-in keys only.
pub fn reset(&mut self) {
*self = KeyMap::default();
}
}
impl<'de> Deserialize<'de> for KeyMap {
/// Lenient: any JSON reads (junk entries dropped), so a damaged map never loses the other
/// preferences saved next to it.
fn deserialize<D: serde::Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
Ok(KeyMap::from_value(&Value::deserialize(d)?))
}
overrides
}
#[cfg(test)]
@@ -208,68 +114,101 @@ mod tests {
use super::*;
#[test]
fn keys_normalize_to_one_spelling() {
assert_eq!(normalize("mod+shift+alt+v").as_deref(), Some("Mod+Alt+Shift+V"));
assert_eq!(normalize("Mod+=").as_deref(), Some("Mod+="));
assert_eq!(normalize("Mod++").as_deref(), Some("Mod++"));
assert_eq!(normalize("f12").as_deref(), Some("F12"));
assert_eq!(normalize("Ctrl+pagedown").as_deref(), Some("Ctrl+PageDown"));
for junk in ["", "Mod+", "Hyper+K", "F99", "Mod+Shift+NotAKey", "Mod+\u{7}", &"x".repeat(100)] {
assert_eq!(normalize(junk), None, "{junk:?}");
}
/// The keys a command has, through the command.
fn keys(s: &mut crate::Session, id: &str) -> Vec<String> {
let r = s.run("tools.customizeKeyboard", &json!({"command": id})).unwrap();
r["keys"].as_array().unwrap().iter().map(|k| k.as_str().unwrap().to_string()).collect()
}
/// #368: an assignment overrides a built-in key, a removed built-in key runs nothing, and
/// Reset All brings the built-ins back.
/// The command a key runs, through the command.
fn holder(s: &mut crate::Session, key: &str) -> Option<String> {
let r = s.run("tools.customizeKeyboard", &json!({"key": key})).unwrap();
r["assignedTo"].as_str().map(str::to_string)
}
/// #368: an assignment takes a built-in key from its command, a removed built-in key runs
/// nothing, and Reset All brings the built-ins back; agents do it without the dialog.
#[test]
fn user_keys_override_and_remove_built_ins() {
let reg = crate::cmd::registry();
let mut m = KeyMap::default();
assert_eq!(m.resolve(&reg, "Mod+B").map(|s| s.id), Some("format.bold"));
// Mod+B to Italic: Bold loses it.
assert_eq!(m.assign(&reg, "format.italic", "mod+b").unwrap().as_deref(), Some("format.bold"));
assert_eq!(m.resolve(&reg, "Mod+B").map(|s| s.id), Some("format.italic"));
assert!(m.keys_for(&reg, "format.bold").is_empty());
assert_eq!(m.keys_for(&reg, "format.italic"), ["Mod+I", "Mod+B"]);
// Removing it from Italic leaves Mod+B doing nothing (Bold doesn't get it back).
assert!(m.remove(&reg, "format.italic", "Mod+B").unwrap());
assert!(m.resolve(&reg, "Mod+B").is_none());
// Removing a built-in key disables it; a new key works.
assert!(m.remove(&reg, "format.underline", "Mod+U").unwrap());
assert!(m.resolve(&reg, "Mod+U").is_none());
assert_eq!(m.assign(&reg, "format.underline", "Mod+Alt+Shift+U").unwrap(), None);
assert_eq!(m.resolve(&reg, "Mod+Shift+Alt+U").map(|s| s.id), Some("format.underline"));
assert!(m.assign(&reg, "no.such.command", "Mod+Q").is_err());
assert!(m.assign(&reg, "format.bold", "Hyper+Q").is_err());
m.reset();
assert_eq!(m.resolve(&reg, "Mod+B").map(|s| s.id), Some("format.bold"));
assert_eq!(m.resolve(&reg, "Mod+U").map(|s| s.id), Some("format.underline"));
// The command does the same for agents, without opening the dialog.
let mut s = crate::Session::new(wordcraft_doc::Document::new());
let bold = keys(&mut s, "format.bold");
let italic = keys(&mut s, "format.italic");
let underline = keys(&mut s, "format.underline");
assert!(!bold.is_empty() && !italic.is_empty() && !underline.is_empty());
// Mod+B to Italic: Bold loses it.
let r = s.run("tools.customizeKeyboard", &json!({"assign": {"command": "format.italic", "key": "Mod+B"}, "key": "Mod+B"})).unwrap();
assert_eq!((r["replaced"].as_str(), r["assignedTo"].as_str()), (Some("format.bold"), Some("format.italic")));
assert!(s.ui_requests.is_empty(), "programmatic calls never open dialogs");
assert!(keys(&mut s, "format.bold").is_empty());
let now = keys(&mut s, "format.italic");
assert_eq!(now.len(), italic.len() + 1);
assert!(now.starts_with(&italic), "{now:?}");
assert!(!s.keymap().is_empty());
assert_eq!(r["custom"], serde_json::to_value(s.keymap()).unwrap());
// Removing it from Italic leaves Mod+B doing nothing; Bold doesn't get it back.
let r = s.run("tools.customizeKeyboard", &json!({"remove": {"command": "format.italic", "key": "Mod+B"}})).unwrap();
assert_eq!(r["removed"], json!(true));
assert_eq!(holder(&mut s, "Mod+B"), None);
assert!(keys(&mut s, "format.bold").is_empty());
// Removing a built-in key disables it; a new key works.
let first = underline[0].clone();
s.run("tools.customizeKeyboard", &json!({"remove": {"command": "format.underline", "key": first}})).unwrap();
assert_eq!(holder(&mut s, &first), None);
s.run("tools.customizeKeyboard", &json!({"assign": {"command": "format.underline", "key": "Mod+Alt+Shift+U"}})).unwrap();
assert_eq!(holder(&mut s, "Mod+Shift+Alt+U").as_deref(), Some("format.underline"));
// Mistakes are errors.
assert!(s.run("tools.customizeKeyboard", &json!({"assign": {"command": "no.such.command", "key": "Mod+Q"}})).is_err());
assert!(s.run("tools.customizeKeyboard", &json!({"assign": {"command": "format.bold", "key": "Hyper+Q"}})).is_err());
if !cfg!(target_os = "macos") {
assert!(
s.run("tools.customizeKeyboard", &json!({"assign": {"command": "format.bold", "key": "Alt+Q"}})).is_err(),
"Alt+Q is the command search"
);
}
s.run("tools.customizeKeyboard", &json!({"reset": true})).unwrap();
assert!(s.keymap().is_empty());
assert_eq!(keys(&mut s, "format.bold"), bold);
assert_eq!(keys(&mut s, "format.italic"), italic);
assert_eq!(keys(&mut s, "format.underline"), underline);
assert!(s.ui_requests.is_empty());
s.run("tools.customizeKeyboard", &json!({})).unwrap();
assert_eq!(s.ui_requests.last(), Some(&json!({"open": "customizeKeyboard"})));
}
/// The old saved map reads as the overrides it stands for; its junk is dropped.
#[test]
fn saved_maps_round_trip_and_junk_is_ignored() {
fn legacy_saved_maps_import_as_overrides() {
let reg = crate::cmd::registry();
let mut m = KeyMap::default();
m.assign(&reg, "format.italic", "Mod+B").unwrap();
let back: KeyMap = serde_json::from_str(&serde_json::to_string(&m).unwrap()).unwrap();
assert_eq!(back, m);
let junk = json!({"assigned": {"Hyper+X": "format.bold", "Mod+Q": 7, "Mod+J": "no.such", "Mod+Alt+K": "format.bold"}, "removed": ["Mod+U", 3, "F99", "Mod+Shift+Q"]});
let mut j: KeyMap = serde_json::from_value(junk).unwrap();
j.retain_known(&reg);
assert_eq!(j.assigned.len(), 1, "{j:?}");
assert_eq!(j.resolve(&reg, "Mod+Alt+K").map(|s| s.id), Some("format.bold"));
assert_eq!(j.removed.iter().collect::<Vec<_>>(), ["Mod+U"]);
let chord = |text: &str| Chord::parse(text).unwrap();
let saved = json!({
"assigned": {"Mod+B": "format.italic", "Hyper+X": "format.bold", "Mod+Q": 7, "Mod+J": "no.such", "Mod+I": "format.italic"},
"removed": ["Mod+U", 3, "F99"]
});
let o = overrides_from_legacy(&reg, &saved);
let mut ids: Vec<&str> = o.iter().map(|(k, _)| k).collect();
ids.sort_unstable();
assert_eq!(ids, ["format.bold", "format.italic", "format.underline"], "{o:?}");
let keymap = registry_keymap(&reg, &o);
let id = |c: &str| keymap.holder(&chord(c)).map(|c| c.id);
assert_eq!(id("Mod+B").as_deref(), Some("format.italic"), "the assignment wins");
assert_eq!(id("Mod+I").as_deref(), Some("format.italic"), "Italic keeps its own key");
assert_eq!(id("Mod+U"), None, "the removed built-in key runs nothing");
let platform = keymap.platform();
let bold = keymap.bindings(&CommandRef::new("format.bold"));
assert!(!bold.iter().any(|b| b.trigger.chord.effective(platform) == chord("Mod+B").effective(platform)), "{bold:?}");
assert!(keymap.problems().is_empty(), "{:?}", keymap.problems());
// An assignment of a command's own built-in key changes nothing.
assert!(overrides_from_legacy(&reg, &json!({"assigned": {"Mod+I": "format.italic"}})).is_empty());
for v in [json!(null), json!(5), json!("x"), json!({"assigned": [1], "removed": {"a": 1}})] {
assert!(serde_json::from_value::<KeyMap>(v).unwrap().is_empty());
assert!(overrides_from_legacy(&reg, &v).is_empty(), "{v}");
}
}
}
+1 -2
View File
@@ -33,8 +33,7 @@ use std::collections::HashMap;
use serde_json::Value;
pub use io::Password;
pub use keymap::KeyMap;
pub use locale::{set_bookmark_error, set_reference_error};
pub use locale::{set_bookmark_error, set_reference_error, system_locale};
pub use ribbon::RibbonLayout;
pub use session::{
CellRange, ColumnBlock, DocInfo, DocState, EditSnapshot, FindState, MathEdit, Prefs, Selection, Session, StylesPaneDock, UNDO_LIST_MAX,
+1 -1
View File
@@ -10,7 +10,7 @@ pub fn set_system_locale(tag: &str) {
}
/// The system locale [`set_system_locale`] recorded, if the shell set one.
pub(crate) fn system_locale() -> Option<&'static str> {
pub fn system_locale() -> Option<&'static str> {
SYSTEM_LOCALE.get().map(String::as_str)
}
+34
View File
@@ -923,6 +923,40 @@ pub fn fetched() -> bool {
FETCHED.load(Ordering::Relaxed)
}
/// What one proofing language found for its Hunspell dictionary: the file, none, or why the file
/// could not be read.
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct DictionaryFound {
/// The language.
pub lang: wordcraft_proof::ProofLang,
/// The dictionary file found for it.
pub file: Option<PathBuf>,
/// Why the file could not be read.
pub error: Option<String>,
}
/// The last report of [`dictionaries_found`], with the dictionary generation it was built for.
static DICTIONARIES_FOUND: Mutex<Option<(u64, Arc<[DictionaryFound]>)>> = Mutex::new(None);
/// The dictionary each language found (File › Options › Language). Finding one searches the disk, so
/// the report is built once per dictionary generation and shared until the folder or an installed
/// pack changes it.
pub fn dictionaries_found() -> Arc<[DictionaryFound]> {
let generation = wordcraft_proof::dictionary_generation();
let mut slot = DICTIONARIES_FOUND.lock().unwrap_or_else(PoisonError::into_inner);
if let Some((built, report)) = slot.as_ref()
&& *built == generation
{
return Arc::clone(report);
}
let report: Arc<[DictionaryFound]> = wordcraft_proof::installed_dictionaries()
.into_iter()
.map(|(lang, file)| DictionaryFound { lang, file, error: wordcraft_proof::dictionary_load_error(lang) })
.collect();
*slot = Some((generation, Arc::clone(&report)));
report
}
/// The languages the document (or the caret) asks for while there is no list of packs yet (a
/// fresh install, or a list cached for an older pin): proofable, not English, with no dictionary
/// and no pack installed, one per proofing language, as the document tags them (`tr-TR`). The
+1 -1
View File
@@ -11,7 +11,7 @@
use serde_json::{Value, json};
use wordcraft_layout::DocLayout;
pub use wordcraft_pdf::imposition::Imposition;
pub use wordcraft_pdf::imposition::{Imposition, Sheet};
use crate::{CmdError, Session, p};
+12 -1
View File
@@ -16,7 +16,7 @@ use crate::Registry;
/// The ribbon's tabs in their default order. `File` opens Backstage: it is always first and
/// isn't part of the customizable list.
pub const TABS: [&str; 13] =
["File", "Home", "Insert", "Draw", "Design", "Layout", "References", "Mailings", "Review", "View", "Developer", "Zotero", "Help"];
["File", "Home", "Insert", "Draw", "Design", "Layout", "References", "Mailings", "Review", "View", "Developer", "Citations", "Help"];
/// Tabs that come up with the selection; custom tabs can't take their names.
pub const CONTEXTUAL_TABS: [&str; 7] =
["Table Design", "Table Layout", "Picture Format", "Shape Format", "Equation", "Chart Design", "SmartArt Design"];
@@ -438,6 +438,17 @@ mod tests {
use super::*;
/// A brand name must not name a tab: the citation tab is "Citations", and "Zotero" is not a tab.
#[test]
fn citations_tab_is_not_named_after_a_brand() {
assert!(TABS.contains(&"Citations"));
assert!(!TABS.contains(&"Zotero"));
let layout = RibbonLayout::default();
let tabs = layout.tabs();
assert!(tabs.iter().any(|t| t.name == "Citations" && !t.custom));
assert!(!tabs.iter().any(|t| t.name == "Zotero"));
}
/// #379: custom tabs and groups, hidden and moved tabs, and the Quick Access Toolbar, changed
/// through the command (as agents do) without opening the dialog.
#[test]
+28 -3
View File
@@ -34,7 +34,7 @@ pub use doc_state::{CellRange, ColumnBlock, FindState, MathEdit, Selection, UNDO
use doc_state::{TypedWord, Undo, doc_bib_style};
use ime_state::ImeCaretState;
pub use locale::set_system_locale;
pub(crate) use locale::system_locale;
pub use locale::system_locale;
pub use prefs::Prefs;
pub use query::blank_document;
pub use snapshot_types::EditSnapshot;
@@ -206,8 +206,12 @@ pub struct Session {
/// browser's locale on the web); headless sessions keep `en-US`. A region the user chose
/// ([`Prefs::region`]) wins: read it with [`Session::region`].
pub system_region: wordcraft_geom::Region,
/// Custom keyboard shortcuts (`tools.customizeKeyboard`); the front end saves them too.
pub keymap: crate::KeyMap,
/// Custom keyboard shortcuts (`tools.customizeKeyboard`) over the registry's keys; the front
/// end saves them too. Read with [`Session::keymap`].
keymap: craft_keymap::Overrides,
/// The Accessibility checker's findings and the `(document_id, rev)` they were made for, so
/// the pane reading them every frame runs the checker only after a change.
findings: Option<((u64, u64), Vec<Value>)>,
/// Custom ribbon and Quick Access Toolbar (`tools.customizeRibbon`); the front end saves it too.
pub ribbon: crate::RibbonLayout,
/// The language new blank documents (and opened plain text) are written in, a BCP 47 tag;
@@ -260,4 +264,25 @@ pub struct Session {
impl Session {
/// File name of the persisted custom dictionary inside the settings folder.
pub const USER_DICT_FILE: &str = "custom-dictionary.txt";
/// The user's keyboard shortcut changes.
pub fn keymap(&self) -> &craft_keymap::Overrides {
&self.keymap
}
/// The user's keyboard shortcut changes, to replace or edit (the saved preferences).
pub fn keymap_mut(&mut self) -> &mut craft_keymap::Overrides {
&mut self.keymap
}
/// The Accessibility checker's findings for the open document as it is now
/// ([`crate::cmd::accessibility::check`]). The checker runs again only when the document
/// changed: an edit bumps [`Session::rev`], a replacement changes [`Session::document_id`].
pub fn accessibility_findings(&mut self) -> &[Value] {
let stamp = (self.document_id, self.rev);
if self.findings.as_ref().is_none_or(|(made_for, _)| *made_for != stamp) {
self.findings = Some((stamp, crate::cmd::accessibility::check(&self.doc)));
}
self.findings.as_ref().map_or(&[], |(_, findings)| findings.as_slice())
}
}
+2
View File
@@ -272,6 +272,8 @@ impl Session {
prefs: _,
system_region: _,
keymap: _,
// Stamped with the document id and revision, so one cache serves every document.
findings: _,
ribbon: _,
editing_lang: _,
math_latex: _,
+16
View File
@@ -72,6 +72,12 @@ impl Session {
self.ime_text_join = Some(self.sel.clone());
}
/// Whether a body `DeleteSurrounding`'s replacement join is still promised: no command has
/// consumed it since. The page keeps the erased text's formatting only while this holds.
pub fn ime_text_join_pending(&self) -> bool {
self.ime_text_join.is_some()
}
/// Discard a body replacement join that received no replacement (an empty or refused
/// commit, a new request or a refusal), so it cannot join a later composition.
pub fn clear_ime_text_join(&mut self) {
@@ -156,6 +162,16 @@ impl Session {
self.history.truncate(usize::try_from(keep).unwrap_or(usize::MAX));
}
/// Takes back every step recorded since `mark` and drops them from redo, so a cancelled gesture leaves no trace.
/// Does nothing when `mark` has already left the history (evicted steps cannot be undone).
pub fn revert_since(&mut self, mark: u64) {
if mark < self.undo_evicted {
return;
}
while self.undo_mark() > mark && self.undo() {}
self.redo.clear();
}
pub fn undo_labels(&self) -> Vec<String> {
self.history.iter().rev().map(|u| u.label.clone()).collect()
}
+2 -1
View File
@@ -159,7 +159,8 @@ impl Session {
member: None,
prefs: Prefs::default(),
system_region: Default::default(),
keymap: crate::KeyMap::default(),
keymap: craft_keymap::Overrides::default(),
findings: None,
ribbon: crate::RibbonLayout::default(),
editing_lang: None,
read_aloud: Default::default(),
+2
View File
@@ -151,6 +151,8 @@ impl Session {
prefs: _,
system_region: _,
keymap: _,
// Derived from `document_id` and `rev`: rebuilt on the next read, not an edit.
findings: _,
ribbon: _,
// A preference for new documents, like `prefs`: not part of this document.
editing_lang: _,
+81 -2
View File
@@ -2132,6 +2132,58 @@ fn body_table_cells(s: &Session) -> Vec<Vec<String>> {
}
/// #1744: Select Table → Copy → Paste outside the table pastes a copy of the whole table.
#[test]
fn table_spots_and_borders_are_the_areas_the_pointer_queries_answer_for() {
use crate::cmd::{table_mouse, table_resize};
let mut sess = s();
run(&mut sess, "insert.table", serde_json::json!({"rows": 3, "cols": 3}));
let l = sess.layout();
let story = sess.sel.focus.story;
let reach = 3.0;
let spots = table_mouse::spots(&l, &sess.doc, story, 0, reach);
let borders = table_resize::borders(&l, &sess.doc, 0, reach);
assert!(!spots.is_empty() && !borders.is_empty());
let inside = |r: &wordcraft_geom::Rect, x: f32, y: f32| x >= r.x && x <= r.right() && y >= r.y && y <= r.bottom();
let (w, bottom) = l.pages.first().map_or((0.0, 0.0), |p| (p.w, p.body.bottom()));
let (mut spot_hits, mut border_hits) = (0, 0);
let mut y = 0.3f32;
while y < bottom {
let mut x = 0.3f32;
while x < w {
let spot = table_mouse::target_at(&l, &sess.doc, story, 0, x, y, reach);
if let Some(t) = &spot {
spot_hits += 1;
assert!(spots.iter().any(|a| a.target == *t && inside(&a.area, x, y)), "spot at ({x}, {y}) lies in its listed area");
}
if spot.is_none() && table_resize::resize_target(&l, &sess.doc, 0, x, y, reach).is_none() {
// Nothing answers: no listed area may hold the point unless a border took it first.
assert!(!spots.iter().any(|a| inside(&a.area, x, y)), "an area holds ({x}, {y}) yet nothing answers");
}
let border = table_resize::resize_target(&l, &sess.doc, 0, x, y, reach);
match &border {
Some(t) => {
border_hits += 1;
assert!(borders.iter().any(|(a, b)| b == t && inside(a, x, y)), "border at ({x}, {y}) lies in its listed strip");
}
None => assert!(
!borders.iter().any(|(a, b)| inside(a, x, y) && {
let d = match b.edge {
table_resize::Edge::Column(i) => b.cols.get(i).map_or(f32::INFINITY, |c| (x - c).abs()),
table_resize::Edge::Row(r) => b.rows.iter().find(|q| q.row == r).map_or(f32::INFINITY, |q| (y - q.bottom).abs()),
table_resize::Edge::Corner => 0.0,
};
d <= reach
}),
"a strip holds ({x}, {y}) within reach yet no border answers"
),
}
x += 3.7;
}
y += 3.7;
}
assert!(spot_hits > 0 && border_hits > 0, "the sweep met both kinds of spot");
}
#[test]
fn copy_whole_table_pastes_a_table() {
let mut s = table_doc();
@@ -7915,6 +7967,35 @@ fn hostile_chart_data_is_capped() {
assert!(s.run("chart.type", &json!({"type": "pie"})).is_err());
}
/// The pane's findings follow the document: an edit that fixes an issue and a replacement by
/// another document both show at the next read, though the session keeps them between reads.
#[test]
fn accessibility_findings_follow_the_document() {
let alt = |s: &mut Session| s.accessibility_findings().iter().any(|i| i["rule"] == "altText");
let mut s = Session::new(wordcraft_doc::Document::from_text("Title"));
run(&mut s, "insert.shape", json!({"kind": "ellipse"}));
assert!(alt(&mut s), "a shape without alternative text is reported");
assert!(alt(&mut s), "and still is at the next read");
let (id, rev) = (s.document_id(), s.rev());
// The fix the issue names, as the pane runs it.
let issue = s.accessibility_findings().iter().find(|i| i["rule"] == "altText").cloned().expect("the alt text issue");
run(&mut s, "select.range", issue["select"].clone());
run(&mut s, issue["action"]["command"].as_str().expect("a fix"), issue["action"]["params"].clone());
assert_eq!(s.document_id(), id);
assert_ne!(s.rev(), rev);
assert!(!alt(&mut s), "the fixed issue is gone");
// The issue again, then another document in its place.
run(&mut s, "insert.shape", json!({"kind": "ellipse"}));
assert!(alt(&mut s));
run(&mut s, "file.new", json!({}));
assert_ne!(s.document_id(), id);
let want = crate::cmd::accessibility::check(&s.doc);
assert_eq!(s.accessibility_findings(), want.as_slice(), "the new document's findings");
assert!(!alt(&mut s));
}
#[test]
fn accessibility_reports_a_chart_without_alt_text() {
use std::sync::Arc;
@@ -11383,8 +11464,6 @@ fn find_replace_and_go_to_open_like_word() {
assert_eq!(s.ui_requests.last(), Some(&json!({"open": "replace"})));
assert!(!s.dirty, "opening the dialog changes nothing");
assert!(s.run("edit.findReplace", &json!({"tab": "nope"})).is_err());
let reg = s.registry.clone();
assert_eq!(s.keymap.resolve(&reg, "Mod+H").map(|c| c.id), Some("edit.findReplace"));
run(&mut s, "edit.goto", json!({}));
assert_eq!(s.ui_requests.last(), Some(&json!({"open": "goto"})));
// Replace with a "with" and the last search still replaces, as before.
+1 -62
View File
@@ -1940,36 +1940,7 @@ fn alt_x_toggles_between_a_character_and_its_code() {
#[test]
fn alt_numpad_codes_map_like_word_on_windows() {
use crate::cmd::text::{alt_code_char, oem_code_page};
let c = |code| alt_code_char(code, 1252, 437);
// Leading 0: Windows-1252.
assert_eq!(c("0233"), Some('é'));
assert_eq!(c("0128"), Some('€'));
assert_eq!(c("0150"), Some('–'));
assert_eq!(c("065"), Some('A'));
assert_eq!(c("0032"), Some(' '));
assert_eq!(c("0255"), Some('ÿ'));
// No leading 0: the OEM code page (437 here, 850 in Western Europe).
assert_eq!(c("233"), Some('Θ'));
// The issue said 233 → é in 850; the CP850 mapping file has Ú at 0xE9 (é is 130 in both).
assert_eq!(alt_code_char("233", 1252, 850), Some('Ú'));
assert_eq!(alt_code_char("130", 1252, 850), Some('é'));
assert_eq!(c("130"), Some('é'));
assert_eq!(alt_code_char("155", 1252, 850), Some('ø'));
assert_eq!(c("155"), Some('¢'));
assert_eq!(c("65"), Some('A'));
assert_eq!(c("1"), Some('☺'));
assert_eq!(c("7"), Some('•'));
assert_eq!(c("127"), Some('⌂'));
assert_eq!(c("176"), Some('░'));
// Above 255: the Unicode character with that decimal value.
assert_eq!(c("8364"), Some('€'));
assert_eq!(c("09733"), Some('★'));
assert_eq!(c("128512"), Some('😀'));
// Nothing for junk, 0, control characters, surrogates or values past Unicode.
for bad in ["", "0", "000", "0009", "0013", "0127", "0129", "x1", "-5", "55296", "1114112", "99999999999999999999", "4294967361"] {
assert_eq!(c(bad), None, "{bad:?}");
}
use crate::cmd::text::oem_code_page;
assert_eq!(oem_code_page(None), 437);
assert_eq!(oem_code_page(Some("en-US")), 437);
assert_eq!(oem_code_page(Some("en_GB.UTF-8")), 850);
@@ -1978,36 +1949,6 @@ fn alt_numpad_codes_map_like_word_on_windows() {
assert_eq!(oem_code_page(Some("ru-RU")), 437, "only 437/850 without the shell's code pages");
}
#[test]
fn alt_numpad_codes_follow_the_system_code_pages() {
use crate::cmd::text::{alt_code_char, windows_code_pages};
// Polish (1250/852): Alt+0185 and Alt+165 are both ą, not ¹ / Ñ.
assert_eq!(alt_code_char("0185", 1250, 852), Some('ą'));
assert_eq!(alt_code_char("165", 1250, 852), Some('ą'));
assert_eq!(alt_code_char("0185", 1252, 437), Some('¹'));
// Russian (1251/866), Greek (1253/737), Turkish (1254/857).
assert_eq!(alt_code_char("0207", 1251, 866), Some('П'));
assert_eq!(alt_code_char("143", 1251, 866), Some('П'));
assert_eq!(alt_code_char("0193", 1253, 737), Some('Α'));
assert_eq!(alt_code_char("128", 1253, 737), Some('Α'));
assert_eq!(alt_code_char("0253", 1254, 857), Some('ı'));
assert_eq!(alt_code_char("141", 1254, 857), Some('ı'));
// Above 255 the code page doesn't matter.
assert_eq!(alt_code_char("8364", 1251, 866), Some('€'));
// A byte the code page leaves unassigned types nothing.
assert_eq!(alt_code_char("213", 1254, 857), None);
assert_eq!(alt_code_char("0219", 874, 437), None);
assert_eq!(windows_code_pages(None), (1252, 437));
assert_eq!(windows_code_pages(Some("en-US")), (1252, 437));
assert_eq!(windows_code_pages(Some("de-DE")), (1252, 850));
assert_eq!(windows_code_pages(Some("pl-PL")), (1250, 852));
assert_eq!(windows_code_pages(Some("sr-Latn-RS")), (1250, 852));
assert_eq!(windows_code_pages(Some("ru_RU.UTF-8")), (1251, 866));
assert_eq!(windows_code_pages(Some("el-GR")), (1253, 737));
assert_eq!(windows_code_pages(Some("tr-TR")), (1254, 857));
assert_eq!(windows_code_pages(Some("ja-JP")), (1252, 437));
}
#[test]
fn alt_numpad_code_types_one_character() {
// `texts` lowercases; the capitals matter here.
@@ -2405,8 +2346,6 @@ fn ctrl_tab_inserts_a_tab_inside_a_table_cell() {
let (_, r, c) = s.sel.focus.path.cell().expect("caret in a cell");
assert_eq!((r, c), (0, 0), "Ctrl+Tab stays in the cell");
assert_eq!(s.doc.para_at(&s.sel.focus).map(|p| p.text.as_str()), Some("A\tB"));
let key = if cfg!(target_os = "macos") { "Alt+Tab" } else { "Mod+Tab" };
assert_eq!(s.keymap.resolve(&s.registry, key).map(|c| c.id), Some("text.insertTab"));
}
/// A .docx of two paragraphs in two sections, as Word writes it: the first section's properties
-1
View File
@@ -33,7 +33,6 @@ use fallback_data::{CoverageIndex, SysFallback};
use fallback_data::{FallbackCache, RunFallbackCache};
#[cfg(not(target_arch = "wasm32"))]
use names::CatalogEntry;
pub(crate) use names::face_names;
pub use names::{LocalName, base_style, name_language_matches, system_font_dirs};
use names::{MAX_FILE_FACES, enumerate_faces, make_face};
#[cfg(test)]
+3 -66
View File
@@ -25,10 +25,7 @@ pub use kurbo::BezPath;
pub use script::{fallback_rank, is_emoji, joins_cursively, needs_layout_tables, script_fallbacks};
use skrifa::MetadataProvider;
use skrifa::instance::Size;
pub use ui_fallback::{
SystemUiFont, is_cjk, system_arabic_ui_font, system_cjk_ui_font, system_cjk_ui_font_for, system_hant_ui_font, ui_needs_system_cjk,
ui_uncovered_cjk,
};
pub use ui_fallback::is_cjk;
/// A font from the optional craft-fonts build input (https://github.com/storytold/craft-fonts;
/// empty unless built with `CRAFT_FONTS_DIR`, see `build.rs`).
@@ -55,65 +52,6 @@ pub fn japanese_document_fonts() -> Vec<&'static CraftFont> {
v
}
/// Japanese faces in UI order: BIZ UDPGothic first (the UI face), then the others; `bold` puts
/// bold styles before regular ones.
pub fn japanese_ui_fonts(bold: bool) -> Vec<&'static CraftFont> {
let mut v: Vec<_> = japanese_fonts().collect();
v.sort_by_key(|f| (f.family != "BIZ UDPGothic", (f.style == "Bold") != bold));
v
}
/// The craft-fonts faces for Simplified Chinese (`"Hans"`), in manifest order. Empty without
/// craft-fonts.
pub fn chinese_fonts() -> impl Iterator<Item = &'static CraftFont> {
CRAFT_FONTS.iter().filter(|f| f.scripts.contains(&"Hans"))
}
/// The craft-fonts faces for Korean (`"Kore"`), in manifest order. Empty without craft-fonts.
pub fn korean_fonts() -> impl Iterator<Item = &'static CraftFont> {
CRAFT_FONTS.iter().filter(|f| f.scripts.contains(&"Kore"))
}
/// The craft-fonts Georgian (`"Geor"`) Regular face for the interface. Empty without craft-fonts.
pub fn georgian_fonts() -> impl Iterator<Item = &'static CraftFont> {
CRAFT_FONTS.iter().filter(|f| f.scripts.contains(&"Geor") && f.style == "Regular")
}
/// The CJK interface faces, Regular styles only (the UI fakes no bold), with the Japanese UI,
/// Chinese, and Korean faces ordered for the selected interface language. Mixing the faces within
/// a line would mix glyph styles, so the first face should cover the interface language. Empty
/// without craft-fonts.
pub fn ui_cjk_fonts(prefer_hans: bool) -> Vec<&'static CraftFont> {
ui_cjk_fonts_for(prefer_hans, false)
}
/// The CJK interface faces in the preferred writing system's order.
pub fn ui_cjk_fonts_for(prefer_hans: bool, prefer_korean: bool) -> Vec<&'static CraftFont> {
let regular = |f: &&CraftFont| f.style == "Regular";
let ja = japanese_ui_fonts(false).into_iter().filter(regular).take(1);
let zh = chinese_fonts().filter(regular).take(1);
let ko = korean_fonts().filter(regular).take(1);
if prefer_korean {
ko.chain(ja).chain(zh).collect()
} else if prefer_hans {
zh.chain(ja).chain(ko).collect()
} else {
ja.chain(zh).chain(ko).collect()
}
}
/// The craft-fonts faces for Arabic script (`"Arab"`), in manifest order: the document fallback
/// for Arabic text. Empty without craft-fonts.
pub fn arabic_fonts() -> impl Iterator<Item = &'static CraftFont> {
CRAFT_FONTS.iter().filter(|f| f.scripts.contains(&"Arab"))
}
/// The craft-fonts faces for Arabic script (`"Arab"`), Regular styles only: the interface's
/// fallback for an Arabic interface and for Arabic file names. Empty without craft-fonts.
pub fn ui_arabic_fonts() -> Vec<&'static CraftFont> {
arabic_fonts().filter(|f| f.style == "Regular").collect()
}
/// The bundled serif used when a document asks for nothing better.
pub const DEFAULT_FAMILY: &str = "Source Serif 4";
@@ -555,8 +493,7 @@ mod tests {
let fonts = japanese_document_fonts();
assert!(!fonts.is_empty(), "craft-fonts has Japanese fonts");
assert!(fonts[0].family.contains("Mincho"), "documents fall back to a Mincho first");
assert_eq!(japanese_ui_fonts(false)[0].family, "BIZ UDPGothic");
assert_eq!(japanese_ui_fonts(true)[0].style, "Bold");
let db = FontDb::with_font_dirs(Vec::new());
db.set_system_fallback(false);
for cf in fonts {
@@ -582,7 +519,7 @@ mod tests {
/// fallback (the browser build has no other), and its letters join when shaped.
#[test]
fn craft_fonts_arabic_face_is_the_document_fallback_for_arabic() {
if arabic_fonts().next().is_none() {
if !CRAFT_FONTS.iter().any(|f| f.scripts.contains(&"Arab")) {
eprintln!("skipped: built without a craft-fonts Arabic face (set CRAFT_FONTS_DIR to a checkout)");
return;
}
+2 -465
View File
@@ -1,27 +1,4 @@
//! An installed CJK font for the interface, after the embedded craft-fonts faces, when they leave
//! characters of the interface text without a glyph: a build without craft-fonts, one whose
//! craft-fonts checkout lacks the Chinese face (#241), or one whose faces lack characters the
//! catalogs use (#486) would otherwise draw Chinese menus with boxes and `?`. Native only; wasm
//! has no system fonts to read.
//!
//! It looks for a short list of well-known files in the platform's font folders
//! ([`system_font_dirs`](crate::system_font_dirs)) rather than waiting for the full system font
//! scan, since the interface fonts are installed on the first frame.
use skrifa::MetadataProvider;
use skrifa::raw::FileRef;
use crate::CraftFont;
/// An installed font file chosen for the interface.
pub struct SystemUiFont {
/// The face's family name, e.g. `Microsoft YaHei`.
pub family: String,
/// The whole font file.
pub bytes: Vec<u8>,
/// The face's index in the file (0 unless it is a collection).
pub index: u32,
}
//! Character classes the interface and the font scan share.
/// Is `c` drawn from a CJK font: Han ideographs, kana, bopomofo, Hangul, CJK punctuation or a
/// full-width form? (Latin, Cyrillic and symbols come from the interface's Latin faces.)
@@ -39,448 +16,8 @@ pub fn is_cjk(c: char) -> bool {
)
}
/// The distinct CJK characters of `texts` (see [`is_cjk`]) that none of the `embedded` faces
/// maps, in code point order. A craft-fonts face may lack characters the interface catalogs use
/// (an older or subset file), and those would draw as boxes or `?` (#486).
pub fn ui_uncovered_cjk(texts: &[&str], embedded: &[&CraftFont]) -> Vec<char> {
let faces: Vec<_> = embedded.iter().filter_map(|f| skrifa::FontRef::from_index(f.bytes, 0).ok()).map(|f| f.charmap()).collect();
let chars: std::collections::BTreeSet<char> = texts.iter().flat_map(|t| t.chars()).filter(|c| is_cjk(*c)).collect();
chars.into_iter().filter(|c| !faces.iter().any(|m| m.map(*c).is_some())).collect()
}
/// Do the embedded interface faces (`ui_cjk_fonts`) leave CJK characters of `texts` (the
/// interface catalogs and language names that can be on screen) without a glyph? Then an
/// installed CJK font goes after them. No embedded face (a build without craft-fonts) leaves
/// every CJK character uncovered; a Japanese face alone lacks the simplified-only hanzi (页, 选,
/// 删 …, #241) and some traditional ones (啟, 內 …, #486).
pub fn ui_needs_system_cjk(texts: &[&str], embedded: &[&CraftFont]) -> bool {
!ui_uncovered_cjk(texts, embedded).is_empty()
}
/// Files larger than this are skipped (the big system CJK collections are around 20–80 MB).
const MAX_FILE: u64 = 128 << 20;
/// Faces looked at in one collection.
const MAX_FACES: u32 = 64;
/// Entries looked at in one macOS font asset folder (each font is one `<hash>.asset` folder).
const MAX_ASSETS: usize = 8192;
/// Characters a face's coverage is measured on.
const MAX_NEEDED: usize = 4096;
/// The tables skrifa reads glyph outlines from: TrueType, CFF, CFF2 and VARC. A face with
/// outlines only in Apple's `hvgl` table has none of them, and the interface draws its characters
/// as blank space.
#[cfg(not(target_arch = "wasm32"))]
pub(crate) const OUTLINE_TABLES: [&[u8; 4]; 4] = [b"glyf", b"CFF ", b"CFF2", b"VARC"];
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub(crate) enum Region {
Hans,
Hant,
Other,
}
impl Region {
fn from_hans(hans: bool) -> Region {
if hans { Region::Hans } else { Region::Other }
}
fn rank(self, family: &str) -> u8 {
match self {
Region::Hans => u8::from(family.ends_with(" SC") || family.ends_with(" GB") || family.contains("YaHei")),
Region::Hant => {
let taiwan =
[" TC", " TW"].iter().any(|s| family.ends_with(s)) || ["JhengHei", "CNS", "LiHei", "MingLiU"].iter().any(|s| family.contains(s));
if taiwan { 2 } else { u8::from(family.ends_with(" HK")) }
}
Region::Other => 1,
}
}
}
/// A character only a font for the language has: a simplified-only hanzi, kana, or Hangul.
fn probe(hans: bool, korean: bool) -> char {
if korean {
'한'
} else if hans {
'页'
} else {
'の'
}
}
/// Font files to look for, relative to a font folder (or absolute), best first.
fn candidates(hans: bool, korean: bool) -> Vec<&'static str> {
let (zh, ja, ko): (&[&str], &[&str], &[&str]) = if cfg!(windows) {
(
&["Deng.ttf", "msyh.ttc", "simhei.ttf", "simsun.ttc", "NotoSansSC-VF.ttf"],
&["YuGothR.ttc", "meiryo.ttc", "msgothic.ttc"],
&["malgun.ttf", "malgunsl.ttf", "gulim.ttc", "batang.ttc"],
)
} else if cfg!(target_os = "macos") {
(
&[
// An asset on macOS 10.15 and later (see `with_asset_data`).
"PingFang.ttc",
"Hiragino Sans GB.ttc",
"STHeiti Light.ttc",
"STHeiti Medium.ttc",
// The system interface's own copy, present when the PingFang asset isn't.
"/System/Library/PrivateFrameworks/FontServices.framework/Resources/Reserved/PingFangUI.ttc",
],
&["ヒラギノ角ゴシック W3.ttc", "Hiragino Sans W3.ttc"],
&["/System/Library/Fonts/AppleSDGothicNeo.ttc", "/System/Library/Fonts/Supplemental/AppleGothic.ttf"],
)
} else {
(
&[
"noto-cjk/NotoSansCJK-Regular.ttc",
"opentype/noto/NotoSansCJK-Regular.ttc",
"google-noto-sans-cjk-fonts/NotoSansCJK-Regular.ttc",
"google-noto-cjk/NotoSansCJK-Regular.ttc",
"noto-cjk/NotoSansCJKsc-Regular.otf",
"opentype/noto/NotoSansCJKsc-Regular.otf",
"adobe-source-han-sans/SourceHanSansCN-Regular.otf",
"wenquanyi/wqy-microhei/wqy-microhei.ttc",
"truetype/wqy/wqy-microhei.ttc",
"wenquanyi/wqy-zenhei/wqy-zenhei.ttc",
"truetype/wqy/wqy-zenhei.ttc",
"truetype/droid/DroidSansFallbackFull.ttf",
],
&["noto-cjk/NotoSansCJKjp-Regular.otf", "opentype/noto/NotoSansCJKjp-Regular.otf"],
&[
"noto-cjk/NotoSansCJKkr-Regular.otf",
"opentype/noto/NotoSansCJKkr-Regular.otf",
"google-noto-sans-cjk-fonts/NotoSansCJKkr-Regular.otf",
"adobe-source-han-sans/SourceHanSansK-Regular.otf",
"opentype/adobe-source-han-sans/SourceHanSansK-Regular.otf",
"truetype/nanum/NanumGothic.ttf",
],
)
};
if korean {
ko.iter().chain(ja).chain(zh).copied().collect()
} else if hans {
zh.to_vec()
} else {
ja.iter().chain(zh).copied().collect()
}
}
fn hant_candidates() -> &'static [&'static str] {
if cfg!(windows) {
&["msjh.ttc", "msjh.ttf", "mingliu.ttc"]
} else if cfg!(target_os = "macos") {
&[
"PingFang.ttc",
"Hiragino Sans CNS.ttc",
"LiHeiPro.ttf",
"/System/Library/PrivateFrameworks/FontServices.framework/Resources/Reserved/PingFangUI.ttc",
]
} else {
&[
"noto-cjk/NotoSansCJK-Regular.ttc",
"opentype/noto/NotoSansCJK-Regular.ttc",
"google-noto-sans-cjk-fonts/NotoSansCJK-Regular.ttc",
"google-noto-cjk/NotoSansCJK-Regular.ttc",
"noto-cjk/NotoSansCJKtc-Regular.otf",
"opentype/noto/NotoSansCJKtc-Regular.otf",
"google-noto-cjk/NotoSansCJKtc-Regular.otf",
"adobe-source-han-sans/SourceHanSansTW-Regular.otf",
"adobe-source-han-sans/SourceHanSansTC-Regular.otf",
"opentype/adobe-source-han-sans/SourceHanSansTW-Regular.otf",
"NotoSansCJK-Regular.ttc",
"NotoSansCJKtc-Regular.otf",
"SourceHanSansTW-Regular.otf",
"SourceHanSansTC-Regular.otf",
]
}
}
pub fn system_hant_ui_font(needed: &[char]) -> Option<SystemUiFont> {
let probe = ['體'];
let needed = if needed.is_empty() { &probe[..] } else { needed.get(..MAX_NEEDED).unwrap_or(needed) };
hant_font_in(&with_asset_data(crate::system_font_dirs()), needed)
}
fn hant_font_in(dirs: &[std::path::PathBuf], needed: &[char]) -> Option<SystemUiFont> {
find_ui_font(dirs, hant_candidates(), needed, Region::Hant).filter(|f| Region::Hant.rank(&f.family) > 0)
}
/// The installed CJK font for a Chinese (`hans`) or other interface that best covers `needed`
/// (the characters the embedded faces lack; empty: a character typical of the language), if one
/// is found. Never panics on damaged files.
pub fn system_cjk_ui_font(hans: bool, needed: &[char]) -> Option<SystemUiFont> {
system_cjk_ui_font_for(hans, false, needed)
}
/// The installed CJK font for a Chinese, Korean or Japanese interface.
pub fn system_cjk_ui_font_for(hans: bool, korean: bool, needed: &[char]) -> Option<SystemUiFont> {
let probe = [probe(hans, korean)];
let needed = if needed.is_empty() { &probe[..] } else { needed.get(..MAX_NEEDED).unwrap_or(needed) };
find_ui_font(&with_asset_data(crate::system_font_dirs()), &candidates(hans, korean), needed, Region::from_hans(hans))
}
/// Arabic font files to look for, relative to a font folder, best first.
fn arabic_candidates() -> &'static [&'static str] {
if cfg!(windows) {
&["segoeui.ttf", "tahoma.ttf", "arial.ttf"]
} else if cfg!(target_os = "macos") {
&["SFArabic.ttf", "GeezaPro.ttc", "Supplemental/GeezaPro.ttc", "Supplemental/Arial Unicode.ttf", "Supplemental/Arial.ttf"]
} else {
&[
"noto/NotoSansArabic-Regular.ttf",
"truetype/noto/NotoSansArabic-Regular.ttf",
"google-noto/NotoSansArabic-Regular.ttf",
"google-noto-sans-arabic-vf-fonts/NotoSansArabic[wght].ttf",
"noto/NotoNaskhArabic-Regular.ttf",
"truetype/noto/NotoNaskhArabic-Regular.ttf",
"google-noto/NotoNaskhArabic-Regular.ttf",
"vazirmatn/Vazirmatn-Regular.ttf",
"truetype/dejavu/DejaVuSans.ttf",
"dejavu/DejaVuSans.ttf",
"TTF/DejaVuSans.ttf",
]
}
}
/// An installed font with Arabic letters, for an Arabic interface in a build whose craft-fonts
/// input has no Arabic face. Reads at most one font file per candidate; never panics on damaged
/// files.
pub fn system_arabic_ui_font() -> Option<SystemUiFont> {
find_ui_font(&crate::system_font_dirs(), arabic_candidates(), &['ع'], Region::Other)
}
/// `dirs` and, for each macOS font asset folder among them (`com_apple_MobileAsset_Font<N>`),
/// the `AssetData` folder of every `<hash>.asset` in it: macOS ships PingFang there, e.g.
/// `/System/Library/AssetsV2/com_apple_MobileAsset_Font7/<hash>.asset/AssetData/PingFang.ttc`
/// (#486). One level, at most [`MAX_ASSETS`] entries per folder.
pub(crate) fn with_asset_data(dirs: Vec<std::path::PathBuf>) -> Vec<std::path::PathBuf> {
let mut out = Vec::with_capacity(dirs.len());
for d in dirs {
let assets = d.file_name().is_some_and(|n| n.to_string_lossy().starts_with("com_apple_MobileAsset_Font"));
if assets && let Ok(entries) = std::fs::read_dir(&d) {
let mut found: Vec<_> =
entries.flatten().take(MAX_ASSETS).map(|e| e.path()).filter(|p| p.extension().is_some_and(|x| x == "asset")).collect();
found.sort();
out.extend(found.into_iter().map(|p| p.join("AssetData")));
}
out.push(d);
}
out
}
/// The font file among `names` (tried in order, each in every folder of `dirs`) whose best face
/// maps all of `needed`, or failing that the one mapping the most of them (the earliest on a
/// tie). A file that maps none of them is never chosen.
pub(crate) fn find_ui_font(dirs: &[std::path::PathBuf], names: &[&str], needed: &[char], region: Region) -> Option<SystemUiFont> {
let mut tried = std::collections::HashSet::new();
let mut best: Option<((u8, usize), SystemUiFont)> = None;
for path in names.iter().flat_map(|n| dirs.iter().map(move |d| d.join(n))) {
if !tried.insert(path.clone()) {
continue;
}
let Some(size) = std::fs::metadata(&path).ok().filter(std::fs::Metadata::is_file).map(|m| m.len()) else { continue };
if size > MAX_FILE {
continue;
}
let Ok(bytes) = std::fs::read(&path) else { continue };
let Some((index, family, covered)) = pick_face(&bytes, needed, region) else { continue };
let fit = if region == Region::Hant { region.rank(&family) } else { 0 };
if best.as_ref().is_some_and(|(b, _)| *b >= (fit, covered)) {
continue;
}
log::debug!("interface CJK fallback: {family} ({}), {covered} of {} characters", path.display(), needed.len());
let done = covered >= needed.len() && (region != Region::Hant || fit == 2);
best = Some(((fit, covered), SystemUiFont { family, bytes, index }));
if done {
break;
}
}
best.map(|(_, f)| f)
}
/// The face of a font file (or collection) to use and how many of `needed` it maps: the one
/// mapping the most, then preferring a Regular style and, for Chinese, a Simplified Chinese
/// family (`… SC`, `… GB`, as in a pan-CJK collection). Faces with none of the
/// [`OUTLINE_TABLES`] are skipped. `None` if the header isn't a font's or no face with outlines
/// maps any of `needed`.
pub(crate) fn pick_face(data: &[u8], needed: &[char], region: Region) -> Option<(u32, String, usize)> {
let magic = data.get(..4)?;
if ![&[0, 1, 0, 0][..], b"OTTO", b"ttcf"].contains(&magic) {
return None;
}
let count = match FileRef::new(data).ok()? {
FileRef::Font(_) => 1,
FileRef::Collection(c) => c.len().min(MAX_FACES),
};
let mut best: Option<((u8, usize, bool, u8), u32, String)> = None;
for i in 0..count {
let Ok(f) = skrifa::FontRef::from_index(data, i) else { continue };
if !OUTLINE_TABLES.iter().any(|t| f.table_data(skrifa::Tag::new(t)).is_some()) {
continue;
}
let charmap = f.charmap();
let covered = needed.iter().filter(|c| charmap.map(**c).is_some()).count();
if covered == 0 {
continue;
}
let Some((family, style, _)) = crate::fontdb::face_names(&f) else { continue };
let rank = region.rank(&family);
let first = if region == Region::Hant { rank } else { 0 };
let score = (first, covered, style.eq_ignore_ascii_case("Regular"), rank);
if best.as_ref().is_none_or(|(s, ..)| score > *s) {
best = Some((score, i, family));
}
}
best.map(|((_, covered, ..), i, family)| (i, family, covered))
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn korean_interface_uses_korean_first_system_font_candidates() {
let names = candidates(false, true);
assert_eq!(
names.first(),
Some(&if cfg!(windows) {
"malgun.ttf"
} else if cfg!(target_os = "macos") {
"/System/Library/Fonts/AppleSDGothicNeo.ttc"
} else {
"noto-cjk/NotoSansCJKkr-Regular.otf"
})
);
assert_eq!(probe(false, true), '한');
}
#[test]
#[cfg(not(target_arch = "wasm32"))]
fn traditional_chinese_interface_picks_the_taiwan_face() {
use crate::fontdb::tests::sysfonts::{collection, renamed_to};
assert_eq!(
hant_candidates().first(),
Some(&if cfg!(windows) {
"msjh.ttc"
} else if cfg!(target_os = "macos") {
"PingFang.ttc"
} else {
"noto-cjk/NotoSansCJK-Regular.ttc"
})
);
let face = |family| renamed_to("SourceSans3-Regular.ttf", family);
let pan = collection(&[face("Probe Sans JP"), face("Probe Sans KR"), face("Probe Sans SC"), face("Probe Sans TC"), face("Probe Sans HK")]);
assert_eq!(pick_face(&pan, &['A'], Region::Hant), Some((3, "Probe Sans TC".to_string(), 1)));
assert_eq!(pick_face(&pan, &['A'], Region::Hans), Some((2, "Probe Sans SC".to_string(), 1)));
assert_eq!(pick_face(&pan, &['A'], Region::Other), Some((0, "Probe Sans JP".to_string(), 1)));
let hk = collection(&[face("Probe Sans SC"), face("Probe Sans HK")]);
assert_eq!(pick_face(&hk, &['A'], Region::Hant).map(|f| f.0), Some(1));
assert_eq!(Region::Hant.rank("Microsoft JhengHei"), 2);
assert_eq!(Region::Hant.rank("Microsoft YaHei"), 0);
let dir = std::env::temp_dir().join(format!("wc-uifallback-hant-{}", std::process::id()));
let _ = std::fs::remove_dir_all(&dir);
std::fs::create_dir_all(&dir).unwrap();
let names = ["missing.ttc", "damaged.ttc", "sc.ttc", "pan.ttc"];
std::fs::write(dir.join("damaged.ttc"), b"ttcf\0\x01\0\0\xff\xff\xff\xff").unwrap();
std::fs::write(dir.join("sc.ttc"), collection(&[face("Probe Sans SC"), face("Probe Sans JP")])).unwrap();
std::fs::write(dir.join("pan.ttc"), &pan).unwrap();
let found = find_ui_font(std::slice::from_ref(&dir), &names, &['A'], Region::Hant).unwrap();
assert_eq!((found.family.as_str(), found.index), ("Probe Sans TC", 3));
assert_eq!(find_ui_font(std::slice::from_ref(&dir), &names, &['A'], Region::Hans).unwrap().family, "Probe Sans SC");
let only_sc = dir.join("only-sc");
std::fs::create_dir_all(only_sc.join("noto-cjk")).unwrap();
std::fs::write(only_sc.join("noto-cjk/NotoSansCJK-Regular.ttc"), collection(&[face("Probe Sans SC")])).unwrap();
assert!(hant_font_in(std::slice::from_ref(&only_sc), &['A']).is_none());
std::fs::write(only_sc.join("noto-cjk/NotoSansCJK-Regular.ttc"), &pan).unwrap();
if !cfg!(windows) && !cfg!(target_os = "macos") {
assert_eq!(hant_font_in(std::slice::from_ref(&only_sc), &['A']).map(|f| f.index), Some(3));
}
assert!(hant_font_in(std::slice::from_ref(&only_sc), &['體']).is_none());
let user = dir.join("user-fonts");
std::fs::create_dir_all(&user).unwrap();
std::fs::write(user.join("NotoSansCJKtc-Regular.otf"), face("Probe Sans TC")).unwrap();
if !cfg!(windows) && !cfg!(target_os = "macos") {
assert_eq!(hant_font_in(std::slice::from_ref(&user), &['A']).map(|f| f.family), Some("Probe Sans TC".to_string()));
}
let _ = std::fs::remove_dir_all(&dir);
}
#[test]
fn needs_system_cjk_when_an_embedded_face_lacks_an_interface_character() {
// A face without CJK glyphs stands in for a craft-fonts face that lacks some (#486).
let latin = CraftFont { family: "Source Sans 3", style: "Regular", scripts: &["Hans"], bytes: crate::bundled()[0] };
assert_eq!(ui_uncovered_cjk(&["选项 Options", "選項:选项"], &[&latin]), ['选', '選', '項', '项', ':']);
assert!(ui_needs_system_cjk(&["简体中文"], &[]));
assert!(ui_needs_system_cjk(&["Save", "开"], &[&latin]));
// Latin, Cyrillic and symbols are the Latin faces' business.
assert!(!ui_needs_system_cjk(&["Українська Español → ¶"], &[]));
// A damaged embedded face counts as covering nothing; it never panics.
let broken = CraftFont { family: "x", style: "Regular", scripts: &["Hans"], bytes: b"OTTO" };
assert!(ui_needs_system_cjk(&["页"], &[&broken]));
// The real faces, when built with craft-fonts: the Chinese face covers simplified and
// traditional hanzi the Japanese one lacks (#241, #486).
let embedded = crate::ui_cjk_fonts(true);
if crate::chinese_fonts().next().is_some() {
assert!(!ui_needs_system_cjk(&["页选项另存为啟內"], &embedded));
}
}
#[test]
fn finds_the_best_covering_font_also_in_macos_asset_folders() {
let dir = std::env::temp_dir().join(format!("wc-uifallback-{}", std::process::id()));
let _ = std::fs::remove_dir_all(&dir);
let assets = dir.join("com_apple_MobileAsset_Font7");
std::fs::create_dir_all(dir.join("sub")).unwrap();
std::fs::create_dir_all(assets.join("0a1b.asset/AssetData")).unwrap();
std::fs::create_dir_all(assets.join("not-an-asset/AssetData")).unwrap();
let sans = crate::bundled()[0];
// Missing, damaged and non-font files are skipped without panicking.
std::fs::write(dir.join("Deng.ttf"), b"ttcf\0\x01\0\0\xff\xff\xff\xff").unwrap();
std::fs::write(dir.join("msyh.ttc"), b"<html>not a font</html>").unwrap();
std::fs::write(dir.join("sub/good.ttf"), sans).unwrap();
let names = ["missing.ttf", "Deng.ttf", "msyh.ttc", "sub/good.ttf"];
let found = find_ui_font(std::slice::from_ref(&dir), &names, &['A'], Region::Hans).unwrap();
assert_eq!((found.family.as_str(), found.index, found.bytes.len()), ("Source Sans 3", 0, sans.len()));
// No candidate maps a CJK character: nothing is chosen.
assert!(find_ui_font(std::slice::from_ref(&dir), &names, &['页'], Region::Hans).is_none());
assert!(pick_face(b"OTT", &['A'], Region::Other).is_none());
// macOS 12 keeps PingFang in `AssetsV2/com_apple_MobileAsset_Font7/<hash>.asset/AssetData`.
std::fs::write(assets.join("0a1b.asset/AssetData/PingFang.ttc"), sans).unwrap();
std::fs::write(assets.join("not-an-asset/AssetData/Hidden.ttc"), sans).unwrap();
let dirs = with_asset_data(vec![dir.clone(), assets.clone()]);
assert_eq!(dirs, [dir.clone(), assets.join("0a1b.asset/AssetData"), assets.clone()]);
let found = find_ui_font(&dirs, &["PingFang.ttc"], &['A'], Region::Hans).unwrap();
assert_eq!(found.family, "Source Sans 3");
assert!(find_ui_font(&dirs, &["Hidden.ttc"], &['A'], Region::Hans).is_none());
// No file maps every needed character: the one mapping the most is used.
let found = find_ui_font(&dirs, &["sub/good.ttf", "PingFang.ttc"], &['A', '页'], Region::Hans).unwrap();
assert_eq!(found.family, "Source Sans 3");
// The bundled Latin face has no Arabic letters, so it is never taken for an Arabic interface.
assert!(find_ui_font(std::slice::from_ref(&dir), &names, &['ع'], Region::Other).is_none());
assert!(!arabic_candidates().is_empty());
let _ = std::fs::remove_dir_all(&dir);
}
#[test]
fn skips_faces_without_outlines() {
// Renaming the `glyf` table to `hvgl` gives a face like those of `PingFangUI.ttc` on
// macOS 27.0.1. Its cmap maps characters, and skrifa reads no outlines from it.
let sans = crate::bundled()[0];
let mut hvgl = sans.to_vec();
let tables = u16::from_be_bytes([hvgl[4], hvgl[5]]) as usize;
let glyf = (0..tables).map(|r| 12 + r * 16).find(|&at| &hvgl[at..at + 4] == b"glyf").unwrap();
hvgl[glyf..glyf + 4].copy_from_slice(b"hvgl");
assert!(skrifa::FontRef::new(&hvgl).unwrap().charmap().map('A').is_some());
assert!(pick_face(&hvgl, &['A'], Region::Hans).is_none());
assert_eq!(pick_face(sans, &['A'], Region::Hans), Some((0, "Source Sans 3".to_string(), 1)));
// `find_ui_font` uses the next file, and returns `None` when no other file is listed.
let dir = std::env::temp_dir().join(format!("wc-uifallback-outlines-{}", std::process::id()));
let _ = std::fs::remove_dir_all(&dir);
std::fs::create_dir_all(&dir).unwrap();
std::fs::write(dir.join("hvgl.ttf"), &hvgl).unwrap();
std::fs::write(dir.join("glyf.ttf"), sans).unwrap();
let found = find_ui_font(std::slice::from_ref(&dir), &["hvgl.ttf", "glyf.ttf"], &['A'], Region::Hans).unwrap();
assert!(found.bytes == sans);
assert!(find_ui_font(std::slice::from_ref(&dir), &["hvgl.ttf"], &['A'], Region::Hans).is_none());
let _ = std::fs::remove_dir_all(&dir);
}
}
+6 -1
View File
@@ -12,7 +12,12 @@ workspace = true
wordcraft-doc = { workspace = true }
wordcraft-engine = { workspace = true }
wordcraft-render = { workspace = true }
wordcraft-control-key = { workspace = true }
craft-mcp-server = { workspace = true }
serde_json = { workspace = true }
log = { workspace = true }
# The bridge to a running app (`Remote`): the control channel's authenticate-once client and token
# lookup, which do not build for wasm32.
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
wordcraft-control-key = { workspace = true }
craft = { workspace = true, features = ["automation"] }
+5 -637
View File
@@ -1,16 +1,11 @@
//! Where MCP tool calls end up: a control-channel method call.
use std::io::{BufReader, Write};
use std::net::{IpAddr, Ipv4Addr, SocketAddr, TcpStream, ToSocketAddrs};
use std::path::Path;
use std::time::Duration;
use serde_json::Value;
use serde_json::{Value, json};
use crate::server::{BoundedLine, read_bounded_line};
/// Longest reply line accepted from the app (screenshots and `document.inspect` are large).
const MAX_REPLY_LINE: usize = 256 << 20;
#[cfg(not(target_arch = "wasm32"))]
mod remote;
#[cfg(not(target_arch = "wasm32"))]
pub use remote::Remote;
/// Something that answers control-channel methods (`engine.execute`, `document.inspect`,
/// `ui.pointer`, `ui.render`, …). See `wordcraft_ui_egui::control` for the full list.
@@ -22,630 +17,3 @@ pub trait Backend {
/// Short human description ("headless", "connected to 127.0.0.1:7981").
fn describe(&self) -> String;
}
/// Looks up the control key for an address (`HOST:PORT`).
type KeyFinder = Box<dyn Fn(&str) -> Result<String, String> + Send>;
/// A running WordCraft app, reached through its loopback control port.
pub struct Remote {
addr: String,
conn: Option<(BufReader<TcpStream>, TcpStream)>,
next_id: u64,
/// Whether a connection ever succeeded (`lazy` starts without one; the app may open later).
connected: bool,
/// The connection leads to the app's 127.0.0.1: requests carry the control key.
send_key: bool,
/// The control key, looked up once per connection (the app picks a new one at every start).
key: Option<String>,
find_key: KeyFinder,
}
/// The control key: `env` (`WORDCRAFT_CONTROL_KEY`) when set, else the app's key file for
/// `port` in `settings`. The error says where it looked.
fn lookup_key(env: Option<String>, settings: Option<&Path>, port: Option<u16>) -> Result<String, String> {
if let Some(k) = env.map(|k| k.trim().to_string()).filter(|k| !k.is_empty()) {
return Ok(k);
}
let (Some(settings), Some(port)) = (settings, port) else {
return Err("no control key: set WORDCRAFT_CONTROL_KEY (no settings folder or port to find the key file)".to_string());
};
let path = wordcraft_control_key::key_path(settings, port);
match std::fs::read_to_string(&path).map(|k| k.trim().to_string()) {
Ok(k) if !k.is_empty() => Ok(k),
_ => Err(format!("no control key: set WORDCRAFT_CONTROL_KEY, or start the app with --control {port} (it writes {})", path.display())),
}
}
/// The key for the app at `addr`, from the environment or the app's key file.
fn find_key(addr: &str) -> Result<String, String> {
let port = addr.rsplit_once(':').and_then(|(_, p)| p.parse().ok());
lookup_key(std::env::var("WORDCRAFT_CONTROL_KEY").ok(), wordcraft_control_key::settings_dir().as_deref(), port)
}
/// The only address the app's control server binds (`apps/wordcraft/src/control_server.rs`).
const APP_IP: IpAddr = IpAddr::V4(Ipv4Addr::LOCALHOST);
/// The host part of `addr` (`HOST:PORT`, `[V6]:PORT`), without brackets.
fn host_of(addr: &str) -> &str {
let host = addr.rsplit_once(':').map_or(addr, |(h, _)| h);
host.strip_prefix('[').and_then(|h| h.strip_suffix(']')).unwrap_or(host)
}
/// Whether `addr` (`HOST:PORT`, as given to `--connect`) names the app's own address:
/// 127.0.0.1 or `localhost`. Other loopback addresses (127.0.0.2, ::1) don't count: the app never
/// listens there, so whatever does is not the app. Other host names are not resolved.
fn is_app_addr(addr: &str) -> bool {
let app = |ip: IpAddr| ip.to_canonical() == APP_IP;
if let Ok(sa) = addr.parse::<SocketAddr>() {
return app(sa.ip());
}
if let Ok(ip) = addr.parse::<IpAddr>() {
return app(ip);
}
let host = host_of(addr);
host.parse::<IpAddr>().map_or_else(|_| host.eq_ignore_ascii_case("localhost"), app)
}
/// The key goes only to the app's `--connect` address, and only when the connection really
/// leads to 127.0.0.1 (`peer`): a listener on another loopback address (::1, 127.0.0.2), which
/// any local user can open, never sees it.
fn may_send_key(addr: &str, peer: Option<SocketAddr>) -> bool {
is_app_addr(addr) && peer.is_some_and(|p| p.ip().to_canonical() == APP_IP)
}
/// Where to connect for `addr`: `localhost` means the app's 127.0.0.1 (not whatever the resolver
/// lists first, which may be ::1); anything else as resolved.
fn targets(addr: &str) -> std::io::Result<Vec<SocketAddr>> {
if host_of(addr).eq_ignore_ascii_case("localhost")
&& let Some(port) = addr.rsplit_once(':').and_then(|(_, p)| p.parse::<u16>().ok())
{
return Ok(vec![SocketAddr::new(APP_IP, port)]);
}
Ok(addr.to_socket_addrs()?.collect())
}
impl Remote {
/// Connect to `addr` (`127.0.0.1:7981`), failing fast when nothing is listening.
pub fn connect(addr: &str) -> std::io::Result<Self> {
Self::connect_with(addr, Box::new(find_key))
}
fn connect_with(addr: &str, find_key: KeyFinder) -> std::io::Result<Self> {
let mut r = Self { addr: addr.to_string(), conn: None, next_id: 1, connected: false, send_key: false, key: None, find_key };
r.reconnect()?;
if let Some(w) = r.key_warning() {
log::warn!("{w}");
}
Ok(r)
}
/// A remote that connects on first use: the app may start after the MCP server, and a
/// server that exits at once reads as failed for the client's whole session (#4078).
pub fn lazy(addr: &str) -> Self {
Self { addr: addr.to_string(), conn: None, next_id: 1, connected: false, send_key: false, key: None, find_key: Box::new(find_key) }
}
/// The address the app is reached at, as given.
pub fn addr(&self) -> &str {
&self.addr
}
/// Why requests go without the control key (the address is not the app's 127.0.0.1), if they
/// do.
pub fn key_warning(&self) -> Option<String> {
// Nothing is known about the address until a connection succeeds.
if !self.connected {
return None;
}
(!self.send_key).then(|| {
format!(
"{} is not the app's address, so the control key is not sent (it only goes to 127.0.0.1 and localhost, where the app listens) and the app refuses requests; reach the app through 127.0.0.1, for example with an SSH tunnel",
self.addr
)
})
}
/// Drop the connection and connect again to the first of the address's targets that answers,
/// deciding afresh whether the control key may go to it.
fn reconnect(&mut self) -> std::io::Result<()> {
self.conn = None;
self.key = None;
let mut last = std::io::Error::new(std::io::ErrorKind::NotFound, format!("cannot resolve {}", self.addr));
for sa in targets(&self.addr)? {
match TcpStream::connect_timeout(&sa, Duration::from_millis(800)) {
Ok(s) => {
s.set_nodelay(true).ok();
// The app answers within 60 s (its own timeout); leave headroom.
s.set_read_timeout(Some(Duration::from_secs(90))).ok();
self.send_key = may_send_key(&self.addr, s.peer_addr().ok());
let read = s.try_clone()?;
self.conn = Some((BufReader::new(read), s));
self.connected = true;
return Ok(());
}
Err(e) => last = e,
}
}
Err(last)
}
/// The request line; it carries the key when this connection may (looked up once per
/// connection).
fn request_line(&mut self, id: u64, method: &str, params: &Value) -> Result<String, String> {
let mut req = json!({"id": id, "method": method, "params": params});
if self.send_key {
let key = match &self.key {
Some(k) => k.clone(),
None => (self.find_key)(&self.addr)?,
};
req["key"] = json!(key);
self.key = Some(key);
}
Ok(req.to_string())
}
/// Send one line and read its reply. Once a write is attempted, any failure leaves the
/// outcome unknown: even a failed write may have delivered a complete request at EOF.
fn roundtrip(&mut self, line: &str) -> Result<String, Failure> {
let Some((reader, writer)) = self.conn.as_mut() else {
return Err(Failure::NotSent(std::io::Error::new(std::io::ErrorKind::NotConnected, "not connected")));
};
roundtrip_io(reader, writer, line)
}
/// One request and its reply. A request that was not sent, or one that only reads, is tried
/// once more on a new connection (the app may have restarted; a new connection also reads
/// the key again). A mutation whose outcome is unknown is never sent again: it may have run.
fn exchange(&mut self, id: u64, method: &str, params: &Value) -> Result<Value, String> {
self.exchange_with(id, method, params, Self::roundtrip)
}
fn exchange_with(
&mut self,
id: u64,
method: &str,
params: &Value,
mut roundtrip: impl FnMut(&mut Self, &str) -> Result<String, Failure>,
) -> Result<Value, String> {
let unreachable = |addr: &str, e: std::io::Error, connected: bool| {
let retry = if connected { String::new() } else { "; will retry on each call".to_string() };
format!("WordCraft app at {addr} is not reachable: {e}{retry}")
};
let mut first = true;
let reply = loop {
let tried = if self.conn.is_some() { Ok(()) } else { self.reconnect().map_err(Failure::NotSent) };
let result = match tried {
Ok(()) => {
let line = self.request_line(id, method, params)?;
roundtrip(self, &line)
}
Err(e) => Err(e),
};
match result {
Ok(r) => break r,
Err(f) => {
self.conn = None;
// A reply that arrived but can't be read (too long, not UTF-8): the app has
// run the request, so sending it again could run a state-changing one twice.
if let Failure::Unknown(e) = &f
&& e.kind() == std::io::ErrorKind::InvalidData
{
return Err(format!("bad reply from app: {e}"));
}
if let Failure::Unknown(e) = &f
&& !is_read_only(method, params)
{
return Err(format!(
"outcome unknown: the connection to the WordCraft app at {} failed while sending `{method}` or waiting for its reply ({e}); it may have been executed, so it is not sent again. Inspect the document to check",
self.addr
));
}
if !first {
return Err(unreachable(&self.addr, f.into_error(), self.connected));
}
first = false;
}
}
};
serde_json::from_str(reply.trim()).map_err(|e| format!("bad reply from app: {e}"))
}
}
/// Shared socket exchange, also used with a writer that fails after partial delivery in tests.
fn roundtrip_io(reader: &mut impl std::io::BufRead, writer: &mut impl Write, line: &str) -> Result<String, Failure> {
let mut out = Vec::with_capacity(line.len() + 1);
out.extend_from_slice(line.as_bytes());
out.push(b'\n');
writer.write_all(&out).and_then(|()| writer.flush()).map_err(Failure::Unknown)?;
match read_bounded_line(reader, MAX_REPLY_LINE).map_err(Failure::Unknown)? {
BoundedLine::Line(reply) => Ok(reply),
BoundedLine::Eof => Err(Failure::Unknown(std::io::Error::new(std::io::ErrorKind::UnexpectedEof, "control channel closed"))),
BoundedLine::TooLong => Err(Failure::Unknown(std::io::Error::new(std::io::ErrorKind::InvalidData, "reply from app too long"))),
}
}
/// Why a round trip failed.
enum Failure {
/// No write was attempted: the app did not run it.
NotSent(std::io::Error),
/// After the request was sent: the app may have run it.
Unknown(std::io::Error),
}
impl Failure {
fn into_error(self) -> std::io::Error {
match self {
Self::NotSent(e) | Self::Unknown(e) => e,
}
}
}
/// Methods that only read: sending them twice does no harm.
fn is_read_only(method: &str, params: &Value) -> bool {
match method {
"document.inspect" | "engine.commands" | "ui.inspect" | "ui.parity" => true,
"ui.render" | "ui.screenshot" => params.get("path").and_then(Value::as_str).is_none(),
_ => false,
}
}
impl Backend for Remote {
fn call(&mut self, method: &str, params: Value) -> Result<Value, String> {
let id = self.next_id;
self.next_id += 1;
let unauthorized = |v: &Value| v.get("error").and_then(Value::as_str) == Some("unauthorized");
let mut v = self.exchange(id, method, &params)?;
if unauthorized(&v) && self.send_key {
// A stale key (the app restarted on this port): the app closed the connection; a new
// one reads the key again. Once.
self.conn = None;
v = self.exchange(id, method, &params)?;
}
if v.get("ok").and_then(Value::as_bool) == Some(true) {
Ok(v.get("result").cloned().unwrap_or(Value::Null))
} else if unauthorized(&v) {
self.conn = None;
Err(self.key_warning().map_or_else(
|| {
format!(
"unauthorized: the WordCraft app at {} refused the control key (from WORDCRAFT_CONTROL_KEY or the app's key file)",
self.addr
)
},
|w| format!("unauthorized: {w}"),
))
} else {
Err(v.get("error").and_then(Value::as_str).unwrap_or("unknown error").to_string())
}
}
fn has_ui(&self) -> bool {
true
}
fn describe(&self) -> String {
if self.connected {
format!("connected to the WordCraft app at {}", self.addr)
} else {
format!("will connect to the WordCraft app at {} when it opens", self.addr)
}
}
}
#[cfg(test)]
mod tests {
use super::*;
use std::io::BufRead;
use std::net::{SocketAddr, TcpListener};
use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::mpsc::{Receiver, channel};
#[test]
fn key_from_env_then_key_file() {
let dir = std::env::temp_dir().join(format!("wordcraft-mcp-key-{}", std::process::id()));
let _ = std::fs::remove_dir_all(&dir);
std::fs::create_dir_all(&dir).unwrap();
let path = wordcraft_control_key::key_path(&dir, 7981);
// Neither: the error names the variable and the file it looked for.
let e = lookup_key(None, Some(&dir), Some(7981)).unwrap_err();
assert!(e.contains("WORDCRAFT_CONTROL_KEY") && e.contains(&path.display().to_string()), "{e}");
// The key file, trimmed; an empty variable does not count.
std::fs::write(&path, " file-key\n").unwrap();
assert_eq!(lookup_key(None, Some(&dir), Some(7981)).unwrap(), "file-key");
assert_eq!(lookup_key(Some(" ".into()), Some(&dir), Some(7981)).unwrap(), "file-key");
// The variable wins.
assert_eq!(lookup_key(Some(" env-key ".into()), Some(&dir), Some(7981)).unwrap(), "env-key");
assert_eq!(lookup_key(Some("env-key".into()), None, None).unwrap(), "env-key");
// Read again every time: the app writes a new key at every start.
std::fs::write(&path, "new-key").unwrap();
assert_eq!(lookup_key(None, Some(&dir), Some(7981)).unwrap(), "new-key");
// Another port, another file.
assert!(lookup_key(None, Some(&dir), Some(7982)).is_err());
let _ = std::fs::remove_dir_all(&dir);
}
#[test]
fn key_only_for_the_apps_address() {
let peer = |s: &str| s.parse::<SocketAddr>().ok();
for (addr, at) in [
("127.0.0.1:7981", "127.0.0.1:7981"),
("[::ffff:127.0.0.1]:7981", "[::ffff:127.0.0.1]:7981"),
("localhost:7981", "127.0.0.1:7981"),
("LocalHost:7981", "127.0.0.1:7981"),
] {
assert!(may_send_key(addr, peer(at)), "{addr} at {at}");
}
for (addr, at) in [
("192.0.2.20:7981", "192.0.2.20:7981"),
("10.0.0.7:7981", "10.0.0.7:7981"),
("[fe80::1]:7981", "[fe80::1]:7981"),
("0.0.0.0:7981", "127.0.0.1:7981"),
// Loopback addresses the app never binds: another local user's listener (#3699).
("127.0.0.2:7981", "127.0.0.2:7981"),
("[::1]:7981", "[::1]:7981"),
("localhost:7981", "[::1]:7981"),
("127.0.0.1:7981", "127.0.0.2:7981"),
// Host names other than localhost: even when they lead to this machine.
("workstation:7981", "127.0.1.1:7981"),
("example.org:7981", "93.184.215.14:7981"),
("localhost.example.org:7981", "127.0.0.1:7981"),
// `localhost` that does not lead to a loopback address.
("localhost:7981", "192.0.2.20:7981"),
] {
assert!(!may_send_key(addr, peer(at)), "{addr} at {at}");
}
// No peer address: no key.
assert!(!may_send_key("127.0.0.1:7981", None));
}
#[test]
fn localhost_connects_to_the_apps_address_only() {
// Not the resolver's list, which may put ::1 (where anyone can listen) first.
let at: SocketAddr = "127.0.0.1:7981".parse().unwrap();
assert_eq!(targets("localhost:7981").unwrap(), vec![at]);
assert_eq!(targets("LOCALHOST:7981").unwrap(), vec![at]);
assert_eq!(targets("127.0.0.1:7981").unwrap(), vec![at]);
assert_eq!(targets("[::1]:7981").unwrap(), vec!["[::1]:7981".parse::<SocketAddr>().unwrap()]);
}
/// A stand-in for the app on 127.0.0.1: every request line goes to the returned channel and
/// gets `answer(request)`: a reply and whether to close the connection after it, or `None`
/// to close it without a reply (the app quit).
fn fake_app(answer: impl Fn(&Value) -> Option<(Value, bool)> + Send + Sync + 'static) -> (u16, Receiver<Value>) {
let listener = TcpListener::bind(("127.0.0.1", 0)).unwrap();
let port = listener.local_addr().unwrap().port();
let (tx, rx) = channel();
let answer = Arc::new(answer);
std::thread::spawn(move || {
for stream in listener.incoming().flatten() {
let (tx, answer) = (tx.clone(), answer.clone());
std::thread::spawn(move || {
let mut out = stream.try_clone().unwrap();
for line in BufReader::new(stream).lines() {
let Ok(req) = serde_json::from_str::<Value>(&line.unwrap_or_default()) else { return };
let _ = tx.send(req.clone());
let Some((mut reply, close)) = answer(&req) else { return };
reply["id"] = req["id"].clone();
if writeln!(out, "{reply}").is_err() || close {
return;
}
}
});
}
});
(port, rx)
}
#[test]
fn an_unreadable_reply_is_not_retried() {
// The app answered something that can't be read (here not UTF-8; an over-long reply
// takes the same path): the request ran, so it must not be sent again.
let listener = TcpListener::bind(("127.0.0.1", 0)).unwrap();
let port = listener.local_addr().unwrap().port();
let seen = Arc::new(AtomicUsize::new(0));
let n = seen.clone();
std::thread::spawn(move || {
for stream in listener.incoming().flatten() {
let n = n.clone();
std::thread::spawn(move || {
let mut out = stream.try_clone().unwrap();
for line in BufReader::new(stream).lines() {
if line.is_err() {
return;
}
n.fetch_add(1, Ordering::SeqCst);
if out.write_all(b"\xff\xfe\n").is_err() {
return;
}
}
});
}
});
let mut r = Remote::connect_with(&format!("127.0.0.1:{port}"), fixed_key("k1")).unwrap();
let e = r.call("engine.execute", json!({"command": "text.insert", "params": {"text": "x"}})).unwrap_err();
assert!(e.contains("bad reply"), "{e}");
assert_eq!(seen.load(Ordering::SeqCst), 1, "the request was sent once");
}
fn fixed_key(key: &'static str) -> KeyFinder {
Box::new(move |_| Ok(key.to_string()))
}
const WAIT: Duration = Duration::from_secs(5);
#[test]
fn sends_the_key_to_loopback() {
let (port, seen) = fake_app(|_| Some((json!({"ok": true, "result": 7}), false)));
for host in ["127.0.0.1", "localhost"] {
let mut r = Remote::connect_with(&format!("{host}:{port}"), fixed_key("k1")).unwrap();
assert!(r.key_warning().is_none(), "{host}");
assert_eq!(r.call("document.inspect", json!({})).unwrap(), json!(7));
assert_eq!(seen.recv_timeout(WAIT).unwrap()["key"], "k1", "{host}");
}
}
#[test]
fn a_lazy_remote_serves_once_the_app_opens() {
// Nothing is listening: the call fails, but the server stays up and says it will retry.
let mut r = Remote::lazy("127.0.0.1:1");
r.find_key = fixed_key("k1");
let e = r.call("document.inspect", json!({})).unwrap_err();
assert!(e.contains("not reachable") && e.contains("will retry"), "{e}");
assert!(r.describe().contains("will connect to"));
// The app opens later: the next call connects and answers.
let (port, seen) = fake_app(|_| Some((json!({"ok": true, "result": 7}), false)));
r.addr = format!("127.0.0.1:{port}");
assert_eq!(r.call("document.inspect", json!({})).unwrap(), json!(7));
assert!(r.key_warning().is_none());
assert_eq!(seen.recv_timeout(WAIT).unwrap()["key"], "k1");
assert!(r.describe().contains("connected to"));
}
#[test]
fn reads_the_key_again_on_a_new_connection() {
// The app restarted with a new key: the old key is refused (and the connection closed).
let (port, seen) = fake_app(|req| {
Some(if req["key"] == "new" { (json!({"ok": true, "result": 1}), false) } else { (json!({"ok": false, "error": "unauthorized"}), true) })
});
let reads = Arc::new(AtomicUsize::new(0));
let n = reads.clone();
let finder: KeyFinder = Box::new(move |_| Ok(if n.fetch_add(1, Ordering::SeqCst) == 0 { "old" } else { "new" }.to_string()));
let mut r = Remote::connect_with(&format!("127.0.0.1:{port}"), finder).unwrap();
assert_eq!(r.call("document.inspect", json!({})).unwrap(), json!(1));
assert_eq!(seen.recv_timeout(WAIT).unwrap()["key"], "old");
assert_eq!(seen.recv_timeout(WAIT).unwrap()["key"], "new");
assert_eq!(reads.load(Ordering::SeqCst), 2);
// The new key is kept for the next requests on the same connection.
assert_eq!(r.call("document.inspect", json!({})).unwrap(), json!(1));
assert_eq!(reads.load(Ordering::SeqCst), 2);
// The app quits mid-session (connection closed): the retry reads the key again.
let (port, seen) = fake_app(|req| if req["id"] == 2 { None } else { Some((json!({"ok": true, "result": 1}), false)) });
let reads = Arc::new(AtomicUsize::new(0));
let n = reads.clone();
let finder: KeyFinder = Box::new(move |_| Ok(format!("key-{}", n.fetch_add(1, Ordering::SeqCst))));
let mut r = Remote::connect_with(&format!("127.0.0.1:{port}"), finder).unwrap();
r.call("document.inspect", json!({})).unwrap();
r.call("document.inspect", json!({})).unwrap_err();
let keys: Vec<Value> = seen.try_iter().map(|v| v["key"].clone()).collect();
assert_eq!(keys.first(), Some(&json!("key-0")), "{keys:?}");
assert_eq!(keys.last(), Some(&json!("key-1")), "{keys:?}");
}
#[test]
fn no_key_for_other_hosts_and_a_clear_error() {
// There is no LAN address to test with here: same stand-in, with the decision a LAN
// address gets.
let (port, seen) = fake_app(|req| {
Some(if req.get("key").is_some() {
(json!({"ok": true, "result": 1}), false)
} else {
(json!({"ok": false, "error": "unauthorized"}), true)
})
});
let finder: KeyFinder = Box::new(|_| Err("the key must not be read for another host".to_string()));
let mut r = Remote::connect_with(&format!("127.0.0.1:{port}"), finder).unwrap();
r.send_key = false;
assert!(r.key_warning().is_some_and(|w| w.contains("not the app's address")));
let e = r.call("document.inspect", json!({})).unwrap_err();
assert!(e.contains("not the app's address") && e.contains("not sent"), "{e}");
assert!(seen.recv_timeout(WAIT).unwrap().get("key").is_none());
}
#[test]
fn a_mutation_with_a_lost_reply_is_not_sent_again() {
// The app runs the request, then the connection drops without a reply.
let (port, seen) = fake_app(|_| None);
let mut r = Remote::connect_with(&format!("127.0.0.1:{port}"), fixed_key("k")).unwrap();
let e = r.call("engine.execute", json!({"command": "text.insert", "params": {"text": "x"}})).unwrap_err();
assert!(e.contains("outcome unknown"), "{e}");
assert_eq!(seen.recv_timeout(WAIT).unwrap()["method"], "engine.execute");
std::thread::sleep(Duration::from_millis(200));
assert!(seen.try_recv().is_err(), "the mutation was sent a second time");
}
#[test]
fn a_read_with_a_lost_reply_is_sent_again() {
let n = Arc::new(AtomicUsize::new(0));
let (port, seen) =
fake_app(move |_| if n.fetch_add(1, Ordering::SeqCst) == 0 { None } else { Some((json!({"ok": true, "result": 3}), false)) });
let mut r = Remote::connect_with(&format!("127.0.0.1:{port}"), fixed_key("k")).unwrap();
assert_eq!(r.call("document.inspect", json!({})).unwrap(), json!(3));
assert_eq!(seen.try_iter().count(), 2);
}
#[test]
fn a_failed_write_after_delivering_json_never_replays_a_mutation() {
// Deliver a complete request, then fail either its newline write or its flush. The
// stand-in, like the production server, accepts a complete JSON body at EOF.
struct FailingWriter<'a> {
socket: &'a mut TcpStream,
fail_flush: bool,
wrote: bool,
}
impl Write for FailingWriter<'_> {
fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
if self.wrote {
return Err(std::io::ErrorKind::BrokenPipe.into());
}
self.wrote = true;
let len = buf.len() - usize::from(!self.fail_flush);
self.socket.write_all(&buf[..len])?;
self.socket.shutdown(std::net::Shutdown::Write)?;
Ok(len)
}
fn flush(&mut self) -> std::io::Result<()> {
Err(std::io::ErrorKind::BrokenPipe.into())
}
}
for fail_flush in [false, true] {
let (port, seen) = fake_app(|_| None);
let mut r = Remote::connect_with(&format!("127.0.0.1:{port}"), fixed_key("k")).unwrap();
let mut attempts = 0;
let e = r
.exchange_with(1, "engine.execute", &json!({"command": "text.insert", "params": {"text": "once"}}), |r, line| {
attempts += 1;
let (reader, socket) = r.conn.as_mut().unwrap();
roundtrip_io(reader, &mut FailingWriter { socket, fail_flush, wrote: false }, line)
})
.unwrap_err();
assert!(e.contains("outcome unknown"), "{e}");
assert_eq!(attempts, 1, "a failed write must not trigger another exchange");
assert_eq!(seen.recv_timeout(WAIT).unwrap()["params"]["params"]["text"], "once");
assert!(seen.try_recv().is_err());
}
}
#[test]
fn image_exports_with_a_lost_reply_are_not_replayed_but_in_memory_reads_are() {
for method in ["ui.render", "ui.screenshot"] {
for path in [json!("out.png"), json!(""), Value::Null] {
let count = Arc::new(AtomicUsize::new(0));
let n = count.clone();
let (port, seen) =
fake_app(move |_| if n.fetch_add(1, Ordering::SeqCst) == 0 { None } else { Some((json!({"ok": true, "result": 3}), false)) });
let mut r = Remote::connect_with(&format!("127.0.0.1:{port}"), fixed_key("k")).unwrap();
let result = r.call(method, json!({"path": path}));
if path.is_string() {
assert!(result.unwrap_err().contains("outcome unknown"));
assert_eq!(count.load(Ordering::SeqCst), 1);
} else {
assert_eq!(result.unwrap(), json!(3));
assert_eq!(count.load(Ordering::SeqCst), 2);
}
assert_eq!(seen.try_iter().count(), if path.is_string() { 1 } else { 2 });
}
assert!(is_read_only(method, &json!({})), "no path means PNG in the reply");
}
}
#[test]
fn a_mutation_not_sent_goes_out_on_a_new_connection() {
let (port, seen) = fake_app(|_| Some((json!({"ok": true, "result": 1}), false)));
let mut r = Remote::connect_with(&format!("127.0.0.1:{port}"), fixed_key("k")).unwrap();
r.conn = None;
assert_eq!(r.call("engine.execute", json!({"command": "file.new"})).unwrap(), json!(1));
assert_eq!(seen.try_iter().count(), 1);
}
}
+586
View File
@@ -0,0 +1,586 @@
//! The bridge to a running WordCraft app: a control-channel client over loopback TCP. Native only
//! (the control channel and its client do not build for wasm32).
use std::net::{IpAddr, Ipv4Addr, SocketAddr, ToSocketAddrs};
use std::path::Path;
use craft::automation::args::{EnvNames, FlagNames};
use craft::automation::client::{ConnectError, ControlClient};
use craft::automation::security::client_token;
use serde_json::Value;
use crate::backend::Backend;
/// A control token and where it came from: a token read from the app's file may be stale after
/// an app restart, one given by the user is not re-read.
#[derive(Clone, Debug, PartialEq, Eq)]
struct Token {
value: String,
from_file: bool,
}
/// Looks up the control token for an address (`HOST:PORT`).
type TokenFinder = Box<dyn Fn(&str) -> Result<Token, Connect> + Send>;
/// The environment variable names of the control channel (`WORDCRAFT_CONTROL_TOKEN`, …).
fn env_names() -> EnvNames {
EnvNames::for_app("WORDCRAFT")
}
/// The control token: `env` (`WORDCRAFT_CONTROL_TOKEN`) when set and not empty, else the app's
/// token file for `port` in `settings`. The error says where it looked. A missing token file means
/// the app has not started (it writes the file before it serves, and removes it on exit), so it
/// reads as unreachable and a lazy bridge keeps retrying (#4078).
fn lookup_token(env: Option<String>, settings: Option<&Path>, port: Option<u16>) -> Result<Token, Connect> {
let names = env_names();
let supplied = env.map(|t| t.trim().to_string()).filter(|t| !t.is_empty());
let file = match (&supplied, settings.zip(port)) {
(Some(_), _) => None,
(None, Some((dir, port))) => {
let path = wordcraft_control_key::key_path(dir, port);
if !path.is_file() {
return Err(Connect::Unreachable(format!(
"no control token yet: set {}, or start the app with --control {port} (it writes {})",
names.token,
path.display()
)));
}
Some(path)
}
(None, None) => {
return Err(Connect::Token(format!("no control token: set {} (no settings folder or port to find the token file)", names.token)));
}
};
let from_file = file.is_some();
client_token(supplied.as_deref(), file.as_deref(), &FlagNames::default(), &names)
.map(|value| Token { value, from_file })
.map_err(|e| Connect::Token(e.to_string()))
}
/// The port of `addr` (`HOST:PORT`).
fn port_of(addr: &str) -> Option<u16> {
addr.rsplit_once(':').and_then(|(_, p)| p.parse().ok())
}
/// The token for the app at `addr`, from the environment or the app's token file.
fn find_token(addr: &str) -> Result<Token, Connect> {
lookup_token(std::env::var(env_names().token).ok(), wordcraft_control_key::settings_dir().as_deref(), port_of(addr))
}
/// The only address the app's control server binds (`apps/wordcraft/src/control_server.rs`).
const APP_IP: IpAddr = IpAddr::V4(Ipv4Addr::LOCALHOST);
/// The host part of `addr` (`HOST:PORT`, `[V6]:PORT`), without brackets.
fn host_of(addr: &str) -> &str {
let host = addr.rsplit_once(':').map_or(addr, |(h, _)| h);
host.strip_prefix('[').and_then(|h| h.strip_suffix(']')).unwrap_or(host)
}
/// Whether `addr` (`HOST:PORT`, as given to `--connect`) names the app's own address:
/// 127.0.0.1 or `localhost`. Other loopback addresses (127.0.0.2, ::1) don't count: the app never
/// listens there, so whatever does is not the app. Other host names are not resolved.
fn is_app_addr(addr: &str) -> bool {
let app = |ip: IpAddr| ip.to_canonical() == APP_IP;
if let Ok(sa) = addr.parse::<SocketAddr>() {
return app(sa.ip());
}
if let Ok(ip) = addr.parse::<IpAddr>() {
return app(ip);
}
let host = host_of(addr);
host.parse::<IpAddr>().map_or_else(|_| host.eq_ignore_ascii_case("localhost"), app)
}
/// The token goes only to the app's `--connect` address, and only when the connection really
/// leads to 127.0.0.1 (`peer`): a listener on another loopback address (::1, 127.0.0.2), which
/// any local user can open, never sees it.
fn may_send_key(addr: &str, peer: SocketAddr) -> bool {
is_app_addr(addr) && peer.ip().to_canonical() == APP_IP
}
/// Where to connect for `addr`: `localhost` means the app's 127.0.0.1 (not whatever the resolver
/// lists first, which may be ::1); anything else as resolved.
fn targets(addr: &str) -> std::io::Result<Vec<SocketAddr>> {
if host_of(addr).eq_ignore_ascii_case("localhost")
&& let Some(port) = addr.rsplit_once(':').and_then(|(_, p)| p.parse::<u16>().ok())
{
return Ok(vec![SocketAddr::new(APP_IP, port)]);
}
Ok(addr.to_socket_addrs()?.collect())
}
/// Why `addr` gets no token.
fn not_app_address(addr: &str) -> String {
format!(
"{addr} is not the app's address, so the control token is not sent (it only goes to 127.0.0.1 and localhost, where the app listens) and the app refuses requests; reach the app through 127.0.0.1, for example with an SSH tunnel"
)
}
/// Why a connection could not be made.
#[derive(Debug)]
enum Connect {
/// The app was not reached.
Unreachable(String),
/// The app refused the token.
Refused(String),
/// No token could be found.
Token(String),
}
/// A running WordCraft app, reached through its loopback control port.
pub struct Remote {
addr: String,
client: Option<ControlClient>,
/// Whether a connection ever succeeded (`lazy` starts without one; the app may open later).
connected: bool,
/// The connection leads to the app's 127.0.0.1: the control token may be sent.
send_key: bool,
find_token: TokenFinder,
}
impl Remote {
/// Connect to `addr` (`127.0.0.1:7981`), failing fast when nothing is listening.
pub fn connect(addr: &str) -> std::io::Result<Self> {
Self::connect_with(addr, Box::new(find_token))
}
fn connect_with(addr: &str, find_token: TokenFinder) -> std::io::Result<Self> {
let mut r = Self { addr: addr.to_string(), client: None, connected: false, send_key: false, find_token };
r.reconnect().map_err(|c| std::io::Error::other(r.connect_error(c, false)))?;
if let Some(w) = r.key_warning() {
log::warn!("{w}");
}
Ok(r)
}
/// A remote that connects on first use: the app may start after the MCP server, and a
/// server that exits at once reads as failed for the client's whole session (#4078).
pub fn lazy(addr: &str) -> Self {
Self { addr: addr.to_string(), client: None, connected: false, send_key: false, find_token: Box::new(find_token) }
}
/// The address the app is reached at, as given.
pub fn addr(&self) -> &str {
&self.addr
}
/// Why requests go without the control token (the address is not the app's 127.0.0.1), if
/// they do.
pub fn key_warning(&self) -> Option<String> {
// Nothing is known about the address until a connection succeeds.
if !self.connected {
return None;
}
(!self.send_key).then(|| not_app_address(&self.addr))
}
/// Drop the connection and connect again to the first of the address's targets that answers,
/// deciding afresh whether the token may go to it. An address that is not the app's gets no
/// connection: nothing could authenticate on it.
fn reconnect(&mut self) -> Result<(), Connect> {
self.client = None;
let mut last = Connect::Unreachable(format!("cannot resolve {}", self.addr));
for sa in targets(&self.addr).map_err(|e| Connect::Unreachable(e.to_string()))? {
self.send_key = may_send_key(&self.addr, sa);
if !self.send_key {
self.connected = true;
return Ok(());
}
match self.authenticate(sa) {
Ok(client) => {
self.client = Some(client);
self.connected = true;
return Ok(());
}
Err(e @ Connect::Unreachable(_)) => last = e,
Err(e) => return Err(e),
}
}
Err(last)
}
/// Connect to `sa` and authenticate. A token read from the app's file that is refused may be
/// stale (the app restarted with a new one), so it is read again once.
fn authenticate(&self, sa: SocketAddr) -> Result<ControlClient, Connect> {
let mut refused_before = false;
loop {
let token = (self.find_token)(&self.addr)?;
match ControlClient::connect(sa, &token.value) {
Ok(client) => return Ok(client),
Err(ConnectError::Refused(_)) if token.from_file && !refused_before => refused_before = true,
Err(ConnectError::Refused(e)) => return Err(Connect::Refused(e)),
Err(ConnectError::Transport(e)) => return Err(Connect::Unreachable(e)),
// `ConnectError` is non-exhaustive: a failure it adds later did not reach the app either.
Err(other) => return Err(Connect::Unreachable(other.to_string())),
}
}
}
/// The error a failed connection reports; `will_retry` says the next call connects again.
fn connect_error(&self, why: Connect, will_retry: bool) -> String {
match why {
Connect::Unreachable(e) => {
let retry = if will_retry { "; will retry on each call" } else { "" };
format!("WordCraft app at {} is not reachable: {e}{retry}", self.addr)
}
Connect::Refused(e) => format!(
"unauthorized: the WordCraft app at {} refused the control token ({e}); it came from {} or the app's token file",
self.addr,
env_names().token
),
Connect::Token(e) => e,
}
}
/// One request and its reply. A request that was not sent, or one that only reads, is tried
/// once more on a new connection (the app may have restarted; a new connection also reads
/// the token again). A mutation whose outcome is unknown is never sent again: it may have run.
fn exchange(&mut self, method: &str, params: &Value) -> Result<Value, String> {
let mut replayed = false;
loop {
if self.client.is_none() {
self.reconnect().map_err(|c| self.connect_error(c, !self.connected))?;
}
if !self.send_key {
return Err(not_app_address(&self.addr));
}
let Some(client) = self.client.as_mut() else {
return Err(format!("WordCraft app at {} is not connected", self.addr));
};
match client.call(method, params.clone()) {
Ok(v) => return Ok(v),
// An error reply: the connection is intact and the app answered.
Err(e) if !client.is_broken() => return Err(e),
Err(e) => {
self.client = None;
if !is_read_only(method, params) {
return Err(format!(
"outcome unknown: the connection to the WordCraft app at {} failed while sending `{method}` or waiting for its reply ({e}); it may have been executed, so it is not sent again. Inspect the document to check",
self.addr
));
}
if replayed {
return Err(format!("WordCraft app at {} is not reachable: {e}", self.addr));
}
replayed = true;
}
}
}
}
}
/// Methods that only read: sending them twice does no harm.
fn is_read_only(method: &str, params: &Value) -> bool {
match method {
"document.inspect" | "engine.commands" | "ui.inspect" | "ui.parity" => true,
"ui.render" | "ui.screenshot" => params.get("path").and_then(Value::as_str).is_none(),
_ => false,
}
}
impl Backend for Remote {
fn call(&mut self, method: &str, params: Value) -> Result<Value, String> {
self.exchange(method, &params)
}
fn has_ui(&self) -> bool {
true
}
fn describe(&self) -> String {
if self.connected {
format!("connected to the WordCraft app at {}", self.addr)
} else {
format!("will connect to the WordCraft app at {} when it opens", self.addr)
}
}
}
#[cfg(test)]
mod tests {
use super::*;
use serde_json::json;
use std::io::{BufRead, BufReader, Write};
use std::net::TcpListener;
use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::mpsc::{Receiver, channel};
use std::time::Duration;
const WAIT: Duration = Duration::from_secs(5);
/// A valid control token (64 hex digits) made of one digit.
fn tok(c: char) -> String {
c.to_string().repeat(64)
}
/// Writes a token file as the app does: readable by its owner alone (the control-key reader refuses
/// a file that group or others can read).
fn write_token_file(path: &std::path::Path, contents: impl AsRef<[u8]>) {
std::fs::write(path, contents).unwrap();
#[cfg(unix)]
{
use std::os::unix::fs::PermissionsExt;
std::fs::set_permissions(path, std::fs::Permissions::from_mode(0o600)).unwrap();
}
}
fn fixed_token(t: String) -> TokenFinder {
Box::new(move |_| Ok(Token { value: t.clone(), from_file: false }))
}
#[test]
fn token_from_env_then_token_file() {
let dir = std::env::temp_dir().join(format!("wordcraft-mcp-token-{}", std::process::id()));
let _ = std::fs::remove_dir_all(&dir);
std::fs::create_dir_all(&dir).unwrap();
let path = wordcraft_control_key::key_path(&dir, 7981);
// Neither: the app has not started; the error names the variable and the file it looked for.
let Connect::Unreachable(e) = lookup_token(None, Some(&dir), Some(7981)).unwrap_err() else {
panic!("a missing token file must read as unreachable");
};
assert!(e.contains("WORDCRAFT_CONTROL_TOKEN") && e.contains(&path.display().to_string()), "{e}");
// The token file, trimmed; an empty variable does not count.
write_token_file(&path, format!(" {}\n", tok('a')));
let file = Token { value: tok('a'), from_file: true };
assert_eq!(lookup_token(None, Some(&dir), Some(7981)).unwrap(), file);
assert_eq!(lookup_token(Some(" ".into()), Some(&dir), Some(7981)).unwrap(), file);
// The variable wins.
let env = Token { value: tok('b'), from_file: false };
assert_eq!(lookup_token(Some(format!(" {} ", tok('b'))), Some(&dir), Some(7981)).unwrap(), env);
assert_eq!(lookup_token(Some(tok('b')), None, None).unwrap(), env);
// Read again every time: the app writes a new token at every start.
write_token_file(&path, tok('c'));
assert_eq!(lookup_token(None, Some(&dir), Some(7981)).unwrap().value, tok('c'));
// Another port, another file.
assert!(lookup_token(None, Some(&dir), Some(7982)).is_err());
let _ = std::fs::remove_dir_all(&dir);
}
#[test]
fn key_only_for_the_apps_address() {
let peer = |s: &str| s.parse::<SocketAddr>().unwrap();
for (addr, at) in [
("127.0.0.1:7981", "127.0.0.1:7981"),
("[::ffff:127.0.0.1]:7981", "[::ffff:127.0.0.1]:7981"),
("localhost:7981", "127.0.0.1:7981"),
("LocalHost:7981", "127.0.0.1:7981"),
] {
assert!(may_send_key(addr, peer(at)), "{addr} at {at}");
}
for (addr, at) in [
("192.0.2.20:7981", "192.0.2.20:7981"),
("10.0.0.7:7981", "10.0.0.7:7981"),
("[fe80::1]:7981", "[fe80::1]:7981"),
("0.0.0.0:7981", "127.0.0.1:7981"),
// Loopback addresses the app never binds: another local user's listener (#3699).
("127.0.0.2:7981", "127.0.0.2:7981"),
("[::1]:7981", "[::1]:7981"),
("localhost:7981", "[::1]:7981"),
("127.0.0.1:7981", "127.0.0.2:7981"),
// Host names other than localhost: even when they lead to this machine.
("workstation:7981", "127.0.1.1:7981"),
("example.org:7981", "93.184.215.14:7981"),
("localhost.example.org:7981", "127.0.0.1:7981"),
// `localhost` that does not lead to a loopback address.
("localhost:7981", "192.0.2.20:7981"),
] {
assert!(!may_send_key(addr, peer(at)), "{addr} at {at}");
}
}
#[test]
fn localhost_connects_to_the_apps_address_only() {
// Not the resolver's list, which may put ::1 (where anyone can listen) first.
let at: SocketAddr = "127.0.0.1:7981".parse().unwrap();
assert_eq!(targets("localhost:7981").unwrap(), vec![at]);
assert_eq!(targets("LOCALHOST:7981").unwrap(), vec![at]);
assert_eq!(targets("127.0.0.1:7981").unwrap(), vec![at]);
assert_eq!(targets("[::1]:7981").unwrap(), vec!["[::1]:7981".parse::<SocketAddr>().unwrap()]);
}
/// A stand-in for the app on 127.0.0.1.
struct Fake {
port: u16,
/// Every request line except `auth`.
seen: Receiver<Value>,
/// The token of every `auth` frame.
tokens: Receiver<String>,
}
/// An `auth` frame is accepted when `accept(token)`; refused, the connection closes. Every
/// other request line gets `answer(request)`: a reply and whether to close the connection
/// after it, or `None` to close it without a reply (the app quit).
fn fake_app(
accept: impl Fn(&str) -> bool + Send + Sync + 'static,
answer: impl Fn(&Value) -> Option<(Value, bool)> + Send + Sync + 'static,
) -> Fake {
let listener = TcpListener::bind(("127.0.0.1", 0)).unwrap();
let port = listener.local_addr().unwrap().port();
let (seen_tx, seen) = channel();
let (token_tx, tokens) = channel();
let (accept, answer) = (Arc::new(accept), Arc::new(answer));
std::thread::spawn(move || {
for stream in listener.incoming().flatten() {
let (seen_tx, token_tx, accept, answer) = (seen_tx.clone(), token_tx.clone(), accept.clone(), answer.clone());
std::thread::spawn(move || {
let mut out = stream.try_clone().unwrap();
for line in BufReader::new(stream).lines() {
let Ok(req) = serde_json::from_str::<Value>(&line.unwrap_or_default()) else { return };
let (mut reply, close) = if req["method"] == "auth" {
let token = req["params"]["token"].as_str().unwrap_or("").to_string();
let ok = accept(&token);
let _ = token_tx.send(token);
if ok {
(json!({"ok": true, "result": {"authenticated": true}}), false)
} else {
(json!({"ok": false, "error": "authentication required"}), true)
}
} else {
let _ = seen_tx.send(req.clone());
let Some(r) = answer(&req) else { return };
r
};
reply["id"] = req["id"].clone();
if writeln!(out, "{reply}").is_err() || close {
return;
}
}
});
}
});
Fake { port, seen, tokens }
}
fn ok(result: i64) -> Option<(Value, bool)> {
Some((json!({"ok": true, "result": result}), false))
}
#[test]
fn sends_the_token_to_loopback() {
let app = fake_app(|_| true, |_| ok(7));
for host in ["127.0.0.1", "localhost"] {
let mut r = Remote::connect_with(&format!("{host}:{}", app.port), fixed_token(tok('1'))).unwrap();
assert!(r.key_warning().is_none(), "{host}");
assert_eq!(r.call("document.inspect", json!({})).unwrap(), json!(7));
assert_eq!(app.tokens.recv_timeout(WAIT).unwrap(), tok('1'), "{host}");
}
}
#[test]
fn a_lazy_remote_serves_once_the_app_opens() {
// The app is not running, so it has written no token file: the call fails, but the server
// stays up and says it will retry.
let dir = std::env::temp_dir().join(format!("wordcraft-mcp-lazy-{}", std::process::id()));
let _ = std::fs::remove_dir_all(&dir);
std::fs::create_dir_all(&dir).unwrap();
let mut r = Remote::lazy("127.0.0.1:1");
let settings = dir.clone();
r.find_token = Box::new(move |addr| lookup_token(None, Some(&settings), port_of(addr)));
let e = r.call("document.inspect", json!({})).unwrap_err();
assert!(e.contains("not reachable") && e.contains("will retry"), "{e}");
assert!(r.describe().contains("will connect to"));
// The app opens later and writes its token file: the next call connects and answers.
let app = fake_app(|_| true, |_| ok(7));
write_token_file(&wordcraft_control_key::key_path(&dir, app.port), tok('1'));
r.addr = format!("127.0.0.1:{}", app.port);
assert_eq!(r.call("document.inspect", json!({})).unwrap(), json!(7));
assert!(r.key_warning().is_none());
assert_eq!(app.tokens.recv_timeout(WAIT).unwrap(), tok('1'));
assert!(r.describe().contains("connected to"));
let _ = std::fs::remove_dir_all(&dir);
}
#[test]
fn reads_the_token_again_on_a_new_connection() {
// The app restarted with a new token: the old one is refused, the file is read again.
let app = fake_app(|t| t == tok('b'), |_| ok(1));
let reads = Arc::new(AtomicUsize::new(0));
let n = reads.clone();
let finder: TokenFinder =
Box::new(move |_| Ok(Token { value: if n.fetch_add(1, Ordering::SeqCst) == 0 { tok('a') } else { tok('b') }, from_file: true }));
let mut r = Remote::connect_with(&format!("127.0.0.1:{}", app.port), finder).unwrap();
assert_eq!(app.tokens.recv_timeout(WAIT).unwrap(), tok('a'));
assert_eq!(app.tokens.recv_timeout(WAIT).unwrap(), tok('b'));
assert_eq!(r.call("document.inspect", json!({})).unwrap(), json!(1));
// The new token is kept for the next requests on the same connection.
assert_eq!(r.call("document.inspect", json!({})).unwrap(), json!(1));
assert_eq!(reads.load(Ordering::SeqCst), 2);
// The app quits mid-session (connection closed): the retry authenticates with the token
// read again.
let calls = Arc::new(AtomicUsize::new(0));
let c = calls.clone();
let app = fake_app(|_| true, move |_| if c.fetch_add(1, Ordering::SeqCst) == 1 { None } else { ok(1) });
let reads = Arc::new(AtomicUsize::new(0));
let n = reads.clone();
let finder: TokenFinder = Box::new(move |_| Ok(Token { value: tok(['a', 'b', 'c'][n.fetch_add(1, Ordering::SeqCst) % 3]), from_file: true }));
let mut r = Remote::connect_with(&format!("127.0.0.1:{}", app.port), finder).unwrap();
r.call("document.inspect", json!({})).unwrap();
assert_eq!(r.call("document.inspect", json!({})).unwrap(), json!(1));
let tokens: Vec<String> = app.tokens.try_iter().collect();
assert_eq!(tokens, vec![tok('a'), tok('b')]);
}
#[test]
fn no_token_for_other_hosts_and_a_clear_error() {
// A LAN address: the token must not be read, and nothing is sent.
let finder: TokenFinder = Box::new(|_| Err(Connect::Token("the token must not be read for another host".to_string())));
let mut r = Remote::connect_with("192.0.2.20:7981", finder).unwrap();
assert!(r.key_warning().is_some_and(|w| w.contains("not the app's address")));
let e = r.call("document.inspect", json!({})).unwrap_err();
assert!(e.contains("not the app's address") && e.contains("not sent"), "{e}");
}
#[test]
fn a_mutation_with_a_lost_reply_is_not_sent_again() {
// The app runs the request, then the connection drops without a reply.
let app = fake_app(|_| true, |_| None);
let mut r = Remote::connect_with(&format!("127.0.0.1:{}", app.port), fixed_token(tok('1'))).unwrap();
let e = r.call("engine.execute", json!({"command": "text.insert", "params": {"text": "x"}})).unwrap_err();
assert!(e.contains("outcome unknown"), "{e}");
assert_eq!(app.seen.recv_timeout(WAIT).unwrap()["method"], "engine.execute");
std::thread::sleep(Duration::from_millis(200));
assert!(app.seen.try_recv().is_err(), "the mutation was sent a second time");
}
#[test]
fn a_read_with_a_lost_reply_is_sent_again() {
let n = Arc::new(AtomicUsize::new(0));
let app = fake_app(|_| true, move |_| if n.fetch_add(1, Ordering::SeqCst) == 0 { None } else { ok(3) });
let mut r = Remote::connect_with(&format!("127.0.0.1:{}", app.port), fixed_token(tok('1'))).unwrap();
assert_eq!(r.call("document.inspect", json!({})).unwrap(), json!(3));
assert_eq!(app.seen.try_iter().count(), 2);
}
#[test]
fn image_exports_with_a_lost_reply_are_not_replayed_but_in_memory_reads_are() {
for method in ["ui.render", "ui.screenshot"] {
for path in [json!("out.png"), json!(""), Value::Null] {
let count = Arc::new(AtomicUsize::new(0));
let n = count.clone();
let app = fake_app(|_| true, move |_| if n.fetch_add(1, Ordering::SeqCst) == 0 { None } else { ok(3) });
let mut r = Remote::connect_with(&format!("127.0.0.1:{}", app.port), fixed_token(tok('1'))).unwrap();
let result = r.call(method, json!({"path": path}));
if path.is_string() {
assert!(result.unwrap_err().contains("outcome unknown"));
assert_eq!(count.load(Ordering::SeqCst), 1);
} else {
assert_eq!(result.unwrap(), json!(3));
assert_eq!(count.load(Ordering::SeqCst), 2);
}
assert_eq!(app.seen.try_iter().count(), if path.is_string() { 1 } else { 2 });
}
assert!(is_read_only(method, &json!({})), "no path means PNG in the reply");
}
}
#[test]
fn a_mutation_not_sent_goes_out_on_a_new_connection() {
let app = fake_app(|_| true, |_| ok(1));
let mut r = Remote::connect_with(&format!("127.0.0.1:{}", app.port), fixed_token(tok('1'))).unwrap();
r.client = None;
assert_eq!(r.call("engine.execute", json!({"command": "file.new"})).unwrap(), json!(1));
assert_eq!(app.seen.try_iter().count(), 1);
}
}
+3 -1
View File
@@ -9,7 +9,9 @@ pub mod backend;
pub mod server;
pub mod tools;
pub use backend::{Backend, Remote};
pub use backend::Backend;
#[cfg(not(target_arch = "wasm32"))]
pub use backend::Remote;
pub use server::Server;
use std::sync::Arc;
+5 -1
View File
@@ -1,7 +1,9 @@
//! WordCraft's MCP server: the shared `craft_mcp_server` core (JSON-RPC framing, the lifecycle,
//! `tools/*` and `resources/*`) around WordCraft's own tools, resources and instructions.
use std::io::{BufRead, Read, Write};
#[cfg(test)]
use std::io::Read;
use std::io::{BufRead, Write};
use craft_mcp_server::{Contents, Info, Options, Tools};
use serde_json::{Value, json};
@@ -29,6 +31,7 @@ pub const COMMANDS_URI: &str = "wordcraft://commands";
pub const MAX_REQUEST_LINE: usize = 1 << 20;
/// One bounded line read.
#[cfg(test)]
pub(crate) enum BoundedLine {
Eof,
Line(String),
@@ -38,6 +41,7 @@ pub(crate) enum BoundedLine {
/// Read one line of at most `max` bytes (excluding the newline) without buffering more than
/// `max + 1` bytes; an over-long line is skipped up to its newline.
#[cfg(test)]
pub(crate) fn read_bounded_line(reader: &mut impl BufRead, max: usize) -> std::io::Result<BoundedLine> {
let mut buf = Vec::new();
reader.by_ref().take(max as u64 + 1).read_until(b'\n', &mut buf)?;
+14 -1
View File
@@ -112,7 +112,6 @@ fn script() -> Vec<Step> {
br#"{"jsonrpc":"2.0","id":1,"error":{"code":1,"message":"x"}}"#,
br#"{"jsonrpc":"2.0","id":7}"#,
br#"{"jsonrpc":"2.0","id":7,"method":5}"#,
br#"{"id":8,"method":"ping"}"#,
br#"[]"#,
br#"42"#,
br#""text""#,
@@ -316,6 +315,20 @@ fn prompts_list_is_empty_and_prompts_get_is_not_found() {
assert_eq!(r["result"]["capabilities"], json!({"tools": {"listChanged": false}, "resources": {"listChanged": false}}));
}
/// Difference 7 (accepted, stricter): a request without `"jsonrpc": "2.0"` is refused as an
/// invalid request (-32600, no id) before dispatch; the old server answered it.
#[test]
fn a_request_without_the_jsonrpc_version_is_refused() {
let mut old = oracle::Server::new(Box::new(Headless::default()));
let mut new = Server::new(Box::new(Headless::default()));
let line = r#"{"id":8,"method":"ping"}"#;
let o: Value = serde_json::from_str(&old.handle_line(line).unwrap()).unwrap();
let n: Value = serde_json::from_str(&new.handle_line(line).unwrap()).unwrap();
assert_eq!(o["result"], json!({}));
assert_eq!(n["error"]["code"], -32600);
assert_eq!(n["id"], Value::Null);
}
/// Difference 4 (accepted hardening): a batch of more than 1000 messages is refused whole; the old
/// server answered every member.
#[test]
+8 -2
View File
@@ -3270,7 +3270,13 @@ fn chart_and_equation_text_keep_their_pdf_bytes() {
shown.insert(String::from_utf16_lossy(&units));
}
}
// The equation's x is the mathematical italic 𝑥 when the math face has that alphabet. A host
// without a math font (no STIX Two Math, Latin Modern Math…) sets math in a text face that
// lacks it, and the layout draws the plain letter slanted instead (`math/nodes.rs`), which the
// body's "x" already maps.
let (math_face, _) = wordcraft_fonts::math::resolve_math("Cambria Math");
let equation_x = if math_face.covers('\u{1D465}') { "\u{1D465}" } else { "x" };
let expected: std::collections::BTreeSet<String> =
["B", "o", "d", "y", " ", "t", "e", "x", "R", "v", "n", "u", "2", "0", "4", "+", "1", "\u{1D465}"].into_iter().map(String::from).collect();
assert_eq!(shown, expected);
["B", "o", "d", "y", " ", "t", "e", "x", "R", "v", "n", "u", "2", "0", "4", "+", "1", equation_x].into_iter().map(String::from).collect();
assert_eq!(shown, expected, "math face: {}", math_face.family);
}
+23 -12
View File
@@ -9,14 +9,14 @@ description = "WordCraft egui front end (Word-style ribbon UI); swappable: nothi
workspace = true
[dependencies]
craft-ui = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a" }
# Interface translations: lookup, fallback, plurals and system-locale matching over the craft-i18n
# catalogs that `build.rs` embeds from `CRAFT_I18N_DIR` (storytold/craft-i18n, pinned in
# `craft-i18n.rev`). Same craft-libs rev as craft-ui; it brings lazy per-locale parsing
# (storytold/craft-libs#247), ICU4X plural rules and bidi isolates around inserted values.
craft-i18n = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a" }
# One native window per open document: the window list, the Window menu and the egui viewports.
craft-window = { git = "https://github.com/storytold/craft-libs", rev = "93dac78c93a7f1fd66e2022edeb089233b1dc45a", features = ["egui"] }
# The craft libraries through their one facade (`craft::ui`, `craft::i18n`, `craft::window`, `craft::update`, ...),
# at the workspace's one craft-libs pin.
craft = { workspace = true, features = [
"ui", "automation", "codepage", "keymap", "platform", "quit", "settings",
"color", "color-ui", "control", "draw", "font-manager", "gpu", "menu", "pages", "print", "review", "table", "text",
"text-find", "web-api", "web-host", "window",
] }
craft-fonts-build = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38" }
wordcraft-geom = { workspace = true, features = ["image"] }
wordcraft-doc = { workspace = true }
wordcraft-fonts = { workspace = true }
@@ -35,6 +35,11 @@ image = { workspace = true }
# The system's preferred interface languages (#8) and region (#838). Native: OS APIs; wasm:
# the browser's languages (`js`).
sys-locale = { version = "0.3", features = ["js"] }
# `Prefs::merge_rule`'s key functions read the settings store's TOML values; the version is the one
# `craft::settings` builds, so the types are the same.
toml_edit = "0.25"
# Comment dates are parsed with it (canvas/balloons.rs); the native clock is added below.
chrono = { workspace = true }
# Linux only, where winit reports no system theme: the desktop portal's light/dark answer (see
# `desktop_theme.rs`). Already in the tree, with these features, through egui's own accessibility
@@ -45,7 +50,8 @@ zbus = "=5.19.0"
# Comment times in the user's own time zone (`local_time.rs`); the web app asks the browser.
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
chrono = { version = "0.4.45", default-features = false, features = ["clock"] }
craft-update = { workspace = true }
# The native file dialogs (rfd) and the self-updater (ureq, ring) do not build for wasm32.
craft = { workspace = true, features = ["dialogs", "update"] }
[target.'cfg(target_arch = "wasm32")'.dependencies]
# The browser clock (`SystemTime::now()`/`Instant::now()` panic on wasm32).
@@ -61,10 +67,15 @@ wordcraft-engine = { workspace = true, features = ["test-support"] }
egui = { workspace = true, features = ["default_fonts", "monochrome_emoji_fonts"] }
egui_kittest = { workspace = true, features = ["wgpu", "snapshot"] }
craft-zip = { workspace = true }
# #2726's regression test: the consumer the Windows adapter runs, fed with our updates.
# Pinned to the version egui already brings into the tree, so nothing is built twice.
accesskit_consumer = "=0.39.1"
# The window tests' frame driver for child viewports; it is not part of the `craft` facade.
craft-ui-test-kit = { workspace = true }
[build-dependencies]
craft-fonts-build = { git = "https://github.com/storytold/craft-libs", rev = "243d68e12d05e89122db6d154924bf1992e10d38", features = ["subset"] }
serde_json = { workspace = true }
toml = "1"
# The headless screenshot tool is a program, so `cl build ui_shot` (a test build) runs its main.
[[example]]
name = "ui_shot"
harness = false
+28 -5
View File
@@ -30,17 +30,37 @@ fn main() {
if let Err(e) = std::fs::write(&out, generate(&json, &people)) {
println!("cargo::warning=writing {}: {e}", out.display());
}
let (table, catalogs) = craft_i18n();
let out = out.with_file_name("craft_i18n.rs");
if let Err(e) = std::fs::write(&out, craft_i18n()) {
if let Err(e) = std::fs::write(&out, table) {
println!("cargo::error=writing {}: {e}", out.display());
}
embed_fonts(catalogs);
}
/// Write `craft_fonts.rs`: the craft-fonts faces (from `CRAFT_FONTS_DIR`) with the CJK interface faces
/// cut to the characters of the embedded catalogs. A web build has a size budget, so it embeds only
/// the Japanese interface face.
fn embed_fonts(catalogs: Vec<std::path::PathBuf>) {
println!("cargo::rerun-if-changed=build.rs");
let wasm = craft_fonts_build::target_is_wasm();
// The web build embeds only the cut Japanese interface face, which needs a craft-fonts checkout whose
// manifest marks interface faces (`role` `ui`); with an older one it embeds none and falls back to the
// Latin faces, so `CRAFT_FONTS_REQUIRED` binds the native build only.
let embed = craft_fonts_build::Embed::new().subset_to(catalogs).filter(move |face| !wasm || face.has_script("Jpan"));
let embed = if wasm { embed.required(false) } else { embed };
let embedded = embed.write("craft_fonts.rs");
if let Err(e) = embedded {
println!("cargo::error={e}");
}
}
/// The catalog this app reads in each locale: `locales/<locale>/wordcraft.tsv`.
const APP_CATALOG: &str = "wordcraft.tsv";
/// `CRAFT_I18N` from `CRAFT_I18N_DIR`: the `Embedded` list the craft-i18n crate reads.
fn craft_i18n() -> String {
/// `CRAFT_I18N` from `CRAFT_I18N_DIR`: the `Embedded` list the craft-i18n crate reads, and the
/// catalog files it names (`wordcraft.tsv` and `common.tsv`).
fn craft_i18n() -> (String, Vec<std::path::PathBuf>) {
println!("cargo::rerun-if-env-changed=CRAFT_I18N_DIR");
println!("cargo::rerun-if-env-changed=CRAFT_I18N_REQUIRED");
let required = std::env::var("CRAFT_I18N_REQUIRED").is_ok_and(|v| v.trim() == "1");
@@ -62,14 +82,17 @@ fn craft_i18n() -> String {
}
};
let mut o = String::from("/// (locale, shared catalog, WordCraft's catalog), one entry per locale; `\"\"` for a missing file.\n");
o.push_str("pub static CRAFT_I18N: &craft_i18n::Embedded = &[\n");
o.push_str("pub static CRAFT_I18N: &craft::i18n::Embedded = &[\n");
let mut catalogs = Vec::new();
for (code, shared, app) in entries {
catalogs.extend(shared.iter().cloned());
catalogs.push(app.clone());
// `{:?}` escapes the path (Windows backslashes) as a Rust string literal.
let shared = shared.map_or_else(|| "\"\"".to_string(), |p| format!("include_str!({p:?})"));
let _ = writeln!(o, " ({code:?}, {shared}, include_str!({app:?})),");
}
o.push_str("];\n");
o
(o, catalogs)
}
/// A locale's code, its `common.tsv` if any, and its app catalog.
+52 -33
View File
@@ -4,31 +4,45 @@
//!
//! `cargo run --release -p wordcraft-ui-egui --example perf_probe -- doc.docx [block]`
//!
//! A frame's time is the CPU time of `WordApp::logic` + `ui` for that frame (layout, page
//! A frame's time is the CPU time of one harness step (`WordApp::logic` + `ui`: layout, page
//! rasterisation, widgets). What the user sees adds the wait for the next frame and the
//! presentation on screen (up to one display refresh).
//! presentation on screen (up to one display refresh). Input goes in through control requests,
//! as an agent sends it.
use std::sync::mpsc::Sender;
use std::time::Instant;
use serde_json::json;
use craft::automation::control::{ControlChannel, ControlRequest};
use serde_json::{Value, json};
use wordcraft_engine::Session;
use wordcraft_ui_egui::{Services, WordApp};
static READY: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
/// Applies the harness's pending raw input, runs one full app frame, and returns its wall-clock
type Harness<'a> = egui_kittest::Harness<'a, WordApp>;
/// Queues a control request; the app answers it in the logic phase of a following frame.
fn request(tx: &Sender<ControlRequest>, method: &str, params: Value) {
let (req, _reply) = ControlRequest::new(method, params);
tx.send(req).expect("the app is running");
}
/// Queues a command through `engine.execute`.
fn exec(tx: &Sender<ControlRequest>, command: &str, params: Value) {
request(tx, "engine.execute", json!({"command": command, "params": params}));
}
/// Hands the app's frame input to the runtime, runs one full app frame and returns its wall-clock
/// duration in milliseconds.
fn step(h: &mut egui_kittest::Harness<'_, WordApp>) -> f64 {
let mut raw = std::mem::take(h.input_mut());
fn step(h: &mut Harness<'_>) -> f64 {
let ctx = h.ctx.clone();
h.state_mut().raw_input_hook(&ctx, &mut raw);
*h.input_mut() = raw;
craft::ui::shell::embed::before_input(&ctx, |out| h.state_mut().frame_input(out));
let t = Instant::now();
h.step();
t.elapsed().as_secs_f64() * 1000.0
}
fn stats(v: &[f64]) -> serde_json::Value {
fn stats(v: &[f64]) -> Value {
let mut s = v.to_vec();
s.sort_by(f64::total_cmp);
let at = |q: f64| s.get(((s.len() as f64 - 1.0) * q).round() as usize).copied().unwrap_or(0.0);
@@ -44,7 +58,8 @@ fn main() {
let mut session = Session::new(wordcraft_doc::Document::new());
session.run("file.open", &json!({"path": path})).expect("open");
let open_ms = t_open.elapsed().as_secs_f64() * 1000.0;
let app = WordApp::new(session, Services::default());
let (tx, rx) = std::sync::mpsc::channel::<ControlRequest>();
let app = WordApp::new(session, Services::default()).with_control(ControlChannel::new(rx));
let mut h =
egui_kittest::Harness::builder().with_size(egui::vec2(1440.0, 900.0)).with_pixels_per_point(2.0).with_max_steps(1_000_000).build_ui_state(
|ui, app: &mut WordApp| {
@@ -57,6 +72,14 @@ fn main() {
},
app,
);
// PLAN(app-hub): craft-ui `testing` feature and craft-automation in dev-dependencies
// PLAN(shell-w11): assumed `wordcraft_ui_egui::ui_fonts` and `i18n::Lang::EN`
if let Err(error) =
craft::ui::shell::embed::install(&h.ctx, craft::ui::testing::install_spec(), &wordcraft_ui_egui::ui_fonts(wordcraft_ui_egui::i18n::Lang::EN))
{
eprintln!("installing the UI runtime failed: {error:?}");
std::process::exit(1);
}
READY.store(true, std::sync::atomic::Ordering::Relaxed);
let first: Vec<f64> = (0..6).map(|_| step(&mut h)).collect();
let mut out =
@@ -67,24 +90,29 @@ fn main() {
let s = &h.state().session;
s.doc.body.iter().enumerate().filter_map(|(i, b)| b.as_para().map(|p| (i, p.len()))).max_by_key(|(_, l)| *l).map(|(i, _)| i).unwrap_or(0)
});
let typing = |h: &mut egui_kittest::Harness<'_, WordApp>, pos: serde_json::Value| -> serde_json::Value {
h.state_mut().session.run("caret.set", &json!({"pos": pos})).ok();
h.state_mut().canvas.want_focus = true;
let typing = |h: &mut Harness<'_>, pos: Value| -> Value {
// One click gives the page the keyboard; the caret is then put where the probe types.
request(&tx, "ui.click", json!({"x": 720.0, "y": 500.0}));
for _ in 0..3 {
step(h);
}
exec(&tx, "caret.set", json!({"pos": pos}));
let ctx = h.ctx.clone();
h.state_mut().canvas.focus_page(&ctx);
for _ in 0..3 {
step(h);
}
let mut frames = Vec::new();
let (mut lay, mut ren) = (Vec::new(), Vec::new());
let mut lay = Vec::new();
for _ in 0..40 {
h.input_mut().events.push(egui::Event::Text("a".into()));
request(&tx, "ui.type", json!({"text": "a"}));
frames.push(step(h));
// the frame after (relayout of a long paragraph may finish there)
frames.push(step(h));
lay.push(h.state_mut().session.layout().ms);
ren.push(h.state().canvas.render_ms);
}
let typed = frames.chunks(2).map(|c| c[0] + c[1]).collect::<Vec<_>>();
json!({"frame_with_key_ms": stats(&frames.iter().step_by(2).copied().collect::<Vec<_>>()), "two_frames_ms": stats(&typed), "layout_ms": stats(&lay), "render_ms": stats(&ren)})
json!({"frame_with_key_ms": stats(&frames.iter().step_by(2).copied().collect::<Vec<_>>()), "two_frames_ms": stats(&typed), "layout_ms": stats(&lay)})
};
let mid = h.state().session.doc.body.get(doc_block).and_then(|b| b.as_para()).map(|p| p.len() / 2).unwrap_or(0);
// a char boundary at or before the middle
@@ -100,21 +128,14 @@ fn main() {
}
// Scrolling: mouse wheel (120 pt notches) and trackpad (20 pt gestures) over the canvas.
let scroll = |h: &mut egui_kittest::Harness<'_, WordApp>, dy: f32, n: usize| -> serde_json::Value {
h.state_mut().session.run("caret.docStart", &json!({})).ok();
let scroll = |h: &mut Harness<'_>, dy: f32, n: usize| -> Value {
exec(&tx, "caret.docStart", json!({}));
for _ in 0..3 {
step(h);
}
let mut f = Vec::new();
for _ in 0..n {
h.input_mut().events.push(egui::Event::PointerMoved(egui::pos2(720.0, 500.0)));
h.input_mut().events.push(egui::Event::MouseWheel {
unit: egui::MouseWheelUnit::Point,
delta: egui::vec2(0.0, dy),
phase: egui::TouchPhase::Move,
modifiers: egui::Modifiers::NONE,
source: egui::MouseWheelSource::Unknown,
});
request(&tx, "ui.wheel", json!({"x": 720.0, "y": 500.0, "dy": dy}));
f.push(step(h));
}
json!({"frame_ms": stats(&f), "frames_over_33ms": f.iter().filter(|x| **x > 33.0).count(), "frames_over_16ms": f.iter().filter(|x| **x > 16.7).count()})
@@ -125,7 +146,7 @@ fn main() {
// Zoom, ribbon tabs, resize: the frame after the change.
let mut zoom = Vec::new();
for z in [50, 75, 100, 150, 200, 100] {
h.state_mut().session.run("view.zoom", &json!({"value": z})).ok();
exec(&tx, "view.zoom", json!({"value": z}));
let a = step(&mut h);
let b = step(&mut h);
zoom.push(json!({"zoom": z, "frame_ms": (a * 10.0).round() / 10.0, "next_ms": (b * 10.0).round() / 10.0}));
@@ -133,7 +154,7 @@ fn main() {
out["zoom"] = json!(zoom);
let mut tabs = Vec::new();
for t in ["Insert", "Draw", "Design", "Layout", "References", "Mailings", "Review", "View", "Home"] {
h.state_mut().execute("ui.tab", json!({"tab": t})).ok();
exec(&tx, "ui.tab", json!({"tab": t}));
tabs.push(step(&mut h));
}
out["ribbon_tab_ms"] = stats(&tabs);
@@ -145,11 +166,9 @@ fn main() {
out["resize_ms"] = stats(&rs);
// Accept all (if the document has tracked changes).
if !h.state().session.doc.revisions.is_empty() {
let t = Instant::now();
h.state_mut().session.run("review.acceptAll", &json!({})).ok();
let cmd = t.elapsed().as_secs_f64() * 1000.0;
exec(&tx, "review.acceptAll", json!({}));
let f = step(&mut h);
out["accept_all"] = json!({"command_ms": (cmd * 10.0).round() / 10.0, "frame_ms": (f * 10.0).round() / 10.0});
out["accept_all"] = json!({"frame_ms": (f * 10.0).round() / 10.0});
}
println!("{out}");
}
+15 -7
View File
@@ -16,8 +16,9 @@
//! folder rather than the person's, or in `"storeDir"` given on the same line (with
//! `CRAFT_LANGUAGE_PACK_INDEX` for a local pack index).
use craft::automation::control::{ControlChannel, ControlRequest};
use wordcraft_engine::Session;
use wordcraft_ui_egui::{ControlRequest, Services, WordApp};
use wordcraft_ui_egui::{Services, WordApp};
static READY: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
@@ -52,8 +53,7 @@ fn main() {
}
None => {}
}
let mut app = WordApp::new(Session::new(doc), Services::default()).with_control(rx);
app.integrated_titlebar = true;
let mut app = WordApp::new(Session::new(doc), Services::default()).with_control(ControlChannel::new(rx));
if lines.first().is_some_and(|l| l.get("startScreen").is_some()) {
app.start_screen();
}
@@ -73,6 +73,16 @@ fn main() {
app,
);
harness.input_mut().max_texture_side = Some(8192);
// PLAN(app-hub): craft-ui `testing` feature and craft-automation in dev-dependencies
// PLAN(shell-w11): assumed `wordcraft_ui_egui::ui_fonts` and `i18n::Lang::EN`
if let Err(error) = craft::ui::shell::embed::install(
&harness.ctx,
craft::ui::testing::install_spec(),
&wordcraft_ui_egui::ui_fonts(wordcraft_ui_egui::i18n::Lang::EN),
) {
eprintln!("installing the UI runtime failed: {error:?}");
std::process::exit(1);
}
READY.store(true, std::sync::atomic::Ordering::Relaxed);
step_n(&mut harness, 6);
for l in lines {
@@ -111,12 +121,10 @@ fn main() {
}
}
/// Applies the harness's pending raw input and advances one UI frame.
/// Hands the app's frame input to the runtime and advances one UI frame.
fn step(harness: &mut egui_kittest::Harness<'_, WordApp>) {
let mut raw = std::mem::take(harness.input_mut());
let ctx = harness.ctx.clone();
harness.state_mut().raw_input_hook(&ctx, &mut raw);
*harness.input_mut() = raw;
craft::ui::shell::embed::before_input(&ctx, |out| harness.state_mut().frame_input(out));
harness.step();
}
+5
View File
@@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<path d="M4 2 L11 2 L15 6 L15 17 L4 17 Z" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M11 2 L11 6 L15 6" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M10 14.5 L12.5 17 L18 11" fill="none" stroke="#2E8B57" class="fixed" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 379 B

+6
View File
@@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<circle cx="10" cy="4" r="1.6" fill="#1E6FD9" class="accent"/>
<path d="M4 7 L16 7" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M10 7 L10 12 L7 17.5" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M10 12 L13 17.5" fill="none" stroke="currentColor" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 408 B

+7
View File
@@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<path d="M3 3 L17 3 L17 12.5 L12.5 17 L3 17 Z" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M12.5 17 L12.5 12.5 L17 12.5" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M6 8 L11 8" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
<path d="M8.5 5.5 L8.5 10.5" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
<path d="M6 13.5 L11 13.5" fill="none" stroke="currentColor" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 564 B

+6
View File
@@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<path d="M3 17 L11 9 L13 11 L5 19 L2.5 19.5 L3 17" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M11 9 L12.5 7.5 L14.5 9.5 L13 11 Z" fill="#1E6FD9" class="accent"/>
<path d="M15 2 L15 8" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
<path d="M12 5 L18 5" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 459 B

+7
View File
@@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<rect x="2.5" y="3" width="7" height="5" rx="1" fill="#1E6FD9" class="accent"/>
<rect x="2.5" y="12" width="7" height="5" rx="1" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M6 8 L6 12" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M14.5 10.5 L14.5 17.5" fill="none" stroke="#2E8B57" class="fixed" stroke-width="1.25"/>
<path d="M11 14 L18 14" fill="none" stroke="#2E8B57" class="fixed" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 549 B

+7
View File
@@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<path d="M3 5 L13 5" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M3 9 L13 9" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M3 13 L13 13" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M15 11 L15 17" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
<path d="M12 14 L18 14" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 514 B

+7
View File
@@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<rect x="3" y="3" width="6" height="6" rx="1" fill="none" stroke="currentColor" stroke-width="1.25"/>
<rect x="11" y="3" width="6" height="6" rx="1" fill="none" stroke="currentColor" stroke-width="1.25"/>
<rect x="3" y="11" width="6" height="6" rx="1" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M14 11 L14 17" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
<path d="M11 14 L17 14" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 589 B

+4
View File
@@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<rect x="2.5" y="6" width="15" height="8" rx="1" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M7.5 8.3 L6 10 L7.5 11.7 M9.3 8.3 L7.8 10 L9.3 11.7 M10.7 8.3 L12.2 10 L10.7 11.7 M12.5 8.3 L14 10 L12.5 11.7" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
</svg>

After

Width:  |  Height:  |  Size: 433 B

+5
View File
@@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<path d="M3 2 L3 18" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
<rect x="4.5" y="4" width="10.5" height="4" rx="1" fill="none" stroke="currentColor" stroke-width="1.25"/>
<rect x="4.5" y="11" width="6.5" height="4" rx="1" fill="none" stroke="currentColor" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 398 B

+7
View File
@@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<path d="M3 4 L17 4" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M3 10 L17 10" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M3 16 L17 16" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M6 7 L14 7" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M6 13 L14 13" fill="none" stroke="currentColor" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 492 B

+7
View File
@@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<path d="M3 4 L17 4" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M3 10 L17 10" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M3 16 L17 16" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M3 7 L12 7" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M3 13 L12 13" fill="none" stroke="currentColor" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 492 B

+7
View File
@@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<path d="M3 4 L17 4" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M3 10 L17 10" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M3 16 L17 16" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M8 7 L17 7" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M8 13 L17 13" fill="none" stroke="currentColor" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 492 B

+8
View File
@@ -0,0 +1,8 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<rect x="3" y="2.5" width="14" height="15" rx="1" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M5.5 9 L11 9" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M5.5 11.5 L11 11.5" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M14 5 L14 15" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
<path d="M12.5 6.5 L14 5 L15.5 6.5" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
<path d="M12.5 13.5 L14 15 L15.5 13.5" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 669 B

+8
View File
@@ -0,0 +1,8 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<rect x="2.5" y="3.5" width="9" height="7.5" rx="1" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M3.5 10 L6 6.5 L8 8.5 L9 7.5 L10.5 10" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
<path d="M13.5 5 L17.5 5" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M13.5 8 L17.5 8" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M2.5 14 L17.5 14" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M2.5 17 L13 17" fill="none" stroke="currentColor" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 653 B

+4
View File
@@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<rect x="3" y="2.5" width="14" height="6.5" rx="1" fill="none" stroke="currentColor" stroke-width="1.25"/>
<rect x="3" y="11" width="14" height="6.5" rx="1" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 318 B

+6
View File
@@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<rect x="3" y="4" width="14" height="12" rx="1" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M5 10 L15 10" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
<path d="M7 8 L5 10 L7 12" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
<path d="M13 8 L15 10 L13 12" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 481 B

+5
View File
@@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<rect x="4" y="3" width="5" height="14" rx="1" fill="none" stroke="currentColor" stroke-width="1.25"/>
<rect x="9" y="3" width="4" height="14" rx="1" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
<path d="M13.5 4 L16.5 3.5 L18 16.5 L15 17 Z" fill="none" stroke="currentColor" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 415 B

+6
View File
@@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<path d="M4 2 L12 2 L16 6 L16 18 L4 18 Z" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M12 2 L12 6 L16 6" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M10 7 L10 13" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
<path d="M7 10 L13 10" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 459 B

+4
View File
@@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<rect x="5" y="9" width="10" height="8.5" rx="1" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M7 9 L7 6 L10 3 L13 6 L13 9" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 304 B

+3
View File
@@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<path d="M5.8 5.4 L10.7 5.4 C13.1 5.4 14.2 6.6 14.2 8.2 C14.2 9.3 13.6 10.1 12.7 10.5 C14 10.8 14.8 11.9 14.8 13.4 C14.8 15.4 13.4 16.5 10.9 16.5 L5.8 16.5 Z M8.1 7.3 L10.4 7.3 C11.5 7.3 12 7.8 12 8.7 C12 9.5 11.5 10 10.4 10 L8.1 10 Z M8.1 11.8 L10.7 11.8 C11.9 11.8 12.5 12.4 12.5 13.2 C12.5 14.1 11.9 14.6 10.7 14.6 L8.1 14.6 Z" fill="currentColor" fill-rule="evenodd"/>
</svg>

After

Width:  |  Height:  |  Size: 466 B

+4
View File
@@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<path d="M5.5 2.5 L14.5 2.5 L14.5 17.5 L10 13.5 L5.5 17.5 Z" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M7 4 L13 4 L13 8 L7 8 Z" fill="#1E6FD9" class="accent"/>
</svg>

After

Width:  |  Height:  |  Size: 278 B

+4
View File
@@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<path d="M4 16 L14 6 L16 8 L6 18 L3.5 18.5 L4 16" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M3 3 L11 3" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 288 B

+24
View File
@@ -0,0 +1,24 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<circle cx="3" cy="3" r="0.6" fill="currentColor"/>
<circle cx="6.5" cy="3" r="0.6" fill="currentColor"/>
<circle cx="10" cy="3" r="0.6" fill="currentColor"/>
<circle cx="13.5" cy="3" r="0.6" fill="currentColor"/>
<circle cx="17" cy="3" r="0.6" fill="currentColor"/>
<circle cx="3" cy="10" r="0.6" fill="currentColor"/>
<circle cx="6.5" cy="10" r="0.6" fill="currentColor"/>
<circle cx="10" cy="10" r="0.6" fill="currentColor"/>
<circle cx="13.5" cy="10" r="0.6" fill="currentColor"/>
<circle cx="17" cy="10" r="0.6" fill="currentColor"/>
<circle cx="3" cy="17" r="0.6" fill="currentColor"/>
<circle cx="6.5" cy="17" r="0.6" fill="currentColor"/>
<circle cx="10" cy="17" r="0.6" fill="currentColor"/>
<circle cx="13.5" cy="17" r="0.6" fill="currentColor"/>
<circle cx="17" cy="17" r="0.6" fill="currentColor"/>
<circle cx="3" cy="6.5" r="0.6" fill="currentColor"/>
<circle cx="3" cy="13.5" r="0.6" fill="currentColor"/>
<circle cx="10" cy="6.5" r="0.6" fill="currentColor"/>
<circle cx="10" cy="13.5" r="0.6" fill="currentColor"/>
<circle cx="17" cy="6.5" r="0.6" fill="currentColor"/>
<circle cx="17" cy="13.5" r="0.6" fill="currentColor"/>
<path d="M3 17 L17 17" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

+7
View File
@@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<path d="M4 1.5 L12 1.5 L16 5.5 L16 8.5 L4 8.5 Z" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M12 1.5 L12 5.5 L16 5.5" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M4 11.5 L12 11.5 L16 15.5 L16 18.5 L4 18.5 Z" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M12 11.5 L12 15.5 L16 15.5" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M2 10 L18 10" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 590 B

+4
View File
@@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<rect x="3" y="3" width="9" height="9" rx="1" fill="none" stroke="currentColor" stroke-width="1.25"/>
<rect x="8" y="8" width="9" height="9" rx="1" fill="#1E6FD9" class="accent"/>
</svg>

After

Width:  |  Height:  |  Size: 275 B

+8
View File
@@ -0,0 +1,8 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<circle cx="4" cy="5" r="1.4" fill="#1E6FD9" class="accent"/>
<path d="M7.5 5 L17 5" fill="none" stroke="currentColor" stroke-width="1.25"/>
<circle cx="4" cy="10" r="1.4" fill="currentColor"/>
<path d="M7.5 10 L17 10" fill="none" stroke="currentColor" stroke-width="1.25"/>
<circle cx="4" cy="15" r="1.4" fill="currentColor"/>
<path d="M7.5 15 L17 15" fill="none" stroke="currentColor" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 512 B

+4
View File
@@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<rect x="2.5" y="4" width="15" height="12" rx="1" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M5 13 L9 8 L12 11 L15 7" fill="none" stroke="#1E6FD9" class="accent" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 301 B

+6
View File
@@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20">
<rect x="3" y="2.5" width="14" height="9" rx="1" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M4.5 10 L8 5.5 L11 10 Z" fill="#1E6FD9" class="accent"/>
<path d="M3 15 L13 15" fill="none" stroke="currentColor" stroke-width="1.25"/>
<path d="M3 17.5 L13 17.5" fill="none" stroke="currentColor" stroke-width="1.25"/>
</svg>

After

Width:  |  Height:  |  Size: 432 B

Some files were not shown because too many files have changed in this diff Show More