static void adblock(WebKitWebView *, WebKitWebFrame *, WebKitWebResource *,
WebKitNetworkRequest *, WebKitNetworkResponse *, gpointer);
static void adblock_load(void);
-static void client_destroy(GtkWidget *, gpointer);
-static void client_new(const gchar *uri);
-static gboolean client_new_request(WebKitWebView *, WebKitWebFrame *,
- WebKitNetworkRequest *,
- WebKitWebNavigationAction *,
- WebKitWebPolicyDecision *, gpointer);
+static void client_destroy(GtkWidget *obj, gpointer data);
+static gboolean client_destroy_request(WebKitWebView *, gpointer);
+static WebKitWebView *client_new(const gchar *uri);
+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 gboolean download_wget(WebKitWebView *, WebKitDownload *, 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);
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;
uri = webkit_network_request_get_uri(request);
if (show_all_requests)
- fprintf(stderr, "-> %s\n", uri);
+ fprintf(stderr, " -> %s\n", uri);
while (it)
{
{
webkit_network_request_set_uri(request, "about:blank");
if (show_all_requests)
- fprintf(stderr, "\tBLOCKED!\n");
+ fprintf(stderr, " BLOCKED!\n");
return;
}
it = g_slist_next(it);
struct Client *c = (struct Client *)data;
(void)obj;
+ (void)data;
- webkit_web_view_stop_loading(WEBKIT_WEB_VIEW(c->web_view));
- gtk_widget_destroy(c->web_view);
- gtk_widget_destroy(c->scroll);
- gtk_widget_destroy(c->status);
- gtk_widget_destroy(c->location);
- gtk_widget_destroy(c->vbox);
- gtk_widget_destroy(c->win);
free(c);
-
clients--;
+
if (clients == 0)
gtk_main_quit();
}
-void
+gboolean
+client_destroy_request(WebKitWebView *web_view, gpointer data)
+{
+ struct Client *c = (struct Client *)data;
+
+ (void)web_view;
+
+ gtk_widget_destroy(c->win);
+
+ return TRUE;
+}
+
+WebKitWebView *
client_new(const gchar *uri)
{
struct Client *c;
- gchar *capitalized_name = NULL, *f;
+ gchar *f;
- if (cooperative_instances && !cooperative_alone)
+ if (uri != NULL && cooperative_instances && !cooperative_alone)
{
write(cooperative_pipe_fp, uri, strlen(uri));
write(cooperative_pipe_fp, "\n", 1);
- return;
+ return NULL;
}
c = malloc(sizeof(struct Client));
if (c->win == NULL)
{
c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-
- capitalized_name = g_strdup(__NAME__);
- capitalized_name[0] = g_ascii_toupper(capitalized_name[0]);
- gtk_window_set_wmclass(GTK_WINDOW(c->win), __NAME__, capitalized_name);
- g_free(capitalized_name);
+ gtk_window_set_wmclass(GTK_WINDOW(c->win), __NAME__, __NAME_CAPITALIZED__);
}
/* When using Gtk2, it only shows a white area when run in suckless'
* to work. This is not needed when using Gtk3. */
gtk_window_set_default_size(GTK_WINDOW(c->win), 1024, 768);
- g_signal_connect(G_OBJECT(c->win), "destroy",
- G_CALLBACK(client_destroy), c);
+ g_signal_connect(G_OBJECT(c->win), "destroy", G_CALLBACK(client_destroy), c);
gtk_window_set_title(GTK_WINDOW(c->win), __NAME__);
c->web_view = webkit_web_view_new();
- webkit_web_view_set_full_content_zoom(WEBKIT_WEB_VIEW(c->web_view), TRUE);
+
+ /* XXX I really do want to enable this option. However, I get
+ * reproducable crashes with it enabled. I've seen bug reports from
+ * 2010 about this... WebKit crashes in libpixman, so maybe it's not
+ * a WebKit issue.
+ * Yeah, well. I'll turn it off for now. */
+ /*webkit_web_view_set_full_content_zoom(WEBKIT_WEB_VIEW(c->web_view), TRUE);*/
+
webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view), global_zoom);
g_signal_connect(G_OBJECT(c->web_view), "notify::title",
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),
- "new-window-policy-decision-requested",
+ 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",
+ G_CALLBACK(client_destroy_request), c);
g_signal_connect(G_OBJECT(c->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_wget), 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-release-event",
+ g_signal_connect(G_OBJECT(c->web_view), "button-press-event",
G_CALLBACK(key_web_view), c);
g_signal_connect(G_OBJECT(c->web_view), "hovering-over-link",
G_CALLBACK(hover_web_view), c);
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);
gtk_widget_grab_focus(c->web_view);
gtk_widget_show_all(c->win);
- f = ensure_url_scheme(uri);
- webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
- g_free(f);
+ if (uri != NULL)
+ {
+ f = ensure_url_scheme(uri);
+ if (show_all_requests)
+ fprintf(stderr, "====> %s\n", uri);
+ webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
+ g_free(f);
+ }
clients++;
+
+ return WEBKIT_WEB_VIEW(c->web_view);
}
-gboolean
-client_new_request(WebKitWebView *web_view, WebKitWebFrame *frame,
- WebKitNetworkRequest *request,
- WebKitWebNavigationAction *navigation_action,
- WebKitWebPolicyDecision *policy_decision, gpointer user_data)
+WebKitWebView *
+client_new_request(WebKitWebView *web_view, WebKitWebFrame *frame, gpointer data)
{
(void)web_view;
(void)frame;
- (void)navigation_action;
- (void)user_data;
-
- webkit_web_policy_decision_ignore(policy_decision);
- client_new(webkit_network_request_get_uri(request));
+ (void)data;
- return TRUE;
+ return client_new(NULL);
}
void
}
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
gtk_entry_set_text(GTK_ENTRY(c->location), (t == NULL ? __NAME__ : t));
}
+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;
+
+ (void)web_view;
+ (void)data;
+
+ path = g_build_filename(download_dir,
+ webkit_download_get_suggested_filename(download),
+ NULL);
+ path2 = g_strdup(path);
+ while (g_file_test(path2, G_FILE_TEST_EXISTS) && suffix < 1000)
+ {
+ g_free(path2);
+
+ path2 = g_strdup_printf("%s.%d", path, suffix);
+ suffix++;
+ }
+
+ if (suffix == 1000)
+ {
+ fprintf(stderr, __NAME__": Suffix reached limit for download.\n");
+ ret = FALSE;
+ }
+ else
+ {
+ uri = g_filename_to_uri(path2, NULL, NULL);
+ 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);
+ g_free(path2);
+
+ 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;
}
-gboolean
-download_wget(WebKitWebView *web_view, WebKitDownload *download, gpointer data)
+void
+downloadmanager_cancel(GtkToolButton *tb, gpointer data)
{
- const gchar *uri;
- char id[16] = "";
- gint ret;
+ WebKitDownload *download = WEBKIT_DOWNLOAD(data);
- (void)web_view;
- (void)data;
+ webkit_download_cancel(download);
+ g_object_unref(download);
- uri = webkit_download_get_uri(download);
- if (fork() == 0)
- {
- chdir(download_dir);
- if (embed == 0)
- ret = execlp("xterm", "xterm", "-hold", "-e", "wget", uri, NULL);
- else
- {
- if (snprintf(id, 16, "%ld", embed) >= 16)
- {
- fprintf(stderr, __NAME__": id for xterm embed truncated!\n");
- exit(EXIT_FAILURE);
- }
- ret = execlp("xterm", "xterm", "-hold", "-into", id, "-e", "wget",
- uri, NULL);
- }
+ gtk_widget_destroy(GTK_WIDGET(tb));
+}
- if (ret == -1)
- {
- fprintf(stderr, __NAME__": exec'ing xterm for download");
- perror(" failed");
- exit(EXIT_FAILURE);
- }
- }
+void
+downloadmanager_progress(GObject *obj, GParamSpec *pspec, gpointer data)
+{
+ WebKitDownload *download = WEBKIT_DOWNLOAD(obj);
+ GtkToolItem *tb = GTK_TOOL_ITEM(data);
+ gdouble p;
+ gchar *t;
- return FALSE;
+ (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);
+
+ 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 *
f = g_ascii_strdown(t, -1);
if (!g_str_has_prefix(f, "http:") &&
- !g_str_has_prefix(f, "https:") &&
- !g_str_has_prefix(f, "file:") &&
- !g_str_has_prefix(f, "about:"))
+ !g_str_has_prefix(f, "https:") &&
+ !g_str_has_prefix(f, "file:") &&
+ !g_str_has_prefix(f, "about:"))
{
g_free(f);
f = g_strdup_printf("http://%s", t);
void
grab_environment_configuration(void)
{
- gchar *u, *v;
const gchar *e;
- u = g_ascii_strup(__NAME__, -1);
-
- v = g_strdup_printf("%s_ACCEPTED_LANGUAGE", u);
- e = g_getenv(v);
+ e = g_getenv(__NAME_UPPERCASE__"_ACCEPTED_LANGUAGE");
if (e != NULL)
- {
accepted_language = g_strdup(e);
- }
- g_free(v);
- v = g_strdup_printf("%s_DOWNLOAD_DIR", u);
- e = g_getenv(v);
+ e = g_getenv(__NAME_UPPERCASE__"_DOWNLOAD_DIR");
if (e != NULL)
- {
download_dir = g_strdup(e);
- }
- g_free(v);
- v = g_strdup_printf("%s_ZOOM", u);
- e = g_getenv(v);
+ e = g_getenv(__NAME_UPPERCASE__"_ZOOM");
if (e != NULL)
- {
global_zoom = atof(e);
- }
- g_free(v);
-
- g_free(u);
}
void
-hover_web_view(WebKitWebView *web_view, gchar *title, gchar *uri,
- gpointer data)
+hover_web_view(WebKitWebView *web_view, gchar *title, gchar *uri, gpointer data)
{
struct Client *c = (struct Client *)data;
(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
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);
}
gtk_entry_set_text(GTK_ENTRY(c->location),
(t == NULL ? __NAME__ : t));
return TRUE;
+ case GDK_KEY_d:
+ if (((GdkEventKey *)event)->state & GDK_CONTROL_MASK)
+ {
+ gtk_widget_show_all(dm.win);
+ return TRUE;
+ }
+ else
+ return FALSE;
}
}
struct Client *c = (struct Client *)data;
WebKitHitTestResultContext ht_context;
WebKitHitTestResult *ht_result = NULL;
- char *ht_uri = NULL;
+ gchar *ht_uri = NULL, *f;
(void)widget;
search(c, -1);
return TRUE;
case GDK_KEY_g:
- webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view),
- first_uri);
+ 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_d:
+ gtk_widget_show_all(dm.win);
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_RELEASE)
+ else if (event->type == GDK_BUTTON_PRESS)
{
switch (((GdkEventButton *)event)->button)
{
adblock_load();
cooperation_setup();
+ downloadmanager_setup();
if (tabbed_automagic && !(cooperative_instances && !cooperative_alone))
embed = tabbed_launch();
projects / chorizo.git / blobdiff