leyoda/cosmic-terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #782 from chrisglass/fix-clippy

Browse source 
Fix clippy warnings
This commit is contained in:
Jeremy Soller 2026-04-13 13:17:37 -06:00 • committed by GitHub
commit aa0785a744
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 292 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

40
.github/workflows/rust-checks.yml vendored
View file

@ -24,3 +24,43 @@ jobs:
- name: Check formatting - name: Check formatting
run: cargo fmt --all -- --check run: cargo fmt --all -- --check
clippy:
name: Clippy
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install system dependencies
run: |
sudo apt-get update
sudo apt-get install -y pkg-config libxkbcommon-dev libfontconfig1-dev libfreetype6-dev libglvnd-dev libinput-dev libvulkan-dev libwayland-dev libx11-dev libxcursor-dev libxi-dev libxrandr-dev libasound2-dev libdbus-1-dev
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
components: clippy
- name: Run Clippy
run: cargo clippy --all-targets --all-features -- -D warnings
test:
name: Test
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install system dependencies
run: |
sudo apt-get update
sudo apt-get install -y pkg-config libxkbcommon-dev libfontconfig1-dev libfreetype6-dev libglvnd-dev libinput-dev libvulkan-dev libwayland-dev libx11-dev libxcursor-dev libxi-dev libxrandr-dev libasound2-dev libdbus-1-dev
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
components: clippy
- name: Run Tests
run: cargo test --all-targets --all-features

310
src/main.rs
View file

