#define LENGTH(x) (sizeof(x) / sizeof(x[0]))
#define CLEANMASK(mask) (mask & (MODKEY|GDK_SHIFT_MASK))
+#define SETB(p, s) [p] = (Parameter){ { .b = s }, }
+#define SETI(p, s) [p] = (Parameter){ { .i = s }, }
+#define SETV(p, s) [p] = (Parameter){ { .v = s }, }
+#define SETF(p, s) [p] = (Parameter){ { .f = s }, }
+#define FSETB(p, s) [p] = (Parameter){ { .b = s }, 1 }
+#define FSETI(p, s) [p] = (Parameter){ { .i = s }, 1 }
+#define FSETV(p, s) [p] = (Parameter){ { .v = s }, 1 }
+#define FSETF(p, s) [p] = (Parameter){ { .f = s }, 1 }
enum { AtomFind, AtomGo, AtomUri, AtomLast };
-enum {
+typedef enum {
CaretBrowsing,
+ CookiePolicies,
+ DiskCache,
+ DNSPrefetch,
+ FontSize,
FrameFlattening,
Geolocation,
+ HideBackground,
+ Inspector,
JavaScript,
+ KioskMode,
LoadImages,
Plugins,
+ PreferredLanguages,
+ RunInFullscreen,
ScrollBars,
-};
+ ShowIndicators,
+ SpellChecking,
+ SpellLanguages,
+ StrictSSL,
+ Style,
+ ZoomLevel,
+ ParameterLast,
+} ParamName;
enum {
OnDoc = WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT,
typedef union {
int b;
int i;
+ float f;
const void *v;
} Arg;
+typedef struct {
+ Arg val;
+ int force;
+} Parameter;
+
typedef struct Client {
GtkWidget *win;
WebKitWebView *view;
GTlsCertificateFlags tlsflags;
Window xid;
int progress, fullscreen;
- const char *title, *targeturi;
+ const char *title, *overtitle, *targeturi;
const char *needle;
struct Client *next;
} Client;
unsigned int stopevent;
} Button;
+typedef struct {
+ const char *uri;
+ Parameter config[ParameterLast];
+ regex_t re;
+} UriParameters;
+
typedef struct {
char *regex;
char *style;
static char *buildfile(const char *path);
static char *buildpath(const char *path);
static Client *newclient(Client *c);
-static void addaccelgroup(Client *c);
static void loaduri(Client *c, const Arg *a);
static const char *geturi(Client *c);
static void setatom(Client *c, int a, const char *v);
static void cleanup(void);
/* GTK/WebKit */
+static GdkDevice *getkbdevice(void);
static WebKitWebView *newview(Client *c, WebKitWebView *rv);
static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a,
Client *c);
static gboolean buttonreleased(GtkWidget *w, GdkEvent *e, Client *c);
-static gboolean keypress(GtkAccelGroup *group, GObject *obj, guint key,
- GdkModifierType mods, Client *c);
static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event,
gpointer d);
static gboolean winevent(GtkWidget *w, GdkEvent *e, Client *c);
static void print(Client *c, const Arg *a);
static void clipboard(Client *c, const Arg *a);
static void zoom(Client *c, const Arg *a);
-static void scroll_v(Client *c, const Arg *a);
-static void scroll_h(Client *c, const Arg *a);
+static void scroll(Client *c, const Arg *a);
static void navigate(Client *c, const Arg *a);
static void stop(Client *c, const Arg *a);
static void toggle(Client *c, const Arg *a);
static int cookiepolicy;
static Display *dpy;
static Client *clients;
+static GdkDevice *gdkkb;
static char *stylefile;
static const char *useragent;
char *argv0;
scriptfile = buildfile(scriptfile);
cachedir = buildpath(cachedir);
+ gdkkb = getkbdevice();
+
if (!stylefile) {
styledir = buildpath(styledir);
for (i = 0; i < LENGTH(styles); ++i) {
if (!(c = calloc(1, sizeof(Client))))
die("Cannot malloc!\n");
- c->title = NULL;
- c->progress = 100;
-
c->next = clients;
clients = c;
- c->view = newview(c, rc ? rc->view : NULL);
+ c->progress = 100;
c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
+ c->view = newview(c, rc ? rc->view : NULL);
return c;
}
-void
-addaccelgroup(Client *c)
-{
- int i;
- GtkAccelGroup *group = gtk_accel_group_new();
- GClosure *closure;
-
- for (i = 0; i < LENGTH(keys); i++) {
- closure = g_cclosure_new(G_CALLBACK(keypress), c, NULL);
- gtk_accel_group_connect(group, keys[i].keyval, keys[i].mod, 0,
- closure);
- }
- gtk_window_add_accel_group(GTK_WINDOW(c->win), group);
-}
-
void
loaduri(Client *c, const Arg *a)
{
reload(c, a);
} else {
webkit_web_view_load_uri(c->view, url);
- c->title = geturi(c);
updatetitle(c);
}
updatetitle(Client *c)
{
char *title;
+ const char *name = c->overtitle ? c->overtitle :
+ c->title ? c->title : "";
if (showindicators) {
gettogglestats(c);
getpagestats(c);
- if (c->progress != 100) {
+ if (c->progress != 100)
title = g_strdup_printf("[%i%%] %s:%s | %s",
- c->progress, togglestats, pagestats,
- c->targeturi ? c->targeturi : c->title);
- } else {
+ c->progress, togglestats, pagestats, name);
+ else
title = g_strdup_printf("%s:%s | %s",
- togglestats, pagestats,
- c->targeturi ? c->targeturi : c->title);
- }
+ togglestats, pagestats, name);
gtk_window_set_title(GTK_WINDOW(c->win), title);
g_free(title);
} else {
- gtk_window_set_title(GTK_WINDOW(c->win), c->title ?
- c->title : "");
+ gtk_window_set_title(GTK_WINDOW(c->win), name);
}
}
return WEBKIT_COOKIE_POLICY_ACCEPT_NEVER;
case '@':
return WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY;
+ default: /* fallthrough */
case 'A':
- default:
- break;
+ return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS;
}
- return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS;
}
char
return 'a';
case WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY:
return '@';
+ default: /* fallthrough */
case WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS:
- default:
- break;
+ return 'A';
}
- return 'A';
}
const char *
close(ConnectionNumber(dpy));
setsid();
execvp(((char **)a->v)[0], (char **)a->v);
- fprintf(stderr, "surf: execvp %s", ((char **)a->v)[0]);
+ fprintf(stderr, "%s: execvp %s", argv0, ((char **)a->v)[0]);
perror(" failed");
- exit(0);
+ exit(1);
}
}
g_free(cachedir);
}
+static GdkDevice *
+getkbdevice(void)
+{
+ GList *l, *gdl = gdk_device_manager_list_devices(
+ gdk_display_get_device_manager(gdk_display_get_default()),
+ GDK_DEVICE_TYPE_MASTER);
+ GdkDevice *gd = NULL;
+
+ for (l = gdl; l != NULL; l = l->next)
+ if (gdk_device_get_source(l->data) == GDK_SOURCE_KEYBOARD)
+ gd = l->data;
+
+ g_list_free(gdl);
+ return gd;
+}
+
WebKitWebView *
newview(Client *c, WebKitWebView *rv)
{
webkit_cookie_manager_set_accept_policy(
webkit_web_context_get_cookie_manager(context),
cookiepolicy_get());
+ /* languages */
+ webkit_web_context_set_preferred_languages(context,
+ preferedlanguages);
+ webkit_web_context_set_spell_checking_languages(context,
+ spellinglanguages);
+ webkit_web_context_set_spell_checking_enabled(context,
+ enablespellchecking);
g_signal_connect(G_OBJECT(context), "download-started",
G_CALLBACK(downloadstarted), c);
NULL);
}
+ g_signal_connect(G_OBJECT(v), "notify::estimated-load-progress",
+ G_CALLBACK(progresschanged), c);
g_signal_connect(G_OBJECT(v), "notify::title",
G_CALLBACK(titlechanged), c);
- g_signal_connect(G_OBJECT(v), "mouse-target-changed",
- G_CALLBACK(mousetargetchanged), c);
- g_signal_connect(G_OBJECT(v), "permission-request",
- G_CALLBACK(permissionrequested), c);
+ g_signal_connect(G_OBJECT(v), "button-release-event",
+ G_CALLBACK(buttonreleased), c);
+ g_signal_connect(G_OBJECT(v), "close",
+ G_CALLBACK(closeview), c);
g_signal_connect(G_OBJECT(v), "create",
G_CALLBACK(createview), c);
- g_signal_connect(G_OBJECT(v), "ready-to-show",
- G_CALLBACK(showview), c);
g_signal_connect(G_OBJECT(v), "decide-policy",
G_CALLBACK(decidepolicy), c);
g_signal_connect(G_OBJECT(v), "load-changed",
G_CALLBACK(loadchanged), c);
- g_signal_connect(G_OBJECT(v), "notify::estimated-load-progress",
- G_CALLBACK(progresschanged), c);
- g_signal_connect(G_OBJECT(v), "button-release-event",
- G_CALLBACK(buttonreleased), c);
- g_signal_connect(G_OBJECT(v), "close",
- G_CALLBACK(closeview), c);
+ g_signal_connect(G_OBJECT(v), "mouse-target-changed",
+ G_CALLBACK(mousetargetchanged), c);
+ g_signal_connect(G_OBJECT(v), "permission-request",
+ G_CALLBACK(permissionrequested), c);
+ g_signal_connect(G_OBJECT(v), "ready-to-show",
+ G_CALLBACK(showview), c);
return v;
}
return FALSE;
}
-gboolean
-keypress(GtkAccelGroup *group, GObject *obj, guint key, GdkModifierType mods,
- Client *c)
-{
- guint i;
- gboolean processed = FALSE;
-
- mods = CLEANMASK(mods);
- key = gdk_keyval_to_lower(key);
- updatewinid(c);
- for (i = 0; i < LENGTH(keys); i++) {
- if (key == keys[i].keyval
- && mods == keys[i].mod
- && keys[i].func) {
- keys[i].func(c, &(keys[i].arg));
- processed = TRUE;
- }
- }
-
- return processed;
-}
-
GdkFilterReturn
processx(GdkXEvent *e, GdkEvent *event, gpointer d)
{
gboolean
winevent(GtkWidget *w, GdkEvent *e, Client *c)
{
+ int i;
+
switch (e->type) {
+ case GDK_ENTER_NOTIFY:
+ c->overtitle = c->targeturi;
+ updatetitle(c);
+ break;
+ case GDK_KEY_PRESS:
+ if (!kioskmode) {
+ for (i = 0; i < LENGTH(keys); ++i) {
+ if (gdk_keyval_to_lower(e->key.keyval) ==
+ keys[i].keyval &&
+ CLEANMASK(e->key.state) == keys[i].mod &&
+ keys[i].func) {
+ updatewinid(c);
+ keys[i].func(c, &(keys[i].arg));
+ return TRUE;
+ }
+ }
+ }
case GDK_LEAVE_NOTIFY:
- c->targeturi = NULL;
+ c->overtitle = NULL;
updatetitle(c);
break;
- case GDK_WINDOW_STATE: /* fallthrough */
+ case GDK_WINDOW_STATE:
if (e->window_state.changed_mask ==
- GDK_WINDOW_STATE_FULLSCREEN) {
+ GDK_WINDOW_STATE_FULLSCREEN)
c->fullscreen = e->window_state.new_window_state &
GDK_WINDOW_STATE_FULLSCREEN;
- break;
- }
+ break;
default:
- return FALSE;
+ break;
}
- return TRUE;
+ return FALSE;
}
void
webkit_web_view_set_background_color(c->view, &bgcolor);
if (!kioskmode) {
- addaccelgroup(c);
gdk_window_set_events(gwin, GDK_ALL_EVENTS_MASK);
gdk_window_add_filter(gwin, processx, c);
}
g_signal_connect(G_OBJECT(w), "destroy",
G_CALLBACK(destroywin), c);
+ g_signal_connect(G_OBJECT(w), "enter-notify-event",
+ G_CALLBACK(winevent), c);
+ g_signal_connect(G_OBJECT(w), "key-press-event",
+ G_CALLBACK(winevent), c);
g_signal_connect(G_OBJECT(w), "leave-notify-event",
G_CALLBACK(winevent), c);
g_signal_connect(G_OBJECT(w), "window-state-event",
void
loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
{
+ const char *title = geturi(c);
+
switch (e) {
case WEBKIT_LOAD_STARTED:
+ setatom(c, AtomUri, title);
+ c->title = title;
c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
break;
case WEBKIT_LOAD_REDIRECTED:
- setatom(c, AtomUri, geturi(c));
+ setatom(c, AtomUri, title);
+ c->title = title;
break;
case WEBKIT_LOAD_COMMITTED:
+ setatom(c, AtomUri, title);
+ c->title = title;
if (!webkit_web_view_get_tls_info(c->view, NULL,
&(c->tlsflags)))
c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
- setatom(c, AtomUri, geturi(c));
-
if (enablestyle)
setstyle(c, getstyle(geturi(c)));
break;
c->targeturi = webkit_hit_test_result_get_media_uri(h);
else
c->targeturi = NULL;
+
+ c->overtitle = c->targeturi;
updatetitle(c);
}
webkit_response_policy_decision_get_response(r);
const gchar *uri = webkit_uri_response_get_uri(res);
- if (g_str_has_suffix(uri, "/favicon.ico"))
- webkit_uri_request_set_uri(
- webkit_response_policy_decision_get_request(r),
- "about:blank");
+ if (g_str_has_suffix(uri, "/favicon.ico")) {
+ webkit_policy_decision_ignore(d);
+ return;
+ }
if (!g_str_has_prefix(uri, "http://")
&& !g_str_has_prefix(uri, "https://")
if (isascii) {
handleplumb(c, uri);
webkit_policy_decision_ignore(d);
+ return;
}
}
pasteuri(GtkClipboard *clipboard, const char *text, gpointer d)
{
Arg a = {.v = text };
- if (!text)
+ if (text)
loaduri((Client *) d, &a);
}
}
void
-scroll_v(Client *c, const Arg *a)
+scroll(Client *c, const Arg *a)
{
- evalscript(c, "window.scrollBy(0, %d * (window.innerHeight / 100))",
- a->i);
-}
+ GdkEvent *ev = gdk_event_new(GDK_KEY_PRESS);
-void
-scroll_h(Client *c, const Arg *a)
-{
- evalscript(c, "window.scrollBy(%d * (window.innerWidth / 100), 0)",
- a->i);
+ gdk_event_set_device(ev, gdkkb);
+// gdk_event_set_screen(ev, gdk_screen_get_default());
+ ev->key.window = gtk_widget_get_window(GTK_WIDGET(c->win));
+ ev->key.state = GDK_CONTROL_MASK;
+ ev->key.time = GDK_CURRENT_TIME;
+
+ switch (a->i) {
+ case 'd':
+ ev->key.keyval = GDK_KEY_Down;
+ break;
+ case 'D':
+ ev->key.keyval = GDK_KEY_Page_Down;
+ break;
+ case 'l':
+ ev->key.keyval = GDK_KEY_Left;
+ break;
+ case 'r':
+ ev->key.keyval = GDK_KEY_Right;
+ break;
+ case 'U':
+ ev->key.keyval = GDK_KEY_Page_Up;
+ break;
+ case 'u':
+ ev->key.keyval = GDK_KEY_Up;
+ break;
+ }
+
+ gdk_event_put(ev);
}
void
togglestyle(Client *c, const Arg *a)
{
enablestyle = !enablestyle;
- setstyle(c, enablestyle ? getstyle(geturi(c)) : "");
+
+ if (enablestyle)
+ setstyle(c, getstyle(geturi(c)));
+ else
+ webkit_user_content_manager_remove_all_style_sheets(
+ webkit_web_view_get_user_content_manager(c->view));
updatetitle(c);
}
{
Arg arg;
- if (webkit_hit_test_result_get_context(h) & OnMedia) {
- arg = (Arg)VIDEOPLAY(webkit_hit_test_result_get_media_uri(h));
- spawn(c, &arg);
- }
+ arg = (Arg)VIDEOPLAY(webkit_hit_test_result_get_media_uri(h));
+ spawn(c, &arg);
}
int
stylefile = EARGF(usage());
break;
case 'u':
- useragent = EARGF(usage());
+ fulluseragent = EARGF(usage());
break;
case 'v':
die("surf-"VERSION", ©2009-2015 surf engineers, "
} ARGEND;
if (argc > 0)
arg.v = argv[0];
+ else
+ arg.v = "about:blank";
setup();
c = newclient(NULL);
showview(NULL, c);
- if (arg.v)
- loaduri(clients, &arg);
- else
- updatetitle(c);
+ loaduri(c, &arg);
+ updatetitle(c);
gtk_main();
cleanup();
