X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=config.def.h;h=e1d4d869ca01324dd0d8a5c3e36a88d3b6e37464;hb=aadcd5b3f0afadfffecfa19f56512c33e136b7ab;hp=c51ae9895c5e207293b984cc4e8853e64b4f77e4;hpb=e9ee0940b7552f087dc3377f160f5c0800045a36;p=surf.git

diff --git a/config.def.h b/config.def.h
index c51ae98..e1d4d86 100644
--- a/config.def.h
+++ b/config.def.h
@@ -5,42 +5,40 @@ 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 NOBACKGROUND 0
+
+#define SETPROP(p, q)     { \
+	.v = (char *[]){ "sh", "-c", \
+	"prop=\"`xprop -id $2 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \
+	"xprop -id $2 -f $1 8s -set $1 \"$prop\"", \
+	p, q, winid, NULL } }
+#define DOWNLOAD(p)       { \
+	.v = (char *[]){ "/bin/sh", "-c", \
+	"prop=\"`xprop -id $1 $0 | cut -d '\"' -f 2 | tr -d '\\''`\";" \
+	"xterm -e \"wget --load-cookies '~/.surf/cookies.txt' '$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 },  Any },
-    { MODKEY,               GDK_r,      reload,     { .b = FALSE }, Any },
-    { MODKEY,               GDK_g,      showuri,    { 0 },          Any },
-    { MODKEY,               GDK_slash,  showsearch, { 0 },          Any },
-    { 0,                    GDK_Escape, hidesearch, { 0 },          Any },
-    { 0,                    GDK_Escape, hideuri,    { 0 },          Any },
-    { MODKEY|GDK_SHIFT_MASK,GDK_p,      print,      { 0 },          Any },
-    { MODKEY,               GDK_p,      clipboard,  { .b = TRUE },  Browser },
-    { MODKEY,               GDK_y,      clipboard,  { .b = FALSE }, Browser },
-    { MODKEY|GDK_SHIFT_MASK,GDK_j,      zoom,       { .i = -1 },    Browser },
-    { MODKEY|GDK_SHIFT_MASK,GDK_k,      zoom,       { .i = +1 },    Browser },
-    { MODKEY|GDK_SHIFT_MASK,GDK_i,      zoom,       { .i = 0  },    Browser },
-    { MODKEY,               GDK_l,      navigate,   { .i = +1 },    Browser },
-    { MODKEY,               GDK_h,      navigate,   { .i = -1 },    Browser },
-    { MODKEY,               GDK_j,      scroll,     { .i = +1 },    Browser },
-    { MODKEY,               GDK_k,      scroll,     { .i = -1 },    Browser },
-    { 0,                    GDK_Escape, stop,       { 0 },          Browser },
-    { MODKEY,               GDK_o,      source,     { 0 },          Browser },
-    { 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 },  UriBar },
-    { 0,                    GDK_Return, hideuri,    { 0 },          UriBar },
-};
-
-static Item items[] = {
-    { "New Window",     newwindow, { .v = NULL } },
-    { "Reload",         reload,    { .b = FALSE } },
-    { "Stop",           stop,      { 0 } },
-    { "<===",           navigate,  { .i = -1 } },
-    { "===>",           navigate,  { .i = +1 } },
+    { MODKEY,               GDK_s,      spawn,      DOWNLOAD("_SURF_HILIGHT") },
+    { MODKEY|GDK_SHIFT_MASK,GDK_r,      reload,     { .b = TRUE } },
+    { MODKEY,               GDK_r,      reload,     { .b = FALSE } },
+    { MODKEY|GDK_SHIFT_MASK,GDK_p,      print,      { 0 } },
+    { MODKEY,               GDK_p,      clipboard,  { .b = TRUE } },
+    { MODKEY,               GDK_y,      clipboard,  { .b = FALSE } },
+    { MODKEY|GDK_SHIFT_MASK,GDK_j,      zoom,       { .i = -1 } },
+    { MODKEY|GDK_SHIFT_MASK,GDK_k,      zoom,       { .i = +1 } },
+    { MODKEY|GDK_SHIFT_MASK,GDK_i,      zoom,       { .i = 0  } },
+    { MODKEY,               GDK_l,      navigate,   { .i = +1 } },
+    { MODKEY,               GDK_h,      navigate,   { .i = -1 } },
+    { MODKEY,               GDK_j,      scroll,     { .i = +1 } },
+    { MODKEY,               GDK_k,      scroll,     { .i = -1 } },
+    { 0,                    GDK_Escape, stop,       { 0 } },
+    { MODKEY,               GDK_o,      source,     { 0 } },
+    { MODKEY,               GDK_g,      spawn,      SETPROP("_SURF_URI", "_SURF_GO") },
+    { MODKEY,               GDK_slash,  spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
+    { MODKEY,               GDK_n,      find,       { .b = TRUE } },
+    { MODKEY|GDK_SHIFT_MASK,GDK_n,      find,       { .b = FALSE } },
 };