#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
+#include <limits.h>
#include <stdlib.h>
#include <stdio.h>
#include <webkit/webkit.h>
#include <glib/gstdio.h>
#include <JavaScriptCore/JavaScript.h>
#include <sys/file.h>
+#include <libgen.h>
+#include <stdarg.h>
#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))
typedef struct Client {
GtkWidget *win, *scroll, *vbox, *indicator;
WebKitWebView *view;
+ WebKitWebInspector *inspector;
char *title, *linkhover;
const char *uri, *needle;
gint progress;
- gboolean sslfailed;
struct Client *next;
- gboolean zoomed;
+ gboolean zoomed, fullscreen, isinspector, sslfailed;
} Client;
typedef struct {
static GdkNativeWindow embed = 0;
static gboolean showxid = FALSE;
static char winid[64];
-static gboolean loadimage = 1, plugin = 1, script = 1, using_proxy = 0;
+static gboolean usingproxy = 0;
+static char togglestat[5];
+static void beforerequest(WebKitWebView *w, WebKitWebFrame *f,
+ WebKitWebResource *r, WebKitNetworkRequest *req,
+ WebKitNetworkResponse *resp, gpointer d);
static char *buildpath(const char *path);
-static 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 die(const char *errstr, ...);
static void drawindicator(Client *c);
+static void eval(Client *c, const Arg *arg);
static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c);
static void find(Client *c, const Arg *arg);
+static void fullscreen(Client *c, const Arg *arg);
static const char *getatom(Client *c, int a);
+static void gettogglestat(Client *c);
static char *geturi(Client *c);
static 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);
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);
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 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;
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);
return false;
}
-void
+static void
cleanup(void) {
while(clients)
destroyclient(clients);
}
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");
}
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;
JSStringRelease(jsscriptname);
}
-void
+static void
runscript(WebKitWebFrame *frame) {
char *script;
GError *error;
}
}
-void
+static void
clipboard(Client *c, const Arg *arg) {
gboolean paste = *(gboolean *)arg;
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);
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;
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);
return FALSE;
}
-void
+static void
destroyclient(Client *c) {
Client *p;
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);
+static void
+die(const char *errstr, ...) {
+ va_list ap;
+
+ va_start(ap, errstr);
+ vfprintf(stderr, errstr, ap);
+ va_end(ap);
exit(EXIT_FAILURE);
}
-void
+static void
drawindicator(Client *c) {
gint width;
const char *uri;
width = c->progress * w->allocation.width / 100;
gc = gdk_gc_new(w->window);
if(strstr(uri, "https://") == uri) {
- if(using_proxy) {
- colorname = c->sslfailed? progress_proxy_untrust : progress_proxy_trust;
+ if(usingproxy) {
+ colorname = c->sslfailed? progress_proxy_untrust :
+ progress_proxy_trust;
} else {
- colorname = c->sslfailed? progress_untrust : progress_trust;
+ colorname = c->sslfailed? progress_untrust :
+ progress_trust;
}
} else {
- if(using_proxy) {
+ if(usingproxy) {
colorname = progress_proxy;
} else {
colorname = progress;
g_object_unref(gc);
}
-gboolean
+static gboolean
exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c) {
drawindicator(c);
return TRUE;
}
-void
+static void
find(Client *c, const Arg *arg) {
const char *s;
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;
return buf;
}
-char *
+static char *
geturi(Client *c) {
char *uri;
return uri;
}
-gboolean
+static gboolean
initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
Arg arg;
updatewinid(c);
- arg = (Arg)DOWNLOAD((char *)webkit_download_get_uri(o));
+ arg = (Arg)DOWNLOAD((char *)webkit_download_get_uri(o), geturi(c));
spawn(c, &arg);
return FALSE;
}
-gboolean
+static void
+inspector(Client *c, const Arg *arg) {
+ if(c->isinspector)
+ return;
+ webkit_web_inspector_show(c->inspector);
+}
+
+static WebKitWebView *
+inspector_new(WebKitWebInspector *i, WebKitWebView *v, Client *c) {
+ Client *n = newclient();
+ n->isinspector = true;
+
+ return n->view;
+}
+
+static gboolean
+inspector_show(WebKitWebInspector *i, Client *c) {
+ gtk_widget_show(GTK_WIDGET(webkit_web_inspector_get_web_view(i)));
+ return true;
+}
+
+static gboolean
+inspector_close(WebKitWebInspector *i, Client *c) {
+ gtk_widget_hide(GTK_WIDGET(webkit_web_inspector_get_web_view(i)));
+ return true;
+}
+
+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;
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;
}
}
+
return processed;
}
-void
+static void
linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) {
if(l) {
c->linkhover = copystr(&c->linkhover, l);
update(c);
}
-void
+static void
loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
WebKitWebFrame *frame;
WebKitWebDataSource *src;
}
}
-void
+static void
loaduri(Client *c, const Arg *arg) {
- char *u;
+ char *u, *rp;
const char *uri = (char *)arg->v;
Arg a = { .b = FALSE };
if(strcmp(uri, "") == 0)
return;
- u = g_strrstr(uri, "://") ? g_strdup(uri)
- : g_strdup_printf("http://%s", uri);
+
+ /* In case it's a file path. */
+ if(uri[0] == '/') {
+ rp = realpath(uri, NULL);
+ u = g_strdup_printf("file://%s", rp);
+ free(rp);
+ } else {
+ u = g_strrstr(uri, "://") ? g_strdup(uri)
+ : g_strdup_printf("http://%s", uri);
+ }
+
/* prevents endless loop */
if(c->uri && strcmp(u, c->uri) == 0) {
reload(c, &a);
}
}
-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;
if(!(c = calloc(1, sizeof(Client))))
die("Cannot malloc!\n");
+
/* Window */
if(embed) {
c->win = gtk_plug_new(embed);
- }
- else {
+ } else {
c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+
/* TA: 20091214: Despite what the GNOME docs say, the ICCCM
* is always correct, so we should still call this function.
* But when doing so, we *must* differentiate between a
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);
+ g_signal_connect(G_OBJECT(c->win),
+ "key-press-event",
+ G_CALLBACK(keypress), c);
/* VBox */
c->vbox = gtk_vbox_new(FALSE, 0);
/* 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),
+ "title-changed",
+ G_CALLBACK(titlechange), c);
+ g_signal_connect(G_OBJECT(c->view),
+ "hovering-over-link",
+ G_CALLBACK(linkhover), c);
+ g_signal_connect(G_OBJECT(c->view),
+ "create-web-view",
+ G_CALLBACK(createwindow), c);
+ g_signal_connect(G_OBJECT(c->view),
+ "new-window-policy-decision-requested",
+ G_CALLBACK(decidewindow), c);
+ g_signal_connect(G_OBJECT(c->view),
+ "mime-type-policy-decision-requested",
+ G_CALLBACK(decidedownload), c);
+ g_signal_connect(G_OBJECT(c->view),
+ "window-object-cleared",
+ G_CALLBACK(windowobjectcleared), c);
+ g_signal_connect(G_OBJECT(c->view),
+ "notify::load-status",
+ G_CALLBACK(loadstatuschange), c);
+ g_signal_connect(G_OBJECT(c->view),
+ "notify::progress",
+ G_CALLBACK(progresschange), c);
+ g_signal_connect(G_OBJECT(c->view),
+ "download-requested",
+ G_CALLBACK(initdownload), c);
+ g_signal_connect(G_OBJECT(c->view),
+ "button-release-event",
+ G_CALLBACK(buttonrelease), c);
+ g_signal_connect(G_OBJECT(c->view),
+ "populate-popup",
+ G_CALLBACK(populatepopup), c);
+ g_signal_connect(G_OBJECT(c->view),
+ "resource-request-starting",
+ G_CALLBACK(beforerequest), c);
/* Indicator */
c->indicator = gtk_drawing_area_new();
gtk_container_add(GTK_CONTAINER(c->vbox), c->indicator);
/* Setup */
- gtk_box_set_child_packing(GTK_BOX(c->vbox), c->indicator, FALSE, FALSE, 0, GTK_PACK_START);
- gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE, TRUE, 0, GTK_PACK_START);
+ gtk_box_set_child_packing(GTK_BOX(c->vbox), c->indicator, FALSE,
+ FALSE, 0, GTK_PACK_START);
+ gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE,
+ TRUE, 0, GTK_PACK_START);
gtk_widget_grab_focus(GTK_WIDGET(c->view));
gtk_widget_show(c->vbox);
gtk_widget_show(c->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);
g_object_set(G_OBJECT(settings), "user-agent", ua, NULL);
uri = g_strconcat("file://", stylefile, NULL);
g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL);
- g_object_set(G_OBJECT(settings), "auto-load-images", loadimage, NULL);
- g_object_set(G_OBJECT(settings), "enable-plugins", plugin, NULL);
- g_object_set(G_OBJECT(settings), "enable-scripts", script, NULL);
- g_object_set(G_OBJECT(settings), "enable-spatial-navigation", SPATIAL_BROWSING, NULL);
+ g_object_set(G_OBJECT(settings), "auto-load-images", loadimages,
+ NULL);
+ g_object_set(G_OBJECT(settings), "enable-plugins", enableplugins,
+ NULL);
+ g_object_set(G_OBJECT(settings), "enable-scripts", enablescripts,
+ NULL);
+ g_object_set(G_OBJECT(settings), "enable-spatial-navigation",
+ enablespatialbrowsing, NULL);
+ g_object_set(G_OBJECT(settings), "enable-developer-extras",
+ enableinspector, NULL);
+
+ if(enableinspector) {
+ c->inspector = WEBKIT_WEB_INSPECTOR(
+ webkit_web_view_get_inspector(c->view));
+ g_signal_connect(G_OBJECT(c->inspector), "inspect-web-view",
+ G_CALLBACK(inspector_new), c);
+ g_signal_connect(G_OBJECT(c->inspector), "show-window",
+ G_CALLBACK(inspector_show), c);
+ g_signal_connect(G_OBJECT(c->inspector), "close-window",
+ G_CALLBACK(inspector_close), c);
+ g_signal_connect(G_OBJECT(c->inspector), "finished",
+ G_CALLBACK(inspector_finished), c);
+ c->isinspector = false;
+ }
g_free(uri);
setatom(c, AtomFind, "");
setatom(c, AtomUri, "about:blank");
- if(HIDE_BACKGROUND)
+ if(hidebackground)
webkit_web_view_set_transparent(c->view, TRUE);
c->title = NULL;
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;
snprintf(tmp, LENGTH(tmp), "%u\n", (int)embed);
cmd[i++] = tmp;
}
- if(!script)
+ if(!enablescripts)
cmd[i++] = "-s";
- if(!plugin)
+ if(!enableplugins)
cmd[i++] = "-p";
- if(!loadimage)
+ if(!loadimages)
cmd[i++] = "-i";
if(showxid)
cmd[i++] = "-x";
}
}
-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;
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)
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;
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;
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);
g_object_set(G_OBJECT(s), "proxy-uri", puri, NULL);
soup_uri_free(puri);
g_free(new_proxy);
- using_proxy = 1;
+ usingproxy = 1;
}
}
-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;
reload(c, &a);
}
-void
+static void
spawn(Client *c, const Arg *arg) {
if(fork() == 0) {
if(dpy)
}
}
-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;
+ gboolean value;
+ Arg a = { .b = FALSE };
+
+ settings = webkit_web_view_get_settings(c->view);
+ g_object_get(G_OBJECT(settings), name, &value, NULL);
+ g_object_set(G_OBJECT(settings), name, !value, NULL);
+
+ reload(c,&a);
+}
+
+static void
+gettogglestat(Client *c){
+ gboolean value;
+ WebKitWebSettings *settings = webkit_web_view_get_settings(c->view);
+
+ g_object_get(G_OBJECT(settings), "enable-caret-browsing",
+ &value, NULL);
+ togglestat[0] = value? 'C': 'c';
+
+ g_object_get(G_OBJECT(settings), "auto-load-images", &value, NULL);
+ togglestat[1] = value? 'I': 'i';
+
+ g_object_get(G_OBJECT(settings), "enable-scripts", &value, NULL);
+ togglestat[2] = value? 'S': 's';
+
+ g_object_get(G_OBJECT(settings), "enable-plugins", &value, NULL);
+ togglestat[3] = value? 'V': 'v';
+
+ togglestat[4] = '\0';
+}
+
+
+static void
update(Client *c) {
char *t;
+ gettogglestat(c);
+
if(c->linkhover) {
- t = g_strdup(c->linkhover);
+ t = g_strdup_printf("%s| %s", togglestat, c->linkhover);
} else if(c->progress != 100) {
drawindicator(c);
gtk_widget_show(c->indicator);
- t = g_strdup_printf("[%i%%] %s", c->progress, c->title);
+ t = g_strdup_printf("[%i%%] %s| %s", c->progress, togglestat,
+ c->title);
} else {
gtk_widget_hide_all(c->indicator);
- t = g_strdup(c->title);
+ t = g_strdup_printf("%s| %s", togglestat, c->title);
}
gtk_window_set_title(GTK_WINDOW(c->win), t);
g_free(t);
}
-void
+static void
updatewinid(Client *c) {
snprintf(winid, LENGTH(winid), "%u",
(int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
}
-void
+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 [-inpsvx] [-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) /* zoom out */
+ if(arg->i < 0) {
+ /* zoom out */
webkit_web_view_zoom_out(c->view);
- else if(arg->i > 0) /* zoom in */
+ } else if(arg->i > 0) {
+ /* zoom in */
webkit_web_view_zoom_in(c->view);
- else { /* reset */
+ } else {
+ /* reset */
c->zoomed = FALSE;
webkit_web_view_set_zoom_level(c->view, 1.0);
}
embed = strtol(EARGF(usage()), NULL, 0);
break;
case 'i':
- loadimage = 0;
+ loadimages = 0;
+ break;
+ case 'n':
+ enableinspector = 0;
break;
case 'p':
- plugin = 0;
+ enableplugins = 0;
break;
case 'r':
scriptfile = EARGF(usage());
break;
case 's':
- script = 0;
+ enablescripts = 0;
break;
case 't':
stylefile = EARGF(usage());
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;