@ -177,11 +177,7 @@ fn main() -> Result<(), Box<dyn Error>> {
let shortcuts_config = shortcuts::ShortcutsConfig::new(config.shortcuts_custom.clone()); let shortcuts_config = shortcuts::ShortcutsConfig::new(config.shortcuts_custom.clone());
let shell = if let Some(shell_program) = shell_program_opt { let shell = shell_program_opt.map(|shell_program| tty::Shell::new(shell_program, shell_args));
Some(tty::Shell::new(shell_program, shell_args))
} else {
None
};
let startup_options = Some(tty::Options { let startup_options = Some(tty::Options {
shell, shell,
working_directory, working_directory,
@ -367,7 +363,7 @@ pub enum Message {
ColorSchemeRename(ColorSchemeKind, ColorSchemeId, String), ColorSchemeRename(ColorSchemeKind, ColorSchemeId, String),
ColorSchemeRenameSubmit, ColorSchemeRenameSubmit,
ColorSchemeTabActivate(widget::segmented_button::Entity), ColorSchemeTabActivate(widget::segmented_button::Entity),
Config(Config), Config(Box<Config>),
Copy(Option<segmented_button::Entity>), Copy(Option<segmented_button::Entity>),
CopyOrSigint(Option<segmented_button::Entity>), CopyOrSigint(Option<segmented_button::Entity>),
CopyPrimary(Option<segmented_button::Entity>), CopyPrimary(Option<segmented_button::Entity>),
@ -379,7 +375,7 @@ pub enum Message {
DefaultFontStretch(usize), DefaultFontStretch(usize),
DefaultFontWeight(usize), DefaultFontWeight(usize),
DefaultZoomStep(usize), DefaultZoomStep(usize),
DialogMessage(DialogMessage), DialogMessage(Box<DialogMessage>), // DialogMessage is huge, so we use a box to make the size of this enum smaller on the stack
Drop(Option<(pane_grid::Pane, segmented_button::Entity, DndDrop)>), Drop(Option<(pane_grid::Pane, segmented_button::Entity, DndDrop)>),
Find(bool), Find(bool),
FindNext, FindNext,
@ -554,21 +550,19 @@ impl App {
.config .config
.color_schemes(color_scheme_kind) .color_schemes(color_scheme_kind)
.get(&color_scheme_id) .get(&color_scheme_id)
{ && self
if self
.themes .themes
.insert( .insert(
(color_scheme_name.clone(), color_scheme_kind), (color_scheme_name.clone(), color_scheme_kind),
color_scheme.into(), color_scheme.into(),
) )
.is_some() .is_some()
{ {
log::warn!( log::warn!(
"custom {:?} color scheme {:?} replaces builtin one", "custom {:?} color scheme {:?} replaces builtin one",
color_scheme_kind, color_scheme_kind,
color_scheme_name color_scheme_name
); );
}
} }
} }
} }
@ -699,21 +693,21 @@ impl App {
// but only for the active pane/tab // but only for the active pane/tab
if let Some(tab_model) = self.pane_model.active() { if let Some(tab_model) = self.pane_model.active() {
for entity in tab_model.iter() { for entity in tab_model.iter() {
if tab_model.is_active(entity) { if tab_model.is_active(entity)
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) { && let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity)
let mut terminal = terminal.lock().unwrap(); {
let current_zoom_adj = terminal.zoom_adj(); let mut terminal = terminal.lock().unwrap();
match zoom_message { let current_zoom_adj = terminal.zoom_adj();
Message::ZoomIn => { match zoom_message {
terminal.set_zoom_adj(current_zoom_adj.saturating_add(1)) Message::ZoomIn => {
} terminal.set_zoom_adj(current_zoom_adj.saturating_add(1))
Message::ZoomOut => {
terminal.set_zoom_adj(current_zoom_adj.saturating_sub(1))
}
_ => {}
} }
terminal.set_config(&self.config, &self.themes); Message::ZoomOut => {
terminal.set_zoom_adj(current_zoom_adj.saturating_sub(1))
}
_ => {}
} }
terminal.set_config(&self.config, &self.themes);
} }
} }
} }
@ -722,16 +716,16 @@ impl App {
fn save_color_schemes(&mut self, color_scheme_kind: ColorSchemeKind) -> Task<Message> { fn save_color_schemes(&mut self, color_scheme_kind: ColorSchemeKind) -> Task<Message> {
// Optimized for just saving color_schemes // Optimized for just saving color_schemes
if let Some(ref config_handler) = self.config_handler { if let Some(ref config_handler) = self.config_handler
if let Err(err) = config_handler.set( && let Err(err) = config_handler.set(
match color_scheme_kind { match color_scheme_kind {
ColorSchemeKind::Dark => "color_schemes_dark", ColorSchemeKind::Dark => "color_schemes_dark",
ColorSchemeKind::Light => "color_schemes_light", ColorSchemeKind::Light => "color_schemes_light",
}, },
self.config.color_schemes(color_scheme_kind), self.config.color_schemes(color_scheme_kind),
) { )
log::error!("failed to save config: {}", err); {
} log::error!("failed to save config: {}", err);
} }
self.update_color_schemes(); self.update_color_schemes();
Task::none() Task::none()
@ -754,16 +748,16 @@ impl App {
if self.find { if self.find {
widget::text_input::focus(self.find_search_id.clone()) widget::text_input::focus(self.find_search_id.clone())
} else if self.core.window.show_context { } else if self.core.window.show_context {
match self.context_page { // Right now we only care about the KeyboardShortcuts context page, so we use a simple if.
ContextPage::KeyboardShortcuts => { // In the future if we are to care about other conext pages, we could switch this to a match
if self.shortcut_search_focus.get() { // statement instead to be cleaner.
self.shortcut_search_focus.set(false); if self.context_page == ContextPage::KeyboardShortcuts
return widget::text_input::focus(self.shortcut_search_id.clone()); && self.shortcut_search_focus.get()
} {
} self.shortcut_search_focus.set(false);
// TODO focus for other context pages? return widget::text_input::focus(self.shortcut_search_id.clone());
_ => {}
} }
Task::none() Task::none()
} else if let Some(terminal_id) = self.terminal_ids.get(&self.pane_model.focused()).cloned() } else if let Some(terminal_id) = self.terminal_ids.get(&self.pane_model.focused()).cloned()
{ {
@ -1026,10 +1020,10 @@ impl App {
let mut found_actions = false; let mut found_actions = false;
for action in group.actions { for action in group.actions {
let action_label = shortcuts::action_label(action); let action_label = shortcuts::action_label(action);
if let Some(regex) = &self.shortcut_search_regex { if let Some(regex) = &self.shortcut_search_regex
if regex.find(&action_label).is_none() { && regex.find(&action_label).is_none()
continue; {
} continue;
} }
found_actions = true; found_actions = true;
@ -1543,13 +1537,13 @@ impl App {
self.startup_options.take().unwrap_or_default(); self.startup_options.take().unwrap_or_default();
let options = tty::Options { let options = tty::Options {
shell: startup_options.shell.or_else(|| { shell: startup_options.shell.or_else(|| {
if let Some(mut args) = shlex::split(&profile.command) { if let Some(mut args) = shlex::split(&profile.command)
if !args.is_empty() { && !args.is_empty()
let command = args.remove(0); {
return Some(tty::Shell::new(command, args)); let command = args.remove(0);
} return Some(tty::Shell::new(command, args));
} }
return None; None
}), }),
working_directory: startup_options.working_directory.or_else( working_directory: startup_options.working_directory.or_else(
|| { || {
@ -1956,24 +1950,23 @@ impl Application for App {
.get(&color_scheme_id) .get(&color_scheme_id)
.map(|color_scheme| color_scheme.name.clone()), .map(|color_scheme| color_scheme.name.clone()),
None => Some(format!("COSMIC {:?}", color_scheme_kind)), None => Some(format!("COSMIC {:?}", color_scheme_kind)),
} { } && self.dialog_opt.is_none()
if self.dialog_opt.is_none() { {
let (dialog, command) = Dialog::new( let (dialog, command) = Dialog::new(
DialogSettings::new().kind(DialogKind::SaveFile { DialogSettings::new().kind(DialogKind::SaveFile {
filename: format!("{}.ron", color_scheme_name), filename: format!("{}.ron", color_scheme_name),
}), }),
Message::DialogMessage, |msg| Message::DialogMessage(Box::new(msg)),
move |result| { move |result| {
Message::ColorSchemeExportResult( Message::ColorSchemeExportResult(
color_scheme_kind, color_scheme_kind,
color_scheme_id_opt, color_scheme_id_opt,
result, result,
) )
}, },
); );
self.dialog_opt = Some(dialog); self.dialog_opt = Some(dialog);
return command; return command;
}
} }
} }
Message::ColorSchemeExportResult(color_scheme_kind, color_scheme_id_opt, result) => { Message::ColorSchemeExportResult(color_scheme_kind, color_scheme_id_opt, result) => {
@ -2061,7 +2054,7 @@ impl Application for App {
self.color_scheme_errors.clear(); self.color_scheme_errors.clear();
let (dialog, command) = Dialog::new( let (dialog, command) = Dialog::new(
DialogSettings::new().kind(DialogKind::OpenMultipleFiles), DialogSettings::new().kind(DialogKind::OpenMultipleFiles),
Message::DialogMessage, |msg| Message::DialogMessage(Box::new(msg)),
move |result| Message::ColorSchemeImportResult(color_scheme_kind, result), move |result| Message::ColorSchemeImportResult(color_scheme_kind, result),
); );
self.dialog_opt = Some(dialog); self.dialog_opt = Some(dialog);
@ -2115,15 +2108,13 @@ impl Application for App {
Message::ColorSchemeRenameSubmit => { Message::ColorSchemeRenameSubmit => {
if let Some((color_scheme_kind, color_scheme_id, color_scheme_name)) = if let Some((color_scheme_kind, color_scheme_id, color_scheme_name)) =
self.color_scheme_renaming.take() self.color_scheme_renaming.take()
{ && let Some(color_scheme) = self
if let Some(color_scheme) = self
.config .config
.color_schemes_mut(color_scheme_kind) .color_schemes_mut(color_scheme_kind)
.get_mut(&color_scheme_id) .get_mut(&color_scheme_id)
{ {
color_scheme.name = color_scheme_name; color_scheme.name = color_scheme_name;
return self.save_color_schemes(color_scheme_kind); return self.save_color_schemes(color_scheme_kind);
}
} }
} }
Message::ColorSchemeTabActivate(entity) => { Message::ColorSchemeTabActivate(entity) => {
@ -2137,11 +2128,11 @@ impl Application for App {
} }
} }
Message::Config(config) => { Message::Config(config) => {
if config != self.config { if *config != self.config {
let shortcuts_changed = config.shortcuts_custom != self.config.shortcuts_custom; let shortcuts_changed = config.shortcuts_custom != self.config.shortcuts_custom;
log::info!("update config"); log::info!("update config");
//TODO: update syntax theme by clearing tabs, only if needed //TODO: update syntax theme by clearing tabs, only if needed
self.config = config; self.config = *config;
if shortcuts_changed { if shortcuts_changed {
self.shortcuts_config = self.shortcuts_config =
shortcuts::ShortcutsConfig::new(self.config.shortcuts_custom.clone()); shortcuts::ShortcutsConfig::new(self.config.shortcuts_custom.clone());
@ -2305,7 +2296,8 @@ impl Application for App {
}, },
Message::DialogMessage(dialog_message) => { Message::DialogMessage(dialog_message) => {
if let Some(dialog) = &mut self.dialog_opt { if let Some(dialog) = &mut self.dialog_opt {
return dialog.update(dialog_message); // DialogMessage is boxed, so we need to dereference it before updating
return dialog.update(*dialog_message);
} }
} }
Message::Drop(Some((pane, entity, data))) => { Message::Drop(Some((pane, entity, data))) => {
@ -2344,13 +2336,13 @@ impl Application for App {
return self.update_focus(); return self.update_focus();
} }
Message::FindNext => { Message::FindNext => {
if !self.find_search_value.is_empty() { if !self.find_search_value.is_empty()
if let Some(tab_model) = self.pane_model.active() { && let Some(tab_model) = self.pane_model.active()
let entity = tab_model.active(); {
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) { let entity = tab_model.active();
let mut terminal = terminal.lock().unwrap(); if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) {
terminal.search(&self.find_search_value, true); let mut terminal = terminal.lock().unwrap();
} terminal.search(&self.find_search_value, true);
} }
} }
@ -2358,13 +2350,13 @@ impl Application for App {
return self.update_focus(); return self.update_focus();
} }
Message::FindPrevious => { Message::FindPrevious => {
if !self.find_search_value.is_empty() { if !self.find_search_value.is_empty()
if let Some(tab_model) = self.pane_model.active() { && let Some(tab_model) = self.pane_model.active()
let entity = tab_model.active(); {
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) { let entity = tab_model.active();
let mut terminal = terminal.lock().unwrap(); if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) {
terminal.search(&self.find_search_value, false); let mut terminal = terminal.lock().unwrap();
} terminal.search(&self.find_search_value, false);
} }
} }
@ -2462,10 +2454,9 @@ impl Application for App {
let mut terminal = terminal.lock().unwrap(); let mut terminal = terminal.lock().unwrap();
if let Some(url) = if let Some(url) =
terminal.context_menu.as_ref().and_then(|m| m.link.as_ref()) terminal.context_menu.as_ref().and_then(|m| m.link.as_ref())
&& let Err(err) = open::that_detached(url)
{ {
if let Err(err) = open::that_detached(url) { log::warn!("failed to open {:?}: {}", url, err);
log::warn!("failed to open {:?}: {}", url, err);
}
} }
terminal.context_menu = None; terminal.context_menu = None;
terminal.active_regex_match = None; terminal.active_regex_match = None;
@ -2829,21 +2820,21 @@ impl Application for App {
} }
} }
// Close terminal context menu state // Close terminal context menu state
if let Some(tab_model) = self.pane_model.active() { if let Some(tab_model) = self.pane_model.active()
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) { && let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity)
let mut terminal = terminal.lock().unwrap(); {
//Some actions need the menu_state, let mut terminal = terminal.lock().unwrap();
//so only clear the position for them. //Some actions need the menu_state,
match action { //so only clear the position for them.
Action::LaunchUrlByMenu | Action::CopyUrlByMenu => { match action {
if let Some(context_menu) = terminal.context_menu.as_mut() { Action::LaunchUrlByMenu | Action::CopyUrlByMenu => {
context_menu.position = None; if let Some(context_menu) = terminal.context_menu.as_mut() {
} context_menu.position = None;
}
_ => {
terminal.context_menu = None;
} }
} }
_ => {
terminal.context_menu = None;
}
} }
} }
tasks.push(self.update(action.message(Some(entity)))); tasks.push(self.update(action.message(Some(entity))));
@ -2966,9 +2957,7 @@ impl Application for App {
let pos = tab_model let pos = tab_model
.position(tab_model.active()) .position(tab_model.active())
.and_then(|i| (i as usize).checked_sub(1)) .and_then(|i| (i as usize).checked_sub(1))
.unwrap_or_else(|| { .unwrap_or_else(|| tab_model.iter().count().saturating_sub(1));
tab_model.iter().count().checked_sub(1).unwrap_or_default()
});
let entity = tab_model.iter().nth(pos); let entity = tab_model.iter().nth(pos);
if let Some(entity) = entity { if let Some(entity) = entity {
@ -3007,13 +2996,13 @@ impl Application for App {
} }
}, },
TermEvent::ColorRequest(index, f) => { TermEvent::ColorRequest(index, f) => {
if let Some(tab_model) = self.pane_model.panes.get(pane) { if let Some(tab_model) = self.pane_model.panes.get(pane)
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) { && let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity)
let terminal = terminal.lock().unwrap(); {
let rgb = terminal.colors()[index].unwrap_or_default(); let terminal = terminal.lock().unwrap();
let text = f(rgb); let rgb = terminal.colors()[index].unwrap_or_default();
terminal.input_no_scroll(text.into_bytes()); let text = f(rgb);
} terminal.input_no_scroll(text.into_bytes());
} }
} }
TermEvent::CursorBlinkingChange => { TermEvent::CursorBlinkingChange => {
@ -3023,11 +3012,11 @@ impl Application for App {
return self.update(Message::TabClose(Some(entity))); return self.update(Message::TabClose(Some(entity)));
} }
TermEvent::PtyWrite(text) => { TermEvent::PtyWrite(text) => {
if let Some(tab_model) = self.pane_model.panes.get(pane) { if let Some(tab_model) = self.pane_model.panes.get(pane)
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) { && let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity)
let terminal = terminal.lock().unwrap(); {
terminal.input_no_scroll(text.into_bytes()); let terminal = terminal.lock().unwrap();
} terminal.input_no_scroll(text.into_bytes());
} }
} }
TermEvent::ResetTitle => { TermEvent::ResetTitle => {
@ -3047,12 +3036,12 @@ impl Application for App {
return self.update_title(Some(pane)); return self.update_title(Some(pane));
} }
TermEvent::TextAreaSizeRequest(f) => { TermEvent::TextAreaSizeRequest(f) => {
if let Some(tab_model) = self.pane_model.panes.get(pane) { if let Some(tab_model) = self.pane_model.panes.get(pane)
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) { && let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity)
let terminal = terminal.lock().unwrap(); {
let text = f(terminal.size().into()); let terminal = terminal.lock().unwrap();
terminal.input_no_scroll(text.into_bytes()); let text = f(terminal.size().into());
} terminal.input_no_scroll(text.into_bytes());
} }
} }
TermEvent::Title(title) => { TermEvent::Title(title) => {
@ -3071,11 +3060,11 @@ impl Application for App {
return self.update_title(Some(pane)); return self.update_title(Some(pane));
} }
TermEvent::MouseCursorDirty | TermEvent::Wakeup => { TermEvent::MouseCursorDirty | TermEvent::Wakeup => {
if let Some(tab_model) = self.pane_model.panes.get(pane) { if let Some(tab_model) = self.pane_model.panes.get(pane)
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) { && let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity)
let mut terminal = terminal.lock().unwrap(); {
terminal.needs_update = true; let mut terminal = terminal.lock().unwrap();
} terminal.needs_update = true;
} }
} }
TermEvent::ChildExit(_error_code) => { TermEvent::ChildExit(_error_code) => {
@ -3212,19 +3201,19 @@ impl Application for App {
return self.update_config(); return self.update_config();
} }
Message::ContextMenuPopupClosed(id) => { Message::ContextMenuPopupClosed(id) => {
if let Some((popup_id, pane, entity, _, _, _)) = &self.context_menu_popup { if let Some((popup_id, pane, entity, _, _, _)) = &self.context_menu_popup
if id == *popup_id { && id == *popup_id
// Clear link underline on the terminal {
if let Some(tab_model) = self.pane_model.panes.get(*pane) { // Clear link underline on the terminal
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(*entity) { if let Some(tab_model) = self.pane_model.panes.get(*pane)
let mut terminal = terminal.lock().unwrap(); && let Some(terminal) = tab_model.data::<Mutex<Terminal>>(*entity)
terminal.context_menu = None; {
terminal.active_regex_match = None; let mut terminal = terminal.lock().unwrap();
terminal.needs_update = true; terminal.context_menu = None;
} terminal.active_regex_match = None;
} terminal.needs_update = true;
self.context_menu_popup = None;
} }
self.context_menu_popup = None;
} }
} }
Message::Surface(a) => { Message::Surface(a) => {
@ -3334,10 +3323,10 @@ impl Application for App {
} }
fn on_close_requested(&self, id: window::Id) -> Option<Self::Message> { fn on_close_requested(&self, id: window::Id) -> Option<Self::Message> {
if let Some((popup_id, _, _, _, _, _)) = &self.context_menu_popup { if let Some((popup_id, _, _, _, _, _)) = &self.context_menu_popup
if id == *popup_id { && id == *popup_id
return Some(Message::ContextMenuPopupClosed(id)); {
} return Some(Message::ContextMenuPopupClosed(id));
} }
None None
} }
@ -3345,14 +3334,13 @@ impl Application for App {
fn view_window(&self, window_id: window::Id) -> Element<'_, Message> { fn view_window(&self, window_id: window::Id) -> Element<'_, Message> {
if let Some((popup_id, _pane, entity, ref link, ref autosize_id, _)) = if let Some((popup_id, _pane, entity, ref link, ref autosize_id, _)) =
self.context_menu_popup self.context_menu_popup
&& window_id == popup_id
{ {
if window_id == popup_id { return widget::autosize::autosize(
return widget::autosize::autosize( menu::context_menu(&self.config, &self.key_binds, entity, link.clone()),
menu::context_menu(&self.config, &self.key_binds, entity, link.clone()), autosize_id.clone(),
autosize_id.clone(), )
) .into();
.into();
}
} }
match &self.dialog_opt { match &self.dialog_opt {
Some(dialog) => dialog.view(window_id), Some(dialog) => dialog.view(window_id),
@ -3608,7 +3596,7 @@ impl Application for App {
update.errors update.errors
); );
} }
Message::Config(update.config) Message::Config(Box::new(update.config))
}), }),
match &self.dialog_opt { match &self.dialog_opt {
Some(dialog) => dialog.subscription(), Some(dialog) => dialog.subscription(),

127
src/password_manager.rs
View file

@ -234,10 +234,10 @@ impl PasswordManager {
} }
// Don't do anything if nothing have changed // Don't do anything if nothing have changed
if let Some(original) = &original { if let Some(original) = &original
if original == &input_state.input { && original == &input_state.input
return Task::none(); {
} return Task::none();
} }
cosmic::task::future(async move { cosmic::task::future(async move {
@ -246,19 +246,14 @@ impl PasswordManager {
"Failed to add password {identifier}: {err}" "Failed to add password {identifier}: {err}"
))) )))
} else { } else {
if let Some(original) = original { if let Some(original) = original
if original.identifier != identifier { && original.identifier != identifier
if let Err(err) = && let Err(err) = store::delete_password(original.identifier.clone()).await
store::delete_password(original.identifier.clone()).await {
{ return Message::PasswordManager(PasswordManagerMessage::Error(format!(
return Message::PasswordManager(PasswordManagerMessage::Error( "Failed to delete password {}: {err}",
format!( original.identifier
"Failed to delete password {}: {err}", )));
original.identifier
),
));
}
}
} }
Message::PasswordManager(PasswordManagerMessage::None) Message::PasswordManager(PasswordManagerMessage::None)
} }
@ -315,72 +310,68 @@ impl PasswordManager {
.spacing(space_xxs), .spacing(space_xxs),
); );
if expanded { if expanded && let Some(input_state) = &self.input_state {
if let Some(input_state) = &self.input_state { let expanded_section: Section<'_, Message> = widget::settings::section().add(
let expanded_section: Section<'_, Message> = widget::settings::section().add( widget::column::with_children(vec![
widget::column::with_children(vec![ widget::column::with_children(vec![
widget::column::with_children(vec![ widget::text(fl!("password-input-description")).into(),
widget::text(fl!("password-input-description")).into(), widget::text_input("", input_state.input.identifier.clone())
widget::text_input("", input_state.input.identifier.clone())
.on_input(move |text| {
Message::PasswordManager(
PasswordManagerMessage::DescriptionInput(text),
)
})
.on_submit(move |text| {
Message::PasswordManager(
PasswordManagerMessage::DescriptionInputAndUpdate(text),
)
})
.on_unfocus(Message::PasswordManager(
PasswordManagerMessage::Update,
))
.into(),
])
.spacing(space_xxxs)
.into(),
widget::column::with_children(vec![
widget::text(fl!("password-input")).into(),
widget::secure_input(
"",
input_state.input.password.clone(),
Some(Message::PasswordManager(
PasswordManagerMessage::ToggleShowPassword,
)),
!input_state.show_password,
)
.on_input(move |text| { .on_input(move |text| {
Message::PasswordManager(PasswordManagerMessage::PasswordInput( Message::PasswordManager(
text, PasswordManagerMessage::DescriptionInput(text),
)) )
}) })
.on_submit(move |text| { .on_submit(move |text| {
Message::PasswordManager( Message::PasswordManager(
PasswordManagerMessage::PasswordInputAndUpdate(text), PasswordManagerMessage::DescriptionInputAndUpdate(text),
) )
}) })
.on_unfocus(Message::PasswordManager( .on_unfocus(Message::PasswordManager(
PasswordManagerMessage::Update, PasswordManagerMessage::Update,
)) ))
.into(), .into(),
]) ])
.spacing(space_xxxs) .spacing(space_xxxs)
.into(),
widget::column::with_children(vec![
widget::text(fl!("password-input")).into(),
widget::secure_input(
"",
input_state.input.password.clone(),
Some(Message::PasswordManager(
PasswordManagerMessage::ToggleShowPassword,
)),
!input_state.show_password,
)
.on_input(move |text| {
Message::PasswordManager(PasswordManagerMessage::PasswordInput(
text,
))
})
.on_submit(move |text| {
Message::PasswordManager(
PasswordManagerMessage::PasswordInputAndUpdate(text),
)
})
.on_unfocus(Message::PasswordManager(PasswordManagerMessage::Update))
.into(), .into(),
]) ])
.padding([0, space_s]) .spacing(space_xxxs)
.spacing(space_xs), .into(),
); ])
.padding([0, space_s])
.spacing(space_xs),
);
let padding = Padding { let padding = Padding {
top: 0.0, top: 0.0,
bottom: 0.0, bottom: 0.0,
left: space_s.into(), left: space_s.into(),
right: space_s.into(), right: space_s.into(),
}; };
passwords_section = passwords_section =
passwords_section.add(widget::container(expanded_section).padding(padding)) passwords_section.add(widget::container(expanded_section).padding(padding))
}
} }
} }
sections.push(passwords_section.into()); sections.push(passwords_section.into());

10
src/shortcuts.rs
View file

@ -245,11 +245,11 @@ impl ShortcutsConfig {
// Remove any matching bindings // Remove any matching bindings
return false; return false;
} }
if let Some(default_action) = self.defaults.0.get(binding) { if let Some(default_action) = self.defaults.0.get(binding)
if *default_action == reset_action { && *default_action == reset_action
// Remove binding that overrode a default {
return false; // Remove binding that overrode a default
} return false;
} }
true true
}); });

