changing SETPROP()-macro

.hgtags

@@ -1,3 +1,6 @@
 d8628fc93353faa411c9fc7eef82d11a84d26ae2 0.1
 d8628fc93353faa411c9fc7eef82d11a84d26ae2 0.1
 9c8ebcf54061112b5979742b403de26fc94007ff 0.1
+3ef997607115303fe93873b592d152f0ec186f77 0.1.1
+bffb0c3c23410ac7f260d167f4b9771497fc1127 0.1.2
+a5db79d487c85615be2ecf30815c6b4977e88000 0.2

Makefile

@@ -35,7 +35,7 @@ clean:
 dist: clean
 	@echo creating dist tarball
 	@mkdir -p surf-${VERSION}
-	@cp -R LICENSE Makefile config.mk \
+	@cp -R LICENSE Makefile config.mk config.def.h README \
 		surf.1 ${SRC} surf-${VERSION}
 	@tar -cf surf-${VERSION}.tar surf-${VERSION}
 	@gzip surf-${VERSION}.tar

README

@@ -0,0 +1,25 @@
+surf - simple webkit-based browser
+==================================
+surf is a simple Web browser based on WebKit/GTK+.
+
+
+Requirements
+------------
+In order to build surf you need GTK+ and Webkit/GTK+ header files.
+
+
+Installation
+------------
+Edit config.mk to match your local setup (surf is installed into
+the /usr/local namespace by default).
+
+Afterwards enter the following command to build and install surf (if
+necessary as root):
+
+    make clean install
+
+
+Running surf
+------------
+run
+	surf [URL]

config.def.h

@@ -1,32 +1,47 @@
 /* modifier 0 means no modifier */
