X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=8daa1e1d5bd063adda6653ecfcb382947b4bd677;hp=938785991f1688f5f3f1244f8d8ec962dd32696a;hb=a981959;hpb=7ca9421a69956c27b010cc9fc6162df7fa9699cf diff --git a/surf.c b/surf.c index 9387859..8daa1e1 100644 --- a/surf.c +++ b/surf.c @@ -58,6 +58,7 @@ enum { }; typedef enum { + AcceleratedCanvas, CaretBrowsing, CookiePolicies, DiskCache, @@ -70,14 +71,16 @@ typedef enum { JavaScript, KioskMode, LoadImages, + MediaManualPlay, Plugins, PreferredLanguages, RunInFullscreen, ScrollBars, ShowIndicators, + SiteQuirks, SpellChecking, SpellLanguages, - StrictSSL, + StrictTLS, Style, ZoomLevel, ParameterLast, @@ -101,9 +104,9 @@ typedef struct Client { WebKitWebInspector *inspector; WebKitFindController *finder; WebKitHitTestResult *mousepos; - GTlsCertificateFlags tlsflags; + GTlsCertificateFlags tlserr; Window xid; - int progress, fullscreen; + int progress, fullscreen, https, insecure; const char *title, *overtitle, *targeturi; const char *needle; struct Client *next; @@ -142,8 +145,11 @@ static void usage(void); static void die(const char *errstr, ...); static void setup(void); static void sigchld(int unused); +static void sighup(int unused); static char *buildfile(const char *path); static char *buildpath(const char *path); +static const char *getuserhomedir(const char *user); +static const char *getcurrentuserhomedir(void); static Client *newclient(Client *c); static void loaduri(Client *c, const Arg *a); static const char *geturi(Client *c); @@ -168,8 +174,8 @@ static void destroyclient(Client *c); static void cleanup(void); /* GTK/WebKit */ -static GdkDevice *getkbdevice(void); static WebKitWebView *newview(Client *c, WebKitWebView *rv); +static void initwebextensions(WebKitWebContext *wc, Client *c); static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c); static gboolean buttonreleased(GtkWidget *w, GdkEvent *e, Client *c); @@ -190,6 +196,8 @@ static gboolean decidepolicy(WebKitWebView *v, WebKitPolicyDecision *d, static void decidenavigation(WebKitPolicyDecision *d, Client *c); static void decidenewwindow(WebKitPolicyDecision *d, Client *c); static void decideresource(WebKitPolicyDecision *d, Client *c); +static void insecurecontent(WebKitWebView *v, WebKitInsecureContentEvent e, + Client *c); static void downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c); static void responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c); @@ -257,27 +265,34 @@ die(const char *errstr, ...) void setup(void) { + GdkDisplay *gdpy; int i, j; /* clean up any zombies immediately */ sigchld(0); - gtk_init(NULL, NULL); + if (signal(SIGHUP, sighup) == SIG_ERR) + die("Can't install SIGHUP handler"); - dpy = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); - - curconfig = defconfig; + if (!(dpy = XOpenDisplay(NULL))) + die("Can't open default display"); /* atoms */ atoms[AtomFind] = XInternAtom(dpy, "_SURF_FIND", False); atoms[AtomGo] = XInternAtom(dpy, "_SURF_GO", False); atoms[AtomUri] = XInternAtom(dpy, "_SURF_URI", False); + gtk_init(NULL, NULL); + + gdpy = gdk_display_get_default(); + + curconfig = defconfig; + /* dirs and files */ cookiefile = buildfile(cookiefile); scriptfile = buildfile(scriptfile); cachedir = buildpath(cachedir); - gdkkb = getkbdevice(); + gdkkb = gdk_seat_get_keyboard(gdk_display_get_default_seat(gdpy)); if (!stylefile) { styledir = buildpath(styledir); @@ -325,6 +340,16 @@ sigchld(int unused) ; } +void +sighup(int unused) +{ + Arg a = { .b = 0 }; + Client *c; + + for (c = clients; c; c = c->next) + reload(c, &a); +} + char * buildfile(const char *path) { @@ -350,29 +375,59 @@ buildfile(const char *path) return fpath; } +static const char* +getuserhomedir(const char *user) +{ + struct passwd *pw = getpwnam(user); + + if (!pw) + die("Can't get user %s login information.\n", user); + + return pw->pw_dir; +} + +static const char* +getcurrentuserhomedir(void) +{ + const char *homedir; + const char *user; + struct passwd *pw; + + homedir = getenv("HOME"); + if (homedir) + return homedir; + + user = getenv("USER"); + if (user) + return getuserhomedir(user); + + pw = getpwuid(getuid()); + if (!pw) + die("Can't get current user home directory\n"); + + return pw->pw_dir; +} + char * buildpath(const char *path) { - struct passwd *pw; char *apath, *name, *p, *fpath; + const char *homedir; if (path[0] == '~') { if (path[1] == '/' || path[1] == '\0') { p = (char *)&path[1]; - pw = getpwuid(getuid()); + homedir = getcurrentuserhomedir(); } else { if ((p = strchr(path, '/'))) name = g_strndup(&path[1], --p - path); else name = g_strdup(&path[1]); - if (!(pw = getpwnam(name))) { - die("Can't get user %s home directory: %s.\n", - name, path); - } + homedir = getuserhomedir(name); g_free(name); } - apath = g_build_filename(pw->pw_dir, p, NULL); + apath = g_build_filename(homedir, p, NULL); } else { apath = g_strdup(path); } @@ -399,7 +454,6 @@ newclient(Client *rc) clients = c; c->progress = 100; - c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1; c->view = newview(c, rc ? rc->view : NULL); return c; @@ -415,7 +469,10 @@ loaduri(Client *c, const Arg *a) if (g_strcmp0(uri, "") == 0) return; - if (g_strrstr(uri, "://") || g_str_has_prefix(uri, "about:")) { + if (g_str_has_prefix(uri, "http://") || + g_str_has_prefix(uri, "https://") || + g_str_has_prefix(uri, "file://") || + g_str_has_prefix(uri, "about:")) { url = g_strdup(uri); } else if (!stat(uri, &st) && (path = realpath(uri, NULL))) { url = g_strdup_printf("file://%s", path); @@ -518,8 +575,10 @@ gettogglestats(Client *c) void getpagestats(Client *c) { - pagestats[0] = c->tlsflags > G_TLS_CERTIFICATE_VALIDATE_ALL ? '-' : - c->tlsflags > 0 ? 'U' : 'T'; + if (c->https) + pagestats[0] = (c->tlserr || c->insecure) ? 'U' : 'T'; + else + pagestats[0] = '-'; pagestats[1] = '\0'; } @@ -575,6 +634,9 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a) WebKitSettings *s = webkit_web_view_get_settings(c->view); switch (p) { + case AcceleratedCanvas: + webkit_settings_set_enable_accelerated_2d_canvas(s, a->b); + break; case CaretBrowsing: webkit_settings_set_enable_caret_browsing(s, a->b); refresh = 0; @@ -619,6 +681,9 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a) case LoadImages: webkit_settings_set_auto_load_images(s, a->b); break; + case MediaManualPlay: + webkit_settings_set_media_playback_requires_user_gesture(s, a->b); + break; case Plugins: webkit_settings_set_enable_plugins(s, a->b); break; @@ -636,13 +701,16 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a) return; /* do not update */ case ShowIndicators: break; + case SiteQuirks: + webkit_settings_set_enable_site_specific_quirks(s, a->b); + break; case SpellChecking: webkit_web_context_set_spell_checking_enabled( webkit_web_view_get_context(c->view), a->b); return; /* do not update */ case SpellLanguages: return; /* do nothing */ - case StrictSSL: + case StrictTLS: webkit_web_context_set_tls_errors_policy( webkit_web_view_get_context(c->view), a->b ? WEBKIT_TLS_ERRORS_POLICY_FAIL : @@ -838,22 +906,7 @@ cleanup(void) g_free(scriptfile); g_free(stylefile); 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; + XCloseDisplay(dpy); } WebKitWebView * @@ -871,7 +924,7 @@ newview(Client *c, WebKitWebView *rv) } else { settings = webkit_settings_new_with_settings( "auto-load-images", curconfig[LoadImages].val.b, - "default-font-size", curconfig[FontSize].val.f, + "default-font-size", curconfig[FontSize].val.i, "enable-caret-browsing", curconfig[CaretBrowsing].val.b, "enable-developer-extras", curconfig[Inspector].val.b, "enable-dns-prefetching", curconfig[DNSPrefetch].val.b, @@ -880,6 +933,9 @@ newview(Client *c, WebKitWebView *rv) "enable-html5-local-storage", curconfig[DiskCache].val.b, "enable-javascript", curconfig[JavaScript].val.b, "enable-plugins", curconfig[Plugins].val.b, + "enable-accelerated-2d-canvas", curconfig[AcceleratedCanvas].val.b, + "enable-site-specific-quirks", curconfig[SiteQuirks].val.b, + "media-playback-requires-user-gesture", curconfig[MediaManualPlay].val.b, NULL); /* For mor interesting settings, have a look at * http://webkitgtk.org/reference/webkit2gtk/stable/WebKitSettings.html */ @@ -904,9 +960,9 @@ newview(Client *c, WebKitWebView *rv) * or one for each view */ webkit_web_context_set_process_model(context, WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES); - /* ssl */ + /* TLS */ webkit_web_context_set_tls_errors_policy(context, - curconfig[StrictSSL].val.b ? WEBKIT_TLS_ERRORS_POLICY_FAIL : + curconfig[StrictTLS].val.b ? WEBKIT_TLS_ERRORS_POLICY_FAIL : WEBKIT_TLS_ERRORS_POLICY_IGNORE); /* disk cache */ webkit_web_context_set_cache_model(context, @@ -931,6 +987,8 @@ newview(Client *c, WebKitWebView *rv) g_signal_connect(G_OBJECT(context), "download-started", G_CALLBACK(downloadstarted), c); + g_signal_connect(G_OBJECT(context), "initialize-web-extensions", + G_CALLBACK(initwebextensions), c); v = g_object_new(WEBKIT_TYPE_WEB_VIEW, "settings", settings, @@ -951,6 +1009,8 @@ newview(Client *c, WebKitWebView *rv) G_CALLBACK(createview), c); g_signal_connect(G_OBJECT(v), "decide-policy", G_CALLBACK(decidepolicy), c); + g_signal_connect(G_OBJECT(v), "insecure-content-detected", + G_CALLBACK(insecurecontent), c); g_signal_connect(G_OBJECT(v), "load-changed", G_CALLBACK(loadchanged), c); g_signal_connect(G_OBJECT(v), "mouse-target-changed", @@ -963,6 +1023,12 @@ newview(Client *c, WebKitWebView *rv) return v; } +void +initwebextensions(WebKitWebContext *wc, Client *c) +{ + webkit_web_context_set_web_extensions_directory(wc, WEBEXTDIR); +} + GtkWidget * createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c) { @@ -1139,7 +1205,7 @@ createwindow(Client *c) gtk_window_set_role(GTK_WINDOW(w), wmstr); g_free(wmstr); - gtk_window_set_default_size(GTK_WINDOW(w), 800, 600); + gtk_window_set_default_size(GTK_WINDOW(w), winsize[0], winsize[1]); } g_signal_connect(G_OBJECT(w), "destroy", @@ -1166,7 +1232,7 @@ loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c) curconfig = defconfig; setatom(c, AtomUri, title); c->title = title; - c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1; + c->https = c->insecure = 0; seturiparameters(c, geturi(c)); break; case WEBKIT_LOAD_REDIRECTED: @@ -1175,10 +1241,8 @@ loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c) seturiparameters(c, geturi(c)); break; case WEBKIT_LOAD_COMMITTED: - if (!webkit_web_view_get_tls_info(c->view, NULL, - &(c->tlsflags))) - c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1; - + c->https = webkit_web_view_get_tls_info(c->view, NULL, + &c->tlserr); break; case WEBKIT_LOAD_FINISHED: /* Disabled until we write some WebKitWebExtension for @@ -1365,6 +1429,12 @@ decideresource(WebKitPolicyDecision *d, Client *c) } } +void +insecurecontent(WebKitWebView *v, WebKitInsecureContentEvent e, Client *c) +{ + c->insecure = 1; +} + void downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c) { @@ -1609,6 +1679,9 @@ main(int argc, char *argv[]) case 'c': cookiefile = EARGF(usage()); break; + case 'C': + stylefile = EARGF(usage()); + break; case 'd': defconfig CSETB(DiskCache, 0); break; @@ -1669,9 +1742,6 @@ main(int argc, char *argv[]) case 'S': defconfig CSETB(JavaScript, 1); break; - case 't': - stylefile = EARGF(usage()); - break; case 'u': fulluseragent = EARGF(usage()); break;