X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=682c1e299c38043f9381b31841dd98c83a5d5725;hp=6cc29c4cbec12fbc931e62156611ce1c91b799a2;hb=0415175e10880585c765613af0bd43e02de87116;hpb=c82fff2dd33346d0acbfed291d54ec9845245249 diff --git a/surf.c b/surf.c index 6cc29c4..682c1e2 100644 --- a/surf.c +++ b/surf.c @@ -13,14 +13,26 @@ #include #include #include +#include #include #include #include #include #include +#include +#include +#include + +#include "arg.h" + +char *argv0; #define LENGTH(x) (sizeof x / sizeof x[0]) -#define CLEANMASK(mask) (mask & ~(GDK_MOD2_MASK)) +#define CLEANMASK(mask) (mask & (MODKEY|GDK_SHIFT_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 { @@ -31,14 +43,13 @@ union Arg { typedef struct Client { GtkWidget *win, *scroll, *vbox, *indicator; - GtkWidget **items; WebKitWebView *view; - WebKitDownload *download; + WebKitWebInspector *inspector; char *title, *linkhover; const char *uri, *needle; gint progress; struct Client *next; - gboolean zoomed; + gboolean zoomed, fullscreen, isinspector, sslfailed; } Client; typedef struct { @@ -54,148 +65,263 @@ typedef struct { const Arg arg; } 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 uriprop, findprop; -static SoupCookieJar *cookies; -static SoupSession *session; +static Atom atoms[AtomLast]; static Client *clients = NULL; static GdkNativeWindow embed = 0; static gboolean showxid = FALSE; -static int ignorexprop = 0; static char winid[64]; -static char *progname; -static gboolean lockcookie = FALSE; +static gboolean usingproxy = 0; +static char togglestat[5]; +static void beforerequest(WebKitWebView *w, WebKitWebFrame *f, + WebKitWebResource *r, WebKitNetworkRequest *req, + WebKitNetworkResponse *resp, gpointer d); static char *buildpath(const char *path); -static void changecookie(SoupCookieJar *jar, SoupCookie *o, SoupCookie *n, gpointer p); +static gboolean buttonrelease(WebKitWebView *web, GdkEventButton *e, + GList *gl); static void cleanup(void); static void clipboard(Client *c, const Arg *arg); -static void context(WebKitWebView *v, GtkMenu *m, Client *c); + +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 gboolean decidewindow(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c); +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 die(const char *errstr, ...); static void drawindicator(Client *c); +static void eval(Client *c, const Arg *arg); static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c); +static void find(Client *c, const Arg *arg); +static void fullscreen(Client *c, const Arg *arg); +static const char *getatom(Client *c, int a); +static void gettogglestat(Client *c); static char *geturi(Client *c); -static const char *getatom(Client *c, Atom a); static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c); -static void itemclick(GtkMenuItem *mi, Client *c); + +static void inspector(Client *c, const Arg *arg); +static WebKitWebView *inspector_new(WebKitWebInspector *i, WebKitWebView *v, + Client *c); +static gboolean inspector_show(WebKitWebInspector *i, Client *c); +static gboolean inspector_close(WebKitWebInspector *i, Client *c); +static void inspector_finished(WebKitWebInspector *i, 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 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 newwindow(Client *c, const Arg *arg); -static WebKitWebView *createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c); +static void newwindow(Client *c, const Arg *arg, gboolean noembed); static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d); -static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, 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 progresschange(WebKitWebView *v, gint p, Client *c); -static void reloadcookies(); +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 resize(GtkWidget *w, GtkAllocation *a, Client *c); -static void sigchld(int unused); -static void setatom(Client *c, Atom a, const char *v); +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 scroll(Client *c, const Arg *arg); -static void find(Client *c, const Arg *arg); +static void sigchld(int unused); static void source(Client *c, const Arg *arg); +static void spawn(Client *c, const Arg *arg); static void stop(Client *c, const Arg *arg); -static void titlechange(WebKitWebView *v, WebKitWebFrame* frame, const char* title, Client *c); -static void usage(void); +static void titlechange(WebKitWebView *v, WebKitWebFrame *frame, + const char *title, Client *c); +static void toggle(Client *c, const Arg *arg); static void update(Client *c); static void updatewinid(Client *c); -static void windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, 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" -char * +static void +beforerequest(WebKitWebView *w, WebKitWebFrame *f, WebKitWebResource *r, + WebKitNetworkRequest *req, WebKitNetworkResponse *resp, + gpointer d) { + const gchar *uri = webkit_network_request_get_uri(req); + if(g_str_has_suffix(uri, "/favicon.ico")) + webkit_network_request_set_uri(req, "about:blank"); +} + +static char * buildpath(const char *path) { char *apath, *p; FILE *f; /* creating directory */ - if(path[0] == '/') + if(path[0] == '/') { apath = g_strdup(path); - else - apath = g_strconcat(g_get_home_dir(), "/", path, NULL); + } else if(path[0] == '~') { + if(path[1] == '/') { + apath = g_strconcat(g_get_home_dir(), &path[1], NULL); + } else { + apath = g_strconcat(g_get_home_dir(), "/", + &path[1], NULL); + } + } else { + apath = g_strconcat(g_get_current_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; } -void -changecookie(SoupCookieJar *j, SoupCookie *oc, SoupCookie *c, gpointer p) { - SoupDate *e; - SoupCookieJar *jar; +static gboolean +buttonrelease(WebKitWebView *web, GdkEventButton *e, GList *gl) { + WebKitHitTestResultContext context; + WebKitHitTestResult *result = webkit_web_view_get_hit_test_result(web, + e); + Arg arg; - if(lockcookie) - return; - if(c && c->expires == NULL) { - e = soup_date_new_from_time_t(time(NULL) + sessiontime); - c = soup_cookie_copy(c); - soup_cookie_set_expires(c, e); + 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; + } } - - jar = soup_cookie_jar_text_new(cookiefile, FALSE); - if(c) - soup_cookie_jar_add_cookie(jar, soup_cookie_copy(c)); - else - soup_cookie_jar_delete_cookie(jar, oc); - g_object_unref(jar); + return false; } -void +static void cleanup(void) { while(clients) destroyclient(clients); g_free(cookiefile); - g_free(dldir); g_free(scriptfile); g_free(stylefile); } -void +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); +} + +static 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); +} + +static 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); + } +} + +static void clipboard(Client *c, const Arg *arg) { gboolean paste = *(gboolean *)arg; if(paste) gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteuri, c); else - gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), geturi(c), -1); -} - -void -context(WebKitWebView *v, GtkMenu *m, Client *c) { - int i; - GtkContainer *parent; - - gtk_widget_hide_all(GTK_WIDGET(m)); - gtk_widget_show(GTK_WIDGET(m)); - for(i = 0; i < LENGTH(items); i++) { - parent = GTK_CONTAINER(gtk_widget_get_parent(c->items[i])); - if(parent) - gtk_container_remove(parent, c->items[i]); - gtk_menu_shell_append(GTK_MENU_SHELL(m), c->items[i]); - gtk_widget_show(c->items[i]); - } + gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), c->linkhover ? c->linkhover : geturi(c), -1); } -char * +static char * copystr(char **str, const char *src) { char *tmp; tmp = g_strdup(src); @@ -207,68 +333,105 @@ copystr(char **str, const char *src) { return tmp; } -void +static WebKitWebView * +createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c) { + Client *n = newclient(); + return n->view; +} + +static 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; +} + +static 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; +} + +static void destroyclient(Client *c) { - int i; 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->vbox); - gtk_widget_destroy(c->indicator); gtk_widget_destroy(c->win); - for(i = 0; i < LENGTH(items); i++) - gtk_widget_destroy(c->items[i]); - free(c->items); for(p = clients; p && p->next != c; p = p->next); - if(p) + if(p) { p->next = c->next; - else + } else { clients = c->next; + } free(c); if(clients == NULL) gtk_main_quit(); } -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 +static void destroywin(GtkWidget* w, Client *c) { destroyclient(c); } -void -die(char *str) { - fputs(str, stderr); +static void +die(const char *errstr, ...) { + va_list ap; + + va_start(ap, errstr); + vfprintf(stderr, errstr, ap); + va_end(ap); exit(EXIT_FAILURE); } -void +static void drawindicator(Client *c) { gint width; const char *uri; + char *colorname; GtkWidget *w; GdkGC *gc; GdkColor fg; - uri = getatom(c, uriprop); + uri = geturi(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) { + if(usingproxy) { + colorname = c->sslfailed? progress_proxy_untrust : + progress_proxy_trust; + } else { + colorname = c->sslfailed? progress_untrust : + progress_trust; + } + } else { + if(usingproxy) { + colorname = progress_proxy; + } else { + colorname = progress; + } + } + + gdk_color_parse(colorname, &fg); gdk_gc_set_rgb_fg_color(gc, &fg); gdk_draw_rectangle(w->window, w->style->bg_gc[GTK_WIDGET_STATE(w)], @@ -278,25 +441,33 @@ drawindicator(Client *c) { g_object_unref(gc); } -gboolean +static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c) { drawindicator(c); return TRUE; } -void -download(WebKitDownload *o, GParamSpec *pspec, Client *c) { - WebKitDownloadStatus status; +static void +find(Client *c, const Arg *arg) { + const char *s; + + s = getatom(c, AtomFind); + gboolean forward = *(gboolean *)arg; + webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE); +} - 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); +static void +fullscreen(Client *c, const Arg *arg) { + if(c->fullscreen) { + gtk_window_unfullscreen(GTK_WINDOW(c->win)); + } else { + gtk_window_fullscreen(GTK_WINDOW(c->win)); } - update(c); + c->fullscreen = !c->fullscreen; } -const char * -getatom(Client *c, Atom a) { +static const char * +getatom(Client *c, int a) { static char buf[BUFSIZ]; Atom adummy; int idummy; @@ -304,7 +475,7 @@ getatom(Client *c, Atom a) { unsigned char *p = NULL; XGetWindowProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), - a, 0L, BUFSIZ, False, XA_STRING, + atoms[a], 0L, BUFSIZ, False, XA_STRING, &adummy, &idummy, &ldummy, &ldummy, &p); if(p) strncpy(buf, (char *)p, LENGTH(buf)-1); @@ -314,32 +485,7 @@ getatom(Client *c, Atom a) { return buf; } -gboolean -initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) { - const char *filename; - char *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; -} - -char * +static char * geturi(Client *c) { char *uri; @@ -348,18 +494,49 @@ geturi(Client *c) { return uri; } -void -itemclick(GtkMenuItem *mi, Client *c) { - int i; - const char *label; +static gboolean +initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) { + Arg arg; + + updatewinid(c); + arg = (Arg)DOWNLOAD((char *)webkit_download_get_uri(o), geturi(c)); + spawn(c, &arg); + return FALSE; +} + +static void +inspector(Client *c, const Arg *arg) { + if(c->isinspector) + return; + webkit_web_inspector_show(c->inspector); +} + +static WebKitWebView * +inspector_new(WebKitWebInspector *i, WebKitWebView *v, Client *c) { + Client *n = newclient(); + n->isinspector = true; + + return n->view; +} + +static gboolean +inspector_show(WebKitWebInspector *i, Client *c) { + gtk_widget_show(GTK_WIDGET(webkit_web_inspector_get_web_view(i))); + return true; +} + +static gboolean +inspector_close(WebKitWebInspector *i, Client *c) { + gtk_widget_hide(GTK_WIDGET(webkit_web_inspector_get_web_view(i))); + return true; +} - label = gtk_menu_item_get_label(mi); - for(i = 0; i < LENGTH(items); i++) - if(!strcmp(items[i].label, label)) - items[i].func(c, &(items[i].arg)); +static void +inspector_finished(WebKitWebInspector *i, Client *c) { + g_free(c->inspector); } -gboolean +static gboolean keypress(GtkWidget* w, GdkEventKey *ev, Client *c) { guint i; gboolean processed = FALSE; @@ -373,108 +550,177 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) { processed = TRUE; } } + return processed; } -void +static void linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) { - if(l) + if(l) { c->linkhover = copystr(&c->linkhover, l); - else if(c->linkhover) { + } else if(c->linkhover) { free(c->linkhover); c->linkhover = NULL; } update(c); } -void -loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) { - setatom(c, uriprop, geturi(c)); - reloadcookies(); -} +static void +loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) { + WebKitWebFrame *frame; + WebKitWebDataSource *src; + WebKitNetworkRequest *request; + SoupMessage *msg; + char *uri; -void -loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) { - c->progress = 0; - update(c); + 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 +static void loaduri(Client *c, const Arg *arg) { - char *u; + char *u, *rp; const char *uri = (char *)arg->v; + Arg a = { .b = FALSE }; - 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); + if(strcmp(uri, "") == 0) + return; + + /* In case it's a file path. */ + if(uri[0] == '/') { + rp = realpath(uri, NULL); + u = g_strdup_printf("file://%s", rp); + free(rp); + } else { + u = g_strrstr(uri, "://") ? g_strdup(uri) + : g_strdup_printf("http://%s", uri); + } + + /* 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 +static 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); } -Client * +static Client * newclient(void) { - int i; Client *c; WebKitWebSettings *settings; - char *uri; + WebKitWebFrame *frame; + GdkGeometry hints = { 1, 1 }; + char *uri, *ua; if(!(c = calloc(1, sizeof(Client)))) die("Cannot malloc!\n"); + /* Window */ if(embed) { c->win = gtk_plug_new(embed); - } - else { + } else { c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_window_set_wmclass(GTK_WINDOW(c->win), "surf", "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); - - if(!(c->items = calloc(1, sizeof(GtkWidget *) * LENGTH(items)))) - die("Cannot malloc!\n"); - /* contextmenu */ - for(i = 0; i < LENGTH(items); i++) { - c->items[i] = gtk_menu_item_new_with_label(items[i].label); - g_signal_connect(G_OBJECT(c->items[i]), "activate", - G_CALLBACK(itemclick), c); + /* 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); /* 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), "window-object-cleared", G_CALLBACK(windowobjectcleared), c); - g_signal_connect(G_OBJECT(c->view), "populate-popup", G_CALLBACK(context), c); - - /* indicator */ + g_signal_connect(G_OBJECT(c->view), + "title-changed", + G_CALLBACK(titlechange), 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), + "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(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); + g_signal_connect(G_OBJECT(c->view), + "resource-request-starting", + G_CALLBACK(beforerequest), c); + + /* 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); @@ -485,52 +731,97 @@ newclient(void) { gtk_container_add(GTK_CONTAINER(c->vbox), c->indicator); /* Setup */ - 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_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_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", loadimages, + NULL); + g_object_set(G_OBJECT(settings), "enable-plugins", enableplugins, + NULL); + g_object_set(G_OBJECT(settings), "enable-scripts", enablescripts, + NULL); + g_object_set(G_OBJECT(settings), "enable-spatial-navigation", + enablespatialbrowsing, NULL); + g_object_set(G_OBJECT(settings), "enable-developer-extras", + enableinspector, NULL); + + if(enableinspector) { + c->inspector = WEBKIT_WEB_INSPECTOR( + webkit_web_view_get_inspector(c->view)); + g_signal_connect(G_OBJECT(c->inspector), "inspect-web-view", + G_CALLBACK(inspector_new), c); + g_signal_connect(G_OBJECT(c->inspector), "show-window", + G_CALLBACK(inspector_show), c); + g_signal_connect(G_OBJECT(c->inspector), "close-window", + G_CALLBACK(inspector_close), c); + g_signal_connect(G_OBJECT(c->inspector), "finished", + G_CALLBACK(inspector_finished), c); + c->isinspector = false; + } + g_free(uri); - setatom(c, findprop, ""); - c->download = NULL; + setatom(c, AtomFind, ""); + setatom(c, AtomUri, "about:blank"); + if(hidebackground) + webkit_web_view_set_transparent(c->view, TRUE); + c->title = NULL; c->next = clients; clients = c; if(showxid) { gdk_display_sync(gtk_widget_get_display(c->win)); - printf("%u\n", (guint)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window)); + 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 -newwindow(Client *c, const Arg *arg) { +static void +newwindow(Client *c, const Arg *arg, gboolean noembed) { guint i = 0; - const char *cmd[7], *uri; + const char *cmd[10], *uri; const Arg a = { .v = (void *)cmd }; char tmp[64]; - cmd[i++] = progname; - if(embed) { + cmd[i++] = argv0; + if(embed && !noembed) { cmd[i++] = "-e"; snprintf(tmp, LENGTH(tmp), "%u\n", (int)embed); cmd[i++] = tmp; } - if(showxid) { + if(!enablescripts) + cmd[i++] = "-s"; + if(!enableplugins) + cmd[i++] = "-p"; + if(!loadimages) + cmd[i++] = "-i"; + if(showxid) cmd[i++] = "-x"; - } cmd[i++] = "--"; uri = arg->v ? (char *)arg->v : c->linkhover; if(uri) @@ -539,20 +830,58 @@ newwindow(Client *c, const Arg *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 +static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d) { Arg arg = {.v = text }; if(text != NULL) loaduri((Client *) d, &arg); } -GdkFilterReturn +static void +print(Client *c, const Arg *arg) { + webkit_web_frame_print(webkit_web_view_get_main_frame(c->view)); +} + +static GdkFilterReturn processx(GdkXEvent *e, GdkEvent *event, gpointer d) { Client *c = (Client *)d; XPropertyEvent *ev; @@ -560,35 +889,29 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) { if(((XEvent *)e)->type == PropertyNotify) { ev = &((XEvent *)e)->xproperty; - if(ignorexprop) - ignorexprop--; - else if(ev->state == PropertyNewValue) { - if(ev->atom == uriprop) { - arg.v = getatom(c, uriprop); - loaduri(c, &arg); - } - else if(ev->atom == findprop) { + 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); + 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 -progresschange(WebKitWebView *v, gint p, Client *c) { - c->progress = p; +static void +progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c) { + c->progress = webkit_web_view_get_progress(c->view) * 100; update(c); } -void +static void reload(Client *c, const Arg *arg) { gboolean nocache = *(gboolean *)arg; if(nocache) @@ -597,67 +920,54 @@ reload(Client *c, const Arg *arg) { webkit_web_view_reload(c->view); } -void -reloadcookies() { - SoupCookieJar *jar; - GSList *l, *e; +static void +scroll_h(Client *c, const Arg *arg) { + scroll(gtk_scrolled_window_get_hadjustment( + GTK_SCROLLED_WINDOW(c->scroll)), arg); +} - lockcookie = TRUE; - for(l = e = soup_cookie_jar_all_cookies(cookies); e; e = e->next) - soup_cookie_jar_delete_cookie(cookies, (SoupCookie *)e->data); - soup_cookies_free(l); - jar = soup_cookie_jar_text_new(cookiefile, TRUE); - for(l = e = soup_cookie_jar_all_cookies(jar); e; e = e->next) - soup_cookie_jar_add_cookie(cookies, (SoupCookie *)e->data); - g_slist_free(l); - lockcookie = FALSE; - g_object_unref(jar); +static 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) { +static void +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 -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 -sigchld(int unused) { - if(signal(SIGCHLD, sigchld) == SIG_ERR) - die("Can't install SIGCHLD handler"); - while(0 < waitpid(-1, NULL, WNOHANG)); -} - -void -setatom(Client *c, Atom a, const char *v) { +static void +setatom(Client *c, int a, const char *v) { XSync(dpy, False); - ignorexprop++; - XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), a, - XA_STRING, 8, PropModeReplace, (unsigned char *)v, - strlen(v) + 1); + XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), + atoms[a], XA_STRING, 8, PropModeReplace, + (unsigned char *)v, strlen(v) + 1); } -void +static void setup(void) { + char *proxy; + char *new_proxy; + SoupURI *puri; SoupSession *s; /* clean up any zombies immediately */ @@ -667,25 +977,49 @@ setup(void) { g_thread_init(NULL); dpy = GDK_DISPLAY(); - session = webkit_get_default_session(); - uriprop = XInternAtom(dpy, "_SURF_URI", False); - findprop = XInternAtom(dpy, "_SURF_FIND", 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(); - cookies = soup_cookie_jar_new(); - soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookies)); - g_signal_connect(cookies, "changed", G_CALLBACK(changecookie), NULL); - reloadcookies(); + + /* 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); + usingproxy = 1; + } +} + +static void +sigchld(int unused) { + if(signal(SIGCHLD, sigchld) == SIG_ERR) + die("Can't install SIGCHLD handler"); + while(0 < waitpid(-1, NULL, WNOHANG)); } -void +static void source(Client *c, const Arg *arg) { Arg a = { .b = FALSE }; gboolean s; @@ -695,25 +1029,7 @@ source(Client *c, const Arg *arg) { reload(c, &a); } -void -find(Client *c, const Arg *arg) { - const char *s; - - s = getatom(c, findprop); - gboolean forward = *(gboolean *)arg; - webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE); -} - -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 +static void spawn(Client *c, const Arg *arg) { if(fork() == 0) { if(dpy) @@ -726,98 +1042,171 @@ spawn(Client *c, const Arg *arg) { } } -void +static void +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], ""); +} + +static void +stop(Client *c, const Arg *arg) { + webkit_web_view_stop_loading(c->view); +} + +static void titlechange(WebKitWebView *v, WebKitWebFrame *f, const char *t, Client *c) { c->title = copystr(&c->title, t); update(c); } -void -usage(void) { - fputs("surf - simple browser\n", stderr); - die("usage: surf [-e Window] [-x] [uri]\n"); +static void +toggle(Client *c, const Arg *arg) { + WebKitWebSettings *settings; + char *name = (char *)arg->v; + gboolean value; + Arg a = { .b = FALSE }; + + settings = webkit_web_view_get_settings(c->view); + g_object_get(G_OBJECT(settings), name, &value, NULL); + g_object_set(G_OBJECT(settings), name, !value, NULL); + + reload(c,&a); +} + +static void +gettogglestat(Client *c){ + gboolean value; + WebKitWebSettings *settings = webkit_web_view_get_settings(c->view); + + g_object_get(G_OBJECT(settings), "enable-caret-browsing", + &value, NULL); + togglestat[0] = value? 'C': 'c'; + + g_object_get(G_OBJECT(settings), "auto-load-images", &value, NULL); + togglestat[1] = value? 'I': 'i'; + + g_object_get(G_OBJECT(settings), "enable-scripts", &value, NULL); + togglestat[2] = value? 'S': 's'; + + g_object_get(G_OBJECT(settings), "enable-plugins", &value, NULL); + togglestat[3] = value? 'V': 'v'; + + togglestat[4] = '\0'; } -void + +static void update(Client *c) { char *t; - if(c->progress != 100) - t = g_strdup_printf("%s [%i%%]", c->title, c->progress); - else if(c->linkhover) - t = g_strdup(c->linkhover); - else - t = g_strdup(c->title); - drawindicator(c); + gettogglestat(c); + + if(c->linkhover) { + t = g_strdup_printf("%s| %s", togglestat, c->linkhover); + } else if(c->progress != 100) { + drawindicator(c); + gtk_widget_show(c->indicator); + t = g_strdup_printf("[%i%%] %s| %s", c->progress, togglestat, + c->title); + } else { + gtk_widget_hide_all(c->indicator); + t = g_strdup_printf("%s| %s", togglestat, c->title); + } + gtk_window_set_title(GTK_WINDOW(c->win), t); g_free(t); - } -void +static void updatewinid(Client *c) { snprintf(winid, LENGTH(winid), "%u", (int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window)); } -void -windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c) { - JSStringRef jsscript; - char *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); - } +static void +usage(void) { + die("usage: %s [-inpsvx] [-c cookiefile] [-e xid] [-r scriptfile]" + " [-t stylefile] [-u useragent] [uri]\n", basename(argv0)); } -void +static void +windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, + JSObjectRef win, Client *c) { + runscript(frame); +} + +static void zoom(Client *c, const Arg *arg) { c->zoomed = TRUE; - if(arg->i < 0) /* zoom out */ + if(arg->i < 0) { + /* zoom out */ webkit_web_view_zoom_out(c->view); - else if(arg->i > 0) /* zoom in */ + } 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 i; +int +main(int argc, char *argv[]) { Arg arg; - progname = argv[0]; + memset(&arg, 0, sizeof(arg)); + /* 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")) { - 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 - usage(); - } - if(i < argc) - arg.v = argv[i]; + ARGBEGIN { + case 'c': + cookiefile = EARGF(usage()); + break; + case 'e': + embed = strtol(EARGF(usage()), NULL, 0); + break; + case 'i': + loadimages = 0; + break; + case 'n': + enableinspector = 0; + break; + case 'p': + enableplugins = 0; + break; + case 'r': + scriptfile = EARGF(usage()); + break; + case 's': + enablescripts = 0; + break; + case 't': + stylefile = EARGF(usage()); + break; + case 'u': + useragent = EARGF(usage()); + break; + case 'v': + die("surf-"VERSION", ©2009-2012 surf engineers, " + "see LICENSE for details\n"); + case 'x': + showxid = TRUE; + break; + default: + usage(); + } ARGEND; + if(argc > 0) + arg.v = argv[0]; + setup(); newclient(); - if(arg.v) { + if(arg.v) loaduri(clients, &arg); - } + gtk_main(); cleanup(); + return EXIT_SUCCESS; } +