Makefile fixing

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index 3460e36..a36af8f 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -16,7 +16,7 @@
 #include <webkit/webkit.h>
 #include <glib/gstdio.h>
 
-#define LENGTH(x) (sizeof x / sizeof x[0])
+#define LENGTH(x)               (sizeof x / sizeof x[0])
 #define CLEANMASK(mask)         (mask & ~(GDK_MOD2_MASK))
 
 Display *dpy;
@@ -64,9 +64,10 @@ SoupCookieJar *cookiejar;
 SoupSession *session;
 Client *clients = NULL;
 Cookie *cookies = NULL;
-gboolean embed = FALSE;
+GdkNativeWindow embed = 0;
 gboolean showxid = FALSE;
 gboolean ignore_once = FALSE;
+gchar *workdir;
 extern char *optarg;
 extern gint optind;
 
@@ -219,14 +220,13 @@ download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
 
 gboolean
 initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
-       const gchar *home, *filename;
+       const gchar *filename;
        gchar *uri, *path, *html;
 
        stop(c, NULL);
        c->download = o;
-       home = g_get_home_dir();
        filename = webkit_download_get_suggested_filename(o);
-       path = g_build_filename(home, ".surf", "dl", 
+       path = g_build_filename(workdir, "dl", 
                        filename, NULL);
        uri = g_strconcat("file://", path, NULL);
        webkit_download_set_destination_uri(c->download, uri);
@@ -373,11 +373,14 @@ navigate(Client *c, const Arg *arg) {
 Client *
 newclient(void) {
        Client *c;
+       WebKitWebSettings *settings;
+       gchar *filename;
+
        if(!(c = calloc(1, sizeof(Client))))
                die("Cannot malloc!\n");
        /* Window */
        if(embed) {
-               c->win = gtk_plug_new(0);
+               c->win = gtk_plug_new(embed);
        }
        else {
                c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -448,6 +451,12 @@ newclient(void) {
        gdk_window_set_events(GTK_WIDGET(c->win)->window, GDK_ALL_EVENTS_MASK);
        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);
+
        c->download = NULL;
        c->title = NULL;
        c->next = clients;
@@ -545,10 +554,9 @@ reload(Client *c, const Arg *arg) {
 
 void
 rereadcookies(void) {
-       const gchar *filename, *home;
+       const gchar *filename;
 
-       home = g_get_home_dir();
-       filename = g_build_filename(home, ".surf", "cookies", NULL);
+       filename = g_build_filename(workdir, "cookies", NULL);
 }
 
 void
@@ -571,9 +579,31 @@ setcookie(char *name, char *val, char *dom, char *path, long exp) {
 
 void
 setup(void) {
+       const gchar *home, *name;
+       SoupSession *s;
+       FILE *tmp;
+
        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_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);
+
+
+       /* cookie persistance */
+       s = webkit_get_default_session();
+       name = g_build_filename(workdir, "cookies.txt", NULL);
+       cookiejar = soup_cookie_jar_text_new(name, FALSE);
+       soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
 }
 
 void
@@ -633,13 +663,13 @@ gboolean
 unfocusbar(GtkWidget *w, GdkEventFocus *e, Client *c) {
        hidesearch(c, NULL);
        hideurl(c, NULL);
-       return TRUE;
+       return FALSE;
 }
 
 void
 usage(void) {
        fputs("surf - simple browser\n", stderr);
-       die("usage: surf [-e] [-x] [uri]\n");
+       die("usage: surf [-e Window] [-x] [uri]\n");
 }
 
 void
@@ -667,24 +697,22 @@ zoom(Client *c, const Arg *arg) {
 }
 
 int main(int argc, char *argv[]) {
-       SoupSession *s;
        Client *c;
-       gint o;
-       const gchar *home, *filename;
+       gint o, a;
        Arg arg;
 
        gtk_init(NULL, NULL);
        if (!g_thread_supported())
                g_thread_init(NULL);
-       setup();
-       while((o = getopt(argc, argv, "vhxeu:f:")) != -1)
+       while((o = getopt(argc, argv, "vhxe:")) != -1)
                switch(o) {
                case 'x':
                        showxid = TRUE;
                        break;
                case 'e':
-                       showxid = TRUE;
-                       embed = TRUE;
+                       if(!(a = atoi(optarg)))
+                               usage();
+                       embed = a;
                        break;
                case 'v':
                        die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n");
@@ -703,19 +731,10 @@ int main(int argc, char *argv[]) {
        }
        else if(optind != argc)
                usage();
+       setup();
        if(!clients)
                newclient();
 
-       /* make dirs */
-       home = g_get_home_dir();
-       filename = g_build_filename(home, ".surf", "dl", NULL);
-       g_mkdir_with_parents(filename, 0755);
-
-       /* cookie persistance */
-       s = webkit_get_default_session();
-       filename = g_build_filename(home, ".surf", "cookies.jar", NULL);
-       cookiejar = soup_cookie_jar_text_new(filename, FALSE);
-       soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
 
        gtk_main();
        cleanup();