change config

Makefile

@@ -77,6 +77,8 @@ install: all
 	chmod 755 $(DESTDIR)$(PREFIX)/bin/surf-add
 	cp -f surf-del  $(DESTDIR)$(PREFIX)/bin/
 	chmod 755 $(DESTDIR)$(PREFIX)/bin/surf-del
+	cp -f surf-search $(DESTDIR)$(PREFIX)/bin/
+	chmod 755 $(DESTDIR)$(PREFIX)/bin/surf-search
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/surf
 	rm -f $(DESTDIR)$(MANPREFIX)/man1/surf.1

config.h

@@ -124,16 +124,15 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
 
 #define BOOKMASK(r, s, p) { \
         .v = (const char *[]){ "/bin/sh", "-c", \
-             "prop=\"$(printf '%b' \"$(xprop -id $1 $2 " \
-             "| sed \"s/^$2(STRING) = //;s/^\\\"\\(.*\\)\\\"$/\\1/\")\" " \
-             "| surf-bookmark)\" && xprop -id $1 -f $3 8s -set $3 \"$prop\"", \
+             "xprop -id $1 -f $3 8s -set $3 \"$(surf-bookmark $1)\"", \
              "surf-setprop", winid, r, s, p, NULL \
         } \
 }
 /* VIDEOPLAY(URI) */
-#define DEL() {\
+#define DEL(r) {\
         .v = (const char *[]){ "/bin/sh", "-c", \
-             "surf-del", NULL \
+             "surf-del $1",  \
+             "surf-setprop", winid, r, NULL, NULL, NULL \
         } \
 }
 
@@ -156,6 +155,13 @@ static SiteSpecific certs[] = {
 	{ "://suckless\\.org/", "suckless.org.crt" },
 };
 
+#define URL(r, s, p) { \
+        .v = (const char *[]){ "/bin/sh", "-c", \
+             "xprop -id $1 -f $3 8s -set $3 \"$(surf-search $1)\"", \
+             "surf-setprop", winid, r, s, p, NULL \
+        } \
+}
+
 #define MODKEY GDK_CONTROL_MASK
 
 /* hotkeys */
@@ -165,12 +171,12 @@ static SiteSpecific certs[] = {
  */
 static Key keys[] = {
 	/* modifier              keyval          function    arg */
-	{ MODKEY,                GDK_KEY_g,      spawn,      SETPROP("_SURF_URI", "_SURF_GO", PROMPT_GO) },
+	{ MODKEY,                GDK_KEY_g,      spawn,      URL("_SURF_URI", "_SURF_GO", PROMPT_GO) },
 	{ MODKEY,                GDK_KEY_f,      spawn,      SETPROP("_SURF_FIND", "_SURF_FIND", PROMPT_FIND) },
 	{ MODKEY,                GDK_KEY_slash,  spawn,      SETPROP("_SURF_FIND", "_SURF_FIND", PROMPT_FIND) },
 	{ MODKEY,                GDK_KEY_q,      spawn,      BOOKMASK("_SURF_URI", "_SURF_GO", PROMPT_GO) },
 	{ 0,                GDK_KEY_F2,      spawn,      BM_ADD("_SURF_URI") },
-	{ 0,                GDK_KEY_F3,      spawn,      DEL() },
+	{ 0,                GDK_KEY_F3,      spawn,      DEL("_SURF_URI") },
 
 	{ 0,                     GDK_KEY_Escape, stop,       { 0 } },
 	{ MODKEY,                GDK_KEY_c,      stop,       { 0 } },

surf-bookmark

@@ -1,5 +1,5 @@
 #!/bin/bash
-buku -p -f 3 |sed 's|waiting for input||g;s|\t| |g'|sed '/^$/d'| dmenu -p 'Bookmarks:' > /tmp/k
+buku -p -f 3 |sed 's|waiting for input||g;s|\t| |g'|sed '/^$/d'| dmenu -w $1 -p 'Bookmarks:' > /tmp/k
 if [ -s /tmp/k ]
 then
 W=$(cat /tmp/k |  awk '{print $1}')

surf-del

@@ -1,5 +1,5 @@
 #!/bin/bash
-buku -p -f 3 |sed 's|waiting for input||g;s|\t| |g'|sed '/^$/d'|  dmenu -p 'Delete Bookmarks:' > /tmp/k
+buku -p -f 3 |sed 's|waiting for input||g;s|\t| |g'|sed '/^$/d'|dmenu -w $1 -p 'Delete Bookmarks:' > /tmp/k
 if [ -s /tmp/k ]
 then
 W=$(cat /tmp/k |  awk '{print $1}')

surf-search

@@ -0,0 +1,26 @@
+#!/bin/bash
+U=$(dmenu -w $1 -p "Go:" -n)
+F=$(echo "$U" | tr '[:upper:]' '[:lower:]')
+if [ -z $U ]
+then
+exit
+elif echo $F | grep 'https://' > /dev/zero || echo $F | grep 'http://' > /dev/zero || echo $F | grep 'file://' > /dev/zero
+then
+echo $F
+elif echo $F | grep -E '\b(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}\b'  > /dev/zero
+then
+
+echo $F |sed -E 's/(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}//g'|sed 's/://' > /tmp/f
+
+D=$(cat /tmp/f)
+
+if [[ $D  =~ ^[0-9]+$ ]] || [ -z $D ] ;then echo $F ; fi
+elif [ -e $U ]
+then
+echo "file://$U"
+elif echo $F | grep '\.' > /dev/zero && echo $F | grep '[a-z]' > /dev/zero
+then 
+echo $F
+else
+echo 'https://duckduckgo.com/?q='$U
+fi