#include <JavaScriptCore/JavaScript.h>
+static gboolean button_tablabel(GtkWidget *, GdkEvent *, gpointer);
static void client_destroy(GtkWidget *, gpointer);
-static gboolean client_destroy_request(WebKitWebView *, 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);
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 void run_user_scripts(WebKitWebView *);
static void search(gpointer, gint);
static void show_web_view(WebKitWebView *, gpointer);
-static Window tabbed_launch(void);
static void trust_user_certs(WebKitWebContext *);
gchar *hover_uri;
gchar *feed_html;
GtkWidget *location;
+ GtkWidget *tabicon;
+ GtkWidget *tablabel;
GtkWidget *vbox;
GtkWidget *web_view;
- GtkWidget *win;
+ gboolean focus_new_tab;
};
+struct MainWindow
+{
+ GtkWidget *win;
+ GtkWidget *notebook;
+} mw;
+
struct DownloadManager
{
GtkWidget *scroll;
static int cooperative_pipe_fp = 0;
static gchar *download_dir = "/var/tmp";
static gboolean enable_console_to_stdout = FALSE;
-static Window embed = 0;
static gchar *fifo_suffix = "main";
static gdouble global_zoom = 1.0;
static gchar *history_file = NULL;
static gboolean initial_wc_setup_done = FALSE;
static GHashTable *keywords = NULL;
static gchar *search_text = NULL;
-static gboolean tabbed_automagic = TRUE;
+static GtkPositionType tab_pos = GTK_POS_TOP;
+static gint tab_width_chars = 20;
static 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)
{
struct Client *c = (struct Client *)data;
+ gint idx;
g_signal_handlers_disconnect_by_func(G_OBJECT(c->web_view),
changed_load_progress, c);
+ idx = gtk_notebook_page_num(GTK_NOTEBOOK(mw.notebook), c->vbox);
+ if (idx == -1)
+ fprintf(stderr, __NAME__": Tab index was -1, bamboozled\n");
+ else
+ gtk_notebook_remove_page(GTK_NOTEBOOK(mw.notebook), idx);
+
free(c);
clients--;
quit_if_nothing_active();
}
-gboolean
-client_destroy_request(WebKitWebView *web_view, gpointer data)
-{
- struct Client *c = (struct Client *)data;
-
- gtk_widget_destroy(c->win);
-
- return TRUE;
-}
-
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;
if (uri != NULL && cooperative_instances && !cooperative_alone)
{
exit(EXIT_FAILURE);
}
- if (embed != 0)
- {
- c->win = gtk_plug_new(embed);
- if (!gtk_plug_get_embedded(GTK_PLUG(c->win)))
- {
- fprintf(stderr, __NAME__": Can't plug-in to XID %ld.\n", embed);
- gtk_widget_destroy(c->win);
- c->win = NULL;
- embed = 0;
- }
- }
-
- if (c->win == NULL)
- c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-
- gtk_window_set_default_size(GTK_WINDOW(c->win), 800, 600);
-
- g_signal_connect(G_OBJECT(c->win), "destroy", G_CALLBACK(client_destroy), c);
- gtk_window_set_title(GTK_WINDOW(c->win), __NAME__);
+ c->focus_new_tab = focus_tab;
if (related_wv == NULL)
c->web_view = webkit_web_view_new();
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",
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_request), c);
+ G_CALLBACK(client_destroy), c);
g_signal_connect(G_OBJECT(c->web_view), "decide-policy",
G_CALLBACK(decide_policy), NULL);
g_signal_connect(G_OBJECT(c->web_view), "key-press-event",
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);
- gtk_container_add(GTK_CONTAINER(c->win), c->vbox);
+ 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);
+
+ /* 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);
+
+ /* 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_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)
show_web_view(NULL, c);
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
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)
{
t = t == NULL ? u : t;
t = t[0] == 0 ? u : t;
- gtk_window_set_title(GTK_WINDOW(c->win), t);
+ gtk_label_set_text(GTK_LABEL(c->tablabel), t);
+ mainwindow_title(-1);
}
void
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);
switch (((GdkEventKey *)event)->keyval)
{
case GDK_KEY_q: /* close window (left hand) */
- gtk_widget_destroy(c->win);
+ client_destroy(NULL, c);
return TRUE;
case GDK_KEY_w: /* home (left hand) */
f = ensure_uri_scheme(home_uri);
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) */
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) */
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;
return ret;
}
+void
+mainwindow_setup(void)
+{
+ mw.win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_default_size(GTK_WINDOW(mw.win), 800, 600);
+ g_signal_connect(G_OBJECT(mw.win), "destroy", gtk_main_quit, NULL);
+ gtk_window_set_title(GTK_WINDOW(mw.win), __NAME__);
+
+ 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);
+}
+
+void
+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, *tabbox, *evbox, *label;
+ GList *tabbox_children, *last;
+ 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));
+ 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)
if (uri)
{
g_strstrip(uri);
- client_new(uri, NULL, TRUE);
+ client_new(uri, NULL, TRUE, TRUE);
g_free(uri);
}
return TRUE;
show_web_view(WebKitWebView *web_view, gpointer data)
{
struct Client *c = (struct Client *)data;
+ gint idx;
(void)web_view;
- gtk_widget_grab_focus(c->web_view);
- gtk_widget_show_all(c->win);
-}
-
-Window
-tabbed_launch(void)
-{
- gint tabbed_stdout;
- GIOChannel *tabbed_stdout_channel;
- GError *err = NULL;
- gchar *output = NULL;
- char *argv[] = { "tabbed", "-c", "-d", "-p", "s1", "-n", __NAME__, NULL };
- Window plug_into;
+ gtk_widget_show_all(mw.win);
- if (!g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL,
- NULL, NULL, NULL, &tabbed_stdout, NULL,
- &err))
+ if (c->focus_new_tab)
{
- fprintf(stderr, __NAME__": Could not launch tabbed: %s\n", err->message);
- g_error_free(err);
- return 0;
- }
+ idx = gtk_notebook_page_num(GTK_NOTEBOOK(mw.notebook), c->vbox);
+ if (idx != -1)
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(mw.notebook), idx);
- tabbed_stdout_channel = g_io_channel_unix_new(tabbed_stdout);
- if (tabbed_stdout_channel == NULL)
- {
- fprintf(stderr, __NAME__": Could open tabbed's stdout\n");
- return 0;
- }
- g_io_channel_read_line(tabbed_stdout_channel, &output, NULL, NULL, NULL);
- g_io_channel_shutdown(tabbed_stdout_channel, FALSE, NULL);
- if (output == NULL)
- {
- fprintf(stderr, __NAME__": Could not read XID from tabbed\n");
- return 0;
+ gtk_widget_grab_focus(c->web_view);
}
- g_strstrip(output);
- plug_into = strtol(output, NULL, 16);
- g_free(output);
- if (plug_into == 0)
- fprintf(stderr, __NAME__": The XID from tabbed is 0\n");
- return plug_into;
}
void
grab_environment_configuration();
- while ((opt = getopt(argc, argv, "e:CT")) != -1)
+ while ((opt = getopt(argc, argv, "C")) != -1)
{
switch (opt)
{
- case 'e':
- embed = atol(optarg);
- tabbed_automagic = FALSE;
- break;
case 'C':
cooperative_instances = FALSE;
break;
- case 'T':
- tabbed_automagic = FALSE;
- break;
default:
fprintf(stderr, "Usage: "__NAME__" [OPTION]... [URI]...\n");
exit(EXIT_FAILURE);
cooperation_setup();
downloadmanager_setup();
- if (tabbed_automagic && !(cooperative_instances && !cooperative_alone))
- embed = tabbed_launch();
+ mainwindow_setup();
if (!cooperative_instances || cooperative_alone)
{
}
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)
projects / chorizo.git / blobdiff