Date: Monday, January 4, 2016 @ 22:15:22 Author: lfleischer Revision: 155490
upgpkg: surf 0.7-1 Upstream update. Modified: surf/trunk/PKGBUILD surf/trunk/config.h ----------+ PKGBUILD | 9 +-- config.h | 160 +++++++++++++++++++++++++++++++++++++++---------------------- 2 files changed, 107 insertions(+), 62 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-01-04 21:14:57 UTC (rev 155489) +++ PKGBUILD 2016-01-04 21:15:22 UTC (rev 155490) @@ -1,4 +1,3 @@ -# $Id$ # Maintainer: Lukas Fleischer <[email protected]> # Contributor: Pierre Chapuis <catwell at archlinux dot us> # Contributor: Ray Kohler <ataraxia937 at gmail dot com> @@ -6,8 +5,8 @@ # Contributor: Raphael Proust <raphlalou at gmail dot com> pkgname=surf -pkgver=0.6 -pkgrel=2 +pkgver=0.7 +pkgrel=1 pkgdesc='A simple web browser based on WebKit/GTK+.' arch=('i686' 'x86_64') url='http://surf.suckless.org/' @@ -21,8 +20,8 @@ install='surf.install' source=("http://dl.suckless.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"; 'config.h') -md5sums=('aeeed723b562a30cc6a2b3ea18f6d99a' - '1447600ca79c56577af3438d5f3d3d56') +md5sums=('45899435aeb5ce3af0a62909911b735f' + '8ea16205648f9045e101d70d6eb84390') build() { cd "${srcdir}/${pkgname}-${pkgver}" Modified: config.h =================================================================== --- config.h 2016-01-04 21:14:57 UTC (rev 155489) +++ config.h 2016-01-04 21:15:22 UTC (rev 155490) @@ -1,34 +1,47 @@ /* 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 char *progress = "#0000FF"; -static char *progress_untrust = "#FF0000"; -static char *progress_trust = "#00FF00"; -static char *progress_proxy = "#FFFF00"; -static char *progress_proxy_trust = "#66FF00"; -static char *progress_proxy_untrust = "#FF6600"; -static char *stylefile = "~/.surf/style.css"; + "AppleWebKit/537.15 (KHTML, like Gecko) " + "Chrome/24.0.1295.0 Safari/537.15 Surf/"VERSION; static char *scriptfile = "~/.surf/script.js"; +static char *styledir = "~/.surf/styles/"; +static char *cachefolder = "~/.surf/cache/"; + +static Bool kioskmode = FALSE; /* Ignore shortcuts */ +static Bool showindicators = TRUE; /* Show indicators in window title */ +static Bool zoomto96dpi = TRUE; /* Zoom pages to always emulate 96dpi */ +static Bool runinfullscreen = FALSE; /* Run in fullscreen mode by default */ + +static guint defaultfontsize = 12; /* Default font size */ +static gfloat zoomlevel = 1.0; /* Default zoom level */ + +/* Soup default features */ static char *cookiefile = "~/.surf/cookies.txt"; +static char *cookiepolicies = "Aa@"; /* A: accept all; a: accept nothing, + * @: accept all except third party */ +static char *cafile = "/etc/ssl/certs/ca-certificates.crt"; +static Bool strictssl = FALSE; /* Refuse untrusted SSL connections */ static time_t sessiontime = 3600; -static char *cafile = "/etc/ssl/certs/ca-certificates.crt"; -static char *strictssl = FALSE; /* Refuse untrusted SSL connections */ -static int indicator_thickness = 2; /* Webkit default features */ +static Bool enablescrollbars = TRUE; static Bool enablespatialbrowsing = TRUE; -static Bool enableplugins = TRUE; -static Bool enablescripts = TRUE; -static Bool enableinspector = TRUE; -static Bool loadimages = TRUE; -static Bool hidebackground = FALSE; +static Bool enablediskcache = TRUE; +static int diskcachebytes = 5 * 1024 * 1024; +static Bool enableplugins = TRUE; +static Bool enablescripts = TRUE; +static Bool enableinspector = TRUE; +static Bool enablestyle = TRUE; +static Bool loadimages = TRUE; +static Bool hidebackground = FALSE; +static Bool allowgeolocation = TRUE; #define SETPROP(p, q) { \ .v = (char *[]){ "/bin/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 \ + "prop=\"`xprop -id $2 $0 " \ + "| sed \"s/^$0(STRING) = \\(\\\\\"\\?\\)\\(.*\\)\\1$/\\2/\" " \ + "| xargs -0 printf %b | dmenu`\" &&" \ + "xprop -id $2 -f $1 8s -set $1 \"$prop\"", \ + p, q, winid, NULL \ } \ } @@ -35,14 +48,33 @@ /* DOWNLOAD(URI, referer) */ #define DOWNLOAD(d, r) { \ .v = (char *[]){ "/bin/sh", "-c", \ - "xterm -e /bin/sh -c \"curl -J -O --user-agent '$1'" \ - " --referer '$2'" \ - " -b ~/.surf/cookies.txt -c ~/.surf/cookies.txt '$0';" \ - " sleep 5;\"", \ - d, useragent, r, NULL \ + "st -e /bin/sh -c \"curl -L -J -O --user-agent '$1'" \ + " --referer '$2' -b $3 -c $3 '$0';" \ + " sleep 5;\"", \ + d, useragent, r, cookiefile, NULL \ } \ } +/* PLUMB(URI) */ +/* This called when some URI which does not begin with "about:", + * "http://"; or "https://"; should be opened. + */ +#define PLUMB(u) {\ + .v = (char *[]){ "/bin/sh", "-c", \ + "xdg-open \"$0\"", u, NULL \ + } \ +} + +/* styles */ +/* + * The iteration will stop at the first match, beginning at the beginning of + * the list. + */ +static SiteStyle styles[] = { + /* regexp file in $styledir */ + { ".*", "default.css" }, +}; + #define MODKEY GDK_CONTROL_MASK /* hotkeys */ @@ -51,45 +83,59 @@ * edit the CLEANMASK() macro. */ static Key keys[] = { - /* modifier keyval function arg Focus */ - { MODKEY|GDK_SHIFT_MASK,GDK_r, reload, { .b = TRUE } }, - { MODKEY, GDK_r, reload, { .b = FALSE } }, - { MODKEY|GDK_SHIFT_MASK,GDK_p, print, { 0 } }, + /* modifier keyval function arg Focus */ + { 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_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_q, zoom, { .i = 0 } }, - { MODKEY, GDK_minus, zoom, { .i = -1 } }, - { MODKEY, GDK_plus, zoom, { .i = +1 } }, + { MODKEY|GDK_SHIFT_MASK,GDK_j, zoom, { .i = -1 } }, + { MODKEY|GDK_SHIFT_MASK,GDK_k, zoom, { .i = +1 } }, + { MODKEY|GDK_SHIFT_MASK,GDK_q, zoom, { .i = 0 } }, + { MODKEY, GDK_minus, zoom, { .i = -1 } }, + { MODKEY, GDK_plus, zoom, { .i = +1 } }, - { MODKEY, GDK_l, navigate, { .i = +1 } }, - { MODKEY, GDK_h, navigate, { .i = -1 } }, + { MODKEY, GDK_l, navigate, { .i = +1 } }, + { MODKEY, GDK_h, navigate, { .i = -1 } }, - { MODKEY, GDK_j, scroll_v, { .i = +1 } }, - { MODKEY, GDK_k, scroll_v, { .i = -1 } }, - { MODKEY, GDK_b, scroll_v, { .i = -10000 } }, - { MODKEY, GDK_space, scroll_v, { .i = +10000 } }, - { MODKEY, GDK_i, scroll_h, { .i = +1 } }, - { MODKEY, GDK_u, scroll_h, { .i = -1 } }, + { MODKEY, GDK_j, scroll_v, { .i = +1 } }, + { MODKEY, GDK_k, scroll_v, { .i = -1 } }, + { MODKEY, GDK_b, scroll_v, { .i = -10000 } }, + { MODKEY, GDK_space, scroll_v, { .i = +10000 } }, + { MODKEY, GDK_i, scroll_h, { .i = +1 } }, + { MODKEY, GDK_u, scroll_h, { .i = -1 } }, - { 0, GDK_F11, fullscreen, { 0 } }, - { 0, GDK_Escape, stop, { 0 } }, - { MODKEY, GDK_o, source, { 0 } }, - { MODKEY|GDK_SHIFT_MASK,GDK_o, inspector, { 0 } }, + { 0, GDK_F11, fullscreen, { 0 } }, + { 0, GDK_Escape, stop, { 0 } }, + { MODKEY, GDK_o, source, { 0 } }, + { MODKEY|GDK_SHIFT_MASK,GDK_o, inspector, { 0 } }, - { MODKEY, GDK_g, spawn, SETPROP("_SURF_URI", "_SURF_GO") }, - { MODKEY, GDK_f, spawn, SETPROP("_SURF_FIND", "_SURF_FIND") }, - { MODKEY, GDK_slash, spawn, SETPROP("_SURF_FIND", "_SURF_FIND") }, + { MODKEY, GDK_g, spawn, SETPROP("_SURF_URI", "_SURF_GO") }, + { MODKEY, GDK_f, spawn, SETPROP("_SURF_FIND", "_SURF_FIND") }, + { MODKEY, GDK_slash, spawn, SETPROP("_SURF_FIND", "_SURF_FIND") }, - { MODKEY, GDK_n, find, { .b = TRUE } }, - { MODKEY|GDK_SHIFT_MASK,GDK_n, find, { .b = FALSE } }, + { MODKEY, GDK_n, find, { .b = TRUE } }, + { MODKEY|GDK_SHIFT_MASK,GDK_n, find, { .b = FALSE } }, - { MODKEY|GDK_SHIFT_MASK,GDK_c, toggle, { .v = "enable-caret-browsing" } }, - { MODKEY|GDK_SHIFT_MASK,GDK_i, toggle, { .v = "auto-load-images" } }, - { MODKEY|GDK_SHIFT_MASK,GDK_s, toggle, { .v = "enable-scripts" } }, - { MODKEY|GDK_SHIFT_MASK,GDK_v, toggle, { .v = "enable-plugins" } }, + { MODKEY|GDK_SHIFT_MASK,GDK_c, toggle, { .v = "enable-caret-browsing" } }, + { MODKEY|GDK_SHIFT_MASK,GDK_i, toggle, { .v = "auto-load-images" } }, + { MODKEY|GDK_SHIFT_MASK,GDK_s, toggle, { .v = "enable-scripts" } }, + { MODKEY|GDK_SHIFT_MASK,GDK_v, toggle, { .v = "enable-plugins" } }, + { MODKEY|GDK_SHIFT_MASK,GDK_a, togglecookiepolicy, { 0 } }, + { MODKEY|GDK_SHIFT_MASK,GDK_m, togglestyle, { 0 } }, + { MODKEY|GDK_SHIFT_MASK,GDK_b, togglescrollbars, { 0 } }, + { MODKEY|GDK_SHIFT_MASK,GDK_g, togglegeolocation, { 0 } }, }; +/* button definitions */ +/* click can be ClkDoc, ClkLink, ClkImg, ClkMedia, ClkSel, ClkEdit, ClkAny */ +static Button buttons[] = { + /* click event mask button function argument */ + { ClkLink, 0, 2, linkopenembed, { 0 } }, + { ClkLink, MODKEY, 2, linkopen, { 0 } }, + { ClkLink, MODKEY, 1, linkopen, { 0 } }, + { ClkAny, 0, 8, navigate, { .i = -1 } }, + { ClkAny, 0, 9, navigate, { .i = +1 } }, +};
