X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=browser.c;h=8df0e330777700e743a953d9cd7123db95e30109;hb=7739f77980be760b31395546053577e9fe64ef10;hp=847cf09e3b6651396dfad08bad3dcb92ecdf0950;hpb=813150ab894f92565735ad5b140a41a512fc6264;p=chorizo.git diff --git a/browser.c b/browser.c index 847cf09..8df0e33 100644 --- a/browser.c +++ b/browser.c @@ -14,48 +14,45 @@ #include -static gboolean button_tablabel(GtkWidget *, GdkEvent *, gpointer); -static void client_destroy(GtkWidget *, gpointer); -static WebKitWebView *client_new(const gchar *, WebKitWebView *, gboolean); -static WebKitWebView *client_new_request(WebKitWebView *, WebKitNavigationAction *, - gpointer); -static void cooperation_setup(void); -static void changed_download_progress(GObject *, GParamSpec *, gpointer); -static void changed_load_progress(GObject *, GParamSpec *, gpointer); -static void changed_favicon(GObject *, GParamSpec *, gpointer); -static void changed_title(GObject *, GParamSpec *, gpointer); -static void changed_uri(GObject *, GParamSpec *, gpointer); -static gboolean crashed_web_view(WebKitWebView *, gpointer); -static gboolean decide_policy(WebKitWebView *, WebKitPolicyDecision *, - WebKitPolicyDecisionType, gpointer); -static gboolean download_handle(WebKitDownload *, gchar *, gpointer); -static void download_handle_start(WebKitWebView *, WebKitDownload *, gpointer); -static void downloadmanager_cancel(GtkToolButton *, gpointer); -static gboolean downloadmanager_delete(GtkWidget *, gpointer); -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); -static gboolean key_web_view(GtkWidget *, GdkEvent *, gpointer); -static void keywords_load(void); -static gboolean keywords_try_search(WebKitWebView *, const gchar *); -static void mainwindow_setup(void); -static void mainwindow_title(gint); -static void mainwindow_title_before(GtkNotebook *, GtkWidget *, guint, gpointer); -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 void trust_user_certs(WebKitWebContext *); +void client_destroy(GtkWidget *, gpointer); +WebKitWebView *client_new(const gchar *, WebKitWebView *, gboolean, + gboolean); +WebKitWebView *client_new_request(WebKitWebView *, WebKitNavigationAction *, + gpointer); +void cooperation_setup(void); +void changed_download_progress(GObject *, GParamSpec *, gpointer); +void changed_load_progress(GObject *, GParamSpec *, gpointer); +void changed_favicon(GObject *, GParamSpec *, gpointer); +void changed_title(GObject *, GParamSpec *, gpointer); +void changed_uri(GObject *, GParamSpec *, gpointer); +gboolean crashed_web_view(WebKitWebView *, gpointer); +gboolean decide_policy(WebKitWebView *, WebKitPolicyDecision *, + WebKitPolicyDecisionType, gpointer); +gboolean download_handle(WebKitDownload *, gchar *, gpointer); +void download_handle_start(WebKitWebView *, WebKitDownload *, gpointer); +void downloadmanager_cancel(GtkToolButton *, gpointer); +gboolean downloadmanager_delete(GtkWidget *, gpointer); +void downloadmanager_setup(void); +gchar *ensure_uri_scheme(const gchar *); +void grab_environment_configuration(void); +void grab_feeds_finished(GObject *, GAsyncResult *, gpointer); +void hover_web_view(WebKitWebView *, WebKitHitTestResult *, guint, gpointer); +void icon_location(GtkEntry *, GtkEntryIconPosition, GdkEvent *, gpointer); +void init_default_web_context(void); +gboolean key_common(GtkWidget *, GdkEvent *, gpointer); +gboolean key_downloadmanager(GtkWidget *, GdkEvent *, gpointer); +gboolean key_location(GtkWidget *, GdkEvent *, gpointer); +gboolean key_tablabel(GtkWidget *, GdkEvent *, gpointer); +gboolean key_web_view(GtkWidget *, GdkEvent *, gpointer); +void mainwindow_setup(void); +void mainwindow_title(gint); +void notebook_switch_page(GtkNotebook *, GtkWidget *, guint, gpointer); +gboolean quit_if_nothing_active(void); +gboolean remote_msg(GIOChannel *, GIOCondition, gpointer); +void run_user_scripts(WebKitWebView *); +void search(gpointer, gint); +void show_web_view(WebKitWebView *, gpointer); +void trust_user_certs(WebKitWebContext *); struct Client @@ -68,6 +65,7 @@ struct Client GtkWidget *tablabel; GtkWidget *vbox; GtkWidget *web_view; + gboolean focus_new_tab; }; struct MainWindow @@ -84,40 +82,23 @@ struct DownloadManager } dm; -static const gchar *accepted_language[2] = { NULL, NULL }; -static gint clients = 0, downloads = 0; -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_console_to_stdout = FALSE; -static gchar *fifo_suffix = "main"; -static gdouble global_zoom = 1.0; -static gchar *history_file = NULL; -static gchar *home_uri = "about:blank"; -static gboolean initial_wc_setup_done = FALSE; -static GHashTable *keywords = NULL; -static gchar *search_text = NULL; -static GtkPositionType tab_pos = GTK_POS_TOP; -static gint tab_width_chars = 20; -static gchar *user_agent = NULL; +const gchar *accepted_language[2] = { NULL, NULL }; +gint clients = 0, downloads = 0; +gboolean cooperative_alone = TRUE; +gboolean cooperative_instances = TRUE; +int cooperative_pipe_fp = 0; +gchar *download_dir = "/var/tmp"; +gboolean enable_console_to_stdout = FALSE; +gchar *fifo_suffix = "main"; +gdouble global_zoom = 1.0; +gchar *history_file = NULL; +gchar *home_uri = "about:blank"; +gchar *search_text = NULL; +GtkPositionType tab_pos = GTK_POS_TOP; +gint tab_width_chars = 20; +gchar *user_agent = NULL; -gboolean -button_tablabel(GtkWidget *widget, GdkEvent *event, gpointer data) -{ - if (event->type == GDK_BUTTON_RELEASE) - { - switch (((GdkEventButton *)event)->button) - { - case 2: - client_destroy(NULL, data); - return TRUE; - } - } - return FALSE; -} - void client_destroy(GtkWidget *widget, gpointer data) { @@ -140,10 +121,10 @@ client_destroy(GtkWidget *widget, gpointer data) } WebKitWebView * -client_new(const gchar *uri, WebKitWebView *related_wv, gboolean show) +client_new(const gchar *uri, WebKitWebView *related_wv, gboolean show, + gboolean focus_tab) { struct Client *c; - WebKitWebContext *wc; gchar *f; GtkWidget *evbox, *tabbox; @@ -163,11 +144,12 @@ client_new(const gchar *uri, WebKitWebView *related_wv, gboolean show) exit(EXIT_FAILURE); } + c->focus_new_tab = focus_tab; + if (related_wv == NULL) c->web_view = webkit_web_view_new(); else c->web_view = webkit_web_view_new_with_related_view(related_wv); - wc = webkit_web_view_get_context(WEBKIT_WEB_VIEW(c->web_view)); webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view), global_zoom); g_signal_connect(G_OBJECT(c->web_view), "notify::favicon", @@ -180,8 +162,6 @@ client_new(const gchar *uri, WebKitWebView *related_wv, gboolean show) G_CALLBACK(changed_load_progress), c); g_signal_connect(G_OBJECT(c->web_view), "create", G_CALLBACK(client_new_request), NULL); - g_signal_connect(G_OBJECT(c->web_view), "context-menu", - G_CALLBACK(menu_web_view), c); g_signal_connect(G_OBJECT(c->web_view), "close", G_CALLBACK(client_destroy), c); g_signal_connect(G_OBJECT(c->web_view), "decide-policy", @@ -197,21 +177,6 @@ client_new(const gchar *uri, WebKitWebView *related_wv, gboolean show) g_signal_connect(G_OBJECT(c->web_view), "web-process-crashed", G_CALLBACK(crashed_web_view), c); - if (!initial_wc_setup_done) - { - if (accepted_language[0] != NULL) - webkit_web_context_set_preferred_languages(wc, accepted_language); - - g_signal_connect(G_OBJECT(wc), "download-started", - G_CALLBACK(download_handle_start), NULL); - - trust_user_certs(wc); - - webkit_web_context_set_favicon_database_directory(wc, NULL); - - initial_wc_setup_done = TRUE; - } - if (user_agent != NULL) g_object_set(G_OBJECT(webkit_web_view_get_settings(WEBKIT_WEB_VIEW(c->web_view))), "user-agent", user_agent, NULL); @@ -239,27 +204,39 @@ client_new(const gchar *uri, WebKitWebView *related_wv, gboolean show) gtk_box_pack_start(GTK_BOX(c->vbox), c->location, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(c->vbox), c->web_view, TRUE, TRUE, 0); - c->tabicon = gtk_image_new_from_icon_name("text-html", GTK_ICON_SIZE_LARGE_TOOLBAR); + c->tabicon = gtk_image_new_from_icon_name("text-html", GTK_ICON_SIZE_SMALL_TOOLBAR); c->tablabel = gtk_label_new(__NAME__); gtk_label_set_ellipsize(GTK_LABEL(c->tablabel), PANGO_ELLIPSIZE_END); gtk_label_set_width_chars(GTK_LABEL(c->tablabel), tab_width_chars); + gtk_widget_set_has_tooltip(c->tablabel, TRUE); - tabbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); + /* XXX I don't own a HiDPI screen, so I don't know if scale_factor + * does the right thing. */ + tabbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, + 5 * gtk_widget_get_scale_factor(mw.win)); gtk_box_pack_start(GTK_BOX(tabbox), c->tabicon, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(tabbox), c->tablabel, TRUE, TRUE, 0); evbox = gtk_event_box_new(); gtk_container_add(GTK_CONTAINER(evbox), tabbox); g_signal_connect(G_OBJECT(evbox), "button-release-event", - G_CALLBACK(button_tablabel), c); + G_CALLBACK(key_tablabel), c); + + gtk_widget_add_events(evbox, GDK_SCROLL_MASK); + g_signal_connect(G_OBJECT(evbox), "scroll-event", + G_CALLBACK(key_tablabel), c); + + /* For easy access, store a reference to our label. */ + g_object_set_data(G_OBJECT(evbox), "lariza-tab-label", c->tablabel); /* This only shows the event box and the label inside, nothing else. * Needed because the evbox/label is "internal" to the notebook and * not part of the normal "widget tree" (IIUC). */ gtk_widget_show_all(evbox); - gtk_notebook_append_page(GTK_NOTEBOOK(mw.notebook), c->vbox, evbox); + gtk_notebook_insert_page(GTK_NOTEBOOK(mw.notebook), c->vbox, evbox, + gtk_notebook_get_current_page(GTK_NOTEBOOK(mw.notebook)) + 1); gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(mw.notebook), c->vbox, TRUE); if (show) @@ -284,7 +261,7 @@ WebKitWebView * client_new_request(WebKitWebView *web_view, WebKitNavigationAction *navigation_action, gpointer data) { - return client_new(NULL, web_view, FALSE); + return client_new(NULL, web_view, FALSE, FALSE); } void @@ -410,29 +387,29 @@ changed_favicon(GObject *obj, GParamSpec *pspec, gpointer data) { struct Client *c = (struct Client *)data; cairo_surface_t *f; - int w, h, w_scaled, h_scaled; + int w, h, w_should, h_should; GdkPixbuf *pb, *pb_scaled; f = webkit_web_view_get_favicon(WEBKIT_WEB_VIEW(c->web_view)); - if (f != NULL) + if (f == NULL) + { + gtk_image_set_from_icon_name(GTK_IMAGE(c->tabicon), "text-html", + GTK_ICON_SIZE_SMALL_TOOLBAR); + } + else { w = cairo_image_surface_get_width(f); h = cairo_image_surface_get_height(f); pb = gdk_pixbuf_get_from_surface(f, 0, 0, w, h); if (pb != NULL) { - if (w > 16 || h > 16) - { - w_scaled = 16 * gtk_widget_get_scale_factor(c->tabicon); - h_scaled = 16 * gtk_widget_get_scale_factor(c->tabicon); - pb_scaled = gdk_pixbuf_scale_simple(pb, w_scaled, h_scaled, - GDK_INTERP_BILINEAR); - gtk_image_set_from_pixbuf(GTK_IMAGE(c->tabicon), pb_scaled); - g_object_unref(pb_scaled); - } - else - gtk_image_set_from_pixbuf(GTK_IMAGE(c->tabicon), pb); + w_should = 16 * gtk_widget_get_scale_factor(c->tabicon); + h_should = 16 * gtk_widget_get_scale_factor(c->tabicon); + pb_scaled = gdk_pixbuf_scale_simple(pb, w_should, h_should, + GDK_INTERP_BILINEAR); + gtk_image_set_from_pixbuf(GTK_IMAGE(c->tabicon), pb_scaled); + g_object_unref(pb_scaled); g_object_unref(pb); } } @@ -454,7 +431,8 @@ changed_title(GObject *obj, GParamSpec *pspec, gpointer data) t = t[0] == 0 ? u : t; gtk_label_set_text(GTK_LABEL(c->tablabel), t); - mainwindow_title(-1); + gtk_widget_set_tooltip_text(c->tablabel, t); + mainwindow_title(gtk_notebook_get_current_page(GTK_NOTEBOOK(mw.notebook))); } void @@ -654,7 +632,8 @@ ensure_uri_scheme(const gchar *t) !g_str_has_prefix(f, "https:") && !g_str_has_prefix(f, "file:") && !g_str_has_prefix(f, "about:") && - !g_str_has_prefix(f, "data:")) + !g_str_has_prefix(f, "data:") && + !g_str_has_prefix(f, "webkit:")) { g_free(f); fabs = realpath(t, NULL); @@ -671,29 +650,6 @@ ensure_uri_scheme(const gchar *t) return g_strdup(t); } -void -external_handler_run(GSimpleAction *simple, GVariant *param, gpointer data) -{ - struct Client *c = (struct Client *)data; - gchar *argv[] = { "lariza-external-handler", "-u", NULL, NULL }; - GPid pid; - GError *err = NULL; - - (void)simple; - (void)param; - - argv[2] = c->external_handler_uri; - if (!g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, - &pid, &err)) - { - fprintf(stderr, __NAME__": Could not launch key handler: %s\n", - err->message); - g_error_free(err); - } - else - g_spawn_close_pid(pid); -} - void grab_environment_configuration(void) { @@ -878,6 +834,38 @@ icon_location(GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEvent *event, } } +void +init_default_web_context(void) +{ + gchar *p; + WebKitWebContext *wc; + + wc = webkit_web_context_get_default(); + + p = g_build_filename(g_get_user_config_dir(), __NAME__, "adblock.black", NULL); + webkit_web_context_set_sandbox_enabled(wc, TRUE); + webkit_web_context_add_path_to_sandbox(wc, p, TRUE); + g_free(p); + + webkit_web_context_set_process_model(wc, + WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES); + + p = g_build_filename(g_get_user_config_dir(), __NAME__, "web_extensions", + NULL); + webkit_web_context_set_web_extensions_directory(wc, p); + g_free(p); + + if (accepted_language[0] != NULL) + webkit_web_context_set_preferred_languages(wc, accepted_language); + + g_signal_connect(G_OBJECT(wc), "download-started", + G_CALLBACK(download_handle_start), NULL); + + trust_user_certs(wc); + + webkit_web_context_set_favicon_database_directory(wc, NULL); +} + gboolean key_common(GtkWidget *widget, GdkEvent *event, gpointer data) { @@ -901,7 +889,7 @@ key_common(GtkWidget *widget, GdkEvent *event, gpointer data) return TRUE; case GDK_KEY_e: /* new tab (left hand) */ f = ensure_uri_scheme(home_uri); - client_new(f, NULL, TRUE); + client_new(f, NULL, TRUE, TRUE); g_free(f); return TRUE; case GDK_KEY_r: /* reload (left hand) */ @@ -929,13 +917,6 @@ key_common(GtkWidget *widget, GdkEvent *event, gpointer data) case GDK_KEY_c: /* reload trusted certs (left hand) */ trust_user_certs(wc); return TRUE; - case GDK_KEY_x: /* launch external handler (left hand) */ - if (c->external_handler_uri != NULL) - g_free(c->external_handler_uri); - c->external_handler_uri = g_strdup( - webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view))); - external_handler_run(NULL, NULL, c); - return TRUE; case GDK_KEY_a: /* go one tab to the left (left hand) */ gtk_notebook_prev_page(GTK_NOTEBOOK(mw.notebook)); return TRUE; @@ -1006,7 +987,7 @@ key_location(GtkWidget *widget, GdkEvent *event, gpointer data) search_text = g_strdup(t + 2); search(c, 0); } - else if (!keywords_try_search(WEBKIT_WEB_VIEW(c->web_view), t)) + else { f = ensure_uri_scheme(t); webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f); @@ -1024,6 +1005,39 @@ key_location(GtkWidget *widget, GdkEvent *event, gpointer data) return FALSE; } +gboolean +key_tablabel(GtkWidget *widget, GdkEvent *event, gpointer data) +{ + GdkScrollDirection direction; + + if (event->type == GDK_BUTTON_RELEASE) + { + switch (((GdkEventButton *)event)->button) + { + case 2: + client_destroy(NULL, data); + return TRUE; + } + } + else if (event->type == GDK_SCROLL) + { + gdk_event_get_scroll_direction(event, &direction); + switch (direction) + { + case GDK_SCROLL_UP: + gtk_notebook_prev_page(GTK_NOTEBOOK(mw.notebook)); + break; + case GDK_SCROLL_DOWN: + gtk_notebook_next_page(GTK_NOTEBOOK(mw.notebook)); + break; + default: + break; + } + return TRUE; + } + return FALSE; +} + gboolean key_web_view(GtkWidget *widget, GdkEvent *event, gpointer data) { @@ -1049,7 +1063,7 @@ key_web_view(GtkWidget *widget, GdkEvent *event, gpointer data) case 2: if (c->hover_uri != NULL) { - client_new(c->hover_uri, NULL, TRUE); + client_new(c->hover_uri, NULL, TRUE, FALSE); return TRUE; } break; @@ -1078,66 +1092,6 @@ key_web_view(GtkWidget *widget, GdkEvent *event, gpointer data) return FALSE; } -void -keywords_load(void) -{ - GError *err = NULL; - GIOChannel *channel = NULL; - gchar *path = NULL, *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, g_strdup(tokens[0]), - g_strdup(tokens[1])); - 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, *escaped = NULL, *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) - { - escaped = g_uri_escape_string(tokens[1], NULL, TRUE); - uri = g_strdup_printf((gchar *)val, escaped); - webkit_web_view_load_uri(web_view, uri); - g_free(uri); - g_free(escaped); - ret = TRUE; - } - } - g_strfreev(tokens); - - return ret; -} - void mainwindow_setup(void) { @@ -1151,80 +1105,29 @@ mainwindow_setup(void) gtk_notebook_set_tab_pos(GTK_NOTEBOOK(mw.notebook), tab_pos); gtk_container_add(GTK_CONTAINER(mw.win), mw.notebook); g_signal_connect(G_OBJECT(mw.notebook), "switch-page", - G_CALLBACK(mainwindow_title_before), NULL); -} - -void -mainwindow_title_before(GtkNotebook *nb, GtkWidget *p, guint idx, gpointer data) -{ - mainwindow_title(idx); + G_CALLBACK(notebook_switch_page), NULL); } void mainwindow_title(gint idx) { - GtkWidget *child, *tabbox, *evbox, *label; - GList *tabbox_children, *last; + GtkWidget *child, *widg, *tablabel; const gchar *text; - if (idx == -1) - { - idx = gtk_notebook_get_current_page(GTK_NOTEBOOK(mw.notebook)); - if (idx == -1) - return; - } - child = gtk_notebook_get_nth_page(GTK_NOTEBOOK(mw.notebook), idx); if (child == NULL) return; - evbox = gtk_notebook_get_tab_label(GTK_NOTEBOOK(mw.notebook), child); - tabbox = gtk_bin_get_child(GTK_BIN(evbox)); - tabbox_children = gtk_container_get_children(GTK_CONTAINER(tabbox)); - last = g_list_last(tabbox_children); - label = last->data; - text = gtk_label_get_text(GTK_LABEL(label)); + widg = gtk_notebook_get_tab_label(GTK_NOTEBOOK(mw.notebook), child); + tablabel = (GtkWidget *)g_object_get_data(G_OBJECT(widg), "lariza-tab-label"); + text = gtk_label_get_text(GTK_LABEL(tablabel)); gtk_window_set_title(GTK_WINDOW(mw.win), text); - g_list_free(tabbox_children); } -gboolean -menu_web_view(WebKitWebView *web_view, WebKitContextMenu *menu, GdkEvent *ev, - WebKitHitTestResult *ht, gpointer data) +void +notebook_switch_page(GtkNotebook *nb, GtkWidget *p, guint idx, gpointer data) { - struct Client *c = (struct Client *)data; - GSimpleAction *action = NULL; - WebKitContextMenuItem *mi = NULL; - const gchar *uri = NULL; - - (void)ev; - - if (webkit_hit_test_result_context_is_link(ht)) - uri = webkit_hit_test_result_get_link_uri(ht); - else if (webkit_hit_test_result_context_is_image(ht)) - uri = webkit_hit_test_result_get_image_uri(ht); - else if (webkit_hit_test_result_context_is_media(ht)) - uri = webkit_hit_test_result_get_media_uri(ht); - - if (uri != NULL) - { - webkit_context_menu_append(menu, webkit_context_menu_item_new_separator()); - - if (c->external_handler_uri != NULL) - g_free(c->external_handler_uri); - c->external_handler_uri = g_strdup(uri); - action = g_simple_action_new("external_handler", NULL); - g_signal_connect(G_OBJECT(action), "activate", - G_CALLBACK(external_handler_run), data); - mi = webkit_context_menu_item_new_from_gaction(G_ACTION(action), - "Open with external handler", - NULL); - webkit_context_menu_append(menu, mi); - g_object_unref(action); - } - - /* FALSE = Show the menu. (TRUE = Don't ever show it.) */ - return FALSE; + mainwindow_title(idx); } gboolean @@ -1253,7 +1156,7 @@ remote_msg(GIOChannel *channel, GIOCondition condition, gpointer data) if (uri) { g_strstrip(uri); - client_new(uri, NULL, TRUE); + client_new(uri, NULL, TRUE, TRUE); g_free(uri); } return TRUE; @@ -1326,11 +1229,14 @@ show_web_view(WebKitWebView *web_view, gpointer data) gtk_widget_show_all(mw.win); - idx = gtk_notebook_page_num(GTK_NOTEBOOK(mw.notebook), c->vbox); - if (idx != -1) - gtk_notebook_set_current_page(GTK_NOTEBOOK(mw.notebook), idx); + if (c->focus_new_tab) + { + idx = gtk_notebook_page_num(GTK_NOTEBOOK(mw.notebook), c->vbox); + if (idx != -1) + gtk_notebook_set_current_page(GTK_NOTEBOOK(mw.notebook), idx); - gtk_widget_grab_focus(c->web_view); + gtk_widget_grab_focus(c->web_view); + } } void @@ -1364,13 +1270,9 @@ trust_user_certs(WebKitWebContext *wc) int main(int argc, char **argv) { - gchar *c; int opt, i; gtk_init(&argc, &argv); - webkit_web_context_set_process_model(webkit_web_context_get_default(), - WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES); - grab_environment_configuration(); while ((opt = getopt(argc, argv, "C")) != -1) @@ -1386,31 +1288,25 @@ main(int argc, char **argv) } } - keywords_load(); if (cooperative_instances) cooperation_setup(); - downloadmanager_setup(); - - mainwindow_setup(); if (!cooperative_instances || cooperative_alone) - { - c = g_build_filename(g_get_user_config_dir(), __NAME__, "web_extensions", - NULL); - webkit_web_context_set_web_extensions_directory( - webkit_web_context_get_default(), c - ); - } + init_default_web_context(); + + downloadmanager_setup(); + mainwindow_setup(); if (optind >= argc) - client_new(home_uri, NULL, TRUE); + client_new(home_uri, NULL, TRUE, TRUE); else { for (i = optind; i < argc; i++) - client_new(argv[i], NULL, TRUE); + client_new(argv[i], NULL, TRUE, TRUE); } if (!cooperative_instances || cooperative_alone) gtk_main(); + exit(EXIT_SUCCESS); }