added bookmarks
This commit is contained in:
WanderingPenwing
parent
f9d542e5ba
commit
9d1735bc80
246
config.def.h
246
config.def.h
|
|
@ -1,15 +1,22 @@
|
||||||
/* modifier 0 means no modifier */
|
/* modifier 0 means no modifier */
|
||||||
static int surfuseragent = 1; /* Append Surf version to default WebKit user agent */
|
static int surfuseragent = 1; /* Append Surf version to default WebKit user agent */
|
||||||
static char *fulluseragent = ""; /* Or override the whole user agent string */
|
static char *fulluseragent = ""; /* Or override the whole user agent string */
|
||||||
static char *scriptfile = "~/.surf/script.js";
|
static char *scriptfile = "~/.surf/script.js";
|
||||||
static char *styledir = "~/.surf/styles/";
|
static char *styledir = "~/.surf/styles/";
|
||||||
static char *certdir = "~/.surf/certificates/";
|
static char *certdir = "~/.surf/certificates/";
|
||||||
static char *cachedir = "/tmp/cache";
|
static char *cachedir = "/tmp/cache";
|
||||||
static char *cookiefile = "/tmp/cookies.txt";
|
static char *cookiefile = "/tmp/cookies.txt";
|
||||||
|
|
||||||
|
static int tab_bar_height = 27;
|
||||||
|
static int tab_spacer_height = 4;
|
||||||
|
static const char *tab_bar_color[] = {"#222222", "#318d56"};
|
||||||
|
static const char tabfont[] = "Mononoki Nerd Font:size=16";
|
||||||
|
static int min_tab_fraction_size = 4; // 1/4th of the screen
|
||||||
|
static int click_cooldown_ms = 200;
|
||||||
|
|
||||||
static SearchEngine searchengines[] = {
|
static SearchEngine searchengines[] = {
|
||||||
{ " ", "https://duckduckgo.com/?q=%s" },
|
{ " ", "https://web.penwing.org/search?q=%s" },
|
||||||
{ "yt ", "https://yewtu.be/search?q=%s" },
|
{ "-", "https://searx.ox2.fr/search?q=%s" },
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Webkit default features */
|
/* Webkit default features */
|
||||||
|
|
@ -19,40 +26,40 @@ static SearchEngine searchengines[] = {
|
||||||
* Command parameters are priority 2
|
* Command parameters are priority 2
|
||||||
*/
|
*/
|
||||||
static Parameter defconfig[ParameterLast] = {
|
static Parameter defconfig[ParameterLast] = {
|
||||||
/* parameter Arg value priority */
|
/* parameter Arg value priority */
|
||||||
[AccessMicrophone] = { { .i = 0 }, },
|
[AccessMicrophone] = { { .i = 0 }, },
|
||||||
[AccessWebcam] = { { .i = 0 }, },
|
[AccessWebcam] = { { .i = 0 }, },
|
||||||
[Certificate] = { { .i = 0 }, },
|
[Certificate] = { { .i = 0 }, },
|
||||||
[CaretBrowsing] = { { .i = 0 }, },
|
[CaretBrowsing] = { { .i = 0 }, },
|
||||||
[CookiePolicies] = { { .v = "@Aa" }, },
|
[CookiePolicies] = { { .v = "@Aa" }, },
|
||||||
[DarkMode] = { { .i = 0 }, },
|
[DarkMode] = { { .i = 0 }, },
|
||||||
[DefaultCharset] = { { .v = "UTF-8" }, },
|
[DefaultCharset] = { { .v = "UTF-8" }, },
|
||||||
[DiskCache] = { { .i = 1 }, },
|
[DiskCache] = { { .i = 1 }, },
|
||||||
[DNSPrefetch] = { { .i = 0 }, },
|
[DNSPrefetch] = { { .i = 0 }, },
|
||||||
[Ephemeral] = { { .i = 0 }, },
|
[Ephemeral] = { { .i = 0 }, },
|
||||||
[FileURLsCrossAccess] = { { .i = 0 }, },
|
[FileURLsCrossAccess] = { { .i = 0 }, },
|
||||||
[FontSize] = { { .i = 12 }, },
|
[FontSize] = { { .i = 12 }, },
|
||||||
[FrameFlattening] = { { .i = 0 }, },
|
[FrameFlattening] = { { .i = 0 }, },
|
||||||
[Geolocation] = { { .i = 0 }, },
|
[Geolocation] = { { .i = 0 }, },
|
||||||
[HideBackground] = { { .i = 0 }, },
|
[HideBackground] = { { .i = 0 }, },
|
||||||
[Inspector] = { { .i = 0 }, },
|
[Inspector] = { { .i = 0 }, },
|
||||||
[Java] = { { .i = 1 }, },
|
[Java] = { { .i = 1 }, },
|
||||||
[JavaScript] = { { .i = 1 }, },
|
[JavaScript] = { { .i = 1 }, },
|
||||||
[KioskMode] = { { .i = 0 }, },
|
[KioskMode] = { { .i = 0 }, },
|
||||||
[LoadImages] = { { .i = 1 }, },
|
[LoadImages] = { { .i = 1 }, },
|
||||||
[MediaManualPlay] = { { .i = 1 }, },
|
[MediaManualPlay] = { { .i = 1 }, },
|
||||||
[PreferredLanguages] = { { .v = (char *[]){ NULL } }, },
|
[PreferredLanguages] = { { .v = (char *[]){ NULL } }, },
|
||||||
[RunInFullscreen] = { { .i = 0 }, },
|
[RunInFullscreen] = { { .i = 0 }, },
|
||||||
[ScrollBars] = { { .i = 1 }, },
|
[ScrollBars] = { { .i = 1 }, },
|
||||||
[ShowIndicators] = { { .i = 1 }, },
|
[ShowIndicators] = { { .i = 1 }, },
|
||||||
[SiteQuirks] = { { .i = 1 }, },
|
[SiteQuirks] = { { .i = 1 }, },
|
||||||
[SmoothScrolling] = { { .i = 0 }, },
|
[SmoothScrolling] = { { .i = 0 }, },
|
||||||
[SpellChecking] = { { .i = 0 }, },
|
[SpellChecking] = { { .i = 0 }, },
|
||||||
[SpellLanguages] = { { .v = ((char *[]){ "en_US", NULL }) }, },
|
[SpellLanguages] = { { .v = ((char *[]){ "en_US", NULL }) }, },
|
||||||
[StrictTLS] = { { .i = 1 }, },
|
[StrictTLS] = { { .i = 1 }, },
|
||||||
[Style] = { { .i = 1 }, },
|
[Style] = { { .i = 1 }, },
|
||||||
[WebGL] = { { .i = 0 }, },
|
[WebGL] = { { .i = 0 }, },
|
||||||
[ZoomLevel] = { { .f = 1.0 }, },
|
[ZoomLevel] = { { .f = 1.0 }, },
|
||||||
};
|
};
|
||||||
|
|
||||||
static UriParameters uriparams[] = {
|
static UriParameters uriparams[] = {
|
||||||
|
|
@ -65,30 +72,30 @@ static UriParameters uriparams[] = {
|
||||||
static int winsize[] = { 800, 600 };
|
static int winsize[] = { 800, 600 };
|
||||||
|
|
||||||
static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
|
static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
|
||||||
WEBKIT_FIND_OPTIONS_WRAP_AROUND;
|
WEBKIT_FIND_OPTIONS_WRAP_AROUND;
|
||||||
|
|
||||||
#define PROMPT_GO "Go:"
|
#define PROMPT_GO "Go:"
|
||||||
#define PROMPT_FIND "Find:"
|
#define PROMPT_FIND "Find:"
|
||||||
|
|
||||||
/* SETPROP(readprop, setprop, prompt)*/
|
/* SETPROP(readprop, setprop, prompt)*/
|
||||||
#define SETPROP(r, s, p) { \
|
#define SETPROP(r, s, p) { \
|
||||||
.v = (const char *[]){ "/bin/sh", "-c", \
|
.v = (const char *[]){ "/bin/sh", "-c", \
|
||||||
"prop=\"$(printf '%b' \"$(xprop -id $1 "r" " \
|
"prop=\"$(printf '%b' \"$(xprop -id $1 "r" " \
|
||||||
"| sed -e 's/^"r"(UTF8_STRING) = \"\\(.*\\)\"/\\1/' " \
|
"| sed -e 's/^"r"(UTF8_STRING) = \"\\(.*\\)\"/\\1/' " \
|
||||||
" -e 's/\\\\\\(.\\)/\\1/g')\" " \
|
" -e 's/\\\\\\(.\\)/\\1/g' && cat ~/.config/surf/bookmarks)\" " \
|
||||||
"| dmenu -p '"p"' -w $1)\" " \
|
"| marukuru -p '"p"' -w $1)\" " \
|
||||||
"&& xprop -id $1 -f "s" 8u -set "s" \"$prop\"", \
|
"&& xprop -id $1 -f "s" 8u -set "s" \"$prop\"", \
|
||||||
"surf-setprop", winid, NULL \
|
"surf-setprop", winid, NULL \
|
||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
|
|
||||||
/* DOWNLOAD(URI, referer) */
|
/* DOWNLOAD(URI, referer) */
|
||||||
#define DOWNLOAD(u, r) { \
|
#define DOWNLOAD(u, r) { \
|
||||||
.v = (const char *[]){ "st", "-e", "/bin/sh", "-c",\
|
.v = (const char *[]){ "st", "-e", "/bin/sh", "-c",\
|
||||||
"curl -g -L -J -O -A \"$1\" -b \"$2\" -c \"$2\"" \
|
"curl -g -L -J -O -A \"$1\" -b \"$2\" -c \"$2\"" \
|
||||||
" -e \"$3\" \"$4\"; read", \
|
" -e \"$3\" \"$4\"; read", \
|
||||||
"surf-download", useragent, cookiefile, r, u, NULL \
|
"surf-download", useragent, cookiefile, r, u, NULL \
|
||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
|
|
||||||
/* PLUMB(URI) */
|
/* PLUMB(URI) */
|
||||||
|
|
@ -96,16 +103,28 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
|
||||||
* "http://" or "https://" should be opened.
|
* "http://" or "https://" should be opened.
|
||||||
*/
|
*/
|
||||||
#define PLUMB(u) {\
|
#define PLUMB(u) {\
|
||||||
.v = (const char *[]){ "/bin/sh", "-c", \
|
.v = (const char *[]){ "/bin/sh", "-c", \
|
||||||
"xdg-open \"$0\"", u, NULL \
|
"xdg-open \"$0\"", u, NULL \
|
||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
|
|
||||||
/* VIDEOPLAY(URI) */
|
/* VIDEOPLAY(URI) */
|
||||||
#define VIDEOPLAY(u) {\
|
#define VIDEOPLAY(u) {\
|
||||||
.v = (const char *[]){ "/bin/sh", "-c", \
|
.v = (const char *[]){ "/bin/sh", "-c", \
|
||||||
"mpv --really-quiet \"$0\"", u, NULL \
|
"mpv --really-quiet \"$0\"", u, NULL \
|
||||||
} \
|
} \
|
||||||
|
}
|
||||||
|
|
||||||
|
/* BM_ADD(readprop) */
|
||||||
|
#define BM_ADD(r) {\
|
||||||
|
.v = (const char *[]){ "/bin/sh", "-c", \
|
||||||
|
"(echo $(xprop -id $0 $1) | cut -d '\"' -f2 " \
|
||||||
|
"| sed 's/.*https*:\\/\\/\\(www\\.\\)\\?//' && cat ~/.config/surf/bookmarks) " \
|
||||||
|
"| awk '!seen[$0]++' > ~/.config/surf/bookmarks.tmp && " \
|
||||||
|
"mv ~/.config/surf/bookmarks.tmp ~/.config/surf/bookmarks &&" \
|
||||||
|
"notify-send -u low -a 'savoia' 'added bookmark'", \
|
||||||
|
winid, r, NULL \
|
||||||
|
} \
|
||||||
}
|
}
|
||||||
|
|
||||||
/* styles */
|
/* styles */
|
||||||
|
|
@ -114,8 +133,8 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
|
||||||
* the list.
|
* the list.
|
||||||
*/
|
*/
|
||||||
static SiteSpecific styles[] = {
|
static SiteSpecific styles[] = {
|
||||||
/* regexp file in $styledir */
|
/* regexp file in $styledir */
|
||||||
{ ".*", "default.css" },
|
{ ".*", "default.css" },
|
||||||
};
|
};
|
||||||
|
|
||||||
/* certificates */
|
/* certificates */
|
||||||
|
|
@ -123,7 +142,7 @@ static SiteSpecific styles[] = {
|
||||||
* Provide custom certificate for urls
|
* Provide custom certificate for urls
|
||||||
*/
|
*/
|
||||||
static SiteSpecific certs[] = {
|
static SiteSpecific certs[] = {
|
||||||
/* regexp file in $certdir */
|
/* regexp file in $certdir */
|
||||||
{ "://suckless\\.org/", "suckless.org.crt" },
|
{ "://suckless\\.org/", "suckless.org.crt" },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -131,71 +150,70 @@ static SiteSpecific certs[] = {
|
||||||
|
|
||||||
/* hotkeys */
|
/* hotkeys */
|
||||||
/*
|
/*
|
||||||
* If you use anything else but MODKEY and GDK_SHIFT_MASK, don't forget to
|
* If you use anything else but MODKEY and GDK_SHIFT_MASK, dont forget to
|
||||||
* edit the CLEANMASK() macro.
|
* edit the CLEANMASK() macro.
|
||||||
*/
|
*/
|
||||||
static Key keys[] = {
|
static Key keys[] = {
|
||||||
/* modifier keyval function arg */
|
/* modifier keyval function arg */
|
||||||
{ 0, GDK_KEY_g, spawn, SETPROP("_SURF_URI", "_SURF_GO", PROMPT_GO) },
|
{ MODKEY, GDK_KEY_g, spawn, SETPROP("_SURF_URI", "_SURF_GO", PROMPT_GO) },
|
||||||
{ 0, GDK_KEY_f, spawn, SETPROP("_SURF_FIND", "_SURF_FIND", PROMPT_FIND) },
|
{ MODKEY, GDK_KEY_f, spawn, SETPROP("_SURF_FIND", "_SURF_FIND", PROMPT_FIND) },
|
||||||
{ 0, GDK_KEY_slash, spawn, SETPROP("_SURF_FIND", "_SURF_FIND", PROMPT_FIND) },
|
{ MODKEY, GDK_KEY_slash, spawn, SETPROP("_SURF_FIND", "_SURF_FIND", PROMPT_FIND) },
|
||||||
|
{ MODKEY, GDK_KEY_m, spawn, BM_ADD("_SURF_URI") },
|
||||||
|
|
||||||
{ 0, GDK_KEY_c, stop, { 0 } },
|
{ MODKEY, GDK_KEY_i, insert, { .i = 1 } },
|
||||||
{ 0, GDK_KEY_i, insert, { .i = 1 } },
|
{ MODKEY, GDK_KEY_Escape, insert, { .i = 0 } },
|
||||||
{ 0, GDK_KEY_Escape, insert, { .i = 0 } },
|
|
||||||
{ 0, GDK_KEY_q, quit, { 0 } },
|
|
||||||
|
|
||||||
{ 0, GDK_KEY_r, reload, { .i = 0 } },
|
{ MODKEY, GDK_KEY_r, reload, { .i = 0 } },
|
||||||
|
|
||||||
{ 0, GDK_KEY_l, navigate, { .i = +1 } },
|
{ MODKEY, GDK_KEY_l, navigate, { .i = +1 } },
|
||||||
{ 0, GDK_KEY_h, navigate, { .i = -1 } },
|
{ MODKEY, GDK_KEY_h, navigate, { .i = -1 } },
|
||||||
|
|
||||||
/* vertical and horizontal scrolling, in viewport percentage */
|
/* vertical and horizontal scrolling, in viewport percentage */
|
||||||
{ 0, GDK_KEY_j, scrollv, { .i = +10 } },
|
{ MODKEY, GDK_KEY_j, scrollv, { .i = +10 } },
|
||||||
{ 0, GDK_KEY_k, scrollv, { .i = -10 } },
|
{ MODKEY, GDK_KEY_k, scrollv, { .i = -10 } },
|
||||||
{ 0, GDK_KEY_space, scrollv, { .i = +50 } },
|
{ MODKEY, GDK_KEY_space, scrollv, { .i = +50 } },
|
||||||
{ 0, GDK_KEY_b, scrollv, { .i = -50 } },
|
{ MODKEY, GDK_KEY_b, scrollv, { .i = -50 } },
|
||||||
{ 0, GDK_KEY_o, scrollh, { .i = +10 } },
|
{ MODKEY, GDK_KEY_o, scrollh, { .i = +10 } },
|
||||||
{ 0, GDK_KEY_u, scrollh, { .i = -10 } },
|
{ MODKEY, GDK_KEY_u, scrollh, { .i = -10 } },
|
||||||
|
|
||||||
|
{ MODKEY, GDK_KEY_equal, zoom, { .i = 0 } },
|
||||||
|
{ MODKEY, GDK_KEY_minus, zoom, { .i = -1 } },
|
||||||
|
{ MODKEY, GDK_KEY_plus, zoom, { .i = +1 } },
|
||||||
|
|
||||||
{ 0|GDK_SHIFT_MASK, GDK_KEY_j, zoom, { .i = -1 } },
|
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_v, clipboard, { .i = 1 } },
|
||||||
{ 0|GDK_SHIFT_MASK, GDK_KEY_k, zoom, { .i = +1 } },
|
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_c, clipboard, { .i = 0 } },
|
||||||
{ 0|GDK_SHIFT_MASK, GDK_KEY_q, zoom, { .i = 0 } },
|
|
||||||
{ 0, GDK_KEY_minus, zoom, { .i = -1 } },
|
|
||||||
{ 0, GDK_KEY_plus, zoom, { .i = +1 } },
|
|
||||||
|
|
||||||
{ 0, GDK_KEY_p, clipboard, { .i = 1 } },
|
{ MODKEY, GDK_KEY_n, find, { .i = +1 } },
|
||||||
{ 0, GDK_KEY_y, clipboard, { .i = 0 } },
|
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_n, find, { .i = -1 } },
|
||||||
|
|
||||||
{ 0, GDK_KEY_n, find, { .i = +1 } },
|
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_a, togglecookiepolicy, { 0 } },
|
||||||
{ 0|GDK_SHIFT_MASK, GDK_KEY_n, find, { .i = -1 } },
|
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_o, toggleinspector, { 0 } },
|
||||||
|
|
||||||
{ 0|GDK_SHIFT_MASK, GDK_KEY_p, print, { 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_a, togglecookiepolicy, { 0 } },
|
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_g, toggle, { .i = Geolocation } },
|
||||||
{ 0, GDK_KEY_F11, togglefullscreen, { 0 } },
|
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_s, toggle, { .i = JavaScript } },
|
||||||
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_o, toggleinspector, { 0 } },
|
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_i, toggle, { .i = LoadImages } },
|
||||||
|
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_b, toggle, { .i = ScrollBars } },
|
||||||
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_c, toggle, { .i = CaretBrowsing } },
|
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_t, toggle, { .i = StrictTLS } },
|
||||||
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_f, toggle, { .i = FrameFlattening } },
|
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_m, toggle, { .i = Style } },
|
||||||
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_g, toggle, { .i = Geolocation } },
|
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_d, toggle, { .i = DarkMode } },
|
||||||
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_s, toggle, { .i = JavaScript } },
|
{ MODKEY, GDK_KEY_Left, switch_tab, { .i = -1 } },
|
||||||
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_i, toggle, { .i = LoadImages } },
|
{ MODKEY, GDK_KEY_Right, switch_tab, { .i = +1 } },
|
||||||
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_b, toggle, { .i = ScrollBars } },
|
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_Left, move_tab, { .i = -1 } },
|
||||||
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_t, toggle, { .i = StrictTLS } },
|
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_Right, move_tab, { .i = +1 } },
|
||||||
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_m, toggle, { .i = Style } },
|
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_Down, close_tab, { .i = -1 } },
|
||||||
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_d, toggle, { .i = DarkMode } },
|
{ MODKEY, GDK_KEY_Up, new_tab, { 0 } },
|
||||||
};
|
};
|
||||||
|
|
||||||
/* button definitions */
|
/* button definitions */
|
||||||
/* target can be OnDoc, OnLink, OnImg, OnMedia, OnEdit, OnBar, OnSel, OnAny */
|
/* target can be OnDoc, OnLink, OnImg, OnMedia, OnEdit, OnBar, OnSel, OnAny */
|
||||||
static Button buttons[] = {
|
static Button buttons[] = {
|
||||||
/* target event mask button function argument stop event */
|
/* target event mask button function argument stop event */
|
||||||
{ OnLink, 0, 2, clicknewwindow, { .i = 0 }, 1 },
|
{ OnLink, 0, 2, clicknewtab, { .i = 0 }, 1 },
|
||||||
{ OnLink, MODKEY, 2, clicknewwindow, { .i = 1 }, 1 },
|
{ OnLink, MODKEY, 1, clicknewtab, { .i = 0 }, 1 },
|
||||||
{ OnLink, MODKEY, 1, clicknewwindow, { .i = 1 }, 1 },
|
{ OnLink, MODKEY, 2, clicknewwindow, { .i = 0 }, 1 },
|
||||||
{ OnAny, 0, 8, clicknavigate, { .i = -1 }, 1 },
|
{ OnAny, 0, 8, clicknavigate, { .i = -1 }, 1 },
|
||||||
{ OnAny, 0, 9, clicknavigate, { .i = +1 }, 1 },
|
{ OnAny, 0, 9, clicknavigate, { .i = +1 }, 1 },
|
||||||
{ OnMedia, MODKEY, 1, clickexternplayer, { 0 }, 1 },
|
{ OnMedia, MODKEY, 1, clickexternplayer, { 0 }, 1 },
|
||||||
};
|
};
|
||||||
|
|
|
||||||
42
surf-bookmarks-20170722-723ff26.diff
Normal file
42
surf-bookmarks-20170722-723ff26.diff
Normal file
|
|
@ -0,0 +1,42 @@
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 2e735bf..43ad9ab 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -69,8 +69,9 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
|
||||||
|
#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\"", \
|
||||||
|
+ "| sed \"s/^$2(STRING) = //;s/^\\\"\\(.*\\)\\\"$/\\1/\" && cat ~/.surf/bookmarks)\" " \
|
||||||
|
+ "| dmenu -l 10 -p \"$4\" -w $1)\" && " \
|
||||||
|
+ "xprop -id $1 -f $3 8s -set $3 \"$prop\"", \
|
||||||
|
"surf-setprop", winid, r, s, p, NULL \
|
||||||
|
} \
|
||||||
|
}
|
||||||
|
@@ -101,6 +102,17 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
|
||||||
|
} \
|
||||||
|
}
|
||||||
|
|
||||||
|
+/* BM_ADD(readprop) */
|
||||||
|
+#define BM_ADD(r) {\
|
||||||
|
+ .v = (const char *[]){ "/bin/sh", "-c", \
|
||||||
|
+ "(echo $(xprop -id $0 $1) | cut -d '\"' -f2 " \
|
||||||
|
+ "| sed 's/.*https*:\\/\\/\\(www\\.\\)\\?//' && cat ~/.surf/bookmarks) " \
|
||||||
|
+ "| awk '!seen[$0]++' > ~/.surf/bookmarks.tmp && " \
|
||||||
|
+ "mv ~/.surf/bookmarks.tmp ~/.surf/bookmarks", \
|
||||||
|
+ winid, r, NULL \
|
||||||
|
+ } \
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
/* styles */
|
||||||
|
/*
|
||||||
|
* The iteration will stop at the first match, beginning at the beginning of
|
||||||
|
@@ -132,6 +144,7 @@ static Key keys[] = {
|
||||||
|
{ 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) },
|
||||||
|
+ { MODKEY, GDK_KEY_m, spawn, BM_ADD("_SURF_URI") },
|
||||||
|
|
||||||
|
{ 0, GDK_KEY_Escape, stop, { 0 } },
|
||||||
|
{ MODKEY, GDK_KEY_c, stop, { 0 } },
|
||||||
226
surf-dlconsole-20190919-d068a38.diff
Normal file
226
surf-dlconsole-20190919-d068a38.diff
Normal file
|
|
@ -0,0 +1,226 @@
|
||||||
|
From 0ea5ecb238b932c533413b912b7981a737af56cf Mon Sep 17 00:00:00 2001
|
||||||
|
From: danoloan10 <danoloan10@tutanota.com>
|
||||||
|
Date: Thu, 19 Sep 2019 18:25:59 +0200
|
||||||
|
Subject: [PATCH] Basic integrated downloads via console display
|
||||||
|
|
||||||
|
---
|
||||||
|
config.def.h | 16 ++++---
|
||||||
|
surf.c | 118 +++++++++++++++++++++++++++++++++++++++------------
|
||||||
|
2 files changed, 101 insertions(+), 33 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 34265f6..375be93 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -6,6 +6,8 @@ static char *styledir = "~/.surf/styles/";
|
||||||
|
static char *certdir = "~/.surf/certificates/";
|
||||||
|
static char *cachedir = "~/.surf/cache/";
|
||||||
|
static char *cookiefile = "~/.surf/cookies.txt";
|
||||||
|
+static char *dldir = "~/dl/";
|
||||||
|
+static char *dlstatus = "~/.surf/dlstatus/";
|
||||||
|
|
||||||
|
/* Webkit default features */
|
||||||
|
/* Highest priority value will be used.
|
||||||
|
@@ -76,13 +78,12 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
|
||||||
|
} \
|
||||||
|
}
|
||||||
|
|
||||||
|
-/* DOWNLOAD(URI, referer) */
|
||||||
|
-#define DOWNLOAD(u, r) { \
|
||||||
|
+#define DLSTATUS { \
|
||||||
|
.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 \
|
||||||
|
- } \
|
||||||
|
+ "while true; do cat $1/* 2>/dev/null || echo \"no hay descargas\";"\
|
||||||
|
+ "A=; read A; "\
|
||||||
|
+ "if [ $A = \"clean\" ]; then rm $1/*; fi; clear; done",\
|
||||||
|
+ "surf-dlstatus", dlstatus, NULL } \
|
||||||
|
}
|
||||||
|
|
||||||
|
/* PLUMB(URI) */
|
||||||
|
@@ -180,6 +181,9 @@ static Key keys[] = {
|
||||||
|
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_b, toggle, { .i = ScrollBars } },
|
||||||
|
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_t, toggle, { .i = StrictTLS } },
|
||||||
|
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_m, toggle, { .i = Style } },
|
||||||
|
+
|
||||||
|
+ /* download-console */
|
||||||
|
+ { MODKEY, GDK_KEY_d, spawndls, { 0 } },
|
||||||
|
};
|
||||||
|
|
||||||
|
/* button definitions */
|
||||||
|
diff --git a/surf.c b/surf.c
|
||||||
|
index 2b54e3c..771858e 100644
|
||||||
|
--- a/surf.c
|
||||||
|
+++ b/surf.c
|
||||||
|
@@ -205,10 +205,6 @@ static void decidenewwindow(WebKitPolicyDecision *d, Client *c);
|
||||||
|
static void decideresource(WebKitPolicyDecision *d, Client *c);
|
||||||
|
static void insecurecontent(WebKitWebView *v, WebKitInsecureContentEvent e,
|
||||||
|
Client *c);
|
||||||
|
-static void downloadstarted(WebKitWebContext *wc, WebKitDownload *d,
|
||||||
|
- Client *c);
|
||||||
|
-static void responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c);
|
||||||
|
-static void download(Client *c, WebKitURIResponse *r);
|
||||||
|
static void webprocessterminated(WebKitWebView *v,
|
||||||
|
WebKitWebProcessTerminationReason r,
|
||||||
|
Client *c);
|
||||||
|
@@ -237,6 +233,17 @@ static void clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h);
|
||||||
|
static void clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h);
|
||||||
|
static void clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h);
|
||||||
|
|
||||||
|
+/* download-console */
|
||||||
|
+static void downloadstarted(WebKitWebContext *wc, WebKitDownload *d,
|
||||||
|
+ Client *c);
|
||||||
|
+static void downloadfailed(WebKitDownload *d, GParamSpec *ps, void *arg);
|
||||||
|
+static void downloadfinished(WebKitDownload *d, GParamSpec *ps, void *arg);
|
||||||
|
+static gboolean decidedestination(WebKitDownload *d,
|
||||||
|
+ gchar *suggested_filename, void *arg);
|
||||||
|
+static void printprogress(WebKitDownload *d, GParamSpec *ps, void *arg);
|
||||||
|
+static void logdownload(WebKitDownload *d, gchar *tail);
|
||||||
|
+static void spawndls(Client *c, const Arg *a);
|
||||||
|
+
|
||||||
|
static char winid[64];
|
||||||
|
static char togglestats[12];
|
||||||
|
static char pagestats[2];
|
||||||
|
@@ -340,6 +347,8 @@ setup(void)
|
||||||
|
scriptfile = buildfile(scriptfile);
|
||||||
|
cachedir = buildpath(cachedir);
|
||||||
|
certdir = buildpath(certdir);
|
||||||
|
+ dlstatus = buildpath(dlstatus);
|
||||||
|
+ dldir = buildpath(dldir);
|
||||||
|
|
||||||
|
gdkkb = gdk_seat_get_keyboard(gdk_display_get_default_seat(gdpy));
|
||||||
|
|
||||||
|
@@ -1079,6 +1088,8 @@ cleanup(void)
|
||||||
|
g_free(scriptfile);
|
||||||
|
g_free(stylefile);
|
||||||
|
g_free(cachedir);
|
||||||
|
+ g_free(dldir);
|
||||||
|
+ g_free(dlstatus);
|
||||||
|
XCloseDisplay(dpy);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1710,8 +1721,7 @@ decideresource(WebKitPolicyDecision *d, Client *c)
|
||||||
|
if (webkit_response_policy_decision_is_mime_type_supported(r)) {
|
||||||
|
webkit_policy_decision_use(d);
|
||||||
|
} else {
|
||||||
|
- webkit_policy_decision_ignore(d);
|
||||||
|
- download(c, res);
|
||||||
|
+ webkit_policy_decision_download(d);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1721,27 +1731,6 @@ insecurecontent(WebKitWebView *v, WebKitInsecureContentEvent e, Client *c)
|
||||||
|
c->insecure = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
-void
|
||||||
|
-downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c)
|
||||||
|
-{
|
||||||
|
- g_signal_connect(G_OBJECT(d), "notify::response",
|
||||||
|
- G_CALLBACK(responsereceived), c);
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-void
|
||||||
|
-responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c)
|
||||||
|
-{
|
||||||
|
- download(c, webkit_download_get_response(d));
|
||||||
|
- webkit_download_cancel(d);
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-void
|
||||||
|
-download(Client *c, WebKitURIResponse *r)
|
||||||
|
-{
|
||||||
|
- Arg a = (Arg)DOWNLOAD(webkit_uri_response_get_uri(r), geturi(c));
|
||||||
|
- spawn(c, &a);
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
void
|
||||||
|
webprocessterminated(WebKitWebView *v, WebKitWebProcessTerminationReason r,
|
||||||
|
Client *c)
|
||||||
|
@@ -1971,6 +1960,81 @@ clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h)
|
||||||
|
spawn(c, &arg);
|
||||||
|
}
|
||||||
|
|
||||||
|
+/* download-console */
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c)
|
||||||
|
+{
|
||||||
|
+ webkit_download_set_allow_overwrite(d, TRUE);
|
||||||
|
+ g_signal_connect(G_OBJECT(d), "decide-destination",
|
||||||
|
+ G_CALLBACK(decidedestination), NULL);
|
||||||
|
+ g_signal_connect(G_OBJECT(d), "notify::estimated-progress",
|
||||||
|
+ G_CALLBACK(printprogress), NULL);
|
||||||
|
+ g_signal_connect(G_OBJECT(d), "failed",
|
||||||
|
+ G_CALLBACK(downloadfailed), NULL);
|
||||||
|
+ g_signal_connect(G_OBJECT(d), "finished",
|
||||||
|
+ G_CALLBACK(downloadfinished), NULL);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+downloadfailed(WebKitDownload *d, GParamSpec *ps, void *arg)
|
||||||
|
+{
|
||||||
|
+ logdownload(d, " -- FAILED");
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+downloadfinished(WebKitDownload *d, GParamSpec *ps, void *arg)
|
||||||
|
+{
|
||||||
|
+ logdownload(d, " -- COMPLETED");
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+gboolean
|
||||||
|
+decidedestination(WebKitDownload *d, gchar *suggested_filename, void *arg)
|
||||||
|
+{
|
||||||
|
+ gchar *dest;
|
||||||
|
+ dest = g_strdup_printf("file://%s/%s", dldir, suggested_filename);
|
||||||
|
+ webkit_download_set_destination(d, dest);
|
||||||
|
+ return TRUE;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+printprogress(WebKitDownload *d, GParamSpec *ps, void *arg)
|
||||||
|
+{
|
||||||
|
+ logdownload(d, "");
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+logdownload(WebKitDownload *d, gchar *tail)
|
||||||
|
+{
|
||||||
|
+ gchar *filename, *statfile;
|
||||||
|
+ FILE *stat;
|
||||||
|
+
|
||||||
|
+ filename = g_path_get_basename(webkit_download_get_destination(d));
|
||||||
|
+ statfile = g_strdup_printf("%s/%s", dlstatus, filename);
|
||||||
|
+
|
||||||
|
+ if ((stat = fopen(statfile, "w")) == NULL) {
|
||||||
|
+ perror("dlstatus");
|
||||||
|
+ } else {
|
||||||
|
+ fprintf(stat, "%s: %d%% (%d.%ds)%s\n",
|
||||||
|
+ filename,
|
||||||
|
+ (int)(webkit_download_get_estimated_progress(d) * 100),
|
||||||
|
+ (int) webkit_download_get_elapsed_time(d),
|
||||||
|
+ (int)(webkit_download_get_elapsed_time(d) * 100),
|
||||||
|
+ tail);
|
||||||
|
+ fclose(stat);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ g_free(statfile);
|
||||||
|
+ g_free(filename);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+spawndls(Client *c, const Arg *a)
|
||||||
|
+{
|
||||||
|
+ Arg arg = (Arg)DLSTATUS;
|
||||||
|
+ spawn(c, &arg);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
int
|
||||||
|
main(int argc, char *argv[])
|
||||||
|
{
|
||||||
|
--
|
||||||
|
2.22.1
|
||||||
|
|
||||||
54
surf-playexternal-20190724-b814567.diff
Normal file
54
surf-playexternal-20190724-b814567.diff
Normal file
|
|
@ -0,0 +1,54 @@
|
||||||
|
From 95e17b5bd428173c83e60cec9cd5666cfe9066fa Mon Sep 17 00:00:00 2001
|
||||||
|
From: DanMan <dnahimov@gmail.com>
|
||||||
|
Date: Wed, 24 Jul 2019 18:47:46 -0400
|
||||||
|
Subject: [PATCH] added playexternal hotkey function
|
||||||
|
|
||||||
|
---
|
||||||
|
config.def.h | 2 ++
|
||||||
|
surf.c | 10 ++++++++++
|
||||||
|
2 files changed, 12 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 6d3135e..5fa0d9d 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -105,6 +105,8 @@ static Key keys[] = {
|
||||||
|
{ MODKEY, GDK_KEY_f, spawn, SETPROP("_SURF_FIND", "_SURF_FIND") },
|
||||||
|
{ MODKEY, GDK_KEY_slash, spawn, SETPROP("_SURF_FIND", "_SURF_FIND") },
|
||||||
|
|
||||||
|
+ { MODKEY, GDK_KEY_w, playexternal, { 0 } },
|
||||||
|
+
|
||||||
|
{ 0, GDK_KEY_Escape, stop, { 0 } },
|
||||||
|
{ MODKEY, GDK_KEY_c, stop, { 0 } },
|
||||||
|
|
||||||
|
diff --git a/surf.c b/surf.c
|
||||||
|
index 93a1629..e74e9df 100644
|
||||||
|
--- a/surf.c
|
||||||
|
+++ b/surf.c
|
||||||
|
@@ -217,6 +217,7 @@ static void togglefullscreen(Client *c, const Arg *a);
|
||||||
|
static void togglecookiepolicy(Client *c, const Arg *a);
|
||||||
|
static void toggleinspector(Client *c, const Arg *a);
|
||||||
|
static void find(Client *c, const Arg *a);
|
||||||
|
+static void playexternal(Client *c, const Arg *a);
|
||||||
|
|
||||||
|
/* Buttons */
|
||||||
|
static void clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h);
|
||||||
|
@@ -1648,6 +1649,15 @@ clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h)
|
||||||
|
spawn(c, &arg);
|
||||||
|
}
|
||||||
|
|
||||||
|
+void
|
||||||
|
+playexternal(Client *c, const Arg *a)
|
||||||
|
+{
|
||||||
|
+ Arg arg;
|
||||||
|
+
|
||||||
|
+ arg = (Arg)VIDEOPLAY(geturi(c));
|
||||||
|
+ spawn(c, &arg);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
int
|
||||||
|
main(int argc, char *argv[])
|
||||||
|
{
|
||||||
|
--
|
||||||
|
2.22.0
|
||||||
|
|
||||||
Loading…
Reference in a new issue