From 1b73c313b2a0c7a4838668a15316caf94d9cf625 Mon Sep 17 00:00:00 2001 From: squid Date: Thu, 12 Nov 2026 20:29:09 +0100 Subject: [PATCH] Added shift+right click to get a context menu in terminals --- src/main.rs | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 147 insertions(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index ffad81c..9fd4dc4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -422,9 +422,15 @@ fn subscription(state: &Moorly) -> Subscription { .with(terminal_target) .filter_map(|(target, text)| Some(Message::TerminalText { id: target?, text })); + let modifiers = keyboard::listen().filter_map(|event| match event { + keyboard::Event::ModifiersChanged(modifiers) => Some(Message::ModifiersChanged(modifiers)), + _ => None, + }); + let mut subscriptions = vec![ keyboard, palette_shortcut, + modifiers, terminal_keys, terminal_text, hotkeys::subscription().map(Message::Hotkey), @@ -1817,6 +1823,13 @@ struct TerminalSelection { focus: (u16, u16), } +#[derive(Debug, Clone)] +struct TerminalMenu { + window: window::Id, + id: u32, + pointer: Point, +} + impl TerminalSelection { fn ordered(self) -> ((u16, u16), (u16, u16)) { if self.anchor <= self.focus { @@ -1927,6 +1940,8 @@ struct Moorly { /// action to offer. autostart_at_login: bool, drag: Option, + modifiers: keyboard::Modifiers, + terminal_menu: Option, theme: theme::Preference, saved_theme: theme::Preference, theme_choice: ThemeChoice, @@ -5058,6 +5073,8 @@ impl Default for Moorly { minimize_to_tray_draft: minimize_to_tray, autostart_at_login: autostart::enabled(), drag: None, + modifiers: keyboard::Modifiers::default(), + terminal_menu: None, theme, saved_theme: theme, theme_choice: theme_choice.clone(), @@ -5156,8 +5173,12 @@ enum Message { TerminalTick, TerminalSelectionStart(u32, u16, u16), TerminalSelectionUpdate(u32, u16, u16), - TerminalRightClick(u32), + TerminalRightClick(window::Id, u32), + TerminalMenuCopy(u32), + TerminalMenuPaste(u32), + CloseTerminalMenu, TerminalPasteContents(u32, Option), + ModifiersChanged(keyboard::Modifiers), TerminalKey { id: u32, key: keyboard::Key, @@ -5484,7 +5505,24 @@ fn update(state: &mut Moorly, message: Message) -> Task { selection.focus = (row, col); } } - Message::TerminalRightClick(id) => { + Message::TerminalRightClick(window, id) => { + if state.modifiers.shift() { + let pointer = state + .windows + .get(&window) + .and_then(|window_state| window_state.pointer) + .unwrap_or(Point::ORIGIN); + + state.terminal_menu = Some(TerminalMenu { + window, + id, + pointer, + }); + + return Task::none(); + } + + state.terminal_menu = None; let has_selection = state .terminal_sessions .get(&id) @@ -5495,6 +5533,16 @@ fn update(state: &mut Moorly, message: Message) -> Task { TerminalClipboardAction::Paste => paste_terminal_clipboard(id), }; } + Message::TerminalMenuCopy(id) => { + state.terminal_menu = None; + return copy_terminal_selection(state, id); + } + Message::TerminalMenuPaste(id) => { + state.terminal_menu = None; + return paste_terminal_clipboard(id); + } + Message::CloseTerminalMenu => state.terminal_menu = None, + Message::ModifiersChanged(modifiers) => state.modifiers = modifiers, Message::TerminalPasteContents(id, contents) => { if let Some(bytes) = paste_contents(contents) && let Some(terminal) = state.terminal_sessions.get_mut(&id) @@ -11555,6 +11603,7 @@ fn profile_start_directory(profile: &Profile) -> (PathBuf, Option) { } struct TerminalCanvas<'a> { + window: window::Id, id: u32, screen: &'a vt100::Screen, selection: Option, @@ -11609,7 +11658,8 @@ impl canvas::Program for TerminalCanvas<'_> { ) } canvas::Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Right)) => Some( - canvas::Action::publish(Message::TerminalRightClick(self.id)).and_capture(), + canvas::Action::publish(Message::TerminalRightClick(self.window, self.id)) + .and_capture(), ), canvas::Event::Mouse(mouse::Event::CursorMoved { .. }) => { if !*dragging { @@ -11844,6 +11894,53 @@ fn draw_run( } } +fn terminal_context_menu(state: &Moorly, window: window::Id) -> Option> { + let menu = state.terminal_menu.as_ref()?; + if menu.window != window { + return None; + } + + let window_state = state.windows.get(&window)?; + let width = 180.0; + let height = MENU_PADDING * 2.0 + 2.0 * MENU_ITEM_HEIGHT + 4.0; + let max_x = (window_state.size.width - width - 8.0).max(8.0); + let max_y = (window_state.size.height - height - 8.0).max(8.0); + + let copy_shortcut = state + .shortcuts + .get(ShortcutAction::TerminalCopy) + .map(ToString::to_string); + let paste_shortcut = state + .shortcuts + .get(ShortcutAction::TerminalPaste) + .map(ToString::to_string); + + let panel = container( + column![ + menu_item("Copy", copy_shortcut, Message::TerminalMenuCopy(menu.id)), + menu_item("Paste", paste_shortcut, Message::TerminalMenuPaste(menu.id)), + ] + .spacing(4), + ) + .width(width) + .padding(MENU_PADDING) + .style(theme::menu); + + Some( + container(panel) + .width(Length::Fill) + .height(Length::Fill) + .align_x(Alignment::Start) + .align_y(Alignment::Start) + .padding(Padding { + top: menu.pointer.y.clamp(8.0, max_y), + left: menu.pointer.x.clamp(8.0, max_x), + ..Padding::ZERO + }) + .into(), + ) +} + fn terminal_page<'a>(state: &'a Moorly, window: window::Id, id: u32) -> Element<'a, Message> { let Some(terminal_session) = state.terminal_sessions.get(&id) else { return container(text("This terminal session has ended.").size(13)) @@ -11856,6 +11953,7 @@ fn terminal_page<'a>(state: &'a Moorly, window: window::Id, id: u32) -> Element< let theme = terminal::Theme::DARK; let view = canvas::Canvas::new(TerminalCanvas { + window, id, screen: terminal_session.session.screen(), selection: terminal_session.selection, @@ -12338,8 +12436,13 @@ fn view(state: &Moorly, window: window::Id) -> Element<'_, Message> { let content = main_view(state, window); let palette = command_palette_layer(state, window); let dialog = profile_dialog_layer(state, window); + let terminal_menu = terminal_context_menu(state, window); - if state.notifications.is_empty() && palette.is_none() && dialog.is_none() { + if state.notifications.is_empty() + && palette.is_none() + && dialog.is_none() + && terminal_menu.is_none() + { return content; } @@ -12367,6 +12470,21 @@ fn view(state: &Moorly, window: window::Id) -> Element<'_, Message> { root = root.push(dialog); } + if terminal_menu.is_some() { + let backdrop = mouse_area( + container(space::horizontal()) + .width(Length::Fill) + .height(Length::Fill), + ) + .on_press(Message::CloseTerminalMenu); + + root = root.push(backdrop); + } + + if let Some(menu) = terminal_menu { + root = root.push(menu); + } + root.width(Length::Fill).height(Length::Fill).into() } @@ -12408,6 +12526,8 @@ mod tests { minimize_to_tray_draft: false, autostart_at_login: false, drag: None, + modifiers: keyboard::Modifiers::default(), + terminal_menu: None, theme: theme::Preference::default(), saved_theme: theme::Preference::default(), theme_choice: super::ThemeChoice::BuiltIn(theme::Preference::default()), @@ -12810,7 +12930,7 @@ mod tests { assert!(state.terminal_sessions[&id].selection.is_none()); state.terminal_sessions.get_mut(&id).unwrap().selection = Some(selection); - let _ = update(&mut state, Message::TerminalRightClick(id)); + let _ = update(&mut state, Message::TerminalRightClick(test_window(), id)); assert!(state.terminal_sessions[&id].selection.is_none()); } @@ -14356,6 +14476,28 @@ mod tests { assert_eq!(bindings[1].trigger.as_deref(), Some("Ctrl+Shift+Space")); } + #[test] + fn shift_right_click_opens_the_terminal_menu_without_copying() { + let (mut state, _, id) = terminal_for_session_end(super::SessionEnd::Keep); + let selection = super::TerminalSelection { + anchor: (0, 0), + focus: (0, 2), + }; + + state.terminal_sessions.get_mut(&id).unwrap().selection = Some(selection); + state.modifiers = keyboard::Modifiers::SHIFT; + + let _ = update(&mut state, Message::TerminalRightClick(test_window(), id)); + + assert!(state.terminal_sessions[&id].selection.is_some()); + assert_eq!(state.terminal_menu.as_ref().unwrap().id, id); + + let _ = update(&mut state, Message::TerminalMenuCopy(id)); + + assert!(state.terminal_menu.is_none()); + assert!(state.terminal_sessions[&id].selection.is_none()); + } + #[test] fn quick_actions_have_default_shortcuts() { let state = state();