X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=browser.c;h=73143aca411e8fa4879c03918371bfc7cd14046a;hb=86fbb28fdcb70733c426219a1b3bc44dc0a27e46;hp=dabc00f32c63e713d72c119e18cac88ce1d2ea7a;hpb=385483de0c99c7665fe5d600d30a766c502c69ea;p=chorizo.git diff --git a/browser.c b/browser.c index dabc00f..73143ac 100644 --- a/browser.c +++ b/browser.c @@ -11,6 +11,7 @@ #include #include #include +#include static void client_destroy(GtkWidget *, gpointer); @@ -34,7 +35,9 @@ static void downloadmanager_setup(void); static gchar *ensure_uri_scheme(const gchar *); static void external_handler_run(GSimpleAction *, GVariant *, gpointer); static void grab_environment_configuration(void); +static void grab_feeds_finished(GObject *, GAsyncResult *, gpointer); static void hover_web_view(WebKitWebView *, WebKitHitTestResult *, guint, gpointer); +static void icon_location(GtkEntry *, GtkEntryIconPosition, GdkEvent *, gpointer); static gboolean key_common(GtkWidget *, GdkEvent *, gpointer); static gboolean key_downloadmanager(GtkWidget *, GdkEvent *, gpointer); static gboolean key_location(GtkWidget *, GdkEvent *, gpointer); @@ -45,9 +48,9 @@ static gboolean menu_web_view(WebKitWebView *, WebKitContextMenu *, GdkEvent *, WebKitHitTestResult *, gpointer); static gboolean quit_if_nothing_active(void); static gboolean remote_msg(GIOChannel *, GIOCondition, gpointer); +static void run_user_scripts(WebKitWebView *); static void search(gpointer, gint); static void show_web_view(WebKitWebView *, gpointer); -static Window tabbed_launch(void); static void trust_user_certs(WebKitWebContext *); @@ -55,6 +58,7 @@ struct Client { gchar *external_handler_uri; gchar *hover_uri; + gchar *feed_html; GtkWidget *location; GtkWidget *vbox; GtkWidget *web_view; @@ -75,9 +79,7 @@ static gboolean cooperative_alone = TRUE; static gboolean cooperative_instances = TRUE; static int cooperative_pipe_fp = 0; static gchar *download_dir = "/var/tmp"; -static gboolean enable_webgl = FALSE; static gboolean enable_console_to_stdout = FALSE; -static Window embed = 0; static gchar *fifo_suffix = "main"; static gdouble global_zoom = 1.0; static gchar *history_file = NULL; @@ -85,7 +87,6 @@ static gchar *home_uri = "about:blank"; static gboolean initial_wc_setup_done = FALSE; static GHashTable *keywords = NULL; static gchar *search_text = NULL; -static gboolean tabbed_automagic = TRUE; static gchar *user_agent = NULL; @@ -136,18 +137,6 @@ client_new(const gchar *uri, WebKitWebView *related_wv, gboolean show) exit(EXIT_FAILURE); } - if (embed != 0) - { - c->win = gtk_plug_new(embed); - if (!gtk_plug_get_embedded(GTK_PLUG(c->win))) - { - fprintf(stderr, __NAME__": Can't plug-in to XID %ld.\n", embed); - gtk_widget_destroy(c->win); - c->win = NULL; - embed = 0; - } - } - if (c->win == NULL) c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL); @@ -179,7 +168,7 @@ client_new(const gchar *uri, WebKitWebView *related_wv, gboolean show) G_CALLBACK(decide_policy), NULL); 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->web_view), "button-release-event", G_CALLBACK(key_web_view), c); g_signal_connect(G_OBJECT(c->web_view), "scroll-event", G_CALLBACK(key_web_view), c); @@ -208,12 +197,21 @@ client_new(const gchar *uri, WebKitWebView *related_wv, gboolean show) if (enable_console_to_stdout) webkit_settings_set_enable_write_console_messages_to_stdout(webkit_web_view_get_settings(WEBKIT_WEB_VIEW(c->web_view)), TRUE); - if (enable_webgl) - webkit_settings_set_enable_webgl(webkit_web_view_get_settings(WEBKIT_WEB_VIEW(c->web_view)), TRUE); + webkit_settings_set_enable_developer_extras(webkit_web_view_get_settings(WEBKIT_WEB_VIEW(c->web_view)), TRUE); c->location = gtk_entry_new(); g_signal_connect(G_OBJECT(c->location), "key-press-event", G_CALLBACK(key_location), c); + g_signal_connect(G_OBJECT(c->location), "icon-release", + G_CALLBACK(icon_location), c); + /* XXX This is a workaround. Setting this to NULL (which is done in + * grab_feeds_finished() if no feed has been detected) adds a little + * padding left of the text. Not sure why. The point of this call + * right here is to have that padding right from the start. This + * avoids a graphical artifact. */ + gtk_entry_set_icon_from_icon_name(GTK_ENTRY(c->location), + GTK_ENTRY_ICON_PRIMARY, + NULL); c->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); gtk_box_pack_start(GTK_BOX(c->vbox), c->location, FALSE, FALSE, 0); @@ -324,10 +322,43 @@ changed_load_progress(GObject *obj, GParamSpec *pspec, gpointer data) { struct Client *c = (struct Client *)data; gdouble p; + gchar *grab_feeds = + "a = document.querySelectorAll('" + " html > head > link[rel=\"alternate\"][href][type=\"application/atom+xml\"]," + " html > head > link[rel=\"alternate\"][href][type=\"application/rss+xml\"]" + "');" + "if (a.length == 0)" + " null;" + "else" + "{" + " out = '';" + " for (i = 0; i < a.length; i++)" + " {" + " url = encodeURIComponent(a[i].href);" + " if ('title' in a[i] && a[i].title != '')" + " title = encodeURIComponent(a[i].title);" + " else" + " title = url;" + " out += '
  • ' + title + '
    • ';" + " }" + " out;" + "}"; p = webkit_web_view_get_estimated_load_progress(WEBKIT_WEB_VIEW(c->web_view)); if (p == 1) + { p = 0; + + /* The page has loaded fully. We now run the short JavaScript + * snippet above that operates on the DOM. It tries to grab all + * occurences of , i.e. RSS/Atom feed + * references. */ + webkit_web_view_run_javascript(WEBKIT_WEB_VIEW(c->web_view), + grab_feeds, NULL, + grab_feeds_finished, c); + + run_user_scripts(WEBKIT_WEB_VIEW(c->web_view)); + } gtk_entry_set_progress_fraction(GTK_ENTRY(c->location), p); } @@ -545,7 +576,8 @@ ensure_uri_scheme(const gchar *t) 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, "about:") && + !g_str_has_prefix(f, "data:")) { g_free(f); fabs = realpath(t, NULL); @@ -602,10 +634,6 @@ grab_environment_configuration(void) if (e != NULL) enable_console_to_stdout = TRUE; - e = g_getenv(__NAME_UPPERCASE__"_ENABLE_EXPERIMENTAL_WEBGL"); - if (e != NULL) - enable_webgl = TRUE; - e = g_getenv(__NAME_UPPERCASE__"_FIFO_SUFFIX"); if (e != NULL) fifo_suffix = g_strdup(e); @@ -627,6 +655,63 @@ grab_environment_configuration(void) global_zoom = atof(e); } +void +grab_feeds_finished(GObject *object, GAsyncResult *result, gpointer data) +{ + struct Client *c = (struct Client *)data; + WebKitJavascriptResult *js_result; + JSCValue *value; + JSCException *exception; + GError *err = NULL; + gchar *str_value; + + g_free(c->feed_html); + c->feed_html = NULL; + + /* This was taken almost verbatim from the example in WebKit's + * documentation: + * + * https://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebView.html#webkit-web-view-run-javascript-finish */ + + js_result = webkit_web_view_run_javascript_finish(WEBKIT_WEB_VIEW(object), + result, &err); + if (!js_result) + { + fprintf(stderr, __NAME__": Error running javascript: %s\n", err->message); + g_error_free(err); + return; + } + + value = webkit_javascript_result_get_js_value(js_result); + if (jsc_value_is_string(value)) + { + str_value = jsc_value_to_string(value); + exception = jsc_context_get_exception(jsc_value_get_context(value)); + if (exception != NULL) + { + fprintf(stderr, __NAME__": Error running javascript: %s\n", + jsc_exception_get_message(exception)); + } + else + c->feed_html = str_value; + + gtk_entry_set_icon_from_icon_name(GTK_ENTRY(c->location), + GTK_ENTRY_ICON_PRIMARY, + "application-rss+xml-symbolic"); + gtk_entry_set_icon_activatable(GTK_ENTRY(c->location), + GTK_ENTRY_ICON_PRIMARY, + TRUE); + } + else + { + gtk_entry_set_icon_from_icon_name(GTK_ENTRY(c->location), + GTK_ENTRY_ICON_PRIMARY, + NULL); + } + + webkit_javascript_result_unref(js_result); +} + void hover_web_view(WebKitWebView *web_view, WebKitHitTestResult *ht, guint modifiers, gpointer data) @@ -656,6 +741,49 @@ hover_web_view(WebKitWebView *web_view, WebKitHitTestResult *ht, guint modifiers } } +void +icon_location(GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEvent *event, + gpointer data) +{ + struct Client *c = (struct Client *)data; + gchar *d; + gchar *data_template = + "data:text/html," + "" + "" + " " + " " + " Feeds" + " " + " " + "

    Feeds found on this page:

    " + "
      " + " %s" + "
    " + " " + ""; + + if (c->feed_html != NULL) + { + /* What we're actually trying to do is show a simple HTML page + * that lists all the feeds on the current page. The function + * webkit_web_view_load_html() looks like the proper way to do + * that. Sad thing is, it doesn't create a history entry, but + * instead simply replaces the content of the current page. This + * is not what we want. + * + * RFC 2397 [0] defines the data URI scheme [1]. We abuse this + * mechanism to show my custom HTML snippet *and* create a + * history entry. + * + * [0]: https://tools.ietf.org/html/rfc2397 + * [1]: https://en.wikipedia.org/wiki/Data_URI_scheme */ + d = g_strdup_printf(data_template, c->feed_html); + webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), d); + g_free(d); + } +} + gboolean key_common(GtkWidget *widget, GdkEvent *event, gpointer data) { @@ -775,7 +903,7 @@ key_location(GtkWidget *widget, GdkEvent *event, gpointer data) { if (search_text != NULL) g_free(search_text); - search_text = g_strdup(t + 2); /* XXX whacky */ + search_text = g_strdup(t + 2); search(c, 0); } else if (!keywords_try_search(WEBKIT_WEB_VIEW(c->web_view), t)) @@ -814,7 +942,7 @@ key_web_view(GtkWidget *widget, GdkEvent *event, gpointer data) gtk_entry_set_progress_fraction(GTK_ENTRY(c->location), 0); } } - else if (event->type == GDK_BUTTON_PRESS) + else if (event->type == GDK_BUTTON_RELEASE) { switch (((GdkEventButton *)event)->button) { @@ -981,6 +1109,36 @@ remote_msg(GIOChannel *channel, GIOCondition condition, gpointer data) return TRUE; } +void +run_user_scripts(WebKitWebView *web_view) +{ + gchar *base = NULL, *path = NULL, *contents = NULL; + const gchar *entry = NULL; + GDir *scriptdir = NULL; + + base = g_build_filename(g_get_user_config_dir(), __NAME__, "user-scripts", NULL); + scriptdir = g_dir_open(base, 0, NULL); + if (scriptdir != NULL) + { + while ((entry = g_dir_read_name(scriptdir)) != NULL) + { + path = g_build_filename(base, entry, NULL); + if (g_str_has_suffix(path, ".js")) + { + if (g_file_get_contents(path, &contents, NULL, NULL)) + { + webkit_web_view_run_javascript(web_view, contents, NULL, NULL, NULL); + g_free(contents); + } + } + g_free(path); + } + g_dir_close(scriptdir); + } + + g_free(base); +} + void search(gpointer data, gint direction) { @@ -1019,46 +1177,6 @@ show_web_view(WebKitWebView *web_view, gpointer data) gtk_widget_show_all(c->win); } -Window -tabbed_launch(void) -{ - gint tabbed_stdout; - GIOChannel *tabbed_stdout_channel; - GError *err = NULL; - gchar *output = NULL; - char *argv[] = { "tabbed", "-c", "-d", "-p", "s1", "-n", __NAME__, NULL }; - Window plug_into; - - if (!g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, - NULL, NULL, NULL, &tabbed_stdout, NULL, - &err)) - { - fprintf(stderr, __NAME__": Could not launch tabbed: %s\n", err->message); - g_error_free(err); - return 0; - } - - tabbed_stdout_channel = g_io_channel_unix_new(tabbed_stdout); - if (tabbed_stdout_channel == NULL) - { - fprintf(stderr, __NAME__": Could open tabbed's stdout\n"); - return 0; - } - g_io_channel_read_line(tabbed_stdout_channel, &output, NULL, NULL, NULL); - g_io_channel_shutdown(tabbed_stdout_channel, FALSE, NULL); - if (output == NULL) - { - fprintf(stderr, __NAME__": Could not read XID from tabbed\n"); - return 0; - } - g_strstrip(output); - plug_into = strtol(output, NULL, 16); - g_free(output); - if (plug_into == 0) - fprintf(stderr, __NAME__": The XID from tabbed is 0\n"); - return plug_into; -} - void trust_user_certs(WebKitWebContext *wc) { @@ -1099,20 +1217,13 @@ main(int argc, char **argv) grab_environment_configuration(); - while ((opt = getopt(argc, argv, "e:CT")) != -1) + while ((opt = getopt(argc, argv, "C")) != -1) { switch (opt) { - case 'e': - embed = atol(optarg); - tabbed_automagic = FALSE; - break; case 'C': cooperative_instances = FALSE; break; - case 'T': - tabbed_automagic = FALSE; - break; default: fprintf(stderr, "Usage: "__NAME__" [OPTION]... [URI]...\n"); exit(EXIT_FAILURE); @@ -1124,9 +1235,6 @@ main(int argc, char **argv) cooperation_setup(); downloadmanager_setup(); - if (tabbed_automagic && !(cooperative_instances && !cooperative_alone)) - embed = tabbed_launch(); - if (!cooperative_instances || cooperative_alone) { c = g_build_filename(g_get_user_config_dir(), __NAME__, "web_extensions",