X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=a36af8fa4694f7924a6cad0bb734fbd31528c86e;hb=2f639aede5709c2c5105e40d35b355bdddbcf4f5;hp=fe7f9adebb66312036a69025ff37d397a5c8ed07;hpb=504fc78c312c5bd85ab9bac271ed754c7352c8bc;p=surf.git diff --git a/surf.c b/surf.c index fe7f9ad..a36af8f 100644 --- a/surf.c +++ b/surf.c @@ -16,7 +16,7 @@ #include #include -#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,15 +64,16 @@ 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; static void cleanup(void); -static void proccookies(SoupMessage *m, Client *c); static void clipboard(Client *c, const Arg *arg); +static gchar *copystr(gchar **str, const gchar *src); static void destroyclient(Client *c); static void destroywin(GtkWidget* w, Client *c); static void die(char *str); @@ -90,26 +91,30 @@ 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(); +static Client *newclient(void); static WebKitWebView *newwindow(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 request(SoupSession *s, SoupMessage *m, Client *c); static void reload(Client *c, const Arg *arg); -static void rereadcookies(); +static void rereadcookies(void); static void setcookie(char *name, char *val, char *dom, char *path, long exp); -static void setup(); +static void setup(void); 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); 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 usage(); -static void update(Client *c, const gchar *title); +static gboolean unfocusbar(GtkWidget *w, GdkEventFocus *e, Client *c); +static void usage(void); +static void update(Client *c); static void zoom(Client *c, const Arg *arg); #include "config.h" @@ -120,30 +125,28 @@ cleanup(void) { destroyclient(clients); } -void -proccookies(SoupMessage *m, Client *c) { - GSList *l; - SoupCookie *co; - long t; - - rereadcookies(); - for (l = soup_cookies_from_response(m); l; l = l->next){ - co = (SoupCookie *)l->data; - t = co->expires ? soup_date_to_time_t(co->expires) : 0; - setcookie(co->name, co->value, co->domain, co->value, t); - } - g_slist_free(l); -} - void clipboard(Client *c, const Arg *arg) { gboolean paste = *(gboolean *)arg; + if(paste) gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteurl, c); else gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), webkit_web_view_get_uri(c->view), -1); } +gchar * +copystr(gchar **str, const gchar *src) { + gchar *tmp; + tmp = g_strdup(src); + + if(str && *str) { + g_free(*str); + *str = tmp; + } + return tmp; +} + void destroyclient(Client *c) { Client *p; @@ -195,7 +198,7 @@ drawindicator(Client *c) { TRUE, 0, 0, w->allocation.width, w->allocation.height); gdk_draw_rectangle(w->window, gc, TRUE, 0, 0, width, w->allocation.height); - g_object_unref(gc);/*g_free(gc);*/ + g_object_unref(gc); } gboolean @@ -212,19 +215,18 @@ download(WebKitDownload *o, GParamSpec *pspec, Client *c) { if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) { c->progress = (gint)(webkit_download_get_progress(c->download)*100); } - update(c, NULL); + update(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); @@ -236,7 +238,9 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) { g_signal_connect(c->download, "notify::progress", G_CALLBACK(download), c); g_signal_connect(c->download, "notify::status", G_CALLBACK(download), c); webkit_download_start(c->download); - update(c, filename); + + c->title = copystr(&c->title, filename); + update(c); g_free(html); return TRUE; } @@ -246,7 +250,7 @@ geturi(Client *c) { gchar *uri; if(!(uri = (gchar *)webkit_web_view_get_uri(c->view))) - uri = g_strdup("about:blank"); + uri = copystr(NULL, "about:blank"); return uri; } @@ -276,9 +280,9 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) { else focus = BROWSER; for(i = 0; i < LENGTH(keys); i++) { - if(focus & keys[i].focus && ev->keyval == keys[i].keyval && - (CLEANMASK(ev->state) == keys[i].mod || - CLEANMASK(ev->state) & keys[i].mod) + if(focus & keys[i].focus + && gdk_keyval_to_lower(ev->keyval) == keys[i].keyval + && CLEANMASK(ev->state) == keys[i].mod && keys[i].func) { keys[i].func(c, &(keys[i].arg)); processed = TRUE; @@ -292,7 +296,7 @@ linkhover(WebKitWebView* page, const gchar* t, const gchar* l, Client *c) { if(l) gtk_window_set_title(GTK_WINDOW(c->win), l); else - update(c, NULL); + update(c); } void @@ -309,7 +313,7 @@ loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) { void loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) { c->progress = 0; - update(c, NULL); + update(c); } void @@ -340,7 +344,8 @@ loadfile(Client *c, const gchar *f) { arg.v = uri = g_strdup_printf("file://%s", f); loaduri(c, &arg); } - update(c, uri); + c->title = copystr(&c->title, uri); + update(c); g_free(uri); } @@ -354,8 +359,9 @@ loaduri(Client *c, const Arg *arg) { : g_strdup_printf("http://%s", uri); webkit_web_view_load_uri(c->view, u); c->progress = 0; - update(c, u); + c->title = copystr(&c->title, u); g_free(u); + update(c); } void @@ -367,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); @@ -403,10 +412,12 @@ newclient(void) { /* 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(); @@ -440,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; @@ -499,10 +516,25 @@ print(Client *c, const Arg *arg) { webkit_web_frame_print(webkit_web_view_get_main_frame(c->view)); } +void +proccookies(SoupMessage *m, Client *c) { + GSList *l; + SoupCookie *co; + long t; + + rereadcookies(); + for (l = soup_cookies_from_response(m); l; l = l->next){ + co = (SoupCookie *)l->data; + t = co->expires ? soup_date_to_time_t(co->expires) : 0; + setcookie(co->name, co->value, co->domain, co->value, t); + } + g_slist_free(l); +} + void progresschange(WebKitWebView* view, gint p, Client *c) { c->progress = p; - update(c, NULL); + update(c); } void @@ -521,11 +553,23 @@ reload(Client *c, const Arg *arg) { } void -rereadcookies() { - const gchar *filename, *home; +rereadcookies(void) { + const gchar *filename; - home = g_get_home_dir(); - filename = g_build_filename(home, ".surf", "cookies", NULL); + filename = g_build_filename(workdir, "cookies", NULL); +} + +void +scroll(Client *c, const Arg *arg) { + gdouble v; + GtkAdjustment *a; + + a = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(c->scroll)); + v = gtk_adjustment_get_value(a); + v += gtk_adjustment_get_step_increment(a) * arg->i; + v = MAX(v, 0.0); + v = MIN(v, gtk_adjustment_get_upper(a) - gtk_adjustment_get_page_size(a)); + gtk_adjustment_set_value(a, v); } void @@ -534,10 +578,32 @@ setcookie(char *name, char *val, char *dom, char *path, long exp) { } void -setup() { +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 @@ -547,6 +613,16 @@ showsearch(Client *c, const Arg *arg) { gtk_widget_grab_focus(c->searchbar); } +void +source(Client *c, const Arg *arg) { + Arg a = { .b = FALSE }; + /*gboolean s; + + s = webkit_web_view_get_view_source_mode(c->view); + webkit_web_view_set_view_source_mode(c->view, c->source);*/ + reload(c, &a); +} + void searchtext(Client *c, const Arg *arg) { gboolean forward = *(gboolean *)arg; @@ -579,24 +655,27 @@ stop(Client *c, const Arg *arg) { void titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, Client *c) { - update(c, t); + c->title = copystr(&c->title, t); + update(c); +} + +gboolean +unfocusbar(GtkWidget *w, GdkEventFocus *e, Client *c) { + hidesearch(c, NULL); + hideurl(c, NULL); + return FALSE; } void -usage() { +usage(void) { fputs("surf - simple browser\n", stderr); - die("usage: surf [-e] [-x] [uri]\n"); + die("usage: surf [-e Window] [-x] [uri]\n"); } void -update(Client *c, const char *title) { +update(Client *c) { gchar *t; - if(title) { - if(c->title) - g_free(c->title); - c->title = g_strdup(title); - } if(c->progress == 100) t = g_strdup(c->title); else @@ -618,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"); @@ -654,21 +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", NULL); - g_mkdir_with_parents(filename, 0711); - 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();