Display *dpy;
Atom urlprop;
typedef struct Client {
- GtkWidget *win, *scroll, *vbox, *pbar, *urlbar, *searchbar;
+ GtkWidget *win, *scroll, *vbox, *urlbar, *searchbar;
WebKitWebView *view;
+ WebKitDownload *download;
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;
static void cleanup(void);
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 downloadcb(WebKitDownload *o, GParamSpec *pspec, gpointer d);
-static gboolean download(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 loadfile(const Client *c, const gchar *f);
-static void loaduri(const Client *c, const gchar *uri);
+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 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);
+static void stop(Client *c);
+static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, Client *c);
+static void usage();
+static void updatetitle(Client *c, const gchar *title);
void
cleanup(void) {
while(clients)
destroyclient(clients);
- g_slist_free(downloads);
}
void
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);
}
void
-destroywin(GtkWidget* w, gpointer d) {
- Client *c = (Client *)d;
-
+destroywin(GtkWidget* w, Client *c) {
destroyclient(c);
}
-void die(char *str) {
+void
+die(char *str) {
fputs(str, stderr);
exit(EXIT_FAILURE);
}
void
-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);
+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);
}
- g_string_free(text, TRUE);
+ updatetitle(c, NULL);
}
gboolean
-download(WebKitWebView *view, WebKitDownload *o, gpointer d) {
- /* TODO */
- Client *c = (Client *) d;
- const gchar *home;
- gchar *uri, *filename;
+initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
+ const gchar *home, *filename;
+ gchar *uri, *path, *html;
+ stop(c);
+ c->download = o;
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);
+ filename = webkit_download_get_suggested_filename(o);
+ path = g_build_filename(home, ".surf", "dl",
+ filename, NULL);
+ uri = g_strconcat("file://", path, NULL);
+ webkit_download_set_destination_uri(c->download, uri);
+ c->progress = 0;
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);
+ html = g_strdup_printf("Download <b>%s</b>...", 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;
}
}
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)) {
return TRUE;
case GDK_Left:
case GDK_Right:
- case GDK_r:
return FALSE;
}
}
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)) {
+ if(ev->state & GDK_CONTROL_MASK) {
switch(ev->keyval) {
+ case GDK_p:
+ gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteurl, c);
+ return TRUE;
+ 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:
case GDK_R:
if((ev->state & GDK_SHIFT_MASK))
case GDK_slash:
showsearch(c);
return TRUE;
+ case GDK_plus:
+ case GDK_equal:
+ webkit_web_view_zoom_in(c->view);
+ return TRUE;
+ case GDK_minus:
+ webkit_web_view_zoom_out(c->view);
+ return TRUE;
+ case GDK_0:
+ webkit_web_view_set_zoom_level(c->view, 1.0);
+ return TRUE;
+ case GDK_n:
+ case GDK_N:
+ 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:
webkit_web_view_go_back(c->view);
return TRUE;
return TRUE;
}
}
+ else {
+ switch(ev->keyval) {
+ case GDK_Escape:
+ stop(c);
+ return TRUE;
+ }
+ }
return FALSE;
}
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
- updatetitle(c);
+ updatetitle(c, NULL);
}
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
-loadfile(const Client *c, const gchar *f) {
+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);
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);
+ g_free(uri);
}
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);
+loaduri(Client *c, const gchar *uri) {
+ 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);
+ g_free(u);
}
Client *
g_signal_connect(G_OBJECT(c->view), "title-changed", G_CALLBACK(titlechange), c);
g_signal_connect(G_OBJECT(c->view), "load-progress-changed", G_CALLBACK(progresschange), c);
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), "download-requested", G_CALLBACK(download), c);
+ g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(initdownload), c);
/* urlbar */
c->urlbar = 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->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));
gtk_widget_show(c->win);
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);
+ c->download = NULL;
+ c->title = NULL;
c->next = clients;
clients = c;
if(showxid)
}
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);
+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
+progresschange(WebKitWebView* view, gint p, Client *c) {
+ c->progress = p;
+ updatetitle(c, NULL);
+}
+
void setup(void) {
dpy = GDK_DISPLAY();
urlprop = XInternAtom(dpy, "_SURF_URL", False);
}
void
-titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, gpointer d) {
- Client *c = (Client *)d;
+stop(Client *c) {
+ if(c->download)
+ webkit_download_cancel(c->download);
+ else
+ webkit_web_view_stop_loading(c->view);
+ c->download = NULL;
+}
- if(c->title)
- g_free(c->title);
- c->title = g_strdup(t);
- updatetitle(c);
+void
+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");
}
void
-updatetitle(Client *c) {
- char t[512];
+updatetitle(Client *c, const char *title) {
+ gchar *t;
+
+ if(title) {
+ if(c->title)
+ g_free(c->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[]) {
- gchar *uri = NULL, *file = NULL;
SoupSession *s;
Client *c;
int o;
embed = TRUE;
break;
case 'u':
- if(!(uri = optarg))
- goto argerr;
c = newclient();
- loaduri(c, uri);
- updatetitle(c);
+ loaduri(c, optarg);
break;
case 'f':
- if(!(file = optarg))
- goto argerr;
c = newclient();
- loadfile(c, file);
- updatetitle(c);
+ loadfile(c, optarg);
break;
case 'v':
die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n");
break;
- argerr:
default:
- puts("surf - simple browser");
- die("usage: surf [-e] [-x] [-u uri] [-f file]\n");
- return EXIT_FAILURE;
+ usage();
}
if(optind != argc)
- goto argerr;
+ usage();
if(!clients)
newclient();
