diff options
| author | srdusr <[email protected]> | 2026-04-27 00:18:00 +0200 |
|---|---|---|
| committer | srdusr <[email protected]> | 2026-04-27 00:18:00 +0200 |
| commit | c4dc99cc3211c4dc1a461f228402be1593b883c9 (patch) | |
| tree | 10a85d60acb863ca98b7e70118dec5cda357efa6 /crates/wayland/src/desktop_menu.rs | |
| parent | 436d42da6ef61a5ea20d5102c4baed7bf0993606 (diff) | |
| download | srdwm-c4dc99cc3211c4dc1a461f228402be1593b883c9.tar.gz srdwm-c4dc99cc3211c4dc1a461f228402be1593b883c9.zip | |
Build the eight asks recovered from the previous session's transcript
The punch list was not the whole record. These are the owner's own typed
requests, read back out of the previous session's transcript rather than
guessed at, then each checked against the code before being treated as open.
Three they suspected were already done really were: dialogs already had a
Close-only titlebar, inactive dimming already existed, and the corner resize
hitbox had already been tuned.
Snap layouts on drag, asked for twice. Edge snapping worked but committed
silently on release with nothing shown first, so there was no way to know it
would happen or where. A translucent drop-target preview now follows the
drag, and throwing the pointer at a monitor's top edge drops down the
existing six-cell grid to aim at. The preview calls the same snap_zone that
end_drag does, so the two cannot disagree. Two defects found by screenshot
before landing: moving down onto the flyout closed it, and its labels
overflowed at a fixed cell width - the same "text goes out of view" fault
already fixed once for the context menu.
New File now offers real types, chosen by extension, with the de-duplication
counter placed before the extension so the file stays what it says it is.
Refresh re-reads init.lua and fires a new srd.on("refresh") handler instead
of only re-scanning the icon grid. What refresh means beyond srdwm's own
config stays the config's decision.
general.config_reload_on_write (default on) applies an edited config on save,
via an mtime sweep rather than an inotify watch: no new dependency, same
behaviour on every target, and unaffected by editors that write through a
temp file.
A real bug behind "what happens when our config fails": you lost every
keybinding. do_reload cleared the binding, handler and repeat tables before
re-executing and never restored them, so a syntax error left neither the old
config nor the new one, and the only key still working was the reload combo
nobody thinks to press. The tables are now restored on any failure and
config errors reach notify-send, not just the log.
srd.lock() and a default Mod4+Ctrl+l binding: the built-in lock screen could
not be reached from Lua at all. Native rather than shelling out, because a
lock key that shells out fails silently when the binary is not on PATH.
Default bindings added for srd.window.move and a dynamic/tiling toggle, both
of which existed with no way to reach them, plus srd.layout.get() so the
toggle reads the live workspace rather than the configured default.
Dialogs open centred, and are excluded from remembered geometry in both
directions - that table is keyed by app_id, which a dialog shares with the
window that spawned it, so dialogs inherited an unrelated position and size
and then overwrote it with their own.
theme.decorations.title_bar.button_mode (dynamic by default, or fixed) drops
the Maximize button on a window whose client pinned min == max size, where
pressing it can do nothing. Maximize is removed from the slot list rather
than skipped in place on both the render and hit-test sides, so the remaining
buttons close the gap identically; three tests pin that agreement, which is
what fails silently when it drifts.
Also: the nested backend's screencopy pass now draws both menus, the flyout
and the drag preview. Four investigations in one day started from a
screenshot missing a tier, so that pass carries an explicit list of what it
still omits and the on-screen loop points at it.
512 tests pass, clippy clean.
Diffstat (limited to 'crates/wayland/src/desktop_menu.rs')
| -rw-r--r-- | crates/wayland/src/desktop_menu.rs | 82 |
1 files changed, 79 insertions, 3 deletions
diff --git a/crates/wayland/src/desktop_menu.rs b/crates/wayland/src/desktop_menu.rs index dbbf957..dfc3a6e 100644 --- a/crates/wayland/src/desktop_menu.rs +++ b/crates/wayland/src/desktop_menu.rs @@ -23,6 +23,21 @@ pub(crate) enum DesktopMenuAction { /// "not even new file" - see `CompState::new_desktop_text_file`'s own /// doc comment. NewTextFile, + /// Creates an empty file with this extension (no leading dot), named + /// "New <label>". The type is chosen by extension, which is what + /// actually decides how a desktop or file manager treats a file: + /// asked for as "in context menu say new file, user can choose what + /// file type is obviously by extension". + /// + /// A fixed, deliberately short list (see `NEW_FILE_TYPES`) rather than + /// a scan of the system's MIME database: the point is a couple of + /// clicks for the handful of files people actually create from a + /// desktop, not a type browser - a real file manager, one row further + /// down this same menu, is the right tool for anything beyond that. + NewFileOfType { + label: &'static str, + extension: &'static str, + }, /// Spawns a terminal with `~/Desktop` as its working directory -- /// `general.terminal`, or a common-binary fallback list if unset. OpenTerminalHere, @@ -52,6 +67,20 @@ pub(crate) struct DesktopMenu { const MENU_WIDTH: u32 = 170; const ROW_HEIGHT: u32 = 28; +/// The file types the bare-desktop menu offers to create, in order. +/// +/// Plain text stays its own separate `NewTextFile` action rather than +/// appearing here, because it is the overwhelmingly common one and was +/// already the menu's own established top-level entry - demoting it into +/// a list would make the ordinary case worse to reach. +const NEW_FILE_TYPES: [(&str, &str); 5] = [ + ("Markdown Document", "md"), + ("Shell Script", "sh"), + ("Python Script", "py"), + ("JSON File", "json"), + ("CSV Spreadsheet", "csv"), +]; + impl DesktopMenu { /// Right-click on `icon` itself - the action set depends on what kind /// of icon it is, not one fixed list: a real file/folder gets Open/ @@ -76,16 +105,21 @@ impl DesktopMenu { /// Right-click on bare desktop (no icon under the pointer). pub(crate) fn open_for_desktop(pos: (i32, i32)) -> Self { - let items = vec![ + let mut items = vec![ ("New Folder", DesktopMenuAction::NewFolder), ("New Text Document", DesktopMenuAction::NewTextFile), + ]; + for (label, extension) in NEW_FILE_TYPES { + items.push((label, DesktopMenuAction::NewFileOfType { label, extension })); + } + items.extend([ ("\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}", DesktopMenuAction::Separator), ("Open Terminal Here", DesktopMenuAction::OpenTerminalHere), ("Open in File Manager", DesktopMenuAction::OpenInFileManager), ("\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}\u{2500}", DesktopMenuAction::Separator), ("Select All", DesktopMenuAction::SelectAll), ("Refresh", DesktopMenuAction::Refresh), - ]; + ]); Self { pos, width: MENU_WIDTH, row_height: ROW_HEIGHT, items } } @@ -150,7 +184,49 @@ mod tests { let menu = DesktopMenu::open_for_desktop((10, 10)); let real_actions: Vec<&str> = menu.items.iter().filter(|(_, a)| !matches!(a, DesktopMenuAction::Separator)).map(|(l, _)| *l).collect(); - assert_eq!(real_actions, vec!["New Folder", "New Text Document", "Open Terminal Here", "Open in File Manager", "Select All", "Refresh"]); + assert_eq!( + real_actions, + vec![ + "New Folder", + "New Text Document", + "Markdown Document", + "Shell Script", + "Python Script", + "JSON File", + "CSV Spreadsheet", + "Open Terminal Here", + "Open in File Manager", + "Select All", + "Refresh", + ] + ); + } + + #[test] + fn every_offered_file_type_carries_a_real_extension() { + let menu = DesktopMenu::open_for_desktop((0, 0)); + let types: Vec<(&str, &str)> = menu + .items + .iter() + .filter_map(|(_, a)| match a { + DesktopMenuAction::NewFileOfType { label, extension } => Some((*label, *extension)), + _ => None, + }) + .collect(); + assert_eq!(types.len(), NEW_FILE_TYPES.len()); + for (label, extension) in types { + assert!(!extension.is_empty(), "{label} has no extension"); + assert!(!extension.starts_with('.'), "{label}: the dot is added when building the name, not stored"); + } + } + + #[test] + fn no_two_offered_file_types_share_an_extension() { + let mut seen: Vec<&str> = Vec::new(); + for (label, extension) in NEW_FILE_TYPES { + assert!(!seen.contains(&extension), "{label} repeats extension {extension}"); + seen.push(extension); + } } #[test] |