#include <webkit/webkit.h>
-#define DOWNLOAD_DIR "/tmp/tmp"
-#define LANGUAGE "en-US"
-
-
static void adblock(WebKitWebView *, WebKitWebFrame *, WebKitWebResource *,
WebKitNetworkRequest *, WebKitNetworkResponse *, gpointer);
static void adblock_load(void);
static void client_destroy(GtkWidget *, gpointer);
-static void client_new(const gchar *uri);
-static gboolean client_new_request(WebKitWebView *, WebKitWebFrame *,
- WebKitNetworkRequest *,
- WebKitWebNavigationAction *,
- WebKitWebPolicyDecision *, gpointer);
+static gboolean client_destroy_request(WebKitWebView *, gpointer);
+static WebKitWebView *client_new(const gchar *);
+static WebKitWebView *client_new_request(WebKitWebView *, WebKitWebFrame *,
+ gpointer);
static void cooperation_setup(void);
-static void changed_load_status(GObject *obj, GParamSpec *pspec,
- gpointer data);
+static void changed_download_progress(GObject *, GParamSpec *, gpointer);
+static void changed_load_progress(GObject *, GParamSpec *, gpointer);
static void changed_title(GObject *, GParamSpec *, gpointer);
static void changed_uri(GObject *, GParamSpec *, gpointer);
+static gboolean download_handle(WebKitWebView *, WebKitDownload *, gpointer);
+static gboolean download_reset_indicator(gpointer);
static gboolean download_request(WebKitWebView *, WebKitWebFrame *,
WebKitNetworkRequest *, gchar *,
WebKitWebPolicyDecision *, gpointer);
-static gboolean download_wget(WebKitWebView *, WebKitDownload *, gpointer);
+static void downloadmanager_cancel(GtkToolButton *, gpointer data);
+static void downloadmanager_setup(void);
+static gchar *ensure_uri_scheme(const gchar *);
+static void grab_environment_configuration(void);
static void hover_web_view(WebKitWebView *, gchar *, gchar *, gpointer);
+static gboolean key_downloadmanager(GtkWidget *, GdkEvent *, gpointer);
static gboolean key_location(GtkWidget *, GdkEvent *, gpointer);
static gboolean key_web_view(GtkWidget *, GdkEvent *, gpointer);
+static void keywords_load(void);
+static gboolean keywords_try_search(WebKitWebView *, const gchar *);
static gboolean remote_msg(GIOChannel *, GIOCondition, gpointer);
static void search(gpointer, gint);
-static void scroll(GtkAdjustment *, gint, gdouble);
static Window tabbed_launch(void);
static void usage(void);
struct Client
{
- GtkWidget *win;
- GtkWidget *vbox;
GtkWidget *location;
- GtkWidget *status;
+ GtkWidget *progress;
GtkWidget *scroll;
+ GtkWidget *status;
+ GtkWidget *top_box;
+ GtkWidget *vbox;
GtkWidget *web_view;
+ GtkWidget *win;
};
+struct DownloadManager
+{
+ GtkWidget *scroll;
+ GtkWidget *toolbar;
+ GtkWidget *win;
+} dm;
+
+static gchar *accepted_language = "en-US";
static GSList *adblock_patterns = NULL;
static gint clients = 0;
static gboolean cooperative_alone = TRUE;
static gboolean cooperative_instances = TRUE;
static int cooperative_pipe_fp = 0;
+static gchar *download_dir = "/tmp";
+static gint downloads_indicated = 0;
static Window embed = 0;
-static gchar *first_uri = NULL;
+static gchar *fifo_suffix = "main";
static gdouble global_zoom = 1.0;
+static gchar *home_uri = "about:blank";
+static GHashTable *keywords = NULL;
static gboolean language_is_set = FALSE;
static gchar *search_text = NULL;
static gboolean show_all_requests = FALSE;
static gboolean tabbed_automagic = TRUE;
+static gchar *user_agent = "Mozilla/5.0 (X11; U; Unix; en-US) "
+ "AppleWebKit/537.15 (KHTML, like Gecko) "
+ "Chrome/24.0.1295.0 "
+ "Safari/537.15 "__NAME_UPPERCASE__"/git";
void
GSList *it = adblock_patterns;
const gchar *uri;
- (void)web_view;
- (void)frame;
- (void)resource;
- (void)response;
- (void)data;
-
uri = webkit_network_request_get_uri(request);
if (show_all_requests)
- fprintf(stderr, "-> %s\n", uri);
+ fprintf(stderr, " -> %s\n", uri);
while (it)
{
{
webkit_network_request_set_uri(request, "about:blank");
if (show_all_requests)
- fprintf(stderr, "\tBLOCKED!\n");
+ fprintf(stderr, " BLOCKED!\n");
return;
}
it = g_slist_next(it);
GRegex *re = NULL;
GError *err = NULL;
GIOChannel *channel = NULL;
- gchar *path = NULL;
- gchar *buf = NULL;
+ gchar *path = NULL, *buf = NULL;
path = g_build_filename(g_get_user_config_dir(), __NAME__, "adblock.black",
NULL);
== G_IO_STATUS_NORMAL)
{
g_strstrip(buf);
- re = g_regex_new(buf,
- G_REGEX_CASELESS | G_REGEX_OPTIMIZE,
- G_REGEX_MATCH_PARTIAL, &err);
- if (err != NULL)
+ if (buf[0] != '#')
{
- fprintf(stderr, __NAME__": Could not compile regex: %s\n", buf);
- g_error_free(err);
- err = NULL;
+ re = g_regex_new(buf,
+ G_REGEX_CASELESS | G_REGEX_OPTIMIZE,
+ G_REGEX_MATCH_PARTIAL, &err);
+ if (err != NULL)
+ {
+ fprintf(stderr, __NAME__": Could not compile regex: %s\n", buf);
+ g_error_free(err);
+ err = NULL;
+ }
+ else
+ adblock_patterns = g_slist_append(adblock_patterns, re);
}
- adblock_patterns = g_slist_append(adblock_patterns, re);
-
g_free(buf);
}
+ g_io_channel_shutdown(channel, FALSE, NULL);
}
g_free(path);
}
{
struct Client *c = (struct Client *)data;
- (void)obj;
+ g_signal_handlers_disconnect_by_func(G_OBJECT(c->web_view),
+ changed_load_progress, c);
- webkit_web_view_stop_loading(WEBKIT_WEB_VIEW(c->web_view));
- gtk_widget_destroy(c->web_view);
- gtk_widget_destroy(c->scroll);
- gtk_widget_destroy(c->status);
- gtk_widget_destroy(c->location);
- gtk_widget_destroy(c->vbox);
- gtk_widget_destroy(c->win);
free(c);
-
clients--;
+
if (clients == 0)
gtk_main_quit();
}
-void
+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)
{
struct Client *c;
- gchar *capitalized_name = NULL;
+ gchar *f;
- if (cooperative_instances && !cooperative_alone)
+ if (uri != NULL && cooperative_instances && !cooperative_alone)
{
write(cooperative_pipe_fp, uri, strlen(uri));
write(cooperative_pipe_fp, "\n", 1);
- return;
+ return NULL;
}
c = malloc(sizeof(struct Client));
if (c->win == NULL)
{
c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-
- capitalized_name = g_strdup(__NAME__);
- capitalized_name[0] = g_ascii_toupper(capitalized_name[0]);
- gtk_window_set_wmclass(GTK_WINDOW(c->win), __NAME__, capitalized_name);
- g_free(capitalized_name);
+ gtk_window_set_wmclass(GTK_WINDOW(c->win), __NAME__, __NAME_CAPITALIZED__);
}
/* When using Gtk2, it only shows a white area when run in suckless'
* to work. This is not needed when using Gtk3. */
gtk_window_set_default_size(GTK_WINDOW(c->win), 1024, 768);
- g_signal_connect(G_OBJECT(c->win), "destroy",
- G_CALLBACK(client_destroy), c);
+ g_signal_connect(G_OBJECT(c->win), "destroy", G_CALLBACK(client_destroy), c);
gtk_window_set_title(GTK_WINDOW(c->win), __NAME__);
c->web_view = webkit_web_view_new();
- webkit_web_view_set_full_content_zoom(WEBKIT_WEB_VIEW(c->web_view), TRUE);
+
+ /* XXX I really do want to enable this option. However, I get
+ * reproducible crashes with it enabled. I've seen bug reports from
+ * 2010 about this... WebKit crashes in libpixman, so maybe it's not
+ * a WebKit issue.
+ * Yeah, well. I'll turn it off for now. */
+ /*webkit_web_view_set_full_content_zoom(WEBKIT_WEB_VIEW(c->web_view), TRUE);*/
+
webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view), global_zoom);
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_CALLBACK(changed_uri), c);
- g_signal_connect(G_OBJECT(c->web_view), "notify::load-status",
- G_CALLBACK(changed_load_status), c);
- g_signal_connect(G_OBJECT(c->web_view),
- "new-window-policy-decision-requested",
+ g_signal_connect(G_OBJECT(c->web_view), "notify::progress",
+ G_CALLBACK(changed_load_progress), c);
+ g_signal_connect(G_OBJECT(c->web_view), "create-web-view",
G_CALLBACK(client_new_request), NULL);
+ g_signal_connect(G_OBJECT(c->web_view), "close-web-view",
+ G_CALLBACK(client_destroy_request), c);
g_signal_connect(G_OBJECT(c->web_view),
"mime-type-policy-decision-requested",
G_CALLBACK(download_request), NULL);
g_signal_connect(G_OBJECT(c->web_view), "download-requested",
- G_CALLBACK(download_wget), NULL);
+ G_CALLBACK(download_handle), c);
g_signal_connect(G_OBJECT(c->web_view), "key-press-event",
G_CALLBACK(key_web_view), c);
g_signal_connect(G_OBJECT(c->web_view), "button-press-event",
G_CALLBACK(key_web_view), c);
+ g_signal_connect(G_OBJECT(c->web_view), "scroll-event",
+ G_CALLBACK(key_web_view), c);
g_signal_connect(G_OBJECT(c->web_view), "hovering-over-link",
G_CALLBACK(hover_web_view), c);
g_signal_connect(G_OBJECT(c->web_view), "resource-request-starting",
if (!language_is_set)
{
- g_object_set(webkit_get_default_session(), "accept-language", LANGUAGE,
- NULL);
+ g_object_set(webkit_get_default_session(), "accept-language",
+ accepted_language, NULL);
language_is_set = TRUE;
}
+ g_object_set(G_OBJECT(webkit_web_view_get_settings(WEBKIT_WEB_VIEW(c->web_view))),
+ "user-agent", user_agent, NULL);
+
c->scroll = gtk_scrolled_window_new(NULL, NULL);
gtk_container_add(GTK_CONTAINER(c->scroll), c->web_view);
g_signal_connect(G_OBJECT(c->location), "key-press-event",
G_CALLBACK(key_location), c);
- c->status = gtk_statusbar_new();
- gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(c->status), FALSE);
+ c->progress = gtk_progress_bar_new();
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->progress), 0);
+
+ c->status = gtk_progress_bar_new();
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->status), 0);
+ gtk_widget_set_size_request(c->status, 20, -1);
- c->vbox = gtk_vbox_new(FALSE, 2);
- gtk_box_pack_start(GTK_BOX(c->vbox), c->location, FALSE, FALSE, 0);
+ c->top_box = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(c->top_box), c->status, FALSE, FALSE, 2);
+ gtk_box_pack_start(GTK_BOX(c->top_box), c->location, TRUE, TRUE, 0);
+ gtk_box_pack_end(GTK_BOX(c->top_box), c->progress, FALSE, TRUE, 2);
+
+ c->vbox = gtk_vbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(c->vbox), c->top_box, FALSE, FALSE, 2);
gtk_container_add(GTK_CONTAINER(c->vbox), c->scroll);
- gtk_box_pack_end(GTK_BOX(c->vbox), c->status, FALSE, FALSE, 0);
gtk_container_add(GTK_CONTAINER(c->win), c->vbox);
gtk_widget_grab_focus(c->web_view);
gtk_widget_show_all(c->win);
- webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), uri);
+ if (uri != NULL)
+ {
+ f = ensure_uri_scheme(uri);
+ if (show_all_requests)
+ fprintf(stderr, "====> %s\n", uri);
+ webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
+ g_free(f);
+ }
clients++;
+
+ return WEBKIT_WEB_VIEW(c->web_view);
}
-gboolean
-client_new_request(WebKitWebView *web_view, WebKitWebFrame *frame,
- WebKitNetworkRequest *request,
- WebKitWebNavigationAction *navigation_action,
- WebKitWebPolicyDecision *policy_decision, gpointer user_data)
+WebKitWebView *
+client_new_request(WebKitWebView *web_view, WebKitWebFrame *frame, gpointer data)
{
- (void)web_view;
- (void)frame;
- (void)navigation_action;
- (void)user_data;
-
- webkit_web_policy_decision_ignore(policy_decision);
- client_new(webkit_network_request_get_uri(request));
-
- return TRUE;
+ return client_new(NULL);
}
void
cooperation_setup(void)
{
GIOChannel *towatch;
- gchar *fifopath;
+ gchar *fifofilename, *fifopath;
- fifopath = g_build_filename(g_get_user_runtime_dir(), __NAME__".fifo", NULL);
+ fifofilename = g_strdup_printf("%s-%s", __NAME__".fifo", fifo_suffix);
+ fifopath = g_build_filename(g_get_user_runtime_dir(), fifofilename, NULL);
+ g_free(fifofilename);
if (!g_file_test(fifopath, G_FILE_TEST_EXISTS))
mkfifo(fifopath, 0600);
}
void
-changed_load_status(GObject *obj, GParamSpec *pspec, gpointer data)
+changed_download_progress(GObject *obj, GParamSpec *pspec, gpointer data)
{
- struct Client *c = (struct Client *)data;
+ WebKitDownload *download = WEBKIT_DOWNLOAD(obj);
+ GtkToolItem *tb = GTK_TOOL_ITEM(data);
+ gdouble p;
+ const gchar *uri;
+ gchar *t, *filename, *base;
- (void)obj;
- (void)pspec;
+ p = webkit_download_get_progress(download) * 100;
- if (webkit_web_view_get_load_status(WEBKIT_WEB_VIEW(c->web_view))
- == WEBKIT_LOAD_FINISHED)
+ uri = webkit_download_get_destination_uri(download);
+ filename = g_filename_from_uri(uri, NULL, NULL);
+ if (filename == NULL)
{
- gtk_statusbar_pop(GTK_STATUSBAR(c->status), 1);
- gtk_statusbar_push(GTK_STATUSBAR(c->status), 1, "Finished.");
+ /* This really should not happen because WebKit uses that URI to
+ * write to a file... */
+ fprintf(stderr, __NAME__": Could not construct file name from URI!\n");
+ t = g_strdup_printf("%s (%.0f%%)",
+ webkit_download_get_suggested_filename(download), p);
}
else
{
- gtk_statusbar_pop(GTK_STATUSBAR(c->status), 1);
- gtk_statusbar_push(GTK_STATUSBAR(c->status), 1, "Loading...");
+ base = g_path_get_basename(filename);
+ t = g_strdup_printf("%s (%.0f%%)", base, p);
+ g_free(filename);
+ g_free(base);
}
+ gtk_tool_button_set_label(GTK_TOOL_BUTTON(tb), t);
+ g_free(t);
+}
+
+void
+changed_load_progress(GObject *obj, GParamSpec *pspec, gpointer data)
+{
+ struct Client *c = (struct Client *)data;
+ gdouble p;
+
+ p = webkit_web_view_get_progress(WEBKIT_WEB_VIEW(c->web_view));
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->progress), p);
}
void
const gchar *t;
struct Client *c = (struct Client *)data;
- (void)obj;
- (void)pspec;
-
t = webkit_web_view_get_title(WEBKIT_WEB_VIEW(c->web_view));
gtk_window_set_title(GTK_WINDOW(c->win), (t == NULL ? __NAME__ : t));
}
const gchar *t;
struct Client *c = (struct Client *)data;
- (void)obj;
- (void)pspec;
-
t = webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view));
gtk_entry_set_text(GTK_ENTRY(c->location), (t == NULL ? __NAME__ : t));
}
+gboolean
+download_handle(WebKitWebView *web_view, WebKitDownload *download, gpointer data)
+{
+ struct Client *c = (struct Client *)data;
+ gchar *path, *path2 = NULL, *uri;
+ GtkToolItem *tb;
+ gboolean ret;
+ int suffix = 1;
+
+ path = g_build_filename(download_dir,
+ webkit_download_get_suggested_filename(download),
+ NULL);
+ path2 = g_strdup(path);
+ while (g_file_test(path2, G_FILE_TEST_EXISTS) && suffix < 1000)
+ {
+ g_free(path2);
+
+ path2 = g_strdup_printf("%s.%d", path, suffix);
+ suffix++;
+ }
+
+ if (suffix == 1000)
+ {
+ fprintf(stderr, __NAME__": Suffix reached limit for download.\n");
+ ret = FALSE;
+ }
+ else
+ {
+ uri = g_filename_to_uri(path2, NULL, NULL);
+ webkit_download_set_destination_uri(download, uri);
+ ret = TRUE;
+ g_free(uri);
+
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->status), 1);
+ downloads_indicated++;
+ g_timeout_add(500, download_reset_indicator, c);
+
+ tb = gtk_tool_button_new_from_stock(GTK_STOCK_DELETE);
+ gtk_tool_button_set_label(GTK_TOOL_BUTTON(tb),
+ webkit_download_get_suggested_filename(download));
+ gtk_toolbar_insert(GTK_TOOLBAR(dm.toolbar), tb, 0);
+ gtk_widget_show_all(dm.toolbar);
+
+ g_signal_connect(G_OBJECT(download), "notify::progress",
+ G_CALLBACK(changed_download_progress), tb);
+
+ g_object_ref(download);
+ g_signal_connect(G_OBJECT(tb), "clicked",
+ G_CALLBACK(downloadmanager_cancel), download);
+ }
+
+ g_free(path);
+ g_free(path2);
+
+ return ret;
+}
+
+gboolean
+download_reset_indicator(gpointer data)
+{
+ struct Client *c = (struct Client *)data;
+
+ downloads_indicated--;
+ if (downloads_indicated == 0)
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->status), 0);
+
+ return FALSE;
+}
+
gboolean
download_request(WebKitWebView *web_view, WebKitWebFrame *frame,
WebKitNetworkRequest *request, gchar *mime_type,
WebKitWebPolicyDecision *policy_decision, gpointer data)
{
- (void)frame;
- (void)request;
- (void)data;
-
if (!webkit_web_view_can_show_mime_type(web_view, mime_type))
{
webkit_web_policy_decision_download(policy_decision);
return FALSE;
}
-gboolean
-download_wget(WebKitWebView *web_view, WebKitDownload *download, gpointer data)
+void
+downloadmanager_cancel(GtkToolButton *tb, gpointer data)
{
- const gchar *uri;
- char id[16] = "";
- gint ret;
+ WebKitDownload *download = WEBKIT_DOWNLOAD(data);
- (void)web_view;
- (void)data;
+ webkit_download_cancel(download);
+ g_object_unref(download);
- uri = webkit_download_get_uri(download);
- if (fork() == 0)
- {
- chdir(DOWNLOAD_DIR);
- if (embed == 0)
- ret = execlp("xterm", "xterm", "-hold", "-e", "wget", uri, NULL);
- else
- {
- if (snprintf(id, 16, "%ld", embed) >= 16)
- {
- fprintf(stderr, __NAME__": id for xterm embed truncated!\n");
- exit(EXIT_FAILURE);
- }
- ret = execlp("xterm", "xterm", "-hold", "-into", id, "-e", "wget",
- uri, NULL);
- }
+ gtk_widget_destroy(GTK_WIDGET(tb));
+}
- if (ret == -1)
- {
- fprintf(stderr, __NAME__": exec'ing xterm for download");
- perror(" failed");
- exit(EXIT_FAILURE);
- }
+void
+downloadmanager_setup(void)
+{
+ dm.win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_type_hint(GTK_WINDOW(dm.win), GDK_WINDOW_TYPE_HINT_DIALOG);
+ gtk_window_set_default_size(GTK_WINDOW(dm.win), 500, 250);
+ gtk_window_set_title(GTK_WINDOW(dm.win), __NAME__" - Download Manager");
+ g_signal_connect(G_OBJECT(dm.win), "delete-event",
+ G_CALLBACK(gtk_widget_hide_on_delete), NULL);
+ g_signal_connect(G_OBJECT(dm.win), "key-press-event",
+ G_CALLBACK(key_downloadmanager), NULL);
+
+ dm.toolbar = gtk_toolbar_new();
+ gtk_orientable_set_orientation(GTK_ORIENTABLE(dm.toolbar),
+ GTK_ORIENTATION_VERTICAL);
+ gtk_toolbar_set_style(GTK_TOOLBAR(dm.toolbar), GTK_TOOLBAR_BOTH_HORIZ);
+ gtk_toolbar_set_show_arrow(GTK_TOOLBAR(dm.toolbar), FALSE);
+
+ dm.scroll = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dm.scroll),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(dm.scroll),
+ dm.toolbar);
+
+ gtk_container_add(GTK_CONTAINER(dm.win), dm.scroll);
+}
+
+gchar *
+ensure_uri_scheme(const gchar *t)
+{
+ gchar *f;
+
+ f = g_ascii_strdown(t, -1);
+ if (!g_str_has_prefix(f, "http:") &&
+ !g_str_has_prefix(f, "https:") &&
+ !g_str_has_prefix(f, "file:") &&
+ !g_str_has_prefix(f, "about:"))
+ {
+ g_free(f);
+ f = g_strdup_printf("http://%s", t);
+ return f;
}
+ else
+ return g_strdup(t);
+}
- return FALSE;
+void
+grab_environment_configuration(void)
+{
+ const gchar *e;
+
+ e = g_getenv(__NAME_UPPERCASE__"_ACCEPTED_LANGUAGE");
+ if (e != NULL)
+ accepted_language = g_strdup(e);
+
+ e = g_getenv(__NAME_UPPERCASE__"_DOWNLOAD_DIR");
+ if (e != NULL)
+ download_dir = g_strdup(e);
+
+ e = g_getenv(__NAME_UPPERCASE__"_FIFO_SUFFIX");
+ if (e != NULL)
+ fifo_suffix = g_strdup(e);
+
+ e = g_getenv(__NAME_UPPERCASE__"_HOME_URI");
+ if (e != NULL)
+ home_uri = g_strdup(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);
}
void
-hover_web_view(WebKitWebView *web_view, gchar *title, gchar *uri,
- gpointer data)
+hover_web_view(WebKitWebView *web_view, gchar *title, gchar *uri, gpointer data)
{
struct Client *c = (struct Client *)data;
- (void)web_view;
- (void)title;
+ if (!gtk_widget_is_focus(c->location))
+ {
+ if (uri == NULL)
+ gtk_entry_set_text(GTK_ENTRY(c->location),
+ webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view)));
+ else
+ gtk_entry_set_text(GTK_ENTRY(c->location), uri);
+ }
+}
- gtk_statusbar_pop(GTK_STATUSBAR(c->status), 0);
- if (uri != NULL)
- gtk_statusbar_push(GTK_STATUSBAR(c->status), 0, uri);
+gboolean
+key_downloadmanager(GtkWidget *widget, GdkEvent *event, gpointer data)
+{
+ if (event->type == GDK_KEY_PRESS)
+ {
+ if (((GdkEventKey *)event)->state & GDK_MOD1_MASK)
+ {
+ switch (((GdkEventKey *)event)->keyval)
+ {
+ case GDK_KEY_d: /* close window (left hand) */
+ gtk_widget_hide(dm.win);
+ return TRUE;
+ }
+ }
+ }
+
+ return FALSE;
}
gboolean
{
struct Client *c = (struct Client *)data;
const gchar *t;
-
- (void)widget;
+ gchar *f;
if (event->type == GDK_KEY_PRESS)
{
- if (((GdkEventKey *)event)->keyval == GDK_KEY_Return)
+ if (((GdkEventKey *)event)->state & GDK_MOD1_MASK)
+ {
+ switch (((GdkEventKey *)event)->keyval)
+ {
+ case GDK_KEY_q: /* close window (left hand) */
+ gtk_widget_destroy(c->win);
+ return TRUE;
+ case GDK_KEY_d: /* download manager (left hand) */
+ gtk_widget_show_all(dm.win);
+ return TRUE;
+ case GDK_KEY_r: /* reload (left hand) */
+ webkit_web_view_reload_bypass_cache(WEBKIT_WEB_VIEW(
+ c->web_view));
+ return TRUE;
+ case GDK_KEY_k: /* initiate search (BOTH hands) */
+ gtk_entry_set_text(GTK_ENTRY(c->location), "/");
+ gtk_editable_set_position(GTK_EDITABLE(c->location), -1);
+ return TRUE;
+ }
+ }
+ else
{
- gtk_widget_grab_focus(c->web_view);
- t = gtk_entry_get_text(GTK_ENTRY(c->location));
- if (t != NULL && t[0] == '/')
+ switch (((GdkEventKey *)event)->keyval)
{
- if (search_text != NULL)
- g_free(search_text);
- search_text = g_strdup(t + 1); /* XXX whacky */
- search(c, 1);
+ case GDK_KEY_Return:
+ gtk_widget_grab_focus(c->web_view);
+ t = gtk_entry_get_text(GTK_ENTRY(c->location));
+ if (t != NULL && t[0] == '/')
+ {
+ if (search_text != NULL)
+ g_free(search_text);
+ search_text = g_strdup(t + 1); /* XXX whacky */
+ search(c, 1);
+ }
+ else if (!keywords_try_search(WEBKIT_WEB_VIEW(c->web_view), t))
+ {
+ f = ensure_uri_scheme(t);
+ if (show_all_requests)
+ fprintf(stderr, "====> %s\n", f);
+ webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
+ g_free(f);
+ }
+ return TRUE;
+ case GDK_KEY_Escape:
+ 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;
}
- else
- webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), t);
- return TRUE;
}
}
key_web_view(GtkWidget *widget, GdkEvent *event, gpointer data)
{
struct Client *c = (struct Client *)data;
-
- (void)widget;
+ WebKitHitTestResultContext ht_context;
+ WebKitHitTestResult *ht_result = NULL;
+ gchar *ht_uri = NULL, *f;
+ gfloat z;
+ gboolean b;
if (event->type == GDK_KEY_PRESS)
{
- if (((GdkEventKey *)event)->state & GDK_CONTROL_MASK)
+ if (((GdkEventKey *)event)->state & GDK_MOD1_MASK)
{
- if (((GdkEventKey *)event)->keyval == GDK_KEY_o)
- {
- gtk_widget_grab_focus(c->location);
- return TRUE;
- }
- else if (((GdkEventKey *)event)->keyval == GDK_KEY_h)
- {
- scroll(gtk_scrolled_window_get_hadjustment(
- GTK_SCROLLED_WINDOW(c->scroll)), 0, -1);
- return TRUE;
- }
- else if (((GdkEventKey *)event)->keyval == GDK_KEY_j)
- {
- scroll(gtk_scrolled_window_get_vadjustment(
- GTK_SCROLLED_WINDOW(c->scroll)), 0, 1);
- return TRUE;
- }
- else if (((GdkEventKey *)event)->keyval == GDK_KEY_k)
- {
- scroll(gtk_scrolled_window_get_vadjustment(
- GTK_SCROLLED_WINDOW(c->scroll)), 0, -1);
- return TRUE;
- }
- else if (((GdkEventKey *)event)->keyval == GDK_KEY_l)
+ switch (((GdkEventKey *)event)->keyval)
{
- scroll(gtk_scrolled_window_get_hadjustment(
- GTK_SCROLLED_WINDOW(c->scroll)), 0, 1);
- return TRUE;
- }
- else if (((GdkEventKey *)event)->keyval == GDK_KEY_f)
- {
- scroll(gtk_scrolled_window_get_vadjustment(
- GTK_SCROLLED_WINDOW(c->scroll)), 1, 0.5);
- return TRUE;
- }
- else if (((GdkEventKey *)event)->keyval == GDK_KEY_b)
- {
- scroll(gtk_scrolled_window_get_vadjustment(
- GTK_SCROLLED_WINDOW(c->scroll)), 1, -0.5);
- return TRUE;
- }
- else if (((GdkEventKey *)event)->keyval == GDK_KEY_n)
- {
- search(c, 1);
- return TRUE;
- }
- else if (((GdkEventKey *)event)->keyval == GDK_KEY_p)
- {
- search(c, -1);
- return TRUE;
- }
- else if (((GdkEventKey *)event)->keyval == GDK_KEY_g)
- {
- webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view),
- first_uri);
- return TRUE;
+ case GDK_KEY_q: /* close window (left hand) */
+ gtk_widget_destroy(c->win);
+ return TRUE;
+ case GDK_KEY_w: /* home (left hand) */
+ f = ensure_uri_scheme(home_uri);
+ if (show_all_requests)
+ fprintf(stderr, "====> %s\n", f);
+ webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
+ g_free(f);
+ return TRUE;
+ case GDK_KEY_e: /* new tab (left hand) */
+ f = ensure_uri_scheme(home_uri);
+ if (show_all_requests)
+ fprintf(stderr, "====> %s\n", f);
+ client_new(f);
+ g_free(f);
+ return TRUE;
+ case GDK_KEY_r: /* reload (left hand) */
+ webkit_web_view_reload_bypass_cache(WEBKIT_WEB_VIEW(
+ c->web_view));
+ return TRUE;
+ case GDK_KEY_s: /* toggle source view (left hand) */
+ b = webkit_web_view_get_view_source_mode(WEBKIT_WEB_VIEW(
+ c->web_view));
+ b = !b;
+ webkit_web_view_set_view_source_mode(WEBKIT_WEB_VIEW(
+ c->web_view), b);
+ webkit_web_view_reload(WEBKIT_WEB_VIEW(c->web_view));
+ return TRUE;
+ case GDK_KEY_d: /* download manager (left hand) */
+ gtk_widget_show_all(dm.win);
+ return TRUE;
+ case GDK_KEY_2: /* search forward (left hand) */
+ case GDK_KEY_n: /* search forward (maybe both hands) */
+ search(c, 1);
+ return TRUE;
+ case GDK_KEY_3: /* search backward (left hand) */
+ search(c, -1);
+ return TRUE;
+ case GDK_KEY_l: /* location (BOTH hands) */
+ gtk_widget_grab_focus(c->location);
+ return TRUE;
+ case GDK_KEY_k: /* initiate search (BOTH hands) */
+ gtk_widget_grab_focus(c->location);
+ gtk_entry_set_text(GTK_ENTRY(c->location), "/");
+ gtk_editable_set_position(GTK_EDITABLE(c->location), -1);
+ return TRUE;
}
}
else if (((GdkEventKey *)event)->keyval == GDK_KEY_Escape)
{
webkit_web_view_stop_loading(WEBKIT_WEB_VIEW(c->web_view));
- gtk_statusbar_pop(GTK_STATUSBAR(c->status), 1);
- gtk_statusbar_push(GTK_STATUSBAR(c->status), 1, "Aborted.");
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->progress), 0);
}
}
else if (event->type == GDK_BUTTON_PRESS)
{
switch (((GdkEventButton *)event)->button)
{
+ case 2:
+ ht_result = webkit_web_view_get_hit_test_result(
+ WEBKIT_WEB_VIEW(c->web_view),
+ (GdkEventButton *)event);
+ g_object_get(ht_result, "context", &ht_context, NULL);
+ if (ht_context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK)
+ {
+ g_object_get(ht_result, "link-uri", &ht_uri, NULL);
+ client_new(ht_uri);
+ g_object_unref(ht_result);
+ return TRUE;
+ }
+ g_object_unref(ht_result);
+ break;
case 8:
webkit_web_view_go_back(WEBKIT_WEB_VIEW(c->web_view));
return TRUE;
return TRUE;
}
}
+ else if (event->type == GDK_SCROLL)
+ {
+ if (((GdkEventScroll *)event)->state & GDK_MOD1_MASK ||
+ ((GdkEventScroll *)event)->state & GDK_CONTROL_MASK)
+ {
+ switch (((GdkEventScroll *)event)->direction)
+ {
+ case GDK_SCROLL_UP:
+ z = webkit_web_view_get_zoom_level(WEBKIT_WEB_VIEW(
+ c->web_view));
+ z += 0.1;
+ webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view),
+ z);
+ return TRUE;
+ case GDK_SCROLL_DOWN:
+ z = webkit_web_view_get_zoom_level(WEBKIT_WEB_VIEW(
+ c->web_view));
+ z -= 0.1;
+ webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view),
+ z);
+ return TRUE;
+ default:
+ break;
+ }
+ }
+ }
return FALSE;
}
+void
+keywords_load(void)
+{
+ GError *err = NULL;
+ GIOChannel *channel = NULL;
+ gchar *path = NULL, *buf = NULL;
+ gchar **tokens = NULL;
+
+ keywords = g_hash_table_new(g_str_hash, g_str_equal);
+
+ path = g_build_filename(g_get_user_config_dir(), __NAME__, "keywordsearch",
+ NULL);
+ channel = g_io_channel_new_file(path, "r", &err);
+ if (channel != NULL)
+ {
+ while (g_io_channel_read_line(channel, &buf, NULL, NULL, NULL)
+ == G_IO_STATUS_NORMAL)
+ {
+ g_strstrip(buf);
+ if (buf[0] != '#')
+ {
+ tokens = g_strsplit(buf, " ", 2);
+ if (tokens[0] != NULL && tokens[1] != NULL)
+ g_hash_table_insert(keywords, g_strdup(tokens[0]),
+ g_strdup(tokens[1]));
+ g_strfreev(tokens);
+ }
+ g_free(buf);
+ }
+ g_io_channel_shutdown(channel, FALSE, NULL);
+ }
+ g_free(path);
+}
+
+gboolean
+keywords_try_search(WebKitWebView *web_view, const gchar *t)
+{
+ gboolean ret = FALSE;
+ gchar **tokens = NULL;
+ gchar *val = NULL, *uri = NULL;
+
+ tokens = g_strsplit(t, " ", 2);
+ if (tokens[0] != NULL && tokens[1] != NULL)
+ {
+ val = g_hash_table_lookup(keywords, tokens[0]);
+ if (val != NULL)
+ {
+ uri = g_strdup_printf((gchar *)val, tokens[1]);
+ if (show_all_requests)
+ fprintf(stderr, "====> %s\n", uri);
+ webkit_web_view_load_uri(web_view, uri);
+ g_free(uri);
+ ret = TRUE;
+ }
+ }
+ g_strfreev(tokens);
+
+ return ret;
+}
+
gboolean
remote_msg(GIOChannel *channel, GIOCondition condition, gpointer data)
{
gchar *uri = NULL;
- (void)condition;
- (void)data;
-
g_io_channel_read_line(channel, &uri, NULL, NULL, NULL);
if (uri)
{
FALSE, direction == 1, TRUE);
}
-void
-scroll(GtkAdjustment *a, gint step_type, gdouble factor)
-{
- gdouble new, lower, upper, step;
- lower = gtk_adjustment_get_lower(a);
- upper = gtk_adjustment_get_upper(a) - gtk_adjustment_get_page_size(a) + lower;
- if (step_type == 0)
- step = gtk_adjustment_get_step_increment(a);
- else
- step = gtk_adjustment_get_page_increment(a);
- new = gtk_adjustment_get_value(a) + factor * step;
- new = new < lower ? lower : new;
- new = new > upper ? upper : new;
- gtk_adjustment_set_value(a, new);
-}
-
Window
tabbed_launch(void)
{
GIOChannel *tabbed_stdout_channel;
GError *err = NULL;
gchar *output = NULL;
- char *argv[] = { "tabbed", "-c", "-d", "-n", __NAME__, NULL };
+ char *argv[] = { "tabbed", "-c", "-d", "-p", "s1", "-n", __NAME__, NULL };
Window plug_into;
if (!g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL,
}
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;
}
-
- g_io_channel_shutdown(tabbed_stdout_channel, FALSE, NULL);
-
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
usage(void)
{
- fprintf(stderr, "Usage: "__NAME__" [OPTION]... <URI>...\n");
+ fprintf(stderr, "Usage: "__NAME__" [OPTION]... [URI]...\n");
exit(EXIT_FAILURE);
}
gtk_init(&argc, &argv);
- while ((opt = getopt(argc, argv, "z:e:rCT")) != -1)
+ grab_environment_configuration();
+
+ while ((opt = getopt(argc, argv, "e:rCT")) != -1)
{
switch (opt)
{
- case 'z':
- global_zoom = atof(optarg);
- break;
case 'e':
embed = atol(optarg);
tabbed_automagic = FALSE;
}
}
- if (optind >= argc)
- usage();
-
adblock_load();
+ keywords_load();
cooperation_setup();
+ downloadmanager_setup();
if (tabbed_automagic && !(cooperative_instances && !cooperative_alone))
embed = tabbed_launch();
- first_uri = g_strdup(argv[optind]);
- for (i = optind; i < argc; i++)
- client_new(argv[i]);
+ if (optind >= argc)
+ client_new(home_uri);
+ else
+ {
+ for (i = optind; i < argc; i++)
+ client_new(argv[i]);
+ }
+
if (!cooperative_instances || cooperative_alone)
gtk_main();
exit(EXIT_SUCCESS);
projects / chorizo.git / blobdiff