#include <stdlib.h>
#include <stdio.h>
#include <webkit/webkit.h>
+#include <glib/gstdio.h>
#define LENGTH(x) (sizeof x / sizeof x[0])
Display *dpy;
Atom urlprop;
typedef struct Client {
- GtkWidget *win, *scroll, *vbox, *urlbar, *urllist, *searchbar;
+ GtkWidget *win, *scroll, *vbox, *pbar, *urlbar, *searchbar;
WebKitWebView *view;
gchar *title;
gint progress;
struct Client *next;
} Client;
+SoupCookieJar *cookiejar;
Client *clients = NULL;
+GSList *downloads = NULL;
gboolean embed = FALSE;
gboolean showxid = FALSE;
gboolean ignore_once = FALSE;
extern char *optarg;
extern int optind;
-static Client *newclient();
-static void die(char *str);
-static void setup(void);
static void cleanup(void);
-static void updatetitle(Client *c);
+static void destroyclient(Client *c);
static void destroywin(GtkWidget* w, gpointer d);
+static void die(char *str);
+static void downloadcb(WebKitDownload *o, GParamSpec *pspec, gpointer d);
+static gboolean download(WebKitWebView *view, WebKitDownload *o, gpointer d);
+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 titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, gpointer d);
-static void progresschange(WebKitWebView *view, gint p, gpointer d);
-static void loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d);
static void linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d);
-static void destroyclient(Client *c);
-static WebKitWebView *newwindow(WebKitWebView *v, WebKitWebFrame *f, gpointer d);
-static gboolean decidewindow(WebKitWebView *view, WebKitWebFrame *f,
- WebKitNetworkRequest *r, WebKitWebNavigationAction *n,
- WebKitWebPolicyDecision *p, gpointer d);
-static gboolean download(WebKitWebView *view, GObject *o, gpointer d);
-static void loaduri(const Client *c, const gchar *uri);
+static void loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d);
static void loadfile(const Client *c, const gchar *f);
-GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer data);
+static void loaduri(const 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 void setup(void);
+static void showsearch(Client *c);
+static void showurl(Client *c);
+static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, gpointer d);
+static void updatetitle(Client *c);
void
cleanup(void) {
while(clients)
destroyclient(clients);
-}
-
-GdkFilterReturn
-processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
- XPropertyEvent *ev;
- Client *c = (Client *)d;
- 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);
- return GDK_FILTER_REMOVE;
- }
- ignore_once = FALSE;
- }
- return GDK_FILTER_CONTINUE;
-}
-
-void
-loadfile(const Client *c, const gchar *f) {
- GIOChannel *chan = NULL;
- GError *e = NULL;
- GString *code = g_string_new("");
- GString *uri = g_string_new(f);
- gchar *line;
-
- if(strcmp(f, "-") == 0) {
- chan = g_io_channel_unix_new(STDIN_FILENO);
- if (chan) {
- 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, NULL);
- g_io_channel_shutdown(chan, FALSE, NULL);
- }
- }
- else {
- g_string_prepend(uri, "file://");
- loaduri(c, uri->str);
- }
-
+ g_slist_free(downloads);
}
void
-loaduri(const 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);
- g_string_free(u, TRUE);
-}
-
-gboolean
-download(WebKitWebView *view, GObject *o, gpointer d) {
- /* TODO */
- return FALSE;
-}
-
-gboolean
-decidewindow(WebKitWebView *view, WebKitWebFrame *f,
- WebKitNetworkRequest *r, WebKitWebNavigationAction *n,
- WebKitWebPolicyDecision *p, gpointer d) {
- /* TODO */
- return TRUE;
-}
+destroyclient(Client *c) {
+ Client *p;
-WebKitWebView *
-newwindow(WebKitWebView *v, WebKitWebFrame *f, gpointer d) {
- /* TODO */
- Client *c = newclient();
- return c->view;
+ gtk_widget_destroy(GTK_WIDGET(webkit_web_view_new()));
+ gtk_widget_destroy(c->scroll);
+ gtk_widget_destroy(c->urlbar);
+ gtk_widget_destroy(c->pbar);
+ gtk_widget_destroy(c->searchbar);
+ gtk_widget_destroy(c->vbox);
+ gtk_widget_destroy(c->win);
+ for(p = clients; p && p->next != c; p = p->next);
+ if(p)
+ p->next = c->next;
+ else
+ clients = c->next;
+ free(c);
+ if(clients == NULL)
+ gtk_main_quit();
}
void
-linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d) {
+destroywin(GtkWidget* w, gpointer d) {
Client *c = (Client *)d;
- if(l)
- gtk_window_set_title(GTK_WINDOW(c->win), l);
- else
- updatetitle(c);
+ destroyclient(c);
}
-void
-loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d) {
- Client *c = (Client *)d;
- gchar *uri;
-
- if(!(uri = (gchar *)webkit_web_view_get_uri(view)))
- uri = "(null)";
- ignore_once = TRUE;
- XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), urlprop,
- XA_STRING, 8, PropModeReplace, (unsigned char *)uri,
- strlen(uri) + 1);
+void die(char *str) {
+ fputs(str, stderr);
+ exit(EXIT_FAILURE);
}
void
-progresschange(WebKitWebView* view, gint p, gpointer d) {
- Client *c = (Client *)d;
-
- c->progress = p;
- updatetitle(c);
+downloadcb(WebKitDownload *o, GParamSpec *pspec, gpointer d) {
+ Client *c = (Client *) d;
+ GSList *i;
+ WebKitDownload *dl;
+ GString *text;
+
+ text = g_string_new("");
+ for (i = downloads; i != NULL; i = i->next) {
+ dl = i->data;
+ if (webkit_download_get_status(dl) == WEBKIT_DOWNLOAD_STATUS_STARTED
+ || webkit_download_get_status(dl) == WEBKIT_DOWNLOAD_STATUS_CREATED) {
+ g_string_append_printf(text, "%s[%.0f%%] ",
+ webkit_download_get_suggested_filename(dl),
+ webkit_download_get_progress(dl)*100);
+ } else {
+ downloads = g_slist_remove(downloads, dl);
+ }
+ }
+ if (downloads == NULL) {
+ gtk_label_set_text((GtkLabel *) c->pbar, "");
+ gtk_widget_hide(c->pbar);
+ } else {
+ gtk_label_set_text((GtkLabel *) c->pbar, text->str);
+ }
+ g_string_free(text, TRUE);
}
-void
-updatetitle(Client *c) {
- char t[512];
- if(c->progress == 100)
- snprintf(t, LENGTH(t), "%s", c->title);
- else
- snprintf(t, LENGTH(t), "%s [%i%%]", c->title, c->progress);
- gtk_window_set_title(GTK_WINDOW(c->win), t);
+gboolean
+download(WebKitWebView *view, WebKitDownload *o, gpointer d) {
+ /* TODO */
+ Client *c = (Client *) d;
+ const gchar *home;
+ gchar *uri, *filename;
+
+ home = g_get_home_dir();
+ filename = g_build_filename(home, ".surf", "dl",
+ webkit_download_get_suggested_filename(o), NULL);
+ uri = g_strconcat("file://", filename, NULL);
+ webkit_download_set_destination_uri(o, uri);
+ g_free(filename);
+ g_free(uri);
+ downloads = g_slist_append(downloads, o);
+ gtk_widget_show(c->pbar);
+ g_signal_connect(o, "notify::progress", G_CALLBACK(downloadcb), d);
+ g_signal_connect(o, "notify::status", G_CALLBACK(downloadcb), d);
+ webkit_download_start(o);
+ return TRUE;
}
-void
-titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, gpointer d) {
- Client *c = (Client *)d;
+gchar *
+geturi(Client *c) {
+ gchar *uri;
- if(c->title)
- g_free(c->title);
- c->title = g_strdup(t);
- updatetitle(c);
+ if(!(uri = (gchar *)webkit_web_view_get_uri(c->view)))
+ uri = g_strdup("about:blank");
+ return uri;
}
void
-destroywin(GtkWidget* w, gpointer d) {
- Client *c = (Client *)d;
-
- destroyclient(c);
+hidesearch(Client *c) {
+ gtk_widget_hide(c->searchbar);
+ gtk_widget_grab_focus(GTK_WIDGET(c->view));
}
void
-destroyclient(Client *c) {
- Client *p;
-
- gtk_widget_destroy(GTK_WIDGET(webkit_web_view_new()));
- gtk_widget_destroy(c->scroll);
- gtk_widget_destroy(c->urlbar);
- gtk_widget_destroy(c->urllist);
- gtk_widget_destroy(c->searchbar);
- gtk_widget_destroy(c->vbox);
- gtk_widget_destroy(c->win);
- for(p = clients; p && p->next != c; p = p->next);
- if(p)
- p->next = c->next;
- else
- clients = c->next;
- free(c);
- if(clients == NULL)
- gtk_main_quit();
+hideurl(Client *c) {
+ gtk_widget_hide(c->urlbar);
+ gtk_widget_grab_focus(GTK_WIDGET(c->view));
}
gboolean
keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) {
Client *c = (Client *)d;
- gchar *uri;
if(ev->type != GDK_KEY_PRESS)
return FALSE;
+ if(GTK_WIDGET_HAS_FOCUS(c->searchbar)) {
+ switch(ev->keyval) {
+ case GDK_Escape:
+ hidesearch(c);
+ return TRUE;
+ case GDK_Return:
+ webkit_web_view_search_text(c->view,
+ gtk_entry_get_text(GTK_ENTRY(c->searchbar)),
+ FALSE,
+ !(ev->state & GDK_SHIFT_MASK),
+ TRUE);
+ return TRUE;
+ case GDK_Left:
+ case GDK_Right:
+ case GDK_r:
+ return FALSE;
+ }
+ }
+ else if(GTK_WIDGET_HAS_FOCUS(c->urlbar)) {
+ switch(ev->keyval) {
+ case GDK_Escape:
+ hideurl(c);
+ return TRUE;
+ case GDK_Return:
+ loaduri(c, gtk_entry_get_text(GTK_ENTRY(c->urlbar)));
+ hideurl(c);
+ return TRUE;
+ case GDK_Left:
+ case GDK_Right:
+ case GDK_r:
+ return FALSE;
+ }
+ }
if(ev->state == GDK_CONTROL_MASK || ev->state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
switch(ev->keyval) {
case GDK_r:
case GDK_b:
return TRUE;
case GDK_g:
- gtk_widget_hide(c->searchbar);
- if(!(uri = (gchar *)webkit_web_view_get_uri(c->view)))
- uri = "(null)";
- gtk_entry_set_text(GTK_ENTRY(c->urlbar), uri);
- gtk_widget_show(c->urlbar);
- gtk_widget_grab_focus(c->urlbar);
+ showurl(c);
return TRUE;
case GDK_slash:
- gtk_widget_hide(c->urlbar);
- gtk_widget_show(c->searchbar);
- gtk_widget_grab_focus(c->searchbar);
+ showsearch(c);
return TRUE;
case GDK_Left:
webkit_web_view_go_back(c->view);
return TRUE;
}
}
- else {
- switch(ev->keyval) {
- case GDK_Escape:
- if(!GTK_WIDGET_HAS_FOCUS(c->searchbar) && !GTK_WIDGET_HAS_FOCUS(c->urlbar))
- return FALSE;
- gtk_widget_hide(c->urlbar);
- gtk_widget_hide(c->searchbar);
- gtk_widget_grab_focus(GTK_WIDGET(c->view));
- return TRUE;
- case GDK_Return:
- if(GTK_WIDGET_HAS_FOCUS(c->urlbar)) {
- loaduri(c, gtk_entry_get_text(GTK_ENTRY(c->urlbar)));
- gtk_widget_hide(c->urlbar);
- gtk_widget_grab_focus(GTK_WIDGET(c->view));
- return TRUE;
- }
- else if(GTK_WIDGET_HAS_FOCUS(c->searchbar)) {
- webkit_web_view_search_text(c->view,
- gtk_entry_get_text(GTK_ENTRY(c->searchbar)),
- FALSE,
- !(ev->state & GDK_SHIFT_MASK),
- TRUE);
+ return FALSE;
+}
+
+void
+linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d) {
+ Client *c = (Client *)d;
+
+ if(l)
+ gtk_window_set_title(GTK_WINDOW(c->win), l);
+ else
+ updatetitle(c);
+}
+
+void
+loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d) {
+ Client *c = (Client *)d;
+ gchar *uri;
+
+ uri = geturi(c);
+ ignore_once = TRUE;
+ XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), urlprop,
+ XA_STRING, 8, PropModeReplace, (unsigned char *)uri,
+ strlen(uri) + 1);
+}
+
+void
+loadfile(const Client *c, const gchar *f) {
+ GIOChannel *chan = NULL;
+ GError *e = NULL;
+ GString *code = g_string_new("");
+ GString *uri = g_string_new(f);
+ gchar *line;
+
+ if(strcmp(f, "-") == 0) {
+ chan = g_io_channel_unix_new(STDIN_FILENO);
+ if (chan) {
+ 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);
}
}
- return FALSE;
-}
+ else {
+ g_string_prepend(uri, "file://");
+ loaduri(c, uri->str);
+ }
-void setup(void) {
- dpy = GDK_DISPLAY();
- urlprop = XInternAtom(dpy, "_SURF_URL", False);
}
-void die(char *str) {
- fputs(str, stderr);
- exit(EXIT_FAILURE);
+void
+loaduri(const 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);
+ g_string_free(u, TRUE);
}
Client *
g_signal_connect(G_OBJECT(c->view), "load-committed", G_CALLBACK(loadcommit), 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), "new-window-policy-decision-requested", G_CALLBACK(decidewindow), c);
g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(download), c);
/* urlbar */
c->searchbar = gtk_entry_new();
gtk_entry_set_has_frame(GTK_ENTRY(c->searchbar), FALSE);
+ /* downloadbar */
+ c->pbar = gtk_label_new("");
+
/* Arranging */
gtk_container_add(GTK_CONTAINER(c->scroll), GTK_WIDGET(c->view));
gtk_container_add(GTK_CONTAINER(c->win), c->vbox);
gtk_container_add(GTK_CONTAINER(c->vbox), c->scroll);
gtk_container_add(GTK_CONTAINER(c->vbox), c->searchbar);
gtk_container_add(GTK_CONTAINER(c->vbox), c->urlbar);
+ gtk_container_add(GTK_CONTAINER(c->vbox), c->pbar);
/* Setup */
gtk_box_set_child_packing(GTK_BOX(c->vbox), c->urlbar, FALSE, FALSE, 0, GTK_PACK_START);
gtk_box_set_child_packing(GTK_BOX(c->vbox), c->searchbar, FALSE, FALSE, 0, GTK_PACK_START);
+ gtk_box_set_child_packing(GTK_BOX(c->vbox), c->pbar, FALSE, FALSE, 0, GTK_PACK_START);
gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE, TRUE, 0, GTK_PACK_START);
gtk_widget_grab_focus(GTK_WIDGET(c->view));
gtk_widget_hide_all(c->searchbar);
gtk_widget_hide_all(c->urlbar);
+ gtk_widget_hide_all(c->pbar);
gtk_widget_show(c->vbox);
gtk_widget_show(c->scroll);
gtk_widget_show(GTK_WIDGET(c->view));
return c;
}
+WebKitWebView *
+newwindow(WebKitWebView *v, WebKitWebFrame *f, gpointer d) {
+ Client *c = newclient();
+ return c->view;
+}
+
+void
+progresschange(WebKitWebView* view, gint p, gpointer d) {
+ Client *c = (Client *)d;
+
+ c->progress = p;
+ updatetitle(c);
+}
+
+GdkFilterReturn
+processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
+ XPropertyEvent *ev;
+ Client *c = (Client *)d;
+ 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);
+ return GDK_FILTER_REMOVE;
+ }
+ }
+ return GDK_FILTER_CONTINUE;
+}
+
+void setup(void) {
+ dpy = GDK_DISPLAY();
+ urlprop = XInternAtom(dpy, "_SURF_URL", False);
+}
+
+void
+showsearch(Client *c) {
+ hideurl(c);
+ gtk_widget_show(c->searchbar);
+ gtk_widget_grab_focus(c->searchbar);
+}
+
+void
+showurl(Client *c) {
+ gchar *uri;
+
+ hidesearch(c);
+ uri = geturi(c);
+ gtk_entry_set_text(GTK_ENTRY(c->urlbar), uri);
+ gtk_widget_show(c->urlbar);
+ gtk_widget_grab_focus(c->urlbar);
+}
+
+void
+titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, gpointer d) {
+ Client *c = (Client *)d;
+
+ if(c->title)
+ g_free(c->title);
+ c->title = g_strdup(t);
+ updatetitle(c);
+}
+
+void
+updatetitle(Client *c) {
+ char t[512];
+ if(c->progress == 100)
+ snprintf(t, LENGTH(t), "%s", c->title);
+ else
+ snprintf(t, LENGTH(t), "%s [%i%%]", c->title, c->progress);
+ gtk_window_set_title(GTK_WINDOW(c->win), t);
+}
+
int main(int argc, char *argv[]) {
gchar *uri = NULL, *file = NULL;
+ SoupSession *s;
Client *c;
int o;
+ const gchar *home, *filename;
gtk_init(NULL, NULL);
if (!g_thread_supported())
goto argerr;
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", NULL);
+ cookiejar = soup_cookie_jar_text_new(filename, FALSE);
+ soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
+
gtk_main();
cleanup();
return EXIT_SUCCESS;
