X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=3193540c2a9fa26ab8166eee352cc72677b06ab7;hb=24bbd6be02e87926e803028477538ce929253626;hp=28b6966bf52fd3e74fdd2fac0f0f6054df39060d;hpb=92cb8792e17e7f0c61131da3be1bddda5375bc47;p=surf.git diff --git a/surf.c b/surf.c index 28b6966..3193540 100644 --- a/surf.c +++ b/surf.c @@ -67,8 +67,8 @@ static Client *clients = NULL; static GdkNativeWindow embed = 0; static gboolean showxid = FALSE; static gboolean ignore_once = FALSE; -static gchar *workdir; +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); @@ -86,7 +86,6 @@ 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); @@ -118,11 +117,35 @@ 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 @@ -151,7 +174,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); @@ -221,14 +244,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); @@ -316,39 +337,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; @@ -374,7 +362,7 @@ Client * newclient(void) { Client *c; WebKitWebSettings *settings; - gchar *filename; + gchar *uri; if(!(c = calloc(1, sizeof(Client)))) die("Cannot malloc!\n"); @@ -452,9 +440,9 @@ newclient(void) { 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); + 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; @@ -553,9 +541,6 @@ reload(Client *c, const Arg *arg) { void rereadcookies(void) { - const gchar *filename; - - filename = g_build_filename(workdir, "cookies", NULL); } void @@ -578,9 +563,7 @@ setcookie(char *name, char *val, char *dom, char *path, long exp) { void setup(void) { - const gchar *home, *name; SoupSession *s; - FILE *tmp; gtk_init(NULL, NULL); if (!g_thread_supported()) @@ -591,22 +574,14 @@ setup(void) { 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); - name = g_build_filename(workdir, "script.js", 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)); } @@ -620,10 +595,10 @@ 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); } @@ -693,14 +668,13 @@ update(Client *c) { void windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c) { JSStringRef jsscript; - gchar *script, *filename; + gchar *script; JSValueRef exception = NULL; GError *error; - filename = g_build_filename(workdir, "script.js", NULL); - if(g_file_get_contents(filename, &script, NULL, &error)) { + if(g_file_get_contents(scriptfile, &script, NULL, &error)) { jsscript = JSStringCreateWithUTF8CString(script); - JSEvaluateScript (js, jsscript, JSContextGetGlobalObject(js), NULL, 0, &exception); + JSEvaluateScript(js, jsscript, JSContextGetGlobalObject(js), NULL, 0, &exception); } } @@ -717,7 +691,6 @@ zoom(Client *c, const Arg *arg) { int main(int argc, char *argv[]) { int i; Arg arg; - Client *c; /* command line args */ for(i = 1, arg.v = NULL; i < argc; i++) { @@ -729,6 +702,8 @@ int main(int argc, char *argv[]) { else usage(); } + else if(!strcmp(argv[i], "--")) + break; else if(!strcmp(argv[i], "-v")) die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n"); else if(argv[i][0] == '-') @@ -737,12 +712,9 @@ int main(int argc, char *argv[]) { arg.v = argv[i]; } setup(); - c = newclient(); + newclient(); if(arg.v) { - if(strchr("./", ((char *)arg.v)[0]) || strcmp("-", (char *)arg.v) == 0) - loadfile(c, (char *)arg.v); - else - loaduri(c, &arg); + loaduri(clients, &arg); } gtk_main(); cleanup();