X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=config.def.h;h=6d62c98ad1fb54ae768835925079f4d7c6d1a76e;hp=c7b0cca3898bd421c879bd037f2ff132ccb8ec14;hb=432f3c6b53cf47db3141a3e9b8b5aec2152f9aae;hpb=82abf5154f0ab94716223f556638f073f01dbc11 diff --git a/config.def.h b/config.def.h index c7b0cca..6d62c98 100644 --- a/config.def.h +++ b/config.def.h @@ -1,7 +1,6 @@ /* modifier 0 means no modifier */ -static char *useragent = "Mozilla/5.0 (X11; U; Unix; en-US) " - "AppleWebKit/537.15 (KHTML, like Gecko) " - "Chrome/24.0.1295.0 Safari/537.15 Surf/"VERSION; +static int surfuseragent = 1; /* Append Surf version to default WebKit user agent */ +static char *fulluseragent = ""; /* Or override the whole user agent string */ static char *scriptfile = "~/.surf/script.js"; static char *styledir = "~/.surf/styles/"; static char *cachedir = "~/.surf/cache/"; @@ -37,7 +36,7 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE | WEBKIT_FIND_OPTIONS_WRAP_AROUND; #define SETPROP(p, q) { \ - .v = (char *[]){ "/bin/sh", "-c", \ + .v = (const char *[]){ "/bin/sh", "-c", \ "prop=\"`xprop -id $2 $0 " \ "| sed \"s/^$0(STRING) = \\(\\\\\"\\?\\)\\(.*\\)\\1$/\\2/\" " \ "| xargs -0 printf %b | dmenu`\" &&" \ @@ -48,7 +47,7 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE | /* DOWNLOAD(URI, referer) */ #define DOWNLOAD(d, r) { \ - .v = (char *[]){ "/bin/sh", "-c", \ + .v = (const char *[]){ "/bin/sh", "-c", \ "st -e /bin/sh -c \"curl -L -J -O --user-agent '$1'" \ " --referer '$2' -b $3 -c $3 '$0';" \ " sleep 5;\"", \ @@ -61,7 +60,7 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE | * "http://" or "https://" should be opened. */ #define PLUMB(u) {\ - .v = (char *[]){ "/bin/sh", "-c", \ + .v = (const char *[]){ "/bin/sh", "-c", \ "xdg-open \"$0\"", u, NULL \ } \ } @@ -85,18 +84,15 @@ static SiteStyle styles[] = { */ static Key keys[] = { /* modifier keyval function arg */ - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_r, reload, { .b = TRUE } }, - { MODKEY, GDK_KEY_r, reload, { .b = FALSE } }, - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_p, print, { 0 } }, + { MODKEY, GDK_KEY_g, spawn, SETPROP("_SURF_URI", "_SURF_GO") }, + { MODKEY, GDK_KEY_f, spawn, SETPROP("_SURF_FIND", "_SURF_FIND") }, + { MODKEY, GDK_KEY_slash, spawn, SETPROP("_SURF_FIND", "_SURF_FIND") }, - { MODKEY, GDK_KEY_p, clipboard, { .b = TRUE } }, - { MODKEY, GDK_KEY_y, clipboard, { .b = FALSE } }, + { 0, GDK_KEY_Escape, stop, { 0 } }, + { MODKEY, GDK_KEY_c, stop, { 0 } }, - { 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 } }, + { MODKEY|GDK_SHIFT_MASK, GDK_KEY_r, reload, { .b = TRUE } }, + { MODKEY, GDK_KEY_r, reload, { .b = FALSE } }, { MODKEY, GDK_KEY_l, navigate, { .i = +1 } }, { MODKEY, GDK_KEY_h, navigate, { .i = -1 } }, @@ -109,17 +105,25 @@ static Key keys[] = { { MODKEY, GDK_KEY_i, scroll_h, { .i = +10 } }, { MODKEY, GDK_KEY_u, scroll_h, { .i = -10 } }, - { 0, GDK_KEY_F11, togglefullscreen, { 0 } }, - { 0, GDK_KEY_Escape, stop, { 0 } }, - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_o, toggleinspector, { 0 } }, + { 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 } }, - { MODKEY, GDK_KEY_g, spawn, SETPROP("_SURF_URI", "_SURF_GO") }, - { MODKEY, GDK_KEY_f, spawn, SETPROP("_SURF_FIND", "_SURF_FIND") }, - { MODKEY, GDK_KEY_slash, spawn, SETPROP("_SURF_FIND", "_SURF_FIND") }, + { MODKEY, GDK_KEY_p, clipboard, { .b = TRUE } }, + { MODKEY, GDK_KEY_y, clipboard, { .b = FALSE } }, { 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_SHIFT_MASK, GDK_KEY_a, togglecookiepolicy, { 0 } }, + { 0, GDK_KEY_F11, togglefullscreen, { 0 } }, + { MODKEY|GDK_SHIFT_MASK, GDK_KEY_o, toggleinspector, { 0 } }, + { MODKEY|GDK_SHIFT_MASK, GDK_KEY_m, togglestyle, { 0 } }, + { MODKEY|GDK_SHIFT_MASK, GDK_KEY_c, toggle, { .i = CaretBrowsing } }, { MODKEY|GDK_SHIFT_MASK, GDK_KEY_f, toggle, { .i = FrameFlattening } }, { MODKEY|GDK_SHIFT_MASK, GDK_KEY_g, toggle, { .i = Geolocation } }, @@ -127,18 +131,15 @@ static Key keys[] = { { MODKEY|GDK_SHIFT_MASK, GDK_KEY_i, toggle, { .i = LoadImages } }, { MODKEY|GDK_SHIFT_MASK, GDK_KEY_v, toggle, { .i = Plugins } }, { MODKEY|GDK_SHIFT_MASK, GDK_KEY_b, toggle, { .i = ScrollBars } }, - - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_a, togglecookiepolicy, { 0 } }, - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_m, togglestyle, { 0 } }, }; /* button definitions */ /* target can be OnDoc, OnLink, OnImg, OnMedia, OnEdit, OnBar, OnSel, OnAny */ static Button buttons[] = { /* target event mask button function argument stop event */ - { OnLink, 0, 2, linkopenembed, { 0 }, 1 }, - { OnLink, MODKEY, 2, linkopen, { 0 }, 1 }, - { OnLink, MODKEY, 1, linkopen, { 0 }, 1 }, - { OnAny, 0, 8, navigate, { .i = -1 }, 1 }, - { OnAny, 0, 9, navigate, { .i = +1 }, 1 }, + { OnLink, 0, 2, clicknewwindow, { .b = 0 }, 1 }, + { OnLink, MODKEY, 2, clicknewwindow, { .b = 1 }, 1 }, + { OnLink, MODKEY, 1, clicknewwindow, { .b = 1 }, 1 }, + { OnAny, 0, 8, clicknavigate, { .i = -1 }, 1 }, + { OnAny, 0, 9, clicknavigate, { .i = +1 }, 1 }, };