#include <webkit2/webkit2.h>
#include "config.h"
-#include "downloads.h"
-
-WebKitWebView *client_new_request(WebKitWebView *, WebKitNavigationAction *,
- gpointer);
-gboolean crashed_web_view(WebKitWebView *, gpointer);
-gboolean decide_policy(WebKitWebView *, WebKitPolicyDecision *,
- WebKitPolicyDecisionType, gpointer);
-gboolean key_location(GtkWidget *, GdkEvent *, gpointer);
-gboolean key_tablabel(GtkWidget *, GdkEvent *, gpointer);
-gboolean key_web_view(GtkWidget *, GdkEvent *, gpointer);
-gboolean key_common(GtkWidget *, GdkEvent *, gpointer);
-gboolean key_wsearch(GtkWidget *, GdkEvent *, gpointer);
-gboolean key_isearch(GtkWidget *, GdkEvent *, gpointer);
-gboolean isearch_counted_matches(GtkWidget *, guint, gpointer);
-gboolean remote_msg(GIOChannel *, GIOCondition, gpointer);
-gchar *ensure_uri_scheme(const gchar *);
-void changed_favicon(GObject *, GParamSpec *, gpointer);
-void changed_load_progress(GObject *, GParamSpec *, gpointer);
-void changed_title(GObject *, GParamSpec *, gpointer);
-void changed_uri(GObject *, GParamSpec *, gpointer);
-void grab_feeds_finished(GObject *, GAsyncResult *, gpointer);
-void hover_web_view(WebKitWebView *, WebKitHitTestResult *, guint, gpointer);
-void icon_location(GtkEntry *, GtkEntryIconPosition, GdkEvent *, gpointer);
-void mainwindow_title(gint);
-void notebook_switch_page(GtkNotebook *, GtkWidget *, guint, gpointer);
-void show_web_view(WebKitWebView *, gpointer);
-void trust_user_certs(WebKitWebContext *);
-
-struct Client {
- GtkWidget *location;
- GtkWidget *wsearch;
- GtkWidget *isearch;
- GtkWidget *isearch_box;
- GtkWidget *isearch_matches;
- GtkWidget *tabicon;
- GtkWidget *tablabel;
- GtkWidget *vbox;
- GtkWidget *web_view;
- WebKitSettings *settings;
- gboolean focus_new_tab;
- gchar *external_handler_uri;
- gchar *feed_html;
- gchar *hover_uri;
-};
-
-struct MainWindow {
- GtkWidget *notebook;
- GtkWidget *win;
-} mw;
-
-struct Configuration {
- gboolean cooperative_alone;
- gboolean noncooperative_instances;
- gboolean private;
- gboolean verbose;
-} cfg;
+#include "chorizo.h"
+
+struct MainWindow mw;
+struct Configuration cfg;
+gboolean switch_tab;
gint clients = 0;
-struct Client **client_arr;
int cooperative_pipe_fp = 0;
gchar *fifopath;
char **closed_tabs;
size_t num_closed = 0;
+gboolean
+isearch_counted_matches(GtkWidget *widget, guint matches, gpointer data)
+{
+ struct Client *c = (struct Client *)data;
+ char *text = malloc(12);
+ sprintf(text, "%d matches", matches);
+ gtk_label_set_text(GTK_LABEL(c->isearch_matches), text);
+ free(text);
+ return TRUE;
+}
+
+gboolean
+quit_if_nothing_active(void)
+{
+ if (clients == 0) {
+ if (downloads == 0) {
+ gtk_main_quit();
+ return TRUE;
+ } else {
+ downloadmanager_show();
+ }
+ }
+ return FALSE;
+}
+gboolean
+remote_msg(GIOChannel *channel, GIOCondition condition, gpointer data)
+{
+ gchar *uri = NULL;
+ g_io_channel_read_line(channel, &uri, NULL, NULL, NULL);
+ if (uri) {
+ g_strstrip(uri);
+ client_new(uri, NULL);
+ g_free(uri);
+ }
+ return TRUE;
+}
+
void
allocfail(void)
{
webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view));
// TODO: Shift everything left if over certain amount
- num_closed++;
- if (num_closed > cfg_max_tabs_closed) {
- memmove(closed_tabs, closed_tabs,
- cfg_max_tabs_closed - 1);
- num_closed = cfg_max_tabs_closed;
- } else {
- closed_tabs =
- realloc(closed_tabs,
+ if (uri != NULL) {
+ num_closed++;
+ if (num_closed > cfg_max_tabs_closed) {
+ memmove(closed_tabs, closed_tabs,
+ cfg_max_tabs_closed - 1);
+ num_closed = cfg_max_tabs_closed;
+ } else {
+ closed_tabs = realloc(
+ closed_tabs,
num_closed * sizeof(closed_tabs[0]));
- if (!closed_tabs) allocfail();
+ if (!closed_tabs) allocfail();
+ }
+ closed_tabs[num_closed - 1] = strdup(uri);
}
- closed_tabs[num_closed - 1] = strdup(uri);
}
- free(c);
clients--;
+ free(c);
quit_if_nothing_active();
}
}
WebKitWebView *
-client_new(const gchar *uri, WebKitWebView *related_wv, gboolean show,
- gboolean focus_tab)
+client_new(const gchar *uri, WebKitWebView *related_wv)
{
struct Client *c;
gchar *f;
}
c = calloc(1, sizeof(struct Client));
if (!c) allocfail();
- c->focus_new_tab = focus_tab;
if (related_wv == NULL) {
WebKitUserContentManager *ucm =
if (g_str_has_suffix(path, ".js")) {
g_file_get_contents(path, &source, NULL,
NULL);
+ // clang-format off
wkscript = webkit_user_script_new(
source,
- WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES,
- WEBKIT_USER_SCRIPT_INJECT_AT_DOCUMENT_START,
+ WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES,
+ WEBKIT_USER_SCRIPT_INJECT_AT_DOCUMENT_START,
NULL, NULL);
+ // clang-format on
webkit_user_content_manager_add_script(
ucm, wkscript);
webkit_user_script_unref(wkscript);
if (g_str_has_suffix(path, ".css")) {
g_file_get_contents(path, &source, NULL,
NULL);
+ // clang-format off
wkstyle = webkit_user_style_sheet_new(
source,
- WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES,
- WEBKIT_USER_STYLE_LEVEL_USER,
+ WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES,
+ WEBKIT_USER_STYLE_LEVEL_USER,
NULL, NULL);
- webkit_user_content_manager_add_style_sheet(
+ webkit_user_content_manager_add_style_sheet(
ucm, wkstyle);
+ // clang-format on
webkit_user_style_sheet_unref(wkstyle);
}
g_free(path);
c->web_view =
webkit_web_view_new_with_user_content_manager(ucm);
+
+ c->settings = webkit_web_view_get_settings(
+ WEBKIT_WEB_VIEW(c->web_view));
+ if (cfg.verbose) {
+ // clang-format off
+ webkit_settings_set_enable_write_console_messages_to_stdout(
+ c->settings, true);
+ // clang-format on
+ }
+ webkit_settings_set_enable_developer_extras(c->settings, TRUE);
} else {
c->web_view = webkit_web_view_new_with_related_view(related_wv);
}
- c->settings =
- webkit_web_view_get_settings(WEBKIT_WEB_VIEW(c->web_view));
- if (cfg.verbose)
- webkit_settings_set_enable_write_console_messages_to_stdout(
- c->settings, true);
- webkit_settings_set_enable_developer_extras(c->settings, TRUE);
-
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",
"notify::estimated-load-progress",
G_CALLBACK(changed_load_progress), c);
g_signal_connect(G_OBJECT(c->web_view), "create",
- G_CALLBACK(client_new_request), NULL);
+ G_CALLBACK(client_new_request), c);
g_signal_connect(G_OBJECT(c->web_view), "close",
G_CALLBACK(client_destroy), c);
g_signal_connect(G_OBJECT(c->web_view), "decide-policy",
c->location = gtk_entry_new();
gtk_entry_set_placeholder_text(GTK_ENTRY(c->location), "URL");
+ char *location_symbol;
+ if (cfg.private) {
+ location_symbol = "security-high-symbolic";
+ gtk_entry_set_icon_tooltip_markup(
+ GTK_ENTRY(c->location), GTK_ENTRY_ICON_PRIMARY,
+ "You are in private mode. No history, caches, or "
+ "cookies will be saved beyond this session.");
+ } else {
+ location_symbol = "text-x-generic-symbolic";
+ }
+
gtk_entry_set_icon_from_icon_name(GTK_ENTRY(c->location),
GTK_ENTRY_ICON_PRIMARY,
- "text-x-generic-symbolic");
+ location_symbol);
gtk_box_pack_start(GTK_BOX(locbox), c->location, TRUE, TRUE, 0);
c->wsearch = gtk_entry_new();
"system-search-symbolic");
gtk_box_pack_start(GTK_BOX(locbox), c->wsearch, FALSE, TRUE, 0);
- if (cfg.private) {
- GtkWidget *privindicator = gtk_label_new("Private mode");
- gtk_widget_set_tooltip_text(
- privindicator,
- "You are in private mode. No history, caches, or "
- "cookies will be saved beyond this session.");
- gtk_box_pack_end(GTK_BOX(locbox), privindicator, FALSE, FALSE,
- 5);
- }
-
g_signal_connect(G_OBJECT(c->location), "key-press-event",
G_CALLBACK(key_location), c);
g_signal_connect(G_OBJECT(c->location), "icon-release",
gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(mw.notebook), c->vbox,
TRUE);
- if (show)
- show_web_view(NULL, c);
- else
- g_signal_connect(G_OBJECT(c->web_view), "ready-to-show",
- G_CALLBACK(show_web_view), c);
+ show_web_view(NULL, c);
if (uri != NULL) {
f = ensure_uri_scheme(uri);
set_uri(uri, c);
clients++;
- client_arr = realloc(client_arr, (clients + 1) * sizeof(client_arr[0]));
- if (!client_arr) allocfail();
-
- client_arr[clients] = c;
if (uri == NULL) gtk_widget_grab_focus(c->location);
client_new_request(WebKitWebView *web_view,
WebKitNavigationAction *navigation_action, gpointer data)
{
- return client_new(NULL, web_view, FALSE, FALSE);
+ switch_tab = FALSE;
+ WebKitWebView *new_web_view = client_new(NULL, web_view);
+ gtk_widget_grab_focus(GTK_WIDGET(new_web_view));
+ return new_web_view;
}
void
u = webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view));
t = webkit_web_view_get_title(WEBKIT_WEB_VIEW(c->web_view));
- u = u == NULL ? "chorizo" : u;
- u = u[0] == 0 ? "chorizo" : u;
-
- t = t == NULL ? u : t;
- t = t[0] == 0 ? u : t;
+ if (t == NULL) t = (u == NULL) ? "chorizo" : u;
gchar *name = malloc(strlen(t) + 4);
if (!name) allocfail();
// No g_get_user_state_dir unfortunately
gchar *state_env = getenv("XDG_STATE_DIR");
- gchar *state_dir = (state_env) ?
- state_env :
- g_build_filename(g_get_home_dir(),
+ // clang-format off
+ gchar *state_dir = (state_env)
+ ? state_env
+ : g_build_filename(g_get_home_dir(),
".local", "state",
"chorizo", NULL);
+ // clang-format on
gchar *history_file =
g_build_filename(state_dir, "history", NULL);
fprintf(fp, "%s\n", t);
fclose(fp);
} else {
- perror("chorizo: error: could not open history file");
+ perror("chorizo: error: could not open history"
+ "file");
}
}
g_free(history_file);
gboolean
crashed_web_view(WebKitWebView *web_view, gpointer data)
{
- struct Client *c = (struct Client *)data;
-
GtkDialogFlags flags = GTK_DIALOG_DESTROY_WITH_PARENT;
GtkWidget *dialog = gtk_message_dialog_new(
GTK_WINDOW(mw.win), flags, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
jsc_context_get_exception(jsc_value_get_context(value));
if (exception != NULL) {
fprintf(stderr,
- "chorizo: warning: error running javascript: %s\n",
+ "chorizo: warning: error running javascript:"
+ "%s\n",
jsc_exception_get_message(exception));
} else {
c->feed_html = str_value;
WebKitWebContext *wc;
WebKitCookieManager *cm;
wc = (cfg.private) ? webkit_web_context_new_ephemeral() :
- webkit_web_context_get_default();
+ webkit_web_context_get_default();
p = g_build_filename(g_get_user_config_dir(), "chorizo", "adblock",
NULL);
webkit_web_context_add_path_to_sandbox(wc, p, TRUE);
g_free(p);
- WebKitProcessModel model =
- WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES;
- webkit_web_context_set_process_model(wc, model);
+ webkit_web_context_set_process_model(
+ wc, WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES);
p = g_build_filename(g_get_user_data_dir(), "chorizo", "web-extensions",
NULL);
{
if (webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view))) {
gtk_widget_show(c->isearch_box);
- gtk_widget_show(c->isearch);
gtk_widget_grab_focus(c->isearch);
}
}
reopen_tab(void)
{
if (num_closed == 0) return;
- client_new(closed_tabs[num_closed - 1], NULL, TRUE, TRUE);
+ client_new(closed_tabs[num_closed - 1], NULL);
num_closed--;
closed_tabs = realloc(closed_tabs, num_closed * sizeof(closed_tabs[0]));
if (!closed_tabs) allocfail();
}
-gboolean
-key_common(GtkWidget *widget, GdkEvent *event, gpointer data)
-{
- struct Client *c = (struct Client *)data;
- gdouble now;
- if (event->type == GDK_KEY_PRESS) {
- guint mask = gtk_accelerator_get_default_mod_mask();
- int key = ((GdkEventKey *)event)->keyval;
- if ((((GdkEventKey *)event)->state & mask) ==
- GDK_CONTROL_MASK) {
- const char *uri = webkit_web_view_get_uri(
- WEBKIT_WEB_VIEW(c->web_view));
- if (GDK_KEY_y == key) {
- downloadmanager_show();
- return TRUE;
- } else if (GDK_KEY_h == key) {
- webkit_web_view_go_back(
- WEBKIT_WEB_VIEW(c->web_view));
- return TRUE;
- } else if (GDK_KEY_l == key) {
- webkit_web_view_go_forward(
- WEBKIT_WEB_VIEW(c->web_view));
- return TRUE;
- } else if (GDK_KEY_s == key) {
- gtk_widget_grab_focus(c->location);
- return TRUE;
- } else if (GDK_KEY_p == key) {
- WebKitPrintOperation *operation =
- webkit_print_operation_new(
- WEBKIT_WEB_VIEW(c->web_view));
- GtkWidget *toplevel =
- gtk_widget_get_toplevel(mw.win);
- webkit_print_operation_run_dialog(
- operation, GTK_WINDOW(toplevel));
- return TRUE;
- } else if (GDK_KEY_g == key) {
- isearch(c, 2);
- gtk_widget_grab_focus(c->web_view);
- if (uri)
- gtk_entry_set_text(
- GTK_ENTRY(c->location), uri);
- webkit_web_view_run_javascript(
- WEBKIT_WEB_VIEW(c->web_view),
- "window.getSelection().removeAllRanges();"
- "document.activeElement.blur();",
- NULL, NULL, c);
- gtk_widget_hide(c->isearch_box);
- gtk_editable_set_position(
- GTK_EDITABLE(c->location), -1);
- gtk_editable_set_position(
- GTK_EDITABLE(c->wsearch), -1);
- return TRUE;
- } else if (GDK_KEY_r == key) {
- webkit_web_view_reload_bypass_cache(
- WEBKIT_WEB_VIEW(c->web_view));
- return TRUE;
- } else if (GDK_KEY_j == key) {
- for (int i = 0; i <= cfg_scroll_lines - 1;
- i++) {
- event->key.keyval = GDK_KEY_Down;
- gdk_event_put(event);
- }
- return TRUE;
- } else if (GDK_KEY_k == key) {
- for (int i = 0; i <= cfg_scroll_lines - 1;
- i++) {
- event->key.keyval = GDK_KEY_Up;
- gdk_event_put(event);
- }
- return TRUE;
- } else if (GDK_KEY_f == key) {
- isearch_init(c, 1);
- return FALSE;
- } else if (GDK_KEY_q == key) {
- client_destroy(NULL, c);
- return TRUE;
- } else if (GDK_KEY_1 == key) {
- gtk_notebook_set_current_page(
- GTK_NOTEBOOK(mw.notebook), 0);
- return TRUE;
- } else if (GDK_KEY_2 == key) {
- gtk_notebook_set_current_page(
- GTK_NOTEBOOK(mw.notebook), 1);
- return TRUE;
- } else if (GDK_KEY_3 == key) {
- gtk_notebook_set_current_page(
- GTK_NOTEBOOK(mw.notebook), 2);
- return TRUE;
- } else if (GDK_KEY_4 == key) {
- gtk_notebook_set_current_page(
- GTK_NOTEBOOK(mw.notebook), 3);
- return TRUE;
- } else if (GDK_KEY_5 == key) {
- gtk_notebook_set_current_page(
- GTK_NOTEBOOK(mw.notebook), 4);
- return TRUE;
- } else if (GDK_KEY_6 == key) {
- gtk_notebook_set_current_page(
- GTK_NOTEBOOK(mw.notebook), 5);
- return TRUE;
- } else if (GDK_KEY_7 == key) {
- gtk_notebook_set_current_page(
- GTK_NOTEBOOK(mw.notebook), 6);
- return TRUE;
- } else if (GDK_KEY_8 == key) {
- gtk_notebook_set_current_page(
- GTK_NOTEBOOK(mw.notebook), 7);
- return TRUE;
- } else if (GDK_KEY_9 == key) {
- gtk_notebook_set_current_page(
- GTK_NOTEBOOK(mw.notebook), 8);
- return TRUE;
- } else if (GDK_KEY_u == key) {
- gtk_notebook_prev_page(
- GTK_NOTEBOOK(mw.notebook));
- return TRUE;
- } else if (GDK_KEY_m == key) {
- gboolean muted = webkit_web_view_get_is_muted(
- WEBKIT_WEB_VIEW(c->web_view));
- webkit_web_view_set_is_muted(
- WEBKIT_WEB_VIEW(c->web_view), !muted);
- changed_title(G_OBJECT(c->web_view), NULL, c);
- return TRUE;
- } else if (GDK_KEY_t == key) {
- client_new(cfg_home_uri, NULL, TRUE, TRUE);
- return TRUE;
- } else if (GDK_KEY_bracketleft == key) {
- reopen_tab();
- return TRUE;
- } else if ((GDK_KEY_i == key) || (GDK_KEY_Tab == key)) {
- gtk_notebook_next_page(
- GTK_NOTEBOOK(mw.notebook));
- return TRUE;
- } else if (GDK_KEY_d == key) {
- gtk_widget_grab_focus(c->wsearch);
- return TRUE;
- } else if (GDK_KEY_equal == key) {
- now = webkit_web_view_get_zoom_level(
- WEBKIT_WEB_VIEW(c->web_view));
- webkit_web_view_set_zoom_level(
- WEBKIT_WEB_VIEW(c->web_view),
- now + 0.1);
- return TRUE;
- } else if (GDK_KEY_minus == key) {
- now = webkit_web_view_get_zoom_level(
- WEBKIT_WEB_VIEW(c->web_view));
- webkit_web_view_set_zoom_level(
- WEBKIT_WEB_VIEW(c->web_view),
- now - 0.1);
- return TRUE;
- } else if (GDK_KEY_0 == key) {
- webkit_web_view_set_zoom_level(
- WEBKIT_WEB_VIEW(c->web_view), 1);
- return TRUE;
- }
- } else if ((((GdkEventKey *)event)->state & mask) ==
- (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
- if (GDK_KEY_ISO_Left_Tab == key) {
- gtk_notebook_prev_page(
- GTK_NOTEBOOK(mw.notebook));
- return TRUE;
- } else if (GDK_KEY_T == key) {
- reopen_tab();
- return TRUE;
- }
- }
- }
- return FALSE;
-}
-
-gboolean
-isearch_counted_matches(GtkWidget *widget, guint matches, gpointer data)
-{
- struct Client *c = (struct Client *)data;
- char *text = malloc(12);
- sprintf(text, "%d matches", matches);
- gtk_label_set_text(GTK_LABEL(c->isearch_matches), text);
- free(text);
- return TRUE;
-}
-
-gboolean
-key_isearch(GtkWidget *widget, GdkEvent *event, gpointer data)
-{
- struct Client *c = (struct Client *)data;
- if (key_common(widget, event, data)) return TRUE;
-
- if (event->type == GDK_KEY_PRESS) {
- int key = ((GdkEventKey *)event)->keyval;
- if ((GDK_KEY_KP_Enter == key) || (GDK_KEY_Return == key)) {
- int direction = (((GdkEventKey *)event)->state &
- GDK_SHIFT_MASK) ?
- -1 :
- 1;
- isearch(c, 0);
- isearch(c, -1);
- isearch(c, direction);
- return TRUE;
- } else if (GDK_KEY_Escape == key) {
- isearch(c, 2);
- gtk_widget_hide(c->isearch_box);
- gtk_widget_grab_focus(c->web_view);
- }
- }
- return FALSE;
-}
-
-gboolean
-key_wsearch(GtkWidget *widget, GdkEvent *event, gpointer data)
-{
- struct Client *c = (struct Client *)data;
- if (key_common(widget, event, data)) return TRUE;
-
- if (event->type == GDK_KEY_PRESS) {
- int key = ((GdkEventKey *)event)->keyval;
- if ((GDK_KEY_KP_Enter == key) || (GDK_KEY_Return == key)) {
- const gchar *t =
- gtk_entry_get_text(GTK_ENTRY(c->wsearch));
- int len = strlen(cfg_search_engine) + strlen(t);
- gchar *f = malloc(len + 1);
- if (!f) allocfail();
-
- snprintf(f, len + 1, "%s%s", cfg_search_engine, t);
- webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view),
- f);
- g_free(f);
- gtk_widget_grab_focus(c->web_view);
- return TRUE;
- }
- }
- return FALSE;
-}
-
-gboolean
-key_location(GtkWidget *widget, GdkEvent *event, gpointer data)
-{
- struct Client *c = (struct Client *)data;
- const gchar *t;
- if (key_common(widget, event, data)) return TRUE;
-
- if (event->type == GDK_KEY_PRESS) {
- int key = ((GdkEventKey *)event)->keyval;
- if ((GDK_KEY_KP_Enter == key) || (GDK_KEY_Return == key)) {
- gtk_widget_grab_focus(c->web_view);
- t = gtk_entry_get_text(GTK_ENTRY(c->location));
- webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view),
- ensure_uri_scheme(t));
- return TRUE;
- } else if (GDK_KEY_Escape == key) {
- t = webkit_web_view_get_uri(
- WEBKIT_WEB_VIEW(c->web_view));
- gtk_entry_set_text(GTK_ENTRY(c->location),
- (t == NULL) ? "" : t);
- return TRUE;
- }
- }
- return FALSE;
-}
-gboolean
-key_tablabel(GtkWidget *widget, GdkEvent *event, gpointer data)
-{
- GdkScrollDirection direction;
- if (event->type == GDK_BUTTON_RELEASE) {
- switch (((GdkEventButton *)event)->button) {
- case 2:
- client_destroy(NULL, data);
- return TRUE;
- }
- } else if (event->type == GDK_SCROLL) {
- gdk_event_get_scroll_direction(event, &direction);
- switch (direction) {
- case GDK_SCROLL_UP:
- gtk_notebook_prev_page(GTK_NOTEBOOK(mw.notebook));
- break;
- case GDK_SCROLL_DOWN:
- gtk_notebook_next_page(GTK_NOTEBOOK(mw.notebook));
- break;
- default:
- break;
- }
- return TRUE;
- }
- return FALSE;
-}
-
-gboolean
-key_web_view(GtkWidget *widget, GdkEvent *event, gpointer data)
-{
- struct Client *c = (struct Client *)data;
- gdouble dx, dy;
- gfloat z;
- if (key_common(c->web_view, event, data)) return TRUE;
-
- if (event->type == GDK_KEY_PRESS) {
- if (((GdkEventKey *)event)->keyval == GDK_KEY_Escape) {
- webkit_web_view_stop_loading(
- WEBKIT_WEB_VIEW(c->web_view));
- gtk_entry_set_progress_fraction(GTK_ENTRY(c->location),
- 0);
- }
- } else if (event->type == GDK_SCROLL) {
- event->scroll.delta_y *= cfg_scroll_lines;
- if (((GdkEventScroll *)event)->state & GDK_CONTROL_MASK) {
- gdk_event_get_scroll_deltas(event, &dx, &dy);
- z = webkit_web_view_get_zoom_level(
- WEBKIT_WEB_VIEW(c->web_view));
- z += -dy * 0.1;
- z = dx != 0 ? 1 : z;
- webkit_web_view_set_zoom_level(
- WEBKIT_WEB_VIEW(c->web_view), z);
- return TRUE;
- }
- }
- return FALSE;
-}
void
mainwindow_setup(void)
{
mw.win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_default_size(GTK_WINDOW(mw.win), 800, 600);
+ gtk_window_set_default_size(GTK_WINDOW(mw.win), 1200, 900);
g_signal_connect(G_OBJECT(mw.win), "destroy", gtk_main_quit, NULL);
gchar *priv = (cfg.private) ? "-private" : "";
gtk_style_context_add_provider_for_screen(
gdk_screen_get_default(), GTK_STYLE_PROVIDER(css),
GTK_STYLE_PROVIDER_PRIORITY_USER);
+
+ gtk_widget_show_all(mw.win);
}
void
mainwindow_title(idx);
}
-gboolean
-quit_if_nothing_active(void)
-{
- if (clients == 0) {
- if (downloads == 0) {
- gtk_main_quit();
- return TRUE;
- } else {
- downloadmanager_show();
- }
- }
- return FALSE;
-}
-gboolean
-remote_msg(GIOChannel *channel, GIOCondition condition, gpointer data)
-{
- gchar *uri = NULL;
- g_io_channel_read_line(channel, &uri, NULL, NULL, NULL);
- if (uri) {
- g_strstrip(uri);
- client_new(uri, NULL, TRUE, TRUE);
- g_free(uri);
- }
- return TRUE;
-}
-
void
show_web_view(WebKitWebView *web_view, gpointer data)
{
struct Client *c = (struct Client *)data;
- gint idx;
(void)web_view;
+ gint idx = gtk_notebook_page_num(GTK_NOTEBOOK(mw.notebook), c->vbox);
- gtk_widget_show_all(mw.win);
-
- // TODO: Fix this hack
- for (int i = 1; i <= clients; i++)
- gtk_widget_hide(client_arr[i]->isearch_box);
+ gtk_widget_show_all(GTK_WIDGET(
+ gtk_notebook_get_nth_page(GTK_NOTEBOOK(mw.notebook), idx)));
gtk_widget_hide(c->isearch_box);
- 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);
- }
+ if (idx != -1 && switch_tab)
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(mw.notebook), idx);
+ gtk_widget_grab_focus(c->web_view);
}
void
g_free(absfile);
if (cert == NULL)
fprintf(stderr,
- "chorizo: warning: could not load trusted cert: %s\n",
+ "chorizo: warning: could not load"
+ "trusted cert: %s\n",
file);
else
- webkit_web_context_allow_tls_certificate_for_host(
+ // clang-format off
+ webkit_web_context_allow_tls_certificate_for_host(
wc, cert, file);
+ // clang-format on
file = g_dir_read_name(dir);
}
g_dir_close(dir);
downloadmanager_setup();
mainwindow_setup();
- client_arr = malloc(sizeof(struct Client *));
- if (!client_arr) allocfail();
-
if (optind >= argc) {
- client_new(cfg_home_uri, NULL, TRUE, TRUE);
+ client_new(cfg_home_uri, NULL);
} else {
- for (i = optind; i < argc; i++)
- client_new(argv[i], NULL, TRUE, TRUE);
+ for (i = optind; i < argc; i++) client_new(argv[i], NULL);
}
if (cfg.noncooperative_instances || cfg.cooperative_alone) {
projects / chorizo.git / blobdiff