X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=browser.c;h=e87131d4de6c5182b6af60d4bb00673d368d1b01;hb=7a97986197e8874ea52711593fc46dd759d7e802;hp=48ff8485e59782917889be1403d74c745ea2f388;hpb=fe194143ed6db650936baa3313bc1061a38049f5;p=chorizo.git diff --git a/browser.c b/browser.c index 48ff848..e87131d 100644 --- a/browser.c +++ b/browser.c @@ -16,12 +16,14 @@ 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(const gchar *, WebKitWebView *, gboolean, + 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); @@ -63,9 +65,11 @@ struct Client gchar *hover_uri; gchar *feed_html; GtkWidget *location; + GtkWidget *tabicon; GtkWidget *tablabel; GtkWidget *vbox; GtkWidget *web_view; + gboolean focus_new_tab; }; struct MainWindow @@ -97,6 +101,7 @@ 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; @@ -137,12 +142,13 @@ 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; + GtkWidget *evbox, *tabbox; if (uri != NULL && cooperative_instances && !cooperative_alone) { @@ -160,6 +166,8 @@ 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 @@ -167,6 +175,8 @@ client_new(const gchar *uri, WebKitWebView *related_wv, gboolean show) 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", + G_CALLBACK(changed_favicon), c); 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", @@ -202,6 +212,8 @@ client_new(const gchar *uri, WebKitWebView *related_wv, gboolean show) trust_user_certs(wc); + webkit_web_context_set_favicon_database_directory(wc, NULL); + initial_wc_setup_done = TRUE; } @@ -232,12 +244,21 @@ 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_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), 20); + gtk_label_set_width_chars(GTK_LABEL(c->tablabel), tab_width_chars); + + /* 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), c->tablabel); + gtk_container_add(GTK_CONTAINER(evbox), tabbox); g_signal_connect(G_OBJECT(evbox), "button-release-event", G_CALLBACK(button_tablabel), c); @@ -246,7 +267,8 @@ client_new(const gchar *uri, WebKitWebView *related_wv, gboolean show) * 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) @@ -271,7 +293,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 @@ -392,6 +414,39 @@ changed_load_progress(GObject *obj, GParamSpec *pspec, gpointer data) gtk_entry_set_progress_fraction(GTK_ENTRY(c->location), p); } +void +changed_favicon(GObject *obj, GParamSpec *pspec, gpointer data) +{ + struct Client *c = (struct Client *)data; + cairo_surface_t *f; + 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) + { + 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) + { + 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); + } + } +} + void changed_title(GObject *obj, GParamSpec *pspec, gpointer data) { @@ -690,6 +745,10 @@ grab_environment_configuration(void) tab_pos = GTK_POS_LEFT; } + e = g_getenv(__NAME_UPPERCASE__"_TAB_WIDTH_CHARS"); + if (e != NULL) + tab_width_chars = atoi(e); + e = g_getenv(__NAME_UPPERCASE__"_USER_AGENT"); if (e != NULL) user_agent = g_strdup(e); @@ -851,7 +910,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) */ @@ -999,7 +1058,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; @@ -1110,10 +1169,13 @@ mainwindow_title_before(GtkNotebook *nb, GtkWidget *p, guint idx, gpointer data) mainwindow_title(idx); } +/* XXX I'd like to avoid traversing the widget hierarchy. Find a better + * way. */ void mainwindow_title(gint idx) { - GtkWidget *child, *evbox, *label; + GtkWidget *child, *tabbox, *evbox, *label; + GList *tabbox_children, *last; const gchar *text; if (idx == -1) @@ -1128,9 +1190,13 @@ mainwindow_title(gint idx) return; evbox = gtk_notebook_get_tab_label(GTK_NOTEBOOK(mw.notebook), child); - label = gtk_bin_get_child(GTK_BIN(evbox)); + 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)); gtk_window_set_title(GTK_WINDOW(mw.win), text); + g_list_free(tabbox_children); } gboolean @@ -1198,7 +1264,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; @@ -1271,11 +1337,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 @@ -1348,11 +1417,11 @@ main(int argc, char **argv) } 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)