renaming newproc to newwindow; make it usable within keys; begin implementing contextmenu

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index 948ca28..b6b8c92 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -38,11 +38,17 @@ typedef struct Client {
        struct Client *next;
 } Client;
 
+typedef struct {
+       char *label;
+       void (*func)(Client *c, const Arg *arg);
+       const Arg arg;
+} Context;
+
 typedef struct Cookie {
-       char *name;
-       char *value;
-       char *domain;
-       char *path;
+       gchar *name;
+       gchar *value;
+       gchar *domain;
+       gchar *path;
        struct Cookie *next;
 } Cookie;
 
@@ -76,47 +82,48 @@ static gchar *progname;
 static gchar *buildpath(const gchar *path);
 static void cleanup(void);
 static void clipboard(Client *c, const Arg *arg);
+static void context(WebKitWebView *v, GtkMenu *m, Client *c);
 static gchar *copystr(gchar **str, const gchar *src);
-static gboolean decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c);
+static gboolean decidewindow(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c);
 static void destroyclient(Client *c);
 static void destroywin(GtkWidget* w, Client *c);
-static void die(char *str);
+static void die(gchar *str);
 static void download(WebKitDownload *o, GParamSpec *pspec, Client *c);
 static void drawindicator(Client *c);
 static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c);
-static gboolean initdownload(WebKitWebView *view, WebKitDownload *o, Client *c);
+static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
 static gchar *geturi(Client *c);
 static void hidesearch(Client *c, const Arg *arg);
 static void hideurl(Client *c, const Arg *arg);
-static gboolean keypress(GtkWidget* w, GdkEventKey *ev, Client *c);
-static void linkhover(WebKitWebView* page, const gchar* t, const gchar* l, Client *c);
-static void loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c);
-static void loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c);
+static gboolean keypress(GtkWidget *w, GdkEventKey *ev, Client *c);
+static void linkhover(WebKitWebView *v, const gchar* t, const gchar* l, Client *c);
+static void loadcommit(WebKitWebView *v, WebKitWebFrame *f, Client *c);
+static void loadstart(WebKitWebView *v, WebKitWebFrame *f, Client *c);
 static void loaduri(Client *c, const Arg *arg);
 static void navigate(Client *c, const Arg *arg);
 static Client *newclient(void);
-static void newproc(const gchar *url);
-static WebKitWebView *createwindow(WebKitWebView  *v, WebKitWebFrame *f, Client *c);
+static void newwindow(Client *c, const Arg *arg);
+static WebKitWebView *createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c);
 static void pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d);
 static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
 static void print(Client *c, const Arg *arg);
 static void proccookies(SoupMessage *m, Client *c);
-static void progresschange(WebKitWebView *view, gint p, Client *c);
+static void progresschange(WebKitWebView *v, gint p, Client *c);
 static void request(SoupSession *s, SoupMessage *m, Client *c);
 static void reload(Client *c, const Arg *arg);
 static void rereadcookies(void);
 static void sigchld(int unused);
-static void setcookie(char *name, char *val, char *dom, char *path, long exp);
+static void setcookie(gchar *name, gchar *val, gchar *dom, gchar *path, long exp);
 static void setup(void);
 static void spawn(Client *c, const Arg *arg);
-static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, Client *c);
+static void titlechange(WebKitWebView *v, WebKitWebFrame* frame, const gchar* title, Client *c);
 static void scroll(Client *c, const Arg *arg);
 static void searchtext(Client *c, const Arg *arg);
 static void source(Client *c, const Arg *arg);
 static void showsearch(Client *c, const Arg *arg);
 static void showurl(Client *c, const Arg *arg);
 static void stop(Client *c, const Arg *arg);
-static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, Client *c);
+static void titlechange(WebKitWebView *v, WebKitWebFrame* frame, const gchar* title, Client *c);
 static gboolean focusview(GtkWidget *w, GdkEventFocus *e, Client *c);
 static void usage(void);
 static void update(Client *c);
