GopherProxy

	Remove external plugin handling - surf - surf browser, a WebKit based browser
	git clone git://git.suckless.org/surf
	Log
	Files
	Refs
	README
	LICENSE
	---
	commit fce76429b8f8ed48116557df3a478bc435145d94
	parent 7dcce9e1b9dbd2be198c19abd36e71eba7d09063
	Author: Quentin Rameau <[email protected]>
	Date: Fri, 30 Apr 2021 08:39:34 +0200

	Remove external plugin handling

	This has been deprecated since release 2.32.

	Diffstat:
	M config.def.h \| 8 --------
	M surf.1 \| 25 -------------------------
	M surf.c \| 20 --------------------

	3 files changed, 0 insertions(+), 53 deletions(-)
	---
	diff --git a/config.def.h b/config.def.h
	@@ -6,11 +6,6 @@ static char *styledir = "~/.surf/styles/";
	static char *certdir = "~/.surf/certificates/";
	static char *cachedir = "~/.surf/cache/";
	static char *cookiefile = "~/.surf/cookies.txt";
	-static char *plugindirs = (char[]){
	- "~/.surf/plugins/",
	- LIBPREFIX "/mozilla/plugins/",
	- NULL
	-};

	/* Webkit default features */
	/* Highest priority value will be used.
	@@ -41,7 +36,6 @@ static Parameter defconfig[ParameterLast] = {
	[KioskMode] = { { .i = 0 }, },
	[LoadImages] = { { .i = 1 }, },
	[MediaManualPlay] = { { .i = 1 }, },
	- [Plugins] = { { .i = 1 }, },
	[PreferredLanguages] = { { .v = (char *[]){ NULL } }, },
	[RunInFullscreen] = { { .i = 0 }, },
	[ScrollBars] = { { .i = 1 }, },
	@@ -59,7 +53,6 @@ static Parameter defconfig[ParameterLast] = {
	static UriParameters uriparams[] = {
	{ "(://\|\\.)suckless\\.org(/\|$)", {
	[JavaScript] = { { .i = 0 }, 1 },
	- [Plugins] = { { .i = 0 }, 1 },
	}, },
	};

	@@ -182,7 +175,6 @@ static Key keys[] = {
	{ MODKEY\|GDK_SHIFT_MASK, GDK_KEY_g, toggle, { .i = Geolocatio…
	{ 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_v, toggle, { .i = Plugins } …
	{ 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 } },
	diff --git a/surf.1 b/surf.1
	@@ -91,12 +91,6 @@ Disable the Web Inspector (Developer Tools).
	.B \-N
	Enable the Web Inspector (Developer Tools).
	.TP
	-.B \-p
	-Disable Plugins.
	-.TP
	-.B \-P
	-Enable Plugins.
	-.TP
	.B \-r scriptfile
	Specify the user
	.IR scriptfile .
	@@ -231,10 +225,6 @@ Toggle script execution. This will reload the page.
	.B Ctrl\-Shift\-t
	Toggle strict TLS check. This will reload the page.
	.TP
	-.B Ctrl\-Shift\-v
	-Toggle the enabling of plugins on that surf instance. This will reload the
	-page.
	-.TP
	.B F11
	Toggle fullscreen mode.
	.SH INDICATORS OF OPERATION
	@@ -265,9 +255,6 @@ images
	.B s S
	scripts
	.TP
	-.B v V
	-plugins
	-.TP
	.B m M
	styles
	.TP
	@@ -309,22 +296,10 @@ If this variable is set and not empty upon startup, surf …
	.SH SIGNALS
	Surf will reload the current page on
	.BR SIGHUP .
	-.SH PLUGINS
	-For using plugins in surf, first determine your running architecture. Then get
	-the appropriate plugin for that architecture and copy it to
	-.BR /usr/lib/browser-plugins
	-or
	-.BR /usr/lib64/browser-plugins.
	-Surf should load them automatically.
	-.BR
	-If you want to use a 32bit plugin on a 64bit system,
	-.BR nspluginwrapper(1)
	-will help you.
	.SH SEE ALSO
	.BR dmenu(1),
	.BR xprop(1),
	.BR tabbed(1),
	-.BR nspluginwrapper(1),
	.BR xdotool(1)
	.SH BUGS
	Please report them!
	diff --git a/surf.c b/surf.c
	@@ -72,7 +72,6 @@ typedef enum {
	KioskMode,
	LoadImages,
	MediaManualPlay,
	- Plugins,
	PreferredLanguages,
	RunInFullscreen,
	ScrollBars,
	@@ -286,7 +285,6 @@ static ParamName loadcommitted[] = {
	Java,
	// KioskMode,
	MediaManualPlay,
	- Plugins,
	RunInFullscreen,
	ScrollBars,
	SiteQuirks,
	@@ -672,7 +670,6 @@ gettogglestats(Client *c)
	togglestats[3] = curconfig[DiskCache].val.i ? 'D' : 'd';
	togglestats[4] = curconfig[LoadImages].val.i ? 'I' : 'i';
	togglestats[5] = curconfig[JavaScript].val.i ? 'S' : 's';
	- togglestats[6] = curconfig[Plugins].val.i ? 'V' : 'v';
	togglestats[7] = curconfig[Style].val.i ? 'M' : 'm';
	togglestats[8] = curconfig[FrameFlattening].val.i ? 'F' : 'f';
	togglestats[9] = curconfig[Certificate].val.i ? 'X' : 'x';
	@@ -825,9 +822,6 @@ setparameter(Client *c, int refresh, ParamName p, const Arg…
	case MediaManualPlay:
	webkit_settings_set_media_playback_requires_user_gesture(s, a-…
	break;
	- case Plugins:
	- webkit_settings_set_enable_plugins(s, a->i);
	- break;
	case PreferredLanguages:
	return; /* do nothing */
	case RunInFullscreen:
	@@ -1030,7 +1024,6 @@ newwindow(Client c, const Arg a, int noembed)
	cmd[i++] = curconfig[KioskMode].val.i ? "-K" : "-k" ;
	cmd[i++] = curconfig[Style].val.i ? "-M" : "-m" ;
	cmd[i++] = curconfig[Inspector].val.i ? "-N" : "-n" ;
	- cmd[i++] = curconfig[Plugins].val.i ? "-P" : "-p" ;
	if (scriptfile && g_strcmp0(scriptfile, "")) {
	cmd[i++] = "-r";
	cmd[i++] = scriptfile;
	@@ -1130,7 +1123,6 @@ newview(Client c, WebKitWebView rv)
	"enable-html5-local-storage", curconfig[DiskCache].val.i,
	"enable-java", curconfig[Java].val.i,
	"enable-javascript", curconfig[JavaScript].val.i,
	- "enable-plugins", curconfig[Plugins].val.i,
	"enable-accelerated-2d-canvas", curconfig[AcceleratedCanvas…
	"enable-site-specific-quirks", curconfig[SiteQuirks].val.i,
	"enable-smooth-scrolling", curconfig[SmoothScrolling].val.i,
	@@ -1175,10 +1167,6 @@ newview(Client c, WebKitWebView rv)
	webkit_web_context_set_cache_model(context,
	curconfig[DiskCache].val.i ? WEBKIT_CACHE_MODEL_WEB_BROWSE…
	WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
	- /* plugins directories */
	- for (; *plugindirs; ++plugindirs)
	- webkit_web_context_set_additional_plugins_directory(
	- context, *plugindirs);

	/* Currently only works with text file to be compatible with c…
	if (!curconfig[Ephemeral].val.i)
	@@ -2090,14 +2078,6 @@ main(int argc, char *argv[])
	defconfig[Inspector].val.i = 1;
	defconfig[Inspector].prio = 2;
	break;
	- case 'p':
	- defconfig[Plugins].val.i = 0;
	- defconfig[Plugins].prio = 2;
	- break;
	- case 'P':
	- defconfig[Plugins].val.i = 1;
	- defconfig[Plugins].prio = 2;
	- break;
	case 'r':
	scriptfile = EARGF(usage());
	break;