X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=53cbff2bb39a48e7ef8a05d8b7479d4f8d45b2d0;hb=50192577ee0941c5a3fa38c0aaf9a67ce8f11ecb;hp=8b57a856995373e85ae926e40986caf16cbf240f;hpb=9a3c48389301917fb3e71c21fe87a074a0c2a164;p=surf.git

diff --git a/surf.c b/surf.c
index 8b57a85..53cbff2 100644
--- a/surf.c
+++ b/surf.c
@@ -24,19 +24,21 @@
 
 typedef union Arg Arg;
 union Arg {
-	const gboolean b;
-	const gint i;
+	gboolean b;
+	gint i;
 	const void *v;
 };
 
 typedef struct Client {
-	GtkWidget *win, *scroll, *vbox, *uribar, *searchbar, *indicator;
+	GtkWidget *win, *scroll, *vbox, *indicator;
 	GtkWidget **items;
 	WebKitWebView *view;
 	WebKitDownload *download;
 	char *title, *linkhover;
+	const char *uri, *needle;
 	gint progress;
 	struct Client *next;
+	gboolean zoomed;
 } Client;
 
 typedef struct {
@@ -45,24 +47,16 @@ typedef struct {
 	const Arg arg;
 } Item;
 
-typedef enum {
-	Browser = 0x0001,
-	SearchBar = 0x0010,
-	UriBar = 0x0100,
-	Any = ~0,
-} KeyFocus;
-
 typedef struct {
 	guint mod;
 	guint keyval;
 	void (*func)(Client *c, const Arg *arg);
 	const Arg arg;
-	KeyFocus focus;
 } Key;
 
 static Display *dpy;
-static Atom uriprop;
-static SoupCookieJar *cookiejar;
+static Atom uriprop, findprop;
+static SoupCookieJar *cookies;
 static SoupSession *session;
 static Client *clients = NULL;
 static GdkNativeWindow embed = 0;
@@ -70,8 +64,8 @@ static gboolean showxid = FALSE;
 static gboolean ignore_once = FALSE;
 static char winid[64];
 static char *progname;
+static gboolean lockcookie = FALSE;
 
-static const char *autouri(Client *c);
 static char *buildpath(const char *path);
 static void changecookie(SoupCookieJar *jar, SoupCookie *o, SoupCookie *n, gpointer p);
 static void cleanup(void);
@@ -85,15 +79,12 @@ 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 const char *getatom(Client *c, Atom a);
 static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
-static char *geturi(Client *c);
-static void hidesearch(Client *c, const Arg *arg);
-static void hideuri(Client *c, const Arg *arg);
 static void itemclick(GtkMenuItem *mi, Client *c);
 static gboolean keypress(GtkWidget *w, GdkEventKey *ev, Client *c);
 static void linkhover(WebKitWebView *v, const char* t, const char* l, Client *c);
 static void loadcommit(WebKitWebView *v, WebKitWebFrame *f, Client *c);
-static void loadfinished(WebKitWebView *v, WebKitWebFrame *f, Client *c);
 static void loadstart(WebKitWebView *v, WebKitWebFrame *f, Client *c);
 static void loaduri(Client *c, const Arg *arg);
 static void navigate(Client *c, const Arg *arg);
@@ -104,19 +95,18 @@ static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
 static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
 static void print(Client *c, const Arg *arg);
 static void progresschange(WebKitWebView *v, gint p, Client *c);
+static void reloadcookies();
 static void reload(Client *c, const Arg *arg);
-static void reloadcookie();
+static void resize(GtkWidget *w, GtkAllocation *a, Client *c);
 static void sigchld(int unused);
+static void setatom(Client *c, Atom a, const char *v);
 static void setup(void);
 static void spawn(Client *c, const Arg *arg);
 static void scroll(Client *c, const Arg *arg);
-static void searchtext(Client *c, const Arg *arg);
+static void find(Client *c, const Arg *arg);
 static void source(Client *c, const Arg *arg);
-static void showsearch(Client *c, const Arg *arg);
-static void showuri(Client *c, const Arg *arg);
 static void stop(Client *c, const Arg *arg);
 static void titlechange(WebKitWebView *v, WebKitWebFrame* frame, const char* title, Client *c);
-static gboolean focusview(GtkWidget *w, GdkEventFocus *e, Client *c);
 static void usage(void);
 static void update(Client *c);
 static void updatewinid(Client *c);
@@ -126,15 +116,6 @@ static void zoom(Client *c, const Arg *arg);
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
-const char *
-autouri(Client *c) {
-	if(GTK_WIDGET_HAS_FOCUS(c->uribar))
-		return gtk_entry_get_text(GTK_ENTRY(c->uribar));
-	else if(c->linkhover)
-		return c->linkhover;
-	return NULL;
-}
-
 char *
 buildpath(const char *path) {
 	char *apath, *p;
@@ -157,15 +138,24 @@ buildpath(const char *path) {
 }
 
 void
-changecookie(SoupCookieJar *jar, SoupCookie *oc, SoupCookie *c, gpointer p) {
+changecookie(SoupCookieJar *j, SoupCookie *oc, SoupCookie *c, gpointer p) {
 	SoupDate *e;
+	SoupCookieJar *jar;
 
+	if(lockcookie)
+		return;
 	if(c && c->expires == NULL) {
 		e = soup_date_new_from_time_t(time(NULL) + sessiontime);
 		c = soup_cookie_copy(c);
 		soup_cookie_set_expires(c, e);
-		soup_cookie_jar_add_cookie(cookiejar, c);
 	}
+	
+	jar = soup_cookie_jar_text_new(cookiefile, FALSE);
+	if(c)
+		soup_cookie_jar_add_cookie(jar, soup_cookie_copy(c));
+	else
+		soup_cookie_jar_delete_cookie(jar, oc);
+	g_object_unref(jar);
 }
 
 void
@@ -223,9 +213,8 @@ destroyclient(Client *c) {
 
 	gtk_widget_destroy(GTK_WIDGET(c->view));
 	gtk_widget_destroy(c->scroll);
-	gtk_widget_destroy(c->uribar);
-	gtk_widget_destroy(c->searchbar);
 	gtk_widget_destroy(c->vbox);
+	gtk_widget_destroy(c->indicator);
 	gtk_widget_destroy(c->win);
 	for(i = 0; i < LENGTH(items); i++)
 		gtk_widget_destroy(c->items[i]);
@@ -267,12 +256,12 @@ die(char *str) {
 void
 drawindicator(Client *c) {
 	gint width;
-	char *uri;
+	const char *uri;
 	GtkWidget *w;
 	GdkGC *gc;
 	GdkColor fg;
 
-	uri = geturi(c);
+	uri = getatom(c, uriprop);
 	w = c->indicator;
 	width = c->progress * w->allocation.width / 100;
 	gc = gdk_gc_new(w->window);
@@ -304,6 +293,25 @@ download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
 	update(c);
 }
 
+const char *
+getatom(Client *c, Atom a) {
+	static char buf[BUFSIZ];
+	Atom adummy;
+	int idummy;
+	unsigned long ldummy;
+	unsigned char *p = NULL;
+
+	XGetWindowProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window),
+			a, 0L, BUFSIZ, False, XA_STRING,
+			&adummy, &idummy, &ldummy, &ldummy, &p);
+	if(p)
+		strncpy(buf, (char *)p, LENGTH(buf)-1);
+	else
+		buf[0] = '\0';
+	XFree(p);
+	return buf;
+}
+
 gboolean
 initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
 	const char *filename;
@@ -334,22 +342,10 @@ geturi(Client *c) {
 	char *uri;
 
 	if(!(uri = (char *)webkit_web_view_get_uri(c->view)))
-		uri = copystr(NULL, "about:blank");
+		uri = "about:blank";
 	return uri;
 }
 
-void
-hidesearch(Client *c, const Arg *arg) {
-	gtk_widget_hide(c->searchbar);
-	gtk_widget_grab_focus(GTK_WIDGET(c->view));
-}
-
-void
-hideuri(Client *c, const Arg *arg) {
-	gtk_widget_hide(c->uribar);
-	gtk_widget_grab_focus(GTK_WIDGET(c->view));
-}
-
 void
 itemclick(GtkMenuItem *mi, Client *c) {
 	int i;
@@ -363,21 +359,12 @@ itemclick(GtkMenuItem *mi, Client *c) {
 
 gboolean
 keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
-	guint i, focus;
+	guint i;
 	gboolean processed = FALSE;
 
-	if(ev->type != GDK_KEY_PRESS)
-		return FALSE;
-	if(GTK_WIDGET_HAS_FOCUS(c->searchbar))
-		focus = SearchBar;
-	else if(GTK_WIDGET_HAS_FOCUS(c->uribar))
-		focus = UriBar;
-	else
-		focus = Browser;
 	updatewinid(c);
 	for(i = 0; i < LENGTH(keys); i++) {
-		if(focus & keys[i].focus
-				&& gdk_keyval_to_lower(ev->keyval) == keys[i].keyval
+		if(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));
@@ -400,23 +387,12 @@ linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) {
 
 void
 loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
-	char *uri;
-
-	ignore_once = TRUE;
-	uri = geturi(c);
-	XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), uriprop,
-			XA_STRING, 8, PropModeReplace, (unsigned char *)uri,
-			strlen(uri) + 1);
-}
-
-void
-loadfinished(WebKitWebView *v, WebKitWebFrame *f, Client *c) {
-	reloadcookie();
+	setatom(c, uriprop, webkit_web_view_get_uri(c->view));
+	reloadcookies();
 }
 
 void
 loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
-	reloadcookie();
 	c->progress = 0;
 	update(c);
 }
@@ -426,10 +402,6 @@ loaduri(Client *c, const Arg *arg) {
 	char *u;
 	const char *uri = (char *)arg->v;
 
-	if(!uri)
-		uri = autouri(c);
-	if(!uri)
-		return;
 	u = g_strrstr(uri, "://") ? g_strdup(uri)
 		: g_strdup_printf("http://%s", uri);
 	webkit_web_view_load_uri(c->view, u);
@@ -465,6 +437,7 @@ newclient(void) {
 	gtk_window_set_default_size(GTK_WINDOW(c->win), 800, 600);
 	g_signal_connect(G_OBJECT(c->win), "destroy", G_CALLBACK(destroywin), c);
 	g_signal_connect(G_OBJECT(c->win), "key-press-event", G_CALLBACK(keypress), c);
+	g_signal_connect(G_OBJECT(c->win), "size-allocate", G_CALLBACK(resize), c);
 
 	if(!(c->items = calloc(1, sizeof(GtkWidget *) * LENGTH(items))))
 		die("Cannot malloc!\n");
@@ -476,7 +449,6 @@ newclient(void) {
 				G_CALLBACK(itemclick), c);
 	}
 
-
 	/* VBox */
 	c->vbox = gtk_vbox_new(FALSE, 0);
 
@@ -489,7 +461,6 @@ newclient(void) {
 	c->view = WEBKIT_WEB_VIEW(webkit_web_view_new());
 	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-finished", G_CALLBACK(loadfinished), 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);
@@ -497,17 +468,8 @@ newclient(void) {
 	g_signal_connect(G_OBJECT(c->view), "new-window-policy-decision-requested", G_CALLBACK(decidewindow), c);
 	g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(initdownload), c);
 	g_signal_connect(G_OBJECT(c->view), "window-object-cleared", G_CALLBACK(windowobjectcleared), c);
-	g_signal_connect(G_OBJECT(c->view), "focus-in-event", G_CALLBACK(focusview), c);
 	g_signal_connect(G_OBJECT(c->view), "populate-popup", G_CALLBACK(context), c);
 
-	/* uribar */
-	c->uribar = gtk_entry_new();
-	gtk_entry_set_has_frame(GTK_ENTRY(c->uribar), FALSE);
-
-	/* searchbar */
-	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);
@@ -518,18 +480,12 @@ newclient(void) {
 	gtk_container_add(GTK_CONTAINER(c->scroll), GTK_WIDGET(c->view));
 	gtk_container_add(GTK_CONTAINER(c->win), c->vbox);
 	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->uribar);
 	gtk_container_add(GTK_CONTAINER(c->vbox), c->indicator);
 
 	/* Setup */
-	gtk_box_set_child_packing(GTK_BOX(c->vbox), c->uribar, 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->uribar);
 	gtk_widget_show(c->vbox);
 	gtk_widget_show(c->indicator);
 	gtk_widget_show(c->scroll);
@@ -543,6 +499,7 @@ newclient(void) {
 	uri = g_strconcat("file://", stylefile, NULL);
 	g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL);
 	g_free(uri);
+	setatom(c, findprop, "");
 
 	c->download = NULL;
 	c->title = NULL;
@@ -573,7 +530,7 @@ newwindow(Client *c, const Arg *arg) {
 		cmd[i++] = "-x";
 	}
 	cmd[i++] = "--";
-	uri = arg->v ? (char *)arg->v : autouri(c);
+	uri = arg->v ? (char *)arg->v : c->linkhover;
 	if(uri)
 		cmd[i++] = uri;
 	cmd[i++] = NULL;
@@ -597,23 +554,20 @@ GdkFilterReturn
 processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
 	Client *c = (Client *)d;
 	XPropertyEvent *ev;
-	Atom adummy;
-	gint idummy;
-	unsigned long ldummy;
-	unsigned char *buf = NULL;
 	Arg arg;
 
 	if(((XEvent *)e)->type == PropertyNotify) {
 		ev = &((XEvent *)e)->xproperty;
-		if(ev->atom == uriprop && ev->state == PropertyNewValue) {
-			if(ignore_once)
-			       ignore_once = FALSE;
-			else {
-				XGetWindowProperty(dpy, ev->window, uriprop, 0L, BUFSIZ, False, XA_STRING,
-					&adummy, &idummy, &ldummy, &ldummy, &buf);
-				arg.v = buf;
+		if(ignore_once)
+			ignore_once = FALSE;
+		else if(ev->state == PropertyNewValue) {
+			if(ev->atom == uriprop) {
+				arg.v = getatom(c, uriprop);
 				loaduri(c, &arg);
-				XFree(buf);
+			}
+			else if(ev->atom == findprop) {
+				arg.b = TRUE;
+				find(c, &arg);
 			}
 			return GDK_FILTER_REMOVE;
 		}
@@ -642,14 +596,21 @@ reload(Client *c, const Arg *arg) {
 }
 
 void
-reloadcookie(void) {
-	SoupSession *s;
+reloadcookies() {
+	SoupCookieJar *jar;
+	GSList *l, *e;
 
-	/* This forces the cookie to be written to hdd */
-	s = webkit_get_default_session();
-	soup_session_remove_feature(s, SOUP_SESSION_FEATURE(cookiejar));
-	soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
-} 
+	lockcookie = TRUE;
+	for(l = e = soup_cookie_jar_all_cookies(cookies); e; e = e->next)
+		soup_cookie_jar_delete_cookie(cookies, (SoupCookie *)e->data);
+	soup_cookies_free(l);
+	jar = soup_cookie_jar_text_new(cookiefile, TRUE);
+	for(l = e = soup_cookie_jar_all_cookies(jar); e; e = e->next)
+		soup_cookie_jar_add_cookie(cookies, (SoupCookie *)e->data);
+	g_slist_free(l);
+	lockcookie = FALSE;
+	g_object_unref(jar);
+}
 
 void
 scroll(Client *c, const Arg *arg) {
@@ -664,6 +625,19 @@ scroll(Client *c, const Arg *arg) {
 	gtk_adjustment_set_value(a, v);
 }
 
+void
+resize(GtkWidget *w, GtkAllocation *a, Client *c) {
+	double zoom;
+
+	if(c->zoomed)
+		return;
+	zoom = webkit_web_view_get_zoom_level(c->view);
+	if(a->width * a->height < 300 * 400 && zoom != 0.2)
+		webkit_web_view_set_zoom_level(c->view, 0.2);
+	else if(zoom != 1.0)
+		webkit_web_view_set_zoom_level(c->view, 1.0);
+}
+
 void
 sigchld(int unused) {
 	if(signal(SIGCHLD, sigchld) == SIG_ERR)
@@ -671,6 +645,15 @@ sigchld(int unused) {
 	while(0 < waitpid(-1, NULL, WNOHANG));
 }
 
+void
+setatom(Client *c, Atom a, const char *v) {
+	XSync(dpy, False);
+	ignore_once = TRUE;
+	XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), a,
+			XA_STRING, 8, PropModeReplace, (unsigned char *)v,
+			strlen(v) + 1);
+}
+
 void
 setup(void) {
 	SoupSession *s;
@@ -684,6 +667,7 @@ setup(void) {
 	dpy = GDK_DISPLAY();
 	session = webkit_get_default_session();
 	uriprop = XInternAtom(dpy, "_SURF_URI", False);
+	findprop = XInternAtom(dpy, "_SURF_FIND", False);
 
 	/* create dirs and files */
 	cookiefile = buildpath(cookiefile);
@@ -693,16 +677,10 @@ setup(void) {
 
 	/* cookie persistance */
 	s = webkit_get_default_session();
-	cookiejar = soup_cookie_jar_text_new(cookiefile, FALSE);
-	soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
-	g_signal_connect(cookiejar, "changed", G_CALLBACK(changecookie), NULL);
-}
-
-void
-showsearch(Client *c, const Arg *arg) {
-	hideuri(c, NULL);
-	gtk_widget_show(c->searchbar);
-	gtk_widget_grab_focus(c->searchbar);
+	cookies = soup_cookie_jar_new();
+	soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookies));
+	g_signal_connect(cookies, "changed", G_CALLBACK(changecookie), NULL);
+	reloadcookies();
 }
 
 void
@@ -716,23 +694,12 @@ source(Client *c, const Arg *arg) {
 }
 
 void
-searchtext(Client *c, const Arg *arg) {
-	const char *text;
-	gboolean forward = *(gboolean *)arg;
-	text = gtk_entry_get_text(GTK_ENTRY(c->searchbar));
-	webkit_web_view_search_text(c->view, text, FALSE, forward, TRUE);
-	webkit_web_view_mark_text_matches(c->view, text, FALSE, 0);
-}
-
-void
-showuri(Client *c, const Arg *arg) {
-	char *uri;
+find(Client *c, const Arg *arg) {
+	const char *s;
 
-	hidesearch(c, NULL);
-	uri = geturi(c);
-	gtk_entry_set_text(GTK_ENTRY(c->uribar), uri);
-	gtk_widget_show(c->uribar);
-	gtk_widget_grab_focus(c->uribar);
+	s = getatom(c, findprop);
+	gboolean forward = *(gboolean *)arg;
+	webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE);
 }
 
 void
@@ -751,7 +718,7 @@ spawn(Client *c, const Arg *arg) {
 			close(ConnectionNumber(dpy));
 		setsid();
 		execvp(((char **)arg->v)[0], (char **)arg->v);
-		fprintf(stderr, "tabbed: execvp %s", ((char **)arg->v)[0]);
+		fprintf(stderr, "surf: execvp %s", ((char **)arg->v)[0]);
 		perror(" failed");
 		exit(0);
 	}
@@ -763,13 +730,6 @@ titlechange(WebKitWebView *v, WebKitWebFrame *f, const char *t, Client *c) {
 	update(c);
 }
 
-gboolean
-focusview(GtkWidget *w, GdkEventFocus *e, Client *c) {
-	hidesearch(c, NULL);
-	hideuri(c, NULL);
-	return FALSE;
-}
-
 void
 usage(void) {
 	fputs("surf - simple browser\n", stderr);
@@ -813,12 +773,15 @@ windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, JSObje
 
 void
 zoom(Client *c, const Arg *arg) {
+	c->zoomed = TRUE;
 	if(arg->i < 0)		/* zoom out */
 		webkit_web_view_zoom_out(c->view);
 	else if(arg->i > 0)	/* zoom in */
 		webkit_web_view_zoom_in(c->view);
-	else			/* reset */
+	else {			/* reset */
+		c->zoomed = FALSE;
 		webkit_web_view_set_zoom_level(c->view, 1.0);
+	}
 }
 
 int main(int argc, char *argv[]) {