pinosaur
/
surf.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a981959 Move -t stylefile flag to -C stylefile
[surf.git]
/
surf.c
diff --git
a/surf.c
b/surf.c
index
64c5f5f
..
4d13b0e
100644
(file)
--- a/
surf.c
+++ b/
surf.c
@@
-58,6
+58,7
@@
enum {
};
typedef enum {
};
typedef enum {
+ AcceleratedCanvas,
CaretBrowsing,
CookiePolicies,
DiskCache,
CaretBrowsing,
CookiePolicies,
DiskCache,
@@
-70,14
+71,16
@@
typedef enum {
JavaScript,
KioskMode,
LoadImages,
JavaScript,
KioskMode,
LoadImages,
+ MediaManualPlay,
Plugins,
PreferredLanguages,
RunInFullscreen,
ScrollBars,
ShowIndicators,
Plugins,
PreferredLanguages,
RunInFullscreen,
ScrollBars,
ShowIndicators,
+ SiteQuirks,
SpellChecking,
SpellLanguages,
SpellChecking,
SpellLanguages,
- Strict
SSL
,
+ Strict
TLS
,
Style,
ZoomLevel,
ParameterLast,
Style,
ZoomLevel,
ParameterLast,
@@
-101,9
+104,9
@@
typedef struct Client {
WebKitWebInspector *inspector;
WebKitFindController *finder;
WebKitHitTestResult *mousepos;
WebKitWebInspector *inspector;
WebKitFindController *finder;
WebKitHitTestResult *mousepos;
- GTlsCertificateFlags tls
flags
;
+ GTlsCertificateFlags tls
err
;
Window xid;
Window xid;
- int progress, fullscreen;
+ int progress, fullscreen
, https, insecure
;
const char *title, *overtitle, *targeturi;
const char *needle;
struct Client *next;
const char *title, *overtitle, *targeturi;
const char *needle;
struct Client *next;
@@
-142,6
+145,7
@@
static void usage(void);
static void die(const char *errstr, ...);
static void setup(void);
static void sigchld(int unused);
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 char *buildfile(const char *path);
static char *buildpath(const char *path);
static const char *getuserhomedir(const char *user);
@@
-171,6
+175,7
@@
static void cleanup(void);
/* GTK/WebKit */
static WebKitWebView *newview(Client *c, WebKitWebView *rv);
/* GTK/WebKit */
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);
static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a,
Client *c);
static gboolean buttonreleased(GtkWidget *w, GdkEvent *e, Client *c);
@@
-191,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 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);
static void downloadstarted(WebKitWebContext *wc, WebKitDownload *d,
Client *c);
static void responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c);
@@
-219,7
+226,7
@@
static void clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h);
static void clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h);
static char winid[64];
static void clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h);
static char winid[64];
-static char togglestats[1
0
];
+static char togglestats[1
1
];
static char pagestats[2];
static Atom atoms[AtomLast];
static Window embed;
static char pagestats[2];
static Atom atoms[AtomLast];
static Window embed;
@@
-240,7
+247,7
@@
void
usage(void)
{
die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] "
usage(void)
{
die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] "
- "[-c cookiefile] [-
e xid] [-r scriptfile] [-t style
file] "
+ "[-c cookiefile] [-
C stylefile] [-e xid] [-r script
file] "
"[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
}
"[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
}
@@
-263,18
+270,23
@@
setup(void)
/* clean up any zombies immediately */
sigchld(0);
/* clean up any zombies immediately */
sigchld(0);
- gtk_init(NULL, NULL);
-
- gdpy = gdk_display_get_default();
- dpy = GDK_DISPLAY_XDISPLAY(gdpy);
+ if (signal(SIGHUP, sighup) == SIG_ERR)
+ die("Can't install SIGHUP handler");
- 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);
/* 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);
/* dirs and files */
cookiefile = buildfile(cookiefile);
scriptfile = buildfile(scriptfile);
@@
-328,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)
{
char *
buildfile(const char *path)
{
@@
-432,7
+454,6
@@
newclient(Client *rc)
clients = c;
c->progress = 100;
clients = c;
c->progress = 100;
- c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
c->view = newview(c, rc ? rc->view : NULL);
return c;
c->view = newview(c, rc ? rc->view : NULL);
return c;
@@
-548,14
+569,17
@@
gettogglestats(Client *c)
togglestats[6] = curconfig[Plugins].val.b ? 'V' : 'v';
togglestats[7] = curconfig[Style].val.b ? 'M' : 'm';
togglestats[8] = curconfig[FrameFlattening].val.b ? 'F' : 'f';
togglestats[6] = curconfig[Plugins].val.b ? 'V' : 'v';
togglestats[7] = curconfig[Style].val.b ? 'M' : 'm';
togglestats[8] = curconfig[FrameFlattening].val.b ? 'F' : 'f';
- togglestats[9] = '\0';
+ togglestats[9] = curconfig[StrictTLS].val.b ? 'T' : 't';
+ togglestats[10] = '\0';
}
void
getpagestats(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';
}
pagestats[1] = '\0';
}
@@
-611,6
+635,9
@@
setparameter(Client *c, int refresh, ParamName p, const Arg *a)
WebKitSettings *s = webkit_web_view_get_settings(c->view);
switch (p) {
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;
case CaretBrowsing:
webkit_settings_set_enable_caret_browsing(s, a->b);
refresh = 0;
@@
-655,6
+682,9
@@
setparameter(Client *c, int refresh, ParamName p, const Arg *a)
case LoadImages:
webkit_settings_set_auto_load_images(s, a->b);
break;
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;
case Plugins:
webkit_settings_set_enable_plugins(s, a->b);
break;
@@
-672,18
+702,21
@@
setparameter(Client *c, int refresh, ParamName p, const Arg *a)
return; /* do not update */
case ShowIndicators:
break;
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 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 Strict
SSL
:
+ case Strict
TLS
:
webkit_web_context_set_tls_errors_policy(
webkit_web_view_get_context(c->view), a->b ?
WEBKIT_TLS_ERRORS_POLICY_FAIL :
WEBKIT_TLS_ERRORS_POLICY_IGNORE);
webkit_web_context_set_tls_errors_policy(
webkit_web_view_get_context(c->view), a->b ?
WEBKIT_TLS_ERRORS_POLICY_FAIL :
WEBKIT_TLS_ERRORS_POLICY_IGNORE);
- return; /* do not update */
+ break;
case Style:
if (a->b)
setstyle(c, getstyle(geturi(c)));
case Style:
if (a->b)
setstyle(c, getstyle(geturi(c)));
@@
-784,7
+817,7
@@
newwindow(Client *c, const Arg *a, int noembed)
{
int i = 0;
char tmp[64];
{
int i = 0;
char tmp[64];
- const char *cmd[2
6
], *uri;
+ const char *cmd[2
7
], *uri;
const Arg arg = { .v = cmd };
cmd[i++] = argv0;
const Arg arg = { .v = cmd };
cmd[i++] = argv0;
@@
-795,6
+828,10
@@
newwindow(Client *c, const Arg *a, int noembed)
cmd[i++] = "-c";
cmd[i++] = cookiefile;
}
cmd[i++] = "-c";
cmd[i++] = cookiefile;
}
+ if (stylefile && g_strcmp0(stylefile, "")) {
+ cmd[i++] = "-C";
+ cmd[i++] = stylefile;
+ }
cmd[i++] = curconfig[DiskCache].val.b ? "-D" : "-d";
if (embed && !noembed) {
cmd[i++] = "-e";
cmd[i++] = curconfig[DiskCache].val.b ? "-D" : "-d";
if (embed && !noembed) {
cmd[i++] = "-e";
@@
-813,10
+850,6
@@
newwindow(Client *c, const Arg *a, int noembed)
cmd[i++] = scriptfile;
}
cmd[i++] = curconfig[JavaScript].val.b ? "-S" : "-s";
cmd[i++] = scriptfile;
}
cmd[i++] = curconfig[JavaScript].val.b ? "-S" : "-s";
- if (stylefile && g_strcmp0(stylefile, "")) {
- cmd[i++] = "-t";
- cmd[i++] = stylefile;
- }
if (fulluseragent && g_strcmp0(fulluseragent, "")) {
cmd[i++] = "-u";
cmd[i++] = fulluseragent;
if (fulluseragent && g_strcmp0(fulluseragent, "")) {
cmd[i++] = "-u";
cmd[i++] = fulluseragent;
@@
-874,6
+907,7
@@
cleanup(void)
g_free(scriptfile);
g_free(stylefile);
g_free(cachedir);
g_free(scriptfile);
g_free(stylefile);
g_free(cachedir);
+ XCloseDisplay(dpy);
}
WebKitWebView *
}
WebKitWebView *
@@
-891,7
+925,7
@@
newview(Client *c, WebKitWebView *rv)
} else {
settings = webkit_settings_new_with_settings(
"auto-load-images", curconfig[LoadImages].val.b,
} 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,
"enable-caret-browsing", curconfig[CaretBrowsing].val.b,
"enable-developer-extras", curconfig[Inspector].val.b,
"enable-dns-prefetching", curconfig[DNSPrefetch].val.b,
@@
-900,6
+934,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-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 */
NULL);
/* For mor interesting settings, have a look at
* http://webkitgtk.org/reference/webkit2gtk/stable/WebKitSettings.html */
@@
-924,9
+961,9
@@
newview(Client *c, WebKitWebView *rv)
* or one for each view */
webkit_web_context_set_process_model(context,
WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES);
* 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,
webkit_web_context_set_tls_errors_policy(context,
- curconfig[Strict
SSL
].val.b ? WEBKIT_TLS_ERRORS_POLICY_FAIL :
+ curconfig[Strict
TLS
].val.b ? WEBKIT_TLS_ERRORS_POLICY_FAIL :
WEBKIT_TLS_ERRORS_POLICY_IGNORE);
/* disk cache */
webkit_web_context_set_cache_model(context,
WEBKIT_TLS_ERRORS_POLICY_IGNORE);
/* disk cache */
webkit_web_context_set_cache_model(context,
@@
-951,6
+988,8
@@
newview(Client *c, WebKitWebView *rv)
g_signal_connect(G_OBJECT(context), "download-started",
G_CALLBACK(downloadstarted), c);
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,
v = g_object_new(WEBKIT_TYPE_WEB_VIEW,
"settings", settings,
@@
-971,6
+1010,8
@@
newview(Client *c, WebKitWebView *rv)
G_CALLBACK(createview), c);
g_signal_connect(G_OBJECT(v), "decide-policy",
G_CALLBACK(decidepolicy), c);
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",
g_signal_connect(G_OBJECT(v), "load-changed",
G_CALLBACK(loadchanged), c);
g_signal_connect(G_OBJECT(v), "mouse-target-changed",
@@
-983,6
+1024,12
@@
newview(Client *c, WebKitWebView *rv)
return v;
}
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)
{
GtkWidget *
createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c)
{
@@
-1159,7
+1206,7
@@
createwindow(Client *c)
gtk_window_set_role(GTK_WINDOW(w), wmstr);
g_free(wmstr);
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",
}
g_signal_connect(G_OBJECT(w), "destroy",
@@
-1186,7
+1233,7
@@
loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
curconfig = defconfig;
setatom(c, AtomUri, title);
c->title = title;
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:
seturiparameters(c, geturi(c));
break;
case WEBKIT_LOAD_REDIRECTED:
@@
-1195,10
+1242,8
@@
loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
seturiparameters(c, geturi(c));
break;
case WEBKIT_LOAD_COMMITTED:
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
break;
case WEBKIT_LOAD_FINISHED:
/* Disabled until we write some WebKitWebExtension for
@@
-1385,6
+1430,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)
{
void
downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c)
{
@@
-1629,6
+1680,9
@@
main(int argc, char *argv[])
case 'c':
cookiefile = EARGF(usage());
break;
case 'c':
cookiefile = EARGF(usage());
break;
+ case 'C':
+ stylefile = EARGF(usage());
+ break;
case 'd':
defconfig CSETB(DiskCache, 0);
break;
case 'd':
defconfig CSETB(DiskCache, 0);
break;
@@
-1689,14
+1743,11
@@
main(int argc, char *argv[])
case 'S':
defconfig CSETB(JavaScript, 1);
break;
case 'S':
defconfig CSETB(JavaScript, 1);
break;
- case 't':
- stylefile = EARGF(usage());
- break;
case 'u':
fulluseragent = EARGF(usage());
break;
case 'v':
case 'u':
fulluseragent = EARGF(usage());
break;
case 'v':
- die("surf-"VERSION", ©2009-201
5
surf engineers, "
+ die("surf-"VERSION", ©2009-201
7
surf engineers, "
"see LICENSE for details\n");
case 'x':
showxid = 1;
"see LICENSE for details\n");
case 'x':
showxid = 1;