improving urlbar hiding.
[surf.git] / surf.c
diff --git a/surf.c b/surf.c
index d7bb88c..948ca28 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -2,6 +2,7 @@
  *
  * To understand surf, start reading main().
  */
+#include <signal.h>
 #include <X11/X.h>
 #include <X11/Xatom.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 #include <unistd.h>
-#include <getopt.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <webkit/webkit.h>
 #include <glib/gstdio.h>
+#include <JavaScriptCore/JavaScript.h>
 
 #define LENGTH(x)               (sizeof x / sizeof x[0])
 #define CLEANMASK(mask)         (mask & ~(GDK_MOD2_MASK))
 
-Display *dpy;
-Atom urlprop;
 typedef union Arg Arg;
 union Arg {
        const gboolean b;
        const gint i;
        const void *v;
-} ;
+};
 
 typedef struct Client {
        GtkWidget *win, *scroll, *vbox, *urlbar, *searchbar, *indicator;
@@ -46,10 +47,10 @@ typedef struct Cookie {
 } Cookie;
 
 typedef enum {
-    BROWSER = 0x0001,
-    SEARCHBAR = 0x0010,
-    URLBAR = 0x0100,
-    ALWAYS = ~0,
+       Browser = 0x0001,
+       SearchBar = 0x0010,
+       UrlBar = 0x0100,
+       Any = ~0,
 } KeyFocus;
 
 typedef struct {
@@ -60,6 +61,8 @@ typedef struct {
        KeyFocus focus;
 } Key;
 
+static Display *dpy;
+static Atom urlprop;
 static SoupCookieJar *cookiejar;
 static SoupSession *session;
 static Client *clients = NULL;
@@ -67,13 +70,14 @@ static Client *clients = NULL;
 static GdkNativeWindow embed = 0;
 static gboolean showxid = FALSE;
 static gboolean ignore_once = FALSE;
-static gchar *workdir;
-extern char *optarg;
-extern gint optind;
+static gchar winid[64];
+static gchar *progname;
 
+static gchar *buildpath(const gchar *path);
 static void cleanup(void);
 static void clipboard(Client *c, const Arg *arg);
 static gchar *copystr(gchar **str, const gchar *src);
+static gboolean decidewindow(WebKitWebView *view, 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);
@@ -88,11 +92,11 @@ 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 void loadfile(Client *c, const gchar *f);
 static void loaduri(Client *c, const Arg *arg);
 static void navigate(Client *c, const Arg *arg);
 static Client *newclient(void);
-static WebKitWebView *newwindow(WebKitWebView  *v, WebKitWebFrame *f, Client *c);
+static void newproc(const gchar *url);
+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);
@@ -101,10 +105,11 @@ static void progresschange(WebKitWebView *view, 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 setup(void);
-static void titlechange(WebKitWebView* view, WebKitWebFrame* frame,
-               const gchar* title, Client *c);
+static void spawn(Client *c, const Arg *arg);
+static void titlechange(WebKitWebView* view, 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);
@@ -112,18 +117,45 @@ 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 gboolean unfocusbar(GtkWidget *w, GdkEventFocus *e, Client *c);
+static gboolean focusview(GtkWidget *w, GdkEventFocus *e, Client *c);
 static void usage(void);
 static void update(Client *c);
+static void updatewinid(Client *c);
+static void windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c);
 static void zoom(Client *c, const Arg *arg);
 
+/* configuration, allows nested code to access above variables */
 #include "config.h"
 
+gchar *
+buildpath(const gchar *path) {
+       gchar *apath, *p;
+       FILE *f;
+
+       /* creating directory */
+       if(path[0] == '/')
+               apath = g_strdup(path);
+       else
+               apath = g_strconcat(g_get_home_dir(), "/", path, NULL);
+       if((p = strrchr(apath, '/'))) {
+               *p = '\0';
+               g_mkdir_with_parents(apath, 0755);
+               *p = '/';
+       }
+       /* creating file (gives error when apath ends with "/") */
+       if((f = g_fopen(apath, "a")))
+               fclose(f);
+       return apath;
+}
+
 void
 cleanup(void) {
        while(clients)
                destroyclient(clients);
-       g_free(workdir);
+       g_free(cookiefile);
+       g_free(dldir);
+       g_free(scriptfile);
+       g_free(stylefile);
 }
 
 void
@@ -152,7 +184,7 @@ void
 destroyclient(Client *c) {
        Client *p;
 
-       gtk_widget_destroy(GTK_WIDGET(webkit_web_view_new()));
+       gtk_widget_destroy(GTK_WIDGET(c->view));
        gtk_widget_destroy(c->scroll);
        gtk_widget_destroy(c->urlbar);
        gtk_widget_destroy(c->searchbar);
@@ -168,6 +200,16 @@ destroyclient(Client *c) {
                gtk_main_quit();
 }
 
+gboolean
+decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c) {
+       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));
+               return TRUE;
+       }
+       return FALSE;
+}
+
 void
 destroywin(GtkWidget* w, Client *c) {
        destroyclient(c);
@@ -222,14 +264,12 @@ download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
 gboolean
 initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
        const gchar *filename;
-       gchar *uri, *path, *html;
+       gchar *uri, *html;
 
        stop(c, NULL);
        c->download = o;
        filename = webkit_download_get_suggested_filename(o);
-       path = g_build_filename(workdir, "dl", 
-                       filename, NULL);
-       uri = g_strconcat("file://", path, NULL);
+       uri = g_strconcat("file://", dldir, "/", filename, NULL);
        webkit_download_set_destination_uri(c->download, uri);
        c->progress = 0;
        g_free(uri);
@@ -275,11 +315,12 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
        if(ev->type != GDK_KEY_PRESS)
                return FALSE;
        if(GTK_WIDGET_HAS_FOCUS(c->searchbar))
-               focus = SEARCHBAR;
+               focus = SearchBar;
        else if(GTK_WIDGET_HAS_FOCUS(c->urlbar))
-               focus = URLBAR;
+               focus = UrlBar;
        else
-               focus = BROWSER;
+               focus = Browser;
+       updatewinid(c);
        for(i = 0; i < LENGTH(keys); i++) {
                if(focus & keys[i].focus
                                && gdk_keyval_to_lower(ev->keyval) == keys[i].keyval
@@ -317,39 +358,6 @@ loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
        update(c);
 }
 
-void
-loadfile(Client *c, const gchar *f) {
-       GIOChannel *chan = NULL;
-       GError *e = NULL;
-       GString *code;
-       gchar *line, *uri;
-       Arg arg;
-
-       if(strcmp(f, "-") == 0) {
-               chan = g_io_channel_unix_new(STDIN_FILENO);
-               if (chan) {
-                       code = g_string_new("");
-                       while(g_io_channel_read_line(chan, &line, NULL, NULL,
-                                               &e) == G_IO_STATUS_NORMAL) {
-                               g_string_append(code, line);
-                               g_free(line);
-                       }
-                       webkit_web_view_load_html_string(c->view, code->str,
-                                       "file://.");
-                       g_io_channel_shutdown(chan, FALSE, NULL);
-                       g_string_free(code, TRUE);
-               }
-               arg.v = uri = g_strdup("stdin");
-       }
-       else {
-               arg.v = uri = g_strdup_printf("file://%s", f);
-               loaduri(c, &arg);
-       }
-       c->title = copystr(&c->title, uri);
-       update(c);
-       g_free(uri);
-}
-
 void
 loaduri(Client *c, const Arg *arg) {
        gchar *u;
@@ -375,7 +383,7 @@ Client *
 newclient(void) {
        Client *c;
        WebKitWebSettings *settings;
-       gchar *filename;
+       gchar *uri;
 
        if(!(c = calloc(1, sizeof(Client))))
                die("Cannot malloc!\n");
@@ -406,19 +414,20 @@ newclient(void) {
        g_signal_connect(G_OBJECT(c->view), "load-committed", G_CALLBACK(loadcommit), c);
        g_signal_connect(G_OBJECT(c->view), "load-started", G_CALLBACK(loadstart), c);
        g_signal_connect(G_OBJECT(c->view), "hovering-over-link", G_CALLBACK(linkhover), c);
-       g_signal_connect(G_OBJECT(c->view), "create-web-view", G_CALLBACK(newwindow), c);
+       g_signal_connect(G_OBJECT(c->view), "create-web-view", G_CALLBACK(createwindow), c);
+       g_signal_connect(G_OBJECT(c->view), "new-window-policy-decision-requested", G_CALLBACK(decidewindow), c);
        g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(initdownload), c);
+       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);
 
        /* urlbar */
        c->urlbar = gtk_entry_new();
        gtk_entry_set_has_frame(GTK_ENTRY(c->urlbar), FALSE);
-       g_signal_connect(G_OBJECT(c->urlbar), "focus-out-event", G_CALLBACK(unfocusbar), c);
 
        /* searchbar */
        c->searchbar = gtk_entry_new();
        gtk_entry_set_has_frame(GTK_ENTRY(c->searchbar), FALSE);
-       g_signal_connect(G_OBJECT(c->searchbar), "focus-out-event", G_CALLBACK(unfocusbar), c);
 
        /* indicator */
        c->indicator = gtk_drawing_area_new();
@@ -426,8 +435,6 @@ newclient(void) {
        g_signal_connect (G_OBJECT (c->indicator), "expose_event",
                        G_CALLBACK (exposeindicator), c);
 
-       /* downloadbar */
-
        /* Arranging */
        gtk_container_add(GTK_CONTAINER(c->scroll), GTK_WIDGET(c->view));
        gtk_container_add(GTK_CONTAINER(c->win), c->vbox);
@@ -453,10 +460,10 @@ newclient(void) {
        gdk_window_add_filter(GTK_WIDGET(c->win)->window, processx, c);
        webkit_web_view_set_full_content_zoom(c->view, TRUE);
        settings = webkit_web_view_get_settings(c->view);
-       g_object_set (G_OBJECT(settings), "user-agent", "surf", NULL);
-       filename = g_build_filename(workdir, "style.css", NULL);
-       filename = g_strdup_printf("file://%s", filename);
-       g_object_set (G_OBJECT(settings), "user-stylesheet-uri", filename, NULL);
+       g_object_set(G_OBJECT(settings), "user-agent", useragent, NULL);
+       uri = g_strconcat("file://", stylefile, NULL);
+       g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL);
+       g_free(uri);
 
        c->download = NULL;
        c->title = NULL;
@@ -470,13 +477,36 @@ newclient(void) {
        return c;
 }
 
+void
+newproc(const gchar *url) {
+       guint i = 0, urlindex;
+       const gchar *cmd[7];
+       const Arg arg = { .v = (void *)cmd };
+       gchar tmp[64];
+
+       cmd[i++] = progname;
+       if(embed) {
+               cmd[i++] = "-e";
+               snprintf(tmp, LENGTH(tmp), "%u\n", (int)embed);
+               cmd[i++] = tmp;
+       }
+       if(showxid) {
+               cmd[i++] = "-x";
+       }
+       cmd[i++] = "--";
+       urlindex = i;
+       if(url)
+               cmd[i++] = url;
+       cmd[i++] = NULL;
+       spawn(NULL, &arg);
+}
+
 WebKitWebView *
-newwindow(WebKitWebView  *v, WebKitWebFrame *f, Client *c) {
+createwindow(WebKitWebView  *v, WebKitWebFrame *f, Client *c) {
        Client *n = newclient();
        return n->view;
 }
 
 void
 pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d) {
        Arg arg = {.v = text };
@@ -555,9 +585,7 @@ reload(Client *c, const Arg *arg) {
 
 void
 rereadcookies(void) {
-       const gchar *filename;
 
-       filename = g_build_filename(workdir, "cookies", NULL);
 }
 
 void
@@ -573,6 +601,13 @@ scroll(Client *c, const Arg *arg) {
        gtk_adjustment_set_value(a, v);
 }
 
+void
+sigchld(int unused) {
+       if(signal(SIGCHLD, sigchld) == SIG_ERR)
+               die("Can't install SIGCHLD handler");
+       while(0 < waitpid(-1, NULL, WNOHANG));
+}
+
 void
 setcookie(char *name, char *val, char *dom, char *path, long exp) {
 
@@ -580,30 +615,27 @@ setcookie(char *name, char *val, char *dom, char *path, long exp) {
 
 void
 setup(void) {
-       const gchar *home, *name;
        SoupSession *s;
-       FILE *tmp;
+
+       /* clean up any zombies immediately */
+       sigchld(0);
+       gtk_init(NULL, NULL);
+       if (!g_thread_supported())
+               g_thread_init(NULL);
 
        dpy = GDK_DISPLAY();
        session = webkit_get_default_session();
        urlprop = XInternAtom(dpy, "_SURF_URL", False);
 
-
        /* create dirs and files */
-       home = g_get_home_dir();
-       workdir = g_strdup(g_build_filename(home, ".surf", NULL));
-       g_mkdir_with_parents(workdir, 0755);
-       name = g_build_filename(workdir, "dl", NULL);
-       g_mkdir(name, 0755);
-       name = g_build_filename(workdir, "style.css", NULL);
-       if((tmp = g_fopen(name, "a")));
-               fclose(tmp);
-
+       cookiefile = buildpath(cookiefile);
+       dldir = buildpath(dldir);
+       scriptfile = buildpath(scriptfile);
+       stylefile = buildpath(stylefile);
 
        /* cookie persistance */
        s = webkit_get_default_session();
-       name = g_build_filename(workdir, "cookies.txt", NULL);
-       cookiejar = soup_cookie_jar_text_new(name, FALSE);
+       cookiejar = soup_cookie_jar_text_new(cookiefile, FALSE);
        soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
 }
 
@@ -617,21 +649,20 @@ showsearch(Client *c, const Arg *arg) {
 void
 source(Client *c, const Arg *arg) {
        Arg a = { .b = FALSE };
-       /*gboolean s;
+       gboolean s;
 
        s = webkit_web_view_get_view_source_mode(c->view);
-       webkit_web_view_set_view_source_mode(c->view, c->source);*/
+       webkit_web_view_set_view_source_mode(c->view, !s);
        reload(c, &a);
 }
 
 void
 searchtext(Client *c, const Arg *arg) {
+       const gchar *text;
        gboolean forward = *(gboolean *)arg;
-       webkit_web_view_search_text(c->view,
-                       gtk_entry_get_text(GTK_ENTRY(c->searchbar)),
-                       FALSE,
-                       forward,
-                       TRUE);
+       text = gtk_entry_get_text(GTK_ENTRY(c->searchbar));
+       webkit_web_view_search_text(c->view, text, FALSE, forward, TRUE);
+       webkit_web_view_mark_text_matches(c->view, text, FALSE, 0);
 }
 
 void
@@ -654,6 +685,19 @@ stop(Client *c, const Arg *arg) {
        c->download = NULL;
 }
 
+void
+spawn(Client *c, const Arg *arg) {
+       if(fork() == 0) {
+               if(dpy)
+                       close(ConnectionNumber(dpy));
+               setsid();
+               execvp(((char **)arg->v)[0], (char **)arg->v);
+               fprintf(stderr, "tabbed: execvp %s", ((char **)arg->v)[0]);
+               perror(" failed");
+               exit(0);
+       }
+}
+
 void
 titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, Client *c) {
        c->title = copystr(&c->title, t);
@@ -661,7 +705,7 @@ titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, Client *c) {
 }
 
 gboolean
-unfocusbar(GtkWidget *w, GdkEventFocus *e, Client *c) {
+focusview(GtkWidget *w, GdkEventFocus *e, Client *c) {
        hidesearch(c, NULL);
        hideurl(c, NULL);
        return FALSE;
@@ -687,6 +731,25 @@ update(Client *c) {
 
 }
 
+void
+updatewinid(Client *c) {
+       snprintf(winid, LENGTH(winid), "%u",
+                       (int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
+}
+
+void
+windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c) {
+       JSStringRef jsscript;
+       gchar *script;
+       JSValueRef exception = NULL;
+       GError *error;
+       
+       if(g_file_get_contents(scriptfile, &script, NULL, &error)) {
+               jsscript = JSStringCreateWithUTF8CString(script);
+               JSEvaluateScript(js, jsscript, JSContextGetGlobalObject(js), NULL, 0, &exception);
+       }
+}
+
 void
 zoom(Client *c, const Arg *arg) {
        if(arg->i < 0)          /* zoom out */
@@ -698,45 +761,36 @@ zoom(Client *c, const Arg *arg) {
 }
 
 int main(int argc, char *argv[]) {
-       Client *c;
-       gint o, a;
+       int i;
        Arg arg;
 
-       gtk_init(NULL, NULL);
-       if (!g_thread_supported())
-               g_thread_init(NULL);
-       while((o = getopt(argc, argv, "vhxe:")) != -1)
-               switch(o) {
-               case 'x':
+       progname = argv[0];
+       /* command line args */
+       for(i = 1, arg.v = NULL; i < argc && argv[i][0] == '-'; i++) {
+               if(!strcmp(argv[i], "-x"))
                        showxid = TRUE;
-                       break;
-               case 'e':
-                       if(!(a = atoi(optarg)))
+               else if(!strcmp(argv[i], "-e")) {
+                       if(++i < argc)
+                               embed = atoi(argv[i]);
+                       else
                                usage();
-                       embed = a;
+               }
+               else if(!strcmp(argv[i], "--")) {
+                       i++;
                        break;
-               case 'v':
+               }
+               else if(!strcmp(argv[i], "-v"))
                        die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n");
-                       break;
-               default:
+               else
                        usage();
-               }
+       }
+       if(i < argc)
+               arg.v = argv[i];
        setup();
-       if(optind + 1 == argc) {
-               c = newclient();
-               arg.v = argv[optind];
-               if(strchr("./", argv[optind][0]) || strcmp("-", argv[optind]) == 0)
-                       loadfile(c, argv[optind]);
-               else
-                       loaduri(c, &arg);
-
+       newclient();
+       if(arg.v) {
+               loaduri(clients, &arg);
        }
-       else if(optind != argc)
-               usage();
-       if(!clients)
-               newclient();
-
-
        gtk_main();
        cleanup();
        return EXIT_SUCCESS;