From: Daniel Carl <danielcarl@gmx.de>
Date: Tue, 1 Jan 2013 13:42:44 +0000 (+0100)
Subject: Show load progress status in statusbar.
X-Git-Url: https://git.owens.tech/assets/static/git-logo.png/assets/static/git-logo.png/git?a=commitdiff_plain;h=cb1d9de60aa47d92062f401f016116eddd622fae;p=vimb.git

Show load progress status in statusbar.
---

diff --git a/src/main.c b/src/main.c
index da6cf5c..2c9c33e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -32,6 +32,7 @@ static gchar **args;
 VpCore vp;
 
 /* callbacks */
+static void vp_webview_progress_cb(WebKitWebView* view, GParamSpec* pspec, gpointer data);
 static void vp_webview_load_status_cb(WebKitWebView* view, GParamSpec* pspec, gpointer user_data);
 static void vp_destroy_window_cb(GtkWidget* widget, GtkWidget* window, gpointer user_data);
 static void vp_inputbox_activate_cb(GtkEntry* entry, gpointer user_data);
@@ -65,25 +66,38 @@ static const gchar* vp_get_cookies(SoupURI *uri);
 #endif
 static gboolean vp_hide_message(void);
 
+static void vp_webview_progress_cb(WebKitWebView* view, GParamSpec* pspec, gpointer data)
+{
+    vp.state.progress = webkit_web_view_get_progress(view) * 100;
+    vp_update_statusbar();
+}
+
 static void vp_webview_load_status_cb(WebKitWebView* view, GParamSpec* pspec, gpointer user_data)
 {
-    Gui* gui        = &vp.gui;
     const char* uri = CURRENT_URL();
 
-    switch (webkit_web_view_get_load_status(gui->webview)) {
+    switch (webkit_web_view_get_load_status(vp.gui.webview)) {
         case WEBKIT_LOAD_PROVISIONAL:
+            /* update load progress in statusbar */
+            vp.state.progress = 0;
+            vp_update_statusbar();
             break;
 
         case WEBKIT_LOAD_COMMITTED:
             /* status bar is updated by vp_set_mode */
             vp_set_mode(VP_MODE_NORMAL , FALSE);
             vp_update_urlbar(uri);
+
             break;
 
         case WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT:
             break;
 
         case WEBKIT_LOAD_FINISHED:
+            /* update load progress in statusbar */
+            vp.state.progress = 100;
+            vp_update_statusbar();
+
             dom_check_auto_insert();
             break;
 
@@ -256,11 +270,11 @@ gboolean vp_load_uri(const Arg* arg)
         /* spawn a new browser instance */
         g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL);
     } else {
-        /* Load a web page into the browser instance */
-        webkit_web_view_load_uri(vp.gui.webview, uri);
-
         /* change state to normal mode */
         vp_set_mode(VP_MODE_NORMAL, FALSE);
+
+        /* Load a web page into the browser instance */
+        webkit_web_view_load_uri(vp.gui.webview, uri);
     }
     g_free(uri);
 
@@ -410,6 +424,10 @@ void vp_update_statusbar(void)
         g_string_append_c(status, vp.state.modkey);
     }
 
+    if (vp.state.progress != 100) {
+        g_string_append_printf(status, " [%i%%]", vp.state.progress);
+    }
+
     /* show the scroll status */
     gint max = gtk_adjustment_get_upper(vp.gui.adjust_v) - gtk_adjustment_get_page_size(vp.gui.adjust_v);
     gint val = (int)(gtk_adjustment_get_value(vp.gui.adjust_v) / max * 100);
@@ -620,6 +638,7 @@ static void vp_setup_signals(void)
     g_signal_connect(gui->window, "destroy", G_CALLBACK(vp_destroy_window_cb), NULL);
     g_object_connect(
         G_OBJECT(gui->webview),
+        "signal::notify::progress", G_CALLBACK(vp_webview_progress_cb), NULL,
         "signal::notify::load-status", G_CALLBACK(vp_webview_load_status_cb), NULL,
         "signal::button-release-event", G_CALLBACK(vp_button_relase_cb), NULL,
         "signal::new-window-policy-decision-requested", G_CALLBACK(vp_new_window_policy_cb), NULL,
diff --git a/src/main.h b/src/main.h
index 2b9b7f9..a760f23 100644
--- a/src/main.h
+++ b/src/main.h
@@ -197,6 +197,7 @@ typedef struct {
     gchar           modkey;
     guint           count;
     GdkNativeWindow embed;
+    guint           progress;
 } State;
 
 /* behaviour */