iContinue style fixing: function declarations, code alignement - surf - Surf web browser. Err gopher.r-36.net 70 i Err gopher.r-36.net 70 1Log /scm/surf//log.gph gopher.r-36.net 70 1Files /scm/surf//files.gph gopher.r-36.net 70 1Refs /scm/surf//refs.gph gopher.r-36.net 70 1README /scm/surf//file/README.gph gopher.r-36.net 70 1LICENSE /scm/surf//file/LICENSE.gph gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1commit c65c8d422b0c4ab800ed92256ac033bb883140f9 /scm/surf//commit/c65c8d422b0c4ab800ed92256ac033bb883140f9.gph gopher.r-36.net 70 1parent 9f5c6ff8d781f1a3a3b8fd4becd7122f3e809e1c /scm/surf//commit/9f5c6ff8d781f1a3a3b8fd4becd7122f3e809e1c.gph gopher.r-36.net 70 hAuthor: Quentin Rameau URL:mailto:quinq+hackers@fifth.space gopher.r-36.net 70 iDate: Tue, 20 Oct 2015 15:04:52 +0200 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iContinue style fixing: function declarations, code alignement Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iHere are the changes we discussed on the mailing-list. Err gopher.r-36.net 70 iAlignement is pushed to the first parameter of the function, which seems Err gopher.r-36.net 70 ito be what people agrees on. Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iSigned-off-by: Christoph Lohmann <20h@r-36.net> Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iDiffstat: Err gopher.r-36.net 70 i surf.c | 817 +++++++++++++++++-------------- Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i1 file changed, 444 insertions(+), 373 deletions(-) Err gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1diff --git a/surf.c b/surf.c /scm/surf//file/surf.c.gph gopher.r-36.net 70 i@@ -2,7 +2,6 @@ Err gopher.r-36.net 70 i * Err gopher.r-36.net 70 i * To understand surf, start reading main(). Err gopher.r-36.net 70 i */ Err gopher.r-36.net 70 i- Err gopher.r-36.net 70 i #include Err gopher.r-36.net 70 i #include Err gopher.r-36.net 70 i #include Err gopher.r-36.net 70 i@@ -113,8 +112,8 @@ static SoupCache *diskcache = NULL; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i static void addaccelgroup(Client *c); Err gopher.r-36.net 70 i static void beforerequest(WebKitWebView *w, WebKitWebFrame *f, Err gopher.r-36.net 70 i- WebKitWebResource *r, WebKitNetworkRequest *req, Err gopher.r-36.net 70 i- WebKitNetworkResponse *resp, Client *c); Err gopher.r-36.net 70 i+ WebKitWebResource *r, WebKitNetworkRequest *req, Err gopher.r-36.net 70 i+ WebKitNetworkResponse *resp, Client *c); Err gopher.r-36.net 70 i static char *buildfile(const char *path); Err gopher.r-36.net 70 i static char *buildpath(const char *path); Err gopher.r-36.net 70 i static gboolean buttonrelease(WebKitWebView *web, GdkEventButton *e, Client *c); Err gopher.r-36.net 70 i@@ -123,26 +122,26 @@ static void clipboard(Client *c, const Arg *arg); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Cookiejar implementation */ Err gopher.r-36.net 70 i static void cookiejar_changed(SoupCookieJar *self, SoupCookie *old_cookie, Err gopher.r-36.net 70 i- SoupCookie *new_cookie); Err gopher.r-36.net 70 i+ SoupCookie *new_cookie); Err gopher.r-36.net 70 i static void cookiejar_finalize(GObject *self); Err gopher.r-36.net 70 i static SoupCookieJarAcceptPolicy cookiepolicy_get(void); Err gopher.r-36.net 70 i static SoupCookieJar *cookiejar_new(const char *filename, gboolean read_only, Err gopher.r-36.net 70 i- SoupCookieJarAcceptPolicy policy); Err gopher.r-36.net 70 i+ SoupCookieJarAcceptPolicy policy); Err gopher.r-36.net 70 i static void cookiejar_set_property(GObject *self, guint prop_id, Err gopher.r-36.net 70 i- const GValue *value, GParamSpec *pspec); Err gopher.r-36.net 70 i+ const GValue *value, GParamSpec *pspec); Err gopher.r-36.net 70 i static char cookiepolicy_set(const SoupCookieJarAcceptPolicy p); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i static char *copystr(char **str, const char *src); Err gopher.r-36.net 70 i static WebKitWebView *createwindow(WebKitWebView *v, WebKitWebFrame *f, Err gopher.r-36.net 70 i- Client *c); Err gopher.r-36.net 70 i+ Client *c); Err gopher.r-36.net 70 i static gboolean decidedownload(WebKitWebView *v, WebKitWebFrame *f, Err gopher.r-36.net 70 i- WebKitNetworkRequest *r, gchar *m, WebKitWebPolicyDecision *p, Err gopher.r-36.net 70 i- Client *c); Err gopher.r-36.net 70 i+ WebKitNetworkRequest *r, gchar *m, Err gopher.r-36.net 70 i+ WebKitWebPolicyDecision *p, Client *c); Err gopher.r-36.net 70 i static gboolean decidewindow(WebKitWebView *v, WebKitWebFrame *f, Err gopher.r-36.net 70 i- WebKitNetworkRequest *r, WebKitWebNavigationAction *n, Err gopher.r-36.net 70 i- WebKitWebPolicyDecision *p, Client *c); Err gopher.r-36.net 70 i+ WebKitNetworkRequest *r, WebKitWebNavigationAction Err gopher.r-36.net 70 i+ *n, WebKitWebPolicyDecision *p, Client *c); Err gopher.r-36.net 70 i static gboolean deletion_interface(WebKitWebView *view, Err gopher.r-36.net 70 i- WebKitDOMHTMLElement *arg1, Client *c); Err gopher.r-36.net 70 i+ WebKitDOMHTMLElement *arg1, Client *c); Err gopher.r-36.net 70 i static void destroyclient(Client *c); Err gopher.r-36.net 70 i static void destroywin(GtkWidget* w, Client *c); Err gopher.r-36.net 70 i static void die(const char *errstr, ...); Err gopher.r-36.net 70 i@@ -150,7 +149,7 @@ static void eval(Client *c, const Arg *arg); Err gopher.r-36.net 70 i static void find(Client *c, const Arg *arg); Err gopher.r-36.net 70 i static void fullscreen(Client *c, const Arg *arg); Err gopher.r-36.net 70 i static void geopolicyrequested(WebKitWebView *v, WebKitWebFrame *f, Err gopher.r-36.net 70 i- WebKitGeolocationPolicyDecision *d, Client *c); Err gopher.r-36.net 70 i+ WebKitGeolocationPolicyDecision *d, Client *c); Err gopher.r-36.net 70 i static const char *getatom(Client *c, int a); Err gopher.r-36.net 70 i static void gettogglestat(Client *c); Err gopher.r-36.net 70 i static void getpagestat(Client *c); Err gopher.r-36.net 70 i@@ -163,29 +162,29 @@ static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i static void inspector(Client *c, const Arg *arg); Err gopher.r-36.net 70 i static WebKitWebView *inspector_new(WebKitWebInspector *i, WebKitWebView *v, Err gopher.r-36.net 70 i- Client *c); Err gopher.r-36.net 70 i+ Client *c); Err gopher.r-36.net 70 i static gboolean inspector_show(WebKitWebInspector *i, Client *c); Err gopher.r-36.net 70 i static gboolean inspector_close(WebKitWebInspector *i, Client *c); Err gopher.r-36.net 70 i static void inspector_finished(WebKitWebInspector *i, Client *c); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static gboolean keypress(GtkAccelGroup *group, Err gopher.r-36.net 70 i- GObject *obj, guint key, GdkModifierType mods, Err gopher.r-36.net 70 i- Client *c); Err gopher.r-36.net 70 i+static gboolean keypress(GtkAccelGroup *group, GObject *obj, guint key, Err gopher.r-36.net 70 i+ GdkModifierType mods, Client *c); Err gopher.r-36.net 70 i static void linkhover(WebKitWebView *v, const char* t, const char* l, Err gopher.r-36.net 70 i- Client *c); Err gopher.r-36.net 70 i+ Client *c); Err gopher.r-36.net 70 i static void loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Err gopher.r-36.net 70 i- Client *c); Err gopher.r-36.net 70 i+ Client *c); Err gopher.r-36.net 70 i static void loaduri(Client *c, const Arg *arg); Err gopher.r-36.net 70 i static void navigate(Client *c, const Arg *arg); Err gopher.r-36.net 70 i static Client *newclient(void); Err gopher.r-36.net 70 i static void newwindow(Client *c, const Arg *arg, gboolean noembed); Err gopher.r-36.net 70 i static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d); Err gopher.r-36.net 70 i static gboolean contextmenu(WebKitWebView *view, GtkWidget *menu, Err gopher.r-36.net 70 i- WebKitHitTestResult *target, gboolean keyboard, Client *c); Err gopher.r-36.net 70 i+ WebKitHitTestResult *target, gboolean keyboard, Err gopher.r-36.net 70 i+ Client *c); Err gopher.r-36.net 70 i static void menuactivate(GtkMenuItem *item, Client *c); Err gopher.r-36.net 70 i static void print(Client *c, const Arg *arg); Err gopher.r-36.net 70 i static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, Err gopher.r-36.net 70 i- gpointer d); Err gopher.r-36.net 70 i+ gpointer d); Err gopher.r-36.net 70 i static void progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c); Err gopher.r-36.net 70 i static void linkopen(Client *c, const Arg *arg); Err gopher.r-36.net 70 i static void linkopenembed(Client *c, const Arg *arg); Err gopher.r-36.net 70 i@@ -210,44 +209,45 @@ static void updatetitle(Client *c); Err gopher.r-36.net 70 i static void updatewinid(Client *c); Err gopher.r-36.net 70 i static void usage(void); Err gopher.r-36.net 70 i static void windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, Err gopher.r-36.net 70 i- JSContextRef js, JSObjectRef win, Client *c); Err gopher.r-36.net 70 i+ JSContextRef js, JSObjectRef win, Client *c); Err gopher.r-36.net 70 i static void zoom(Client *c, const Arg *arg); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* configuration, allows nested code to access above variables */ Err gopher.r-36.net 70 i #include "config.h" Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-addaccelgroup(Client *c) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+addaccelgroup(Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i int i; Err gopher.r-36.net 70 i GtkAccelGroup *group = gtk_accel_group_new(); Err gopher.r-36.net 70 i GClosure *closure; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i for (i = 0; i < LENGTH(keys); i++) { Err gopher.r-36.net 70 i closure = g_cclosure_new(G_CALLBACK(keypress), c, NULL); Err gopher.r-36.net 70 i- gtk_accel_group_connect(group, keys[i].keyval, keys[i].mod, Err gopher.r-36.net 70 i- 0, closure); Err gopher.r-36.net 70 i+ gtk_accel_group_connect(group, keys[i].keyval, keys[i].mod, 0, Err gopher.r-36.net 70 i+ closure); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i gtk_window_add_accel_group(GTK_WINDOW(c->win), group); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i beforerequest(WebKitWebView *w, WebKitWebFrame *f, WebKitWebResource *r, Err gopher.r-36.net 70 i- WebKitNetworkRequest *req, WebKitNetworkResponse *resp, Err gopher.r-36.net 70 i- Client *c) { Err gopher.r-36.net 70 i+ WebKitNetworkRequest *req, WebKitNetworkResponse *resp, Err gopher.r-36.net 70 i+ Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i const gchar *uri = webkit_network_request_get_uri(req); Err gopher.r-36.net 70 i int i, isascii = 1; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if (g_str_has_suffix(uri, "/favicon.ico")) Err gopher.r-36.net 70 i webkit_network_request_set_uri(req, "about:blank"); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if (!g_str_has_prefix(uri, "http://") \ Err gopher.r-36.net 70 i- && !g_str_has_prefix(uri, "https://") \ Err gopher.r-36.net 70 i- && !g_str_has_prefix(uri, "about:") \ Err gopher.r-36.net 70 i- && !g_str_has_prefix(uri, "file://") \ Err gopher.r-36.net 70 i- && !g_str_has_prefix(uri, "data:") \ Err gopher.r-36.net 70 i- && !g_str_has_prefix(uri, "blob:") \ Err gopher.r-36.net 70 i- && strlen(uri) > 0) { Err gopher.r-36.net 70 i- Err gopher.r-36.net 70 i+ if (!g_str_has_prefix(uri, "http://") Err gopher.r-36.net 70 i+ && !g_str_has_prefix(uri, "https://") Err gopher.r-36.net 70 i+ && !g_str_has_prefix(uri, "about:") Err gopher.r-36.net 70 i+ && !g_str_has_prefix(uri, "file://") Err gopher.r-36.net 70 i+ && !g_str_has_prefix(uri, "data:") Err gopher.r-36.net 70 i+ && !g_str_has_prefix(uri, "blob:") Err gopher.r-36.net 70 i+ && strlen(uri) > 0) { Err gopher.r-36.net 70 i for (i = 0; i < strlen(uri); i++) { Err gopher.r-36.net 70 i if (!g_ascii_isprint(uri[i])) { Err gopher.r-36.net 70 i isascii = 0; Err gopher.r-36.net 70 i@@ -259,8 +259,9 @@ beforerequest(WebKitWebView *w, WebKitWebFrame *f, WebKitWebResource *r, Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static char * Err gopher.r-36.net 70 i-buildfile(const char *path) { Err gopher.r-36.net 70 i+char * Err gopher.r-36.net 70 i+buildfile(const char *path) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i char *dname, *bname, *bpath, *fpath; Err gopher.r-36.net 70 i FILE *f; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -282,8 +283,9 @@ buildfile(const char *path) { Err gopher.r-36.net 70 i return fpath; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static char * Err gopher.r-36.net 70 i-buildpath(const char *path) { Err gopher.r-36.net 70 i+char * Err gopher.r-36.net 70 i+buildpath(const char *path) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i struct passwd *pw; Err gopher.r-36.net 70 i char *apath, *name, *p, *fpath; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -299,7 +301,7 @@ buildpath(const char *path) { Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if (!(pw = getpwnam(name))) { Err gopher.r-36.net 70 i die("Can't get user %s home directory: %s.\n", Err gopher.r-36.net 70 i- name, path); Err gopher.r-36.net 70 i+ name, path); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i g_free(name); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -318,28 +320,33 @@ buildpath(const char *path) { Err gopher.r-36.net 70 i return fpath; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static gboolean Err gopher.r-36.net 70 i-buttonrelease(WebKitWebView *web, GdkEventButton *e, Client *c) { Err gopher.r-36.net 70 i+gboolean Err gopher.r-36.net 70 i+buttonrelease(WebKitWebView *web, GdkEventButton *e, Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i WebKitHitTestResultContext context; Err gopher.r-36.net 70 i- WebKitHitTestResult *result = webkit_web_view_get_hit_test_result(web, Err gopher.r-36.net 70 i- e); Err gopher.r-36.net 70 i+ WebKitHitTestResult *result; Err gopher.r-36.net 70 i Arg arg; Err gopher.r-36.net 70 i unsigned int i; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i+ result = webkit_web_view_get_hit_test_result(web, e); Err gopher.r-36.net 70 i g_object_get(result, "context", &context, NULL); Err gopher.r-36.net 70 i g_object_get(result, "link-uri", &arg.v, NULL); Err gopher.r-36.net 70 i for (i = 0; i < LENGTH(buttons); i++) { Err gopher.r-36.net 70 i- if (context & buttons[i].click && e->button == buttons[i].button && Err gopher.r-36.net 70 i- CLEANMASK(e->state) == CLEANMASK(buttons[i].mask) && buttons[i].func) { Err gopher.r-36.net 70 i- buttons[i].func(c, buttons[i].click == ClkLink && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg); Err gopher.r-36.net 70 i+ if (context & buttons[i].click Err gopher.r-36.net 70 i+ && e->button == buttons[i].button Err gopher.r-36.net 70 i+ && CLEANMASK(e->state) == CLEANMASK(buttons[i].mask) Err gopher.r-36.net 70 i+ && buttons[i].func) { Err gopher.r-36.net 70 i+ buttons[i].func(c, buttons[i].click == ClkLink Err gopher.r-36.net 70 i+ && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg); Err gopher.r-36.net 70 i return true; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i return false; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-cleanup(void) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+cleanup(void) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i if (diskcache) { Err gopher.r-36.net 70 i soup_cache_flush(diskcache); Err gopher.r-36.net 70 i soup_cache_dump(diskcache); Err gopher.r-36.net 70 i@@ -351,60 +358,68 @@ cleanup(void) { Err gopher.r-36.net 70 i g_free(stylefile); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i cookiejar_changed(SoupCookieJar *self, SoupCookie *old_cookie, Err gopher.r-36.net 70 i- SoupCookie *new_cookie) { Err gopher.r-36.net 70 i+ SoupCookie *new_cookie) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i flock(COOKIEJAR(self)->lock, LOCK_EX); Err gopher.r-36.net 70 i if (new_cookie && !new_cookie->expires && sessiontime) { Err gopher.r-36.net 70 i soup_cookie_set_expires(new_cookie, Err gopher.r-36.net 70 i- soup_date_new_from_now(sessiontime)); Err gopher.r-36.net 70 i+ soup_date_new_from_now(sessiontime)); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i SOUP_COOKIE_JAR_CLASS(cookiejar_parent_class)->changed(self, Err gopher.r-36.net 70 i- old_cookie, new_cookie); Err gopher.r-36.net 70 i+ old_cookie, Err gopher.r-36.net 70 i+ new_cookie); Err gopher.r-36.net 70 i flock(COOKIEJAR(self)->lock, LOCK_UN); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-cookiejar_class_init(CookieJarClass *klass) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+cookiejar_class_init(CookieJarClass *klass) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i SOUP_COOKIE_JAR_CLASS(klass)->changed = cookiejar_changed; Err gopher.r-36.net 70 i G_OBJECT_CLASS(klass)->get_property = Err gopher.r-36.net 70 i- G_OBJECT_CLASS(cookiejar_parent_class)->get_property; Err gopher.r-36.net 70 i+ G_OBJECT_CLASS(cookiejar_parent_class)->get_property; Err gopher.r-36.net 70 i G_OBJECT_CLASS(klass)->set_property = cookiejar_set_property; Err gopher.r-36.net 70 i G_OBJECT_CLASS(klass)->finalize = cookiejar_finalize; Err gopher.r-36.net 70 i g_object_class_override_property(G_OBJECT_CLASS(klass), 1, "filename"); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-cookiejar_finalize(GObject *self) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+cookiejar_finalize(GObject *self) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i close(COOKIEJAR(self)->lock); Err gopher.r-36.net 70 i G_OBJECT_CLASS(cookiejar_parent_class)->finalize(self); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-cookiejar_init(CookieJar *self) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+cookiejar_init(CookieJar *self) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i self->lock = open(cookiefile, 0); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static SoupCookieJar * Err gopher.r-36.net 70 i+SoupCookieJar * Err gopher.r-36.net 70 i cookiejar_new(const char *filename, gboolean read_only, Err gopher.r-36.net 70 i- SoupCookieJarAcceptPolicy policy) { Err gopher.r-36.net 70 i+ SoupCookieJarAcceptPolicy policy) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i return g_object_new(COOKIEJAR_TYPE, Err gopher.r-36.net 70 i SOUP_COOKIE_JAR_TEXT_FILENAME, filename, Err gopher.r-36.net 70 i- SOUP_COOKIE_JAR_READ_ONLY, read_only, Err gopher.r-36.net 70 i- SOUP_COOKIE_JAR_ACCEPT_POLICY, policy, NULL); Err gopher.r-36.net 70 i+ SOUP_COOKIE_JAR_READ_ONLY, read_only, Err gopher.r-36.net 70 i+ SOUP_COOKIE_JAR_ACCEPT_POLICY, policy, NULL); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i cookiejar_set_property(GObject *self, guint prop_id, const GValue *value, Err gopher.r-36.net 70 i- GParamSpec *pspec) { Err gopher.r-36.net 70 i+ GParamSpec *pspec) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i flock(COOKIEJAR(self)->lock, LOCK_SH); Err gopher.r-36.net 70 i G_OBJECT_CLASS(cookiejar_parent_class)->set_property(self, prop_id, Err gopher.r-36.net 70 i- value, pspec); Err gopher.r-36.net 70 i+ value, pspec); Err gopher.r-36.net 70 i flock(COOKIEJAR(self)->lock, LOCK_UN); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static SoupCookieJarAcceptPolicy Err gopher.r-36.net 70 i-cookiepolicy_get(void) { Err gopher.r-36.net 70 i+SoupCookieJarAcceptPolicy Err gopher.r-36.net 70 i+cookiepolicy_get(void) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i switch (cookiepolicies[policysel]) { Err gopher.r-36.net 70 i case 'a': Err gopher.r-36.net 70 i return SOUP_COOKIE_JAR_ACCEPT_NEVER; Err gopher.r-36.net 70 i@@ -418,8 +433,9 @@ cookiepolicy_get(void) { Err gopher.r-36.net 70 i return SOUP_COOKIE_JAR_ACCEPT_ALWAYS; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static char Err gopher.r-36.net 70 i-cookiepolicy_set(const SoupCookieJarAcceptPolicy ep) { Err gopher.r-36.net 70 i+char Err gopher.r-36.net 70 i+cookiepolicy_set(const SoupCookieJarAcceptPolicy ep) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i switch (ep) { Err gopher.r-36.net 70 i case SOUP_COOKIE_JAR_ACCEPT_NEVER: Err gopher.r-36.net 70 i return 'a'; Err gopher.r-36.net 70 i@@ -433,47 +449,51 @@ cookiepolicy_set(const SoupCookieJarAcceptPolicy ep) { Err gopher.r-36.net 70 i return 'A'; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-evalscript(JSContextRef js, char *script, char* scriptname) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+evalscript(JSContextRef js, char *script, char* scriptname) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i JSStringRef jsscript, jsscriptname; Err gopher.r-36.net 70 i JSValueRef exception = NULL; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i jsscript = JSStringCreateWithUTF8CString(script); Err gopher.r-36.net 70 i jsscriptname = JSStringCreateWithUTF8CString(scriptname); Err gopher.r-36.net 70 i JSEvaluateScript(js, jsscript, JSContextGetGlobalObject(js), Err gopher.r-36.net 70 i- jsscriptname, 0, &exception); Err gopher.r-36.net 70 i+ jsscriptname, 0, &exception); Err gopher.r-36.net 70 i JSStringRelease(jsscript); Err gopher.r-36.net 70 i JSStringRelease(jsscriptname); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-runscript(WebKitWebFrame *frame) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+runscript(WebKitWebFrame *frame) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i char *script; Err gopher.r-36.net 70 i GError *error; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if (g_file_get_contents(scriptfile, &script, NULL, &error)) { Err gopher.r-36.net 70 i- evalscript(webkit_web_frame_get_global_context(frame), Err gopher.r-36.net 70 i- script, scriptfile); Err gopher.r-36.net 70 i+ evalscript(webkit_web_frame_get_global_context(frame), script, Err gopher.r-36.net 70 i+ scriptfile); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-clipboard(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+clipboard(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i gboolean paste = *(gboolean *)arg; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if (paste) { Err gopher.r-36.net 70 i- gtk_clipboard_request_text( Err gopher.r-36.net 70 i- gtk_clipboard_get(GDK_SELECTION_PRIMARY), Err gopher.r-36.net 70 i- pasteuri, c); Err gopher.r-36.net 70 i+ gtk_clipboard_request_text(gtk_clipboard_get( Err gopher.r-36.net 70 i+ GDK_SELECTION_PRIMARY), Err gopher.r-36.net 70 i+ pasteuri, c); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i- gtk_clipboard_set_text( Err gopher.r-36.net 70 i- gtk_clipboard_get(GDK_SELECTION_PRIMARY), Err gopher.r-36.net 70 i- c->linkhover ? c->linkhover : geturi(c), -1); Err gopher.r-36.net 70 i+ gtk_clipboard_set_text(gtk_clipboard_get( Err gopher.r-36.net 70 i+ GDK_SELECTION_PRIMARY), c->linkhover Err gopher.r-36.net 70 i+ ? c->linkhover : geturi(c), -1); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static char * Err gopher.r-36.net 70 i-copystr(char **str, const char *src) { Err gopher.r-36.net 70 i+char * Err gopher.r-36.net 70 i+copystr(char **str, const char *src) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i char *tmp; Err gopher.r-36.net 70 i tmp = g_strdup(src); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -484,15 +504,17 @@ copystr(char **str, const char *src) { Err gopher.r-36.net 70 i return tmp; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static WebKitWebView * Err gopher.r-36.net 70 i-createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c) { Err gopher.r-36.net 70 i+WebKitWebView * Err gopher.r-36.net 70 i+createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i Client *n = newclient(); Err gopher.r-36.net 70 i return n->view; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static gboolean Err gopher.r-36.net 70 i+gboolean Err gopher.r-36.net 70 i decidedownload(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r, Err gopher.r-36.net 70 i- gchar *m, WebKitWebPolicyDecision *p, Client *c) { Err gopher.r-36.net 70 i+ gchar *m, WebKitWebPolicyDecision *p, Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i if (!webkit_web_view_can_show_mime_type(v, m)) { Err gopher.r-36.net 70 i webkit_web_policy_decision_download(p); Err gopher.r-36.net 70 i return TRUE; Err gopher.r-36.net 70 i@@ -500,14 +522,15 @@ decidedownload(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r, Err gopher.r-36.net 70 i return FALSE; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static gboolean Err gopher.r-36.net 70 i+gboolean Err gopher.r-36.net 70 i decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, Err gopher.r-36.net 70 i- WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Err gopher.r-36.net 70 i- Client *c) { Err gopher.r-36.net 70 i+ WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Err gopher.r-36.net 70 i+ Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i Arg arg; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if (webkit_web_navigation_action_get_reason(n) == Err gopher.r-36.net 70 i- WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) { Err gopher.r-36.net 70 i+ if (webkit_web_navigation_action_get_reason(n) Err gopher.r-36.net 70 i+ == WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) { Err gopher.r-36.net 70 i webkit_web_policy_decision_ignore(p); Err gopher.r-36.net 70 i arg.v = (void *)webkit_network_request_get_uri(r); Err gopher.r-36.net 70 i newwindow(NULL, &arg, 0); Err gopher.r-36.net 70 i@@ -516,14 +539,15 @@ decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, Err gopher.r-36.net 70 i return FALSE; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static gboolean Err gopher.r-36.net 70 i-deletion_interface(WebKitWebView *view, Err gopher.r-36.net 70 i- WebKitDOMHTMLElement *arg1, Client *c) { Err gopher.r-36.net 70 i+gboolean Err gopher.r-36.net 70 i+deletion_interface(WebKitWebView *view, WebKitDOMHTMLElement *arg1, Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i return FALSE; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-destroyclient(Client *c) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+destroyclient(Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i Client *p; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i webkit_web_view_stop_loading(c->view); Err gopher.r-36.net 70 i@@ -532,24 +556,26 @@ destroyclient(Client *c) { Err gopher.r-36.net 70 i gtk_widget_destroy(c->vbox); Err gopher.r-36.net 70 i gtk_widget_destroy(c->win); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for (p = clients; p && p->next != c; p = p->next); Err gopher.r-36.net 70 i- if (p) { Err gopher.r-36.net 70 i+ for (p = clients; p && p->next != c; p = p->next) Err gopher.r-36.net 70 i+ ; Err gopher.r-36.net 70 i+ if (p) Err gopher.r-36.net 70 i p->next = c->next; Err gopher.r-36.net 70 i- } else { Err gopher.r-36.net 70 i+ else Err gopher.r-36.net 70 i clients = c->next; Err gopher.r-36.net 70 i- } Err gopher.r-36.net 70 i free(c); Err gopher.r-36.net 70 i if (clients == NULL) Err gopher.r-36.net 70 i gtk_main_quit(); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-destroywin(GtkWidget* w, Client *c) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+destroywin(GtkWidget* w, Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i destroyclient(c); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-die(const char *errstr, ...) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+die(const char *errstr, ...) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i va_list ap; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i va_start(ap, errstr); Err gopher.r-36.net 70 i@@ -558,8 +584,9 @@ die(const char *errstr, ...) { Err gopher.r-36.net 70 i exit(EXIT_FAILURE); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-find(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+find(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i const char *s; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i s = getatom(c, AtomFind); Err gopher.r-36.net 70 i@@ -567,28 +594,29 @@ find(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-fullscreen(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i- if (c->fullscreen) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+fullscreen(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i+ if (c->fullscreen) Err gopher.r-36.net 70 i gtk_window_unfullscreen(GTK_WINDOW(c->win)); Err gopher.r-36.net 70 i- } else { Err gopher.r-36.net 70 i+ else Err gopher.r-36.net 70 i gtk_window_fullscreen(GTK_WINDOW(c->win)); Err gopher.r-36.net 70 i- } Err gopher.r-36.net 70 i c->fullscreen = !c->fullscreen; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i geopolicyrequested(WebKitWebView *v, WebKitWebFrame *f, Err gopher.r-36.net 70 i- WebKitGeolocationPolicyDecision *d, Client *c) { Err gopher.r-36.net 70 i- if (allowgeolocation) { Err gopher.r-36.net 70 i+ WebKitGeolocationPolicyDecision *d, Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i+ if (allowgeolocation) Err gopher.r-36.net 70 i webkit_geolocation_policy_allow(d); Err gopher.r-36.net 70 i- } else { Err gopher.r-36.net 70 i+ else Err gopher.r-36.net 70 i webkit_geolocation_policy_deny(d); Err gopher.r-36.net 70 i- } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static const char * Err gopher.r-36.net 70 i-getatom(Client *c, int a) { Err gopher.r-36.net 70 i+const char * Err gopher.r-36.net 70 i+getatom(Client *c, int a) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i static char buf[BUFSIZ]; Err gopher.r-36.net 70 i Atom adummy; Err gopher.r-36.net 70 i int idummy; Err gopher.r-36.net 70 i@@ -596,20 +624,20 @@ getatom(Client *c, int a) { Err gopher.r-36.net 70 i unsigned char *p = NULL; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i XGetWindowProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), Err gopher.r-36.net 70 i- atoms[a], 0L, BUFSIZ, False, XA_STRING, Err gopher.r-36.net 70 i- &adummy, &idummy, &ldummy, &ldummy, &p); Err gopher.r-36.net 70 i- if (p) { Err gopher.r-36.net 70 i+ atoms[a], 0L, BUFSIZ, False, XA_STRING, Err gopher.r-36.net 70 i+ &adummy, &idummy, &ldummy, &ldummy, &p); Err gopher.r-36.net 70 i+ if (p) Err gopher.r-36.net 70 i strncpy(buf, (char *)p, LENGTH(buf)-1); Err gopher.r-36.net 70 i- } else { Err gopher.r-36.net 70 i+ else Err gopher.r-36.net 70 i buf[0] = '\0'; Err gopher.r-36.net 70 i- } Err gopher.r-36.net 70 i XFree(p); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i return buf; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static char * Err gopher.r-36.net 70 i-geturi(Client *c) { Err gopher.r-36.net 70 i+char * Err gopher.r-36.net 70 i+geturi(Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i char *uri; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if (!(uri = (char *)webkit_web_view_get_uri(c->view))) Err gopher.r-36.net 70 i@@ -617,8 +645,9 @@ geturi(Client *c) { Err gopher.r-36.net 70 i return uri; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static gchar * Err gopher.r-36.net 70 i-getstyle(const char *uri) { Err gopher.r-36.net 70 i+gchar * Err gopher.r-36.net 70 i+getstyle(const char *uri) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i int i; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if (stylefile != NULL) Err gopher.r-36.net 70 i@@ -626,15 +655,15 @@ getstyle(const char *uri) { Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i for (i = 0; i < LENGTH(styles); i++) { Err gopher.r-36.net 70 i if (styles[i].regex && !regexec(&(styles[i].re), uri, 0, Err gopher.r-36.net 70 i- NULL, 0)) { Err gopher.r-36.net 70 i+ NULL, 0)) Err gopher.r-36.net 70 i return g_strconcat("file://", styles[i].style, NULL); Err gopher.r-36.net 70 i- } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i return g_strdup(""); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-handleplumb(Client *c, WebKitWebView *w, const gchar *uri) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+handleplumb(Client *c, WebKitWebView *w, const gchar *uri) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i Arg arg; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i webkit_web_view_stop_loading(w); Err gopher.r-36.net 70 i@@ -642,8 +671,9 @@ handleplumb(Client *c, WebKitWebView *w, const gchar *uri) { Err gopher.r-36.net 70 i spawn(c, &arg); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static gboolean Err gopher.r-36.net 70 i-initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) { Err gopher.r-36.net 70 i+gboolean Err gopher.r-36.net 70 i+initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i Arg arg; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i updatewinid(c); Err gopher.r-36.net 70 i@@ -652,22 +682,24 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) { Err gopher.r-36.net 70 i return FALSE; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-inspector(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i- if (c->isinspecting) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+inspector(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i+ if (c->isinspecting) Err gopher.r-36.net 70 i webkit_web_inspector_close(c->inspector); Err gopher.r-36.net 70 i- } else { Err gopher.r-36.net 70 i+ else Err gopher.r-36.net 70 i webkit_web_inspector_show(c->inspector); Err gopher.r-36.net 70 i- } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static WebKitWebView * Err gopher.r-36.net 70 i-inspector_new(WebKitWebInspector *i, WebKitWebView *v, Client *c) { Err gopher.r-36.net 70 i+WebKitWebView * Err gopher.r-36.net 70 i+inspector_new(WebKitWebInspector *i, WebKitWebView *v, Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i return WEBKIT_WEB_VIEW(webkit_web_view_new()); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static gboolean Err gopher.r-36.net 70 i-inspector_show(WebKitWebInspector *i, Client *c) { Err gopher.r-36.net 70 i+gboolean Err gopher.r-36.net 70 i+inspector_show(WebKitWebInspector *i, Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i WebKitWebView *w; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if (c->isinspecting) Err gopher.r-36.net 70 i@@ -681,8 +713,9 @@ inspector_show(WebKitWebInspector *i, Client *c) { Err gopher.r-36.net 70 i return true; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static gboolean Err gopher.r-36.net 70 i-inspector_close(WebKitWebInspector *i, Client *c) { Err gopher.r-36.net 70 i+gboolean Err gopher.r-36.net 70 i+inspector_close(WebKitWebInspector *i, Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i GtkWidget *w; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if (!c->isinspecting) Err gopher.r-36.net 70 i@@ -696,14 +729,16 @@ inspector_close(WebKitWebInspector *i, Client *c) { Err gopher.r-36.net 70 i return true; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-inspector_finished(WebKitWebInspector *i, Client *c) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+inspector_finished(WebKitWebInspector *i, Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i g_free(c->inspector); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static gboolean Err gopher.r-36.net 70 i-keypress(GtkAccelGroup *group, GObject *obj, Err gopher.r-36.net 70 i- guint key, GdkModifierType mods, Client *c) { Err gopher.r-36.net 70 i+gboolean Err gopher.r-36.net 70 i+keypress(GtkAccelGroup *group, GObject *obj, guint key, GdkModifierType mods, Err gopher.r-36.net 70 i+ Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i guint i; Err gopher.r-36.net 70 i gboolean processed = FALSE; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -712,8 +747,8 @@ keypress(GtkAccelGroup *group, GObject *obj, Err gopher.r-36.net 70 i updatewinid(c); Err gopher.r-36.net 70 i for (i = 0; i < LENGTH(keys); i++) { Err gopher.r-36.net 70 i if (key == keys[i].keyval Err gopher.r-36.net 70 i- && mods == keys[i].mod Err gopher.r-36.net 70 i- && keys[i].func) { Err gopher.r-36.net 70 i+ && mods == keys[i].mod Err gopher.r-36.net 70 i+ && keys[i].func) { Err gopher.r-36.net 70 i keys[i].func(c, &(keys[i].arg)); Err gopher.r-36.net 70 i processed = TRUE; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -722,8 +757,9 @@ keypress(GtkAccelGroup *group, GObject *obj, Err gopher.r-36.net 70 i return processed; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i if (l) { Err gopher.r-36.net 70 i c->linkhover = copystr(&c->linkhover, l); Err gopher.r-36.net 70 i } else if (c->linkhover) { Err gopher.r-36.net 70 i@@ -733,8 +769,9 @@ linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) { Err gopher.r-36.net 70 i updatetitle(c); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i WebKitWebFrame *frame; Err gopher.r-36.net 70 i WebKitWebDataSource *src; Err gopher.r-36.net 70 i WebKitNetworkRequest *request; Err gopher.r-36.net 70 i@@ -751,13 +788,13 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) { Err gopher.r-36.net 70 i request = webkit_web_data_source_get_request(src); Err gopher.r-36.net 70 i msg = webkit_network_request_get_message(request); Err gopher.r-36.net 70 i c->sslfailed = !(soup_message_get_flags(msg) Err gopher.r-36.net 70 i- & SOUP_MESSAGE_CERTIFICATE_TRUSTED); Err gopher.r-36.net 70 i+ & SOUP_MESSAGE_CERTIFICATE_TRUSTED); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i setatom(c, AtomUri, uri); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if (enablestyles) { Err gopher.r-36.net 70 i g_object_set(G_OBJECT(set), "user-stylesheet-uri", Err gopher.r-36.net 70 i- getstyle(uri), NULL); Err gopher.r-36.net 70 i+ getstyle(uri), NULL); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case WEBKIT_LOAD_FINISHED: Err gopher.r-36.net 70 i@@ -773,8 +810,9 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) { Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-loaduri(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+loaduri(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i char *u = NULL, *rp; Err gopher.r-36.net 70 i const char *uri = (char *)arg->v; Err gopher.r-36.net 70 i Arg a = { .b = FALSE }; Err gopher.r-36.net 70 i@@ -790,7 +828,7 @@ loaduri(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i free(rp); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i u = g_strrstr(uri, "://") ? g_strdup(uri) Err gopher.r-36.net 70 i- : g_strdup_printf("http://%s", uri); Err gopher.r-36.net 70 i+ : g_strdup_printf("http://%s", uri); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i setatom(c, AtomUri, uri); Err gopher.r-36.net 70 i@@ -807,14 +845,16 @@ loaduri(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i g_free(u); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-navigate(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+navigate(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i int steps = *(int *)arg; Err gopher.r-36.net 70 i webkit_web_view_go_back_or_forward(c->view, steps); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static Client * Err gopher.r-36.net 70 i-newclient(void) { Err gopher.r-36.net 70 i+Client * Err gopher.r-36.net 70 i+newclient(void) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i Client *c; Err gopher.r-36.net 70 i WebKitWebSettings *settings; Err gopher.r-36.net 70 i WebKitWebFrame *frame; Err gopher.r-36.net 70 i@@ -851,11 +891,11 @@ newclient(void) { Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i gtk_window_set_default_size(GTK_WINDOW(c->win), 800, 600); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->win), Err gopher.r-36.net 70 i- "destroy", Err gopher.r-36.net 70 i- G_CALLBACK(destroywin), c); Err gopher.r-36.net 70 i+ "destroy", Err gopher.r-36.net 70 i+ G_CALLBACK(destroywin), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->win), Err gopher.r-36.net 70 i- "leave_notify_event", Err gopher.r-36.net 70 i- G_CALLBACK(titlechangeleave), c); Err gopher.r-36.net 70 i+ "leave_notify_event", Err gopher.r-36.net 70 i+ G_CALLBACK(titlechangeleave), c); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if (!kioskmode) Err gopher.r-36.net 70 i addaccelgroup(c); Err gopher.r-36.net 70 i@@ -871,61 +911,63 @@ newclient(void) { Err gopher.r-36.net 70 i c->view = WEBKIT_WEB_VIEW(webkit_web_view_new()); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i- "notify::title", Err gopher.r-36.net 70 i- G_CALLBACK(titlechange), c); Err gopher.r-36.net 70 i+ "notify::title", Err gopher.r-36.net 70 i+ G_CALLBACK(titlechange), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i- "hovering-over-link", Err gopher.r-36.net 70 i- G_CALLBACK(linkhover), c); Err gopher.r-36.net 70 i+ "hovering-over-link", Err gopher.r-36.net 70 i+ G_CALLBACK(linkhover), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i- "geolocation-policy-decision-requested", Err gopher.r-36.net 70 i- G_CALLBACK(geopolicyrequested), c); Err gopher.r-36.net 70 i+ "geolocation-policy-decision-requested", Err gopher.r-36.net 70 i+ G_CALLBACK(geopolicyrequested), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i- "create-web-view", Err gopher.r-36.net 70 i- G_CALLBACK(createwindow), c); Err gopher.r-36.net 70 i+ "create-web-view", Err gopher.r-36.net 70 i+ G_CALLBACK(createwindow), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i- "new-window-policy-decision-requested", Err gopher.r-36.net 70 i- G_CALLBACK(decidewindow), c); Err gopher.r-36.net 70 i+ "new-window-policy-decision-requested", Err gopher.r-36.net 70 i+ G_CALLBACK(decidewindow), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i- "mime-type-policy-decision-requested", Err gopher.r-36.net 70 i- G_CALLBACK(decidedownload), c); Err gopher.r-36.net 70 i+ "mime-type-policy-decision-requested", Err gopher.r-36.net 70 i+ G_CALLBACK(decidedownload), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i- "window-object-cleared", Err gopher.r-36.net 70 i- G_CALLBACK(windowobjectcleared), c); Err gopher.r-36.net 70 i+ "window-object-cleared", Err gopher.r-36.net 70 i+ G_CALLBACK(windowobjectcleared), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i- "notify::load-status", Err gopher.r-36.net 70 i- G_CALLBACK(loadstatuschange), c); Err gopher.r-36.net 70 i+ "notify::load-status", Err gopher.r-36.net 70 i+ G_CALLBACK(loadstatuschange), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i- "notify::progress", Err gopher.r-36.net 70 i- G_CALLBACK(progresschange), c); Err gopher.r-36.net 70 i+ "notify::progress", Err gopher.r-36.net 70 i+ G_CALLBACK(progresschange), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i- "download-requested", Err gopher.r-36.net 70 i- G_CALLBACK(initdownload), c); Err gopher.r-36.net 70 i+ "download-requested", Err gopher.r-36.net 70 i+ G_CALLBACK(initdownload), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i- "button-release-event", Err gopher.r-36.net 70 i- G_CALLBACK(buttonrelease), c); Err gopher.r-36.net 70 i+ "button-release-event", Err gopher.r-36.net 70 i+ G_CALLBACK(buttonrelease), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i- "context-menu", Err gopher.r-36.net 70 i- G_CALLBACK(contextmenu), c); Err gopher.r-36.net 70 i+ "context-menu", Err gopher.r-36.net 70 i+ G_CALLBACK(contextmenu), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i- "resource-request-starting", Err gopher.r-36.net 70 i- G_CALLBACK(beforerequest), c); Err gopher.r-36.net 70 i+ "resource-request-starting", Err gopher.r-36.net 70 i+ G_CALLBACK(beforerequest), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i- "should-show-delete-interface-for-element", Err gopher.r-36.net 70 i- G_CALLBACK(deletion_interface), c); Err gopher.r-36.net 70 i+ "should-show-delete-interface-for-element", Err gopher.r-36.net 70 i+ G_CALLBACK(deletion_interface), c); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Scrolled Window */ Err gopher.r-36.net 70 i c->scroll = gtk_scrolled_window_new(NULL, NULL); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i frame = webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(c->view)); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(frame), "scrollbars-policy-changed", Err gopher.r-36.net 70 i- G_CALLBACK(gtk_true), NULL); Err gopher.r-36.net 70 i+ G_CALLBACK(gtk_true), NULL); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if (!enablescrollbars) { Err gopher.r-36.net 70 i gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll), Err gopher.r-36.net 70 i- GTK_POLICY_NEVER, GTK_POLICY_NEVER); Err gopher.r-36.net 70 i+ GTK_POLICY_NEVER, Err gopher.r-36.net 70 i+ GTK_POLICY_NEVER); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll), Err gopher.r-36.net 70 i- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); Err gopher.r-36.net 70 i+ GTK_POLICY_AUTOMATIC, Err gopher.r-36.net 70 i+ GTK_POLICY_AUTOMATIC); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Arranging */ Err gopher.r-36.net 70 i@@ -934,8 +976,8 @@ newclient(void) { Err gopher.r-36.net 70 i gtk_container_add(GTK_CONTAINER(c->vbox), c->scroll); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Setup */ Err gopher.r-36.net 70 i- gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE, Err gopher.r-36.net 70 i- TRUE, 0, GTK_PACK_START); Err gopher.r-36.net 70 i+ gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE, TRUE, 0, Err gopher.r-36.net 70 i+ GTK_PACK_START); Err gopher.r-36.net 70 i gtk_widget_grab_focus(GTK_WIDGET(c->view)); Err gopher.r-36.net 70 i gtk_widget_show(c->pane); Err gopher.r-36.net 70 i gtk_widget_show(c->vbox); Err gopher.r-36.net 70 i@@ -943,7 +985,7 @@ newclient(void) { Err gopher.r-36.net 70 i gtk_widget_show(GTK_WIDGET(c->view)); Err gopher.r-36.net 70 i gtk_widget_show(c->win); Err gopher.r-36.net 70 i gtk_window_set_geometry_hints(GTK_WINDOW(c->win), NULL, &hints, Err gopher.r-36.net 70 i- GDK_HINT_MIN_SIZE); Err gopher.r-36.net 70 i+ GDK_HINT_MIN_SIZE); Err gopher.r-36.net 70 i gdk_window_set_events(GTK_WIDGET(c->win)->window, GDK_ALL_EVENTS_MASK); Err gopher.r-36.net 70 i gdk_window_add_filter(GTK_WIDGET(c->win)->window, processx, c); Err gopher.r-36.net 70 i webkit_web_view_set_full_content_zoom(c->view, TRUE); Err gopher.r-36.net 70 i@@ -955,25 +997,26 @@ newclient(void) { Err gopher.r-36.net 70 i ua = useragent; Err gopher.r-36.net 70 i g_object_set(G_OBJECT(settings), "user-agent", ua, NULL); Err gopher.r-36.net 70 i if (enablestyles) { Err gopher.r-36.net 70 i- g_object_set(G_OBJECT(settings), "user-stylesheet-uri", Err gopher.r-36.net 70 i- getstyle("about:blank"), NULL); Err gopher.r-36.net 70 i+ g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i+ "user-stylesheet-uri", getstyle("about:blank"), Err gopher.r-36.net 70 i+ NULL); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- g_object_set(G_OBJECT(settings), "auto-load-images", loadimages, Err gopher.r-36.net 70 i- NULL); Err gopher.r-36.net 70 i- g_object_set(G_OBJECT(settings), "enable-plugins", enableplugins, Err gopher.r-36.net 70 i- NULL); Err gopher.r-36.net 70 i- g_object_set(G_OBJECT(settings), "enable-scripts", enablescripts, Err gopher.r-36.net 70 i- NULL); Err gopher.r-36.net 70 i- g_object_set(G_OBJECT(settings), "enable-spatial-navigation", Err gopher.r-36.net 70 i- enablespatialbrowsing, NULL); Err gopher.r-36.net 70 i- g_object_set(G_OBJECT(settings), "enable-developer-extras", Err gopher.r-36.net 70 i- enableinspector, NULL); Err gopher.r-36.net 70 i- g_object_set(G_OBJECT(settings), "enable-default-context-menu", Err gopher.r-36.net 70 i- kioskmode ^ 1, NULL); Err gopher.r-36.net 70 i- g_object_set(G_OBJECT(settings), "default-font-size", Err gopher.r-36.net 70 i- defaultfontsize, NULL); Err gopher.r-36.net 70 i- g_object_set(G_OBJECT(settings), "resizable-text-areas", Err gopher.r-36.net 70 i- 1, NULL); Err gopher.r-36.net 70 i+ g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i+ "auto-load-images", loadimages, NULL); Err gopher.r-36.net 70 i+ g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i+ "enable-plugins", enableplugins, NULL); Err gopher.r-36.net 70 i+ g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i+ "enable-scripts", enablescripts, NULL); Err gopher.r-36.net 70 i+ g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i+ "enable-spatial-navigation", enablespatialbrowsing, NULL); Err gopher.r-36.net 70 i+ g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i+ "enable-developer-extras", enableinspector, NULL); Err gopher.r-36.net 70 i+ g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i+ "enable-default-context-menu", kioskmode ^ 1, NULL); Err gopher.r-36.net 70 i+ g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i+ "default-font-size", defaultfontsize, NULL); Err gopher.r-36.net 70 i+ g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i+ "resizable-text-areas", 1, NULL); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Err gopher.r-36.net 70 i * While stupid, CSS specifies that a pixel represents 1/96 of an inch. Err gopher.r-36.net 70 i@@ -984,8 +1027,8 @@ newclient(void) { Err gopher.r-36.net 70 i screen = gdk_window_get_screen(GTK_WIDGET(c->win)->window); Err gopher.r-36.net 70 i dpi = gdk_screen_get_resolution(screen); Err gopher.r-36.net 70 i if (dpi != -1) { Err gopher.r-36.net 70 i- g_object_set(G_OBJECT(settings), "enforce-96-dpi", true, Err gopher.r-36.net 70 i- NULL); Err gopher.r-36.net 70 i+ g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i+ "enforce-96-dpi", true, NULL); Err gopher.r-36.net 70 i webkit_web_view_set_zoom_level(c->view, dpi/96); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -994,16 +1037,15 @@ newclient(void) { Err gopher.r-36.net 70 i webkit_web_view_set_zoom_level(c->view, zoomlevel); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if (enableinspector) { Err gopher.r-36.net 70 i- c->inspector = WEBKIT_WEB_INSPECTOR( Err gopher.r-36.net 70 i- webkit_web_view_get_inspector(c->view)); Err gopher.r-36.net 70 i+ c->inspector = webkit_web_view_get_inspector(c->view); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->inspector), "inspect-web-view", Err gopher.r-36.net 70 i- G_CALLBACK(inspector_new), c); Err gopher.r-36.net 70 i+ G_CALLBACK(inspector_new), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->inspector), "show-window", Err gopher.r-36.net 70 i- G_CALLBACK(inspector_show), c); Err gopher.r-36.net 70 i+ G_CALLBACK(inspector_show), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->inspector), "close-window", Err gopher.r-36.net 70 i- G_CALLBACK(inspector_close), c); Err gopher.r-36.net 70 i+ G_CALLBACK(inspector_close), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->inspector), "finished", Err gopher.r-36.net 70 i- G_CALLBACK(inspector_finished), c); Err gopher.r-36.net 70 i+ G_CALLBACK(inspector_finished), c); Err gopher.r-36.net 70 i c->isinspecting = false; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1023,7 +1065,7 @@ newclient(void) { Err gopher.r-36.net 70 i if (showxid) { Err gopher.r-36.net 70 i gdk_display_sync(gtk_widget_get_display(c->win)); Err gopher.r-36.net 70 i printf("%u\n", Err gopher.r-36.net 70 i- (guint)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window)); Err gopher.r-36.net 70 i+ (guint)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window)); Err gopher.r-36.net 70 i fflush(NULL); Err gopher.r-36.net 70 i if (fclose(stdout) != 0) { Err gopher.r-36.net 70 i die("Error closing stdout"); Err gopher.r-36.net 70 i@@ -1033,8 +1075,9 @@ newclient(void) { Err gopher.r-36.net 70 i return c; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-newwindow(Client *c, const Arg *arg, gboolean noembed) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+newwindow(Client *c, const Arg *arg, gboolean noembed) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i guint i = 0; Err gopher.r-36.net 70 i const char *cmd[18], *uri; Err gopher.r-36.net 70 i const Arg a = { .v = (void *)cmd }; Err gopher.r-36.net 70 i@@ -1074,21 +1117,22 @@ newwindow(Client *c, const Arg *arg, gboolean noembed) { Err gopher.r-36.net 70 i spawn(NULL, &a); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static gboolean Err gopher.r-36.net 70 i+gboolean Err gopher.r-36.net 70 i contextmenu(WebKitWebView *view, GtkWidget *menu, WebKitHitTestResult *target, Err gopher.r-36.net 70 i- gboolean keyboard, Client *c) { Err gopher.r-36.net 70 i+ gboolean keyboard, Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i GList *items = gtk_container_get_children(GTK_CONTAINER(GTK_MENU(menu))); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for (GList *l = items; l; l = l->next) { Err gopher.r-36.net 70 i+ for (GList *l = items; l; l = l->next) Err gopher.r-36.net 70 i g_signal_connect(l->data, "activate", G_CALLBACK(menuactivate), c); Err gopher.r-36.net 70 i- } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i g_list_free(items); Err gopher.r-36.net 70 i return FALSE; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-menuactivate(GtkMenuItem *item, Client *c) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+menuactivate(GtkMenuItem *item, Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i /* Err gopher.r-36.net 70 i * context-menu-action-2000 open link Err gopher.r-36.net 70 i * context-menu-action-1 open link in window Err gopher.r-36.net 70 i@@ -1122,20 +1166,23 @@ menuactivate(GtkMenuItem *item, Client *c) { Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-pasteuri(GtkClipboard *clipboard, const char *text, gpointer d) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+pasteuri(GtkClipboard *clipboard, const char *text, gpointer d) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i Arg arg = {.v = text }; Err gopher.r-36.net 70 i if (text != NULL) Err gopher.r-36.net 70 i loaduri((Client *) d, &arg); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-print(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+print(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i webkit_web_frame_print(webkit_web_view_get_main_frame(c->view)); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static GdkFilterReturn Err gopher.r-36.net 70 i-processx(GdkXEvent *e, GdkEvent *event, gpointer d) { Err gopher.r-36.net 70 i+GdkFilterReturn Err gopher.r-36.net 70 i+processx(GdkXEvent *e, GdkEvent *event, gpointer d) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i Client *c = (Client *)d; Err gopher.r-36.net 70 i XPropertyEvent *ev; Err gopher.r-36.net 70 i Arg arg; Err gopher.r-36.net 70 i@@ -1159,54 +1206,59 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) { Err gopher.r-36.net 70 i return GDK_FILTER_CONTINUE; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i c->progress = webkit_web_view_get_progress(c->view) * 100; Err gopher.r-36.net 70 i updatetitle(c); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-linkopen(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+linkopen(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i newwindow(NULL, arg, 1); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-linkopenembed(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+linkopenembed(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i newwindow(NULL, arg, 0); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-reload(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+reload(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i gboolean nocache = *(gboolean *)arg; Err gopher.r-36.net 70 i- if (nocache) { Err gopher.r-36.net 70 i+ if (nocache) Err gopher.r-36.net 70 i webkit_web_view_reload_bypass_cache(c->view); Err gopher.r-36.net 70 i- } else { Err gopher.r-36.net 70 i+ else Err gopher.r-36.net 70 i webkit_web_view_reload(c->view); Err gopher.r-36.net 70 i- } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-scroll_h(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+scroll_h(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i scroll(gtk_scrolled_window_get_hadjustment( Err gopher.r-36.net 70 i- GTK_SCROLLED_WINDOW(c->scroll)), arg); Err gopher.r-36.net 70 i+ GTK_SCROLLED_WINDOW(c->scroll)), arg); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-scroll_v(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+scroll_v(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i scroll(gtk_scrolled_window_get_vadjustment( Err gopher.r-36.net 70 i- GTK_SCROLLED_WINDOW(c->scroll)), arg); Err gopher.r-36.net 70 i+ GTK_SCROLLED_WINDOW(c->scroll)), arg); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-scroll(GtkAdjustment *a, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+scroll(GtkAdjustment *a, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i gdouble v; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i v = gtk_adjustment_get_value(a); Err gopher.r-36.net 70 i switch (arg->i) { Err gopher.r-36.net 70 i case +10000: Err gopher.r-36.net 70 i case -10000: Err gopher.r-36.net 70 i- v += gtk_adjustment_get_page_increment(a) * Err gopher.r-36.net 70 i- (arg->i / 10000); Err gopher.r-36.net 70 i+ v += gtk_adjustment_get_page_increment(a) * (arg->i / 10000); Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case +20000: Err gopher.r-36.net 70 i case -20000: Err gopher.r-36.net 70 i@@ -1216,20 +1268,22 @@ scroll(GtkAdjustment *a, const Arg *arg) { Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i v = MAX(v, 0.0); Err gopher.r-36.net 70 i v = MIN(v, gtk_adjustment_get_upper(a) - Err gopher.r-36.net 70 i- gtk_adjustment_get_page_size(a)); Err gopher.r-36.net 70 i+ gtk_adjustment_get_page_size(a)); Err gopher.r-36.net 70 i gtk_adjustment_set_value(a, v); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-setatom(Client *c, int a, const char *v) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+setatom(Client *c, int a, const char *v) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i XSync(dpy, False); Err gopher.r-36.net 70 i XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), Err gopher.r-36.net 70 i- atoms[a], XA_STRING, 8, PropModeReplace, Err gopher.r-36.net 70 i- (unsigned char *)v, strlen(v) + 1); Err gopher.r-36.net 70 i+ atoms[a], XA_STRING, 8, PropModeReplace, Err gopher.r-36.net 70 i+ (unsigned char *)v, strlen(v) + 1); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-setup(void) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+setup(void) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i int i; Err gopher.r-36.net 70 i char *proxy; Err gopher.r-36.net 70 i char *new_proxy; Err gopher.r-36.net 70 i@@ -1256,15 +1310,14 @@ setup(void) { Err gopher.r-36.net 70 i if (stylefile == NULL) { Err gopher.r-36.net 70 i for (i = 0; i < LENGTH(styles); i++) { Err gopher.r-36.net 70 i if (regcomp(&(styles[i].re), styles[i].regex, Err gopher.r-36.net 70 i- REG_EXTENDED)) { Err gopher.r-36.net 70 i+ REG_EXTENDED)) { Err gopher.r-36.net 70 i fprintf(stderr, Err gopher.r-36.net 70 i- "Could not compile regex: %s\n", Err gopher.r-36.net 70 i- styles[i].regex); Err gopher.r-36.net 70 i+ "Could not compile regex: %s\n", Err gopher.r-36.net 70 i+ styles[i].regex); Err gopher.r-36.net 70 i styles[i].regex = NULL; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- styles[i].style = buildfile( Err gopher.r-36.net 70 i- g_strconcat(styledir, "/", Err gopher.r-36.net 70 i- styles[i].style, NULL)); Err gopher.r-36.net 70 i+ styles[i].style = buildfile(g_strconcat(styledir, "/", Err gopher.r-36.net 70 i+ styles[i].style, NULL)); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i stylefile = buildfile(stylefile); Err gopher.r-36.net 70 i@@ -1275,12 +1328,13 @@ setup(void) { Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* cookie jar */ Err gopher.r-36.net 70 i soup_session_add_feature(s, Err gopher.r-36.net 70 i- SOUP_SESSION_FEATURE(cookiejar_new(cookiefile, FALSE, Err gopher.r-36.net 70 i- cookiepolicy_get()))); Err gopher.r-36.net 70 i+ SOUP_SESSION_FEATURE(cookiejar_new(cookiefile, Err gopher.r-36.net 70 i+ FALSE, cookiepolicy_get()))); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* disk cache */ Err gopher.r-36.net 70 i if (enablediskcache) { Err gopher.r-36.net 70 i- diskcache = soup_cache_new(cachefolder, SOUP_CACHE_SINGLE_USER); Err gopher.r-36.net 70 i+ diskcache = soup_cache_new(cachefolder, Err gopher.r-36.net 70 i+ SOUP_CACHE_SINGLE_USER); Err gopher.r-36.net 70 i soup_cache_set_max_size(diskcache, diskcachebytes); Err gopher.r-36.net 70 i soup_cache_load(diskcache); Err gopher.r-36.net 70 i soup_session_add_feature(s, SOUP_SESSION_FEATURE(diskcache)); Err gopher.r-36.net 70 i@@ -1290,7 +1344,8 @@ setup(void) { Err gopher.r-36.net 70 i tlsdb = g_tls_file_database_new(cafile, &error); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if (error) { Err gopher.r-36.net 70 i- g_warning("Error loading SSL database %s: %s", cafile, error->message); Err gopher.r-36.net 70 i+ g_warning("Error loading SSL database %s: %s", cafile, Err gopher.r-36.net 70 i+ error->message); Err gopher.r-36.net 70 i g_error_free(error); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i g_object_set(G_OBJECT(s), "tls-database", tlsdb, NULL); Err gopher.r-36.net 70 i@@ -1299,11 +1354,11 @@ setup(void) { Err gopher.r-36.net 70 i /* proxy */ Err gopher.r-36.net 70 i if ((proxy = getenv("http_proxy")) && strcmp(proxy, "")) { Err gopher.r-36.net 70 i new_proxy = g_strrstr(proxy, "http://") Err gopher.r-36.net 70 i- || g_strrstr(proxy, "socks://") Err gopher.r-36.net 70 i- || g_strrstr(proxy, "socks4://") Err gopher.r-36.net 70 i- || g_strrstr(proxy, "socks5://") Err gopher.r-36.net 70 i- ? g_strdup(proxy) Err gopher.r-36.net 70 i- : g_strdup_printf("http://%s", proxy); Err gopher.r-36.net 70 i+ || g_strrstr(proxy, "socks://") Err gopher.r-36.net 70 i+ || g_strrstr(proxy, "socks4://") Err gopher.r-36.net 70 i+ || g_strrstr(proxy, "socks5://") Err gopher.r-36.net 70 i+ ? g_strdup(proxy) Err gopher.r-36.net 70 i+ : g_strdup_printf("http://%s", proxy); Err gopher.r-36.net 70 i puri = soup_uri_new(new_proxy); Err gopher.r-36.net 70 i g_object_set(G_OBJECT(s), "proxy-uri", puri, NULL); Err gopher.r-36.net 70 i soup_uri_free(puri); Err gopher.r-36.net 70 i@@ -1312,15 +1367,17 @@ setup(void) { Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-sigchld(int unused) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+sigchld(int unused) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i if (signal(SIGCHLD, sigchld) == SIG_ERR) Err gopher.r-36.net 70 i die("Can't install SIGCHLD handler"); Err gopher.r-36.net 70 i while (0 < waitpid(-1, NULL, WNOHANG)); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-source(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+source(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i Arg a = { .b = FALSE }; Err gopher.r-36.net 70 i gboolean s; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1329,8 +1386,9 @@ source(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i reload(c, &a); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-spawn(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+spawn(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i if (fork() == 0) { Err gopher.r-36.net 70 i if (dpy) Err gopher.r-36.net 70 i close(ConnectionNumber(dpy)); Err gopher.r-36.net 70 i@@ -1342,20 +1400,23 @@ spawn(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-eval(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+eval(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i WebKitWebFrame *frame = webkit_web_view_get_main_frame(c->view); Err gopher.r-36.net 70 i evalscript(webkit_web_frame_get_global_context(frame), Err gopher.r-36.net 70 i- ((char **)arg->v)[0], ""); Err gopher.r-36.net 70 i+ ((char **)arg->v)[0], ""); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-stop(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+stop(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i webkit_web_view_stop_loading(c->view); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-ttitlechange(WebKitWebView *view, GParamSpec *pspec, Client *c) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+ttitlechange(WebKitWebView *view, GParamSpec *pspec, Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i const gchar *t = webkit_web_view_get_title(view); Err gopher.r-36.net 70 i if (t) { Err gopher.r-36.net 70 i c->title = copystr(&c->title, t); Err gopher.r-36.net 70 i@@ -1363,14 +1424,16 @@ titlechange(WebKitWebView *view, GParamSpec *pspec, Client *c) { Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-ttitlechangeleave(void *a, void *b, Client *c) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+ttitlechangeleave(void *a, void *b, Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i c->linkhover = NULL; Err gopher.r-36.net 70 i updatetitle(c); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-ttoggle(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+ttoggle(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i WebKitWebSettings *settings; Err gopher.r-36.net 70 i char *name = (char *)arg->v; Err gopher.r-36.net 70 i gboolean value; Err gopher.r-36.net 70 i@@ -1383,44 +1446,44 @@ toggle(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i reload(c, &a); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-ttogglecookiepolicy(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+ttogglecookiepolicy(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i SoupCookieJar *jar; Err gopher.r-36.net 70 i SoupCookieJarAcceptPolicy policy; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- jar = SOUP_COOKIE_JAR( Err gopher.r-36.net 70 i- soup_session_get_feature( Err gopher.r-36.net 70 i- webkit_get_default_session(), Err gopher.r-36.net 70 i- SOUP_TYPE_COOKIE_JAR)); Err gopher.r-36.net 70 i+ jar = SOUP_COOKIE_JAR(soup_session_get_feature( Err gopher.r-36.net 70 i+ webkit_get_default_session(), Err gopher.r-36.net 70 i+ SOUP_TYPE_COOKIE_JAR)); Err gopher.r-36.net 70 i g_object_get(G_OBJECT(jar), "accept-policy", &policy, NULL); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i policysel++; Err gopher.r-36.net 70 i if (policysel >= strlen(cookiepolicies)) Err gopher.r-36.net 70 i policysel = 0; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- g_object_set(G_OBJECT(jar), "accept-policy", Err gopher.r-36.net 70 i- cookiepolicy_get(), NULL); Err gopher.r-36.net 70 i+ g_object_set(G_OBJECT(jar), "accept-policy", cookiepolicy_get(), NULL); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i updatetitle(c); Err gopher.r-36.net 70 i /* Do not reload. */ Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-ttogglegeolocation(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+ttogglegeolocation(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i Arg a = { .b = FALSE }; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i allowgeolocation ^= 1; Err gopher.r-36.net 70 i- Err gopher.r-36.net 70 i reload(c, &a); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-ttwitch(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+ttwitch(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i GtkAdjustment *a; Err gopher.r-36.net 70 i gdouble v; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- a = gtk_scrolled_window_get_vadjustment( Err gopher.r-36.net 70 i- GTK_SCROLLED_WINDOW(c->scroll)); Err gopher.r-36.net 70 i+ a = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW( Err gopher.r-36.net 70 i+ c->scroll)); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i v = gtk_adjustment_get_value(a); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1428,23 +1491,27 @@ twitch(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i v = MAX(v, 0.0); Err gopher.r-36.net 70 i v = MIN(v, gtk_adjustment_get_upper(a) - Err gopher.r-36.net 70 i- gtk_adjustment_get_page_size(a)); Err gopher.r-36.net 70 i+ gtk_adjustment_get_page_size(a)); Err gopher.r-36.net 70 i gtk_adjustment_set_value(a, v); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-ttogglescrollbars(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+ttogglescrollbars(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i GtkPolicyType vspolicy; Err gopher.r-36.net 70 i Arg a; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(c->scroll), NULL, &vspolicy); Err gopher.r-36.net 70 i+ gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(c->scroll), NULL, Err gopher.r-36.net 70 i+ &vspolicy); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if (vspolicy == GTK_POLICY_AUTOMATIC) { Err gopher.r-36.net 70 i gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll), Err gopher.r-36.net 70 i- GTK_POLICY_NEVER, GTK_POLICY_NEVER); Err gopher.r-36.net 70 i+ GTK_POLICY_NEVER, Err gopher.r-36.net 70 i+ GTK_POLICY_NEVER); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll), Err gopher.r-36.net 70 i- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); Err gopher.r-36.net 70 i+ GTK_POLICY_AUTOMATIC, Err gopher.r-36.net 70 i+ GTK_POLICY_AUTOMATIC); Err gopher.r-36.net 70 i a.i = +1; Err gopher.r-36.net 70 i twitch(c, &a); Err gopher.r-36.net 70 i a.i = -1; Err gopher.r-36.net 70 i@@ -1452,8 +1519,9 @@ togglescrollbars(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-ttogglestyle(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+ttogglestyle(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i WebKitWebSettings *settings = webkit_web_view_get_settings(c->view); Err gopher.r-36.net 70 i char *uri; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1464,16 +1532,17 @@ togglestyle(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i updatetitle(c); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-gettogglestat(Client *c){ Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+gettogglestat(Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i gboolean value; Err gopher.r-36.net 70 i int p = 0; Err gopher.r-36.net 70 i WebKitWebSettings *settings = webkit_web_view_get_settings(c->view); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i togglestat[p++] = cookiepolicy_set(cookiepolicy_get()); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- g_object_get(G_OBJECT(settings), "enable-caret-browsing", Err gopher.r-36.net 70 i- &value, NULL); Err gopher.r-36.net 70 i+ g_object_get(G_OBJECT(settings), "enable-caret-browsing", &value, Err gopher.r-36.net 70 i+ NULL); Err gopher.r-36.net 70 i togglestat[p++] = value? 'C': 'c'; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i togglestat[p++] = allowgeolocation? 'G': 'g'; Err gopher.r-36.net 70 i@@ -1494,23 +1563,23 @@ gettogglestat(Client *c){ Err gopher.r-36.net 70 i togglestat[p] = '\0'; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-getpagestat(Client *c) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+getpagestat(Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i const char *uri = geturi(c); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if (strstr(uri, "https://") == uri) { Err gopher.r-36.net 70 i+ if (strstr(uri, "https://") == uri) Err gopher.r-36.net 70 i pagestat[0] = c->sslfailed ? 'U' : 'T'; Err gopher.r-36.net 70 i- } else { Err gopher.r-36.net 70 i+ else Err gopher.r-36.net 70 i pagestat[0] = '-'; Err gopher.r-36.net 70 i- } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i pagestat[1] = usingproxy ? 'P' : '-'; Err gopher.r-36.net 70 i pagestat[2] = '\0'; Err gopher.r-36.net 70 i- Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-updatetitle(Client *c) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+updatetitle(Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i char *t; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if (showindicators) { Err gopher.r-36.net 70 i@@ -1518,48 +1587,50 @@ updatetitle(Client *c) { Err gopher.r-36.net 70 i getpagestat(c); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if (c->linkhover) { Err gopher.r-36.net 70 i- t = g_strdup_printf("%s:%s | %s", togglestat, Err gopher.r-36.net 70 i- pagestat, c->linkhover); Err gopher.r-36.net 70 i+ t = g_strdup_printf("%s:%s | %s", togglestat, pagestat, Err gopher.r-36.net 70 i+ c->linkhover); Err gopher.r-36.net 70 i } else if (c->progress != 100) { Err gopher.r-36.net 70 i t = g_strdup_printf("[%i%%] %s:%s | %s", c->progress, Err gopher.r-36.net 70 i- togglestat, pagestat, Err gopher.r-36.net 70 i- (c->title == NULL)? "" : c->title); Err gopher.r-36.net 70 i+ togglestat, pagestat, Err gopher.r-36.net 70 i+ c->title == NULL ? "" : c->title); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i t = g_strdup_printf("%s:%s | %s", togglestat, pagestat, Err gopher.r-36.net 70 i- (c->title == NULL)? "" : c->title); Err gopher.r-36.net 70 i+ c->title == NULL ? "" : c->title); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i gtk_window_set_title(GTK_WINDOW(c->win), t); Err gopher.r-36.net 70 i g_free(t); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i- gtk_window_set_title(GTK_WINDOW(c->win), Err gopher.r-36.net 70 i- (c->title == NULL)? "" : c->title); Err gopher.r-36.net 70 i+ gtk_window_set_title(GTK_WINDOW(c->win), (c->title == NULL) ? Err gopher.r-36.net 70 i+ "" : c->title); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-updatewinid(Client *c) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+updatewinid(Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i snprintf(winid, LENGTH(winid), "%u", Err gopher.r-36.net 70 i- (int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window)); Err gopher.r-36.net 70 i+ (int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window)); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-usage(void) { Err gopher.r-36.net 70 i- die("usage: %s [-bBfFgGiIkKnNpPsSvx]" Err gopher.r-36.net 70 i- " [-a cookiepolicies ] " Err gopher.r-36.net 70 i- " [-c cookiefile] [-e xid] [-r scriptfile]" Err gopher.r-36.net 70 i- " [-t stylefile] [-u useragent] [-z zoomlevel]" Err gopher.r-36.net 70 i- " [uri]\n", basename(argv0)); Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+usage(void) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i+ die("usage: %s [-bBfFgGiIkKnNpPsSvx] [-a cookiepolicies ] " Err gopher.r-36.net 70 i+ "[-c cookiefile] [-e xid] [-r scriptfile] [-t stylefile] " Err gopher.r-36.net 70 i+ "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0)); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, Err gopher.r-36.net 70 i- JSObjectRef win, Client *c) { Err gopher.r-36.net 70 i+ JSObjectRef win, Client *c) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i runscript(frame); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-static void Err gopher.r-36.net 70 i-zoom(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+zoom(Client *c, const Arg *arg) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i c->zoomed = TRUE; Err gopher.r-36.net 70 i if (arg->i < 0) { Err gopher.r-36.net 70 i /* zoom out */ Err gopher.r-36.net 70 i@@ -1575,7 +1646,8 @@ zoom(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i int Err gopher.r-36.net 70 i-main(int argc, char *argv[]) { Err gopher.r-36.net 70 i+main(int argc, char *argv[]) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i Arg arg; Err gopher.r-36.net 70 i Client *c; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1662,8 +1734,8 @@ main(int argc, char *argv[]) { Err gopher.r-36.net 70 i useragent = EARGF(usage()); Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case 'v': Err gopher.r-36.net 70 i- die("surf-"VERSION", ©2009-2014 surf engineers, " Err gopher.r-36.net 70 i- "see LICENSE for details\n"); Err gopher.r-36.net 70 i+ die("surf-"VERSION", ©2009-2015 surf engineers, " Err gopher.r-36.net 70 i+ "see LICENSE for details\n"); Err gopher.r-36.net 70 i case 'x': Err gopher.r-36.net 70 i showxid = TRUE; Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i@@ -1678,11 +1750,10 @@ main(int argc, char *argv[]) { Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i setup(); Err gopher.r-36.net 70 i c = newclient(); Err gopher.r-36.net 70 i- if (arg.v) { Err gopher.r-36.net 70 i+ if (arg.v) Err gopher.r-36.net 70 i loaduri(clients, &arg); Err gopher.r-36.net 70 i- } else { Err gopher.r-36.net 70 i+ else Err gopher.r-36.net 70 i updatetitle(c); Err gopher.r-36.net 70 i- } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i gtk_main(); Err gopher.r-36.net 70 i cleanup(); Err gopher.r-36.net 70 .