X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=702eaf6d80768faae23c8535599322f9b57223a7;hb=badb84387e659ba1692c08f728ad6e7846d37818;hp=a15ed00fc8bef0f0419bd8f0a32a78dd10cc44c7;hpb=e96f191088efd2f687aeaa1903bd9b3c8133e1af;p=surf.git diff --git a/surf.c b/surf.c index a15ed00..702eaf6 100644 --- a/surf.c +++ b/surf.c @@ -20,12 +20,15 @@ #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)) #define COOKIEJAR_TYPE (cookiejar_get_type ()) #define COOKIEJAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), COOKIEJAR_TYPE, CookieJar)) @@ -39,22 +42,16 @@ union Arg { }; typedef struct Client { - GtkWidget *win, *scroll, *vbox, *indicator; + GtkWidget *win, *scroll, *vbox, *pane; WebKitWebView *view; + WebKitWebInspector *inspector; char *title, *linkhover; const char *uri, *needle; gint progress; - gboolean sslfailed; struct Client *next; - gboolean zoomed; + gboolean zoomed, fullscreen, isinspecting, sslfailed; } Client; -typedef struct { - char *label; - void (*func)(Client *c, const Arg *arg); - const Arg arg; -} Item; - typedef struct { guint mod; guint keyval; @@ -79,34 +76,59 @@ static Client *clients = NULL; static GdkNativeWindow embed = 0; static gboolean showxid = FALSE; static char winid[64]; -static gboolean loadimages = 1, enableplugins = 1, enablescripts = 1, - usingproxy = 0; -static char togglestat[5]; +static gboolean usingproxy = 0; +static char togglestat[6]; +static char pagestat[3]; +static void beforerequest(WebKitWebView *w, WebKitWebFrame *f, + WebKitWebResource *r, WebKitNetworkRequest *req, + WebKitNetworkResponse *resp, gpointer d); static char *buildpath(const char *path); -static gboolean buttonrelease(WebKitWebView *web, GdkEventButton *e, GList *gl); +static gboolean buttonrelease(WebKitWebView *web, GdkEventButton *e, + GList *gl); static void cleanup(void); static void clipboard(Client *c, const Arg *arg); -static void cookiejar_changed(SoupCookieJar *self, SoupCookie *old_cookie, SoupCookie *new_cookie); + +static void cookiejar_changed(SoupCookieJar *self, SoupCookie *old_cookie, + SoupCookie *new_cookie); static void cookiejar_finalize(GObject *self); static SoupCookieJar *cookiejar_new(const char *filename, gboolean read_only); -static void cookiejar_set_property(GObject *self, guint prop_id, const GValue *value, GParamSpec *pspec); +static void cookiejar_set_property(GObject *self, guint prop_id, + const GValue *value, GParamSpec *pspec); + static char *copystr(char **str, const char *src); -static WebKitWebView *createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c); -static gboolean decidedownload(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r, gchar *m, WebKitWebPolicyDecision *p, Client *c); -static gboolean decidewindow(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c); +static WebKitWebView *createwindow(WebKitWebView *v, WebKitWebFrame *f, + Client *c); +static gboolean decidedownload(WebKitWebView *v, WebKitWebFrame *f, + WebKitNetworkRequest *r, gchar *m, WebKitWebPolicyDecision *p, + Client *c); +static gboolean decidewindow(WebKitWebView *v, WebKitWebFrame *f, + WebKitNetworkRequest *r, WebKitWebNavigationAction *n, + WebKitWebPolicyDecision *p, Client *c); static void destroyclient(Client *c); static void destroywin(GtkWidget* w, Client *c); -static void die(char *str); -static void drawindicator(Client *c); -static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c); +static void die(const char *errstr, ...); +static void eval(Client *c, const Arg *arg); static void find(Client *c, const Arg *arg); +static void fullscreen(Client *c, const Arg *arg); static const char *getatom(Client *c, int a); +static void gettogglestat(Client *c); +static void getpagestat(Client *c); static char *geturi(Client *c); static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c); + +static void inspector(Client *c, const Arg *arg); +static WebKitWebView *inspector_new(WebKitWebInspector *i, WebKitWebView *v, + Client *c); +static gboolean inspector_show(WebKitWebInspector *i, Client *c); +static gboolean inspector_close(WebKitWebInspector *i, Client *c); +static void inspector_finished(WebKitWebInspector *i, Client *c); + static gboolean keypress(GtkWidget *w, GdkEventKey *ev, Client *c); -static void linkhover(WebKitWebView *v, const char* t, const char* l, Client *c); -static void loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c); +static void linkhover(WebKitWebView *v, const char* t, const char* l, + Client *c); +static void loadstatuschange(WebKitWebView *view, GParamSpec *pspec, + Client *c); static void loaduri(Client *c, const Arg *arg); static void navigate(Client *c, const Arg *arg); static Client *newclient(void); @@ -115,7 +137,8 @@ static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d); static void populatepopup(WebKitWebView *web, GtkMenu *menu, Client *c); static void popupactivate(GtkMenuItem *menu, Client *); static void print(Client *c, const Arg *arg); -static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d); +static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, + gpointer d); static void progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c); static void reload(Client *c, const Arg *arg); static void scroll_h(Client *c, const Arg *arg); @@ -126,21 +149,33 @@ static void setup(void); static void sigchld(int unused); static void source(Client *c, const Arg *arg); static void spawn(Client *c, const Arg *arg); -static void eval(Client *c, const Arg *arg); static void stop(Client *c, const Arg *arg); -static void titlechange(WebKitWebView *v, WebKitWebFrame* frame, const char* title, Client *c); +static void titlechange(WebKitWebView *v, WebKitWebFrame *frame, + const char *title, Client *c); static void toggle(Client *c, const Arg *arg); -static void gettogglestat(Client *c); +static void togglescrollbars(Client *c, const Arg *arg); +static void togglestyle(Client *c, const Arg *arg); static void update(Client *c); static void updatewinid(Client *c); static void usage(void); -static void windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c); +static void windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, + JSContextRef js, JSObjectRef win, Client *c); static void zoom(Client *c, const Arg *arg); /* configuration, allows nested code to access above variables */ #include "config.h" -char * +static void +beforerequest(WebKitWebView *w, WebKitWebFrame *f, WebKitWebResource *r, + WebKitNetworkRequest *req, WebKitNetworkResponse *resp, + gpointer d) { + const gchar *uri = webkit_network_request_get_uri(req); + + if(g_str_has_suffix(uri, "/favicon.ico")) + webkit_network_request_set_uri(req, "about:blank"); +} + +static char * buildpath(const char *path) { char *apath, *p; FILE *f; @@ -177,7 +212,8 @@ buildpath(const char *path) { static gboolean buttonrelease(WebKitWebView *web, GdkEventButton *e, GList *gl) { WebKitHitTestResultContext context; - WebKitHitTestResult *result = webkit_web_view_get_hit_test_result(web, e); + WebKitHitTestResult *result = webkit_web_view_get_hit_test_result(web, + e); Arg arg; g_object_get(result, "context", &context, NULL); @@ -191,7 +227,7 @@ buttonrelease(WebKitWebView *web, GdkEventButton *e, GList *gl) { return false; } -void +static void cleanup(void) { while(clients) destroyclient(clients); @@ -201,18 +237,23 @@ cleanup(void) { } static void -cookiejar_changed(SoupCookieJar *self, SoupCookie *old_cookie, SoupCookie *new_cookie) { +cookiejar_changed(SoupCookieJar *self, SoupCookie *old_cookie, + SoupCookie *new_cookie) { flock(COOKIEJAR(self)->lock, LOCK_EX); - if(new_cookie && !new_cookie->expires && sessiontime) - soup_cookie_set_expires(new_cookie, soup_date_new_from_now(sessiontime)); - SOUP_COOKIE_JAR_CLASS(cookiejar_parent_class)->changed(self, old_cookie, new_cookie); + if(new_cookie && !new_cookie->expires && sessiontime) { + soup_cookie_set_expires(new_cookie, + soup_date_new_from_now(sessiontime)); + } + SOUP_COOKIE_JAR_CLASS(cookiejar_parent_class)->changed(self, + old_cookie, new_cookie); flock(COOKIEJAR(self)->lock, LOCK_UN); } static void cookiejar_class_init(CookieJarClass *klass) { SOUP_COOKIE_JAR_CLASS(klass)->changed = cookiejar_changed; - G_OBJECT_CLASS(klass)->get_property = G_OBJECT_CLASS(cookiejar_parent_class)->get_property; + G_OBJECT_CLASS(klass)->get_property = + G_OBJECT_CLASS(cookiejar_parent_class)->get_property; G_OBJECT_CLASS(klass)->set_property = cookiejar_set_property; G_OBJECT_CLASS(klass)->finalize = cookiejar_finalize; g_object_class_override_property(G_OBJECT_CLASS(klass), 1, "filename"); @@ -237,45 +278,54 @@ cookiejar_new(const char *filename, gboolean read_only) { } static void -cookiejar_set_property(GObject *self, guint prop_id, const GValue *value, GParamSpec *pspec) { +cookiejar_set_property(GObject *self, guint prop_id, const GValue *value, + GParamSpec *pspec) { flock(COOKIEJAR(self)->lock, LOCK_SH); - G_OBJECT_CLASS(cookiejar_parent_class)->set_property(self, prop_id, value, pspec); + G_OBJECT_CLASS(cookiejar_parent_class)->set_property(self, prop_id, + value, pspec); flock(COOKIEJAR(self)->lock, LOCK_UN); } -void +static void evalscript(JSContextRef js, char *script, char* scriptname) { JSStringRef jsscript, jsscriptname; JSValueRef exception = NULL; jsscript = JSStringCreateWithUTF8CString(script); jsscriptname = JSStringCreateWithUTF8CString(scriptname); - JSEvaluateScript(js, jsscript, JSContextGetGlobalObject(js), jsscriptname, 0, &exception); + JSEvaluateScript(js, jsscript, JSContextGetGlobalObject(js), + jsscriptname, 0, &exception); JSStringRelease(jsscript); JSStringRelease(jsscriptname); } -void +static void runscript(WebKitWebFrame *frame) { char *script; GError *error; if(g_file_get_contents(scriptfile, &script, NULL, &error)) { - evalscript(webkit_web_frame_get_global_context(frame), script, scriptfile); + evalscript(webkit_web_frame_get_global_context(frame), + script, scriptfile); } } -void +static void clipboard(Client *c, const Arg *arg) { gboolean paste = *(gboolean *)arg; - if(paste) - gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteuri, c); - else - gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), c->linkhover ? c->linkhover : geturi(c), -1); + if(paste) { + gtk_clipboard_request_text( + gtk_clipboard_get(GDK_SELECTION_PRIMARY), + pasteuri, c); + } else { + gtk_clipboard_set_text( + gtk_clipboard_get(GDK_SELECTION_PRIMARY), + c->linkhover ? c->linkhover : geturi(c), -1); + } } -char * +static char * copystr(char **str, const char *src) { char *tmp; tmp = g_strdup(src); @@ -287,14 +337,15 @@ copystr(char **str, const char *src) { return tmp; } -WebKitWebView * +static WebKitWebView * createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c) { Client *n = newclient(); return n->view; } -gboolean -decidedownload(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r, gchar *m, WebKitWebPolicyDecision *p, Client *c) { +static gboolean +decidedownload(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r, + gchar *m, WebKitWebPolicyDecision *p, Client *c) { if(!webkit_web_view_can_show_mime_type(v, m)) { webkit_web_policy_decision_download(p); return TRUE; @@ -302,11 +353,14 @@ decidedownload(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r, gch return FALSE; } -gboolean -decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c) { +static gboolean +decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, + WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, + Client *c) { Arg arg; - if(webkit_web_navigation_action_get_reason(n) == WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) { + if(webkit_web_navigation_action_get_reason(n) == + WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) { webkit_web_policy_decision_ignore(p); arg.v = (void *)webkit_network_request_get_uri(r); newwindow(NULL, &arg, 0); @@ -315,82 +369,43 @@ decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, We return FALSE; } -void +static void destroyclient(Client *c) { Client *p; webkit_web_view_stop_loading(c->view); - gtk_widget_destroy(c->indicator); gtk_widget_destroy(GTK_WIDGET(c->view)); gtk_widget_destroy(c->scroll); gtk_widget_destroy(c->vbox); gtk_widget_destroy(c->win); for(p = clients; p && p->next != c; p = p->next); - if(p) + if(p) { p->next = c->next; - else + } else { clients = c->next; + } free(c); if(clients == NULL) gtk_main_quit(); } -void +static void destroywin(GtkWidget* w, Client *c) { destroyclient(c); } -void -die(char *str) { - fputs(str, stderr); - exit(EXIT_FAILURE); -} - -void -drawindicator(Client *c) { - gint width; - const char *uri; - char *colorname; - GtkWidget *w; - GdkGC *gc; - GdkColor fg; - - uri = geturi(c); - w = c->indicator; - width = c->progress * w->allocation.width / 100; - gc = gdk_gc_new(w->window); - if(strstr(uri, "https://") == uri) { - if(usingproxy) { - colorname = c->sslfailed? progress_proxy_untrust : progress_proxy_trust; - } else { - colorname = c->sslfailed? progress_untrust : progress_trust; - } - } else { - if(usingproxy) { - colorname = progress_proxy; - } else { - colorname = progress; - } - } - - gdk_color_parse(colorname, &fg); - gdk_gc_set_rgb_fg_color(gc, &fg); - gdk_draw_rectangle(w->window, - w->style->bg_gc[GTK_WIDGET_STATE(w)], - TRUE, 0, 0, w->allocation.width, w->allocation.height); - gdk_draw_rectangle(w->window, gc, TRUE, 0, 0, width, - w->allocation.height); - g_object_unref(gc); -} +static void +die(const char *errstr, ...) { + va_list ap; -gboolean -exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c) { - drawindicator(c); - return TRUE; + va_start(ap, errstr); + vfprintf(stderr, errstr, ap); + va_end(ap); + exit(EXIT_FAILURE); } -void +static void find(Client *c, const Arg *arg) { const char *s; @@ -399,7 +414,17 @@ find(Client *c, const Arg *arg) { webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE); } -const char * +static void +fullscreen(Client *c, const Arg *arg) { + if(c->fullscreen) { + gtk_window_unfullscreen(GTK_WINDOW(c->win)); + } else { + gtk_window_fullscreen(GTK_WINDOW(c->win)); + } + c->fullscreen = !c->fullscreen; +} + +static const char * getatom(Client *c, int a) { static char buf[BUFSIZ]; Atom adummy; @@ -410,15 +435,17 @@ getatom(Client *c, int a) { XGetWindowProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), atoms[a], 0L, BUFSIZ, False, XA_STRING, &adummy, &idummy, &ldummy, &ldummy, &p); - if(p) + if(p) { strncpy(buf, (char *)p, LENGTH(buf)-1); - else + } else { buf[0] = '\0'; + } XFree(p); + return buf; } -char * +static char * geturi(Client *c) { char *uri; @@ -427,7 +454,7 @@ geturi(Client *c) { return uri; } -gboolean +static gboolean initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) { Arg arg; @@ -437,7 +464,56 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) { return FALSE; } -gboolean +static void +inspector(Client *c, const Arg *arg) { + if(c->isinspecting) { + webkit_web_inspector_close(c->inspector); + } else { + webkit_web_inspector_show(c->inspector); + } +} + +static WebKitWebView * +inspector_new(WebKitWebInspector *i, WebKitWebView *v, Client *c) { + return WEBKIT_WEB_VIEW(webkit_web_view_new()); +} + +static gboolean +inspector_show(WebKitWebInspector *i, Client *c) { + WebKitWebView *w; + + if(c->isinspecting) + return false; + + w = webkit_web_inspector_get_web_view(i); + gtk_paned_pack2(GTK_PANED(c->pane), GTK_WIDGET(w), TRUE, TRUE); + gtk_widget_show(GTK_WIDGET(w)); + c->isinspecting = true; + + return true; +} + +static gboolean +inspector_close(WebKitWebInspector *i, Client *c) { + GtkWidget *w; + + if(!c->isinspecting) + return false; + + w = GTK_WIDGET(webkit_web_inspector_get_web_view(i)); + gtk_widget_hide(w); + gtk_widget_destroy(w); + c->isinspecting = false; + + return true; +} + +static void +inspector_finished(WebKitWebInspector *i, Client *c) { + g_free(c->inspector); +} + +static gboolean keypress(GtkWidget* w, GdkEventKey *ev, Client *c) { guint i; gboolean processed = FALSE; @@ -445,7 +521,7 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) { updatewinid(c); for(i = 0; i < LENGTH(keys); i++) { if(gdk_keyval_to_lower(ev->keyval) == keys[i].keyval - && (ev->state & keys[i].mod) == keys[i].mod + && CLEANMASK(ev->state) == keys[i].mod && keys[i].func) { keys[i].func(c, &(keys[i].arg)); processed = TRUE; @@ -455,7 +531,7 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) { return processed; } -void +static void linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) { if(l) { c->linkhover = copystr(&c->linkhover, l); @@ -466,7 +542,7 @@ linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) { update(c); } -void +static void loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) { WebKitWebFrame *frame; WebKitWebDataSource *src; @@ -496,7 +572,7 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) { } } -void +static void loaduri(Client *c, const Arg *arg) { char *u, *rp; const char *uri = (char *)arg->v; @@ -527,13 +603,13 @@ loaduri(Client *c, const Arg *arg) { } } -void +static void navigate(Client *c, const Arg *arg) { int steps = *(int *)arg; webkit_web_view_go_back_or_forward(c->view, steps); } -Client * +static Client * newclient(void) { Client *c; WebKitWebSettings *settings; @@ -565,69 +641,131 @@ newclient(void) { gtk_window_set_role(GTK_WINDOW(c->win), "Surf"); } gtk_window_set_default_size(GTK_WINDOW(c->win), 800, 600); - g_signal_connect(G_OBJECT(c->win), "destroy", G_CALLBACK(destroywin), c); - g_signal_connect(G_OBJECT(c->win), "key-press-event", G_CALLBACK(keypress), c); + g_signal_connect(G_OBJECT(c->win), + "destroy", + G_CALLBACK(destroywin), c); + if(!kioskmode) { + g_signal_connect(G_OBJECT(c->win), + "key-press-event", + G_CALLBACK(keypress), c); + } + + /* Pane */ + c->pane = gtk_vpaned_new(); /* VBox */ c->vbox = gtk_vbox_new(FALSE, 0); + gtk_paned_pack1(GTK_PANED(c->pane), c->vbox, TRUE, TRUE); + + /* Webview */ + c->view = WEBKIT_WEB_VIEW(webkit_web_view_new()); + + g_signal_connect(G_OBJECT(c->view), + "title-changed", + G_CALLBACK(titlechange), c); + g_signal_connect(G_OBJECT(c->view), + "hovering-over-link", + G_CALLBACK(linkhover), c); + g_signal_connect(G_OBJECT(c->view), + "create-web-view", + G_CALLBACK(createwindow), c); + g_signal_connect(G_OBJECT(c->view), + "new-window-policy-decision-requested", + G_CALLBACK(decidewindow), c); + g_signal_connect(G_OBJECT(c->view), + "mime-type-policy-decision-requested", + G_CALLBACK(decidedownload), c); + g_signal_connect(G_OBJECT(c->view), + "window-object-cleared", + G_CALLBACK(windowobjectcleared), c); + g_signal_connect(G_OBJECT(c->view), + "notify::load-status", + G_CALLBACK(loadstatuschange), c); + g_signal_connect(G_OBJECT(c->view), + "notify::progress", + G_CALLBACK(progresschange), c); + g_signal_connect(G_OBJECT(c->view), + "download-requested", + G_CALLBACK(initdownload), c); + g_signal_connect(G_OBJECT(c->view), + "button-release-event", + G_CALLBACK(buttonrelease), c); + g_signal_connect(G_OBJECT(c->view), + "populate-popup", + G_CALLBACK(populatepopup), c); + g_signal_connect(G_OBJECT(c->view), + "resource-request-starting", + G_CALLBACK(beforerequest), c); /* Scrolled Window */ c->scroll = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll), - GTK_POLICY_NEVER, GTK_POLICY_NEVER); - /* Webview */ - c->view = WEBKIT_WEB_VIEW(webkit_web_view_new()); - g_signal_connect(G_OBJECT(c->view), "title-changed", G_CALLBACK(titlechange), c); - g_signal_connect(G_OBJECT(c->view), "hovering-over-link", G_CALLBACK(linkhover), c); - g_signal_connect(G_OBJECT(c->view), "create-web-view", G_CALLBACK(createwindow), c); - g_signal_connect(G_OBJECT(c->view), "new-window-policy-decision-requested", G_CALLBACK(decidewindow), c); - g_signal_connect(G_OBJECT(c->view), "mime-type-policy-decision-requested", G_CALLBACK(decidedownload), c); - g_signal_connect(G_OBJECT(c->view), "window-object-cleared", G_CALLBACK(windowobjectcleared), c); - g_signal_connect(G_OBJECT(c->view), "notify::load-status", G_CALLBACK(loadstatuschange), c); - g_signal_connect(G_OBJECT(c->view), "notify::progress", G_CALLBACK(progresschange), c); - g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(initdownload), c); - g_signal_connect(G_OBJECT(c->view), "button-release-event", G_CALLBACK(buttonrelease), c); - g_signal_connect(G_OBJECT(c->view), "populate-popup", G_CALLBACK(populatepopup), c); - - /* Indicator */ - c->indicator = gtk_drawing_area_new(); - gtk_widget_set_size_request(c->indicator, 0, indicator_thickness); - g_signal_connect (G_OBJECT (c->indicator), "expose_event", - G_CALLBACK (exposeindicator), c); + frame = webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(c->view)); + g_signal_connect(G_OBJECT(frame), "scrollbars-policy-changed", + G_CALLBACK(gtk_true), NULL); + + if(!enablescrollbars) { + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll), + GTK_POLICY_NEVER, GTK_POLICY_NEVER); + } else { + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + } /* Arranging */ gtk_container_add(GTK_CONTAINER(c->scroll), GTK_WIDGET(c->view)); - gtk_container_add(GTK_CONTAINER(c->win), c->vbox); + gtk_container_add(GTK_CONTAINER(c->win), c->pane); gtk_container_add(GTK_CONTAINER(c->vbox), c->scroll); - gtk_container_add(GTK_CONTAINER(c->vbox), c->indicator); /* Setup */ - gtk_box_set_child_packing(GTK_BOX(c->vbox), c->indicator, FALSE, FALSE, 0, GTK_PACK_START); - gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE, TRUE, 0, GTK_PACK_START); + gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE, + TRUE, 0, GTK_PACK_START); gtk_widget_grab_focus(GTK_WIDGET(c->view)); + gtk_widget_show(c->pane); gtk_widget_show(c->vbox); gtk_widget_show(c->scroll); gtk_widget_show(GTK_WIDGET(c->view)); gtk_widget_show(c->win); - gtk_window_set_geometry_hints(GTK_WINDOW(c->win), NULL, &hints, GDK_HINT_MIN_SIZE); + gtk_window_set_geometry_hints(GTK_WINDOW(c->win), NULL, &hints, + GDK_HINT_MIN_SIZE); gdk_window_set_events(GTK_WIDGET(c->win)->window, GDK_ALL_EVENTS_MASK); gdk_window_add_filter(GTK_WIDGET(c->win)->window, processx, c); webkit_web_view_set_full_content_zoom(c->view, TRUE); - frame = webkit_web_view_get_main_frame(c->view); runscript(frame); + settings = webkit_web_view_get_settings(c->view); if(!(ua = getenv("SURF_USERAGENT"))) ua = useragent; g_object_set(G_OBJECT(settings), "user-agent", ua, NULL); uri = g_strconcat("file://", stylefile, NULL); g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL); - g_object_set(G_OBJECT(settings), "auto-load-images", loadimages, NULL); - g_object_set(G_OBJECT(settings), "enable-plugins", enableplugins, NULL); - g_object_set(G_OBJECT(settings), "enable-scripts", enablescripts, NULL); + g_object_set(G_OBJECT(settings), "auto-load-images", loadimages, + NULL); + g_object_set(G_OBJECT(settings), "enable-plugins", enableplugins, + NULL); + g_object_set(G_OBJECT(settings), "enable-scripts", enablescripts, + NULL); g_object_set(G_OBJECT(settings), "enable-spatial-navigation", - spatialbrowsing, NULL); + enablespatialbrowsing, NULL); + g_object_set(G_OBJECT(settings), "enable-developer-extras", + enableinspector, NULL); + g_object_set(G_OBJECT(settings), "enable-default-context-menu", + kioskmode ^ 1, NULL); + + if(enableinspector) { + c->inspector = WEBKIT_WEB_INSPECTOR( + webkit_web_view_get_inspector(c->view)); + g_signal_connect(G_OBJECT(c->inspector), "inspect-web-view", + G_CALLBACK(inspector_new), c); + g_signal_connect(G_OBJECT(c->inspector), "show-window", + G_CALLBACK(inspector_show), c); + g_signal_connect(G_OBJECT(c->inspector), "close-window", + G_CALLBACK(inspector_close), c); + g_signal_connect(G_OBJECT(c->inspector), "finished", + G_CALLBACK(inspector_finished), c); + c->isinspecting = false; + } g_free(uri); @@ -639,36 +777,43 @@ newclient(void) { c->title = NULL; c->next = clients; clients = c; + if(showxid) { gdk_display_sync(gtk_widget_get_display(c->win)); - printf("%u\n", (guint)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window)); + printf("%u\n", + (guint)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window)); fflush(NULL); if (fclose(stdout) != 0) { die("Error closing stdout"); } } + return c; } -void +static void newwindow(Client *c, const Arg *arg, gboolean noembed) { guint i = 0; - const char *cmd[10], *uri; + const char *cmd[12], *uri; const Arg a = { .v = (void *)cmd }; char tmp[64]; cmd[i++] = argv0; + if(!enablescrollbars) + cmd[i++] = "-b"; if(embed && !noembed) { cmd[i++] = "-e"; snprintf(tmp, LENGTH(tmp), "%u\n", (int)embed); cmd[i++] = tmp; } - if(!enablescripts) - cmd[i++] = "-s"; - if(!enableplugins) - cmd[i++] = "-p"; 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"; cmd[i++] = "--"; @@ -718,19 +863,19 @@ popupactivate(GtkMenuItem *menu, Client *c) { } } -void +static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d) { Arg arg = {.v = text }; if(text != NULL) loaduri((Client *) d, &arg); } -void +static void print(Client *c, const Arg *arg) { webkit_web_frame_print(webkit_web_view_get_main_frame(c->view)); } -GdkFilterReturn +static GdkFilterReturn processx(GdkXEvent *e, GdkEvent *event, gpointer d) { Client *c = (Client *)d; XPropertyEvent *ev; @@ -754,34 +899,35 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) { return GDK_FILTER_CONTINUE; } -void +static void progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c) { c->progress = webkit_web_view_get_progress(c->view) * 100; update(c); } -void +static void reload(Client *c, const Arg *arg) { gboolean nocache = *(gboolean *)arg; - if(nocache) + if(nocache) { webkit_web_view_reload_bypass_cache(c->view); - else + } else { webkit_web_view_reload(c->view); + } } -void +static void scroll_h(Client *c, const Arg *arg) { scroll(gtk_scrolled_window_get_hadjustment( GTK_SCROLLED_WINDOW(c->scroll)), arg); } -void +static void scroll_v(Client *c, const Arg *arg) { scroll(gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(c->scroll)), arg); } -void +static void scroll(GtkAdjustment *a, const Arg *arg) { gdouble v; @@ -804,15 +950,15 @@ scroll(GtkAdjustment *a, const Arg *arg) { gtk_adjustment_set_value(a, v); } -void +static void setatom(Client *c, int a, const char *v) { XSync(dpy, False); - XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), atoms[a], - XA_STRING, 8, PropModeReplace, (unsigned char *)v, - strlen(v) + 1); + XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), + atoms[a], XA_STRING, 8, PropModeReplace, + (unsigned char *)v, strlen(v) + 1); } -void +static void setup(void) { char *proxy; char *new_proxy; @@ -822,8 +968,6 @@ setup(void) { /* clean up any zombies immediately */ sigchld(0); gtk_init(NULL, NULL); - if (!g_thread_supported()) - g_thread_init(NULL); dpy = GDK_DISPLAY(); @@ -841,7 +985,9 @@ setup(void) { s = webkit_get_default_session(); /* cookie jar */ - soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar_new(cookiefile, FALSE))); + soup_session_add_feature(s, + SOUP_SESSION_FEATURE(cookiejar_new(cookiefile, + FALSE))); /* ssl */ g_object_set(G_OBJECT(s), "ssl-ca-file", cafile, NULL); @@ -859,14 +1005,14 @@ setup(void) { } } -void +static void sigchld(int unused) { if(signal(SIGCHLD, sigchld) == SIG_ERR) die("Can't install SIGCHLD handler"); while(0 < waitpid(-1, NULL, WNOHANG)); } -void +static void source(Client *c, const Arg *arg) { Arg a = { .b = FALSE }; gboolean s; @@ -876,7 +1022,7 @@ source(Client *c, const Arg *arg) { reload(c, &a); } -void +static void spawn(Client *c, const Arg *arg) { if(fork() == 0) { if(dpy) @@ -889,25 +1035,25 @@ spawn(Client *c, const Arg *arg) { } } -void +static void eval(Client *c, const Arg *arg) { WebKitWebFrame *frame = webkit_web_view_get_main_frame(c->view); evalscript(webkit_web_frame_get_global_context(frame), ((char **)arg->v)[0], ""); } -void +static void stop(Client *c, const Arg *arg) { webkit_web_view_stop_loading(c->view); } -void +static void titlechange(WebKitWebView *v, WebKitWebFrame *f, const char *t, Client *c) { c->title = copystr(&c->title, t); update(c); } -void +static void toggle(Client *c, const Arg *arg) { WebKitWebSettings *settings; char *name = (char *)arg->v; @@ -921,9 +1067,61 @@ toggle(Client *c, const Arg *arg) { reload(c,&a); } -void +static void +twitch(Client *c, const Arg *arg) { + GtkAdjustment *a; + gdouble v; + + a = gtk_scrolled_window_get_vadjustment( + GTK_SCROLLED_WINDOW(c->scroll)); + + v = gtk_adjustment_get_value(a); + + v += arg->i; + + v = MAX(v, 0.0); + v = MIN(v, gtk_adjustment_get_upper(a) - + gtk_adjustment_get_page_size(a)); + gtk_adjustment_set_value(a, v); +} + +static void +togglescrollbars(Client *c, const Arg *arg) { + GtkPolicyType vspolicy; + Arg a; + + gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(c->scroll), NULL, &vspolicy); + + if(vspolicy == GTK_POLICY_AUTOMATIC) { + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll), + GTK_POLICY_NEVER, GTK_POLICY_NEVER); + } else { + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + a.i = +1; + twitch(c, &a); + a.i = -1; + twitch(c, &a); + } +} + +static void +togglestyle(Client *c, const Arg *arg) { + WebKitWebSettings *settings; + char *uri; + + settings = webkit_web_view_get_settings(c->view); + g_object_get(G_OBJECT(settings), "user-stylesheet-uri", &uri, NULL); + uri = uri[0] ? g_strdup("") : g_strconcat("file://", stylefile, NULL); + g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL); + + update(c); +} + +static void gettogglestat(Client *c){ gboolean value; + char *uri; WebKitWebSettings *settings = webkit_web_view_get_settings(c->view); g_object_get(G_OBJECT(settings), "enable-caret-browsing", @@ -939,51 +1137,66 @@ gettogglestat(Client *c){ g_object_get(G_OBJECT(settings), "enable-plugins", &value, NULL); togglestat[3] = value? 'V': 'v'; - togglestat[4] = '\0'; + g_object_get(G_OBJECT(settings), "user-stylesheet-uri", &uri, NULL); + togglestat[4] = uri[0] ? 'M': 'm'; + + togglestat[5] = '\0'; } +static void +getpagestat(Client *c) { + const char *uri = geturi(c); + + if(strstr(uri, "https://") == uri) { + pagestat[0] = c->sslfailed ? 'U' : 'T'; + } else { + pagestat[0] = '-'; + } + + pagestat[1] = usingproxy ? 'P' : '-'; + pagestat[2] = '\0'; + +} -void +static void update(Client *c) { char *t; gettogglestat(c); + getpagestat(c); if(c->linkhover) { - t = g_strdup_printf("%s| %s", togglestat, c->linkhover); + t = g_strdup_printf("%s:%s | %s", togglestat, pagestat, c->linkhover); } else if(c->progress != 100) { - drawindicator(c); - gtk_widget_show(c->indicator); - t = g_strdup_printf("[%i%%] %s| %s", c->progress, togglestat, - c->title); + t = g_strdup_printf("[%i%%] %s:%s | %s", c->progress, togglestat, + pagestat, c->title); } else { - gtk_widget_hide_all(c->indicator); - t = g_strdup_printf("%s| %s", togglestat, c->title); + t = g_strdup_printf("%s:%s | %s", togglestat, pagestat, c->title); } gtk_window_set_title(GTK_WINDOW(c->win), t); g_free(t); } -void +static void updatewinid(Client *c) { snprintf(winid, LENGTH(winid), "%u", (int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window)); } -void +static void usage(void) { - fputs("surf - simple browser\n", stderr); - die("usage: surf [-c cookiefile] [-e xid] [-i] [-p] [-r scriptfile]" - " [-s] [-t stylefile] [-u useragent] [-v] [-x] [uri]\n"); + die("usage: %s [-biknpsvx] [-c cookiefile] [-e xid] [-r scriptfile]" + " [-t stylefile] [-u useragent] [uri]\n", basename(argv0)); } -void -windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c) { +static void +windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, + JSObjectRef win, Client *c) { runscript(frame); } -void +static void zoom(Client *c, const Arg *arg) { c->zoomed = TRUE; if(arg->i < 0) { @@ -1007,6 +1220,9 @@ main(int argc, char *argv[]) { /* command line args */ ARGBEGIN { + case 'b': + enablescrollbars = 0; + break; case 'c': cookiefile = EARGF(usage()); break; @@ -1016,6 +1232,12 @@ main(int argc, char *argv[]) { case 'i': loadimages = 0; break; + case 'k': + kioskmode = 1; + break; + case 'n': + enableinspector = 0; + break; case 'p': enableplugins = 0; break; @@ -1031,11 +1253,12 @@ main(int argc, char *argv[]) { case 'u': useragent = EARGF(usage()); break; + case 'v': + die("surf-"VERSION", ©2009-2012 surf engineers, " + "see LICENSE for details\n"); case 'x': showxid = TRUE; break; - case 'v': - die("surf-"VERSION", ©2009-2012 surf engineers, see LICENSE for details\n"); default: usage(); } ARGEND;