#include <webkit/webkit.h>
#include <glib/gstdio.h>
#include <JavaScriptCore/JavaScript.h>
+#include <sys/file.h>
#define LENGTH(x) (sizeof x / sizeof x[0])
-#define CLEANMASK(mask) (mask & ~(GDK_MOD2_MASK))
+
+enum { AtomFind, AtomGo, AtomUri, AtomLast };
typedef union Arg Arg;
union Arg {
- const gboolean b;
- const gint i;
+ gboolean b;
+ gint i;
const void *v;
};
typedef struct Client {
- GtkWidget *win, *scroll, *vbox, *urlbar, *searchbar, *indicator;
+ GtkWidget *win, *scroll, *vbox, *indicator;
WebKitWebView *view;
- WebKitDownload *download;
- gchar *title;
+ char *title, *linkhover;
+ const char *uri, *needle;
gint progress;
+ gboolean sslfailed;
struct Client *next;
+ gboolean zoomed;
} Client;
-typedef struct Cookie {
- char *name;
- char *value;
- char *domain;
- char *path;
- struct Cookie *next;
-} Cookie;
-
-typedef enum {
- Browser = 0x0001,
- SearchBar = 0x0010,
- UrlBar = 0x0100,
- Any = ~0,
-} KeyFocus;
+typedef struct {
+ char *label;
+ void (*func)(Client *c, const Arg *arg);
+ const Arg arg;
+} Item;
typedef struct {
guint mod;
guint keyval;
void (*func)(Client *c, const Arg *arg);
const Arg arg;
- KeyFocus focus;
} Key;
static Display *dpy;
-static Atom urlprop;
-static SoupCookieJar *cookiejar;
-static SoupSession *session;
+static Atom atoms[AtomLast];
static Client *clients = NULL;
-/*static Cookie *cookies = NULL;*/
static GdkNativeWindow embed = 0;
static gboolean showxid = FALSE;
-static gboolean ignore_once = FALSE;
-static gchar winid[64];
-static gchar *progname;
+static char winid[64];
+static char *progname;
+static gboolean loadimage = 1, plugin = 1, script = 1;
-static gchar *buildpath(const gchar *path);
+static char *buildpath(const char *path);
static void cleanup(void);
static void clipboard(Client *c, const Arg *arg);
-static gchar *copystr(gchar **str, const gchar *src);
-static gboolean decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c);
+static char *copystr(char **str, const char *src);
+static WebKitWebView *createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c);
+static gboolean decidedownload(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r, gchar *m, WebKitWebPolicyDecision *p, Client *c);
+static gboolean decidewindow(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c);
static void destroyclient(Client *c);
static void destroywin(GtkWidget* w, Client *c);
static void die(char *str);
-static void download(WebKitDownload *o, GParamSpec *pspec, Client *c);
static void drawindicator(Client *c);
static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c);
-static gboolean initdownload(WebKitWebView *view, WebKitDownload *o, Client *c);
-static gchar *geturi(Client *c);
-static void hidesearch(Client *c, const Arg *arg);
-static void hideurl(Client *c, const Arg *arg);
-static gboolean keypress(GtkWidget* w, GdkEventKey *ev, Client *c);
-static void linkhover(WebKitWebView* page, const gchar* t, const gchar* l, Client *c);
-static void loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c);
-static void loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c);
+static void find(Client *c, const Arg *arg);
+static const char *getatom(Client *c, int a);
+static const char *getcookies(SoupURI *uri);
+static char *geturi(Client *c);
+void gotheaders(SoupMessage *msg, gpointer user_data);
+static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
+static gboolean keypress(GtkWidget *w, GdkEventKey *ev, Client *c);
+static void linkhover(WebKitWebView *v, const char* t, const char* l, Client *c);
+static void loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c);
static void loaduri(Client *c, const Arg *arg);
static void navigate(Client *c, const Arg *arg);
static Client *newclient(void);
-static void newproc(const gchar *url);
-static WebKitWebView *createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c);
-static void pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d);
-static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
+static void newwindow(Client *c, const Arg *arg);
+static void newrequest(SoupSession *s, SoupMessage *msg, gpointer v);
+static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
static void print(Client *c, const Arg *arg);
-static void proccookies(SoupMessage *m, Client *c);
-static void progresschange(WebKitWebView *view, gint p, Client *c);
-static void request(SoupSession *s, SoupMessage *m, Client *c);
+static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
+static void progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c);
static void reload(Client *c, const Arg *arg);
-static void rereadcookies(void);
-static void sigchld(int unused);
-static void setcookie(char *name, char *val, char *dom, char *path, long exp);
+static void resize(GtkWidget *w, GtkAllocation *a, Client *c);
+static void scroll_h(Client *c, const Arg *arg);
+static void scroll_v(Client *c, const Arg *arg);
+static void scroll(GtkAdjustment *a, const Arg *arg);
+static void setatom(Client *c, int a, const char *v);
+static void setcookie(SoupCookie *c);
static void setup(void);
-static void spawn(Client *c, const Arg *arg);
-static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, Client *c);
-static void scroll(Client *c, const Arg *arg);
-static void searchtext(Client *c, const Arg *arg);
+static void sigchld(int unused);
static void source(Client *c, const Arg *arg);
-static void showsearch(Client *c, const Arg *arg);
-static void showurl(Client *c, const Arg *arg);
+static void spawn(Client *c, const Arg *arg);
+static void eval(Client *c, const Arg *arg);
static void stop(Client *c, const Arg *arg);
-static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, Client *c);
-static gboolean unfocusbar(GtkWidget *w, GdkEventFocus *e, Client *c);
-static void usage(void);
+static void titlechange(WebKitWebView *v, WebKitWebFrame* frame, const char* title, Client *c);
static void update(Client *c);
static void updatewinid(Client *c);
+static void usage(void);
static void windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c);
static void zoom(Client *c, const Arg *arg);
/* configuration, allows nested code to access above variables */
#include "config.h"
-gchar *
-buildpath(const gchar *path) {
- gchar *apath, *p;
+char *
+buildpath(const char *path) {
+ char *apath, *p;
FILE *f;
/* creating directory */
apath = g_strconcat(g_get_home_dir(), "/", path, NULL);
if((p = strrchr(apath, '/'))) {
*p = '\0';
- g_mkdir_with_parents(apath, 0755);
+ g_mkdir_with_parents(apath, 0700);
+ g_chmod(apath, 0700); /* in case it existed */
*p = '/';
}
/* creating file (gives error when apath ends with "/") */
- if((f = g_fopen(apath, "a")))
+ if((f = fopen(apath, "a"))) {
+ g_chmod(apath, 0600); /* always */
fclose(f);
+ }
return apath;
}
while(clients)
destroyclient(clients);
g_free(cookiefile);
- g_free(dldir);
g_free(scriptfile);
g_free(stylefile);
}
+void
+evalscript(WebKitWebFrame *frame, JSContextRef js, char *script, char* scriptname) {
+ JSStringRef jsscript, jsscriptname;
+ JSValueRef exception = NULL;
+
+ jsscript = JSStringCreateWithUTF8CString(script);
+ jsscriptname = JSStringCreateWithUTF8CString(scriptname);
+ JSEvaluateScript(js, jsscript, JSContextGetGlobalObject(js), jsscriptname, 0, &exception);
+ JSStringRelease(jsscript);
+ JSStringRelease(jsscriptname);
+}
+
+void
+runscript(WebKitWebFrame *frame, JSContextRef js) {
+ char *script;
+ GError *error;
+
+ if(g_file_get_contents(scriptfile, &script, NULL, &error)) {
+ evalscript(frame, webkit_web_frame_get_global_context(frame), script, scriptfile);
+ }
+}
+
void
clipboard(Client *c, const Arg *arg) {
gboolean paste = *(gboolean *)arg;
if(paste)
- gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteurl, c);
+ gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteuri, c);
else
- gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), webkit_web_view_get_uri(c->view), -1);
+ gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), c->linkhover ? c->linkhover : geturi(c), -1);
}
-gchar *
-copystr(gchar **str, const gchar *src) {
- gchar *tmp;
+char *
+copystr(char **str, const char *src) {
+ char *tmp;
tmp = g_strdup(src);
if(str && *str) {
return tmp;
}
+WebKitWebView *
+createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c) {
+ Client *n = newclient();
+ return n->view;
+}
+
+gboolean
+decidedownload(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r, gchar *m, WebKitWebPolicyDecision *p, Client *c) {
+ if(!webkit_web_view_can_show_mime_type(v, m)) {
+ webkit_web_policy_decision_download(p);
+ return TRUE;
+ }
+ return FALSE;
+}
+
+gboolean
+decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c) {
+ Arg arg;
+
+ if(webkit_web_navigation_action_get_reason(n) == WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) {
+ webkit_web_policy_decision_ignore(p);
+ arg.v = (void *)webkit_network_request_get_uri(r);
+ newwindow(NULL, &arg);
+ return TRUE;
+ }
+ return FALSE;
+}
+
void
destroyclient(Client *c) {
Client *p;
+ webkit_web_view_stop_loading(c->view);
+ gtk_widget_destroy(c->indicator);
gtk_widget_destroy(GTK_WIDGET(c->view));
gtk_widget_destroy(c->scroll);
- gtk_widget_destroy(c->urlbar);
- gtk_widget_destroy(c->searchbar);
gtk_widget_destroy(c->vbox);
gtk_widget_destroy(c->win);
+
for(p = clients; p && p->next != c; p = p->next);
if(p)
p->next = c->next;
gtk_main_quit();
}
-gboolean
-decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c) {
- if(webkit_web_navigation_action_get_reason(n) == WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) {
- webkit_web_policy_decision_ignore(p);
- newproc(webkit_network_request_get_uri(r));
- return TRUE;
- }
- return FALSE;
-}
-
void
destroywin(GtkWidget* w, Client *c) {
destroyclient(c);
void
drawindicator(Client *c) {
gint width;
- gchar *uri;
+ const char *uri;
GtkWidget *w;
GdkGC *gc;
GdkColor fg;
w = c->indicator;
width = c->progress * w->allocation.width / 100;
gc = gdk_gc_new(w->window);
- gdk_color_parse(strstr(uri, "https://") == uri ?
- progress_trust : progress, &fg);
+ if(strstr(uri, "https://") == uri)
+ gdk_color_parse(c->sslfailed ?
+ progress_untrust : progress_trust, &fg);
+ else
+ gdk_color_parse(progress, &fg);
gdk_gc_set_rgb_fg_color(gc, &fg);
gdk_draw_rectangle(w->window,
w->style->bg_gc[GTK_WIDGET_STATE(w)],
}
void
-download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
- WebKitDownloadStatus status;
+find(Client *c, const Arg *arg) {
+ const char *s;
- status = webkit_download_get_status(c->download);
- if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
- c->progress = (gint)(webkit_download_get_progress(c->download)*100);
- }
- update(c);
+ s = getatom(c, AtomFind);
+ gboolean forward = *(gboolean *)arg;
+ webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE);
}
-gboolean
-initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
- const gchar *filename;
- gchar *uri, *html;
-
- stop(c, NULL);
- c->download = o;
- filename = webkit_download_get_suggested_filename(o);
- uri = g_strconcat("file://", dldir, "/", filename, NULL);
- webkit_download_set_destination_uri(c->download, uri);
- c->progress = 0;
- g_free(uri);
- html = g_strdup_printf("Download <b>%s</b>...", filename);
- webkit_web_view_load_html_string(c->view, html,
- webkit_download_get_uri(c->download));
- g_signal_connect(c->download, "notify::progress", G_CALLBACK(download), c);
- g_signal_connect(c->download, "notify::status", G_CALLBACK(download), c);
- webkit_download_start(c->download);
-
- c->title = copystr(&c->title, filename);
- update(c);
- g_free(html);
- return TRUE;
+const char *
+getcookies(SoupURI *uri) {
+ const char *c;
+ SoupCookieJar *j = soup_cookie_jar_text_new(cookiefile, TRUE);
+ c = soup_cookie_jar_get_cookies(j, uri, TRUE);
+ g_object_unref(j);
+ return c;
}
-gchar *
+const char *
+getatom(Client *c, int a) {
+ static char buf[BUFSIZ];
+ Atom adummy;
+ int idummy;
+ unsigned long ldummy;
+ unsigned char *p = NULL;
+
+ XGetWindowProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window),
+ atoms[a], 0L, BUFSIZ, False, XA_STRING,
+ &adummy, &idummy, &ldummy, &ldummy, &p);
+ if(p)
+ strncpy(buf, (char *)p, LENGTH(buf)-1);
+ else
+ buf[0] = '\0';
+ XFree(p);
+ return buf;
+}
+
+char *
geturi(Client *c) {
- gchar *uri;
+ char *uri;
- if(!(uri = (gchar *)webkit_web_view_get_uri(c->view)))
- uri = copystr(NULL, "about:blank");
+ if(!(uri = (char *)webkit_web_view_get_uri(c->view)))
+ uri = "about:blank";
return uri;
}
void
-hidesearch(Client *c, const Arg *arg) {
- gtk_widget_hide(c->searchbar);
- gtk_widget_grab_focus(GTK_WIDGET(c->view));
+gotheaders(SoupMessage *msg, gpointer v) {
+ SoupURI *uri;
+ GSList *l, *p;
+
+ uri = soup_message_get_uri(msg);
+ for(p = l = soup_cookies_from_response(msg); p;
+ p = g_slist_next(p)) {
+ setcookie((SoupCookie *)p->data);
+ }
+ soup_cookies_free(l);
}
-void
-hideurl(Client *c, const Arg *arg) {
- gtk_widget_hide(c->urlbar);
- gtk_widget_grab_focus(GTK_WIDGET(c->view));
+gboolean
+initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
+ Arg arg;
+
+ updatewinid(c);
+ arg = (Arg)DOWNLOAD((char *)webkit_download_get_uri(o));
+ spawn(c, &arg);
+ return FALSE;
}
gboolean
keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
- guint i, focus;
+ guint i;
gboolean processed = FALSE;
- if(ev->type != GDK_KEY_PRESS)
- return FALSE;
- if(GTK_WIDGET_HAS_FOCUS(c->searchbar))
- focus = SearchBar;
- else if(GTK_WIDGET_HAS_FOCUS(c->urlbar))
- focus = UrlBar;
- else
- focus = Browser;
updatewinid(c);
for(i = 0; i < LENGTH(keys); i++) {
- if(focus & keys[i].focus
- && gdk_keyval_to_lower(ev->keyval) == keys[i].keyval
- && CLEANMASK(ev->state) == keys[i].mod
+ if(gdk_keyval_to_lower(ev->keyval) == keys[i].keyval
+ && (ev->state & keys[i].mod) == keys[i].mod
&& keys[i].func) {
keys[i].func(c, &(keys[i].arg));
processed = TRUE;
}
void
-linkhover(WebKitWebView* page, const gchar* t, const gchar* l, Client *c) {
- if(l)
- gtk_window_set_title(GTK_WINDOW(c->win), l);
- else
- update(c);
-}
-
-void
-loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
- gchar *uri;
-
- ignore_once = TRUE;
- uri = geturi(c);
- XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), urlprop,
- XA_STRING, 8, PropModeReplace, (unsigned char *)uri,
- strlen(uri) + 1);
+linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) {
+ if(l) {
+ c->linkhover = copystr(&c->linkhover, l);
+ }
+ else if(c->linkhover) {
+ free(c->linkhover);
+ c->linkhover = NULL;
+ }
+ update(c);
}
void
-loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
- c->progress = 0;
- update(c);
+loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
+ WebKitWebFrame *frame;
+ WebKitWebDataSource *src;
+ WebKitNetworkRequest *request;
+ SoupMessage *msg;
+ char *uri;
+
+ switch(webkit_web_view_get_load_status (c->view)) {
+ case WEBKIT_LOAD_COMMITTED:
+ uri = geturi(c);
+ if(strstr(uri, "https://") == uri) {
+ frame = webkit_web_view_get_main_frame(c->view);
+ src = webkit_web_frame_get_data_source(frame);
+ request = webkit_web_data_source_get_request(src);
+ msg = webkit_network_request_get_message(request);
+ c->sslfailed = soup_message_get_flags(msg)
+ ^ SOUP_MESSAGE_CERTIFICATE_TRUSTED;
+ }
+ setatom(c, AtomUri, uri);
+ break;
+ case WEBKIT_LOAD_FINISHED:
+ c->progress = 0;
+ update(c);
+ break;
+ default:
+ break;
+ }
}
void
loaduri(Client *c, const Arg *arg) {
- gchar *u;
- const gchar *uri = (gchar *)arg->v;
- if(!uri)
- uri = gtk_entry_get_text(GTK_ENTRY(c->urlbar));
+ char *u;
+ const char *uri = (char *)arg->v;
+ Arg a = { .b = FALSE };
+
+ if(strcmp(uri, "") == 0)
+ return;
u = g_strrstr(uri, "://") ? g_strdup(uri)
: g_strdup_printf("http://%s", uri);
- webkit_web_view_load_uri(c->view, u);
- c->progress = 0;
- c->title = copystr(&c->title, u);
- g_free(u);
- update(c);
+ /* prevents endless loop */
+ if(c->uri && strcmp(u, c->uri) == 0) {
+ reload(c, &a);
+ }
+ else {
+ webkit_web_view_load_uri(c->view, u);
+ c->progress = 0;
+ c->title = copystr(&c->title, u);
+ g_free(u);
+ update(c);
+ }
}
void
navigate(Client *c, const Arg *arg) {
- gint steps = *(gint *)arg;
+ int steps = *(int *)arg;
webkit_web_view_go_back_or_forward(c->view, steps);
}
newclient(void) {
Client *c;
WebKitWebSettings *settings;
- gchar *uri;
+ WebKitWebFrame *frame;
+ GdkGeometry hints = { 1, 1 };
+ char *uri, *ua;
if(!(c = calloc(1, sizeof(Client))))
die("Cannot malloc!\n");
}
else {
c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_wmclass(GTK_WINDOW(c->win), "surf", "surf");
+ /* TA: 20091214: Despite what the GNOME docs say, the ICCCM
+ * is always correct, so we should still call this function.
+ * But when doing so, we *must* differentiate between a
+ * WM_CLASS and a resource on the window. By convention, the
+ * window class (WM_CLASS) is capped, while the resource is in
+ * lowercase. Both these values come as a pair.
+ */
+ gtk_window_set_wmclass(GTK_WINDOW(c->win), "surf", "Surf");
+
+ /* TA: 20091214: And set the role here as well -- so that
+ * sessions can pick this up.
+ */
+ gtk_window_set_role(GTK_WINDOW(c->win), "Surf");
}
gtk_window_set_default_size(GTK_WINDOW(c->win), 800, 600);
g_signal_connect(G_OBJECT(c->win), "destroy", G_CALLBACK(destroywin), c);
g_signal_connect(G_OBJECT(c->win), "key-press-event", G_CALLBACK(keypress), c);
+ g_signal_connect(G_OBJECT(c->win), "size-allocate", G_CALLBACK(resize), c);
/* VBox */
c->vbox = gtk_vbox_new(FALSE, 0);
- /* scrolled window */
+ /* Scrolled Window */
c->scroll = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll),
GTK_POLICY_NEVER, GTK_POLICY_NEVER);
- /* webview */
+ /* Webview */
c->view = WEBKIT_WEB_VIEW(webkit_web_view_new());
g_signal_connect(G_OBJECT(c->view), "title-changed", G_CALLBACK(titlechange), c);
- g_signal_connect(G_OBJECT(c->view), "load-progress-changed", G_CALLBACK(progresschange), c);
- g_signal_connect(G_OBJECT(c->view), "load-committed", G_CALLBACK(loadcommit), c);
- g_signal_connect(G_OBJECT(c->view), "load-started", G_CALLBACK(loadstart), c);
g_signal_connect(G_OBJECT(c->view), "hovering-over-link", G_CALLBACK(linkhover), c);
g_signal_connect(G_OBJECT(c->view), "create-web-view", G_CALLBACK(createwindow), c);
g_signal_connect(G_OBJECT(c->view), "new-window-policy-decision-requested", G_CALLBACK(decidewindow), c);
- g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(initdownload), c);
+ g_signal_connect(G_OBJECT(c->view), "mime-type-policy-decision-requested", G_CALLBACK(decidedownload), c);
g_signal_connect(G_OBJECT(c->view), "window-object-cleared", G_CALLBACK(windowobjectcleared), c);
- g_signal_connect_after(session, "request-started", G_CALLBACK(request), c);
-
- /* urlbar */
- c->urlbar = gtk_entry_new();
- gtk_entry_set_has_frame(GTK_ENTRY(c->urlbar), FALSE);
- g_signal_connect(G_OBJECT(c->urlbar), "focus-out-event", G_CALLBACK(unfocusbar), c);
-
- /* searchbar */
- c->searchbar = gtk_entry_new();
- gtk_entry_set_has_frame(GTK_ENTRY(c->searchbar), FALSE);
- g_signal_connect(G_OBJECT(c->searchbar), "focus-out-event", G_CALLBACK(unfocusbar), c);
+ g_signal_connect(G_OBJECT(c->view), "notify::load-status", G_CALLBACK(loadstatuschange), c);
+ g_signal_connect(G_OBJECT(c->view), "notify::progress", G_CALLBACK(progresschange), c);
+ g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(initdownload), c);
- /* indicator */
+ /* Indicator */
c->indicator = gtk_drawing_area_new();
gtk_widget_set_size_request(c->indicator, 0, 2);
g_signal_connect (G_OBJECT (c->indicator), "expose_event",
gtk_container_add(GTK_CONTAINER(c->scroll), GTK_WIDGET(c->view));
gtk_container_add(GTK_CONTAINER(c->win), c->vbox);
gtk_container_add(GTK_CONTAINER(c->vbox), c->scroll);
- gtk_container_add(GTK_CONTAINER(c->vbox), c->searchbar);
- gtk_container_add(GTK_CONTAINER(c->vbox), c->urlbar);
gtk_container_add(GTK_CONTAINER(c->vbox), c->indicator);
/* Setup */
- gtk_box_set_child_packing(GTK_BOX(c->vbox), c->urlbar, FALSE, FALSE, 0, GTK_PACK_START);
- gtk_box_set_child_packing(GTK_BOX(c->vbox), c->searchbar, FALSE, FALSE, 0, GTK_PACK_START);
gtk_box_set_child_packing(GTK_BOX(c->vbox), c->indicator, FALSE, FALSE, 0, GTK_PACK_START);
gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE, TRUE, 0, GTK_PACK_START);
gtk_widget_grab_focus(GTK_WIDGET(c->view));
- gtk_widget_hide_all(c->searchbar);
- gtk_widget_hide_all(c->urlbar);
gtk_widget_show(c->vbox);
gtk_widget_show(c->indicator);
gtk_widget_show(c->scroll);
gtk_widget_show(GTK_WIDGET(c->view));
gtk_widget_show(c->win);
+ gtk_window_set_geometry_hints(GTK_WINDOW(c->win), NULL, &hints, GDK_HINT_MIN_SIZE);
gdk_window_set_events(GTK_WIDGET(c->win)->window, GDK_ALL_EVENTS_MASK);
gdk_window_add_filter(GTK_WIDGET(c->win)->window, processx, c);
webkit_web_view_set_full_content_zoom(c->view, TRUE);
+ frame = webkit_web_view_get_main_frame(c->view);
+ runscript(frame, webkit_web_frame_get_global_context(frame));
settings = webkit_web_view_get_settings(c->view);
- g_object_set(G_OBJECT(settings), "user-agent", useragent, NULL);
+ if(!(ua = getenv("SURF_USERAGENT")))
+ ua = useragent;
+ g_object_set(G_OBJECT(settings), "user-agent", ua, NULL);
uri = g_strconcat("file://", stylefile, NULL);
g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL);
+ g_object_set(G_OBJECT(settings), "auto-load-images", loadimage, NULL);
+ g_object_set(G_OBJECT(settings), "enable-plugins", plugin, NULL);
+ g_object_set(G_OBJECT(settings), "enable-scripts", script, NULL);
+ g_object_set(G_OBJECT(settings), "enable-spatial-navigation", SPATIAL_BROWSING, NULL);
+
g_free(uri);
- c->download = NULL;
+ setatom(c, AtomFind, "");
+ setatom(c, AtomUri, "about:blank");
+ if(HIDE_BACKGROUND)
+ webkit_web_view_set_transparent(c->view, TRUE);
+
c->title = NULL;
c->next = clients;
clients = c;
gdk_display_sync(gtk_widget_get_display(c->win));
printf("%u\n", (guint)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
fflush(NULL);
+ if (fclose(stdout) != 0) {
+ die("Error closing stdout");
+ }
}
return c;
}
void
-newproc(const gchar *url) {
- guint i = 0, urlindex;
- const gchar *cmd[7];
- const Arg arg = { .v = (void *)cmd };
- gchar tmp[64];
+newrequest(SoupSession *s, SoupMessage *msg, gpointer v) {
+ SoupMessageHeaders *h = msg->request_headers;
+ SoupURI *uri;
+ const char *c;
+
+ soup_message_headers_remove(h, "Cookie");
+ uri = soup_message_get_uri(msg);
+ if((c = getcookies(uri)))
+ soup_message_headers_append(h, "Cookie", c);
+ g_signal_connect_after(G_OBJECT(msg), "got-headers", G_CALLBACK(gotheaders), NULL);
+}
+
+void
+newwindow(Client *c, const Arg *arg) {
+ guint i = 0;
+ const char *cmd[10], *uri;
+ const Arg a = { .v = (void *)cmd };
+ char tmp[64];
cmd[i++] = progname;
if(embed) {
snprintf(tmp, LENGTH(tmp), "%u\n", (int)embed);
cmd[i++] = tmp;
}
- if(showxid) {
+ if(!script)
+ cmd[i++] = "-s";
+ if(!plugin)
+ cmd[i++] = "-p";
+ if(!loadimage)
+ cmd[i++] = "-i";
+ if(showxid)
cmd[i++] = "-x";
- }
cmd[i++] = "--";
- urlindex = i;
- if(url)
- cmd[i++] = url;
+ uri = arg->v ? (char *)arg->v : c->linkhover;
+ if(uri)
+ cmd[i++] = uri;
cmd[i++] = NULL;
- spawn(NULL, &arg);
+ spawn(NULL, &a);
}
-WebKitWebView *
-createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c) {
- Client *n = newclient();
- return n->view;
-}
-
-
void
-pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d) {
+pasteuri(GtkClipboard *clipboard, const char *text, gpointer d) {
Arg arg = {.v = text };
if(text != NULL)
loaduri((Client *) d, &arg);
}
+void
+print(Client *c, const Arg *arg) {
+ webkit_web_frame_print(webkit_web_view_get_main_frame(c->view));
+}
+
GdkFilterReturn
processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
Client *c = (Client *)d;
XPropertyEvent *ev;
- Atom adummy;
- gint idummy;
- unsigned long ldummy;
- unsigned char *buf = NULL;
Arg arg;
if(((XEvent *)e)->type == PropertyNotify) {
ev = &((XEvent *)e)->xproperty;
- if(ev->atom == urlprop && ev->state == PropertyNewValue) {
- if(ignore_once)
- ignore_once = FALSE;
- else {
- XGetWindowProperty(dpy, ev->window, urlprop, 0L, BUFSIZ, False, XA_STRING,
- &adummy, &idummy, &ldummy, &ldummy, &buf);
- arg.v = buf;
+ if(ev->state == PropertyNewValue) {
+ if(ev->atom == atoms[AtomFind]) {
+ arg.b = TRUE;
+ find(c, &arg);
+ return GDK_FILTER_REMOVE;
+ }
+ else if(ev->atom == atoms[AtomGo]) {
+ arg.v = getatom(c, AtomGo);
loaduri(c, &arg);
- XFree(buf);
+ return GDK_FILTER_REMOVE;
}
- return GDK_FILTER_REMOVE;
}
}
return GDK_FILTER_CONTINUE;
}
void
-print(Client *c, const Arg *arg) {
- webkit_web_frame_print(webkit_web_view_get_main_frame(c->view));
-}
-
-void
-proccookies(SoupMessage *m, Client *c) {
- GSList *l;
- SoupCookie *co;
- long t;
-
- rereadcookies();
- for (l = soup_cookies_from_response(m); l; l = l->next){
- co = (SoupCookie *)l->data;
- t = co->expires ? soup_date_to_time_t(co->expires) : 0;
- setcookie(co->name, co->value, co->domain, co->value, t);
- }
- g_slist_free(l);
-}
-
-void
-progresschange(WebKitWebView* view, gint p, Client *c) {
- c->progress = p;
+progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
+ c->progress = webkit_web_view_get_progress(c->view) * 100;
update(c);
}
-void
-request(SoupSession *s, SoupMessage *m, Client *c) {
- soup_message_add_header_handler(m, "got-headers", "Set-Cookie",
- G_CALLBACK(proccookies), c);
-}
-
void
reload(Client *c, const Arg *arg) {
gboolean nocache = *(gboolean *)arg;
}
void
-rereadcookies(void) {
+resize(GtkWidget *w, GtkAllocation *a, Client *c) {
+ double zoom;
+ if(c->zoomed)
+ return;
+ zoom = webkit_web_view_get_zoom_level(c->view);
+ if(a->width * a->height < 300 * 400 && zoom != 0.2)
+ webkit_web_view_set_zoom_level(c->view, 0.2);
+ else if(zoom != 1.0)
+ webkit_web_view_set_zoom_level(c->view, 1.0);
}
void
-scroll(Client *c, const Arg *arg) {
- gdouble v;
- GtkAdjustment *a;
+scroll_h(Client *c, const Arg *arg) {
+ scroll(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(c->scroll)), arg);
+}
- a = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(c->scroll));
- v = gtk_adjustment_get_value(a);
- v += gtk_adjustment_get_step_increment(a) * arg->i;
- v = MAX(v, 0.0);
- v = MIN(v, gtk_adjustment_get_upper(a) - gtk_adjustment_get_page_size(a));
- gtk_adjustment_set_value(a, v);
+void
+scroll_v(Client *c, const Arg *arg) {
+ scroll(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(c->scroll)), arg);
}
void
-sigchld(int unused) {
- if(signal(SIGCHLD, sigchld) == SIG_ERR)
- die("Can't install SIGCHLD handler");
- while(0 < waitpid(-1, NULL, WNOHANG));
+scroll(GtkAdjustment *a, const Arg *arg) {
+ gdouble v;
+
+ v = gtk_adjustment_get_value(a);
+ switch (arg->i){
+ case +10000:
+ case -10000:
+ v += gtk_adjustment_get_page_increment(a) * (arg->i / 10000); break;
+ case +20000:
+ case -20000:
+ default:
+ v += gtk_adjustment_get_step_increment(a) * arg->i;
+ }
+ v = MAX(v, 0.0);
+ v = MIN(v, gtk_adjustment_get_upper(a) - gtk_adjustment_get_page_size(a));
+ gtk_adjustment_set_value(a, v);
}
void
-setcookie(char *name, char *val, char *dom, char *path, long exp) {
+setcookie(SoupCookie *c) {
+ int lock;
+ lock = open(cookiefile, 0);
+ flock(lock, LOCK_EX);
+ SoupDate *e;
+ SoupCookieJar *j = soup_cookie_jar_text_new(cookiefile, FALSE);
+ c = soup_cookie_copy(c);
+ if(c->expires == NULL && sessiontime) {
+ e = soup_date_new_from_time_t(time(NULL) + sessiontime);
+ soup_cookie_set_expires(c, e);
+ }
+ soup_cookie_jar_add_cookie(j, c);
+ g_object_unref(j);
+ flock(lock, LOCK_UN);
+ close(lock);
+}
+
+void
+setatom(Client *c, int a, const char *v) {
+ XSync(dpy, False);
+ XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), atoms[a],
+ XA_STRING, 8, PropModeReplace, (unsigned char *)v,
+ strlen(v) + 1);
}
void
setup(void) {
+ char *proxy;
+ char *new_proxy;
+ SoupURI *puri;
SoupSession *s;
/* clean up any zombies immediately */
g_thread_init(NULL);
dpy = GDK_DISPLAY();
- session = webkit_get_default_session();
- urlprop = XInternAtom(dpy, "_SURF_URL", False);
+ s = webkit_get_default_session();
- /* create dirs and files */
+ /* atoms */
+ atoms[AtomFind] = XInternAtom(dpy, "_SURF_FIND", False);
+ atoms[AtomGo] = XInternAtom(dpy, "_SURF_GO", False);
+ atoms[AtomUri] = XInternAtom(dpy, "_SURF_URI", False);
+
+ /* dirs and files */
cookiefile = buildpath(cookiefile);
- dldir = buildpath(dldir);
scriptfile = buildpath(scriptfile);
stylefile = buildpath(stylefile);
- /* cookie persistance */
+ /* request handler */
s = webkit_get_default_session();
- cookiejar = soup_cookie_jar_text_new(cookiefile, FALSE);
- soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
+ soup_session_remove_feature_by_type(s, soup_cookie_get_type());
+ soup_session_remove_feature_by_type(s, soup_cookie_jar_get_type());
+ g_signal_connect_after(G_OBJECT(s), "request-started", G_CALLBACK(newrequest), NULL);
+
+ /* ssl */
+ g_object_set(G_OBJECT(s), "ssl-ca-file", cafile, NULL);
+ g_object_set(G_OBJECT(s), "ssl-strict", strictssl, NULL);
+
+ /* proxy */
+ if((proxy = getenv("http_proxy")) && strcmp(proxy, "")) {
+ new_proxy = g_strrstr(proxy, "http://") ? g_strdup(proxy) :
+ g_strdup_printf("http://%s", proxy);
+ puri = soup_uri_new(new_proxy);
+ g_object_set(G_OBJECT(s), "proxy-uri", puri, NULL);
+ soup_uri_free(puri);
+ g_free(new_proxy);
+ }
}
void
-showsearch(Client *c, const Arg *arg) {
- hideurl(c, NULL);
- gtk_widget_show(c->searchbar);
- gtk_widget_grab_focus(c->searchbar);
+sigchld(int unused) {
+ if(signal(SIGCHLD, sigchld) == SIG_ERR)
+ die("Can't install SIGCHLD handler");
+ while(0 < waitpid(-1, NULL, WNOHANG));
}
void
reload(c, &a);
}
-void
-searchtext(Client *c, const Arg *arg) {
- const gchar *text;
- gboolean forward = *(gboolean *)arg;
- text = gtk_entry_get_text(GTK_ENTRY(c->searchbar));
- webkit_web_view_search_text(c->view, text, FALSE, forward, TRUE);
- webkit_web_view_mark_text_matches(c->view, text, FALSE, 0);
-}
-
-void
-showurl(Client *c, const Arg *arg) {
- gchar *uri;
-
- hidesearch(c, NULL);
- uri = geturi(c);
- gtk_entry_set_text(GTK_ENTRY(c->urlbar), uri);
- gtk_widget_show(c->urlbar);
- gtk_widget_grab_focus(c->urlbar);
-}
-
-void
-stop(Client *c, const Arg *arg) {
- if(c->download)
- webkit_download_cancel(c->download);
- else
- webkit_web_view_stop_loading(c->view);
- c->download = NULL;
-}
-
void
spawn(Client *c, const Arg *arg) {
if(fork() == 0) {
close(ConnectionNumber(dpy));
setsid();
execvp(((char **)arg->v)[0], (char **)arg->v);
- fprintf(stderr, "tabbed: execvp %s", ((char **)arg->v)[0]);
+ fprintf(stderr, "surf: execvp %s", ((char **)arg->v)[0]);
perror(" failed");
exit(0);
}
}
void
-titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, Client *c) {
- c->title = copystr(&c->title, t);
- update(c);
+eval(Client *c, const Arg *arg) {
+ WebKitWebFrame *frame = webkit_web_view_get_main_frame(c->view);
+ evalscript(frame, webkit_web_frame_get_global_context(frame), ((char **)arg->v)[0], "");
}
-gboolean
-unfocusbar(GtkWidget *w, GdkEventFocus *e, Client *c) {
- hidesearch(c, NULL);
- hideurl(c, NULL);
- return FALSE;
+void
+stop(Client *c, const Arg *arg) {
+ webkit_web_view_stop_loading(c->view);
}
void
-usage(void) {
- fputs("surf - simple browser\n", stderr);
- die("usage: surf [-e Window] [-x] [uri]\n");
+titlechange(WebKitWebView *v, WebKitWebFrame *f, const char *t, Client *c) {
+ c->title = copystr(&c->title, t);
+ update(c);
}
void
update(Client *c) {
- gchar *t;
+ char *t;
- if(c->progress == 100)
- t = g_strdup(c->title);
+ if(c->linkhover)
+ t = g_strdup(c->linkhover);
+ else if(c->progress != 100)
+ t = g_strdup_printf("[%i%%] %s", c->progress, c->title);
else
- t = g_strdup_printf("%s [%i%%]", c->title, c->progress);
+ t = g_strdup(c->title);
drawindicator(c);
gtk_window_set_title(GTK_WINDOW(c->win), t);
g_free(t);
-
}
void
(int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
}
+void
+usage(void) {
+ fputs("surf - simple browser\n", stderr);
+ die("usage: surf [-e xid] [-i] [-p] [-s] [-v] [-x] [uri]\n");
+}
+
void
windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c) {
- JSStringRef jsscript;
- gchar *script;
- JSValueRef exception = NULL;
- GError *error;
-
- if(g_file_get_contents(scriptfile, &script, NULL, &error)) {
- jsscript = JSStringCreateWithUTF8CString(script);
- JSEvaluateScript(js, jsscript, JSContextGetGlobalObject(js), NULL, 0, &exception);
- }
+ runscript(frame, js);
}
void
zoom(Client *c, const Arg *arg) {
+ c->zoomed = TRUE;
if(arg->i < 0) /* zoom out */
webkit_web_view_zoom_out(c->view);
else if(arg->i > 0) /* zoom in */
webkit_web_view_zoom_in(c->view);
- else /* reset */
+ else { /* reset */
+ c->zoomed = FALSE;
webkit_web_view_set_zoom_level(c->view, 1.0);
+ }
}
-int main(int argc, char *argv[]) {
+int
+main(int argc, char *argv[]) {
int i;
Arg arg;
progname = argv[0];
/* command line args */
- for(i = 1, arg.v = NULL; i < argc && argv[i][0] == '-'; i++) {
- if(!strcmp(argv[i], "-x"))
- showxid = TRUE;
- else if(!strcmp(argv[i], "-e")) {
+ for(i = 1, arg.v = NULL; i < argc && argv[i][0] == '-' &&
+ argv[i][1] != '\0' && argv[i][2] == '\0'; i++) {
+ if(!strcmp(argv[i], "--")) {
+ i++;
+ break;
+ }
+ switch(argv[i][1]) {
+ case 'e':
if(++i < argc)
embed = atoi(argv[i]);
else
usage();
- }
- else if(!strcmp(argv[i], "--")) {
- i++;
break;
- }
- else if(!strcmp(argv[i], "-v"))
- die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n");
- else
+ case 'i':
+ loadimage = 0;
+ break;
+ case 'p':
+ plugin = 0;
+ break;
+ case 's':
+ script = 0;
+ break;
+ case 'x':
+ showxid = TRUE;
+ break;
+ case 'v':
+ die("surf-"VERSION", ©2009-2012 surf engineers, see LICENSE for details\n");
+ default:
usage();
+ }
}
if(i < argc)
arg.v = argv[i];
setup();
newclient();
- if(arg.v) {
+ if(arg.v)
loaduri(clients, &arg);
- }
gtk_main();
cleanup();
return EXIT_SUCCESS;