Favicons, yay!

finally, i might daily drive cinnamon now!

1 files changed, 42 insertions, 5 deletions

diff --git a/main.c b/main.c
index 313cb1d..a902461 100644
--- a/main.c
+++ b/main.c
@@ -4,6 +4,8 @@ This software is licensed under the ARPL. See LICENSE for details.
 */
 #include <webkit2/webkit2.h>
 #include <gtk/gtk.h>
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <stdio.h>
 
 /* forward declare BEFORE including config.h so that config.h can reference them */
@@ -61,13 +63,43 @@ static void parse_keybind(const char *key, guint *keyval, GdkModifierType *mods)
 	*keyval = gdk_keyval_from_name(name);
 }
 
-static void on_title_changed(WebKitWebView *webview, GParamSpec *pspec, GtkNotebook *notebook) {
-	const char *title = webkit_web_view_get_title(webview);
+static void on_title_changed(WebKitWebView* webview, GParamSpec* pspec, GtkNotebook* notebook) {
+	const char* title = webkit_web_view_get_title(webview);
 	int page = gtk_notebook_page_num(notebook, GTK_WIDGET(webview));
-	gtk_notebook_set_tab_label_text(notebook, GTK_WIDGET(webview), title ? title : "New Tab");
+
+	GtkWidget* hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
+
+#ifdef TABS_SHOW_FAVICON
+	cairo_surface_t* favicon = webkit_web_view_get_favicon(webview);
+	if (favicon) {
+		int w = cairo_image_surface_get_width(favicon);
+		int h = cairo_image_surface_get_height(favicon);
+
+		GdkPixbuf* pixbuf = gdk_pixbuf_get_from_surface(favicon, 0, 0, w, h);
+		if (pixbuf) {
+			GdkPixbuf* scaled = gdk_pixbuf_scale_simple(pixbuf, 16, 16, GDK_INTERP_BILINEAR);
+			GtkWidget* image = gtk_image_new_from_pixbuf(scaled);
+			gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
+			g_object_unref(scaled);
+			g_object_unref(pixbuf);
+		}
+	}
+#endif
+
+#ifdef TABS_SHOW_TITLE
+	GtkWidget* label = gtk_label_new(title ? title : "New Tab");
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#endif
+
+	gtk_widget_show_all(hbox);
+	gtk_notebook_set_tab_label(notebook, GTK_WIDGET(webview), hbox);
 }
 
-static gboolean on_cmdbar_activate(GtkEntry *entry, gpointer data) {
+static void on_favicon_changed(WebKitWebView* webview, GParamSpec* pspec, GtkNotebook* notebook) {
+	on_title_changed(webview, pspec, notebook);
+}
+
+static gboolean on_cmdbar_activate(GtkEntry* entry, gpointer data) {
 	Cinnamon* cinnamon = (Cinnamon*)data;
 	const char *input = gtk_entry_get_text(entry);
 
@@ -187,8 +219,9 @@ void set_mode(Cinnamon* cinnamon, int new_mode) {
 
 void tabopen(Cinnamon* cinnamon) {
 	GtkWidget *webview = webkit_web_view_new_with_context(cinnamon->web_context);
-	gtk_notebook_append_page(GTK_NOTEBOOK(cinnamon->notebook), webview, gtk_label_new("New Tab"));
+	gtk_notebook_append_page(GTK_NOTEBOOK(cinnamon->notebook), webview, gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4));
 	g_signal_connect(webview, "notify::title", G_CALLBACK(on_title_changed), cinnamon->notebook);
+	g_signal_connect(webview, "notify::favicon", G_CALLBACK(on_favicon_changed), cinnamon->notebook);
 	/* HOMEPAGE and USERAGENT defined in config.h */
 	webkit_web_view_set_settings(WEBKIT_WEB_VIEW(webview), g_object_new(WEBKIT_TYPE_SETTINGS, "user-agent", USERAGENT, NULL));
 	webkit_web_view_load_uri(WEBKIT_WEB_VIEW(webview), HOMEPAGE);
@@ -250,6 +283,7 @@ int main(int argc, char *argv[]) {
 	gtk_container_add(GTK_CONTAINER(cinnamon.window), vbox);
 
 	cinnamon.notebook = gtk_notebook_new();
+	gtk_notebook_set_scrollable(GTK_NOTEBOOK(cinnamon.notebook), TRUE);
         // gtk_container_add(GTK_CONTAINER(cinnamon.window), cinnamon.notebook);
 	gtk_box_pack_start(GTK_BOX(vbox), cinnamon.notebook, TRUE, TRUE, 0);
 
@@ -259,6 +293,9 @@ int main(int argc, char *argv[]) {
 	WebKitCookieManager *cookie_manager = webkit_web_context_get_cookie_manager(cinnamon.web_context);
 	webkit_cookie_manager_set_persistent_storage(cookie_manager, g_build_filename(g_get_user_data_dir(), "cinnamon", "cookies.sqlite", NULL), WEBKIT_COOKIE_PERSISTENT_STORAGE_SQLITE);
 
+	/* favicon db */
+	webkit_web_context_set_favicon_database_directory(cinnamon.web_context, g_build_filename(g_get_user_cache_dir(), "cinnamon", "favicons", NULL));
+
 	/* Create initial tab */
 	tabopen(&cinnamon);