void search(gpointer, gint);
void show_web_view(WebKitWebView *, gpointer);
void trust_user_certs(WebKitWebContext *);
+GKeyFile *get_ini(void);
+GKeyFile *config;
struct Client
{
gboolean cooperative_alone = TRUE;
gboolean cooperative_instances = TRUE;
int cooperative_pipe_fp = 0;
-gchar *download_dir = "/var/tmp";
-gboolean enable_console_to_stdout = FALSE;
+gboolean enable_console_to_stdout;
gchar *fifo_suffix = "main";
-gdouble global_zoom = 1.0;
-gchar *history_file = NULL;
-gchar *home_uri = "about:blank";
-gchar *search_text = NULL;
-GtkPositionType tab_pos = GTK_POS_TOP;
-gint tab_width_chars = 20;
-gchar *user_agent = NULL;
-
+gdouble global_zoom;
+gchar *download_dir;
+gchar *history_file;
+gchar *home_uri;
+gchar *search_text;
+gint tab_width_chars;
+gchar *user_agent;
+gboolean javascript_disabled;
void
client_destroy(GtkWidget *widget, gpointer data)
c->web_view = webkit_web_view_new_with_related_view(related_wv);
webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view), global_zoom);
+ WebKitSettings *settings = webkit_web_view_get_settings(WEBKIT_WEB_VIEW(c->web_view));
+ webkit_settings_set_enable_javascript(settings, !javascript_disabled);
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",
}
void
-grab_environment_configuration(void)
+get_config(void)
{
const gchar *e;
- e = g_getenv(__NAME_UPPERCASE__"_ACCEPTED_LANGUAGE");
- if (e != NULL)
- accepted_language[0] = g_strdup(e);
-
- e = g_getenv(__NAME_UPPERCASE__"_DOWNLOAD_DIR");
- if (e != NULL)
- download_dir = g_strdup(e);
-
- e = g_getenv(__NAME_UPPERCASE__"_ENABLE_CONSOLE_TO_STDOUT");
- if (e != NULL)
- enable_console_to_stdout = TRUE;
-
e = g_getenv(__NAME_UPPERCASE__"_FIFO_SUFFIX");
if (e != NULL)
fifo_suffix = g_strdup(e);
- e = g_getenv(__NAME_UPPERCASE__"_HISTORY_FILE");
- if (e != NULL)
- history_file = g_strdup(e);
-
- e = g_getenv(__NAME_UPPERCASE__"_HOME_URI");
- 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;
+ char *xdg_down = getenv("XDG_DOWNLOAD_DIR");
+ download_dir = (xdg_down) ? xdg_down : "/var/tmp";
+
+ config = get_ini();
+ accepted_language[0] = g_key_file_get_string(config, "browser",
+ "accepted_language", NULL);
+ history_file = g_key_file_get_string(config, "browser", "history_file", NULL);
+ home_uri = g_key_file_get_string(config, "browser", "homepage", NULL);
+ enable_console_to_stdout = g_key_file_get_boolean(config, "browser",
+ "console_to_stdout", NULL);
+ user_agent = g_key_file_get_string(config, "browser", "user_agent", NULL);
+ javascript_disabled = g_key_file_get_boolean(config, "browser",
+ "javascript_disabled", NULL);
+ char *input_cookie_policy = g_key_file_get_string(config, "browser",
+ "cookie_policy", NULL);
+ cookie_policy = WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY;
+ if (input_cookie_policy) {
+ if (strcmp(input_cookie_policy, "all") == 0) {
+ cookie_policy = WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS;
+ } else if (strcmp(input_cookie_policy, "none") == 0) {
+ cookie_policy = WEBKIT_COOKIE_POLICY_ACCEPT_NEVER;
+ }
}
- 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);
-
- e = g_getenv(__NAME_UPPERCASE__"_ZOOM");
- if (e != NULL)
- global_zoom = atof(e);
+ tab_width_chars = g_key_file_get_integer(config, "ui", "tab_width", NULL);
+ tab_width_chars = (tab_width_chars) ? tab_width_chars : 20;
+ global_zoom = g_key_file_get_double(config, "ui", "zoom_level", NULL);
+ global_zoom = (global_zoom) ? global_zoom : 1.0;
+ search_engine = g_key_file_get_string(config, "ui", "search_engine", NULL);
+ search_engine = (search_engine) ? search_engine : "https://duckduckgo.com?q=";
}
void
trust_user_certs(wc);
cm = webkit_web_context_get_cookie_manager(wc);
- webkit_cookie_manager_set_accept_policy(cm, WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY);
+ webkit_cookie_manager_set_accept_policy(cm, cookie_policy);
webkit_web_context_set_favicon_database_directory(wc, NULL);
webkit_cookie_manager_set_persistent_storage(cm,
search(c, direction);
}
+int
+def_key(char *key, unsigned int def)
+{
+ char *conf = g_key_file_get_string(config, "keybindings", key, NULL);
+ return (conf) ? gdk_keyval_from_name((conf) ? conf : NULL) : def;
+}
+
gboolean
key_common(GtkWidget *widget, GdkEvent *event, gpointer data)
{
if (event->type == GDK_KEY_PRESS) {
if (((GdkEventKey *)event)->state & GDK_CONTROL_MASK) {
- switch (((GdkEventKey *)event)->keyval) {
- case GDK_KEY_q: // close window
+ WebKitSettings *settings = webkit_web_view_get_settings(WEBKIT_WEB_VIEW(c->web_view));
+ gboolean js = webkit_settings_get_enable_javascript(settings);
+ int key = ((GdkEventKey *)event)->keyval;
+ if (def_key("close_tab", GDK_KEY_q) == key) {
client_destroy(NULL, c);
return TRUE;
- case GDK_KEY_w: // new tab
+ } else if (def_key("new_tab", GDK_KEY_w) == key) {
f = ensure_uri_scheme(home_uri);
client_new(f, NULL, TRUE, TRUE);
g_free(f);
return TRUE;
- case GDK_KEY_e: // reload
+ } else if (def_key("reload", GDK_KEY_e) == key) {
webkit_web_view_reload_bypass_cache(WEBKIT_WEB_VIEW(c->web_view));
return TRUE;
- case GDK_KEY_y: // download manager
+ } else if (def_key("download_manager", GDK_KEY_y) == key) {
gtk_widget_show_all(dm.win);
return TRUE;
- case GDK_KEY_d: // initiate web search
+ } else if (def_key("web_search", GDK_KEY_d) == key) {
gtk_widget_grab_focus(c->location);
gtk_entry_set_text(GTK_ENTRY(c->location), "w/");
gtk_editable_set_position(GTK_EDITABLE(c->location), -1);
return TRUE;
- case GDK_KEY_s: // i-search forwards
+ } else if (def_key("search_forwards", GDK_KEY_s) == key) {
search_init(c, 1);
return TRUE;
- case GDK_KEY_r: // i-search backwards
+ } else if (def_key("search_backwards", GDK_KEY_r) == key) {
search_init(c, -1);
return TRUE;
- case GDK_KEY_t: // location
+ } else if (def_key("location", GDK_KEY_t) == key) {
gtk_widget_grab_focus(c->location);
- gtk_entry_set_text(GTK_ENTRY(c->location),
- webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view)));
+ const char *uri = webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view));
+ const char *goal = (uri) ? uri : "https://";
+ gtk_entry_set_text(GTK_ENTRY(c->location), goal);
+ gtk_editable_set_position(GTK_EDITABLE(c->location), -1);
return TRUE;
- case GDK_KEY_u: // previous tab
+ } else if (def_key("previous_tab", GDK_KEY_u) == key) {
gtk_notebook_prev_page(GTK_NOTEBOOK(mw.notebook));
return TRUE;
- case GDK_KEY_i: // next tab
+ } else if (def_key("next_tab", GDK_KEY_i) == key) {
gtk_notebook_next_page(GTK_NOTEBOOK(mw.notebook));
return TRUE;
- case GDK_KEY_h: // back in history
+ } else if (def_key("history_back", GDK_KEY_h) == key) {
webkit_web_view_go_back(WEBKIT_WEB_VIEW(c->web_view));
return TRUE;
- case GDK_KEY_l: // forward in history
+ } else if (def_key("history_forwards", GDK_KEY_l) == key) {
webkit_web_view_go_forward(WEBKIT_WEB_VIEW(c->web_view));
return TRUE;
- case GDK_KEY_j: // scroll down
+ } else if (def_key("scroll_down", GDK_KEY_j) == key) {
for (int i = 0; i < 2; i++) {
event->key.keyval = GDK_KEY_Down;
gdk_event_put(event);
}
return TRUE;
- case GDK_KEY_k: // scroll up
- for (int i = 0; i < 2; i++) {
- event->key.keyval = GDK_KEY_Up;
- gdk_event_put(event);
- }
+ } else if (def_key("scroll_up", GDK_KEY_k) == key) {
+ event->key.keyval = GDK_KEY_Up;
+ gdk_event_put(event);
return TRUE;
- case GDK_KEY_f: // page down
+ } else if (def_key("scroll_page_down", GDK_KEY_f) == key) {
event->key.keyval = GDK_KEY_Page_Down;
gdk_event_put(event);
return TRUE;
- case GDK_KEY_b: // page up
+ } else if (def_key("scroll_page_up", GDK_KEY_b) == key) {
event->key.keyval = GDK_KEY_Page_Up;
gdk_event_put(event);
return TRUE;
- case GDK_KEY_o: // toggle JS
- WebKitSettings *settings = webkit_web_view_get_settings(WEBKIT_WEB_VIEW(c->web_view));
- gboolean current = webkit_settings_get_enable_javascript(settings);
- webkit_settings_set_enable_javascript(settings,
- (current) ? FALSE : TRUE);
+ } else if (def_key("toggle_js", GDK_KEY_o) == key) {
+ webkit_settings_set_enable_javascript(settings, (js) ? FALSE : TRUE);
webkit_web_view_set_settings(WEBKIT_WEB_VIEW(c->web_view), settings);
return TRUE;
- case GDK_KEY_g: // go to bottom
+ } else if (def_key("quit", GDK_KEY_g) == key) {
search(c, 2);
gtk_widget_grab_focus(c->web_view);
gtk_entry_set_text(GTK_ENTRY(c->location),
"document.activeElement.blur();",
NULL, NULL, c);
return TRUE;
- case GDK_KEY_equal: // zoom in
+ } else if (def_key("zoom_in", 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;
- case GDK_KEY_minus: // zoom out
+ } else if (def_key("zoom_out", 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;
- case GDK_KEY_0: // reset zoom
- webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view), 1);
+ } else if (def_key("zoom_reset", GDK_KEY_0) == key) {
+ webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view),
+ global_zoom);
return TRUE;
}
}
{
if (event->type == GDK_KEY_PRESS) {
if (((GdkEventKey *)event)->state & GDK_CONTROL_MASK) {
- switch (((GdkEventKey *)event)->keyval) {
- case GDK_KEY_y: /* close window (left hand) */
- case GDK_KEY_q:
+ int key = ((GdkEventKey *)event)->keyval;
+ if ((def_key("close_tab", GDK_KEY_q) == key) ||
+ (def_key("download_manager", GDK_KEY_y) == key)) {
downloadmanager_delete(dm.win, NULL);
return TRUE;
}
return TRUE;
if (event->type == GDK_KEY_PRESS) {
- switch (((GdkEventKey *)event)->keyval) {
- case GDK_KEY_KP_Enter:
- case GDK_KEY_Return:
+ 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));
if (t != NULL && t[0] == 's' && t[1] == '/') {
search_text = g_strdup(t + 2);
search(c, 0);
} else if (t != NULL && t[0] == 'w' && t[1] == '/') {
- const char *engine = "https://duckduckgo.com?q=";
+ const char *engine = search_engine;
int len = strlen(engine) + strlen(t) - 2;
char *f = (char *) malloc(len);
snprintf(f, len + 1, "%s%s", engine, t + 2);
g_free(f);
}
return TRUE;
- case GDK_KEY_Escape:
+ } else if ((GDK_KEY_Escape == key) ||
+ (def_key("quit", GDK_KEY_g) == key)) {
t = webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view));
gtk_entry_set_text(GTK_ENTRY(c->location),
(t == NULL ? __NAME__ : t));
return TRUE;
}
}
-
return FALSE;
}
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(notebook_switch_page), NULL);
}
}
+GKeyFile *
+get_ini(void)
+{
+ GKeyFileFlags flags = G_KEY_FILE_NONE;
+ g_autoptr(GError) error = NULL;
+ config = g_key_file_new();
+
+ // Load user config
+ if (!g_key_file_load_from_file(config,
+ g_build_filename(g_get_user_config_dir(),
+ __NAME__, "lariza.ini",
+ NULL), flags, &error)) {
+ // Load global config
+ if (!g_key_file_load_from_file(config, "/etc/lariza.ini", flags,
+ &error)) {
+ fprintf(stderr, "Could not load lariza.ini: %s", error->message);
+ }
+ }
+ return config;
+}
+
int
main(int argc, char **argv)
{
int opt, i;
gtk_init(&argc, &argv);
- grab_environment_configuration();
+ get_config();
while ((opt = getopt(argc, argv, "C")) != -1) {
switch (opt) {
projects / chorizo.git / blobdiff