X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=94c6d231435eefa51342a916a8b4d845485cc003;hb=2fd67f61e7e7b54073818268cb3f28a51a472898;hp=c1bb1b2a38c0d2ebc760049abd93e668515f7325;hpb=8f8abc6146fce495427fdc0ecf97c80ed99bdf44;p=surf.git

diff --git a/surf.c b/surf.c
index c1bb1b2..94c6d23 100644
--- a/surf.c
+++ b/surf.c
@@ -67,6 +67,7 @@ Cookie *cookies = NULL;
 gboolean embed = FALSE;
 gboolean showxid = FALSE;
 gboolean ignore_once = FALSE;
+gchar *workdir;
 extern char *optarg;
 extern gint optind;
 
@@ -111,6 +112,7 @@ 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 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);
@@ -196,7 +198,7 @@ drawindicator(Client *c) {
 			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);*/
+	g_object_unref(gc);
 }
 
 gboolean
@@ -218,14 +220,13 @@ download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
 
 gboolean
 initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
-	const gchar *home, *filename;
+	const gchar *filename;
 	gchar *uri, *path, *html;
 
 	stop(c, NULL);
 	c->download = o;
-	home = g_get_home_dir();
 	filename = webkit_download_get_suggested_filename(o);
-	path = g_build_filename(home, ".surf", "dl", 
+	path = g_build_filename(workdir, "dl", 
 			filename, NULL);
 	uri = g_strconcat("file://", path, NULL);
 	webkit_download_set_destination_uri(c->download, uri);
@@ -372,6 +373,9 @@ navigate(Client *c, const Arg *arg) {
 Client *
 newclient(void) {
 	Client *c;
+	WebKitWebSettings *settings;
+	gchar *filename;
+
 	if(!(c = calloc(1, sizeof(Client))))
 		die("Cannot malloc!\n");
 	/* Window */
@@ -408,10 +412,12 @@ newclient(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();
@@ -445,6 +451,12 @@ newclient(void) {
 	gdk_window_set_events(GTK_WIDGET(c->win)->window, GDK_ALL_EVENTS_MASK);
 	gdk_window_add_filter(GTK_WIDGET(c->win)->window, processx, c);
 	webkit_web_view_set_full_content_zoom(c->view, TRUE);
+	settings = webkit_web_view_get_settings(c->view);
+	g_object_set (G_OBJECT(settings), "user-agent", "surf", NULL);
+	filename = g_build_filename(workdir, "style.css", NULL);
+	filename = g_strdup_printf("file://%s", filename);
+	g_object_set (G_OBJECT(settings), "user-stylesheet-uri", filename, NULL);
+
 	c->download = NULL;
 	c->title = NULL;
 	c->next = clients;
@@ -542,10 +554,9 @@ reload(Client *c, const Arg *arg) {
 
 void
 rereadcookies(void) {
-	const gchar *filename, *home;
+	const gchar *filename;
 
-	home = g_get_home_dir();
-	filename = g_build_filename(home, ".surf", "cookies", NULL);
+	filename = g_build_filename(workdir, "cookies", NULL);
 }
 
 void
@@ -568,9 +579,13 @@ setcookie(char *name, char *val, char *dom, char *path, long exp) {
 
 void
 setup(void) {
+	const gchar *home;
 	dpy = GDK_DISPLAY();
 	session = webkit_get_default_session();
 	urlprop = XInternAtom(dpy, "_SURF_URL", False);
+
+	home = g_get_home_dir();
+	workdir = g_build_filename(home, ".surf", NULL);
 }
 
 void
@@ -626,6 +641,13 @@ titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, Client *c) {
 	update(c);
 }
 
+gboolean
+unfocusbar(GtkWidget *w, GdkEventFocus *e, Client *c) {
+	hidesearch(c, NULL);
+	hideurl(c, NULL);
+	return TRUE;
+}
+
 void
 usage(void) {
 	fputs("surf - simple browser\n", stderr);
@@ -660,7 +682,7 @@ int main(int argc, char *argv[]) {
 	SoupSession *s;
 	Client *c;
 	gint o;
-	const gchar *home, *filename;
+	const gchar *filename;
 	Arg arg;
 
 	gtk_init(NULL, NULL);
@@ -697,13 +719,12 @@ int main(int argc, char *argv[]) {
 		newclient();
 
 	/* make dirs */
-	home = g_get_home_dir();
-	filename = g_build_filename(home, ".surf", "dl", NULL);
+	filename = g_build_filename(workdir, "dl", NULL);
 	g_mkdir_with_parents(filename, 0755);
 
 	/* cookie persistance */
 	s = webkit_get_default_session();
-	filename = g_build_filename(home, ".surf", "cookies.jar", NULL);
+	filename = g_build_filename(workdir, "cookies.jar", NULL);
 	cookiejar = soup_cookie_jar_text_new(filename, FALSE);
 	soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));