31
src/terminal.rs
View file

@ -264,6 +264,7 @@ pub struct Terminal {
impl Terminal { impl Terminal {
//TODO: error handling //TODO: error handling
#[allow(clippy::too_many_arguments)]
pub fn new( pub fn new(
pane: pane_grid::Pane, pane: pane_grid::Pane,
entity: segmented_button::Entity, entity: segmented_button::Entity,
@ -858,13 +859,12 @@ impl Terminal {
} }
// Change color if selected // Change color if selected
if let Some(selection) = &term.selection { if let Some(selection) = &term.selection
if let Some(range) = selection.to_range(&term) { && let Some(range) = selection.to_range(&term)
if range.contains(indexed.point) { && range.contains(indexed.point)
//TODO: better handling of selection {
mem::swap(&mut fg, &mut bg); //TODO: better handling of selection
} mem::swap(&mut fg, &mut bg);
}
} }
// Convert foreground to linear // Convert foreground to linear
@ -878,10 +878,10 @@ impl Terminal {
let mut flags = indexed.cell.flags; let mut flags = indexed.cell.flags;
if let Some(active_match) = &self.active_regex_match { if let Some(active_match) = &self.active_regex_match
if active_match.contains(&indexed.point) { && active_match.contains(&indexed.point)
flags |= Flags::UNDERLINE; {
} flags |= Flags::UNDERLINE;
} }
if let Some(active_id) = &self.active_hyperlink_id { if let Some(active_id) = &self.active_hyperlink_id {
let mut matches_active = indexed let mut matches_active = indexed
@ -1190,13 +1190,12 @@ impl<'a, T> Iterator for HintPostProcessor<'a, T> {
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
let next_match = self.next_match.take()?; let next_match = self.next_match.take()?;
if self.start <= self.end { if self.start <= self.end
if let Some(rm) = self && let Some(rm) = self
.term .term
.regex_search_right(self.regex, self.start, self.end) .regex_search_right(self.regex, self.start, self.end)
{ {
self.next_processed_match(rm); self.next_processed_match(rm);
}
} }
Some(next_match) Some(next_match)

50
src/terminal_box.rs
View file

@ -26,10 +26,9 @@ use cosmic::{
iced::{ iced::{
Color, Element, Length, Padding, Point, Rectangle, Size, Vector, Color, Element, Length, Padding, Point, Rectangle, Size, Vector,
advanced::graphics::text::Raw, advanced::graphics::text::Raw,
event::{Event, Status}, event::Event,
keyboard::{Event as KeyEvent, Key, Modifiers}, keyboard::{Event as KeyEvent, Key, Modifiers},
mouse::{self, Button, Event as MouseEvent, ScrollDelta}, mouse::{self, Button, Event as MouseEvent, ScrollDelta},
window::RedrawRequest,
}, },
theme::Theme, theme::Theme,
}; };
@ -863,8 +862,8 @@ where
if is_mouse_mode { if is_mouse_mode {
state.autoscroll.stop(); state.autoscroll.stop();
} else { } else {
if let Some((pointer, multiplier)) = state.autoscroll.next_due() { if let Some((pointer, multiplier)) = state.autoscroll.next_due()
if update_buffer_drag( && update_buffer_drag(
state, state,
&mut terminal, &mut terminal,
buffer_size, buffer_size,
@ -872,9 +871,9 @@ where
layout.bounds(), layout.bounds(),
self.padding, self.padding,
multiplier, multiplier,
) { )
shell.capture_event(); {
} shell.capture_event();
} }
if state.autoscroll.is_active() { if state.autoscroll.is_active() {
shell.request_redraw(); shell.request_redraw();
@ -1319,21 +1318,20 @@ where
} }
Event::Mouse(MouseEvent::ButtonReleased(Button::Left)) => { Event::Mouse(MouseEvent::ButtonReleased(Button::Left)) => {
state.autoscroll.stop(); state.autoscroll.stop();
if let Some(dragging) = state.dragging.take() { if let Some(dragging) = state.dragging.take()
if let Dragging::Buffer { && let Dragging::Buffer {
last_point, last_point,
last_side, last_side,
.. ..
} = dragging } = dragging
{
{ {
{ let mut term = terminal.term.lock();
let mut term = terminal.term.lock(); if let Some(selection) = &mut term.selection {
if let Some(selection) = &mut term.selection { selection.update(last_point, last_side);
selection.update(last_point, last_side);
}
} }
terminal.needs_update = true;
} }
terminal.needs_update = true;
} }
if let Some(p) = cursor_position.position_in(layout.bounds()) { if let Some(p) = cursor_position.position_in(layout.bounds()) {
let x = p.x - self.padding.left; let x = p.x - self.padding.left;
@ -1344,13 +1342,12 @@ where
let location = terminal let location = terminal
.viewport_to_point(TermPoint::new(row as usize, TermColumn(col as usize))); .viewport_to_point(TermPoint::new(row as usize, TermColumn(col as usize)));
if state.modifiers.control() { if state.modifiers.control()
if let Some(on_open_hyperlink) = &self.on_open_hyperlink { && let Some(on_open_hyperlink) = &self.on_open_hyperlink
if let Some(hyperlink) = get_hyperlink(&terminal, location) { && let Some(hyperlink) = get_hyperlink(&terminal, location)
shell.publish(on_open_hyperlink(hyperlink)); {
shell.capture_event(); shell.publish(on_open_hyperlink(hyperlink));
} shell.capture_event();
}
} }
if is_mouse_mode { if is_mouse_mode {
@ -1655,10 +1652,10 @@ fn update_active_regex_match(
.find(|bounds| bounds.contains(&location)) .find(|bounds| bounds.contains(&location))
{ {
'update: { 'update: {
if let Some(active_match) = &terminal.active_regex_match { if let Some(active_match) = &terminal.active_regex_match
if active_match == match_ { && active_match == match_
break 'update; {
} break 'update;
} }
terminal.active_regex_match = Some(match_.clone()); terminal.active_regex_match = Some(match_.clone());
terminal.needs_update = true; terminal.needs_update = true;
@ -1719,6 +1716,7 @@ enum EdgeScrollDirection {
Bottom, Bottom,
} }
#[allow(clippy::too_many_arguments)]
fn edge_scroll_adjustment( fn edge_scroll_adjustment(
y: f32, y: f32,
buffer_height: f32, buffer_height: f32,