const gboolean b;
const int i;
const unsigned int ui;
- const float f;
const void *v;
} ;
struct Client *next;
} Client;
+typedef struct Cookie {
+ char *name;
+ char *value;
+ char *domain;
+ char *path;
+ 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;
+Cookie *cookies = NULL;
gboolean embed = FALSE;
gboolean showxid = FALSE;
gboolean ignore_once = FALSE;
extern int optind;
static void cleanup(void);
+static void proccookies(SoupMessage *m, Client *c);
static void clipboard(Client *c, const Arg *arg);
static void destroyclient(Client *c);
static void destroywin(GtkWidget* w, Client *c);
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 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 showsearch(Client *c, const Arg *arg);
static void showurl(Client *c, const Arg *arg);
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;
gboolean
keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
- unsigned int n, m;
+ unsigned int 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 &&
+ (ev->state == keys[i].mod || ev->state & keys[i].mod)
+ && keys[i].func) {
+ keys[i].func(c, &(keys[i].arg));
+ processed = TRUE;
}
}
- return FALSE;
+ return processed;
}
void
const gchar *uri = (gchar *)arg->v;
if(!uri)
uri = gtk_entry_get_text(GTK_ENTRY(c->urlbar));
- u = g_strrstr(uri, ":") ? g_strdup(uri)
+ u = g_strrstr(uri, "://") ? g_strdup(uri)
: g_strdup_printf("http://%s", uri);
webkit_web_view_load_uri(c->view, u);
c->progress = 0;
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 *
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();
unsigned long ldummy;
unsigned char *buf = NULL;
Arg arg;
+
if(((XEvent *)e)->type == PropertyNotify) {
ev = &((XEvent *)e)->xproperty;
if(ev->atom == urlprop && ev->state == PropertyNewValue) {
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);
}
+void
+request(SoupSession *s, SoupMessage *m, Client *c) {
+ soup_message_add_header_handler(m, "got-headers", "Set-Cookie",
+ G_CALLBACK(proccookies), c);
+}
+
void
reload(Client *c, const Arg *arg) {
gboolean nocache = *(gboolean *)arg;
webkit_web_view_reload(c->view);
}
-void setup(void) {
+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) {
+
+}
+
+void
+setup() {
dpy = GDK_DISPLAY();
+ session = webkit_get_default_session();
urlprop = XInternAtom(dpy, "_SURF_URL", False);
}
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
void
zoompage(Client *c, const Arg *arg) {
- if(*(float *)arg < 0) /* zoom out */
+ 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[]) {
showxid = TRUE;
embed = TRUE;
break;
- case 'u':
- c = newclient();
- arg.v = optarg;
- loaduri(c, &arg);
- 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();
+ arg.v = argv[optind];
+ if(strchr("./", argv[optind][0]) || strcmp("-", argv[optind]) == 0)
+ loadfile(c, argv[optind]);
+ else
+ loaduri(c, &arg);
+
+ }
+ else if(optind != argc)
usage();
if(!clients)
newclient();
/* 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));