]> git.armaanb.net Git - chorizo.git/blobdiff - browser.c
Implement keyword based searching
[chorizo.git] / browser.c
index 7ad931c4822ba9835bfb4064b69ca7a612a7d114..fe66eb46e75d452dcec60bec04b6adb31f6ce7d6 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -30,14 +30,20 @@ static gboolean download_reset_indicator(gpointer);
 static gboolean download_request(WebKitWebView *, WebKitWebFrame *,
                                  WebKitNetworkRequest *, gchar *,
                                  WebKitWebPolicyDecision *, gpointer);
+static void downloadmanager_cancel(GtkToolButton *, gpointer data);
+static void downloadmanager_progress(GObject *obj, GParamSpec *pspec,
+                                     gpointer data);
+static void downloadmanager_setup(void);
 static gchar *ensure_url_scheme(const gchar *);
 static void grab_environment_configuration(void);
 static void hover_web_view(WebKitWebView *, gchar *, gchar *, gpointer);
+static gboolean key_downloadmanager(GtkWidget *, GdkEvent *, gpointer);
 static gboolean key_location(GtkWidget *, GdkEvent *, gpointer);
 static gboolean key_web_view(GtkWidget *, GdkEvent *, gpointer);
+static void keywords_load(void);
+static gboolean keywords_try_search(WebKitWebView *, const gchar *);
 static gboolean remote_msg(GIOChannel *, GIOCondition, gpointer);
 static void search(gpointer, gint);
-static void scroll(GtkAdjustment *, gint, gdouble);
 static Window tabbed_launch(void);
 static void usage(void);
 
@@ -54,6 +60,13 @@ struct Client
        GtkWidget *win;
 };
 
+struct DownloadManager
+{
+       GtkWidget *scroll;
+       GtkWidget *toolbar;
+       GtkWidget *win;
+} dm;
+
 
 static gchar *accepted_language = "en-US";
 static GSList *adblock_patterns = NULL;
@@ -66,6 +79,7 @@ static gint downloads_indicated = 0;
 static Window embed = 0;
 static gchar *first_uri = NULL;
 static gdouble global_zoom = 1.0;
+static GHashTable *keywords = NULL;
 static gboolean language_is_set = FALSE;
 static gchar *search_text = NULL;
 static gboolean show_all_requests = FALSE;
@@ -135,6 +149,7 @@ adblock_load(void)
                        g_free(buf);
                }
        }
+       g_io_channel_shutdown(channel, FALSE, NULL);
        g_free(path);
 }
 
@@ -383,6 +398,7 @@ download_handle(WebKitWebView *web_view, WebKitDownload *download, gpointer data
 {
        struct Client *c = (struct Client *)data;
        gchar *path, *path2 = NULL, *uri;
+       GtkToolItem *tb;
        gboolean ret;
        int suffix = 1;
 
@@ -416,6 +432,19 @@ download_handle(WebKitWebView *web_view, WebKitDownload *download, gpointer data
                gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->status), 1);
                downloads_indicated++;
                g_timeout_add(500, download_reset_indicator, c);
+
+               tb = gtk_tool_button_new_from_stock(GTK_STOCK_DELETE);
+               gtk_tool_button_set_label(GTK_TOOL_BUTTON(tb),
+                                         webkit_download_get_suggested_filename(download));
+               gtk_toolbar_insert(GTK_TOOLBAR(dm.toolbar), tb, 0);
+               gtk_widget_show_all(dm.toolbar);
+
+               g_signal_connect(G_OBJECT(download), "notify::progress",
+                                G_CALLBACK(downloadmanager_progress), tb);
+
+               g_object_ref(download);
+               g_signal_connect(G_OBJECT(tb), "clicked",
+                                G_CALLBACK(downloadmanager_cancel), download);
        }
 
        g_free(path);
@@ -453,6 +482,62 @@ download_request(WebKitWebView *web_view, WebKitWebFrame *frame,
        return FALSE;
 }
 
