X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=2a6d388f1ad979e4c0617f058a8cb8e4c76b7437;hb=2448c967f6fed9cc8f570ec2df3f1d59b714e33e;hp=97670dc169c408cc0ffdc5a25961997b52d735c7;hpb=d408ffb5950d571f938cb834e445e8dc8d3fde3c;p=surf.git
diff --git a/surf.c b/surf.c
index 97670dc..2a6d388 100644
--- a/surf.c
+++ b/surf.c
@@ -28,8 +28,19 @@ typedef struct Client {
gint progress;
struct Client *next;
} Client;
+
+typedef struct Cookie {
+ char *name;
+ char *value;
+ char *domain;
+ char *path;
+ struct Cookie *next;
+} Cookie;
+
SoupCookieJar *cookiejar;
+SoupSession *session;
Client *clients = NULL;
+Cookie *cookies = NULL;
gboolean embed = FALSE;
gboolean showxid = FALSE;
gboolean ignore_once = FALSE;
@@ -37,29 +48,34 @@ extern char *optarg;
extern int optind;
static void cleanup(void);
+static void proccookies(SoupMessage *m, Client *c);
static void destroyclient(Client *c);
-static void destroywin(GtkWidget* w, gpointer d);
+static void destroywin(GtkWidget* w, Client *c);
static void die(char *str);
-static void download(WebKitDownload *o, GParamSpec *pspec, gpointer d);
-static gboolean initdownload(WebKitWebView *view, WebKitDownload *o, gpointer d);
+static void download(WebKitDownload *o, GParamSpec *pspec, Client *c);
+static gboolean initdownload(WebKitWebView *view, WebKitDownload *o, Client *c);
static gchar *geturi(Client *c);
static void hidesearch(Client *c);
static void hideurl(Client *c);
-static gboolean keypress(GtkWidget* w, GdkEventKey *ev, gpointer d);
-static void linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d);
-static void loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d);
-static void loadstart(WebKitWebView *view, WebKitWebFrame *f, gpointer d);
+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 gchar *uri);
static Client *newclient();
-static WebKitWebView *newwindow(WebKitWebView *v, WebKitWebFrame *f, gpointer d);
-static void progresschange(WebKitWebView *view, gint p, gpointer d);
-static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer data);
+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 progresschange(WebKitWebView *view, gint p, Client *c);
+static void request(SoupSession *s, SoupMessage *m, Client *c);
+static void setcookie(char *name, char *val, char *dom, char *path, long exp);
static void setup(void);
static void showsearch(Client *c);
static void showurl(Client *c);
static void stop(Client *c);
-static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, gpointer d);
+static void titlechange(WebKitWebView* view, WebKitWebFrame* frame,
+ const gchar* title, Client *c);
static void usage();
static void updatetitle(Client *c, const gchar *title);
@@ -69,6 +85,20 @@ cleanup(void) {
destroyclient(clients);
}
+void
+proccookies(SoupMessage *m, Client *c) {
+ GSList *l;
+ SoupCookie *co;
+ long t;
+
+ 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
destroyclient(Client *c) {
Client *p;
@@ -90,9 +120,7 @@ destroyclient(Client *c) {
}
void
-destroywin(GtkWidget* w, gpointer d) {
- Client *c = (Client *)d;
-
+destroywin(GtkWidget* w, Client *c) {
destroyclient(c);
}
@@ -103,26 +131,20 @@ die(char *str) {
}
void
-download(WebKitDownload *o, GParamSpec *pspec, gpointer d) {
- Client *c = (Client *) d;
+download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
WebKitDownloadStatus status;
status = webkit_download_get_status(c->download);
if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
c->progress = (int)(webkit_download_get_progress(c->download)*100);
}
- else {
- stop(c);
- }
updatetitle(c, NULL);
}
gboolean
-initdownload(WebKitWebView *view, WebKitDownload *o, gpointer d) {
- Client *c = (Client *) d;
+initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
const gchar *home, *filename;
- gchar *uri, *path;
- GString *html = g_string_new("");
+ gchar *uri, *path, *html;
stop(c);
c->download = o;
@@ -134,15 +156,14 @@ initdownload(WebKitWebView *view, WebKitDownload *o, gpointer d) {
webkit_download_set_destination_uri(c->download, uri);
c->progress = 0;
g_free(uri);
- html = g_string_append(html, "Downloading ");
- html = g_string_append(html, filename);
- html = g_string_append(html, "...");
- webkit_web_view_load_html_string(c->view, html->str,
+ html = g_strdup_printf("Download %s...", filename);
+ webkit_web_view_load_html_string(c->view, html,
webkit_download_get_uri(c->download));
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);
updatetitle(c, filename);
+ g_free(html);
return TRUE;
}
@@ -168,9 +189,7 @@ hideurl(Client *c) {
}
gboolean
-keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) {
- Client *c = (Client *)d;
-
+keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
if(ev->type != GDK_KEY_PRESS)
return FALSE;
if(GTK_WIDGET_HAS_FOCUS(c->searchbar)) {
@@ -204,14 +223,21 @@ keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) {
return FALSE;
}
}
- if((ev->state & ~(GDK_SHIFT_MASK|GDK_LOCK_MASK)) == GDK_CONTROL_MASK) {
+ if(ev->state & GDK_CONTROL_MASK) {
switch(ev->keyval) {
+ case GDK_P:
+ webkit_web_frame_print(webkit_web_view_get_main_frame(c->view));
+ return TRUE;
+ case GDK_p:
+ gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteurl, c);
+ case GDK_y:
+ gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), webkit_web_view_get_uri(c->view), -1);
+ return TRUE;
case GDK_r:
+ webkit_web_view_reload(c->view);
+ return TRUE;
case GDK_R:
- if((ev->state & GDK_SHIFT_MASK))
- webkit_web_view_reload_bypass_cache(c->view);
- else
- webkit_web_view_reload(c->view);
+ webkit_web_view_reload_bypass_cache(c->view);
return TRUE;
case GDK_b:
return TRUE;
@@ -239,10 +265,10 @@ keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) {
!(ev->state & GDK_SHIFT_MASK),
TRUE);
return TRUE;
- case GDK_Left:
+ case GDK_h:
webkit_web_view_go_back(c->view);
return TRUE;
- case GDK_Right:
+ case GDK_l:
webkit_web_view_go_forward(c->view);
return TRUE;
}
@@ -258,9 +284,7 @@ keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) {
}
void
-linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d) {
- Client *c = (Client *)d;
-
+linkhover(WebKitWebView* page, const gchar* t, const gchar* l, Client *c) {
if(l)
gtk_window_set_title(GTK_WINDOW(c->win), l);
else
@@ -268,36 +292,33 @@ linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d) {
}
void
-loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d) {
- Client *c = (Client *)d;
+loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
gchar *uri;
- uri = geturi(c);
ignore_once = TRUE;
+ uri = geturi(c);
XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), urlprop,
XA_STRING, 8, PropModeReplace, (unsigned char *)uri,
strlen(uri) + 1);
}
void
-loadstart(WebKitWebView *view, WebKitWebFrame *f, gpointer d) {
- Client *c = (Client *)d;
-
- if(c->download)
- stop(c);
+loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
+ c->progress = 0;
+ updatetitle(c, NULL);
}
void
loadfile(Client *c, const gchar *f) {
GIOChannel *chan = NULL;
GError *e = NULL;
- GString *code = g_string_new("");
- GString *uri = g_string_new(f);
- gchar *line;
+ GString *code;
+ gchar *line, *uri;
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);
@@ -306,24 +327,27 @@ loadfile(Client *c, const gchar *f) {
webkit_web_view_load_html_string(c->view, code->str,
"file://.");
g_io_channel_shutdown(chan, FALSE, NULL);
+ g_string_free(code, TRUE);
}
+ uri = g_strdup("stdin");
}
else {
- g_string_prepend(uri, "file://");
- loaduri(c, uri->str);
+ uri = g_strdup_printf("file://%s", f);
+ loaduri(c, uri);
}
- updatetitle(c, uri->str);
+ updatetitle(c, uri);
+ g_free(uri);
}
void
loaduri(Client *c, const gchar *uri) {
- GString* u = g_string_new(uri);
- if(g_strrstr(u->str, ":") == NULL)
- g_string_prepend(u, "http://");
- webkit_web_view_load_uri(c->view, u->str);
+ gchar *u;
+ u = g_strrstr(uri, "://") ? g_strdup(uri)
+ : g_strdup_printf("http://%s", uri);
+ webkit_web_view_load_uri(c->view, u);
c->progress = 0;
- updatetitle(c, u->str);
- g_string_free(u, TRUE);
+ updatetitle(c, u);
+ g_free(u);
}
Client *
@@ -360,6 +384,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_after(session, "request-started", G_CALLBACK(request), c);
/* urlbar */
c->urlbar = gtk_entry_new();
@@ -402,42 +427,65 @@ newclient(void) {
}
WebKitWebView *
-newwindow(WebKitWebView *v, WebKitWebFrame *f, gpointer d) {
- Client *c = newclient();
- return c->view;
+newwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c) {
+ Client *n = newclient();
+ return n->view;
}
+
void
-progresschange(WebKitWebView* view, gint p, gpointer d) {
- Client *c = (Client *)d;
-
- c->progress = p;
- updatetitle(c, NULL);
+pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d) {
+ if(text != NULL)
+ loaduri((Client *) d, text);
}
GdkFilterReturn
processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
- XPropertyEvent *ev;
Client *c = (Client *)d;
+ XPropertyEvent *ev;
Atom adummy;
int idummy;
unsigned long ldummy;
unsigned char *buf = NULL;
+
if(((XEvent *)e)->type == PropertyNotify) {
ev = &((XEvent *)e)->xproperty;
- if(ignore_once == FALSE && ev->atom == urlprop && ev->state == PropertyNewValue) {
- XGetWindowProperty(dpy, ev->window, urlprop, 0L, BUFSIZ, False, XA_STRING,
- &adummy, &idummy, &ldummy, &ldummy, &buf);
- loaduri(c, (gchar *)buf);
- XFree(buf);
+ if(ev->atom == urlprop && ev->state == PropertyNewValue) {
+ if(ignore_once)
+ ignore_once = FALSE;
+ else {
+ XGetWindowProperty(dpy, ev->window, urlprop, 0L, BUFSIZ, False, XA_STRING,
+ &adummy, &idummy, &ldummy, &ldummy, &buf);
+ loaduri(c, (gchar *)buf);
+ XFree(buf);
+ }
return GDK_FILTER_REMOVE;
}
}
return GDK_FILTER_CONTINUE;
}
-void setup(void) {
+void
+progresschange(WebKitWebView* view, gint p, Client *c) {
+ c->progress = p;
+ updatetitle(c, NULL);
+}
+
+void
+request(SoupSession *s, SoupMessage *m, Client *c) {
+ soup_message_add_header_handler(m, "got-headers", "Set-Cookie",
+ G_CALLBACK(proccookies), c);
+}
+
+void
+setcookie(char *name, char *val, char *dom, char *path, long exp) {
+ printf("%s %s %s %s %li\n", name, val, dom, path, exp);
+}
+
+void
+setup(void) {
dpy = GDK_DISPLAY();
+ session = webkit_get_default_session();
urlprop = XInternAtom(dpy, "_SURF_URL", False);
}
@@ -469,21 +517,19 @@ stop(Client *c) {
}
void
-titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, gpointer d) {
- Client *c = (Client *)d;
-
+titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, Client *c) {
updatetitle(c, t);
}
void
usage() {
fputs("surf - simple browser\n", stderr);
- die("usage: surf [-e] [-x] [-u uri] [-f file]\n");
+ die("usage: surf [-e] [-x] [uri]\n");
}
void
updatetitle(Client *c, const char *title) {
- char t[512];
+ gchar *t;
if(title) {
if(c->title)
@@ -491,10 +537,12 @@ updatetitle(Client *c, const char *title) {
c->title = g_strdup(title);
}
if(c->progress == 100)
- snprintf(t, LENGTH(t), "%s", c->title);
+ t = g_strdup(c->title);
else
- snprintf(t, LENGTH(t), "%s [%i%%]", c->title, c->progress);
+ t = g_strdup_printf("%s [%i%%]", c->title, c->progress);
gtk_window_set_title(GTK_WINDOW(c->win), t);
+ g_free(t);
+
}
int main(int argc, char *argv[]) {
@@ -516,21 +564,21 @@ int main(int argc, char *argv[]) {
showxid = TRUE;
embed = TRUE;
break;
- case 'u':
- c = newclient();
- loaduri(c, optarg);
- break;
- case 'f':
- c = newclient();
- loadfile(c, optarg);
- break;
case 'v':
die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n");
break;
default:
usage();
}
- if(optind != argc)
+ if(optind + 1 == argc) {
+ c = newclient();
+ if(strchr("./", argv[optind][0]) || strcmp("-", argv[optind]) == 0)
+ loadfile(c, argv[optind]);
+ else
+ loaduri(c, argv[optind]);
+
+ }
+ else if(optind != argc)
usage();
if(!clients)
newclient();