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);
gchar *hover_uri;
gchar *feed_html;
GtkWidget *location;
+ GtkWidget *tabicon;
GtkWidget *tablabel;
GtkWidget *vbox;
GtkWidget *web_view;
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;
struct Client *c;
WebKitWebContext *wc;
gchar *f;
- GtkWidget *evbox;
+ GtkWidget *evbox, *tabbox;
if (uri != NULL && cooperative_instances && !cooperative_alone)
{
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",
trust_user_certs(wc);
+ webkit_web_context_set_favicon_database_directory(wc, NULL);
+
initial_wc_setup_done = TRUE;
}
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);
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)
+ {
+ 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)
{
if (e != NULL)
home_uri = g_strdup(e);
+ e = g_getenv(__NAME_UPPERCASE__"_TAB_POS");
+ if (e != NULL)
+ {
+ if (strcmp(e, "top") == 0)
+ tab_pos = GTK_POS_TOP;
+ if (strcmp(e, "right") == 0)
+ tab_pos = GTK_POS_RIGHT;
+ if (strcmp(e, "bottom") == 0)
+ tab_pos = GTK_POS_BOTTOM;
+ if (strcmp(e, "left") == 0)
+ 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);
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;
+ case GDK_KEY_s: /* go one tab to the right (left hand) */
+ gtk_notebook_next_page(GTK_NOTEBOOK(mw.notebook));
+ return TRUE;
}
}
/* navigate backward (left hand) */
mw.notebook = gtk_notebook_new();
gtk_notebook_set_scrollable(GTK_NOTEBOOK(mw.notebook), TRUE);
+ 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);
-
- /* XXX Global hotkeys to change tabs are missing */
}
void
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)
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
projects / chorizo.git / blobdiff