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);
GtkWidget *tablabel;
GtkWidget *vbox;
GtkWidget *web_view;
+ gboolean focus_new_tab;
};
struct MainWindow
}
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;
exit(EXIT_FAILURE);
}
+ c->focus_new_tab = focus_tab;
+
if (related_wv == NULL)
c->web_view = webkit_web_view_new();
else
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);
- 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);
* 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)
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
{
struct Client *c = (struct Client *)data;
cairo_surface_t *f;
- int w, h;
- GdkPixbuf *pb;
+ 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)
{
- /* TODO: Resize icon */
- 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);
}
}
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) */
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;
mainwindow_title(idx);
}
+/* XXX I'd like to avoid traversing the widget hierarchy. Find a better
+ * way. */
void
mainwindow_title(gint idx)
{
if (uri)
{
g_strstrip(uri);
- client_new(uri, NULL, TRUE);
+ client_new(uri, NULL, TRUE, TRUE);
g_free(uri);
}
return TRUE;
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
}
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)