X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=b6b8c928c13961a56f7849c107eff5d11566c4c7;hb=e3690dffed6b6ebd09f53d70d05af6c8504aa0f1;hp=8c83eff7acee8d6da00e29743b35b98997223edd;hpb=95a6bfcc036d8a8f90b5231a710940d89dc58631;p=surf.git diff --git a/surf.c b/surf.c index 8c83eff..b6b8c92 100644 --- a/surf.c +++ b/surf.c @@ -2,6 +2,7 @@ * * To understand surf, start reading main(). */ +#include #include #include #include @@ -9,6 +10,8 @@ #include #include #include +#include +#include #include #include #include @@ -35,11 +38,17 @@ typedef struct Client { struct Client *next; } Client; +typedef struct { + char *label; + void (*func)(Client *c, const Arg *arg); + const Arg arg; +} Context; + typedef struct Cookie { - char *name; - char *value; - char *domain; - char *path; + gchar *name; + gchar *value; + gchar *domain; + gchar *path; struct Cookie *next; } Cookie; @@ -67,51 +76,58 @@ static Client *clients = NULL; static GdkNativeWindow embed = 0; static gboolean showxid = FALSE; static gboolean ignore_once = FALSE; +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 void context(WebKitWebView *v, GtkMenu *m, Client *c); static gchar *copystr(gchar **str, const gchar *src); +static gboolean decidewindow(WebKitWebView *v, 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); +static void die(gchar *str); static void download(WebKitDownload *o, GParamSpec *pspec, Client *c); static void drawindicator(Client *c); static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c); -static gboolean initdownload(WebKitWebView *view, WebKitDownload *o, Client *c); +static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c); static gchar *geturi(Client *c); static void hidesearch(Client *c, const Arg *arg); static void hideurl(Client *c, const Arg *arg); -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 gboolean keypress(GtkWidget *w, GdkEventKey *ev, Client *c); +static void linkhover(WebKitWebView *v, const gchar* t, const gchar* l, Client *c); +static void loadcommit(WebKitWebView *v, WebKitWebFrame *f, Client *c); +static void loadstart(WebKitWebView *v, WebKitWebFrame *f, Client *c); 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 newwindow(Client *c, const Arg *arg); +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); static void proccookies(SoupMessage *m, Client *c); -static void progresschange(WebKitWebView *view, gint p, Client *c); +static void progresschange(WebKitWebView *v, 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 setcookie(char *name, char *val, char *dom, char *path, long exp); +static void sigchld(int unused); +static void setcookie(gchar *name, gchar *val, gchar *dom, gchar *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 *v, 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 gboolean unfocusbar(GtkWidget *w, GdkEventFocus *e, Client *c); +static void titlechange(WebKitWebView *v, WebKitWebFrame* frame, const gchar* title, 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); @@ -159,6 +175,12 @@ clipboard(Client *c, const Arg *arg) { gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), webkit_web_view_get_uri(c->view), -1); } +void +context(WebKitWebView *v, GtkMenu *m, Client *c) { + + //gtk_menu_shell_append ((GtkMenuShell *)(menu),(child)) +} + gchar * copystr(gchar **str, const gchar *src) { gchar *tmp; @@ -191,13 +213,25 @@ destroyclient(Client *c) { gtk_main_quit(); } +gboolean +decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c) { + Arg arg; + if(webkit_web_navigation_action_get_reason(n) == WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) { + webkit_web_policy_decision_ignore(p); + arg.v = (void *)webkit_network_request_get_uri(r); + newwindow(NULL, &arg); + return TRUE; + } + return FALSE; +} + void destroywin(GtkWidget* w, Client *c) { destroyclient(c); } void -die(char *str) { +die(gchar *str) { fputs(str, stderr); exit(EXIT_FAILURE); } @@ -301,6 +335,7 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) { focus = UrlBar; else 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 @@ -314,7 +349,7 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) { } void -linkhover(WebKitWebView* page, const gchar* t, const gchar* l, Client *c) { +linkhover(WebKitWebView *v, const gchar* t, const gchar* l, Client *c) { if(l) gtk_window_set_title(GTK_WINDOW(c->win), l); else @@ -338,39 +373,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; @@ -427,20 +429,21 @@ 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); + g_signal_connect(G_OBJECT(c->view), "populate-popup", G_CALLBACK(context), 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(); @@ -473,7 +476,7 @@ 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", useragent, NULL); uri = g_strconcat("file://", stylefile, NULL); g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL); g_free(uri); @@ -490,13 +493,36 @@ newclient(void) { return c; } +void +newwindow(Client *c, const Arg *arg) { + guint i = 0, urlindex; + const gchar *cmd[7]; + const Arg a = { .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(arg->v) + cmd[i++] = (char *)arg->v; + cmd[i++] = NULL; + spawn(NULL, &a); +} + 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 }; @@ -553,7 +579,7 @@ proccookies(SoupMessage *m, Client *c) { } void -progresschange(WebKitWebView* view, gint p, Client *c) { +progresschange(WebKitWebView *v, gint p, Client *c) { c->progress = p; update(c); } @@ -575,6 +601,7 @@ reload(Client *c, const Arg *arg) { void rereadcookies(void) { + } void @@ -591,7 +618,14 @@ scroll(Client *c, const Arg *arg) { } void -setcookie(char *name, char *val, char *dom, char *path, long exp) { +sigchld(int unused) { + if(signal(SIGCHLD, sigchld) == SIG_ERR) + die("Can't install SIGCHLD handler"); + while(0 < waitpid(-1, NULL, WNOHANG)); +} + +void +setcookie(gchar *name, gchar *val, gchar *dom, gchar *path, long exp) { } @@ -599,6 +633,8 @@ void setup(void) { SoupSession *s; + /* clean up any zombies immediately */ + sigchld(0); gtk_init(NULL, NULL); if (!g_thread_supported()) g_thread_init(NULL); @@ -629,21 +665,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 @@ -666,6 +701,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(((gchar **)arg->v)[0], (gchar **)arg->v); + fprintf(stderr, "tabbed: execvp %s", ((gchar **)arg->v)[0]); + perror(" failed"); + exit(0); + } +} + void titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, Client *c) { c->title = copystr(&c->title, t); @@ -673,7 +721,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; @@ -699,6 +747,12 @@ 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; @@ -725,10 +779,10 @@ zoom(Client *c, const Arg *arg) { int main(int argc, char *argv[]) { int i; Arg arg; - Client *c; + progname = argv[0]; /* command line args */ - for(i = 1, arg.v = NULL; i < argc; i++) { + for(i = 1, arg.v = NULL; i < argc && argv[i][0] == '-'; i++) { if(!strcmp(argv[i], "-x")) showxid = TRUE; else if(!strcmp(argv[i], "-e")) { @@ -737,22 +791,21 @@ int main(int argc, char *argv[]) { else usage(); } - else if(!strcmp(argv[i], "--")) + else if(!strcmp(argv[i], "--")) { + i++; break; + } else if(!strcmp(argv[i], "-v")) die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n"); - else if(argv[i][0] == '-') - usage(); else - arg.v = argv[i]; + usage(); } + if(i < argc) + 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();