Disable shortcuts in terminal, add back Ctrl+L and Ctrl+D

Author: ranfdev

src/application.rs

@@ -81,17 +81,6 @@ mod imp {
             self.parent_constructed();
             let obj = self.obj();
             obj.setup_gactions();
-            obj.set_accels_for_action("app.quit", &["<primary>q"]);
-            obj.set_accels_for_action("app.shortcuts", &["<primary>question"]);
-            obj.set_accels_for_action("win.refresh", &["F5"]);
-            obj.set_accels_for_action("win.upgrade-container", &["<primary>u"]);
-            obj.set_accels_for_action("win.upgrade-all", &["<primary><shift>u"]);
-            obj.set_accels_for_action("win.install-package", &["<primary>i"]);
-            obj.set_accels_for_action("win.preferences", &["<primary>comma"]);
-            obj.set_accels_for_action("win.open-terminal", &["<primary>period"]);
-            obj.set_accels_for_action("win.view-exportable-apps", &["<primary>e"]);
-            obj.set_accels_for_action("win.delete-container", &["<primary>Delete"]);
-            obj.set_accels_for_action("win.stop-container", &["<primary>s"]);
         }
     }
 
@@ -254,6 +243,7 @@ impl DistroShelfApplication {
         root_store.start_background_tasks();
 
         self.set_root_store(root_store);
+        self.bind_shortcuts_model();
         let window =
             DistroShelfWindow::new(self.upcast_ref::<adw::Application>(), self.root_store());
         window.upcast()
@@ -269,6 +259,38 @@ impl DistroShelfApplication {
         self.add_action_entries([quit_action, about_action]);
     }
 
+    fn bind_shortcuts_model(&self) {
+        let shortcuts = self.root_store().shortcuts_model();
+        let app = self.clone();
+        shortcuts.connect_items_changed(move |_, _, _, _| {
+            app.sync_shortcut_accels();
+        });
+        self.sync_shortcut_accels();
+    }
+
+    fn sync_shortcut_accels(&self) {
+        let shortcuts = self.root_store().shortcuts_model();
+
+        for action in self.root_store().shortcut_action_names() {
+            self.set_accels_for_action(action, &[]);
+        }
+
+        for shortcut in shortcuts.iter::<gtk::Shortcut>() {
+            let Ok(shortcut) = shortcut else {
+                continue;
+            };
+
+            let Some(named_action) = shortcut.action().and_downcast::<gtk::NamedAction>() else {
+                continue;
+            };
+            let Some(trigger) = shortcut.trigger() else {
+                continue;
+            };
+
+            self.set_accels_for_action(&named_action.action_name(), &[&trigger.to_string()]);
+        }
+    }
+
     fn show_about(&self) {
         let window = self.active_window().unwrap();
         let about =

src/models/root_store.rs

@@ -30,6 +30,22 @@ use crate::query::Query;
 
 use serde::Deserialize;
 
+const SHORTCUT_DEFINITIONS: [(&str, &str); 13] = [
+    ("<primary>q", "app.quit"),
+    ("<primary>question", "app.shortcuts"),
+    ("F5", "win.refresh"),
+    ("<primary>u", "win.upgrade-container"),
+    ("<primary><shift>u", "win.upgrade-all"),
+    ("<primary>i", "win.install-package"),
+    ("<primary>comma", "win.preferences"),
+    ("<primary>period", "win.open-terminal"),
+    ("<primary>e", "win.view-exportable-apps"),
+    ("<primary>Delete", "win.delete-container"),
+    ("<primary>s", "win.stop-container"),
+    ("<primary>l", "win.command-log"),
+    ("<primary>d", "win.delete-container"),
+];
+
 #[derive(Debug, Clone, Deserialize, Hash, Eq, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct Image {
@@ -69,6 +85,9 @@ mod imp {
         #[property(get)]
         pub settings: gio::Settings,
 
+        pub shortcuts: gio::ListStore,
+        pub shortcuts_enabled: std::cell::Cell<bool>,
+
         #[property(get, set, builder(ViewType::default()))]
         current_view: RefCell<ViewType>,
         #[property(get, set, builder(DialogType::default()))]
@@ -109,6 +128,8 @@ mod imp {
                 selected_task: Default::default(),
                 bundled_update_available: std::cell::Cell::new(false),
                 settings: gio::Settings::new("com.ranfdev.DistroShelf"),
+                shortcuts: gio::ListStore::new::<gtk::Shortcut>(),
+                shortcuts_enabled: std::cell::Cell::new(false),
             }
         }
     }
@@ -312,9 +333,57 @@ impl RootStore {
             );
         });
 