+void
+downloadmanager_cancel(GtkToolButton *tb, gpointer data)
+{
+       WebKitDownload *download = WEBKIT_DOWNLOAD(data);
+
+       webkit_download_cancel(download);
+       g_object_unref(download);
+
+       gtk_widget_destroy(GTK_WIDGET(tb));
+}
+
+void
+downloadmanager_progress(GObject *obj, GParamSpec *pspec, gpointer data)
+{
+       WebKitDownload *download = WEBKIT_DOWNLOAD(obj);
+       GtkToolItem *tb = GTK_TOOL_ITEM(data);
+       gdouble p;
+       gchar *t;
+
+       (void)pspec;
+
+       p = webkit_download_get_progress(download) * 100;
+       t = g_strdup_printf("%s (%.0f%%)",
+                           webkit_download_get_suggested_filename(download),
+                                               p);
+       gtk_tool_button_set_label(GTK_TOOL_BUTTON(tb), t);
+       g_free(t);
+}
+
+void
+downloadmanager_setup(void)
+{
+       dm.win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       gtk_window_set_type_hint(GTK_WINDOW(dm.win), GDK_WINDOW_TYPE_HINT_DIALOG);
+       gtk_window_set_default_size(GTK_WINDOW(dm.win), 500, 250);
+       gtk_window_set_title(GTK_WINDOW(dm.win), __NAME__" - Download Manager");
+       g_signal_connect(G_OBJECT(dm.win), "delete-event",
+                        G_CALLBACK(gtk_widget_hide_on_delete), NULL);
+       g_signal_connect(G_OBJECT(dm.win), "key-press-event",
+                        G_CALLBACK(key_downloadmanager), NULL);
+
+       dm.toolbar = gtk_toolbar_new();
+       gtk_orientable_set_orientation(GTK_ORIENTABLE(dm.toolbar),
+                                      GTK_ORIENTATION_VERTICAL);
+       gtk_toolbar_set_style(GTK_TOOLBAR(dm.toolbar), GTK_TOOLBAR_BOTH_HORIZ);
+       gtk_toolbar_set_show_arrow(GTK_TOOLBAR(dm.toolbar), FALSE);
+
+       dm.scroll = gtk_scrolled_window_new(NULL, NULL);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dm.scroll),
+                                      GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(dm.scroll),
+                                             dm.toolbar);
+
+       gtk_container_add(GTK_CONTAINER(dm.win), dm.scroll);
+}
+
 gchar *
 ensure_url_scheme(const gchar *t)
 {
@@ -508,6 +593,28 @@ hover_web_view(WebKitWebView *web_view, gchar *title, gchar *uri, gpointer data)
        }
 }
 
+gboolean
+key_downloadmanager(GtkWidget *widget, GdkEvent *event, gpointer data)
+{
+       (void)widget;
+       (void)data;
+
+       if (event->type == GDK_KEY_PRESS)
+       {
+               if (((GdkEventKey *)event)->state & GDK_MOD1_MASK)
+               {
+                       switch (((GdkEventKey *)event)->keyval)
+                       {
+                               case GDK_KEY_q:  /* close window (left hand) */
+                                       gtk_widget_hide(dm.win);
+                                       return TRUE;
+                       }
+               }
+       }
+
+       return FALSE;
+}
+
 gboolean
 key_location(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
@@ -519,32 +626,55 @@ key_location(GtkWidget *widget, GdkEvent *event, gpointer data)
 
        if (event->type == GDK_KEY_PRESS)
        {
-               switch (((GdkEventKey *)event)->keyval)
+               if (((GdkEventKey *)event)->state & GDK_MOD1_MASK)
                {
-                       case GDK_KEY_Return:
-                               gtk_widget_grab_focus(c->web_view);
-                               t = gtk_entry_get_text(GTK_ENTRY(c->location));
-                               if (t != NULL && t[0] == '/')
-                               {
-                                       if (search_text != NULL)
-                                               g_free(search_text);
-                                       search_text = g_strdup(t + 1);  /* XXX whacky */
-                                       search(c, 1);
-                               }
-                               else
-                               {
-                                       f = ensure_url_scheme(t);
-                                       if (show_all_requests)
-                                               fprintf(stderr, "====> %s\n", f);
-                                       webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
-                                       g_free(f);
-                               }
-                               return TRUE;
-                       case GDK_KEY_Escape:
-                               t = webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view));
-                               gtk_entry_set_text(GTK_ENTRY(c->location),
-                                                  (t == NULL ? __NAME__ : t));
-                               return TRUE;
+                       switch (((GdkEventKey *)event)->keyval)
+                       {
+                               case GDK_KEY_q:  /* close window (left hand) */
+                                       gtk_widget_destroy(c->win);
+                                       return TRUE;
+                               case GDK_KEY_d:  /* download manager (left hand) */
+                                       gtk_widget_show_all(dm.win);
+                                       return TRUE;
+                               case GDK_KEY_r:  /* reload (left hand) */
+                                       webkit_web_view_reload_bypass_cache(WEBKIT_WEB_VIEW(
+                                                                           c->web_view));
+                                       return TRUE;
+                               case GDK_KEY_k:  /* initiate search (BOTH hands) */
+                                       gtk_entry_set_text(GTK_ENTRY(c->location), "/");
+                                       gtk_editable_set_position(GTK_EDITABLE(c->location), -1);
+                                       return TRUE;
+                       }
+               }
+               else
+               {
+                       switch (((GdkEventKey *)event)->keyval)
+                       {
+                               case GDK_KEY_Return:
+                                       gtk_widget_grab_focus(c->web_view);
+                                       t = gtk_entry_get_text(GTK_ENTRY(c->location));
+                                       if (t != NULL && t[0] == '/')
+                                       {
+                                               if (search_text != NULL)
+                                                       g_free(search_text);
+                                               search_text = g_strdup(t + 1);  /* XXX whacky */
+                                               search(c, 1);
+                                       }
+                                       else if (!keywords_try_search(WEBKIT_WEB_VIEW(c->web_view), t))
+                                       {
+                                               f = ensure_url_scheme(t);
+                                               if (show_all_requests)
+                                                       fprintf(stderr, "====> %s\n", f);
+                                               webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
+                                               g_free(f);
+                                       }
+                                       return TRUE;
+                               case GDK_KEY_Escape:
+                                       t = webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view));
+                                       gtk_entry_set_text(GTK_ENTRY(c->location),
+                                                          (t == NULL ? __NAME__ : t));
+                                       return TRUE;
+                       }
                }
        }
 
