#include <string.h>
#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
+#include <gtk/gtkx.h>
#include <gdk/gdkkeysyms.h>
#include <gio/gio.h>
-#include <webkit/webkit.h>
+#include <webkit2/webkit2.h>
+#if 0
static void adblock(WebKitWebView *, WebKitWebFrame *, WebKitWebResource *,
WebKitNetworkRequest *, WebKitNetworkResponse *, gpointer);
static void adblock_load(void);
+#endif
static void client_destroy(GtkWidget *, gpointer);
static gboolean client_destroy_request(WebKitWebView *, gpointer);
static WebKitWebView *client_new(const gchar *);
-static WebKitWebView *client_new_request(WebKitWebView *, WebKitWebFrame *,
+static WebKitWebView *client_new_request(WebKitWebView *, WebKitNavigationAction *,
gpointer);
static void cooperation_setup(void);
static void changed_download_progress(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_setup(void);
static gchar *ensure_uri_scheme(const gchar *);
static gchar *search_text = NULL;
static gboolean show_all_requests = FALSE;
static gboolean tabbed_automagic = TRUE;
+static gchar *user_agent = "Mozilla/5.0 (X11; U; Unix; en-US) "
+ "AppleWebKit/537.15 (KHTML, like Gecko) "
+ "Chrome/24.0.1295.0 "
+ "Safari/537.15 "__NAME_CAPITALIZED__"/git";
+#if 0
void
adblock(WebKitWebView *web_view, WebKitWebFrame *frame,
WebKitWebResource *resource, WebKitNetworkRequest *request,
}
g_free(path);
}
+#endif
void
client_destroy(GtkWidget *obj, gpointer data)
client_new(const gchar *uri)
{
struct Client *c;
+ WebKitWebContext *wc;
gchar *f;
if (uri != NULL && cooperative_instances && !cooperative_alone)
gtk_window_set_wmclass(GTK_WINDOW(c->win), __NAME__, __NAME_CAPITALIZED__);
}
- /* When using Gtk2, it only shows a white area when run in suckless'
- * tabbed. It appears we need to set a default window size for this
- * 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);
gtk_window_set_title(GTK_WINDOW(c->win), __NAME__);
c->web_view = webkit_web_view_new();
+ wc = webkit_web_view_get_context(WEBKIT_WEB_VIEW(c->web_view));
/* XXX I really do want to enable this option. However, I get
* reproducible crashes with it enabled. I've seen bug reports from
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::progress",
+ g_signal_connect(G_OBJECT(c->web_view), "notify::estimated-load-progress",
G_CALLBACK(changed_load_progress), c);
- g_signal_connect(G_OBJECT(c->web_view), "create-web-view",
+ g_signal_connect(G_OBJECT(c->web_view), "create",
G_CALLBACK(client_new_request), NULL);
- g_signal_connect(G_OBJECT(c->web_view), "close-web-view",
+ g_signal_connect(G_OBJECT(c->web_view), "close",
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_signal_connect(G_OBJECT(wc), "download-requested",
G_CALLBACK(download_handle), c);
g_signal_connect(G_OBJECT(c->web_view), "key-press-event",
G_CALLBACK(key_web_view), c);
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->web_view), "resource-request-starting",
G_CALLBACK(adblock), NULL);
+ */
if (!language_is_set)
{
- g_object_set(webkit_get_default_session(), "accept-language",
- accepted_language, NULL);
+ /* XXX make this pretty */
+ const gchar *languages[2];
+ languages[0] = accepted_language;
+ languages[1] = NULL;
+ webkit_web_context_set_preferred_languages(wc, languages);
language_is_set = TRUE;
}
+ /*
+ g_object_set(G_OBJECT(webkit_web_view_get_settings(WEBKIT_WEB_VIEW(c->web_view))),
+ "user-agent", user_agent, NULL);
+ */
+
c->scroll = gtk_scrolled_window_new(NULL, NULL);
gtk_container_add(GTK_CONTAINER(c->scroll), c->web_view);
g_signal_connect(G_OBJECT(c->location), "key-press-event",
G_CALLBACK(key_location), c);
- c->progress = gtk_progress_bar_new();
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->progress), 0);
+ /* XXX Progress bars don't work/look as intended anymore. Level bars
+ * are a dirty workaround (kind of). */
+ c->progress = gtk_level_bar_new();
+ gtk_level_bar_set_value(GTK_LEVEL_BAR(c->progress), 0);
+ gtk_widget_set_size_request(c->progress, 100, -1);
- c->status = gtk_progress_bar_new();
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->status), 0);
+ c->status = gtk_level_bar_new();
+ gtk_level_bar_set_value(GTK_LEVEL_BAR(c->status), 0);
gtk_widget_set_size_request(c->status, 20, -1);
- c->top_box = gtk_hbox_new(FALSE, 0);
+ c->top_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 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);
+ gtk_box_pack_start(GTK_BOX(c->top_box), c->progress, FALSE, FALSE, 2);
- c->vbox = gtk_vbox_new(FALSE, 0);
+ c->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 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_start(GTK_BOX(c->vbox), c->scroll, TRUE, TRUE, 2);
gtk_container_add(GTK_CONTAINER(c->win), c->vbox);
}
WebKitWebView *
-client_new_request(WebKitWebView *web_view, WebKitWebFrame *frame, gpointer data)
+client_new_request(WebKitWebView *web_view,
+ WebKitNavigationAction *navigation_action, gpointer data)
{
return client_new(NULL);
}
changed_download_progress(GObject *obj, GParamSpec *pspec, gpointer data)
{
WebKitDownload *download = WEBKIT_DOWNLOAD(obj);
+ WebKitURIResponse *resp;
GtkToolItem *tb = GTK_TOOL_ITEM(data);
- gdouble p;
+ gdouble p, size_mb;
const gchar *uri;
gchar *t, *filename, *base;
- p = webkit_download_get_progress(download) * 100;
+ p = webkit_download_get_estimated_progress(download) * 100;
+ resp = webkit_download_get_response(download);
+ size_mb = webkit_uri_response_get_content_length(resp) / 1e6;
- uri = webkit_download_get_destination_uri(download);
+ uri = webkit_download_get_destination(download);
filename = g_filename_from_uri(uri, NULL, NULL);
if (filename == NULL)
{
/* This really should not happen because WebKit uses that URI to
* write to a file... */
fprintf(stderr, __NAME__": Could not construct file name from URI!\n");
- t = g_strdup_printf("%s (%.0f%%)",
- webkit_download_get_suggested_filename(download), p);
+ t = g_strdup_printf("%s (%.0f%% of %.1f MB)",
+ webkit_uri_response_get_uri(resp), p, size_mb);
}
else
{
base = g_path_get_basename(filename);
- t = g_strdup_printf("%s (%.0f%%)", base, p);
+ t = g_strdup_printf("%s (%.0f%% of %.1f MB)", base, p, size_mb);
g_free(filename);
g_free(base);
}
struct Client *c = (struct Client *)data;
gdouble p;
- p = webkit_web_view_get_progress(WEBKIT_WEB_VIEW(c->web_view));
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->progress), p);
+ p = webkit_web_view_get_estimated_load_progress(WEBKIT_WEB_VIEW(c->web_view));
+ gtk_level_bar_set_value(GTK_LEVEL_BAR(c->progress), p);
}
void
download_handle(WebKitWebView *web_view, WebKitDownload *download, gpointer data)
{
struct Client *c = (struct Client *)data;
+ WebKitURIResponse *resp;
gchar *path, *path2 = NULL, *uri;
GtkToolItem *tb;
gboolean ret;
int suffix = 1;
+ resp = webkit_download_get_response(download);
path = g_build_filename(download_dir,
- webkit_download_get_suggested_filename(download),
+ webkit_uri_response_get_suggested_filename(resp),
NULL);
path2 = g_strdup(path);
while (g_file_test(path2, G_FILE_TEST_EXISTS) && suffix < 1000)
else
{
uri = g_filename_to_uri(path2, NULL, NULL);
- webkit_download_set_destination_uri(download, uri);
+ webkit_download_set_destination(download, uri);
ret = TRUE;
g_free(uri);
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->status), 1);
+ gtk_level_bar_set_value(GTK_LEVEL_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));
+ webkit_uri_response_get_suggested_filename(resp));
gtk_toolbar_insert(GTK_TOOLBAR(dm.toolbar), tb, 0);
gtk_widget_show_all(dm.toolbar);
- g_signal_connect(G_OBJECT(download), "notify::progress",
+ g_signal_connect(G_OBJECT(download), "notify::estimated-progress",
G_CALLBACK(changed_download_progress), tb);
g_object_ref(download);
downloads_indicated--;
if (downloads_indicated == 0)
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->status), 0);
+ gtk_level_bar_set_value(GTK_LEVEL_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)
if (e != NULL)
home_uri = g_strdup(e);
+ e = g_getenv(__NAME_UPPERCASE__"_USER_AGENT");
+ if (e != NULL)
+ user_agent = g_strdup(e);
+
e = g_getenv(__NAME_UPPERCASE__"_ZOOM");
if (e != NULL)
global_zoom = atof(e);
webkit_web_view_reload_bypass_cache(WEBKIT_WEB_VIEW(
c->web_view));
return TRUE;
+#if 0
case GDK_KEY_s: /* toggle source view (left hand) */
b = webkit_web_view_get_view_source_mode(WEBKIT_WEB_VIEW(
c->web_view));
c->web_view), b);
webkit_web_view_reload(WEBKIT_WEB_VIEW(c->web_view));
return TRUE;
+#endif
case GDK_KEY_d: /* download manager (left hand) */
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_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->progress), 0);
+ gtk_level_bar_set_value(GTK_LEVEL_BAR(c->progress), 0);
}
}
else if (event->type == GDK_BUTTON_PRESS)
{
switch (((GdkEventButton *)event)->button)
{
+#if 0
case 2:
ht_result = webkit_web_view_get_hit_test_result(
WEBKIT_WEB_VIEW(c->web_view),
}
g_object_unref(ht_result);
break;
+#endif
case 8:
webkit_web_view_go_back(WEBKIT_WEB_VIEW(c->web_view));
return TRUE;
switch (((GdkEventScroll *)event)->direction)
{
case GDK_SCROLL_UP:
- z = webkit_web_view_get_zoom_level(WEBKIT_WEB_VIEW(
- c->web_view));
+ z = webkit_web_view_get_zoom_level(WEBKIT_WEB_VIEW(c->web_view));
z += 0.1;
- webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view),
- z);
+ webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view), z);
return TRUE;
case GDK_SCROLL_DOWN:
- z = webkit_web_view_get_zoom_level(WEBKIT_WEB_VIEW(
- c->web_view));
+ z = webkit_web_view_get_zoom_level(WEBKIT_WEB_VIEW(c->web_view));
z -= 0.1;
- webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view),
- z);
+ webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view), z);
return TRUE;
default:
break;
{
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_hash_table_insert(keywords, g_strdup(tokens[0]),
+ g_strdup(tokens[1]));
+ g_strfreev(tokens);
}
g_free(buf);
}
if (search_text == NULL)
return;
+ /*
webkit_web_view_search_text(WEBKIT_WEB_VIEW(c->web_view), search_text,
FALSE, direction == 1, TRUE);
+ */
}
Window
}
}
- adblock_load();
+ /*adblock_load();*/
keywords_load();
cooperation_setup();
downloadmanager_setup();
projects / chorizo.git / blobdiff