@@ -168,6 +175,12 @@ clipboard(Client *c, const Arg *arg) {
                gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), webkit_web_view_get_uri(c->view), -1);
 }
 
+void
+context(WebKitWebView *v, GtkMenu *m, Client *c) {
+
+       //gtk_menu_shell_append  ((GtkMenuShell *)(menu),(child))
+}
+
 gchar *
 copystr(gchar **str, const gchar *src) {
        gchar *tmp;
@@ -202,9 +215,11 @@ destroyclient(Client *c) {
 
 gboolean
 decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c) {
+       Arg arg;
        if(webkit_web_navigation_action_get_reason(n) == WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) {
                webkit_web_policy_decision_ignore(p);
-               newproc(webkit_network_request_get_uri(r));
+               arg.v = (void *)webkit_network_request_get_uri(r);
+               newwindow(NULL, &arg);
                return TRUE;
        }
        return FALSE;
@@ -216,7 +231,7 @@ destroywin(GtkWidget* w, Client *c) {
 }
 
 void
-die(char *str) {
+die(gchar *str) {
        fputs(str, stderr);
        exit(EXIT_FAILURE);
 }
@@ -334,7 +349,7 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
 }
 
 void
-linkhover(WebKitWebView* page, const gchar* t, const gchar* l, Client *c) {
+linkhover(WebKitWebView *v, const gchar* t, const gchar* l, Client *c) {
        if(l)
                gtk_window_set_title(GTK_WINDOW(c->win), l);
        else
@@ -420,6 +435,7 @@ newclient(void) {
        g_signal_connect(G_OBJECT(c->view), "window-object-cleared", G_CALLBACK(windowobjectcleared), c);
        g_signal_connect_after(session, "request-started", G_CALLBACK(request), c);
        g_signal_connect(G_OBJECT(c->view), "focus-in-event", G_CALLBACK(focusview), c);
+       g_signal_connect(G_OBJECT(c->view), "populate-popup", G_CALLBACK(context), c);
 
        /* urlbar */
        c->urlbar = gtk_entry_new();
@@ -478,10 +494,10 @@ newclient(void) {
 }
 
 void
-newproc(const gchar *url) {
+newwindow(Client *c, const Arg *arg) {
        guint i = 0, urlindex;
        const gchar *cmd[7];
-       const Arg arg = { .v = (void *)cmd };
+       const Arg a = { .v = (void *)cmd };
        gchar tmp[64];
 
        cmd[i++] = progname;
@@ -495,10 +511,10 @@ newproc(const gchar *url) {
        }
        cmd[i++] = "--";
        urlindex = i;
-       if(url)
-               cmd[i++] = url;
+       if(arg->v)
+               cmd[i++] = (char *)arg->v;
        cmd[i++] = NULL;
-       spawn(NULL, &arg);
+       spawn(NULL, &a);
 }
 
 WebKitWebView *
@@ -563,7 +579,7 @@ proccookies(SoupMessage *m, Client *c) {
 }
 
 void
-progresschange(WebKitWebView* view, gint p, Client *c) {
+progresschange(WebKitWebView *v, gint p, Client *c) {
        c->progress = p;
        update(c);
 }
@@ -609,7 +625,7 @@ sigchld(int unused) {
 }
 
 void
-setcookie(char *name, char *val, char *dom, char *path, long exp) {
+setcookie(gchar *name, gchar *val, gchar *dom, gchar *path, long exp) {
 
 }
 
@@ -691,8 +707,8 @@ spawn(Client *c, const Arg *arg) {
                if(dpy)
                        close(ConnectionNumber(dpy));
                setsid();
-               execvp(((char **)arg->v)[0], (char **)arg->v);
-               fprintf(stderr, "tabbed: execvp %s", ((char **)arg->v)[0]);
+               execvp(((gchar **)arg->v)[0], (gchar **)arg->v);
+               fprintf(stderr, "tabbed: execvp %s", ((gchar **)arg->v)[0]);
                perror(" failed");
                exit(0);
        }