Specify an action on notifications to activate the tab

midori-browser#383
MidnightBSD · May 24, 2023 · b791787 · b791787
1 parent 9b84c32
commit b791787
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/core/app.vala b/core/app.vala
@@ -150,6 +150,10 @@ namespace Midori {
 
             add_action_entries (actions, this);
 
+            var tab_focus_action = new SimpleAction ("tab-focus", VariantType.STRING);
+            tab_focus_action.activate.connect (tab_focus_activated);
+            add_action (tab_focus_action);
+
             var action = new SimpleAction ("win-new", VariantType.STRING);
             action.activate.connect (win_new_activated);
             add_action (action);
@@ -370,6 +374,20 @@ namespace Midori {
             request.unref ();
         }
 
+        void tab_focus_activated (Action action, Variant? parameter) {
+            string id = parameter.get_string ();
+            foreach (var browser in get_windows ()) {
+                if (!(browser is Browser))
+                    continue;
+                foreach (var tab in ((Browser)browser).tabs.get_children ()) {
+                    if (((Tab)tab).id == id) {
+                        ((Browser)browser).tabs.visible_child = tab;
+                        browser.present ();
+                    }
+                }
+            }
+        }
+
         void win_new_activated (Action action, Variant? parameter) {
             var browser = new Browser (this);
             if (!browser.default_tab ()) {

diff --git a/core/tab.vala b/core/tab.vala
@@ -374,6 +374,7 @@ namespace Midori {
             notification.set_body (webkit_notification.body);
             // Use a per-host ID to avoid collisions, but neglect the tag
             string hostname = new Soup.URI (uri).host;
+            notification.set_default_action_and_target_value("app.tab-focus", id);
             Application.get_default ().send_notification ("web-%s".printf (hostname), notification);
             return true;
         }