X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=faf712fd42f80ac16a4fb396809abf15a2c2e115;hp=7c48bb60ea3fb793941b46f54644ccd86b81caf6;hb=2fb122c01202e7b8f2b31f964daee19b86f4d433;hpb=526b974c33a17b7ef77f4268bd8602e2d51ad1b9 diff --git a/surf.c b/surf.c index 7c48bb6..faf712f 100644 --- a/surf.c +++ b/surf.c @@ -2,40 +2,48 @@ * * To understand surf, start reading main(). */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include -#include +#include #include -#include +#include +#include +#include +#include #include -#include +#include +#include +#include + +#include +#include +#include #include +#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 & (MODKEY|GDK_SHIFT_MASK)) enum { AtomFind, AtomGo, AtomUri, AtomLast }; +enum { + CaretBrowsing, + FrameFlattening, + Geolocation, + JavaScript, + LoadImages, + Plugins, + ScrollBars, +}; + enum { OnDoc = WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT, OnLink = WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK, @@ -47,32 +55,30 @@ enum { OnAny = OnDoc | OnLink | OnImg | OnMedia | OnEdit | OnBar | OnSel, }; -typedef union Arg Arg; -union Arg { - gboolean b; - gint i; +typedef union { + int b; + int i; const void *v; -}; +} Arg; typedef struct Client { GtkWidget *win; - Window xid; WebKitWebView *view; WebKitWebInspector *inspector; WebKitFindController *finder; WebKitHitTestResult *mousepos; GTlsCertificateFlags tlsflags; + Window xid; + int progress, fullscreen; const char *title, *targeturi; const char *needle; - gint progress; struct Client *next; - gboolean fullscreen; } Client; typedef struct { guint mod; guint keyval; - void (*func)(Client *c, const Arg *arg); + void (*func)(Client *c, const Arg *a); const Arg arg; } Key; @@ -91,116 +97,169 @@ typedef struct { regex_t re; } SiteStyle; -static Display *dpy; -static Atom atoms[AtomLast]; -static Client *clients = NULL; -static Window embed = 0; -static gboolean showxid = FALSE; -static char winid[64]; -static char togglestat[9]; -static char pagestat[3]; -static GTlsDatabase *tlsdb; -static int cookiepolicy; -static char *stylefile = NULL; - -static void addaccelgroup(Client *c); +/* Surf */ +static void usage(void); +static void die(const char *errstr, ...); +static void setup(void); +static void sigchld(int unused); static char *buildfile(const char *path); static char *buildpath(const char *path); -static gboolean buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c); -static void cleanup(void); -static void clipboard(Client *c, const Arg *a); - +static Client *newclient(Client *c); +static void addaccelgroup(Client *c); +static void loaduri(Client *c, const Arg *a); +static const char *geturi(Client *c); +static void setatom(Client *c, int a, const char *v); +static const char *getatom(Client *c, int a); +static void updatetitle(Client *c); +static void gettogglestats(Client *c); +static void getpagestats(Client *c); static WebKitCookieAcceptPolicy cookiepolicy_get(void); static char cookiepolicy_set(const WebKitCookieAcceptPolicy p); +static const char *getstyle(const char *uri); +static void setstyle(Client *c, const char *stylefile); +static void runscript(Client *c); +static void evalscript(Client *c, const char *jsstr, ...); +static void updatewinid(Client *c); +static void handleplumb(Client *c, const char *uri); +static void newwindow(Client *c, const Arg *a, int noembed); +static void spawn(Client *c, const Arg *a); +static void destroyclient(Client *c); +static void cleanup(void); -static char *copystr(char **str, const char *src); +/* GTK/WebKit */ +static WebKitWebView *newview(Client *c, WebKitWebView *rv); static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a, - Client *c); + Client *c); +static gboolean buttonreleased(GtkWidget *w, GdkEvent *e, Client *c); +static gboolean keypress(GtkAccelGroup *group, GObject *obj, guint key, + GdkModifierType mods, Client *c); +static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, + gpointer d); +static gboolean winevent(GtkWidget *w, GdkEvent *e, Client *c); +static void showview(WebKitWebView *v, Client *c); +static GtkWidget *createwindow(Client *c); +static void loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c); +static void progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c); +static void titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c); +static void mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, + guint modifiers, Client *c); +static gboolean permissionrequested(WebKitWebView *v, + WebKitPermissionRequest *r, Client *c); static gboolean decidepolicy(WebKitWebView *v, WebKitPolicyDecision *d, - WebKitPolicyDecisionType dt, Client *c); + WebKitPolicyDecisionType dt, Client *c); static void decidenavigation(WebKitPolicyDecision *d, Client *c); static void decidenewwindow(WebKitPolicyDecision *d, Client *c); static void decideresource(WebKitPolicyDecision *d, Client *c); -static void closeview(WebKitWebView *v, Client *c); -static void destroyclient(Client *c); -static void destroywin(GtkWidget* w, Client *c); -static void die(const char *errstr, ...); -static void evalscript(Client *c, const char *jsstr, ...); -static void runscript(Client *c); -static void find(Client *c, const Arg *a); -static void togglefullscreen(Client *c, const Arg *a); -static gboolean permissionrequested(WebKitWebView *v, - WebKitPermissionRequest *r, Client *c); -static const char *getatom(Client *c, int a); -static void gettogglestat(Client *c); -static void getpagestat(Client *c); -static char *geturi(Client *c); -static const gchar *getstyle(const char *uri); -static void setstyle(Client *c, const char *stylefile); - -static void handleplumb(Client *c, const gchar *uri); - static void downloadstarted(WebKitWebContext *wc, WebKitDownload *d, - Client *c); + Client *c); static void responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c); static void download(Client *c, WebKitURIResponse *r); +static void closeview(WebKitWebView *v, Client *c); +static void destroywin(GtkWidget* w, Client *c); -static void toggleinspector(Client *c, const Arg *a); - -static gboolean keypress(GtkAccelGroup *group, GObject *obj, guint key, - GdkModifierType mods, Client *c); -static void mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, - guint modifiers, Client *c); -static void loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c); -static void loaduri(Client *c, const Arg *arg); -static void navigate(Client *c, const Arg *a); -static Client *newclient(Client *c); -static WebKitWebView *newview(Client *c, WebKitWebView *rv); -static void showview(WebKitWebView *v, Client *c); -static void newwindow(Client *c, const Arg *arg, gboolean noembed); -static GtkWidget *createwindow(Client *c); +/* Hotkeys */ static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d); +static void reload(Client *c, const Arg *a); static void print(Client *c, const Arg *a); -static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, - gpointer d); -static gboolean winevent(GtkWidget *w, GdkEvent *e, Client *c); -static void progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c); -static void linkopen(Client *c, const Arg *arg); -static void linkopenembed(Client *c, const Arg *arg); -static void reload(Client *c, const Arg *arg); -static void scroll_h(Client *c, const Arg *a); -static void scroll_v(Client *c, const Arg *a); -static void setatom(Client *c, int a, const char *v); -static void setup(void); -static void sigchld(int unused); -static void spawn(Client *c, const Arg *arg); -static void stop(Client *c, const Arg *arg); -static void titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c); -static void toggle(Client *c, const Arg *arg); -static void togglecookiepolicy(Client *c, const Arg *arg); -static void togglegeolocation(Client *c, const Arg *arg); -static void togglestyle(Client *c, const Arg *arg); -static void updatetitle(Client *c); -static void updatewinid(Client *c); -static void usage(void); +static void clipboard(Client *c, const Arg *a); static void zoom(Client *c, const Arg *a); +static void scroll_v(Client *c, const Arg *a); +static void scroll_h(Client *c, const Arg *a); +static void navigate(Client *c, const Arg *a); +static void stop(Client *c, const Arg *a); +static void toggle(Client *c, const Arg *a); +static void togglefullscreen(Client *c, const Arg *a); +static void togglecookiepolicy(Client *c, const Arg *a); +static void togglestyle(Client *c, const Arg *a); +static void toggleinspector(Client *c, const Arg *a); +static void find(Client *c, const Arg *a); + +/* Buttons */ +static void clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h); +static void clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h); +static void clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h); + +static char winid[64]; +static char togglestats[10]; +static char pagestats[2]; +static Atom atoms[AtomLast]; +static Window embed; +static int showxid; +static int cookiepolicy; +static Display *dpy; +static Client *clients; +static char *stylefile; +static const char *useragent; +char *argv0; /* configuration, allows nested code to access above variables */ #include "config.h" void -addaccelgroup(Client *c) +usage(void) +{ + die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] " + "[-c cookiefile] [-e xid] [-r scriptfile] [-t stylefile] " + "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0)); +} + +void +die(const char *errstr, ...) +{ + va_list ap; + + va_start(ap, errstr); + vfprintf(stderr, errstr, ap); + va_end(ap); + exit(EXIT_FAILURE); +} + +void +setup(void) { int i; - GtkAccelGroup *group = gtk_accel_group_new(); - GClosure *closure; - for (i = 0; i < LENGTH(keys); i++) { - closure = g_cclosure_new(G_CALLBACK(keypress), c, NULL); - gtk_accel_group_connect(group, keys[i].keyval, keys[i].mod, 0, - closure); + /* clean up any zombies immediately */ + sigchld(0); + gtk_init(NULL, NULL); + + dpy = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); + + /* 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 = buildfile(cookiefile); + scriptfile = buildfile(scriptfile); + cachedir = buildpath(cachedir); + + if (!stylefile) { + styledir = buildpath(styledir); + for (i = 0; i < LENGTH(styles); ++i) { + if (regcomp(&(styles[i].re), styles[i].regex, + REG_EXTENDED)) { + fprintf(stderr, + "Could not compile regex: %s\n", + styles[i].regex); + styles[i].regex = NULL; + } + styles[i].style = g_strconcat(styledir, "/", + styles[i].style, NULL); + } + g_free(styledir); + } else { + stylefile = buildfile(stylefile); } - gtk_window_add_accel_group(GTK_WINDOW(c->win), group); +} + +void +sigchld(int unused) +{ + if (signal(SIGCHLD, sigchld) == SIG_ERR) + die("Can't install SIGCHLD handler"); + while (0 < waitpid(-1, NULL, WNOHANG)); } char * @@ -265,479 +324,513 @@ buildpath(const char *path) return fpath; } -gboolean -buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c) +Client * +newclient(Client *rc) { - WebKitHitTestResultContext element; - GdkEventButton *eb = (GdkEventButton*)e; - int i; + Client *c; - element = webkit_hit_test_result_get_context(c->mousepos); + if (!(c = calloc(1, sizeof(Client)))) + die("Cannot malloc!\n"); - for (i = 0; i < LENGTH(buttons); ++i) { - if (element & buttons[i].target && - eb->button == buttons[i].button && - CLEANMASK(eb->state) == CLEANMASK(buttons[i].mask) && - buttons[i].func) { - buttons[i].func(c, &buttons[i].arg, c->mousepos); - return buttons[i].stopevent; - } - } + c->title = NULL; + c->progress = 100; - return FALSE; + c->next = clients; + clients = c; + + c->view = newview(c, rc ? rc->view : NULL); + c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1; + + return c; } void -cleanup(void) +addaccelgroup(Client *c) { - while (clients) - destroyclient(clients); - g_free(cookiefile); - g_free(scriptfile); - g_free(stylefile); - g_free(cachedir); -} + int i; + GtkAccelGroup *group = gtk_accel_group_new(); + GClosure *closure; -WebKitCookieAcceptPolicy -cookiepolicy_get(void) -{ - switch (cookiepolicies[cookiepolicy]) { - case 'a': - return WEBKIT_COOKIE_POLICY_ACCEPT_NEVER; - case '@': - return WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY; - case 'A': - default: - break; + for (i = 0; i < LENGTH(keys); i++) { + closure = g_cclosure_new(G_CALLBACK(keypress), c, NULL); + gtk_accel_group_connect(group, keys[i].keyval, keys[i].mod, 0, + closure); } - - return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS; + gtk_window_add_accel_group(GTK_WINDOW(c->win), group); } -char -cookiepolicy_set(const WebKitCookieAcceptPolicy ep) +void +loaduri(Client *c, const Arg *a) { - switch (ep) { - case WEBKIT_COOKIE_POLICY_ACCEPT_NEVER: - return 'a'; - case WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY: - return '@'; - case WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS: - default: - break; - } + struct stat st; + char *url, *path; + const char *uri = a->v; - return 'A'; -} + if (g_strcmp0(uri, "") == 0) + return; -void -evalscript(Client *c, const char *jsstr, ...) -{ - va_list ap; - gchar *script; + if (g_strrstr(uri, "://") || g_str_has_prefix(uri, "about:")) { + url = g_strdup(uri); + } else if (!stat(uri, &st) && (path = realpath(uri, NULL))) { + url = g_strdup_printf("file://%s", path); + free(path); + } else { + url = g_strdup_printf("http://%s", uri); + } - va_start(ap, jsstr); - script = g_strdup_vprintf(jsstr, ap); - va_end(ap); + setatom(c, AtomUri, url); - webkit_web_view_run_javascript(c->view, script, NULL, NULL, NULL); - g_free(script); + if (strcmp(url, geturi(c)) == 0) { + reload(c, a); + } else { + webkit_web_view_load_uri(c->view, url); + c->title = geturi(c); + updatetitle(c); + } + + g_free(url); } -void -runscript(Client *c) +const char * +geturi(Client *c) { - gchar *script; - gsize l; + const char *uri; - if (g_file_get_contents(scriptfile, &script, &l, NULL) && l) - evalscript(c, script); - g_free(script); + if (!(uri = webkit_web_view_get_uri(c->view))) + uri = "about:blank"; + return uri; } void -clipboard(Client *c, const Arg *a) +setatom(Client *c, int a, const char *v) { - if (a->b) { /* load clipboard uri */ - gtk_clipboard_request_text(gtk_clipboard_get( - GDK_SELECTION_PRIMARY), - pasteuri, c); - } else { /* copy uri */ - gtk_clipboard_set_text(gtk_clipboard_get( - GDK_SELECTION_PRIMARY), c->targeturi - ? c->targeturi : geturi(c), -1); - } + XSync(dpy, False); + XChangeProperty(dpy, c->xid, + atoms[a], XA_STRING, 8, PropModeReplace, + (unsigned char *)v, strlen(v) + 1); } -char * -copystr(char **str, const char *src) +const char * +getatom(Client *c, int a) { - char *tmp; - tmp = g_strdup(src); + static char buf[BUFSIZ]; + Atom adummy; + int idummy; + unsigned long ldummy; + unsigned char *p = NULL; - if (str && *str) { - g_free(*str); - *str = tmp; - } - return tmp; + XGetWindowProperty(dpy, c->xid, 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; } -GtkWidget * -createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c) +void +updatetitle(Client *c) { - Client *n; + char *title; - switch (webkit_navigation_action_get_navigation_type(a)) { - case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */ - /* - * popup windows of type “other” are almost always triggered - * by user gesture, so inverse the logic here - */ -/* instead of this, compare destination uri to mouse-over uri for validating window */ - if (webkit_navigation_action_is_user_gesture(a)) { - return NULL; - break; + if (showindicators) { + gettogglestats(c); + getpagestats(c); + + if (c->progress != 100) { + title = g_strdup_printf("[%i%%] %s:%s | %s", + c->progress, togglestats, pagestats, + c->targeturi ? c->targeturi : c->title); + } else { + title = g_strdup_printf("%s:%s | %s", + togglestats, pagestats, + c->targeturi ? c->targeturi : c->title); } - case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: /* fallthrough */ - case WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED: /* fallthrough */ - case WEBKIT_NAVIGATION_TYPE_BACK_FORWARD: /* fallthrough */ - case WEBKIT_NAVIGATION_TYPE_RELOAD: /* fallthrough */ - case WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED: - n = newclient(c); - break; - default: - return NULL; - break; - } - return GTK_WIDGET(n->view); + gtk_window_set_title(GTK_WINDOW(c->win), title); + g_free(title); + } else { + gtk_window_set_title(GTK_WINDOW(c->win), c->title ? + c->title : ""); + } } -gboolean -decidepolicy(WebKitWebView *v, WebKitPolicyDecision *d, - WebKitPolicyDecisionType dt, Client *c) +void +gettogglestats(Client *c) { - switch (dt) { - case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION: - decidenavigation(d, c); - break; - case WEBKIT_POLICY_DECISION_TYPE_NEW_WINDOW_ACTION: - decidenewwindow(d, c); - break; - case WEBKIT_POLICY_DECISION_TYPE_RESPONSE: - decideresource(d, c); - break; - default: - webkit_policy_decision_ignore(d); - break; - } - return TRUE; + togglestats[0] = cookiepolicy_set(cookiepolicy_get()); + togglestats[1] = enablecaretbrowsing ? 'C' : 'c'; + togglestats[2] = allowgeolocation ? 'G' : 'g'; + togglestats[3] = enablecache ? 'D' : 'd'; + togglestats[4] = loadimages ? 'I' : 'i'; + togglestats[5] = enablescripts ? 'S' : 's'; + togglestats[6] = enableplugins ? 'V' : 'v'; + togglestats[7] = enablestyle ? 'M' : 'm'; + togglestats[8] = enableframeflattening ? 'F' : 'f'; + togglestats[9] = '\0'; } void -decidenavigation(WebKitPolicyDecision *d, Client *c) +getpagestats(Client *c) { - WebKitNavigationAction *a; - - a = webkit_navigation_policy_decision_get_navigation_action( - WEBKIT_NAVIGATION_POLICY_DECISION(d)); + pagestats[0] = c->tlsflags > G_TLS_CERTIFICATE_VALIDATE_ALL ? '-' : + c->tlsflags > 0 ? 'U' : 'T'; + pagestats[1] = '\0'; +} - switch (webkit_navigation_action_get_navigation_type(a)) { - case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: /* fallthrough */ - case WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED: /* fallthrough */ - case WEBKIT_NAVIGATION_TYPE_BACK_FORWARD: /* fallthrough */ - case WEBKIT_NAVIGATION_TYPE_RELOAD: /* fallthrough */ - case WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED: - case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */ +WebKitCookieAcceptPolicy +cookiepolicy_get(void) +{ + switch (cookiepolicies[cookiepolicy]) { + case 'a': + return WEBKIT_COOKIE_POLICY_ACCEPT_NEVER; + case '@': + return WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY; + case 'A': default: - /* Do not navigate to links with a "_blank" target (popup) */ - if (webkit_navigation_policy_decision_get_frame_name( - WEBKIT_NAVIGATION_POLICY_DECISION(d))) { - webkit_policy_decision_ignore(d); - } else { - /* Filter out navigation to different domain ? */ - /* get action→urirequest, copy and load in new window+view - * on Ctrl+Click ? */ - webkit_policy_decision_use(d); - } break; } + + return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS; } -void -decidenewwindow(WebKitPolicyDecision *d, Client *c) +char +cookiepolicy_set(const WebKitCookieAcceptPolicy p) { - WebKitNavigationAction *a; - Arg arg; - - a = webkit_navigation_policy_decision_get_navigation_action( - WEBKIT_NAVIGATION_POLICY_DECISION(d)); - - switch (webkit_navigation_action_get_navigation_type(a)) { - case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: /* fallthrough */ - case WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED: /* fallthrough */ - case WEBKIT_NAVIGATION_TYPE_BACK_FORWARD: /* fallthrough */ - case WEBKIT_NAVIGATION_TYPE_RELOAD: /* fallthrough */ - case WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED: - /* Filter domains here */ -/* If the value of “mouse-button” is not 0, then the navigation was triggered by a mouse event. - * test for link clicked but no button ? */ - arg.v = webkit_uri_request_get_uri( - webkit_navigation_action_get_request(a)); - newwindow(c, &arg, 0); - break; - case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */ + switch (p) { + case WEBKIT_COOKIE_POLICY_ACCEPT_NEVER: + return 'a'; + case WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY: + return '@'; + case WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS: default: break; } - webkit_policy_decision_ignore(d); + return 'A'; } -void -decideresource(WebKitPolicyDecision *d, Client *c) +const char * +getstyle(const char *uri) { - const gchar *uri; - int i, isascii = 1; - WebKitResponsePolicyDecision *r = WEBKIT_RESPONSE_POLICY_DECISION(d); - WebKitURIResponse *res; - - res = webkit_response_policy_decision_get_response(r); - uri = webkit_uri_response_get_uri(res); + int i; - if (g_str_has_suffix(uri, "/favicon.ico")) - webkit_uri_request_set_uri( - webkit_response_policy_decision_get_request(r), - "about:blank"); + if (stylefile) + return stylefile; - if (!g_str_has_prefix(uri, "http://") - && !g_str_has_prefix(uri, "https://") - && !g_str_has_prefix(uri, "about:") - && !g_str_has_prefix(uri, "file://") - && !g_str_has_prefix(uri, "data:") - && !g_str_has_prefix(uri, "blob:") - && strlen(uri) > 0) { - for (i = 0; i < strlen(uri); i++) { - if (!g_ascii_isprint(uri[i])) { - isascii = 0; - break; - } - } - if (isascii) { - handleplumb(c, uri); - webkit_policy_decision_ignore(d); - } + for (i = 0; i < LENGTH(styles); ++i) { + if (styles[i].regex && + !regexec(&(styles[i].re), uri, 0, NULL, 0)) + return styles[i].style; } - if (webkit_response_policy_decision_is_mime_type_supported(r)) { - webkit_policy_decision_use(d); - } else { - webkit_policy_decision_ignore(d); - download(c, res); - } + return ""; } void -destroyclient(Client *c) +setstyle(Client *c, const char *stylefile) { - Client *p; + gchar *style; - webkit_web_view_stop_loading(c->view); - /* Not needed, has already been called - gtk_widget_destroy(c->win); - */ + if (!g_file_get_contents(stylefile, &style, NULL, NULL)) { + fprintf(stderr, "Could not read style file: %s\n", stylefile); + return; + } - for (p = clients; p && p->next != c; p = p->next) - ; - if (p) - p->next = c->next; - else - clients = c->next; - free(c); + webkit_user_content_manager_add_style_sheet( + webkit_web_view_get_user_content_manager(c->view), + webkit_user_style_sheet_new(style, + WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES, + WEBKIT_USER_STYLE_LEVEL_USER, + NULL, NULL)); + + g_free(style); } void -closeview(WebKitWebView *v, Client *c) +runscript(Client *c) { - gtk_widget_destroy(c->win); + gchar *script; + gsize l; + + if (g_file_get_contents(scriptfile, &script, &l, NULL) && l) + evalscript(c, script); + g_free(script); } void -destroywin(GtkWidget* w, Client *c) -{ - destroyclient(c); - if (clients == NULL) - gtk_main_quit(); -} - -void -die(const char *errstr, ...) +evalscript(Client *c, const char *jsstr, ...) { va_list ap; + gchar *script; - va_start(ap, errstr); - vfprintf(stderr, errstr, ap); + va_start(ap, jsstr); + script = g_strdup_vprintf(jsstr, ap); va_end(ap); - exit(EXIT_FAILURE); + + webkit_web_view_run_javascript(c->view, script, NULL, NULL, NULL); + g_free(script); } void -find(Client *c, const Arg *a) +updatewinid(Client *c) { - const char *s, *f; - - if (a && a->i) { - if (a->i > 0) - webkit_find_controller_search_next(c->finder); - else - webkit_find_controller_search_previous(c->finder); - } else { - s = getatom(c, AtomFind); - f = webkit_find_controller_get_search_text(c->finder); - - if (g_strcmp0(f, s) == 0) /* reset search */ - webkit_find_controller_search(c->finder, "", findopts, G_MAXUINT); - - webkit_find_controller_search(c->finder, s, findopts, G_MAXUINT); - - if (strcmp(s, "") == 0) - webkit_find_controller_search_finish(c->finder); - } + snprintf(winid, LENGTH(winid), "%lu", c->xid); } void -togglefullscreen(Client *c, const Arg *a) +handleplumb(Client *c, const char *uri) { - /* toggling value is handled in winevent() */ - if (c->fullscreen) - gtk_window_unfullscreen(GTK_WINDOW(c->win)); - else - gtk_window_fullscreen(GTK_WINDOW(c->win)); + Arg a = (Arg)PLUMB(uri); + spawn(c, &a); } -gboolean -permissionrequested(WebKitWebView *v, WebKitPermissionRequest *r, Client *c) +void +newwindow(Client *c, const Arg *a, int noembed) { - if (WEBKIT_IS_GEOLOCATION_PERMISSION_REQUEST(r)) { - if (allowgeolocation) - webkit_permission_request_allow(r); - else - webkit_permission_request_deny(r); - return TRUE; + int i = 0; + char tmp[64]; + const char *cmd[26], *uri; + const Arg arg = { .v = cmd }; + + cmd[i++] = argv0; + cmd[i++] = "-a"; + cmd[i++] = cookiepolicies; + cmd[i++] = enablescrollbars ? "-B" : "-b"; + if (cookiefile && g_strcmp0(cookiefile, "")) { + cmd[i++] = "-c"; + cmd[i++] = cookiefile; } + cmd[i++] = enablecache ? "-D" : "-d"; + if (embed && !noembed) { + cmd[i++] = "-e"; + snprintf(tmp, LENGTH(tmp), "%lu", embed); + cmd[i++] = tmp; + } + cmd[i++] = runinfullscreen ? "-F" : "-f"; + cmd[i++] = allowgeolocation ? "-G" : "-g"; + cmd[i++] = loadimages ? "-I" : "-i"; + cmd[i++] = kioskmode ? "-K" : "-k"; + cmd[i++] = enablestyle ? "-M" : "-m"; + cmd[i++] = enableinspector ? "-N" : "-n"; + cmd[i++] = enableplugins ? "-P" : "-p"; + if (scriptfile && g_strcmp0(scriptfile, "")) { + cmd[i++] = "-r"; + cmd[i++] = scriptfile; + } + cmd[i++] = enablescripts ? "-S" : "-s"; + if (stylefile && g_strcmp0(stylefile, "")) { + cmd[i++] = "-t"; + cmd[i++] = stylefile; + } + if (fulluseragent && g_strcmp0(fulluseragent, "")) { + cmd[i++] = "-u"; + cmd[i++] = fulluseragent; + } + if (showxid) + cmd[i++] = "-x"; + /* do not keep zoom level */ + cmd[i++] = "--"; + if ((uri = a->v)) + cmd[i++] = uri; + cmd[i] = NULL; - return FALSE; + spawn(c, &arg); } -const char * -getatom(Client *c, int a) +void +spawn(Client *c, const Arg *a) { - static char buf[BUFSIZ]; - Atom adummy; - int idummy; - unsigned long ldummy; - unsigned char *p = NULL; + if (fork() == 0) { + if (dpy) + close(ConnectionNumber(dpy)); + setsid(); + execvp(((char **)a->v)[0], (char **)a->v); + fprintf(stderr, "surf: execvp %s", ((char **)a->v)[0]); + perror(" failed"); + exit(0); + } +} + +void +destroyclient(Client *c) +{ + Client *p; - XGetWindowProperty(dpy, c->xid, - atoms[a], 0L, BUFSIZ, False, XA_STRING, - &adummy, &idummy, &ldummy, &ldummy, &p); + webkit_web_view_stop_loading(c->view); + /* Not needed, has already been called + gtk_widget_destroy(c->win); + */ + + for (p = clients; p && p->next != c; p = p->next) + ; if (p) - strncpy(buf, (char *)p, LENGTH(buf)-1); + p->next = c->next; else - buf[0] = '\0'; - XFree(p); - - return buf; + clients = c->next; + free(c); } -char * -geturi(Client *c) +void +cleanup(void) { - char *uri; - - if (!(uri = (char *)webkit_web_view_get_uri(c->view))) - uri = "about:blank"; - return uri; + while (clients) + destroyclient(clients); + g_free(cookiefile); + g_free(scriptfile); + g_free(stylefile); + g_free(cachedir); } -const gchar * -getstyle(const char *uri) +WebKitWebView * +newview(Client *c, WebKitWebView *rv) { - int i; + WebKitWebView *v; + WebKitSettings *settings; + WebKitUserContentManager *contentmanager; + WebKitWebContext *context; - if (stylefile != NULL) - return stylefile; + /* Webview */ + if (rv) { + v = WEBKIT_WEB_VIEW( + webkit_web_view_new_with_related_view(rv)); + } else { + settings = webkit_settings_new_with_settings( + "auto-load-images", loadimages, + "default-font-size", defaultfontsize, + "enable-caret-browsing", enablecaretbrowsing, + "enable-developer-extras", enableinspector, + "enable-dns-prefetching", enablednsprefetching, + "enable-frame-flattening", enableframeflattening, + "enable-html5-database", enablecache, + "enable-html5-local-storage", enablecache, + "enable-javascript", enablescripts, + "enable-plugins", enableplugins, + NULL); +/* For mor interesting settings, have a look at + * http://webkitgtk.org/reference/webkit2gtk/stable/WebKitSettings.html */ + + if (strcmp(fulluseragent, "")) { + webkit_settings_set_user_agent(settings, fulluseragent); + } else if (surfuseragent) { + webkit_settings_set_user_agent_with_application_details( + settings, "Surf", VERSION); + } + useragent = webkit_settings_get_user_agent(settings); - for (i = 0; i < LENGTH(styles); i++) { - if (styles[i].regex && !regexec(&(styles[i].re), uri, 0, - NULL, 0)) - return styles[i].style; - } + contentmanager = webkit_user_content_manager_new(); - return ""; -} + context = webkit_web_context_new_with_website_data_manager( + webkit_website_data_manager_new( + "base-cache-directory", cachedir, + "base-data-directory", cachedir, + NULL)); -void -setstyle(Client *c, const char *stylefile) -{ - gchar *style; + /* rendering process model, can be a shared unique one + * or one for each view */ + webkit_web_context_set_process_model(context, + WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES); + /* ssl */ + webkit_web_context_set_tls_errors_policy(context, strictssl ? + WEBKIT_TLS_ERRORS_POLICY_FAIL : + WEBKIT_TLS_ERRORS_POLICY_IGNORE); + /* disk cache */ + webkit_web_context_set_cache_model(context, enablecache ? + WEBKIT_CACHE_MODEL_WEB_BROWSER : + WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER); - if (!g_file_get_contents(stylefile, &style, NULL, NULL)) { - fprintf(stderr, "Could not read style file: %s\n", stylefile); - return; - } + /* Currently only works with text file to be compatible with curl */ + webkit_cookie_manager_set_persistent_storage( + webkit_web_context_get_cookie_manager(context), cookiefile, + WEBKIT_COOKIE_PERSISTENT_STORAGE_TEXT); + /* cookie policy */ + webkit_cookie_manager_set_accept_policy( + webkit_web_context_get_cookie_manager(context), + cookiepolicy_get()); - webkit_user_content_manager_add_style_sheet( - webkit_web_view_get_user_content_manager(c->view), - webkit_user_style_sheet_new(style, - WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES, - WEBKIT_USER_STYLE_LEVEL_USER, - NULL, NULL)); + g_signal_connect(G_OBJECT(context), "download-started", + G_CALLBACK(downloadstarted), c); - g_free(style); -} + v = g_object_new(WEBKIT_TYPE_WEB_VIEW, + "settings", settings, + "user-content-manager", contentmanager, + "web-context", context, + NULL); + } -void -handleplumb(Client *c, const gchar *uri) -{ - Arg arg; + g_signal_connect(G_OBJECT(v), "notify::title", + G_CALLBACK(titlechanged), c); + g_signal_connect(G_OBJECT(v), "mouse-target-changed", + G_CALLBACK(mousetargetchanged), c); + g_signal_connect(G_OBJECT(v), "permission-request", + G_CALLBACK(permissionrequested), c); + g_signal_connect(G_OBJECT(v), "create", + G_CALLBACK(createview), c); + g_signal_connect(G_OBJECT(v), "ready-to-show", + G_CALLBACK(showview), c); + g_signal_connect(G_OBJECT(v), "decide-policy", + G_CALLBACK(decidepolicy), c); + g_signal_connect(G_OBJECT(v), "load-changed", + G_CALLBACK(loadchanged), c); + g_signal_connect(G_OBJECT(v), "notify::estimated-load-progress", + G_CALLBACK(progresschanged), c); + g_signal_connect(G_OBJECT(v), "button-release-event", + G_CALLBACK(buttonreleased), c); + g_signal_connect(G_OBJECT(v), "close", + G_CALLBACK(closeview), c); - arg = (Arg)PLUMB(uri); - spawn(c, &arg); + return v; } -void -downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c) +GtkWidget * +createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c) { - g_signal_connect(G_OBJECT(d), "notify::response", - G_CALLBACK(responsereceived), c); -} + Client *n; -void -responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c) -{ - download(c, webkit_download_get_response(d)); - webkit_download_cancel(d); + switch (webkit_navigation_action_get_navigation_type(a)) { + case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */ + /* + * popup windows of type “other” are almost always triggered + * by user gesture, so inverse the logic here + */ +/* instead of this, compare destination uri to mouse-over uri for validating window */ + if (webkit_navigation_action_is_user_gesture(a)) + return NULL; + case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_BACK_FORWARD: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_RELOAD: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED: + n = newclient(c); + break; + default: + return NULL; + } + + return GTK_WIDGET(n->view); } -void -download(Client *c, WebKitURIResponse *r) +gboolean +buttonreleased(GtkWidget *w, GdkEvent *e, Client *c) { - Arg a; + WebKitHitTestResultContext element; + int i; - a = (Arg)DOWNLOAD(webkit_uri_response_get_uri(r), geturi(c)); - spawn(c, &a); -} + element = webkit_hit_test_result_get_context(c->mousepos); -void -toggleinspector(Client *c, const Arg *a) -{ - if (enableinspector) { - if (webkit_web_inspector_is_attached(c->inspector)) - webkit_web_inspector_close(c->inspector); - else - webkit_web_inspector_show(c->inspector); + for (i = 0; i < LENGTH(buttons); ++i) { + if (element & buttons[i].target && + e->button.button == buttons[i].button && + CLEANMASK(e->button.state) == CLEANMASK(buttons[i].mask) && + buttons[i].func) { + buttons[i].func(c, &buttons[i].arg, c->mousepos); + return buttons[i].stopevent; + } } + + return FALSE; } gboolean @@ -762,26 +855,134 @@ keypress(GtkAccelGroup *group, GObject *obj, guint key, GdkModifierType mods, return processed; } -void -mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, guint modifiers, - Client *c) +GdkFilterReturn +processx(GdkXEvent *e, GdkEvent *event, gpointer d) { - WebKitHitTestResultContext hc; + Client *c = (Client *)d; + XPropertyEvent *ev; + Arg a; - /* Keep the hit test to know where is the pointer on the next click */ - c->mousepos = h; + if (((XEvent *)e)->type == PropertyNotify) { + ev = &((XEvent *)e)->xproperty; + if (ev->state == PropertyNewValue) { + if (ev->atom == atoms[AtomFind]) { + find(c, NULL); - hc = webkit_hit_test_result_get_context(h); + return GDK_FILTER_REMOVE; + } else if (ev->atom == atoms[AtomGo]) { + a.v = getatom(c, AtomGo); + loaduri(c, &a); - if (hc & OnLink) - c->targeturi = webkit_hit_test_result_get_link_uri(h); - else if (hc & OnImg) - c->targeturi = webkit_hit_test_result_get_image_uri(h); - else if (hc & OnMedia) - c->targeturi = webkit_hit_test_result_get_media_uri(h); - else + return GDK_FILTER_REMOVE; + } + } + } + return GDK_FILTER_CONTINUE; +} + +gboolean +winevent(GtkWidget *w, GdkEvent *e, Client *c) +{ + switch (e->type) { + case GDK_LEAVE_NOTIFY: c->targeturi = NULL; - updatetitle(c); + updatetitle(c); + break; + case GDK_WINDOW_STATE: /* fallthrough */ + if (e->window_state.changed_mask == + GDK_WINDOW_STATE_FULLSCREEN) { + c->fullscreen = e->window_state.new_window_state & + GDK_WINDOW_STATE_FULLSCREEN; + break; + } + default: + return FALSE; + } + + return TRUE; +} + +void +showview(WebKitWebView *v, Client *c) +{ + GdkGeometry hints = { 1, 1 }; + GdkRGBA bgcolor = { 0 }; + GdkWindow *gwin; + + c->finder = webkit_web_view_get_find_controller(c->view); + if (enableinspector) + c->inspector = webkit_web_view_get_inspector(c->view); + + c->win = createwindow(c); + + gtk_container_add(GTK_CONTAINER(c->win), GTK_WIDGET(c->view)); + gtk_window_set_geometry_hints(GTK_WINDOW(c->win), NULL, &hints, + GDK_HINT_MIN_SIZE); + gtk_widget_show_all(c->win); + gtk_widget_grab_focus(GTK_WIDGET(c->view)); + + gwin = gtk_widget_get_window(GTK_WIDGET(c->win)); + c->xid = gdk_x11_window_get_xid(gwin); + updatewinid(c); + if (showxid) { + gdk_display_sync(gtk_widget_get_display(c->win)); + puts(winid); + } + + if (hidebackground) + webkit_web_view_set_background_color(c->view, &bgcolor); + + if (!kioskmode) { + addaccelgroup(c); + gdk_window_set_events(gwin, GDK_ALL_EVENTS_MASK); + gdk_window_add_filter(gwin, processx, c); + } + + if (runinfullscreen) + togglefullscreen(c, NULL); + + if (zoomlevel != 1.0) + webkit_web_view_set_zoom_level(c->view, zoomlevel); + + setatom(c, AtomFind, ""); + setatom(c, AtomUri, "about:blank"); +} + +GtkWidget * +createwindow(Client *c) +{ + GtkWidget *w; + + if (embed) { + w = gtk_plug_new(embed); + } else { + w = gtk_window_new(GTK_WINDOW_TOPLEVEL); + + /* 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(w), "surf", "Surf"); + + /* TA: 20091214: And set the role here as well -- so that + * sessions can pick this up. + */ + gtk_window_set_role(GTK_WINDOW(w), "Surf"); + + gtk_window_set_default_size(GTK_WINDOW(w), 800, 600); + } + + g_signal_connect(G_OBJECT(w), "destroy", + G_CALLBACK(destroywin), c); + g_signal_connect(G_OBJECT(w), "leave-notify-event", + G_CALLBACK(winevent), c); + g_signal_connect(G_OBJECT(w), "window-state-event", + G_CALLBACK(winevent), c); + + return w; } void @@ -795,7 +996,8 @@ loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c) setatom(c, AtomUri, geturi(c)); break; case WEBKIT_LOAD_COMMITTED: - if (!webkit_web_view_get_tls_info(c->view, NULL, &(c->tlsflags))) + if (!webkit_web_view_get_tls_info(c->view, NULL, + &(c->tlsflags))) c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1; setatom(c, AtomUri, geturi(c)); @@ -816,512 +1018,350 @@ loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c) } void -loaduri(Client *c, const Arg *arg) +progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c) { - char *u = NULL, *rp; - const char *uri = (char *)arg->v; - Arg a = { .b = FALSE }; - struct stat st; - - if (strcmp(uri, "") == 0) - return; - - /* In case it's a file path. */ - if (stat(uri, &st) == 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); - } - - setatom(c, AtomUri, uri); - - /* prevents endless loop */ - if (strcmp(u, geturi(c)) == 0) { - reload(c, &a); - } else { - webkit_web_view_load_uri(c->view, u); - c->progress = 0; - c->title = copystr(&c->title, u); - updatetitle(c); - } - g_free(u); + c->progress = webkit_web_view_get_estimated_load_progress(c->view) * + 100; + updatetitle(c); } void -navigate(Client *c, const Arg *a) +titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c) { - if (a->i < 0) - webkit_web_view_go_back(c->view); - else if (a->i > 0) - webkit_web_view_go_forward(c->view); + c->title = webkit_web_view_get_title(c->view); + updatetitle(c); } -Client * -newclient(Client *rc) +void +mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, guint modifiers, + Client *c) { - Client *c; - gdouble dpi; - - if (!(c = calloc(1, sizeof(Client)))) - die("Cannot malloc!\n"); - - c->title = NULL; - c->progress = 100; - - c->next = clients; - clients = c; + WebKitHitTestResultContext hc = webkit_hit_test_result_get_context(h); - c->view = newview(c, rc ? rc->view : NULL); - c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1; + /* Keep the hit test to know where is the pointer on the next click */ + c->mousepos = h; - return c; + if (hc & OnLink) + c->targeturi = webkit_hit_test_result_get_link_uri(h); + else if (hc & OnImg) + c->targeturi = webkit_hit_test_result_get_image_uri(h); + else if (hc & OnMedia) + c->targeturi = webkit_hit_test_result_get_media_uri(h); + else + c->targeturi = NULL; + updatetitle(c); } -WebKitWebView * -newview(Client *c, WebKitWebView *rv) +gboolean +permissionrequested(WebKitWebView *v, WebKitPermissionRequest *r, Client *c) { - WebKitWebView *v; - WebKitSettings *settings; - WebKitUserContentManager *contentmanager; - WebKitWebContext *context; - char *ua; - - /* Webview */ - if (rv) { - v = WEBKIT_WEB_VIEW( - webkit_web_view_new_with_related_view(rv)); - } else { - settings = webkit_settings_new_with_settings( - "auto-load-images", loadimages, - "default-font-size", defaultfontsize, - "enable-caret-browsing", enablecaretbrowsing, - "enable-developer-extras", enableinspector, - "enable-dns-prefetching", enablednsprefetching, - "enable-frame-flattening", enableframeflattening, - "enable-html5-database", enablecache, - "enable-html5-local-storage", enablecache, - "enable-javascript", enablescripts, - "enable-plugins", enableplugins, - NULL); - if (!(ua = getenv("SURF_USERAGENT"))) - ua = useragent; - webkit_settings_set_user_agent(settings, ua); - /* Have a look at http://webkitgtk.org/reference/webkit2gtk/stable/WebKitSettings.html - * for more interesting settings */ - - contentmanager = webkit_user_content_manager_new(); - - context = webkit_web_context_new_with_website_data_manager( - webkit_website_data_manager_new( - "base-cache-directory", cachedir, - "base-data-directory", cachedir, - NULL)); - - /* rendering process model, can be a shared unique one or one for each - * view */ - webkit_web_context_set_process_model(context, - WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES); - /* ssl */ - webkit_web_context_set_tls_errors_policy(context, strictssl ? - WEBKIT_TLS_ERRORS_POLICY_FAIL : WEBKIT_TLS_ERRORS_POLICY_IGNORE); - /* disk cache */ - webkit_web_context_set_cache_model(context, enablecache ? - WEBKIT_CACHE_MODEL_WEB_BROWSER : WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER); - - /* Currently only works with text file to be compatible with curl */ - webkit_cookie_manager_set_persistent_storage( - webkit_web_context_get_cookie_manager(context), cookiefile, - WEBKIT_COOKIE_PERSISTENT_STORAGE_TEXT); - /* cookie policy */ - webkit_cookie_manager_set_accept_policy( - webkit_web_context_get_cookie_manager(context), - cookiepolicy_get()); - - g_signal_connect(G_OBJECT(context), "download-started", - G_CALLBACK(downloadstarted), c); - - v = g_object_new(WEBKIT_TYPE_WEB_VIEW, - "settings", settings, - "user-content-manager", contentmanager, - "web-context", context, - NULL); + if (WEBKIT_IS_GEOLOCATION_PERMISSION_REQUEST(r)) { + if (allowgeolocation) + webkit_permission_request_allow(r); + else + webkit_permission_request_deny(r); + return TRUE; } - g_signal_connect(G_OBJECT(v), - "notify::title", - G_CALLBACK(titlechanged), c); - g_signal_connect(G_OBJECT(v), - "mouse-target-changed", - G_CALLBACK(mousetargetchanged), c); - g_signal_connect(G_OBJECT(v), - "permission-request", - G_CALLBACK(permissionrequested), c); - g_signal_connect(G_OBJECT(v), - "create", - G_CALLBACK(createview), c); - g_signal_connect(G_OBJECT(v), "ready-to-show", - G_CALLBACK(showview), c); - g_signal_connect(G_OBJECT(v), - "decide-policy", - G_CALLBACK(decidepolicy), c); - g_signal_connect(G_OBJECT(v), - "load-changed", - G_CALLBACK(loadchanged), c); - g_signal_connect(G_OBJECT(v), - "notify::estimated-load-progress", - G_CALLBACK(progresschanged), c); - g_signal_connect(G_OBJECT(v), - "button-release-event", - G_CALLBACK(buttonreleased), c); - g_signal_connect(G_OBJECT(v), "close", - G_CALLBACK(closeview), c); + return FALSE; +} - return v; +gboolean +decidepolicy(WebKitWebView *v, WebKitPolicyDecision *d, + WebKitPolicyDecisionType dt, Client *c) +{ + switch (dt) { + case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION: + decidenavigation(d, c); + break; + case WEBKIT_POLICY_DECISION_TYPE_NEW_WINDOW_ACTION: + decidenewwindow(d, c); + break; + case WEBKIT_POLICY_DECISION_TYPE_RESPONSE: + decideresource(d, c); + break; + default: + webkit_policy_decision_ignore(d); + break; + } + return TRUE; } void -showview(WebKitWebView *v, Client *c) +decidenavigation(WebKitPolicyDecision *d, Client *c) { - GdkGeometry hints = { 1, 1 }; - GdkRGBA bgcolor = { 0 }; - GdkWindow *gwin; - - c->win = createwindow(c); - - if (enableinspector) - c->inspector = webkit_web_view_get_inspector(c->view); - - c->finder = webkit_web_view_get_find_controller(c->view); - - if (!kioskmode) - addaccelgroup(c); - - /* Arranging */ - gtk_container_add(GTK_CONTAINER(c->win), GTK_WIDGET(c->view)); - - /* Setup */ - gtk_widget_grab_focus(GTK_WIDGET(c->view)); - gtk_widget_show(GTK_WIDGET(c->view)); - gtk_widget_show(c->win); - gwin = gtk_widget_get_window(GTK_WIDGET(c->win)); - c->xid = gdk_x11_window_get_xid(gwin); - gtk_window_set_geometry_hints(GTK_WINDOW(c->win), NULL, &hints, - GDK_HINT_MIN_SIZE); - gdk_window_set_events(gwin, GDK_ALL_EVENTS_MASK); - gdk_window_add_filter(gwin, processx, c); - - if (zoomlevel != 1.0) - webkit_web_view_set_zoom_level(c->view, zoomlevel); - - if (runinfullscreen) - togglefullscreen(c, NULL); - - setatom(c, AtomFind, ""); - setatom(c, AtomUri, "about:blank"); - if (hidebackground) - webkit_web_view_set_background_color(c->view, &bgcolor); + WebKitNavigationAction *a = + webkit_navigation_policy_decision_get_navigation_action( + WEBKIT_NAVIGATION_POLICY_DECISION(d)); - if (showxid) { - gdk_display_sync(gtk_widget_get_display(c->win)); - printf("%lu\n", c->xid); - fflush(NULL); - if (fclose(stdout) != 0) { - die("Error closing stdout"); - } + switch (webkit_navigation_action_get_navigation_type(a)) { + case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_BACK_FORWARD: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_RELOAD: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */ + default: + /* Do not navigate to links with a "_blank" target (popup) */ + if (webkit_navigation_policy_decision_get_frame_name( + WEBKIT_NAVIGATION_POLICY_DECISION(d))) { + webkit_policy_decision_ignore(d); + } else { + /* Filter out navigation to different domain ? */ + /* get action→urirequest, copy and load in new window+view + * on Ctrl+Click ? */ + webkit_policy_decision_use(d); + } + break; } } void -newwindow(Client *c, const Arg *arg, gboolean noembed) +decidenewwindow(WebKitPolicyDecision *d, Client *c) { - guint i = 0; - const char *cmd[18], *uri; - const Arg a = { .v = (void *)cmd }; - char tmp[64]; + Arg arg; + WebKitNavigationAction *a = + webkit_navigation_policy_decision_get_navigation_action( + WEBKIT_NAVIGATION_POLICY_DECISION(d)); - cmd[i++] = argv0; - cmd[i++] = "-a"; - cmd[i++] = cookiepolicies; - if (!enablescrollbars) - cmd[i++] = "-b"; - if (embed && !noembed) { - cmd[i++] = "-e"; - snprintf(tmp, LENGTH(tmp), "%u", (int)embed); - cmd[i++] = tmp; + + switch (webkit_navigation_action_get_navigation_type(a)) { + case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_BACK_FORWARD: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_RELOAD: /* fallthrough */ + case WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED: + /* Filter domains here */ +/* If the value of “mouse-button” is not 0, then the navigation was triggered by a mouse event. + * test for link clicked but no button ? */ + arg.v = webkit_uri_request_get_uri( + webkit_navigation_action_get_request(a)); + newwindow(c, &arg, 0); + break; + case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */ + default: + break; } - if (!allowgeolocation) - cmd[i++] = "-g"; - if (!loadimages) - cmd[i++] = "-i"; - if (kioskmode) - cmd[i++] = "-k"; - if (!enableplugins) - cmd[i++] = "-p"; - if (!enablescripts) - cmd[i++] = "-s"; - if (showxid) - cmd[i++] = "-x"; - if (enablediskcache) - cmd[i++] = "-D"; - cmd[i++] = "-c"; - cmd[i++] = cookiefile; - cmd[i++] = "--"; - uri = arg->v ? (char *)arg->v : c->linkhover; - if (uri) - cmd[i++] = uri; - cmd[i++] = NULL; - spawn(NULL, &a); + + webkit_policy_decision_ignore(d); } -GtkWidget * -createwindow(Client *c) +void +decideresource(WebKitPolicyDecision *d, Client *c) { - GtkWidget *w; - - if (embed) { - w = gtk_plug_new(embed); - } else { - w = gtk_window_new(GTK_WINDOW_TOPLEVEL); - - /* 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(w), "surf", "Surf"); + int i, isascii = 1; + WebKitResponsePolicyDecision *r = WEBKIT_RESPONSE_POLICY_DECISION(d); + WebKitURIResponse *res = + webkit_response_policy_decision_get_response(r); + const gchar *uri = webkit_uri_response_get_uri(res); - /* TA: 20091214: And set the role here as well -- so that - * sessions can pick this up. - */ - gtk_window_set_role(GTK_WINDOW(w), "Surf"); + if (g_str_has_suffix(uri, "/favicon.ico")) + webkit_uri_request_set_uri( + webkit_response_policy_decision_get_request(r), + "about:blank"); - gtk_window_set_default_size(GTK_WINDOW(w), 800, 600); + if (!g_str_has_prefix(uri, "http://") + && !g_str_has_prefix(uri, "https://") + && !g_str_has_prefix(uri, "about:") + && !g_str_has_prefix(uri, "file://") + && !g_str_has_prefix(uri, "data:") + && !g_str_has_prefix(uri, "blob:") + && strlen(uri) > 0) { + for (i = 0; i < strlen(uri); i++) { + if (!g_ascii_isprint(uri[i])) { + isascii = 0; + break; + } + } + if (isascii) { + handleplumb(c, uri); + webkit_policy_decision_ignore(d); + } } - g_signal_connect(G_OBJECT(w), "destroy", - G_CALLBACK(destroywin), c); - g_signal_connect(G_OBJECT(w), "leave-notify-event", - G_CALLBACK(winevent), c); - g_signal_connect(G_OBJECT(w), "window-state-event", - G_CALLBACK(winevent), c); - - return w; + if (webkit_response_policy_decision_is_mime_type_supported(r)) { + webkit_policy_decision_use(d); + } else { + webkit_policy_decision_ignore(d); + download(c, res); + } } void -pasteuri(GtkClipboard *clipboard, const char *text, gpointer d) +downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c) { - Arg arg = {.v = text }; - if (text != NULL) - loaduri((Client *) d, &arg); + g_signal_connect(G_OBJECT(d), "notify::response", + G_CALLBACK(responsereceived), c); } void -print(Client *c, const Arg *a) +responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c) { - webkit_print_operation_run_dialog(webkit_print_operation_new(c->view), - GTK_WINDOW(c->win)); + download(c, webkit_download_get_response(d)); + webkit_download_cancel(d); } -GdkFilterReturn -processx(GdkXEvent *e, GdkEvent *event, gpointer d) +void +download(Client *c, WebKitURIResponse *r) { - Client *c = (Client *)d; - XPropertyEvent *ev; - Arg arg; - - if (((XEvent *)e)->type == PropertyNotify) { - ev = &((XEvent *)e)->xproperty; - if (ev->state == PropertyNewValue) { - if (ev->atom == atoms[AtomFind]) { - find(c, NULL); - - 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_CONTINUE; + Arg a = (Arg)DOWNLOAD(webkit_uri_response_get_uri(r), geturi(c)); + spawn(c, &a); } void -progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c) +closeview(WebKitWebView *v, Client *c) { - c->progress = webkit_web_view_get_estimated_load_progress(c->view) * - 100; - updatetitle(c); + gtk_widget_destroy(c->win); } void -linkopen(Client *c, const Arg *arg) +destroywin(GtkWidget* w, Client *c) { - newwindow(NULL, arg, 1); + destroyclient(c); + if (!clients) + gtk_main_quit(); } void -linkopenembed(Client *c, const Arg *arg) +pasteuri(GtkClipboard *clipboard, const char *text, gpointer d) { - newwindow(NULL, arg, 0); + Arg a = {.v = text }; + if (!text) + loaduri((Client *) d, &a); } void -reload(Client *c, const Arg *arg) +reload(Client *c, const Arg *a) { - gboolean nocache = *(gboolean *)arg; - if (nocache) + if (a->b) webkit_web_view_reload_bypass_cache(c->view); else webkit_web_view_reload(c->view); } void -scroll_h(Client *c, const Arg *a) +print(Client *c, const Arg *a) { - evalscript(c, "window.scrollBy(%d * (window.innerWidth / 100), 0)", - a->i); + webkit_print_operation_run_dialog(webkit_print_operation_new(c->view), + GTK_WINDOW(c->win)); } void -scroll_v(Client *c, const Arg *a) +clipboard(Client *c, const Arg *a) { - evalscript(c, "window.scrollBy(0, %d * (window.innerHeight / 100))", - a->i); + if (a->b) { /* load clipboard uri */ + gtk_clipboard_request_text(gtk_clipboard_get( + GDK_SELECTION_PRIMARY), + pasteuri, c); + } else { /* copy uri */ + gtk_clipboard_set_text(gtk_clipboard_get( + GDK_SELECTION_PRIMARY), c->targeturi + ? c->targeturi : geturi(c), -1); + } } void -setatom(Client *c, int a, const char *v) +zoom(Client *c, const Arg *a) { - XSync(dpy, False); - XChangeProperty(dpy, c->xid, - atoms[a], XA_STRING, 8, PropModeReplace, - (unsigned char *)v, strlen(v) + 1); + if (a->i > 0) + webkit_web_view_set_zoom_level(c->view, zoomlevel + 0.1); + else if (a->i < 0) + webkit_web_view_set_zoom_level(c->view, zoomlevel - 0.1); + else + webkit_web_view_set_zoom_level(c->view, 1.0); + + zoomlevel = webkit_web_view_get_zoom_level(c->view); } void -setup(void) +scroll_v(Client *c, const Arg *a) { - int i; - WebKitWebContext *context; - GError *error = NULL; - - /* clean up any zombies immediately */ - sigchld(0); - gtk_init(NULL, NULL); - - dpy = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); - - /* 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 = buildfile(cookiefile); - scriptfile = buildfile(scriptfile); - cachedir = buildpath(cachedir); - - if (stylefile == NULL) { - styledir = buildpath(styledir); - for (i = 0; i < LENGTH(styles); i++) { - if (regcomp(&(styles[i].re), styles[i].regex, - REG_EXTENDED)) { - fprintf(stderr, - "Could not compile regex: %s\n", - styles[i].regex); - styles[i].regex = NULL; - } - styles[i].style = g_strconcat(styledir, "/", - styles[i].style, NULL); - } - g_free(styledir); - } else { - stylefile = buildfile(stylefile); - } + evalscript(c, "window.scrollBy(0, %d * (window.innerHeight / 100))", + a->i); } void -sigchld(int unused) +scroll_h(Client *c, const Arg *a) { - if (signal(SIGCHLD, sigchld) == SIG_ERR) - die("Can't install SIGCHLD handler"); - while (0 < waitpid(-1, NULL, WNOHANG)); + evalscript(c, "window.scrollBy(%d * (window.innerWidth / 100), 0)", + a->i); } void -spawn(Client *c, const Arg *arg) +navigate(Client *c, const Arg *a) { - if (fork() == 0) { - if (dpy) - close(ConnectionNumber(dpy)); - setsid(); - execvp(((char **)arg->v)[0], (char **)arg->v); - fprintf(stderr, "surf: execvp %s", ((char **)arg->v)[0]); - perror(" failed"); - exit(0); - } + if (a->i < 0) + webkit_web_view_go_back(c->view); + else if (a->i > 0) + webkit_web_view_go_forward(c->view); } void -stop(Client *c, const Arg *arg) +stop(Client *c, const Arg *a) { webkit_web_view_stop_loading(c->view); } void -titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c) +toggle(Client *c, const Arg *a) { - c->title = webkit_web_view_get_title(c->view); - updatetitle(c); -} + WebKitSettings *s = webkit_web_view_get_settings(c->view); -gboolean -winevent(GtkWidget *w, GdkEvent *e, Client *c) -{ - switch (e->type) { - case GDK_LEAVE_NOTIFY: - c->targeturi = NULL; + switch ((unsigned int)a->i) { + case CaretBrowsing: + enablecaretbrowsing = !enablecaretbrowsing; + webkit_settings_set_enable_caret_browsing(s, + enablecaretbrowsing); updatetitle(c); + return; /* do not reload */ + break; + case FrameFlattening: + enableframeflattening = !enableframeflattening; + webkit_settings_set_enable_frame_flattening(s, + enableframeflattening); + break; + case Geolocation: + allowgeolocation = !allowgeolocation; + break; + case JavaScript: + enablescripts = !enablescripts; + webkit_settings_set_enable_javascript(s, enablescripts); + break; + case LoadImages: + loadimages = !loadimages; + webkit_settings_set_auto_load_images(s, loadimages); + break; + case Plugins: + enableplugins = !enableplugins; + webkit_settings_set_enable_plugins(s, enableplugins); + break; + case ScrollBars: + /* Disabled until we write some WebKitWebExtension for + * manipulating the DOM directly. + enablescrollbars = !enablescrollbars; + evalscript(c, "document.documentElement.style.overflow = '%s'", + enablescrollbars ? "auto" : "hidden"); + */ + return; /* do not reload */ break; - case GDK_WINDOW_STATE: /* fallthrough */ - if (e->window_state.changed_mask == - GDK_WINDOW_STATE_FULLSCREEN) { - c->fullscreen = e->window_state.new_window_state & - GDK_WINDOW_STATE_FULLSCREEN; - break; - } default: - return FALSE; + break; } - - return TRUE; + reload(c, a); } void -toggle(Client *c, const Arg *arg) +togglefullscreen(Client *c, const Arg *a) { - 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); + /* toggling value is handled in winevent() */ + if (c->fullscreen) + gtk_window_unfullscreen(GTK_WINDOW(c->win)); + else + gtk_window_fullscreen(GTK_WINDOW(c->win)); } void -togglecookiepolicy(Client *c, const Arg *arg) +togglecookiepolicy(Client *c, const Arg *a) { ++cookiepolicy; cookiepolicy %= strlen(cookiepolicies); @@ -1336,16 +1376,7 @@ togglecookiepolicy(Client *c, const Arg *arg) } void -togglegeolocation(Client *c, const Arg *arg) -{ - Arg a = { .b = FALSE }; - - allowgeolocation ^= 1; - reload(c, &a); -} - -void -togglestyle(Client *c, const Arg *arg) +togglestyle(Client *c, const Arg *a) { enablestyle = !enablestyle; setstyle(c, enablestyle ? getstyle(geturi(c)) : ""); @@ -1354,100 +1385,66 @@ togglestyle(Client *c, const Arg *arg) } void -gettogglestat(Client *c) +toggleinspector(Client *c, const Arg *a) { - gboolean value; - int p = 0; - WebKitWebSettings *settings = webkit_web_view_get_settings(c->view); - - togglestat[p++] = cookiepolicy_set(cookiepolicy_get()); - - g_object_get(G_OBJECT(settings), "enable-caret-browsing", &value, - NULL); - togglestat[p++] = value? 'C': 'c'; - - togglestat[p++] = allowgeolocation? 'G': 'g'; - - togglestat[p++] = enablediskcache? 'D': 'd'; - - g_object_get(G_OBJECT(settings), "auto-load-images", &value, NULL); - togglestat[p++] = value? 'I': 'i'; - - g_object_get(G_OBJECT(settings), "enable-scripts", &value, NULL); - togglestat[p++] = value? 'S': 's'; - - g_object_get(G_OBJECT(settings), "enable-plugins", &value, NULL); - togglestat[p++] = value? 'V': 'v'; - - togglestat[p++] = enablestyle ? 'M': 'm'; - - togglestat[p] = '\0'; + if (enableinspector) { + if (webkit_web_inspector_is_attached(c->inspector)) + webkit_web_inspector_close(c->inspector); + else + webkit_web_inspector_show(c->inspector); + } } void -getpagestat(Client *c) +find(Client *c, const Arg *a) { - const char *uri = geturi(c); + const char *s, *f; - pagestats[0] = c->tlsflags > G_TLS_CERTIFICATE_VALIDATE_ALL ? '-' : - c->tlsflags > 0 ? 'U' : 'T'; - pagestat[1] = '\0'; -} + if (a && a->i) { + if (a->i > 0) + webkit_find_controller_search_next(c->finder); + else + webkit_find_controller_search_previous(c->finder); + } else { + s = getatom(c, AtomFind); + f = webkit_find_controller_get_search_text(c->finder); -void -updatetitle(Client *c) -{ - char *t; + if (g_strcmp0(f, s) == 0) /* reset search */ + webkit_find_controller_search(c->finder, "", findopts, + G_MAXUINT); - if (showindicators) { - gettogglestat(c); - getpagestat(c); - - if (c->linkhover) { - t = g_strdup_printf("%s:%s | %s", togglestat, pagestat, - c->linkhover); - } else if (c->progress != 100) { - t = g_strdup_printf("[%i%%] %s:%s | %s", c->progress, - togglestat, pagestat, - c->title == NULL ? "" : c->title); - } else { - t = g_strdup_printf("%s:%s | %s", togglestat, pagestat, - c->title == NULL ? "" : c->title); - } + webkit_find_controller_search(c->finder, s, findopts, + G_MAXUINT); - gtk_window_set_title(GTK_WINDOW(c->win), t); - g_free(t); - } else { - gtk_window_set_title(GTK_WINDOW(c->win), (c->title == NULL) ? - "" : c->title); + if (strcmp(s, "") == 0) + webkit_find_controller_search_finish(c->finder); } } void -updatewinid(Client *c) +clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h) { - snprintf(winid, LENGTH(winid), "%lu", c->xid); + navigate(c, a); } void -usage(void) +clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h) { - die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] " - "[-c cookiefile] [-e xid] [-r scriptfile] [-t stylefile] " - "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0)); + Arg arg; + + arg.v = webkit_hit_test_result_get_link_uri(h); + newwindow(c, &arg, a->b); } void -zoom(Client *c, const Arg *a) +clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h) { - if (a->i > 0) - webkit_web_view_set_zoom_level(c->view, zoomlevel + 0.1); - else if (a->i < 0) - webkit_web_view_set_zoom_level(c->view, zoomlevel - 0.1); - else - webkit_web_view_set_zoom_level(c->view, 1.0); + Arg arg; - zoomlevel = webkit_web_view_get_zoom_level(c->view); + if (webkit_hit_test_result_get_context(h) & OnMedia) { + arg = (Arg)VIDEOPLAY(webkit_hit_test_result_get_media_uri(h)); + spawn(c, &arg); + } } int @@ -1473,10 +1470,10 @@ main(int argc, char *argv[]) cookiefile = EARGF(usage()); break; case 'd': - enablediskcache = 0; + enablecache = 0; break; case 'D': - enablediskcache = 1; + enablecache = 1; break; case 'e': embed = strtol(EARGF(usage()), NULL, 0); @@ -1542,7 +1539,7 @@ main(int argc, char *argv[]) die("surf-"VERSION", ©2009-2015 surf engineers, " "see LICENSE for details\n"); case 'x': - showxid = TRUE; + showxid = 1; break; case 'z': zoomlevel = strtof(EARGF(usage()), NULL); @@ -1556,6 +1553,7 @@ main(int argc, char *argv[]) setup(); c = newclient(NULL); showview(NULL, c); + if (arg.v) loaduri(clients, &arg); else @@ -1566,4 +1564,3 @@ main(int argc, char *argv[]) return EXIT_SUCCESS; } -