Allowing geo location policy decisions.

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index 830665a..da84e1c 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -77,9 +77,10 @@ static GdkNativeWindow embed = 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 void beforerequest(WebKitWebView *w, WebKitWebFrame *f,
                WebKitWebResource *r, WebKitNetworkRequest *req,
                WebKitNetworkResponse *resp, gpointer d);
@@ -105,12 +106,16 @@ static gboolean decidedownload(WebKitWebView *v, WebKitWebFrame *f,
 static gboolean decidewindow(WebKitWebView *v, WebKitWebFrame *f,
                WebKitNetworkRequest *r, WebKitWebNavigationAction *n,
                WebKitWebPolicyDecision *p, Client *c);
+static gboolean deletion_interface(WebKitWebView *view,
+               WebKitDOMHTMLElement *arg1, Client *c);
 static void destroyclient(Client *c);
 static void destroywin(GtkWidget* w, Client *c);
 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 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);
@@ -124,7 +129,9 @@ 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 gboolean keypress(GtkAccelGroup *group,
+               GObject *obj, guint key, GdkModifierType mods,
+               Client *c);
 static void linkhover(WebKitWebView *v, const char* t, const char* l,
                Client *c);
 static void loadstatuschange(WebKitWebView *view, GParamSpec *pspec,
@@ -153,9 +160,10 @@ 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 togglegeolocation(Client *c, const Arg *arg);
 static void togglescrollbars(Client *c, const Arg *arg);
 static void togglestyle(Client *c, const Arg *arg);
-static void update(Client *c);
+static void updatetitle(Client *c);
 static void updatewinid(Client *c);
 static void usage(void);
 static void windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame,
@@ -165,6 +173,20 @@ static void zoom(Client *c, const Arg *arg);
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
+static 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);
+}
+
 static void
 beforerequest(WebKitWebView *w, WebKitWebFrame *f, WebKitWebResource *r,
                WebKitNetworkRequest *req, WebKitNetworkResponse *resp,
@@ -369,6 +391,12 @@ decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r,
        return FALSE;
 }
 
