static WebKitWebView *client_new_request(WebKitWebView *, WebKitWebFrame *,
gpointer);
static void cooperation_setup(void);
-static void changed_load_status(GObject *obj, GParamSpec *pspec,
- gpointer data);
+static void changed_load_progress(GObject *obj, GParamSpec *pspec,
+ gpointer data);
static void changed_title(GObject *, GParamSpec *, gpointer);
static void changed_uri(GObject *, GParamSpec *, gpointer);
static gboolean download_handle(WebKitWebView *, WebKitDownload *, gpointer);
+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);
struct Client
{
- GtkWidget *win;
- GtkWidget *vbox;
GtkWidget *location;
- GtkWidget *status;
+ GtkWidget *progress;
GtkWidget *scroll;
+ GtkWidget *status;
+ GtkWidget *top_box;
+ GtkWidget *vbox;
GtkWidget *web_view;
+ GtkWidget *win;
};
+struct DownloadManager
+{
+ GtkWidget *scroll;
+ GtkWidget *toolbar;
+ GtkWidget *win;
+} dm;
+
static gchar *accepted_language = "en-US";
static GSList *adblock_patterns = NULL;
static gboolean cooperative_instances = TRUE;
static int cooperative_pipe_fp = 0;
static gchar *download_dir = "/tmp";
+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;
g_free(buf);
}
}
+ g_io_channel_shutdown(channel, FALSE, NULL);
g_free(path);
}
G_CALLBACK(changed_title), c);
g_signal_connect(G_OBJECT(c->web_view), "notify::uri",
G_CALLBACK(changed_uri), c);
- g_signal_connect(G_OBJECT(c->web_view), "notify::load-status",
- G_CALLBACK(changed_load_status), c);
+ g_signal_connect(G_OBJECT(c->web_view), "notify::progress",
+ G_CALLBACK(changed_load_progress), c);
g_signal_connect(G_OBJECT(c->web_view), "create-web-view",
G_CALLBACK(client_new_request), NULL);
g_signal_connect(G_OBJECT(c->web_view), "close-web-view",
"mime-type-policy-decision-requested",
G_CALLBACK(download_request), NULL);
g_signal_connect(G_OBJECT(c->web_view), "download-requested",
- G_CALLBACK(download_handle), NULL);
+ G_CALLBACK(download_handle), c);
g_signal_connect(G_OBJECT(c->web_view), "key-press-event",
G_CALLBACK(key_web_view), c);
g_signal_connect(G_OBJECT(c->web_view), "button-press-event",
g_signal_connect(G_OBJECT(c->location), "key-press-event",
G_CALLBACK(key_location), c);
- c->status = gtk_statusbar_new();
- gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(c->status), FALSE);
+ c->progress = gtk_progress_bar_new();
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->progress), 0);
- c->vbox = gtk_vbox_new(FALSE, 2);
- gtk_box_pack_start(GTK_BOX(c->vbox), c->location, FALSE, FALSE, 0);
+ c->status = gtk_progress_bar_new();
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->status), 0);
+ gtk_widget_set_size_request(c->status, 20, -1);
+
+ c->top_box = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(c->top_box), c->status, FALSE, FALSE, 2);
+ gtk_box_pack_start(GTK_BOX(c->top_box), c->location, TRUE, TRUE, 0);
+ gtk_box_pack_end(GTK_BOX(c->top_box), c->progress, FALSE, TRUE, 2);
+
+ c->vbox = gtk_vbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(c->vbox), c->top_box, FALSE, FALSE, 2);
gtk_container_add(GTK_CONTAINER(c->vbox), c->scroll);
- gtk_box_pack_end(GTK_BOX(c->vbox), c->status, FALSE, FALSE, 0);
gtk_container_add(GTK_CONTAINER(c->win), c->vbox);
}
void
-changed_load_status(GObject *obj, GParamSpec *pspec, gpointer data)
+changed_load_progress(GObject *obj, GParamSpec *pspec, gpointer data)
{
struct Client *c = (struct Client *)data;
+ gdouble p;
(void)obj;
(void)pspec;
- if (webkit_web_view_get_load_status(WEBKIT_WEB_VIEW(c->web_view))
- == WEBKIT_LOAD_FINISHED)
- {
- gtk_statusbar_pop(GTK_STATUSBAR(c->status), 1);
- gtk_statusbar_push(GTK_STATUSBAR(c->status), 1, "Finished.");
- }
- else
- {
- gtk_statusbar_pop(GTK_STATUSBAR(c->status), 1);
- gtk_statusbar_push(GTK_STATUSBAR(c->status), 1, "Loading...");
- }
+ p = webkit_web_view_get_progress(WEBKIT_WEB_VIEW(c->web_view));
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->progress), p);
}
void
gboolean
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;
webkit_download_set_destination_uri(download, uri);
ret = TRUE;
g_free(uri);
+
+ 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);
return ret;
}
+gboolean
+download_reset_indicator(gpointer data)
+{
+ struct Client *c = (struct Client *)data;
+
+ downloads_indicated--;
+ if (downloads_indicated == 0)
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->status), 0);
+
+ return FALSE;
+}
+
gboolean
download_request(WebKitWebView *web_view, WebKitWebFrame *frame,
WebKitNetworkRequest *request, gchar *mime_type,
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)
{
(void)web_view;
(void)title;
- gtk_statusbar_pop(GTK_STATUSBAR(c->status), 0);
- if (uri != NULL)
- gtk_statusbar_push(GTK_STATUSBAR(c->status), 0, uri);
+ if (!gtk_widget_is_focus(c->location))
+ {
+ if (uri == NULL)
+ gtk_entry_set_text(GTK_ENTRY(c->location),
+ webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view)));
+ else
+ gtk_entry_set_text(GTK_ENTRY(c->location), uri);
+ }
+}
+
+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
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;
+ }
}
}
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;
}
}
else if (((GdkEventKey *)event)->keyval == GDK_KEY_Escape)
{
webkit_web_view_stop_loading(WEBKIT_WEB_VIEW(c->web_view));
- gtk_statusbar_pop(GTK_STATUSBAR(c->status), 1);
- gtk_statusbar_push(GTK_STATUSBAR(c->status), 1, "Aborted.");
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->progress), 0);
}
}
else if (event->type == GDK_BUTTON_PRESS)
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)
{
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)
{
usage();
adblock_load();
+ keywords_load();
cooperation_setup();
+ downloadmanager_setup();
if (tabbed_automagic && !(cooperative_instances && !cooperative_alone))
embed = tabbed_launch();
projects / chorizo.git / blobdiff