Improve shortcuts: <Ctrl>l, open in tab with <Ctrl>mouse, document hidden shortcuts

Author: ranfdev

data/resources/ui/shortcuts.blp

@@ -29,6 +29,11 @@ Gtk.ShortcutsWindow help_overlay {
         action-name: "win.close-tab";
       }
 
+      Gtk.ShortcutsShortcut {
+        title: C_("shortcut window", "Go to Nth Tab");
+        accelerator: "<Alt>1...9";
+      }
+
       Gtk.ShortcutsShortcut {
         title: C_("shortcut window", "View Source");
         action-name: "win.view-source";
@@ -38,12 +43,12 @@ Gtk.ShortcutsWindow help_overlay {
       title: C_("shortcut window", "Navigation");
 
       Gtk.ShortcutsShortcut {
-        title: C_("shortcut window", "Previous Tab");
+        title: C_("shortcut window", "Previous Page");
         action-name: "win.previous";
       }
 
       Gtk.ShortcutsShortcut {
-        title: C_("shortcut window", "Next Tab");
+        title: C_("shortcut window", "Next Page");
         action-name: "win.next";
       }
 

src/main.rs

@@ -93,13 +93,10 @@ fn main() {
     application.set_accels_for_action("win.bookmark-current", &["<Ctrl>d"]);
     application.set_accels_for_action("win.new-tab", &["<Ctrl>t"]);
     application.set_accels_for_action("win.close-tab", &["<Ctrl>w"]);
-    application.set_accels_for_action("win.focus-url-bar", &["F6"]);
+    application.set_accels_for_action("win.focus-url-bar", &["F6", "<Ctrl>L"]);
     application.set_accels_for_action("win.zoom-in", &["<Ctrl>plus"]);
     application.set_accels_for_action("win.zoom-out", &["<Ctrl>minus"]);
     application.set_accels_for_action("win.reset-zoom", &["<Ctrl>0"]);
-    // Sadly Tab doesn't work as an accelerator in gtk...
-    application.set_accels_for_action("win.focus-next-tab", &["<Ctrl>Tab"]);
-    application.set_accels_for_action("win.focus-previous-tab", &["<Ctrl><Shift>Tab"]);
     // FIXME: win.view-source
     let ret = application.run();
     std::process::exit(ret);

src/widgets/tab.rs

@@ -167,7 +167,7 @@ impl Tab {
         this.bind_signals();
         this
     }
-    pub fn handle_click(&self, x: f64, y: f64) -> Result<()> {
+    pub fn handle_click(&self, ctrl: &gtk::GestureClick, x: f64, y: f64) -> Result<()> {
         let imp = self.imp();
         let gemini_text_ext = imp.gemini_text_ext.borrow();
         let text_view = &gemini_text_ext.as_ref().unwrap().text_view;
@@ -177,7 +177,18 @@ impl Tab {
         }
         let link = Self::extract_linkhandler(gemini_text_ext.as_ref().unwrap(), x, y)?;
         let url = self.parse_link(&link)?;
-        self.spawn_open_url(url);
+        if ctrl
+            .current_event()
+            .unwrap()
+            .modifier_state()
+            .contains(gdk::ModifierType::CONTROL_MASK)
+        {
+            self.activate_action("win.open-in-new-tab", Some(&url.as_str().to_variant()))
+                .unwrap()
+        } else {
+            self.spawn_open_url(url);
+        }
+
         Ok(())
     }
     fn handle_right_click(&self, x: f64, y: f64) -> Result<()> {
@@ -395,8 +406,8 @@ impl Tab {
         let this = self.clone();
         let left_click_ctrl = imp.left_click_ctrl.borrow();
         let left_click_ctrl = left_click_ctrl.as_ref().unwrap();
-        left_click_ctrl.connect_released(move |_ctrl, _n_press, x, y| {
-            if let Err(e) = this.handle_click(x, y) {
+        left_click_ctrl.connect_released(move |ctrl, _n_press, x, y| {
+            if let Err(e) = this.handle_click(ctrl, x, y) {
                 info!("{}", e);
             };
         });

src/widgets/window.rs

@@ -215,8 +215,8 @@ impl Window {
         self_action!(self, "focus-url-bar", focus_url_bar);
         self_action!(self, "shortcuts", present_shortcuts);
         self_action!(self, "about", present_about);
-        self_action!(self, "focus-tab-previous", focus_tab_previous);
-        self_action!(self, "focus-tab-next", focus_tab_next);
+        self_action!(self, "focus-previous-tab", focus_previous_tab);
+        self_action!(self, "focus-next-tab", focus_next_tab);
         self_action!(self, "donate", donate);
         self_action!(self, "zoom-in", zoom_in);
         self_action!(self, "zoom-out", zoom_out);
@@ -313,6 +313,24 @@ impl Window {
         ctrl.connect_motion(move |_, _, _| {
             url_status_box_clone.set_visible(false);
         });
+
+        let ctrl = gtk::EventControllerKey::new();
+        ctrl.set_propagation_limit(gtk::PropagationLimit::None);
+        ctrl.set_propagation_phase(gtk::PropagationPhase::Capture);
+        self.add_controller(&ctrl);
+        ctrl.connect_key_pressed(
+            clone!(@weak self as this => @default-panic, move |_, key, _, modif| {
+              let action = match (modif.contains(gdk::ModifierType::CONTROL_MASK), key) {
+                (true, gdk::Key::ISO_Left_Tab) => Some("win.focus-previous-tab"),
+                (true, gdk::Key::Tab) => Some("win.focus-next-tab"),
+                _ => None,
+              };
+              action
+                  .map(|a| WidgetExt::activate_action(&this, a, None))
+                  .map(|_| gtk::Inhibit(true))
+                  .unwrap_or(gtk::Inhibit(false))
+            }),
+        );
     }
     fn setup_zoom_popover_item(&self) {
         let imp = self.imp();
@@ -597,11 +615,11 @@ impl Window {
             0,
         );
     }
-    fn focus_tab_next(&self) {
+    fn focus_next_tab(&self) {
         let imp = self.imp();
         imp.tab_view.select_next_page();
     }
-    fn focus_tab_previous(&self) {
+    fn focus_previous_tab(&self) {
         let imp = self.imp();
         imp.tab_view.select_previous_page();
     }