From 569d2767996f886f17bb0625f8e2c07d8ecc8364 Mon Sep 17 00:00:00 2001
From: Simon Rozet <simon@rozet.name>
Date: Sun, 7 Jun 2009 21:16:19 +0200
Subject: strip trailing whitespace
---
surf.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/surf.c b/surf.c
index 24b694a..318d694 100644
--- a/surf.c
+++ b/surf.c
@@ -113,7 +113,7 @@ download(WebKitWebView *view, WebKitDownload *o, gpointer d) {
gchar *uri, *filename;
home = g_get_home_dir();
- filename = g_build_filename(home, "Desktop",
+ filename = g_build_filename(home, "Desktop",
webkit_download_get_suggested_filename(o), NULL);
uri = g_strconcat("file://", filename, NULL);
webkit_download_set_destination_uri(o, uri);
@@ -256,7 +256,7 @@ loadfile(const Client *c, const gchar *f) {
g_string_prepend(uri, "file://");
loaduri(c, uri->str);
}
-
+
}
void
@@ -364,7 +364,7 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
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,
+ XGetWindowProperty(dpy, ev->window, urlprop, 0L, BUFSIZ, False, XA_STRING,
&adummy, &idummy, &ldummy, &ldummy, &buf);
loaduri(c, (gchar *)buf);
XFree(buf);
--
cgit v1.2.3
From ffd50068b335bea02a3f477396e9cfe6f906e648 Mon Sep 17 00:00:00 2001
From: Thomas Menari <spaceinvader@chaotika.org>
Date: Sun, 7 Jun 2009 20:49:36 +0200
Subject: vi-style scrolling
---
surf.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/surf.c b/surf.c
index 318d694..989cc51 100644
--- a/surf.c
+++ b/surf.c
@@ -183,7 +183,7 @@ keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) {
return FALSE;
}
}
- if(ev->state == GDK_CONTROL_MASK || ev->state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
+ else if(ev->state == GDK_CONTROL_MASK || ev->state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
switch(ev->keyval) {
case GDK_r:
case GDK_R:
@@ -208,6 +208,16 @@ keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) {
return TRUE;
}
}
+ else {
+ switch(ev->keyval) {
+ case GDK_k:
+ webkit_web_view_move_cursor(c->view, GTK_MOVEMENT_DISPLAY_LINES, -1);
+ return TRUE;
+ case GDK_j:
+ webkit_web_view_move_cursor(c->view, GTK_MOVEMENT_DISPLAY_LINES, 1);
+ return TRUE;
+ }
+ }
return FALSE;
}
--
cgit v1.2.3
From c5144c040f554f0320c744cb48a2d8dc1b646c4e Mon Sep 17 00:00:00 2001
From: Thomas Menari <spaceinvader@chaotika.org>
Date: Sun, 7 Jun 2009 21:25:22 +0200
Subject: cookie persistance
* stored in ~/.surf-cookies
* $EDITOR editable
---
surf.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/surf.c b/surf.c
index 989cc51..74a2d55 100644
--- a/surf.c
+++ b/surf.c
@@ -26,6 +26,7 @@ typedef struct Client {
gint progress;
struct Client *next;
} Client;
+SoupCookieJar *cookiejar;
Client *clients = NULL;
gboolean embed = FALSE;
gboolean showxid = FALSE;
@@ -429,8 +430,10 @@ updatetitle(Client *c) {
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())
@@ -472,6 +475,14 @@ int main(int argc, char *argv[]) {
goto argerr;
if(!clients)
newclient();
+
+ /* cookie persistance */
+ s = webkit_get_default_session();
+ home = g_get_home_dir();
+ 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;
--
cgit v1.2.3