X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=ae1a9355164b113172604375c4bff3c1920ed0b3;hp=111da8d0fb0a7d1b615881ff22d2db099d2641e8;hb=25ba840e4d24735118949f38216628792f22d7f5;hpb=f62505a47ab046d5f31ae0d1ec652b94749b785e diff --git a/surf.c b/surf.c index 111da8d..ae1a935 100644 --- a/surf.c +++ b/surf.c @@ -18,124 +18,123 @@ #include #include #include +#include #define LENGTH(x) (sizeof x / sizeof x[0]) -#define CLEANMASK(mask) (mask & ~(GDK_MOD2_MASK)) +#define COOKIEJAR_TYPE (cookiejar_get_type ()) +#define COOKIEJAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), COOKIEJAR_TYPE, CookieJar)) + +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 { char *label; void (*func)(Client *c, const Arg *arg); const Arg arg; -} Context; - -typedef struct Cookie { - gchar *name; - gchar *value; - gchar *domain; - gchar *path; - struct Cookie *next; -} Cookie; - -typedef enum { - Browser = 0x0001, - SearchBar = 0x0010, - UrlBar = 0x0100, - Any = ~0, -} KeyFocus; +} Item; typedef struct { guint mod; guint keyval; void (*func)(Client *c, const Arg *arg); const Arg arg; - KeyFocus focus; } Key; +typedef struct { + SoupCookieJarText parent_instance; + int lock; +} CookieJar; + +typedef struct { + SoupCookieJarTextClass parent_class; +} CookieJarClass; + +G_DEFINE_TYPE(CookieJar, cookiejar, SOUP_TYPE_COOKIE_JAR_TEXT) + 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 gboolean buttonrelease(WebKitWebView *web, GdkEventButton *e, GList *gl); static void cleanup(void); static void clipboard(Client *c, const Arg *arg); -static gchar *copystr(gchar **str, const gchar *src); +static void cookiejar_changed(SoupCookieJar *self, SoupCookie *old_cookie, SoupCookie *new_cookie); +static void cookiejar_finalize(GObject *self); +static SoupCookieJar *cookiejar_new(const char *filename, gboolean read_only); +static void cookiejar_set_property(GObject *self, guint prop_id, const GValue *value, GParamSpec *pspec); +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(gchar *str); -static void download(WebKitDownload *o, GParamSpec *pspec, Client *c); +static void die(char *str); static void drawindicator(Client *c); static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c); +static void find(Client *c, const Arg *arg); +static const char *getatom(Client *c, int a); +static char *geturi(Client *c); static gboolean initdownload(WebKitWebView *v, 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 *v, const gchar* t, const gchar* l, Client *c); -static void loadcommit(WebKitWebView *v, WebKitWebFrame *f, Client *c); -static void loadstart(WebKitWebView *v, WebKitWebFrame *f, 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, gboolean noembed); +static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d); +static void populatepopup(WebKitWebView *web, GtkMenu *menu, Client *c); +static void popupactivate(GtkMenuItem *menu, Client *); static void print(Client *c, const Arg *arg); -static void proccookies(SoupMessage *m, Client *c); -static void progresschange(WebKitWebView *v, 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(gchar *name, gchar *val, gchar *dom, gchar *path, long exp); +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 setup(void); -static void spawn(Client *c, const Arg *arg); -static void titlechange(WebKitWebView *v, 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 *v, WebKitWebFrame* frame, const gchar* title, Client *c); -static gboolean focusview(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 */ @@ -145,38 +144,122 @@ buildpath(const gchar *path) { 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; } +static gboolean +buttonrelease(WebKitWebView *web, GdkEventButton *e, GList *gl) { + WebKitHitTestResultContext context; + WebKitHitTestResult *result = webkit_web_view_get_hit_test_result(web, e); + Arg arg; + + g_object_get(result, "context", &context, NULL); + if(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK) { + if(e->button == 2) { + g_object_get(result, "link-uri", &arg.v, NULL); + newwindow(NULL, &arg, e->state & GDK_CONTROL_MASK); + return true; + } + } + return false; +} + void cleanup(void) { while(clients) destroyclient(clients); g_free(cookiefile); - g_free(dldir); g_free(scriptfile); g_free(stylefile); } +static void +cookiejar_changed(SoupCookieJar *self, SoupCookie *old_cookie, SoupCookie *new_cookie) { + flock(COOKIEJAR(self)->lock, LOCK_EX); + if(new_cookie && !new_cookie->expires && sessiontime) + soup_cookie_set_expires(new_cookie, soup_date_new_from_now(sessiontime)); + SOUP_COOKIE_JAR_CLASS(cookiejar_parent_class)->changed(self, old_cookie, new_cookie); + flock(COOKIEJAR(self)->lock, LOCK_UN); +} + +static void +cookiejar_class_init(CookieJarClass *klass) { + SOUP_COOKIE_JAR_CLASS(klass)->changed = cookiejar_changed; + G_OBJECT_CLASS(klass)->get_property = G_OBJECT_CLASS(cookiejar_parent_class)->get_property; + G_OBJECT_CLASS(klass)->set_property = cookiejar_set_property; + G_OBJECT_CLASS(klass)->finalize = cookiejar_finalize; + g_object_class_override_property(G_OBJECT_CLASS(klass), 1, "filename"); +} + +static void +cookiejar_finalize(GObject *self) { + close(COOKIEJAR(self)->lock); + G_OBJECT_CLASS(cookiejar_parent_class)->finalize(self); +} + +static void +cookiejar_init(CookieJar *self) { + self->lock = open(cookiefile, 0); +} + +static SoupCookieJar * +cookiejar_new(const char *filename, gboolean read_only) { + return g_object_new(COOKIEJAR_TYPE, + SOUP_COOKIE_JAR_TEXT_FILENAME, filename, + SOUP_COOKIE_JAR_READ_ONLY, read_only, NULL); +} + +static void +cookiejar_set_property(GObject *self, guint prop_id, const GValue *value, GParamSpec *pspec) { + flock(COOKIEJAR(self)->lock, LOCK_SH); + G_OBJECT_CLASS(cookiejar_parent_class)->set_property(self, prop_id, value, pspec); + flock(COOKIEJAR(self)->lock, LOCK_UN); +} + +void +evalscript(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) { + char *script; + GError *error; + + if(g_file_get_contents(scriptfile, &script, NULL, &error)) { + evalscript(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) { @@ -186,16 +269,45 @@ copystr(gchar **str, const gchar *src) { 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, 0); + 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; @@ -206,23 +318,13 @@ destroyclient(Client *c) { 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 -die(gchar *str) { +die(char *str) { fputs(str, stderr); exit(EXIT_FAILURE); } @@ -230,7 +332,7 @@ die(gchar *str) { void drawindicator(Client *c) { gint width; - gchar *uri; + const char *uri; GtkWidget *w; GdkGC *gc; GdkColor fg; @@ -239,8 +341,12 @@ drawindicator(Client *c) { 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)], @@ -257,80 +363,61 @@ exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c) { } 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 %s...", 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 * +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; } -gchar * +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)); -} +gboolean +initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) { + Arg arg; -void -hideurl(Client *c, const Arg *arg) { - gtk_widget_hide(c->urlbar); - gtk_widget_grab_focus(GTK_WIDGET(c->view)); + 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; @@ -340,48 +427,73 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) { } void -linkhover(WebKitWebView *v, 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 = 100; + 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); } @@ -389,7 +501,9 @@ Client * 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"); @@ -399,7 +513,19 @@ newclient(void) { } 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); @@ -408,36 +534,28 @@ newclient(void) { /* 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); - g_signal_connect(G_OBJECT(c->view), "focus-in-event", G_CALLBACK(focusview), c); - - /* urlbar */ - c->urlbar = gtk_entry_new(); - gtk_entry_set_has_frame(GTK_ENTRY(c->urlbar), FALSE); - - /* searchbar */ - c->searchbar = gtk_entry_new(); - gtk_entry_set_has_frame(GTK_ENTRY(c->searchbar), FALSE); + 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); + g_signal_connect(G_OBJECT(c->view), "button-release-event", G_CALLBACK(buttonrelease), c); + g_signal_connect(G_OBJECT(c->view), "populate-popup", G_CALLBACK(populatepopup), c); - /* indicator */ + /* Indicator */ c->indicator = gtk_drawing_area_new(); - gtk_widget_set_size_request(c->indicator, 0, 2); + gtk_widget_set_size_request(c->indicator, 0, indicator_thickness); g_signal_connect (G_OBJECT (c->indicator), "expose_event", G_CALLBACK (exposeindicator), c); @@ -445,33 +563,40 @@ newclient(void) { 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); 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; @@ -479,107 +604,123 @@ newclient(void) { 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]; +newwindow(Client *c, const Arg *arg, gboolean noembed) { + guint i = 0; + const char *cmd[10], *uri; + const Arg a = { .v = (void *)cmd }; + char tmp[64]; cmd[i++] = progname; - if(embed) { + if(embed && !noembed) { cmd[i++] = "-e"; 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; +static void +populatepopup(WebKitWebView *web, GtkMenu *menu, Client *c) { + GList *items = gtk_container_get_children(GTK_CONTAINER(menu)); + + for(GList *l = items; l; l = l->next) { + g_signal_connect(l->data, "activate", G_CALLBACK(popupactivate), c); + } + + g_list_free(items); +} + +static void +popupactivate(GtkMenuItem *menu, Client *c) { + /* + * context-menu-action-2000 open link + * context-menu-action-1 open link in window + * context-menu-action-2 download linked file + * context-menu-action-3 copy link location + * context-menu-action-13 reload + * context-menu-action-10 back + * context-menu-action-11 forward + * context-menu-action-12 stop + */ + + GtkAction *a = NULL; + const char *name; + GtkClipboard *prisel; + + a = gtk_activatable_get_related_action(GTK_ACTIVATABLE(menu)); + if(a == NULL) + return; + + name = gtk_action_get_name(a); + if(!g_strcmp0(name, "context-menu-action-3")) { + prisel = gtk_clipboard_get(GDK_SELECTION_PRIMARY); + gtk_clipboard_set_text(prisel, c->linkhover, -1); + } } 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 *v, 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; @@ -590,37 +731,53 @@ reload(Client *c, const Arg *arg) { } void -rereadcookies(void) { +scroll_h(Client *c, const Arg *arg) { + scroll(gtk_scrolled_window_get_hadjustment( + GTK_SCROLLED_WINDOW(c->scroll)), arg); +} +void +scroll_v(Client *c, const Arg *arg) { + scroll(gtk_scrolled_window_get_vadjustment( + GTK_SCROLLED_WINDOW(c->scroll)), arg); } void -scroll(Client *c, const Arg *arg) { +scroll(GtkAdjustment *a, const Arg *arg) { gdouble v; - GtkAdjustment *a; - 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; + 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)); + v = MIN(v, gtk_adjustment_get_upper(a) - + gtk_adjustment_get_page_size(a)); gtk_adjustment_set_value(a, v); } void -sigchld(int unused) { - if(signal(SIGCHLD, sigchld) == SIG_ERR) - die("Can't install SIGCHLD handler"); - while(0 < waitpid(-1, NULL, WNOHANG)); -} - -void -setcookie(gchar *name, gchar *val, gchar *dom, gchar *path, long exp) { - +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 */ @@ -630,26 +787,43 @@ setup(void) { g_thread_init(NULL); dpy = GDK_DISPLAY(); - session = webkit_get_default_session(); - urlprop = XInternAtom(dpy, "_SURF_URL", False); - /* 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)); + + /* cookie jar */ + soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar_new(cookiefile, FALSE))); + + /* 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 @@ -662,79 +836,53 @@ source(Client *c, const Arg *arg) { 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) { if(dpy) close(ConnectionNumber(dpy)); setsid(); - execvp(((gchar **)arg->v)[0], (gchar **)arg->v); - fprintf(stderr, "tabbed: execvp %s", ((gchar **)arg->v)[0]); + execvp(((char **)arg->v)[0], (char **)arg->v); + 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(webkit_web_frame_get_global_context(frame), + ((char **)arg->v)[0], ""); } -gboolean -focusview(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; - - if(c->progress == 100) + char *t; + + if(c->linkhover) { + t = g_strdup(c->linkhover); + } else if(c->progress != 100) { + drawindicator(c); + gtk_widget_show(c->indicator); + t = g_strdup_printf("[%i%%] %s", c->progress, c->title); + } else { + gtk_widget_hide_all(c->indicator); t = g_strdup(c->title); - else - t = g_strdup_printf("%s [%i%%]", c->title, c->progress); - drawindicator(c); + } gtk_window_set_title(GTK_WINDOW(c->win), t); g_free(t); - } void @@ -743,60 +891,74 @@ updatewinid(Client *c) { (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); } 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]); + embed = strtol(argv[i], NULL, 0); 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;