@@ -563,49 +693,48 @@ key_web_view(GtkWidget *widget, GdkEvent *event, gpointer data)
 
        if (event->type == GDK_KEY_PRESS)
        {
-               if (((GdkEventKey *)event)->state & GDK_CONTROL_MASK)
+               if (((GdkEventKey *)event)->state & GDK_MOD1_MASK)
                {
                        switch (((GdkEventKey *)event)->keyval)
                        {
-                               case GDK_KEY_o:
-                                       gtk_widget_grab_focus(c->location);
-                                       return TRUE;
-                               case GDK_KEY_h:
-                                       scroll(gtk_scrolled_window_get_hadjustment(
-                                              GTK_SCROLLED_WINDOW(c->scroll)), 0, -1);
+                               case GDK_KEY_q:  /* close window (left hand) */
+                                       gtk_widget_destroy(c->win);
                                        return TRUE;
-                               case GDK_KEY_j:
-                                       scroll(gtk_scrolled_window_get_vadjustment(
-                                              GTK_SCROLLED_WINDOW(c->scroll)), 0, 1);
-                                       return TRUE;
-                               case GDK_KEY_k:
-                                       scroll(gtk_scrolled_window_get_vadjustment(
-                                              GTK_SCROLLED_WINDOW(c->scroll)), 0, -1);
+                               case GDK_KEY_w:  /* home (left hand) */
+                                       f = ensure_url_scheme(first_uri);
+                                       if (show_all_requests)
+                                               fprintf(stderr, "====> %s\n", f);
+                                       webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
+                                       g_free(f);
                                        return TRUE;
-                               case GDK_KEY_l:
-                                       scroll(gtk_scrolled_window_get_hadjustment(
-                                              GTK_SCROLLED_WINDOW(c->scroll)), 0, 1);
+                               case GDK_KEY_e:  /* new tab (left hand) */
+                                       f = ensure_url_scheme(first_uri);
+                                       if (show_all_requests)
+                                               fprintf(stderr, "====> %s\n", f);
+                                       client_new(f);
+                                       g_free(f);
                                        return TRUE;
-                               case GDK_KEY_f:
-                                       scroll(gtk_scrolled_window_get_vadjustment(
-                                              GTK_SCROLLED_WINDOW(c->scroll)), 1, 0.5);
+                               case GDK_KEY_r:  /* reload (left hand) */
+                                       webkit_web_view_reload_bypass_cache(WEBKIT_WEB_VIEW(
+                                                                           c->web_view));
                                        return TRUE;
-                               case GDK_KEY_b:
-                                       scroll(gtk_scrolled_window_get_vadjustment(
-                                              GTK_SCROLLED_WINDOW(c->scroll)), 1, -0.5);
+                               case GDK_KEY_d:  /* download manager (left hand) */
+                                       gtk_widget_show_all(dm.win);
                                        return TRUE;
-                               case GDK_KEY_n:
+                               case GDK_KEY_2:  /* search forward (left hand) */
+                               case GDK_KEY_n:  /* search forward (maybe both hands) */
                                        search(c, 1);
                                        return TRUE;
-                               case GDK_KEY_p:
+                               case GDK_KEY_3:  /* search backward (left hand) */
                                        search(c, -1);
                                        return TRUE;
-                               case GDK_KEY_g:
-                                       f = ensure_url_scheme(first_uri);
-                                       if (show_all_requests)
-                                               fprintf(stderr, "====> %s\n", f);
-                                       webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
-                                       g_free(f);
+                               case GDK_KEY_l:  /* location (BOTH hands) */
+                                       gtk_widget_grab_focus(c->location);
+                                       return TRUE;
+                               case GDK_KEY_k:  /* initiate search (BOTH hands) */
+                                       gtk_widget_grab_focus(c->location);
+                                       gtk_entry_set_text(GTK_ENTRY(c->location), "/");
+                                       gtk_editable_set_position(GTK_EDITABLE(c->location), -1);
                                        return TRUE;
                        }
                }
@@ -645,6 +774,68 @@ key_web_view(GtkWidget *widget, GdkEvent *event, gpointer data)
        return FALSE;
 }
 
