#include <glib/gstdio.h>
#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 int i;
- const unsigned int ui;
+ const gint i;
const void *v;
} ;
typedef struct Client {
- GtkWidget *win, *scroll, *vbox, *urlbar, *searchbar;
+ GtkWidget *win, *scroll, *vbox, *urlbar, *searchbar, *indicator;
WebKitWebView *view;
WebKitDownload *download;
gchar *title;
gboolean showxid = FALSE;
gboolean ignore_once = FALSE;
extern char *optarg;
-extern int optind;
+extern gint optind;
static void cleanup(void);
-static void proccookies(SoupMessage *m, Client *c);
static void clipboard(Client *c, const Arg *arg);
+static gchar *copystr(gchar **str, const gchar *src);
static void destroyclient(Client *c);
static void destroywin(GtkWidget* w, Client *c);
static void die(char *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 gchar *geturi(Client *c);
static void hidesearch(Client *c, const Arg *arg);
static void loadfile(Client *c, const gchar *f);
static void loaduri(Client *c, const Arg *arg);
static void navigate(Client *c, const Arg *arg);
-static Client *newclient();
+static Client *newclient(void);
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 print(Client *c, const Arg *arg);
+static void proccookies(SoupMessage *m, Client *c);
static void progresschange(WebKitWebView *view, gint p, Client *c);
static void request(SoupSession *s, SoupMessage *m, Client *c);
static void reload(Client *c, const Arg *arg);
-static void rereadcookies();
+static void rereadcookies(void);
static void setcookie(char *name, char *val, char *dom, char *path, long exp);
-static void setup();
+static void setup(void);
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);
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 void usage();
-static void updatetitle(Client *c, const gchar *title);
-static void zoompage(Client *c, const Arg *arg);
+static gboolean unfocusbar(GtkWidget *w, GdkEventFocus *e, Client *c);
+static void usage(void);
+static void update(Client *c);
+static void zoom(Client *c, const Arg *arg);
#include "config.h"
destroyclient(clients);
}
-void
-proccookies(SoupMessage *m, Client *c) {
- GSList *l;
- SoupCookie *co;
- long t;
-
- rereadcookies();
- 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
clipboard(Client *c, const Arg *arg) {
gboolean paste = *(gboolean *)arg;
+
if(paste)
gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteurl, c);
else
gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), webkit_web_view_get_uri(c->view), -1);
}
+gchar *
+copystr(gchar **str, const gchar *src) {
+ gchar *tmp;
+ tmp = g_strdup(src);
+
+ if(str && *str) {
+ g_free(*str);
+ *str = tmp;
+ }
+ return tmp;
+}
+
void
destroyclient(Client *c) {
Client *p;
exit(EXIT_FAILURE);
}
+void
+drawindicator(Client *c) {
+ gint width;
+ gchar *uri;
+ GtkWidget *w;
+ GdkGC *gc;
+ GdkColor fg;
+
+ uri = geturi(c);
+ w = c->indicator;
+ width = c->progress * w->allocation.width / 100;
+ gc = gdk_gc_new(w->window);
+ gdk_color_parse(strstr(uri, "https://") == uri ?
+ progress_trust : progress, &fg);
+ gdk_gc_set_rgb_fg_color(gc, &fg);
+ gdk_draw_rectangle(w->window,
+ w->style->bg_gc[GTK_WIDGET_STATE(w)],
+ TRUE, 0, 0, w->allocation.width, w->allocation.height);
+ gdk_draw_rectangle(w->window, gc, TRUE, 0, 0, width,
+ w->allocation.height);
+ g_object_unref(gc);
+}
+
+gboolean
+exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c) {
+ drawindicator(c);
+ return TRUE;
+}
+
void
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);
+ c->progress = (gint)(webkit_download_get_progress(c->download)*100);
}
- updatetitle(c, NULL);
+ update(c);
}
gboolean
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);
+
+ c->title = copystr(&c->title, filename);
+ update(c);
g_free(html);
return TRUE;
}
gchar *uri;
if(!(uri = (gchar *)webkit_web_view_get_uri(c->view)))
- uri = g_strdup("about:blank");
+ uri = copystr(NULL, "about:blank");
return uri;
}
gboolean
keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
- unsigned int i, focus;
+ guint i, focus;
gboolean processed = FALSE;
if(ev->type != GDK_KEY_PRESS)
else
focus = BROWSER;
for(i = 0; i < LENGTH(keys); i++) {
- if(focus & keys[i].focus && ev->keyval == keys[i].keyval &&
- (ev->state == keys[i].mod || ev->state & keys[i].mod)
+ if(focus & keys[i].focus
+ && gdk_keyval_to_lower(ev->keyval) == keys[i].keyval
+ && CLEANMASK(ev->state) == keys[i].mod
&& keys[i].func) {
keys[i].func(c, &(keys[i].arg));
processed = TRUE;
if(l)
gtk_window_set_title(GTK_WINDOW(c->win), l);
else
- updatetitle(c, NULL);
+ update(c);
}
void
void
loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
c->progress = 0;
- updatetitle(c, NULL);
+ update(c);
}
void
arg.v = uri = g_strdup_printf("file://%s", f);
loaduri(c, &arg);
}
- updatetitle(c, uri);
+ c->title = copystr(&c->title, uri);
+ update(c);
g_free(uri);
}
: g_strdup_printf("http://%s", uri);
webkit_web_view_load_uri(c->view, u);
c->progress = 0;
- updatetitle(c, u);
+ c->title = copystr(&c->title, u);
g_free(u);
+ update(c);
}
void
/* 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();
+ gtk_widget_set_size_request(c->indicator, 0, 2);
+ g_signal_connect (G_OBJECT (c->indicator), "expose_event",
+ G_CALLBACK (exposeindicator), c);
/* downloadbar */
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->indicator);
/* 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->indicator, 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_show(c->vbox);
+ gtk_widget_show(c->indicator);
gtk_widget_show(c->scroll);
gtk_widget_show(GTK_WIDGET(c->view));
gtk_widget_show(c->win);
c->title = NULL;
c->next = clients;
clients = c;
- if(showxid)
- printf("%u\n", (unsigned int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
+ if(showxid) {
+ gdk_display_sync(gtk_widget_get_display(c->win));
+ printf("%u\n", (guint)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
+ fflush(NULL);
+ }
return c;
}
Client *c = (Client *)d;
XPropertyEvent *ev;
Atom adummy;
- int idummy;
+ gint idummy;
unsigned long ldummy;
unsigned char *buf = NULL;
Arg arg;
webkit_web_frame_print(webkit_web_view_get_main_frame(c->view));
}
+void
+proccookies(SoupMessage *m, Client *c) {
+ GSList *l;
+ SoupCookie *co;
+ long t;
+
+ rereadcookies();
+ 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
progresschange(WebKitWebView* view, gint p, Client *c) {
c->progress = p;
- updatetitle(c, NULL);
+ update(c);
}
void
}
void
-rereadcookies() {
+rereadcookies(void) {
const gchar *filename, *home;
home = g_get_home_dir();
filename = g_build_filename(home, ".surf", "cookies", NULL);
}
+void
+scroll(Client *c, const Arg *arg) {
+ gdouble v;
+ GtkAdjustment *a;
+
+ a = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(c->scroll));
+ v = gtk_adjustment_get_value(a);
+ v += gtk_adjustment_get_step_increment(a) * arg->i;
+ v = MAX(v, 0.0);
+ v = MIN(v, gtk_adjustment_get_upper(a) - gtk_adjustment_get_page_size(a));
+ gtk_adjustment_set_value(a, v);
+}
+
void
setcookie(char *name, char *val, char *dom, char *path, long exp) {
}
void
-setup() {
+setup(void) {
dpy = GDK_DISPLAY();
session = webkit_get_default_session();
urlprop = XInternAtom(dpy, "_SURF_URL", False);
gtk_widget_grab_focus(c->searchbar);
}
+void
+source(Client *c, const Arg *arg) {
+ Arg a = { .b = FALSE };
+ /*gboolean s;
+
+ s = webkit_web_view_get_view_source_mode(c->view);
+ webkit_web_view_set_view_source_mode(c->view, c->source);*/
+ reload(c, &a);
+}
+
void
searchtext(Client *c, const Arg *arg) {
gboolean forward = *(gboolean *)arg;
void
titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, Client *c) {
- updatetitle(c, t);
+ c->title = copystr(&c->title, t);
+ update(c);
+}
+
+gboolean
+unfocusbar(GtkWidget *w, GdkEventFocus *e, Client *c) {
+ hidesearch(c, NULL);
+ hideurl(c, NULL);
+ return TRUE;
}
void
-usage() {
+usage(void) {
fputs("surf - simple browser\n", stderr);
die("usage: surf [-e] [-x] [uri]\n");
}
void
-updatetitle(Client *c, const char *title) {
+update(Client *c) {
gchar *t;
- if(title) {
- if(c->title)
- g_free(c->title);
- c->title = g_strdup(title);
- }
if(c->progress == 100)
t = g_strdup(c->title);
else
t = g_strdup_printf("%s [%i%%]", c->title, c->progress);
+ drawindicator(c);
gtk_window_set_title(GTK_WINDOW(c->win), t);
g_free(t);
}
void
-zoompage(Client *c, const Arg *arg) {
+zoom(Client *c, const Arg *arg) {
if(arg->i < 0) /* zoom out */
webkit_web_view_zoom_out(c->view);
else if(arg->i > 0) /* zoom in */
int main(int argc, char *argv[]) {
SoupSession *s;
Client *c;
- int o;
+ gint o;
const gchar *home, *filename;
Arg arg;
/* 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);