+        this.enable_shortcuts();
+
         this
     }
 
+    fn build_shortcut(trigger: &str, action: &str) -> Option<gtk::Shortcut> {
+        let trigger =
+            gtk::ShortcutTrigger::parse_string(trigger).expect("Invalid shortcut trigger");
+        let action = gtk::NamedAction::new(action);
+        Some(gtk::Shortcut::new(Some(trigger), Some(action)))
+    }
+
+    fn rebuild_shortcuts_model(&self) {
+        let shortcuts = &self.imp().shortcuts;
+        shortcuts.remove_all();
+        for (trigger, action) in SHORTCUT_DEFINITIONS {
+            if let Some(shortcut) = Self::build_shortcut(trigger, action) {
+                shortcuts.append(&shortcut);
+            }
+        }
+    }
+
+    pub fn shortcuts_model(&self) -> gio::ListStore {
+        self.imp().shortcuts.clone()
+    }
+
+    pub fn shortcut_action_names(&self) -> Vec<&'static str> {
+        SHORTCUT_DEFINITIONS
+            .iter()
+            .map(|(_, action)| *action)
+            .collect::<Vec<_>>()
+    }
+
+    pub fn enable_shortcuts(&self) {
+        if self.imp().shortcuts_enabled.get() {
+            return;
+        }
+
+        self.rebuild_shortcuts_model();
+        self.imp().shortcuts_enabled.set(true);
+    }
+
+    pub fn disable_shortcuts(&self) {
+        if !self.imp().shortcuts_enabled.get() {
+            return;
+        }
+
+        self.imp().shortcuts.remove_all();
+        self.imp().shortcuts_enabled.set(false);
+    }
+
     pub fn start_background_tasks(&self) {
         self.distrobox_version().refetch();
         self.container_runtime().refetch();
@@ -1179,4 +1248,32 @@ mod tests {
         assert_eq!(returned_task, existing_task);
         assert_eq!(store.tasks().iter().count(), 1);
     }
+
+    #[gtk::test]
+    fn test_shortcuts_toggle_is_idempotent() {
+        let store = RootStore::new(NullCommandRunnerBuilder::new().build());
+
+        assert_eq!(
+            store.shortcuts_model().n_items(),
+            SHORTCUT_DEFINITIONS.len() as u32
+        );
+
+        store.enable_shortcuts();
+        assert_eq!(
+            store.shortcuts_model().n_items(),
+            SHORTCUT_DEFINITIONS.len() as u32
+        );
+
+        store.disable_shortcuts();
+        assert_eq!(store.shortcuts_model().n_items(), 0);
+
+        store.disable_shortcuts();
+        assert_eq!(store.shortcuts_model().n_items(), 0);
+
+        store.enable_shortcuts();
+        assert_eq!(
+            store.shortcuts_model().n_items(),
+            SHORTCUT_DEFINITIONS.len() as u32
+        );
+    }
 }

src/widgets/integrated_terminal.rs

@@ -139,6 +139,22 @@ impl IntegratedTerminal {
             }
         ));
 
+        terminal.connect_notify_local(
+            Some("has-focus"),
+            clone!(
+                #[weak(rename_to=this)]
+                self,
+                move |terminal, _| {
+                    let root_store = this.container().root_store();
+                    if terminal.has_focus() {
+                        root_store.disable_shortcuts();
+                    } else {
+                        root_store.enable_shortcuts();
+                    }
+                }
+            ),
+        );
+
         // Reload button click handler
         reload_button.connect_clicked(clone!(
             #[weak(rename_to=this)]

src/widgets/window.rs

@@ -209,6 +209,8 @@ impl DistroShelfWindow {
                         .as_ref()
                 {
                     terminal.spawn_terminal();
+                } else {
+                    this_clone.root_store().enable_shortcuts();
                 }
             });