#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 float f;
+ 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;
struct Cookie *next;
} Cookie;
+typedef enum {
+ BROWSER = 0x0001,
+ SEARCHBAR = 0x0010,
+ URLBAR = 0x0100,
+ ALWAYS = ~0,
+} KeyFocus;
+
typedef struct {
guint mod;
guint keyval;
void (*func)(Client *c, const Arg *arg);
const Arg arg;
- gboolean stop; /* do not propagate keypress event/stop matching keys */
+ KeyFocus focus;
} Key;
-typedef enum {
- NONE,
- SEARCHBAR,
- URLBAR,
-} Keypressmode;
-
-typedef struct {
- Key *keys;
- unsigned int numkeys;
- Keypressmode mode;
-} KeySet;
-
SoupCookieJar *cookiejar;
SoupSession *session;
Client *clients = NULL;
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 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 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 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 reload(Client *c, const Arg *arg);
-static void setup(void);
+static void rereadcookies();
+static void setcookie(char *name, char *val, char *dom, char *path, long exp);
+static void setup();
static void titlechange(WebKitWebView* view, WebKitWebFrame* frame,
const gchar* title, Client *c);
static void searchtext(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 void update(Client *c, const gchar *title);
+static void zoom(Client *c, const Arg *arg);
#include "config.h"
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;
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);/*g_free(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, NULL);
}
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);
+ update(c, filename);
g_free(html);
return TRUE;
}
gboolean
keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
- unsigned int n, m;
+ guint i, focus;
+ gboolean processed = FALSE;
if(ev->type != GDK_KEY_PRESS)
return FALSE;
-
- for(n = 0; n < LENGTH(keysets); n++)
- switch(keysets[n].mode) {
- case SEARCHBAR:
- if(GTK_WIDGET_HAS_FOCUS(c->searchbar))
- goto matchkeys;
- break;
- case URLBAR:
- if(GTK_WIDGET_HAS_FOCUS(c->urlbar))
- goto matchkeys;
- break;
- case NONE:
- goto matchkeys;
- default:
- fprintf(stderr, "keypress(): Unknown Keypressmode\n");
- break;
- }
- if(n < LENGTH(keysets)) {
-matchkeys:
- for(m = 0; m < keysets[n].numkeys; m++) {
- Key *keys = keysets[n].keys;
- if(ev->keyval == keys[m].keyval
- && (ev->state == keys[m].mod
- || (ev->state & keys[m].mod))
- && keys[m].func) {
- keys[m].func(c, &(keys[m].arg));
- if(keys[m].stop)
- return TRUE;
- }
+ if(GTK_WIDGET_HAS_FOCUS(c->searchbar))
+ focus = SEARCHBAR;
+ else if(GTK_WIDGET_HAS_FOCUS(c->urlbar))
+ focus = URLBAR;
+ else
+ focus = BROWSER;
+ for(i = 0; i < LENGTH(keys); i++) {
+ if(focus & keys[i].focus && ev->keyval == keys[i].keyval &&
+ (CLEANMASK(ev->state) == keys[i].mod ||
+ CLEANMASK(ev->state) & keys[i].mod)
+ && keys[i].func) {
+ keys[i].func(c, &(keys[i].arg));
+ processed = TRUE;
}
}
- return FALSE;
+ return processed;
}
void
if(l)
gtk_window_set_title(GTK_WINDOW(c->win), l);
else
- updatetitle(c, NULL);
+ update(c, NULL);
}
void
void
loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
c->progress = 0;
- updatetitle(c, NULL);
+ update(c, NULL);
}
void
arg.v = uri = g_strdup_printf("file://%s", f);
loaduri(c, &arg);
}
- updatetitle(c, uri);
+ update(c, uri);
g_free(uri);
}
: g_strdup_printf("http://%s", uri);
webkit_web_view_load_uri(c->view, u);
c->progress = 0;
- updatetitle(c, u);
+ update(c, u);
g_free(u);
}
void
navigate(Client *c, const Arg *arg) {
- gboolean forward = *(gboolean *)arg;
- if(forward)
- webkit_web_view_go_forward(c->view);
- else
- webkit_web_view_go_back(c->view);
+ gint steps = *(gint *)arg;
+ webkit_web_view_go_back_or_forward(c->view, steps);
}
Client *
c->searchbar = gtk_entry_new();
gtk_entry_set_has_frame(GTK_ENTRY(c->searchbar), FALSE);
+ /* 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 */
/* Arranging */
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;
return GDK_FILTER_CONTINUE;
}
+void
+print(Client *c, const Arg *arg) {
+ webkit_web_frame_print(webkit_web_view_get_main_frame(c->view));
+}
+
void
progresschange(WebKitWebView* view, gint p, Client *c) {
c->progress = p;
- updatetitle(c, NULL);
+ update(c, NULL);
}
void
webkit_web_view_reload(c->view);
}
+void
+rereadcookies() {
+ const gchar *filename, *home;
+
+ home = g_get_home_dir();
+ filename = g_build_filename(home, ".surf", "cookies", NULL);
+}
+
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
void
titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, Client *c) {
- updatetitle(c, t);
+ update(c, t);
}
void
}
void
-updatetitle(Client *c, const char *title) {
+update(Client *c, const char *title) {
gchar *t;
if(title) {
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) {
- if(*(float *)arg < 0) /* zoom out */
+zoom(Client *c, const Arg *arg) {
+ if(arg->i < 0) /* zoom out */
webkit_web_view_zoom_out(c->view);
- else if(*(float *)arg == 0) /* zoom in */
+ else if(arg->i > 0) /* zoom in */
webkit_web_view_zoom_in(c->view);
- else /* absolute level */
- webkit_web_view_set_zoom_level(c->view, *(float *)arg);
+ else /* reset */
+ webkit_web_view_set_zoom_level(c->view, 1.0);
}
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);
/* cookie persistance */
s = webkit_get_default_session();
- filename = g_build_filename(home, ".surf", "cookies", NULL);
+ filename = g_build_filename(home, ".surf", "cookies.jar", NULL);
cookiejar = soup_cookie_jar_text_new(filename, FALSE);
soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));