Add keybindings for opening history and downloads

Author: TingPing

src/wig-application.c

@@ -73,6 +73,28 @@ static void wig_application_add_new_tab_with_uri(WigApplication *app, WigWindow
   webkit_web_view_load_uri(web_view, uri);
 }
 
+void wig_application_open_internal_page(WigApplication *app, GtkWindow *win, const char *uri)
+{
+  if (win && wig_window_focus_tab_by_site(WIG_WINDOW(win), uri))
+    return;
+
+  for (GList *l = gtk_application_get_windows(GTK_APPLICATION(app)); l; l = l->next) {
+    if (l->data == win)
+      continue;
+
+    if (wig_window_focus_tab_by_site(WIG_WINDOW(l->data), uri)) {
+      gtk_window_present(GTK_WINDOW(l->data));
+      return;
+    }
+  }
+
+  if (!win)
+    win = gtk_application_get_active_window(GTK_APPLICATION(app));
+
+  if (win)
+    wig_application_add_new_tab_with_uri(app, WIG_WINDOW(win), uri);
+}
+
 static gboolean uri_should_be_recorded(const char *uri)
 {
   if (!uri || !*uri)
@@ -230,13 +252,7 @@ static gboolean on_decide_destination(WebKitDownload *download, const char *sugg
   g_autofree char *path = g_build_filename(dir ? dir : fallback, suggested_filename, NULL);
   webkit_download_set_destination(download, path);
 
-  for (GList *l = gtk_application_get_windows(GTK_APPLICATION(app)); l; l = l->next) {
-    if (wig_window_focus_tab_by_site(WIG_WINDOW(l->data), "wig:downloads"))
-      return TRUE;
-  }
-
-  GtkWindow *active = gtk_application_get_active_window(GTK_APPLICATION(app));
-  wig_application_add_new_tab_with_uri(app, WIG_WINDOW(active), "wig:downloads");
+  wig_application_open_internal_page(app, NULL, "wig:downloads");
   return TRUE;
 }
 
@@ -426,6 +442,8 @@ static void wig_application_startup(GApplication *application)
     { "win.find", { "<Primary>f", NULL } },
     { "win.find-next", { "<Primary>g", "F3", NULL } },
     { "win.find-previous", { "<Primary><Shift>g", "<Shift>F3", NULL } },
+    { "win.show-downloads", { "<Primary>j", NULL } },
+    { "win.show-history", { "<Primary>h", NULL } },
 
   };
 

src/wig-application.h

@@ -76,6 +76,8 @@ WPEDisplay *wig_application_get_display(WigApplication *app);
 WebKitNetworkSession *wig_application_get_network_session(WigApplication *app);
 WebKitWebView *wig_application_create_web_view(WigApplication *app);
 WigHistoryStore *wig_application_get_history_store(WigApplication *app);
+void wig_application_open_internal_page(WigApplication *app, GtkWindow *win, const char *uri);
+
 void wig_application_mark_typed_navigation(WigApplication *app, WebKitWebView *web_view, const char *uri);
 void wig_application_mark_internal_navigation(WigApplication *app, WebKitWebView *web_view, const char *uri);
 gboolean wig_application_take_internal_navigation(WigApplication *app, WebKitWebView *web_view, const char *uri);

src/wig-window.c

@@ -483,6 +483,16 @@ static void wig_window_search_bar_closed(WigSearchBar *search_bar, WigWindow *wi
     gtk_widget_grab_focus(wig_tab_get_widget(tab));
 }
 
+static void wig_window_show_downloads(GSimpleAction *action, GVariant *parameter, gpointer user_data)
+{
+  wig_application_open_internal_page(wig_application_get(), GTK_WINDOW(user_data), "wig:downloads");
+}
+
+static void wig_window_show_history(GSimpleAction *action, GVariant *parameter, gpointer user_data)
+{
+  wig_application_open_internal_page(wig_application_get(), GTK_WINDOW(user_data), "wig:history");
+}
+
 static void wig_window_close_tab_action(GSimpleAction *action, GVariant *parameter, gpointer user_data)
 {
   WigWindow *win = WIG_WINDOW(user_data);
@@ -834,6 +844,8 @@ static const GActionEntry actions[] = {
   { "find", wig_window_find },
   { "find-next", wig_window_find_next },
   { "find-previous", wig_window_find_previous },
+  { "show-downloads", wig_window_show_downloads },
+  { "show-history", wig_window_show_history },
   { "close-tab", wig_window_close_tab_action },
   { "reload", wig_window_reload },
   { "reload-bypass-cache", wig_window_reload_bypass_cache },
@@ -1753,5 +1765,6 @@ void wig_window_add_web_view(WigWindow *win, WebKitWebView *web_view)
   g_return_if_fail(WIG_IS_WINDOW(win));
   g_return_if_fail(WEBKIT_IS_WEB_VIEW(web_view));
 
-  wig_window_add_tab_for_view(win, web_view);
+  WigTab *tab = wig_window_add_tab_for_view(win, web_view);
+  wig_tab_list_set_active(win->tab_list, tab);
 }