Compare commits
No commits in common. "main" and "surf-webkit2" have entirely different histories.
main
...
surf-webki
5 changed files with 12 additions and 240 deletions
|
|
@ -7,11 +7,6 @@ static char *certdir = "~/.surf/certificates/";
|
|||
static char *cachedir = "~/.surf/cache/";
|
||||
static char *cookiefile = "~/.surf/cookies.txt";
|
||||
|
||||
static SearchEngine searchengines[] = {
|
||||
{ " ", "https://duckduckgo.com/?q=%s" },
|
||||
{ "osrs ", "https://oldschool.runescape.wiki/?search=%s" },
|
||||
};
|
||||
|
||||
/* Webkit default features */
|
||||
/* Highest priority value will be used.
|
||||
* Default parameters are priority 0
|
||||
|
|
|
|||
199
config.h
199
config.h
|
|
@ -1,199 +0,0 @@
|
|||
/* modifier 0 means no modifier */
|
||||
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 *certdir = "~/.surf/certificates/";
|
||||
static char *cachedir = "~/.surf/cache/";
|
||||
static char *cookiefile = "~/.surf/cookies.txt";
|
||||
|
||||
#define HOMEPAGE "http://localhost:9001/bookmarks.html"
|
||||
|
||||
static SearchEngine searchengines[] = {
|
||||
{ " ", "https://kagi.com/search?q=%s" },
|
||||
};
|
||||
/* Webkit default features */
|
||||
/* Highest priority value will be used.
|
||||
* Default parameters are priority 0
|
||||
* Per-uri parameters are priority 1
|
||||
* Command parameters are priority 2
|
||||
*/
|
||||
static Parameter defconfig[ParameterLast] = {
|
||||
/* parameter Arg value priority */
|
||||
[AccessMicrophone] = { { .i = 0 }, },
|
||||
[AccessWebcam] = { { .i = 0 }, },
|
||||
[Certificate] = { { .i = 0 }, },
|
||||
[CaretBrowsing] = { { .i = 0 }, },
|
||||
[CookiePolicies] = { { .v = "@Aa" }, },
|
||||
[DefaultCharset] = { { .v = "UTF-8" }, },
|
||||
[DiskCache] = { { .i = 1 }, },
|
||||
[DNSPrefetch] = { { .i = 0 }, },
|
||||
[Ephemeral] = { { .i = 0 }, },
|
||||
[FileURLsCrossAccess] = { { .i = 0 }, },
|
||||
[FontSize] = { { .i = 12 }, },
|
||||
[FrameFlattening] = { { .i = 0 }, },
|
||||
[Geolocation] = { { .i = 0 }, },
|
||||
[HideBackground] = { { .i = 0 }, },
|
||||
[Inspector] = { { .i = 1 }, },
|
||||
[Java] = { { .i = 1 }, },
|
||||
[JavaScript] = { { .i = 1 }, },
|
||||
[KioskMode] = { { .i = 0 }, },
|
||||
[LoadImages] = { { .i = 1 }, },
|
||||
[MediaManualPlay] = { { .i = 1 }, },
|
||||
[PreferredLanguages] = { { .v = (char *[]){ NULL } }, },
|
||||
[RunInFullscreen] = { { .i = 0 }, },
|
||||
[ScrollBars] = { { .i = 1 }, },
|
||||
[ShowIndicators] = { { .i = 1 }, },
|
||||
[SiteQuirks] = { { .i = 1 }, },
|
||||
[SmoothScrolling] = { { .i = 0 }, },
|
||||
[SpellChecking] = { { .i = 0 }, },
|
||||
[SpellLanguages] = { { .v = ((char *[]){ "en_US", NULL }) }, },
|
||||
[StrictTLS] = { { .i = 1 }, },
|
||||
[Style] = { { .i = 1 }, },
|
||||
[WebGL] = { { .i = 0 }, },
|
||||
[ZoomLevel] = { { .f = 1.0 }, },
|
||||
};
|
||||
|
||||
static UriParameters uriparams[] = {
|
||||
{ "(://|\\.)suckless\\.org(/|$)", {
|
||||
[JavaScript] = { { .i = 0 }, 1 },
|
||||
}, },
|
||||
};
|
||||
|
||||
/* default window size: width, height */
|
||||
static int winsize[] = { 800, 600 };
|
||||
|
||||
static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
|
||||
WEBKIT_FIND_OPTIONS_WRAP_AROUND;
|
||||
|
||||
#define PROMPT_GO "Go:"
|
||||
#define PROMPT_FIND "Find:"
|
||||
|
||||
/* SETPROP(readprop, setprop, prompt)*/
|
||||
#define SETPROP(r, s, p) { \
|
||||
.v = (const char *[]){ "/bin/sh", "-c", \
|
||||
"prop=\"$(printf '%b' \"$(xprop -id $1 "r" " \
|
||||
"| sed -e 's/^"r"(UTF8_STRING) = \"\\(.*\\)\"/\\1/' " \
|
||||
" -e 's/\\\\\\(.\\)/\\1/g')\" " \
|
||||
"| dmenu -fn saucecodepronerdfont-9 -nb black -nf grey50 -sb '#019b92' -sf black -p '"p"' -w $1)\" " \
|
||||
"&& xprop -id $1 -f "s" 8u -set "s" \"$prop\"", \
|
||||
"surf-setprop", winid, NULL \
|
||||
} \
|
||||
}
|
||||
|
||||
/* DOWNLOAD(URI, referer) */
|
||||
#define DOWNLOAD(u, r) { \
|
||||
.v = (const char *[]){ "st", "-g", "80x3", "-t", "downloading", "-e", "/bin/sh", "-c",\
|
||||
"cd ~/tmp; curl -g -L -J -O -A \"$1\" -b \"$2\" -c \"$2\"" \
|
||||
" -e \"$3\" \"$4\"; read", \
|
||||
"surf-download", useragent, cookiefile, r, u, NULL \
|
||||
} \
|
||||
}
|
||||
|
||||
/* PLUMB(URI) */
|
||||
/* This called when some URI which does not begin with "about:",
|
||||
* "http://" or "https://" should be opened.
|
||||
*/
|
||||
#define PLUMB(u) {\
|
||||
.v = (const char *[]){ "/bin/sh", "-c", \
|
||||
"xdg-open \"$0\"", u, NULL \
|
||||
} \
|
||||
}
|
||||
|
||||
/* VIDEOPLAY(URI) */
|
||||
#define VIDEOPLAY(u) {\
|
||||
.v = (const char *[]){ "/bin/sh", "-c", \
|
||||
"mpv --really-quiet \"$0\"", u, NULL \
|
||||
} \
|
||||
}
|
||||
|
||||
/* styles */
|
||||
/*
|
||||
* The iteration will stop at the first match, beginning at the beginning of
|
||||
* the list.
|
||||
*/
|
||||
static SiteSpecific styles[] = {
|
||||
/* regexp file in $styledir */
|
||||
{ ".*", "default.css" },
|
||||
};
|
||||
|
||||
/* certificates */
|
||||
/*
|
||||
* Provide custom certificate for urls
|
||||
*/
|
||||
static SiteSpecific certs[] = {
|
||||
/* regexp file in $certdir */
|
||||
{ "://suckless\\.org/", "suckless.org.crt" },
|
||||
};
|
||||
|
||||
#define MODKEY GDK_CONTROL_MASK
|
||||
|
||||
/* hotkeys */
|
||||
/*
|
||||
* If you use anything else but MODKEY and GDK_SHIFT_MASK, don't forget to
|
||||
* edit the CLEANMASK() macro.
|
||||
*/
|
||||
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_Escape, stop, { 0 } },
|
||||
{ MODKEY, GDK_KEY_c, stop, { 0 } },
|
||||
|
||||
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_r, reload, { .i = 1 } },
|
||||
{ MODKEY, GDK_KEY_r, reload, { .i = 0 } },
|
||||
|
||||
{ MODKEY, GDK_KEY_l, navigate, { .i = +1 } },
|
||||
{ MODKEY, GDK_KEY_h, navigate, { .i = -1 } },
|
||||
|
||||
/* vertical and horizontal scrolling, in viewport percentage */
|
||||
{ MODKEY, GDK_KEY_j, scrollv, { .i = +10 } },
|
||||
{ MODKEY, GDK_KEY_k, scrollv, { .i = -10 } },
|
||||
{ MODKEY, GDK_KEY_space, scrollv, { .i = +50 } },
|
||||
{ MODKEY, GDK_KEY_b, scrollv, { .i = -50 } },
|
||||
{ MODKEY, GDK_KEY_i, scrollh, { .i = +10 } },
|
||||
{ MODKEY, GDK_KEY_u, scrollh, { .i = -10 } },
|
||||
|
||||
|
||||
{ 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_p, clipboard, { .i = 1 } },
|
||||
{ MODKEY, 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 } },
|
||||
|
||||
{ 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_c, toggle, { .i = CaretBrowsing } },
|
||||
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_f, toggle, { .i = FrameFlattening } },
|
||||
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_g, toggle, { .i = Geolocation } },
|
||||
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_s, toggle, { .i = JavaScript } },
|
||||
{ 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_t, toggle, { .i = StrictTLS } },
|
||||
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_m, toggle, { .i = Style } },
|
||||
};
|
||||
|
||||
/* 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, clicknewwindow, { .i = 0 }, 1 },
|
||||
{ OnLink, MODKEY, 2, clicknewwindow, { .i = 1 }, 1 },
|
||||
{ OnLink, MODKEY, 1, clicknewwindow, { .i = 1 }, 1 },
|
||||
{ OnAny, 0, 8, clicknavigate, { .i = -1 }, 1 },
|
||||
{ OnAny, 0, 9, clicknavigate, { .i = +1 }, 1 },
|
||||
{ OnMedia, MODKEY, 1, clickexternplayer, { 0 }, 1 },
|
||||
};
|
||||
10
config.mk
10
config.mk
|
|
@ -12,13 +12,13 @@ LIBDIR = $(LIBPREFIX)/surf
|
|||
X11INC = `pkg-config --cflags x11`
|
||||
X11LIB = `pkg-config --libs x11`
|
||||
|
||||
GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.1`
|
||||
GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.1`
|
||||
WEBEXTINC = `pkg-config --cflags webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0`
|
||||
WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0`
|
||||
GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0`
|
||||
GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0`
|
||||
WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0`
|
||||
WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0`
|
||||
|
||||
# includes and libs
|
||||
INCS = $(X11INC) $(GTKINC) -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include/
|
||||
INCS = $(X11INC) $(GTKINC)
|
||||
LIBS = $(X11LIB) $(GTKLIB) -lgthread-2.0
|
||||
|
||||
# flags
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
*::-webkit-scrollbar { width:6px;height:6px; }
|
||||
*::-webkit-scrollbar-track { background:#000; }
|
||||
*::-webkit-scrollbar-thumb { background-color:#1f9b92;border-radius:0;border:none; }
|
||||
*::-webkit-scrollbar-corner { background:#000; }
|
||||
34
surf.c
34
surf.c
|
|
@ -129,11 +129,6 @@ typedef struct {
|
|||
unsigned int stopevent;
|
||||
} Button;
|
||||
|
||||
typedef struct {
|
||||
char *token;
|
||||
char *uri;
|
||||
} SearchEngine;
|
||||
|
||||
typedef struct {
|
||||
const char *uri;
|
||||
Parameter config[ParameterLast];
|
||||
|
|
@ -221,7 +216,6 @@ static void webprocessterminated(WebKitWebView *v,
|
|||
Client *c);
|
||||
static void closeview(WebKitWebView *v, Client *c);
|
||||
static void destroywin(GtkWidget* w, Client *c);
|
||||
static gchar *parseuri(const gchar *uri);
|
||||
|
||||
/* Hotkeys */
|
||||
static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
|
||||
|
|
@ -260,7 +254,6 @@ static const char *useragent;
|
|||
static Parameter *curconfig;
|
||||
static int modparams[ParameterLast];
|
||||
static int spair[2];
|
||||
static int enablescrollbars;
|
||||
char *argv0;
|
||||
|
||||
static ParamName loadtransient[] = {
|
||||
|
|
@ -584,7 +577,7 @@ loaduri(Client *c, const Arg *a)
|
|||
url = g_strdup_printf("file://%s", path);
|
||||
free(path);
|
||||
} else {
|
||||
url = parseuri(uri);
|
||||
url = g_strdup_printf("http://%s", uri);
|
||||
}
|
||||
if (apath != uri)
|
||||
free(apath);
|
||||
|
|
@ -834,8 +827,8 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a)
|
|||
* manipulating the DOM directly.
|
||||
enablescrollbars = !enablescrollbars;
|
||||
evalscript(c, "document.documentElement.style.overflow = '%s'",
|
||||
enablescrollbars ? "auto" : "hidden");*/
|
||||
|
||||
enablescrollbars ? "auto" : "hidden");
|
||||
*/
|
||||
return; /* do not update */
|
||||
case ShowIndicators:
|
||||
break;
|
||||
|
|
@ -1540,8 +1533,9 @@ loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
|
|||
seturiparameters(c, uri, loadfinished);
|
||||
/* Disabled until we write some WebKitWebExtension for
|
||||
* manipulating the DOM directly.
|
||||
*evalscript(c, "document.documentElement.style.overflow = '%s'",
|
||||
enablescrollbars ? "auto" : "hidden");*/
|
||||
evalscript(c, "document.documentElement.style.overflow = '%s'",
|
||||
enablescrollbars ? "auto" : "hidden");
|
||||
*/
|
||||
runscript(c);
|
||||
break;
|
||||
}
|
||||
|
|
@ -1783,20 +1777,6 @@ destroywin(GtkWidget* w, Client *c)
|
|||
gtk_main_quit();
|
||||
}
|
||||
|
||||
gchar *
|
||||
parseuri(const gchar *uri)
|
||||
{
|
||||
guint i;
|
||||
|
||||
for (i = 0; i < LENGTH(searchengines); i++) {
|
||||
if (g_str_has_prefix(uri, searchengines[i].token))
|
||||
return g_strdup_printf(searchengines[i].uri,
|
||||
uri + strlen(searchengines[i].token));
|
||||
}
|
||||
|
||||
return g_strdup_printf("http://%s", uri);
|
||||
}
|
||||
|
||||
void
|
||||
pasteuri(GtkClipboard *clipboard, const char *text, gpointer d)
|
||||
{
|
||||
|
|
@ -2138,7 +2118,7 @@ main(int argc, char *argv[])
|
|||
if (argc > 0)
|
||||
arg.v = argv[0];
|
||||
else
|
||||
arg.v = HOMEPAGE;
|
||||
arg.v = "about:blank";
|
||||
|
||||
setup();
|
||||
c = newclient(NULL);
|
||||
|
|
|
|||
Loading…
Reference in a new issue