pinosaur
/
surf.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setting the cookie file on new instances.
[surf.git]
/
surf.c
diff --git
a/surf.c
b/surf.c
index
87116f9
..
939a06f
100644
(file)
--- a/
surf.c
+++ b/
surf.c
@@
-2,6
+2,7
@@
*
* To understand surf, start reading main().
*/
*
* To understand surf, start reading main().
*/
+
#include <signal.h>
#include <X11/X.h>
#include <X11/Xatom.h>
#include <signal.h>
#include <X11/X.h>
#include <X11/Xatom.h>
@@
-77,7
+78,7
@@
static GdkNativeWindow embed = 0;
static gboolean showxid = FALSE;
static char winid[64];
static gboolean usingproxy = 0;
static gboolean showxid = FALSE;
static char winid[64];
static gboolean usingproxy = 0;
-static char togglestat[
6
];
+static char togglestat[
7
];
static char pagestat[3];
static void addaccelgroup(Client *c);
static char pagestat[3];
static void addaccelgroup(Client *c);
@@
-114,6
+115,8
@@
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 void eval(Client *c, const Arg *arg);
static void find(Client *c, const Arg *arg);
static void fullscreen(Client *c, const Arg *arg);
+static void geopolicyrequested(WebKitWebView *v, WebKitWebFrame *f,
+ WebKitGeolocationPolicyDecision *d, Client *c);
static const char *getatom(Client *c, int a);
static void gettogglestat(Client *c);
static void getpagestat(Client *c);
static const char *getatom(Client *c, int a);
static void gettogglestat(Client *c);
static void getpagestat(Client *c);
@@
-158,6
+161,7
@@
static void stop(Client *c, const Arg *arg);
static void titlechange(WebKitWebView *v, WebKitWebFrame *frame,
const char *title, Client *c);
static void toggle(Client *c, const Arg *arg);
static void titlechange(WebKitWebView *v, WebKitWebFrame *frame,
const char *title, Client *c);
static void toggle(Client *c, const Arg *arg);
+static void togglegeolocation(Client *c, const Arg *arg);
static void togglescrollbars(Client *c, const Arg *arg);
static void togglestyle(Client *c, const Arg *arg);
static void updatetitle(Client *c);
static void togglescrollbars(Client *c, const Arg *arg);
static void togglestyle(Client *c, const Arg *arg);
static void updatetitle(Client *c);
@@
-449,6
+453,16
@@
fullscreen(Client *c, const Arg *arg) {
c->fullscreen = !c->fullscreen;
}
c->fullscreen = !c->fullscreen;
}
+static void
+geopolicyrequested(WebKitWebView *v, WebKitWebFrame *f,
+ WebKitGeolocationPolicyDecision *d, Client *c) {
+ if(allowgeolocation) {
+ webkit_geolocation_policy_allow(d);
+ } else {
+ webkit_geolocation_policy_deny(d);
+ }
+}
+
static const char *
getatom(Client *c, int a) {
static char buf[BUFSIZ];
static const char *
getatom(Client *c, int a) {
static char buf[BUFSIZ];
@@
-693,6
+707,9
@@
newclient(void) {
g_signal_connect(G_OBJECT(c->view),
"hovering-over-link",
G_CALLBACK(linkhover), c);
g_signal_connect(G_OBJECT(c->view),
"hovering-over-link",
G_CALLBACK(linkhover), c);
+ g_signal_connect(G_OBJECT(c->view),
+ "geolocation-policy-decision-requested",
+ G_CALLBACK(geopolicyrequested), c);
g_signal_connect(G_OBJECT(c->view),
"create-web-view",
G_CALLBACK(createwindow), c);
g_signal_connect(G_OBJECT(c->view),
"create-web-view",
G_CALLBACK(createwindow), c);
@@
-826,7
+843,7
@@
newclient(void) {
static void
newwindow(Client *c, const Arg *arg, gboolean noembed) {
guint i = 0;
static void
newwindow(Client *c, const Arg *arg, gboolean noembed) {
guint i = 0;
- const char *cmd[1
2
], *uri;
+ const char *cmd[1
4
], *uri;
const Arg a = { .v = (void *)cmd };
char tmp[64];
const Arg a = { .v = (void *)cmd };
char tmp[64];
@@
-848,6
+865,8
@@
newwindow(Client *c, const Arg *arg, gboolean noembed) {
cmd[i++] = "-s";
if(showxid)
cmd[i++] = "-x";
cmd[i++] = "-s";
if(showxid)
cmd[i++] = "-x";
+ cmd[i++] = "-c";
+ cmd[i++] = cookiefile;
cmd[i++] = "--";
uri = arg->v ? (char *)arg->v : c->linkhover;
if(uri)
cmd[i++] = "--";
uri = arg->v ? (char *)arg->v : c->linkhover;
if(uri)
@@
-1097,7
+1116,7
@@
toggle(Client *c, const Arg *arg) {
g_object_get(G_OBJECT(settings), name, &value, NULL);
g_object_set(G_OBJECT(settings), name, !value, NULL);
g_object_get(G_OBJECT(settings), name, &value, NULL);
g_object_set(G_OBJECT(settings), name, !value, NULL);
- reload(c,&a);
+ reload(c,
&a);
}
static void
}
static void
@@
-1118,6
+1137,15
@@
twitch(Client *c, const Arg *arg) {
gtk_adjustment_set_value(a, v);
}
gtk_adjustment_set_value(a, v);
}
+static void
+togglegeolocation(Client *c, const Arg *arg) {
+ Arg a = { .b = FALSE };
+
+ allowgeolocation ^= 1;
+
+ reload(c, &a);
+}
+
static void
togglescrollbars(Client *c, const Arg *arg) {
GtkPolicyType vspolicy;
static void
togglescrollbars(Client *c, const Arg *arg) {
GtkPolicyType vspolicy;
@@
-1161,19
+1189,21
@@
gettogglestat(Client *c){
&value, NULL);
togglestat[0] = value? 'C': 'c';
&value, NULL);
togglestat[0] = value? 'C': 'c';
+ togglestat[1] = allowgeolocation? 'G': 'g';
+
g_object_get(G_OBJECT(settings), "auto-load-images", &value, NULL);
g_object_get(G_OBJECT(settings), "auto-load-images", &value, NULL);
- togglestat[
1
] = value? 'I': 'i';
+ togglestat[
2
] = value? 'I': 'i';
g_object_get(G_OBJECT(settings), "enable-scripts", &value, NULL);
g_object_get(G_OBJECT(settings), "enable-scripts", &value, NULL);
- togglestat[
2
] = value? 'S': 's';
+ togglestat[
3
] = value? 'S': 's';
g_object_get(G_OBJECT(settings), "enable-plugins", &value, NULL);
g_object_get(G_OBJECT(settings), "enable-plugins", &value, NULL);
- togglestat[
3
] = value? 'V': 'v';
+ togglestat[
4
] = value? 'V': 'v';
g_object_get(G_OBJECT(settings), "user-stylesheet-uri", &uri, NULL);
g_object_get(G_OBJECT(settings), "user-stylesheet-uri", &uri, NULL);
- togglestat[
4
] = uri[0] ? 'M': 'm';
+ togglestat[
5
] = uri[0] ? 'M': 'm';
- togglestat[
5
] = '\0';
+ togglestat[
6
] = '\0';
}
static void
}
static void
@@
-1262,30
+1292,54
@@
main(int argc, char *argv[]) {
case 'b':
enablescrollbars = 0;
break;
case 'b':
enablescrollbars = 0;
break;
+ case 'B':
+ enablescrollbars = 1;
+ break;
case 'c':
cookiefile = EARGF(usage());
break;
case 'e':
embed = strtol(EARGF(usage()), NULL, 0);
break;
case 'c':
cookiefile = EARGF(usage());
break;
case 'e':
embed = strtol(EARGF(usage()), NULL, 0);
break;
+ case 'g':
+ allowgeolocation = 0;
+ break;
+ case 'G':
+ allowgeolocation = 1;
+ break;
case 'i':
loadimages = 0;
break;
case 'i':
loadimages = 0;
break;
+ case 'I':
+ loadimages = 1;
+ break;
case 'k':
case 'k':
+ kioskmode = 0;
+ break;
+ case 'K':
kioskmode = 1;
break;
case 'n':
enableinspector = 0;
break;
kioskmode = 1;
break;
case 'n':
enableinspector = 0;
break;
+ case 'N':
+ enableinspector = 1;
+ break;
case 'p':
enableplugins = 0;
break;
case 'p':
enableplugins = 0;
break;
+ case 'P':
+ enableplugins = 1;
+ break;
case 'r':
scriptfile = EARGF(usage());
break;
case 's':
enablescripts = 0;
break;
case 'r':
scriptfile = EARGF(usage());
break;
case 's':
enablescripts = 0;
break;
+ case 'S':
+ enablescripts = 1;
+ break;
case 't':
stylefile = EARGF(usage());
break;
case 't':
stylefile = EARGF(usage());
break;