+static gboolean
+deletion_interface(WebKitWebView *view,
+               WebKitDOMHTMLElement *arg1, Client *c) {
+       return FALSE;
+}
+
 static void
 destroyclient(Client *c) {
        Client *p;
@@ -424,6 +452,16 @@ fullscreen(Client *c, const Arg *arg) {
        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];
@@ -514,14 +552,17 @@ inspector_finished(WebKitWebInspector *i, Client *c) {
 }
 
 static gboolean
-keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
+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(gdk_keyval_to_lower(ev->keyval) == keys[i].keyval
-                               && CLEANMASK(ev->state) == keys[i].mod
+               if(key == keys[i].keyval
+                               && mods == keys[i].mod
                                && keys[i].func) {
                        keys[i].func(c, &(keys[i].arg));
                        processed = TRUE;
@@ -539,7 +580,7 @@ linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) {
                free(c->linkhover);
                c->linkhover = NULL;
        }
-       update(c);
+       updatetitle(c);
 }
 
 static void
@@ -565,7 +606,7 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
                break;
        case WEBKIT_LOAD_FINISHED:
                c->progress = 100;
-               update(c);
+               updatetitle(c);
                break;
        default:
                break;
@@ -577,12 +618,13 @@ loaduri(Client *c, const Arg *arg) {
        char *u, *rp;
        const char *uri = (char *)arg->v;
        Arg a = { .b = FALSE };
+       struct stat st;
 
        if(strcmp(uri, "") == 0)
                return;
 
        /* In case it's a file path. */
-       if(uri[0] == '/') {
+       if(stat(uri, &st) == 0) {
                rp = realpath(uri, NULL);
                u = g_strdup_printf("file://%s", rp);
                free(rp);
@@ -599,7 +641,7 @@ loaduri(Client *c, const Arg *arg) {
                c->progress = 0;
                c->title = copystr(&c->title, u);
                g_free(u);
-               update(c);
+               updatetitle(c);
        }
 }
 
@@ -644,11 +686,9 @@ newclient(void) {
        g_signal_connect(G_OBJECT(c->win),
                        "destroy",
                        G_CALLBACK(destroywin), c);
-       if(!kioskmode) {
-               g_signal_connect(G_OBJECT(c->win),
-                               "key-press-event",
-                               G_CALLBACK(keypress), c);
-       }
+
+       if(!kioskmode)
+               addaccelgroup(c);
 
        /* Pane */
        c->pane = gtk_vpaned_new();
@@ -666,6 +706,9 @@ newclient(void) {
        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);
@@ -696,6 +739,9 @@ newclient(void) {
        g_signal_connect(G_OBJECT(c->view),
                        "resource-request-starting",
                        G_CALLBACK(beforerequest), c);
+       g_signal_connect(G_OBJECT(c->view),
+                       "should-show-delete-interface-for-element",
+                       G_CALLBACK(deletion_interface), c);
 
        /* Scrolled Window */
        c->scroll = gtk_scrolled_window_new(NULL, NULL);
@@ -889,11 +935,12 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
                        if(ev->atom == atoms[AtomFind]) {
                                arg.b = TRUE;
                                find(c, &arg);
+
                                return GDK_FILTER_REMOVE;
-                       }
-                       else if(ev->atom == atoms[AtomGo]) {
+                       } else if(ev->atom == atoms[AtomGo]) {
                                arg.v = getatom(c, AtomGo);
                                loaduri(c, &arg);
+
                                return GDK_FILTER_REMOVE;
                        }
                }
@@ -904,7 +951,7 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
 static void
 progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
        c->progress = webkit_web_view_get_progress(c->view) * 100;
-       update(c);
+       updatetitle(c);
 }
 
 static void
@@ -1052,7 +1099,7 @@ stop(Client *c, const Arg *arg) {
 static void
 titlechange(WebKitWebView *v, WebKitWebFrame *f, const char *t, Client *c) {
        c->title = copystr(&c->title, t);
-       update(c);
+       updatetitle(c);
 }
 
 static void
@@ -1066,7 +1113,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);
 
-       reload(c,&a);
+       reload(c, &a);
 }
 
 static void
@@ -1087,6 +1134,15 @@ twitch(Client *c, const Arg *arg) {
        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;
@@ -1117,7 +1173,7 @@ togglestyle(Client *c, const Arg *arg) {
        uri = uri[0] ? g_strdup("") : g_strconcat("file://", stylefile, NULL);
        g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL);
 
-       update(c);
+       updatetitle(c);
 }
 
 static void
@@ -1130,19 +1186,21 @@ gettogglestat(Client *c){
                        &value, NULL);
        togglestat[0] = value? 'C': 'c';
 
+       togglestat[1] = allowgeolocation? 'G': 'g';
+
        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);
-       togglestat[2] = value? 'S': 's';
+       togglestat[3] = value? 'S': 's';
 
        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);
-       togglestat[4] = uri[0] ? 'M': 'm';
+       togglestat[5] = uri[0] ? 'M': 'm';
 
-       togglestat[5] = '\0';
+       togglestat[6] = '\0';
 }
 
 static void
@@ -1161,23 +1219,29 @@ getpagestat(Client *c) {
 }
 
 static void
-update(Client *c) {
+updatetitle(Client *c) {
        char *t;
 
-       gettogglestat(c);
-       getpagestat(c);
+       if(showindicators) {
+               gettogglestat(c);
+               getpagestat(c);
 
-       if(c->linkhover) {
-               t = g_strdup_printf("%s:%s | %s", togglestat, pagestat, c->linkhover);
-       } else if(c->progress != 100) {
-               t = g_strdup_printf("[%i%%] %s:%s | %s", c->progress, togglestat,
-                       pagestat, c->title);
+               if(c->linkhover) {
+                       t = g_strdup_printf("%s:%s | %s", togglestat,
+                                       pagestat, c->linkhover);
+               } else if(c->progress != 100) {
+                       t = g_strdup_printf("[%i%%] %s:%s | %s", c->progress,
+                                       togglestat, pagestat, c->title);
+               } else {
+                       t = g_strdup_printf("%s:%s | %s", togglestat, pagestat,
+                                       c->title);
+               }
+
+               gtk_window_set_title(GTK_WINDOW(c->win), t);
+               g_free(t);
        } else {
-               t = g_strdup_printf("%s:%s | %s", togglestat, pagestat, c->title);
+               gtk_window_set_title(GTK_WINDOW(c->win), c->title);
        }
-
-       gtk_window_set_title(GTK_WINDOW(c->win), t);
-       g_free(t);
 }
 
 static void
@@ -1231,6 +1295,9 @@ main(int argc, char *argv[]) {
        case 'e':
                embed = strtol(EARGF(usage()), NULL, 0);
                break;
+       case 'g':
+               allowgeolocation = 0;
+               break;
        case 'i':
                loadimages = 0;
                break;