+void
+keywords_load(void)
+{
+       GError *err = NULL;
+       GIOChannel *channel = NULL;
+       gchar *path = NULL;
+       gchar *buf = NULL;
+       gchar **tokens = NULL;
+
+       keywords = g_hash_table_new(g_str_hash, g_str_equal);
+
+       path = g_build_filename(g_get_user_config_dir(), __NAME__, "keywordsearch",
+                               NULL);
+       channel = g_io_channel_new_file(path, "r", &err);
+       if (channel != NULL)
+       {
+               while (g_io_channel_read_line(channel, &buf, NULL, NULL, NULL)
+                      == G_IO_STATUS_NORMAL)
+               {
+                       g_strstrip(buf);
+                       if (buf[0] != '#')
+                       {
+                               tokens = g_strsplit(buf, " ", 2);
+                               if (tokens[0] != NULL && tokens[1] != NULL)
+                                       g_hash_table_insert(keywords, tokens[0], tokens[1]);
+                               else
+                                       g_strfreev(tokens);
+                       }
+                       g_free(buf);
+               }
+       }
+       g_io_channel_shutdown(channel, FALSE, NULL);
+       g_free(path);
+}
+
+gboolean
+keywords_try_search(WebKitWebView *web_view, const gchar *t)
+{
+       gboolean ret = FALSE;
+       gchar **tokens = NULL;
+       gchar *val = NULL;
+       gchar *uri = NULL;
+
+       tokens = g_strsplit(t, " ", 2);
+       if (tokens[0] != NULL && tokens[1] != NULL)
+       {
+               val = g_hash_table_lookup(keywords, tokens[0]);
+               if (val != NULL)
+               {
+                       uri = g_strdup_printf((gchar *)val, tokens[1]);
+                       if (show_all_requests)
+                               fprintf(stderr, "====> %s\n", uri);
+                       webkit_web_view_load_uri(web_view, uri);
+                       g_free(uri);
+                       ret = TRUE;
+               }
+       }
+       g_strfreev(tokens);
+
+       return ret;
+}
+
 gboolean
 remote_msg(GIOChannel *channel, GIOCondition condition, gpointer data)
 {
@@ -675,22 +866,6 @@ search(gpointer data, gint direction)
                                    FALSE, direction == 1, TRUE);
 }
 
-void
-scroll(GtkAdjustment *a, gint step_type, gdouble factor)
-{
-       gdouble new, lower, upper, step;
-       lower = gtk_adjustment_get_lower(a);
-       upper = gtk_adjustment_get_upper(a) - gtk_adjustment_get_page_size(a) + lower;
-       if (step_type == 0)
-               step = gtk_adjustment_get_step_increment(a);
-       else
-               step = gtk_adjustment_get_page_increment(a);
-       new = gtk_adjustment_get_value(a) + factor * step;
-       new = new < lower ? lower : new;
-       new = new > upper ? upper : new;
-       gtk_adjustment_set_value(a, new);
-}
-
 Window
 tabbed_launch(void)
 {
@@ -769,7 +944,9 @@ main(int argc, char **argv)
                usage();
 
        adblock_load();
+       keywords_load();
        cooperation_setup();
+       downloadmanager_setup();
 
        if (tabbed_automagic && !(cooperative_instances && !cooperative_alone))
                embed = tabbed_launch();