-static gchar *progress       = "#FF0000";
+static char *useragent      = "Mozilla/5.0 (X11; U; Linux; en-us) AppleWebKit/531.2+ (KHTML, like Gecko, surf-"VERSION") Safari/531.2+";
-static gchar *progress_trust = "#00FF00";
+static char *progress       = "#FF0000";
+static char *progress_trust = "#00FF00";
+static char *stylefile      = ".surf/style.css";
+static char *scriptfile     = ".surf/script.js";
+static char *cookiefile     = ".surf/cookies.txt";
+static char *dldir          = ".surf/dl";
+static time_t sessiontime   = 3600;
+
+#define SETPROP(p)       { .v = (char *[]){ "/bin/sh", "-c", \
+	"prop=\"`dmenu < /dev/null`\" &&" \
+		"xprop -id $1 -f $0 8s -set $0 \"$prop\"", \
+	p, winid, NULL } }
 #define MODKEY GDK_CONTROL_MASK
 static Key keys[] = {
     /* modifier	            keyval      function    arg             Focus */
-    { MODKEY|GDK_SHIFT_MASK,GDK_r,      reload,     { .b = TRUE },  ALWAYS },
+    { MODKEY|GDK_SHIFT_MASK,GDK_r,      reload,     { .b = TRUE } },
-    { MODKEY,               GDK_r,      reload,     { .b = FALSE }, ALWAYS },
+    { MODKEY,               GDK_r,      reload,     { .b = FALSE } },
-    { MODKEY,               GDK_g,      showurl,    { 0 },          ALWAYS },
+    { MODKEY|GDK_SHIFT_MASK,GDK_p,      print,      { 0 } },
-    { MODKEY,               GDK_slash,  showsearch, { 0 },          ALWAYS },
+    { MODKEY,               GDK_p,      clipboard,  { .b = TRUE } },
-    { 0,                    GDK_Escape, hidesearch, { 0 },          ALWAYS },
+    { MODKEY,               GDK_y,      clipboard,  { .b = FALSE } },
-    { 0,                    GDK_Escape, hideurl,    { 0 },          ALWAYS },
+    { MODKEY|GDK_SHIFT_MASK,GDK_j,      zoom,       { .i = -1 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_p,      print,      { 0 },          ALWAYS },
+    { MODKEY|GDK_SHIFT_MASK,GDK_k,      zoom,       { .i = +1 } },
-    { MODKEY,               GDK_p,      clipboard,  { .b = TRUE },  BROWSER },
+    { MODKEY|GDK_SHIFT_MASK,GDK_i,      zoom,       { .i = 0  } },
-    { MODKEY,               GDK_y,      clipboard,  { .b = FALSE }, BROWSER },
+    { MODKEY,               GDK_l,      navigate,   { .i = +1 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_j,      zoom,       { .i = -1 },    BROWSER },
+    { MODKEY,               GDK_h,      navigate,   { .i = -1 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_k,      zoom,       { .i = +1 },    BROWSER },
+    { MODKEY,               GDK_j,      scroll,     { .i = +1 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_i,      zoom,       { .i = 0  },    BROWSER },
+    { MODKEY,               GDK_k,      scroll,     { .i = -1 } },
-    { MODKEY,               GDK_l,      navigate,   { .i = +1 },    BROWSER },
+    { 0,                    GDK_Escape, stop,       { 0 } },
-    { MODKEY,               GDK_h,      navigate,   { .i = -1 },    BROWSER },
+    { MODKEY,               GDK_o,      source,     { 0 } },
-    { MODKEY,               GDK_j,      scroll,     { .i = +1 },    BROWSER },
+    { MODKEY,               GDK_g,      spawn,      SETPROP("_SURF_URI") },
-    { MODKEY,               GDK_k,      scroll,     { .i = -1 },    BROWSER },
+    { MODKEY,               GDK_slash,  spawn,      SETPROP("_SURF_FIND") },
-    { 0,                    GDK_Escape, stop,       { 0 },          BROWSER },
+    { MODKEY,               GDK_n,      find,       { .b = TRUE } },
-    { MODKEY,               GDK_o,      source,     { 0 },          BROWSER },
+    { MODKEY|GDK_SHIFT_MASK,GDK_n,      find,       { .b = FALSE } },
-    { MODKEY,               GDK_n,      searchtext, { .b = TRUE },  BROWSER|SEARCHBAR },
-    { MODKEY|GDK_SHIFT_MASK,GDK_n,      searchtext, { .b = FALSE }, BROWSER|SEARCHBAR },
-    { 0,                    GDK_Return, searchtext, { .b = TRUE },  SEARCHBAR },
-    { GDK_SHIFT_MASK,       GDK_Return, searchtext, { .b = FALSE }, SEARCHBAR },
-    { 0,                    GDK_Return, loaduri,    { .v = NULL },  URLBAR },
-    { 0,                    GDK_Return, hideurl,    { 0 },          URLBAR },
 };
 
+static Item items[] = {
+    { "Back",           navigate,  { .i = -1 } },
+    { "Forward",        navigate,  { .i = +1 } },
+    { "New Window",     newwindow, { .v = NULL } },
+    { "Reload",         reload,    { .b = FALSE } },
+    { "Stop",           stop,      { 0 } },
+    { "Paste URI",      clipboard, { .b = TRUE } },
+    { "Copy URI",       clipboard, { .b = FALSE } },
+    { "Download",       download,  { 0 } },
+};

config.mk

@@ -1,5 +1,5 @@
 # surf version
-VERSION = 0.1.1
+VERSION = 0.3
 
 # Customize below to fit your system
 
@@ -17,10 +17,8 @@ LIBS = -L/usr/lib -lc ${GTKLIB} -lgthread-2.0
 
 # flags
 CPPFLAGS = -DVERSION=\"${VERSION}\"
-#CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-CFLAGS = -std=c99 -pedantic -Wall -Werror -O0 ${INCS} ${CPPFLAGS}
+LDFLAGS = -s ${LIBS}
-#LDFLAGS = -s ${LIBS}
-LDFLAGS = ${LIBS}
 
 # Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"

surf.1

@@ -33,6 +33,21 @@ Walks back the history.
 .B Ctrl\-l
 Walks forward the history.
 .TP
+.B Ctrl\-k
+Scrolls page upwards.
+.TP
+.B Ctrl\-j
+Scrolls page downwards.
+.TP
+.B Ctrl\-Shift\-k
+Zooms page in.
+.TP
+.B Ctrl\-Shift\-j
+Zooms page out
+.TP
+.B Ctrl\-Shift\-i
+Resets Zoom
+.TP
 .B Ctrl\-/
 Opens the search-bar.
 .TP
@@ -42,6 +57,9 @@ Opens the URL-bar.
 .B Ctrl\-p
 Loads URI from primary selection.
 .TP
+.B Ctrl\-Shift\-p
+Calls Printpage Dialog.
+.TP
 .B Ctrl\-r
 Reloads the website.
 .TP
@@ -50,6 +68,9 @@ Reloads the website without using cache.
 .TP
 .B Ctrl\-y
 Copies current URI to primary selection.
+.TP
+.B Ctrl\-o
+show the sourcecode of the current page.
 .SH SEE ALSO
 .BR dmenu(1)
 .BR xprop(1)