X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=e40bfd0b5f2bdf93c53fac9e5209fa0d2b2447be;hb=d3d32fd6c754c9e4528471efe10706638a1192dd;hp=c61620ba05dd2c0c04d4885b86824a14b2a14336;hpb=159022e4ef2c58670f539d86ea3f9c846ada0021;p=surf.git diff --git a/surf.c b/surf.c index c61620b..e40bfd0 100644 --- a/surf.c +++ b/surf.c @@ -10,23 +10,21 @@ #include #include #include -#include #include #include #include #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; -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 +44,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,16 +58,16 @@ typedef struct { KeyFocus focus; } Key; -SoupCookieJar *cookiejar; -SoupSession *session; -Client *clients = NULL; -Cookie *cookies = NULL; -gboolean embed = FALSE; -gboolean showxid = FALSE; -gboolean ignore_once = FALSE; -gchar *workdir; -extern char *optarg; -extern gint optind; +static Display *dpy; +static Atom urlprop; +static SoupCookieJar *cookiejar; +static SoupSession *session; +static Client *clients = NULL; +/*static Cookie *cookies = NULL;*/ +static GdkNativeWindow embed = 0; +static gboolean showxid = FALSE; +static gboolean ignore_once = FALSE; +static gchar *workdir; static void cleanup(void); static void clipboard(Client *c, const Arg *arg); @@ -103,8 +101,7 @@ static void reload(Client *c, const Arg *arg); static void rereadcookies(void); 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 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); @@ -115,14 +112,17 @@ static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* static gboolean unfocusbar(GtkWidget *w, GdkEventFocus *e, Client *c); static void usage(void); static void update(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" void cleanup(void) { while(clients) destroyclient(clients); + g_free(workdir); } void @@ -274,11 +274,11 @@ 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; for(i = 0; i < LENGTH(keys); i++) { if(focus & keys[i].focus && gdk_keyval_to_lower(ev->keyval) == keys[i].keyval @@ -380,7 +380,7 @@ newclient(void) { 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); @@ -407,6 +407,7 @@ newclient(void) { 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), "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); /* urlbar */ @@ -425,8 +426,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); @@ -452,10 +451,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); + 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-stylesheet-uri", filename, NULL); c->download = NULL; c->title = NULL; @@ -583,25 +582,30 @@ setup(void) { SoupSession *s; FILE *tmp; + 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_build_filename(home, ".surf", NULL); + 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); /* cookie persistance */ s = webkit_get_default_session(); - name = g_build_filename(workdir, "cookies.jar", NULL); + 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)); } @@ -663,13 +667,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 @@ -686,6 +690,23 @@ update(Client *c) { } +void +windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObjectRef win, Client *c) { + JSStringRef jsscript; + gchar *script, *filename; + JSValueRef exception = NULL; + GError *error; + + filename = g_build_filename(workdir, "script.js", NULL); + if(g_file_get_contents(filename, &script, NULL, &error)) { + script = g_strdup_printf("window.addEventListener" + "('DOMContentLoaded', function () { %s }, true);", + script); + jsscript = JSStringCreateWithUTF8CString (script); + JSEvaluateScript (js, jsscript, JSContextGetGlobalObject(js), NULL, 0, &exception); + } +} + void zoom(Client *c, const Arg *arg) { if(arg->i < 0) /* zoom out */ @@ -697,44 +718,35 @@ zoom(Client *c, const Arg *arg) { } int main(int argc, char *argv[]) { - Client *c; - gint o; + int i; Arg arg; + Client *c; - gtk_init(NULL, NULL); - if (!g_thread_supported()) - g_thread_init(NULL); - setup(); - while((o = getopt(argc, argv, "vhxeu:f:")) != -1) - switch(o) { - case 'x': + /* command line args */ + for(i = 1, arg.v = NULL; i < argc; i++) { + if(!strcmp(argv[i], "-x")) showxid = TRUE; - break; - case 'e': - showxid = TRUE; - embed = TRUE; - break; - case 'v': + else if(!strcmp(argv[i], "-e")) { + if(++i < argc) + embed = atoi(argv[i]); + else + usage(); + } + else if(!strcmp(argv[i], "-v")) die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n"); - break; - default: + else if(argv[i][0] == '-') usage(); - } - if(optind + 1 == argc) { - c = newclient(); - arg.v = argv[optind]; - if(strchr("./", argv[optind][0]) || strcmp("-", argv[optind]) == 0) - loadfile(c, argv[optind]); + else + arg.v = argv[i]; + } + setup(); + c = newclient(); + if(arg.v) { + if(strchr("./", ((char *)arg.v)[0]) || strcmp("-", (char *)arg.v) == 0) + loadfile(c, (char *)arg.v); else loaduri(c, &arg); - } - else if(optind != argc) - usage(); - if(!clients) - newclient(); - - gtk_main(); cleanup(); return EXIT_SUCCESS;