diff options
Diffstat (limited to 'config.h')
| -rw-r--r-- | config.h | 86 |
1 files changed, 51 insertions, 35 deletions
@@ -20,7 +20,7 @@ static Parameter defconfig[ParameterLast] = { [AccessWebcam] = { { .i = 0 }, }, [Certificate] = { { .i = 0 }, }, [CaretBrowsing] = { { .i = 0 }, }, - [CookiePolicies] = { { .v = "@Aa" }, }, + [CookiePolicies] = { { .v = "a@A" }, }, [DefaultCharset] = { { .v = "UTF-8" }, }, [DiskCache] = { { .i = 1 }, }, [DNSPrefetch] = { { .i = 0 }, }, @@ -31,11 +31,11 @@ static Parameter defconfig[ParameterLast] = { [HideBackground] = { { .i = 0 }, }, [Inspector] = { { .i = 0 }, }, [Java] = { { .i = 1 }, }, - [JavaScript] = { { .i = 1 }, }, + [JavaScript] = { { .i = 0 }, }, [KioskMode] = { { .i = 0 }, }, [LoadImages] = { { .i = 1 }, }, [MediaManualPlay] = { { .i = 1 }, }, - [Plugins] = { { .i = 1 }, }, + [Plugins] = { { .i = 0 }, }, [PreferredLanguages] = { { .v = (char *[]){ NULL } }, }, [RunInFullscreen] = { { .i = 0 }, }, [ScrollBars] = { { .i = 1 }, }, @@ -66,22 +66,36 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE | #define PROMPT_GO "Go:" #define PROMPT_FIND "Find:" -/* SETPROP(readprop, setprop, prompt)*/ +// surf new window #define SETPROP(r, s, p) { \ .v = (const char *[]){ "/bin/sh", "-c", \ "prop=\"$(printf '%b' \"$(xprop -id $1 $2 " \ "| sed \"s/^$2(STRING) = //;s/^\\\"\\(.*\\)\\\"$/\\1/\")\" " \ - "| dmenu -p \"$4\" -w $1)\" && xprop -id $1 -f $3 8s -set $3 \"$prop\"", \ + "| dmenu -p \"$4\")\" && xprop -id $1 -f $3 8s -set $3 \"$prop\"", \ "surf-setprop", winid, r, s, p, NULL \ } \ } +#define SETPROP_OLD(p, q) { \ + .v = (const char *[]){ "/bin/sh", "-c", \ + "/home/miguel/bin/surf $2 OLD", \ + p, q, winid, NULL \ + } \ +} + +// surf existing window +#define SETPROP_NEW(p, q) { \ + .v = (const char *[]){ "/bin/sh", "-c", \ + "/home/miguel/bin/surf $2 NEW", \ + p, q, winid, NULL \ + } \ +} -/* DOWNLOAD(URI, referer) */ -#define DOWNLOAD(u, r) { \ - .v = (const char *[]){ "st", "-e", "/bin/sh", "-c",\ - "curl -g -L -J -O -A \"$1\" -b \"$2\" -c \"$2\"" \ - " -e \"$3\" \"$4\"; read", \ - "surf-download", useragent, cookiefile, r, u, NULL \ +// download with curl +#define DOWNLOAD(d, r) { \ + .v = (const char *[]){ "/bin/sh", "-c", \ + "/usr/bin/xterm -e /bin/sh -c \"cd /home/miguel/temp; ls; /usr/bin/curl -g -L -J -O --user-agent '$1'" \ + " --referer '$2' -b $3 -c $3 '$0'; sleep 1;\"", \ + d, useragent, r, cookiefile, NULL \ } \ } @@ -130,41 +144,40 @@ 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_f, spawn, SETPROP("_SURF_FIND", "_SURF_FIND", PROMPT_FIND) }, - { MODKEY, GDK_KEY_slash, spawn, SETPROP("_SURF_FIND", "_SURF_FIND", PROMPT_FIND) }, + { 0, GDK_KEY_o, spawn, SETPROP_OLD("_SURF_URI", "_SURF_GO") }, + { GDK_SHIFT_MASK, GDK_KEY_o, spawn, SETPROP_NEW("_SURF_URI", "_SURF_GO") }, - { 0, GDK_KEY_Escape, stop, { 0 } }, - { MODKEY, GDK_KEY_c, stop, { 0 } }, + { 0, GDK_KEY_slash, spawn, SETPROP("_SURF_FIND", "_SURF_FIND", PROMPT_FIND) }, + { 0, GDK_KEY_n, find, { .i = +1 } }, + { GDK_SHIFT_MASK , GDK_KEY_n, find, { .i = -1 } }, - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_r, reload, { .i = 1 } }, - { MODKEY, GDK_KEY_r, reload, { .i = 0 } }, + { 0, GDK_KEY_s, stop, { 0 } }, + { GDK_SHIFT_MASK, GDK_KEY_r, reload, { .i = 1 } }, + { 0, GDK_KEY_r, reload, { .i = 0 } }, - { MODKEY, GDK_KEY_l, navigate, { .i = +1 } }, - { MODKEY, GDK_KEY_h, navigate, { .i = -1 } }, + { MODKEY, GDK_KEY_i, navigate, { .i = +1 } }, + { MODKEY, GDK_KEY_o, navigate, { .i = -1 } }, /* Currently we have to use scrolling steps that WebKit2GTK+ gives us * d: step down, u: step up, r: step right, l:step left * D: page down, U: page up */ - { MODKEY, GDK_KEY_j, scroll, { .i = 'd' } }, - { MODKEY, GDK_KEY_k, scroll, { .i = 'u' } }, - { MODKEY, GDK_KEY_b, scroll, { .i = 'U' } }, - { MODKEY, GDK_KEY_space, scroll, { .i = 'D' } }, - { MODKEY, GDK_KEY_i, scroll, { .i = 'r' } }, - { MODKEY, GDK_KEY_u, scroll, { .i = 'l' } }, + { 0, GDK_KEY_j, scroll, { .i = 'd' } }, + { 0, GDK_KEY_k, scroll, { .i = 'u' } }, + { MODKEY, GDK_KEY_u, scroll, { .i = 'U' } }, + { MODKEY, GDK_KEY_d, scroll, { .i = 'D' } }, + { 0, GDK_KEY_l, scroll, { .i = 'r' } }, + { 0, GDK_KEY_h, scroll, { .i = 'l' } }, + { 0, GDK_KEY_g, scroll, { .i = 'H' } }, + { GDK_SHIFT_MASK, GDK_KEY_g, scroll, { .i = 'E' } }, - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_j, zoom, { .i = -1 } }, - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_k, zoom, { .i = +1 } }, - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_q, zoom, { .i = 0 } }, - { MODKEY, GDK_KEY_minus, zoom, { .i = -1 } }, - { MODKEY, GDK_KEY_plus, zoom, { .i = +1 } }, + { 0, GDK_KEY_BackSpace, zoom, { .i = 0 } }, + { 0, GDK_KEY_minus, zoom, { .i = -1 } }, + { 0, GDK_KEY_equal, zoom, { .i = +1 } }, - { MODKEY, GDK_KEY_p, clipboard, { .i = 1 } }, - { MODKEY, GDK_KEY_y, clipboard, { .i = 0 } }, + { 0, GDK_KEY_p, clipboard, { .i = 1 } }, + { 0, GDK_KEY_y, clipboard, { .i = 0 } }, - { MODKEY, GDK_KEY_n, find, { .i = +1 } }, - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_n, find, { .i = -1 } }, { MODKEY|GDK_SHIFT_MASK, GDK_KEY_p, print, { 0 } }, { MODKEY, GDK_KEY_t, showcert, { 0 } }, @@ -195,6 +208,9 @@ static Key keys[] = { { 0, GDK_KEY_7, sendext, { .i = 7 } }, { 0, GDK_KEY_8, sendext, { .i = 8 } }, { 0, GDK_KEY_9, sendext, { .i = 9 } }, + //insert mode toggle + { 0, GDK_KEY_Escape, toggle, { .i = KioskMode } }, + { 0, GDK_KEY_i, toggle, { .i = KioskMode } }, }; |