netsurf-test: branch master updated. 7daf034fd94a8a07f9cbb5d070a085de69d184fd
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf-test.git/shortlog/7daf034fd94a8a07...
...commit http://git.netsurf-browser.org/netsurf-test.git/commit/7daf034fd94a8a07f9...
...tree http://git.netsurf-browser.org/netsurf-test.git/tree/7daf034fd94a8a07f9cb...
The branch, master has been updated
via 7daf034fd94a8a07f9cbb5d070a085de69d184fd (commit)
from e995422137ad124718c97326e205ce531d8b0536 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf-test.git/commit/?id=7daf034fd94a8a...
commit 7daf034fd94a8a07f9cbb5d070a085de69d184fd
Author: Daniel Silverstone <dsilvers(a)digital-scurf.org>
Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org>
Async delayed hello world, first draft
Signed-off-by: Daniel Silverstone <dsilvers(a)digital-scurf.org>
diff --git a/cgi-bin/and-then-js-async-cb-adds-timeout.js b/cgi-bin/and-then-js-async-cb-adds-timeout.js
new file mode 100644
index 0000000..b53678b
--- /dev/null
+++ b/cgi-bin/and-then-js-async-cb-adds-timeout.js
@@ -0,0 +1,11 @@
+/* JS returned by and-then-js.cgi
+ * this is to be loaded as an async script
+ */
+
+/* After one second */
+setTimeout(1000, function() {
+ /* Add a <script> tag */
+ var script = document.createElement("SCRIPT");
+ script.src = "https://test.netsurf-browser.org/hello-world.js";
+ document.body.appendChild(script);
+});
diff --git a/cgi-bin/and-then-js.cgi b/cgi-bin/and-then-js.cgi
new file mode 100755
index 0000000..1930df3
--- /dev/null
+++ b/cgi-bin/and-then-js.cgi
@@ -0,0 +1,24 @@
+#!/usr/bin/python3
+
+import cgi
+import cgitb
+import os
+import time
+
+cgitb.enable()
+
+qs = cgi.parse_qs(os.getenv("QUERY_STRING", "t=1&val=async-cb-adds-timeout"))
+
+content = qs.get("val", ["async-cb-adds-timeout"])[0]
+
+print("Content-Type: text/javascript")
+print("")
+
+sleep_time = int(qs.get("t", [1])[0])
+
+print("{}Sleeping for {} seconds".format(prefix, sleep_time))
+
+time.sleep(sleep_time)
+
+print("{}Done sleeping {} seconds".format(prefix,sleep_time))
+
diff --git a/html/async-delayed-hello-world.html b/html/async-delayed-hello-world.html
new file mode 100644
index 0000000..a2cbc20
--- /dev/null
+++ b/html/async-delayed-hello-world.html
@@ -0,0 +1,9 @@
+<html>
+ <head>
+ <title>Hello World</title>
+ <script src="https://test.netsurf-browser.org/cgi-bin/and-then-js.cgi?t=5&val=async-cb..."></script>
+ </head>
+ <body>
+ <h1>Check the console for a hello world log</h1>
+ </body>
+</html>
diff --git a/html/hello-world.js b/html/hello-world.js
new file mode 100644
index 0000000..03a10db
--- /dev/null
+++ b/html/hello-world.js
@@ -0,0 +1,3 @@
+/* Hello World */
+
+console.log("Hello World")
-----------------------------------------------------------------------
Summary of changes:
cgi-bin/and-then-js-async-cb-adds-timeout.js | 11 +++++++++++
cgi-bin/and-then-js.cgi | 24 ++++++++++++++++++++++++
html/async-delayed-hello-world.html | 9 +++++++++
html/hello-world.js | 3 +++
4 files changed, 47 insertions(+)
create mode 100644 cgi-bin/and-then-js-async-cb-adds-timeout.js
create mode 100755 cgi-bin/and-then-js.cgi
create mode 100644 html/async-delayed-hello-world.html
create mode 100644 html/hello-world.js
diff --git a/cgi-bin/and-then-js-async-cb-adds-timeout.js b/cgi-bin/and-then-js-async-cb-adds-timeout.js
new file mode 100644
index 0000000..b53678b
--- /dev/null
+++ b/cgi-bin/and-then-js-async-cb-adds-timeout.js
@@ -0,0 +1,11 @@
+/* JS returned by and-then-js.cgi
+ * this is to be loaded as an async script
+ */
+
+/* After one second */
+setTimeout(1000, function() {
+ /* Add a <script> tag */
+ var script = document.createElement("SCRIPT");
+ script.src = "https://test.netsurf-browser.org/hello-world.js";
+ document.body.appendChild(script);
+});
diff --git a/cgi-bin/and-then-js.cgi b/cgi-bin/and-then-js.cgi
new file mode 100755
index 0000000..1930df3
--- /dev/null
+++ b/cgi-bin/and-then-js.cgi
@@ -0,0 +1,24 @@
+#!/usr/bin/python3
+
+import cgi
+import cgitb
+import os
+import time
+
+cgitb.enable()
+
+qs = cgi.parse_qs(os.getenv("QUERY_STRING", "t=1&val=async-cb-adds-timeout"))
+
+content = qs.get("val", ["async-cb-adds-timeout"])[0]
+
+print("Content-Type: text/javascript")
+print("")
+
+sleep_time = int(qs.get("t", [1])[0])
+
+print("{}Sleeping for {} seconds".format(prefix, sleep_time))
+
+time.sleep(sleep_time)
+
+print("{}Done sleeping {} seconds".format(prefix,sleep_time))
+
diff --git a/html/async-delayed-hello-world.html b/html/async-delayed-hello-world.html
new file mode 100644
index 0000000..a2cbc20
--- /dev/null
+++ b/html/async-delayed-hello-world.html
@@ -0,0 +1,9 @@
+<html>
+ <head>
+ <title>Hello World</title>
+ <script src="https://test.netsurf-browser.org/cgi-bin/and-then-js.cgi?t=5&val=async-cb..."></script>
+ </head>
+ <body>
+ <h1>Check the console for a hello world log</h1>
+ </body>
+</html>
diff --git a/html/hello-world.js b/html/hello-world.js
new file mode 100644
index 0000000..03a10db
--- /dev/null
+++ b/html/hello-world.js
@@ -0,0 +1,3 @@
+/* Hello World */
+
+console.log("Hello World")
--
NetSurf test cases
2 years, 11 months
- 1
- 0
netsurf-wiki: branch master updated. 8638dae7d2f93e7d10bdca48aa680c495996b19c
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf-wiki.git/shortlog/8638dae7d2f93e7d...
...commit http://git.netsurf-browser.org/netsurf-wiki.git/commit/8638dae7d2f93e7d10...
...tree http://git.netsurf-browser.org/netsurf-wiki.git/tree/8638dae7d2f93e7d10bd...
The branch, master has been updated
via 8638dae7d2f93e7d10bdca48aa680c495996b19c (commit)
from fb2a55dd8a1d819d14080020ba4256c9001ad437 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf-wiki.git/commit/?id=8638dae7d2f93e...
commit 8638dae7d2f93e7d10bdca48aa680c495996b19c
Author: Daniel Silverstone <dsilvers(a)digital-scurf.org>
Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org>
Daniel updated the SDK a bit
diff --git a/developer-weekend/feb-2020.mdwn b/developer-weekend/feb-2020.mdwn
index 4caf72f..3a2a180 100644
--- a/developer-weekend/feb-2020.mdwn
+++ b/developer-weekend/feb-2020.mdwn
@@ -99,7 +99,7 @@ Daniel
content state machine when async scripts completed after `dom_to_box` had
finished. Fixed that.
* Went through [[!bug 2736]] and fixed the tests to use `__func__` instead.
-
+* Updated the SDK for iconv and curl versions
Vince
-----------------------------------------------------------------------
Summary of changes:
developer-weekend/feb-2020.mdwn | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/developer-weekend/feb-2020.mdwn b/developer-weekend/feb-2020.mdwn
index 4caf72f..3a2a180 100644
--- a/developer-weekend/feb-2020.mdwn
+++ b/developer-weekend/feb-2020.mdwn
@@ -99,7 +99,7 @@ Daniel
content state machine when async scripts completed after `dom_to_box` had
finished. Fixed that.
* Went through [[!bug 2736]] and fixed the tests to use `__func__` instead.
-
+* Updated the SDK for iconv and curl versions
Vince
--
NetSurf Developer Wiki Backing Store
2 years, 11 months
- 1
- 0
toolchains: branch master updated. 010c70c60d68d3e9147ce5254e801048110913d5
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/010c70c60d68d3e914...
...commit http://git.netsurf-browser.org/toolchains.git/commit/010c70c60d68d3e9147c...
...tree http://git.netsurf-browser.org/toolchains.git/tree/010c70c60d68d3e9147ce5...
The branch, master has been updated
via 010c70c60d68d3e9147ce5254e801048110913d5 (commit)
via b8fbfd0c35cdb89810d115724e39db369a30cbf1 (commit)
from 204d0d8048272e12d8c7dc17535fbf3b1d57e101 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=010c70c60d68d3e9...
commit 010c70c60d68d3e9147ce5254e801048110913d5
Author: Daniel Silverstone <dsilvers(a)digital-scurf.org>
Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org>
SDK: Update libcurl to 7.68.0
Signed-off-by: Daniel Silverstone <dsilvers(a)digital-scurf.org>
diff --git a/sdk/Makefile b/sdk/Makefile
index e56d185..125dfce 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -43,7 +43,7 @@ VERSION_LIBWEBP := 1.0.3
# https://c-ares.haxx.se/
VERSION_LIBCARES := 1.15.0
# https://curl.haxx.se/
-VERSION_LIBCURL := 7.67.0
+VERSION_LIBCURL := 7.68.0
VERSION_LIBGNURX := 2.5.1
# http://mission-base.com/peter/source/
VERSION_LIBPBL := 1_04
commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=b8fbfd0c35cdb898...
commit b8fbfd0c35cdb89810d115724e39db369a30cbf1
Author: Daniel Silverstone <dsilvers(a)digital-scurf.org>
Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org>
SDK: Update iconv to 1.16
Signed-off-by: Daniel Silverstone <dsilvers(a)digital-scurf.org>
diff --git a/sdk/Makefile b/sdk/Makefile
index 76005c0..e56d185 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -26,7 +26,7 @@ endif
# https://zlib.net/
VERSION_ZLIB := 1.2.11
# https://www.gnu.org/software/libiconv/
-VERSION_LIBICONV := 1.15
+VERSION_LIBICONV := 1.16
# https://laurikari.net/tre/
VERSION_LIBTRE := 0.8.0
# https://www.openssl.org/
-----------------------------------------------------------------------
Summary of changes:
sdk/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sdk/Makefile b/sdk/Makefile
index 76005c0..125dfce 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -26,7 +26,7 @@ endif
# https://zlib.net/
VERSION_ZLIB := 1.2.11
# https://www.gnu.org/software/libiconv/
-VERSION_LIBICONV := 1.15
+VERSION_LIBICONV := 1.16
# https://laurikari.net/tre/
VERSION_LIBTRE := 0.8.0
# https://www.openssl.org/
@@ -43,7 +43,7 @@ VERSION_LIBWEBP := 1.0.3
# https://c-ares.haxx.se/
VERSION_LIBCARES := 1.15.0
# https://curl.haxx.se/
-VERSION_LIBCURL := 7.67.0
+VERSION_LIBCURL := 7.68.0
VERSION_LIBGNURX := 2.5.1
# http://mission-base.com/peter/source/
VERSION_LIBPBL := 1_04
--
Cross-compilation toolchains and environments
2 years, 11 months
- 1
- 0
netsurf: branch master updated. release/3.9-423-g9232b8f
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/9232b8fedae8b33e46af0...
...commit http://git.netsurf-browser.org/netsurf.git/commit/9232b8fedae8b33e46af08c...
...tree http://git.netsurf-browser.org/netsurf.git/tree/9232b8fedae8b33e46af08c8c...
The branch, master has been updated
via 9232b8fedae8b33e46af08c8ce3eed63363cff34 (commit)
via 9a98f19611dad6af594cdda78bfeda56e0f9eafc (commit)
via cbaf33e02d45d05e1a23080f9bc0a8cd6c5f96fc (commit)
via 62a32a2a8ad7f683162de7f0f626b6791c4c62be (commit)
via bcf82925a3fc015feb728ede6be8b796d5436630 (commit)
via d1e8c84ea60e727d49ea51191cc4c2b6dcf886db (commit)
via 38c632a7da14c2b0e46b0b81724200578482f4c9 (commit)
from db370bfdb7a091bb85a4e2120e641fea0c663734 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=9232b8fedae8b33e46a...
commit 9232b8fedae8b33e46af08c8ce3eed63363cff34
Author: Michael Drake <michael.drake(a)codethink.co.uk>
Commit: Michael Drake <michael.drake(a)codethink.co.uk>
Docs: Don't mention removed minimum GIF delay option.
diff --git a/docs/netsurf-fb.1 b/docs/netsurf-fb.1
index aa30ab3..045c1fe 100644
--- a/docs/netsurf-fb.1
+++ b/docs/netsurf-fb.1
@@ -95,9 +95,6 @@ Maximum disc cache size.
.B \-\-block_advertisements
Boolean to enable ad blocking.
.TP
-.B \-\-minimum_gif_delay
-Minimum time between gif frames
-.TP
.B \-\-send_referer
Boolean controlling whether referer data should be sent
.TP
diff --git a/docs/netsurf-gtk.1 b/docs/netsurf-gtk.1
index 10f0ae5..2ae61be 100644
--- a/docs/netsurf-gtk.1
+++ b/docs/netsurf-gtk.1
@@ -67,8 +67,6 @@ Maximum memory cache size.
Maximum disc cache size.
.It Fl -block_advertisements
Boolean to enable ad blocking.
-.It Fl -minimum_gif_delay
-Minimum time between gif frames
.It Fl -send_referer
Boolean controlling whether referrer data should be sent
.It Fl -animate_images
diff --git a/docs/netsurf-options.md b/docs/netsurf-options.md
index 5538138..4e87d9b 100644
--- a/docs/netsurf-options.md
+++ b/docs/netsurf-options.md
@@ -44,7 +44,6 @@ General Options
disc_cache_age | int | 28 | Preferred expiry age of disc cache in days.
block_advertisements | bool | false | Whether to block advertisements
do_not_track | bool | false | Disable website tracking [1]
- minimum_gif_delay | int | 10 | Minimum GIF animation delay
send_referer | bool | true | Whether to send the referer HTTP header.
foreground_images | bool | true | Whether to fetch foreground images
background_images | bool | true | Whether to fetch background images
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=9a98f19611dad6af594...
commit 9a98f19611dad6af594cdda78bfeda56e0f9eafc
Author: Michael Drake <michael.drake(a)codethink.co.uk>
Commit: Michael Drake <michael.drake(a)codethink.co.uk>
Core: Remove unused minimum GIF delay option.
diff --git a/desktop/options.h b/desktop/options.h
index 0e56ad3..326e041 100644
--- a/desktop/options.h
+++ b/desktop/options.h
@@ -105,9 +105,6 @@ NSOPTION_BOOL(block_advertisements, false)
* http://www.w3.org/Submission/2011/SUBM-web-tracking-protection-20110224/#... */
NSOPTION_BOOL(do_not_track, false)
-/** Minimum GIF animation delay */
-NSOPTION_INTEGER(minimum_gif_delay, 10)
-
/** Whether to send the referer HTTP header */
NSOPTION_BOOL(send_referer, true)
diff --git a/test/data/Choices b/test/data/Choices
index a1fc15b..511ecf8 100644
--- a/test/data/Choices
+++ b/test/data/Choices
@@ -30,7 +30,6 @@ disc_cache_size:1073741824
disc_cache_age:28
block_advertisements:0
do_not_track:0
-minimum_gif_delay:10
send_referer:1
foreground_images:1
background_images:1
diff --git a/test/data/Choices-all b/test/data/Choices-all
index b430db5..65a467d 100644
--- a/test/data/Choices-all
+++ b/test/data/Choices-all
@@ -20,7 +20,6 @@ disc_cache_size:1073741824
disc_cache_age:28
block_advertisements:0
do_not_track:0
-minimum_gif_delay:10
send_referer:1
foreground_images:1
background_images:1
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=cbaf33e02d45d05e1a2...
commit cbaf33e02d45d05e1a23080f9bc0a8cd6c5f96fc
Author: Michael Drake <michael.drake(a)codethink.co.uk>
Commit: Michael Drake <michael.drake(a)codethink.co.uk>
Windows: Attempt to remove unused minimum GIF delay option.
diff --git a/frontends/windows/prefs.c b/frontends/windows/prefs.c
index 9937f2e..37f5584 100644
--- a/frontends/windows/prefs.c
+++ b/frontends/windows/prefs.c
@@ -230,13 +230,6 @@ static BOOL CALLBACK options_appearance_dialog_handler(HWND hwnd,
sub = GetDlgItem(hwnd, IDC_PREFS_NOANIMATION);
SendMessage(sub, BM_SETCHECK, (WPARAM)((nsoption_bool(animate_images))
? BST_UNCHECKED : BST_CHECKED), 0);
-
- if (nsoption_int(minimum_gif_delay) != 0) {
- sub = GetDlgItem(hwnd, IDC_PREFS_ANIMATIONDELAY);
- snprintf(number, 6, "%.1f", nsoption_int(minimum_gif_delay) /
- 100.0);
- SendMessage(sub, WM_SETTEXT, 0, (LPARAM)number);
- }
break;
case WM_NOTIFY:
@@ -268,18 +261,6 @@ static BOOL CALLBACK options_appearance_dialog_handler(HWND hwnd,
nsoption_set_bool(animate_images,
(IsDlgButtonChecked(hwnd, IDC_PREFS_NOANIMATION) == BST_CHECKED) ? true : false);
-
- sub = GetDlgItem(hwnd, IDC_PREFS_ANIMATIONDELAY);
- len = SendMessage(sub, WM_GETTEXTLENGTH, 0, 0);
- temp = malloc(len + 1);
- if (temp != NULL) {
- SendMessage(sub, WM_GETTEXT, (WPARAM)
- (len + 1), (LPARAM) temp);
- nsoption_set_int(minimum_gif_delay,
- (int)(100 * strtod(temp, NULL)));
- free(temp);
- }
-
break;
case UDN_DELTAPOS: {
@@ -292,11 +273,6 @@ static BOOL CALLBACK options_appearance_dialog_handler(HWND hwnd,
case IDC_PREFS_FONT_MINSIZE_SPIN:
change_spinner(GetDlgItem(hwnd, IDC_PREFS_FONT_MINSIZE), 0.1 * ud->iDelta, 1.0, 50.0);
return TRUE;
-
- case IDC_PREFS_ANIMATIONDELAY_SPIN:
- change_spinner(GetDlgItem(hwnd, IDC_PREFS_ANIMATIONDELAY), 0.1 * ud->iDelta, 0.1, 100.0);
- return TRUE;
-
}
}
break;
diff --git a/frontends/windows/res/resource.rc b/frontends/windows/res/resource.rc
index 2d9e6cf..9e9927b 100644
--- a/frontends/windows/res/resource.rc
+++ b/frontends/windows/res/resource.rc
@@ -242,9 +242,6 @@ FONT 8, "MS Shell Dlg", 0, 0, 1
LTEXT "Animation", IDC_STATIC, 7, 148, 36, 8, NOT WS_GROUP | SS_LEFT, WS_EX_LEFT
CONTROL "", IDC_STATIC, WC_STATIC, SS_ETCHEDFRAME, 43, 152, 170, 1, WS_EX_LEFT
AUTOCHECKBOX "Disable", IDC_PREFS_NOANIMATION, 43, 163, 39, 10, 0, WS_EX_LEFT
- LTEXT "Minimum delay:", IDC_STATIC, 55, 180, 56, 8, SS_LEFT, WS_EX_LEFT
- EDITTEXT IDC_PREFS_ANIMATIONDELAY, 113, 177, 35, 14, NOT WS_BORDER, WS_EX_CLIENTEDGE
- CONTROL "Min delay", IDC_PREFS_ANIMATIONDELAY_SPIN, UPDOWN_CLASS, UDS_ALIGNRIGHT | UDS_AUTOBUDDY, 43, 210, 11, 15, WS_EX_LEFT
}
diff --git a/frontends/windows/resourceid.h b/frontends/windows/resourceid.h
index a0642b1..2933b15 100644
--- a/frontends/windows/resourceid.h
+++ b/frontends/windows/resourceid.h
@@ -88,8 +88,6 @@
#define IDC_PREFS_FANTASY 1219
#define IDC_PREFS_FONTDEF 1220
#define IDC_PREFS_NOANIMATION 1227
-#define IDC_PREFS_ANIMATIONDELAY 1228
-#define IDC_PREFS_ANIMATIONDELAY_SPIN 1229
#define IDD_SSLCERT 1600
#define IDC_SSLCERT_IMG1 1601
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=62a32a2a8ad7f683162...
commit 62a32a2a8ad7f683162de7f0f626b6791c4c62be
Author: Michael Drake <michael.drake(a)codethink.co.uk>
Commit: Michael Drake <michael.drake(a)codethink.co.uk>
Atari: Attempt to remove unused minimum GIF delay option.
diff --git a/frontends/atari/res/netsurf.rsh b/frontends/atari/res/netsurf.rsh
index c856501..be2bc94 100755
--- a/frontends/atari/res/netsurf.rsh
+++ b/frontends/atari/res/netsurf.rsh
@@ -147,9 +147,6 @@
#define SETTINGS_EDIT_MIN_FONT_SIZE 28 /* FTEXT in tree SETTINGS */
#define SETTINGS_DEC_MIN_FONT_SIZE 29 /* BOXCHAR in tree SETTINGS */
#define SETTINGS_INC_MIN_FONT_SIZE 30 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_EDIT_MIN_GIF_DELAY 35 /* FTEXT in tree SETTINGS */
-#define SETTINGS_INC_GIF_DELAY 36 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_DEC_GIF_DELAY 37 /* BOXCHAR in tree SETTINGS */
#define SETTINGS_CB_ENABLE_ANIMATION 40 /* BUTTON in tree SETTINGS */
#define SETTINGS_CB_BG_IMAGES 42 /* BUTTON in tree SETTINGS */
#define SETTINGS_CB_FG_IMAGES 44 /* BUTTON in tree SETTINGS */
diff --git a/frontends/atari/res/netsurf.rsm b/frontends/atari/res/netsurf.rsm
index 6c240d3..3122791 100755
--- a/frontends/atari/res/netsurf.rsm
+++ b/frontends/atari/res/netsurf.rsm
@@ -132,9 +132,6 @@ ResourceMaster v3.651
#O 28@29@EDIT_MIN_FONT_SIZE@@
#O 29@27@DEC_MIN_FONT_SIZE@@
#O 30@27@INC_MIN_FONT_SIZE@@
-#O 35@29@EDIT_MIN_GIF_DELAY@@
-#O 36@27@INC_GIF_DELAY@@
-#O 37@27@DEC_GIF_DELAY@@
#O 40@26@CB_ENABLE_ANIMATION@@
#O 42@26@CB_BG_IMAGES@@
#O 44@26@CB_FG_IMAGES@@
diff --git a/frontends/atari/settings.c b/frontends/atari/settings.c
index 7084bac..d76468c 100644
--- a/frontends/atari/settings.c
+++ b/frontends/atari/settings.c
@@ -48,7 +48,6 @@
extern char options[PATH_MAX];
extern GRECT desk_area;
-static float tmp_option_minimum_gif_delay;
static unsigned tmp_option_memory_cache_size;
static unsigned int tmp_option_disc_cache_size;
static unsigned int tmp_option_expire_url;
@@ -308,10 +307,6 @@ static void display_settings(void)
INPUT_MIN_REFLOW_PERIOD_MAX_LEN );
- tmp_option_minimum_gif_delay = (float)nsoption_int(minimum_gif_delay) / (float)100;
- snprintf( spare, 255, "%01.1f", tmp_option_minimum_gif_delay );
- set_text( SETTINGS_EDIT_MIN_GIF_DELAY, spare, 3 );
-
/* "Network" tab: */
set_text( SETTINGS_EDIT_PROXY_HOST, nsoption_charp(http_proxy_host),
INPUT_PROXY_HOST_MAX_LEN );
@@ -464,11 +459,6 @@ static void form_event(int index, int external)
break;
case SETTINGS_CB_ENABLE_ANIMATION:
- if( checked ) {
- ENABLE_OBJ( SETTINGS_EDIT_MIN_GIF_DELAY );
- } else {
- DISABLE_OBJ( SETTINGS_EDIT_MIN_GIF_DELAY );
- }
break;
case SETTINGS_BT_SEL_FONT_RENDERER:
@@ -697,23 +687,6 @@ static void form_event(int index, int external)
OBJ_REDRAW(SETTINGS_EDIT_HISTORY_AGE);
break;
- case SETTINGS_INC_GIF_DELAY:
- case SETTINGS_DEC_GIF_DELAY:
- if( index == SETTINGS_INC_GIF_DELAY )
- tmp_option_minimum_gif_delay += 0.1;
- else
- tmp_option_minimum_gif_delay -= 0.1;
-
- if( tmp_option_minimum_gif_delay < 0.1 )
- tmp_option_minimum_gif_delay = 0.1;
- if( tmp_option_minimum_gif_delay > 9.0 )
- tmp_option_minimum_gif_delay = 9.0;
- snprintf( spare, 255, "%01.1f", tmp_option_minimum_gif_delay );
- set_text( SETTINGS_EDIT_MIN_GIF_DELAY, spare, 3 );
- is_button = true;
- OBJ_REDRAW(SETTINGS_EDIT_MIN_GIF_DELAY);
- break;
-
case SETTINGS_INC_MIN_FONT_SIZE:
case SETTINGS_DEC_MIN_FONT_SIZE:
if( index == SETTINGS_INC_MIN_FONT_SIZE )
@@ -817,8 +790,6 @@ static void apply_settings(void)
OBJ_SELECTED(SETTINGS_CB_TRANSPARENCY));
nsoption_set_bool(animate_images,
OBJ_SELECTED(SETTINGS_CB_ENABLE_ANIMATION));
- nsoption_set_int(minimum_gif_delay,
- (int)(tmp_option_minimum_gif_delay*100+0.5));
/* nsoption_set_bool(incremental_reflow,
OBJ_SELECTED(SETTINGS_CB_INCREMENTAL_REFLOW));*/
nsoption_set_int(min_reflow_period, tmp_option_min_reflow_period);
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=bcf82925a3fc015feb7...
commit bcf82925a3fc015feb728ede6be8b796d5436630
Author: Michael Drake <michael.drake(a)codethink.co.uk>
Commit: Michael Drake <michael.drake(a)codethink.co.uk>
GTK: Remove unused minimum GIF delay option.
diff --git a/frontends/gtk/preferences.c b/frontends/gtk/preferences.c
index 8ec41ca..a44e724 100644
--- a/frontends/gtk/preferences.c
+++ b/frontends/gtk/preferences.c
@@ -475,9 +475,6 @@ nsgtk_preferences_comboboxLoadImages_realize(GtkWidget *widget,
/* enable animation */
TOGGLEBUTTON_SIGNALS(checkEnableAnimations, animate_images)
-/* frame time */
-SPINBUTTON_SIGNALS(spinAnimationSpeed, minimum_gif_delay, 100.0)
-
/* Fonts */
/* default font */
diff --git a/frontends/gtk/res/options.gtk2.ui b/frontends/gtk/res/options.gtk2.ui
index ed596c0..907d0b5 100644
--- a/frontends/gtk/res/options.gtk2.ui
+++ b/frontends/gtk/res/options.gtk2.ui
@@ -1240,55 +1240,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkHBox" id="hbox9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">preferencesAnimationMinimum</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinAnimationSpeed">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">preferencesAnimationMinimumTooltip</property>
- <property name="invisible_char">●</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
- <property name="adjustment">adjustment_animation_time</property>
- <property name="climb_rate">1</property>
- <property name="digits">1</property>
- <property name="numeric">True</property>
- <property name="update_policy">if-valid</property>
- <signal name="value-changed" handler="nsgtk_preferences_spinAnimationSpeed_valuechanged" swapped="no"/>
- <signal name="realize" handler="nsgtk_preferences_spinAnimationSpeed_realize" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
</object>
</child>
</object>
diff --git a/frontends/gtk/res/options.gtk3.ui b/frontends/gtk/res/options.gtk3.ui
index af0dd5c..4d3a426 100644
--- a/frontends/gtk/res/options.gtk3.ui
+++ b/frontends/gtk/res/options.gtk3.ui
@@ -1085,51 +1085,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkHBox" id="hbox9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">preferencesAnimationMinimum</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinAnimationSpeed">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">preferencesAnimationMinimumTooltip</property>
- <property name="invisible_char">●</property>
- <property name="adjustment">adjustment_animation_time</property>
- <property name="climb_rate">1</property>
- <property name="digits">1</property>
- <property name="numeric">True</property>
- <property name="update_policy">if-valid</property>
- <signal name="value-changed" handler="nsgtk_preferences_spinAnimationSpeed_valuechanged" swapped="no"/>
- <signal name="realize" handler="nsgtk_preferences_spinAnimationSpeed_realize" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
</object>
</child>
</object>
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=d1e8c84ea60e727d49e...
commit d1e8c84ea60e727d49ea51191cc4c2b6dcf886db
Author: Michael Drake <michael.drake(a)codethink.co.uk>
Commit: Michael Drake <michael.drake(a)codethink.co.uk>
Amiga: Try removing unused minimum GIF delay option.
diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c
index 36d8546..fa8cdee 100755
--- a/frontends/amiga/gui_options.c
+++ b/frontends/amiga/gui_options.c
@@ -116,7 +116,6 @@ enum
GID_OPTS_NATIVEBM,
GID_OPTS_SCALEQ,
GID_OPTS_DITHERQ,
- GID_OPTS_ANIMSPEED,
GID_OPTS_ANIMDISABLE,
GID_OPTS_DPI_Y,
GID_OPTS_FONT_SANS,
@@ -377,7 +376,6 @@ static void ami_gui_opts_setup(struct ami_gui_opts_window *gow)
gadlab[GID_OPTS_NATIVEBM] = (char *)ami_utf8_easy((char *)messages_get("CacheNative"));
gadlab[GID_OPTS_SCALEQ] = (char *)ami_utf8_easy((char *)messages_get("ScaleQuality"));
gadlab[GID_OPTS_DITHERQ] = (char *)ami_utf8_easy((char *)messages_get("DitherQuality"));
- gadlab[GID_OPTS_ANIMSPEED] = (char *)ami_utf8_easy((char *)messages_get("AnimSpeedLimit"));
gadlab[GID_OPTS_DPI_Y] = (char *)ami_utf8_easy((char *)messages_get("ResolutionY"));
gadlab[GID_OPTS_ANIMDISABLE] = (char *)ami_utf8_easy((char *)messages_get("AnimDisable"));
gadlab[GID_OPTS_FONT_SANS] = (char *)ami_utf8_easy((char *)messages_get("FontSans"));
@@ -423,7 +421,6 @@ static void ami_gui_opts_setup(struct ami_gui_opts_window *gow)
gadlab[LAB_OPTS_WINTITLE] = (char *)ami_utf8_easy((char *)messages_get("Preferences"));
gadlab[LAB_OPTS_RESTART] = (char *)ami_utf8_easy((char *)messages_get("NeedRestart"));
gadlab[LAB_OPTS_DAYS] = (char *)ami_utf8_easy((char *)messages_get("Days"));
- gadlab[LAB_OPTS_SECS] = (char *)ami_utf8_easy((char *)messages_get("AnimSpeedFrames"));
gadlab[LAB_OPTS_PT] = (char *)ami_utf8_easy((char *)messages_get("Pt"));
gadlab[LAB_OPTS_MM] = (char *)ami_utf8_easy((char *)messages_get("MM"));
gadlab[LAB_OPTS_MB] = (char *)ami_utf8_easy((char *)messages_get("MBytes"));
@@ -514,12 +511,11 @@ void ami_gui_opts_open(void)
ULONG proxytype = 0;
BOOL screenmodedisabled = FALSE, screennamedisabled = FALSE;
BOOL proxyhostdisabled = TRUE, proxyauthdisabled = TRUE, proxybypassdisabled = FALSE;
- BOOL disableanims, animspeeddisabled = FALSE, acceptlangdisabled = FALSE;
+ BOOL disableanims, acceptlangdisabled = FALSE;
BOOL scaleselected = nsoption_bool(scale_quality), scaledisabled = FALSE;
BOOL ditherdisable = TRUE;
BOOL download_notify_disabled = FALSE, tab_always_show_disabled = FALSE;
BOOL ptr_disable = FALSE;
- char animspeed[10];
char *homepage_url_lc = ami_utf8_easy(nsoption_charp(homepage_url));
struct TextAttr fontsans, fontserif, fontmono, fontcursive, fontfantasy;
@@ -583,17 +579,13 @@ void ami_gui_opts_open(void)
proxybypassdisabled = TRUE;
}
- sprintf(animspeed,"%.2f",(float)(nsoption_int(minimum_gif_delay)/100.0));
-
if(nsoption_bool(animate_images))
{
disableanims = FALSE;
- animspeeddisabled = FALSE;
}
else
{
disableanims = TRUE;
- animspeeddisabled = TRUE;
}
if(nsoption_bool(accept_lang_locale))
@@ -1071,24 +1063,6 @@ void ami_gui_opts_open(void)
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_ANIMS],
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_ANIMSPEED] = StringObj,
- GA_ID, GID_OPTS_ANIMSPEED,
- GA_RelVerify, TRUE,
- GA_Disabled, animspeeddisabled,
- STRINGA_HookType, SHK_FLOAT,
- STRINGA_TextVal, animspeed,
- STRINGA_BufferPos,0,
- StringEnd,
- CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
- LABEL_Text, gadlab[LAB_OPTS_SECS],
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
- LABEL_Text, gadlab[GID_OPTS_ANIMSPEED],
- LabelEnd,
LAYOUT_AddChild, gow->objects[GID_OPTS_ANIMDISABLE] = CheckBoxObj,
GA_ID, GID_OPTS_ANIMDISABLE,
GA_RelVerify, TRUE,
@@ -1684,7 +1658,6 @@ void ami_gui_opts_open(void)
static void ami_gui_opts_use(bool save)
{
ULONG data, id = 0;
- float animspeed;
struct TextAttr *tattr;
char *dot;
bool rescan_fonts = false;
@@ -1835,10 +1808,6 @@ static void ami_gui_opts_use(bool save)
GetAttr(CHOOSER_Selected,gow->objects[GID_OPTS_DITHERQ],(ULONG *)&nsoption_int(dither_quality));
- GetAttr(STRINGA_TextVal,gow->objects[GID_OPTS_ANIMSPEED],(ULONG *)&data);
- animspeed = strtof((char *)data, NULL);
- nsoption_set_int(minimum_gif_delay, (int)(animspeed * 100));
-
GetAttr(GA_Selected,gow->objects[GID_OPTS_ANIMDISABLE],(ULONG *)&data);
if(data) {
nsoption_set_bool(animate_images, false);
@@ -2250,8 +2219,6 @@ static BOOL ami_gui_opts_event(void *w)
break;
case GID_OPTS_ANIMDISABLE:
- RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_ANIMSPEED],
- gow->win,NULL, GA_Disabled, code, TAG_DONE);
break;
case GID_OPTS_FONT_SANS:
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=38c632a7da14c2b0e46...
commit 38c632a7da14c2b0e46b0b81724200578482f4c9
Author: Michael Drake <michael.drake(a)codethink.co.uk>
Commit: Michael Drake <michael.drake(a)codethink.co.uk>
RISC OS: Remove unused minimum gif delay from Choices.
The templates might need work to remove empty space.
diff --git a/frontends/riscos/configure/con_image.c b/frontends/riscos/configure/con_image.c
index c7fc7f3..3f12f89 100644
--- a/frontends/riscos/configure/con_image.c
+++ b/frontends/riscos/configure/con_image.c
@@ -38,11 +38,6 @@
#define IMAGE_BACKGROUND_FIELD 6
#define IMAGE_BACKGROUND_MENU 7
#define IMAGE_CURRENT_DISPLAY 8
-#define IMAGE_SPEED_TEXT 11
-#define IMAGE_SPEED_FIELD 12
-#define IMAGE_SPEED_DEC 13
-#define IMAGE_SPEED_INC 14
-#define IMAGE_SPEED_CS 15
#define IMAGE_DISABLE_ANIMATION 16
#define IMAGE_DEFAULT_BUTTON 17
#define IMAGE_CANCEL_BUTTON 18
@@ -88,8 +83,6 @@ bool ro_gui_options_image_initialise(wimp_w w)
image_quality_menu->entries[i].
data.indirected_text.text, true);
}
- ro_gui_set_icon_decimal(w, IMAGE_SPEED_FIELD,
- nsoption_int(minimum_gif_delay), 2);
ro_gui_set_icon_selected_state(w, IMAGE_DISABLE_ANIMATION,
!nsoption_bool(animate_images));
ro_gui_options_update_shading(w);
@@ -99,11 +92,7 @@ bool ro_gui_options_image_initialise(wimp_w w)
IMAGE_FOREGROUND_MENU, image_quality_menu);
ro_gui_wimp_event_register_menu_gright(w, IMAGE_BACKGROUND_FIELD,
IMAGE_BACKGROUND_MENU, image_quality_menu);
- ro_gui_wimp_event_register_text_field(w, IMAGE_SPEED_TEXT);
- ro_gui_wimp_event_register_numeric_field(w, IMAGE_SPEED_FIELD,
- IMAGE_SPEED_INC, IMAGE_SPEED_DEC, 0, 6000, 10, 2);
ro_gui_wimp_event_register_checkbox(w, IMAGE_DISABLE_ANIMATION);
- ro_gui_wimp_event_register_text_field(w, IMAGE_SPEED_CS);
ro_gui_wimp_event_register_redraw_window(w,
ro_gui_options_image_redraw);
ro_gui_wimp_event_register_mouse_click(w,
@@ -218,8 +207,6 @@ bool ro_gui_options_image_click(wimp_pointer *pointer)
IMAGE_BACKGROUND_FIELD,
image_quality_menu->entries[2].
data.indirected_text.text, true);
- ro_gui_set_icon_decimal(pointer->w, IMAGE_SPEED_FIELD,
- 10, 2);
ro_gui_set_icon_selected_state(pointer->w,
IMAGE_DISABLE_ANIMATION, false);
case IMAGE_DISABLE_ANIMATION:
@@ -245,11 +232,6 @@ void ro_gui_options_update_shading(wimp_w w)
bool shaded;
shaded = ro_gui_get_icon_selected_state(w, IMAGE_DISABLE_ANIMATION);
- ro_gui_set_icon_shaded_state(w, IMAGE_SPEED_TEXT, shaded);
- ro_gui_set_icon_shaded_state(w, IMAGE_SPEED_FIELD, shaded);
- ro_gui_set_icon_shaded_state(w, IMAGE_SPEED_DEC, shaded);
- ro_gui_set_icon_shaded_state(w, IMAGE_SPEED_INC, shaded);
- ro_gui_set_icon_shaded_state(w, IMAGE_SPEED_CS, shaded);
}
bool ro_gui_options_image_ok(wimp_w w)
@@ -258,9 +240,6 @@ bool ro_gui_options_image_ok(wimp_w w)
(unsigned int *)&nsoption_int(plot_bg_quality),
(unsigned int *)&nsoption_int(plot_fg_quality));
- nsoption_set_int(minimum_gif_delay,
- ro_gui_get_icon_decimal(w, IMAGE_SPEED_FIELD, 2));
-
nsoption_set_bool(animate_images,
!ro_gui_get_icon_selected_state(w,
IMAGE_DISABLE_ANIMATION));
diff --git a/frontends/riscos/templates/de b/frontends/riscos/templates/de
index ee35750..ef67b2c 100644
--- a/frontends/riscos/templates/de
+++ b/frontends/riscos/templates/de
@@ -858,56 +858,6 @@ wimp_window {
text_and_sprite.validation:""
}
wimp_icon {
- extent:20,-404,208,-360
- icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text.text:"Speedlimit"
- text.size:12
- text.validation:""
- }
- wimp_icon {
- extent:212,-408,380,-356
- icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_WHITE
- text.text:"12.34"
- text.size:*
- text.validation:"Pptr_write;Kta"
- }
- wimp_icon {
- extent:396,-400,428,-368
- icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text_and_sprite.text:""
- text_and_sprite.size:*
- text_and_sprite.validation:"r5;sdown,pdown"
- }
- wimp_icon {
- extent:428,-400,460,-368
- icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text_and_sprite.text:""
- text_and_sprite.size:*
- text_and_sprite.validation:"r5;sup,pup"
- }
- wimp_icon {
- extent:468,-404,612,-360
- icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text.text:"Sekunden"
- text.size:*
- text.validation:""
- }
- wimp_icon {
extent:212,-460,640,-416
icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO
icon_esg:0
diff --git a/frontends/riscos/templates/en b/frontends/riscos/templates/en
index fa7c2ce..8db0f94 100644
--- a/frontends/riscos/templates/en
+++ b/frontends/riscos/templates/en
@@ -856,56 +856,6 @@ wimp_window {
text_and_sprite.validation:""
}
wimp_icon {
- extent:20,-404,208,-360
- icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text.text:"Speed limit"
- text.size:*
- text.validation:""
- }
- wimp_icon {
- extent:212,-408,380,-356
- icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_WHITE
- text.text:"12.34"
- text.size:*
- text.validation:"Pptr_write;Kta;A0-9."
- }
- wimp_icon {
- extent:396,-400,428,-368
- icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text_and_sprite.text:""
- text_and_sprite.size:*
- text_and_sprite.validation:"r5;sdown,pdown"
- }
- wimp_icon {
- extent:428,-400,460,-368
- icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text_and_sprite.text:""
- text_and_sprite.size:*
- text_and_sprite.validation:"r5;sup,pup"
- }
- wimp_icon {
- extent:468,-404,592,-360
- icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text.text:"seconds"
- text.size:*
- text.validation:""
- }
- wimp_icon {
extent:212,-460,556,-416
icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO
icon_esg:0
diff --git a/frontends/riscos/templates/fr b/frontends/riscos/templates/fr
index 48b4ab0..9ca0d7c 100644
--- a/frontends/riscos/templates/fr
+++ b/frontends/riscos/templates/fr
@@ -860,56 +860,6 @@ wimp_window {
text_and_sprite.validation:""
}
wimp_icon {
- extent:20,-404,208,-360
- icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text.text:"Vitesse limite"
- text.size:*
- text.validation:""
- }
- wimp_icon {
- extent:212,-408,380,-356
- icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_WHITE
- text.text:"12.34"
- text.size:*
- text.validation:"Pptr_write;Kta"
- }
- wimp_icon {
- extent:396,-400,428,-368
- icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text_and_sprite.text:""
- text_and_sprite.size:*
- text_and_sprite.validation:"r5;sdown,pdown"
- }
- wimp_icon {
- extent:428,-400,460,-368
- icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text_and_sprite.text:""
- text_and_sprite.size:*
- text_and_sprite.validation:"r5;sup,pup"
- }
- wimp_icon {
- extent:468,-404,592,-360
- icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text.text:"secondes"
- text.size:*
- text.validation:""
- }
- wimp_icon {
extent:212,-460,628,-416
icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO
icon_esg:0
diff --git a/frontends/riscos/templates/nl b/frontends/riscos/templates/nl
index 19b6e70..a3426a1 100644
--- a/frontends/riscos/templates/nl
+++ b/frontends/riscos/templates/nl
@@ -858,56 +858,6 @@ wimp_window {
text_and_sprite.validation:""
}
wimp_icon {
- extent:20,-404,232,-360
- icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text.text:"Animatietijd"
- text.size:15
- text.validation:""
- }
- wimp_icon {
- extent:236,-408,404,-356
- icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_WHITE
- text.text:"12.34"
- text.size:6
- text.validation:"Pptr_write;Kta;A0-9."
- }
- wimp_icon {
- extent:420,-400,452,-368
- icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text_and_sprite.text:""
- text_and_sprite.size:1
- text_and_sprite.validation:"r5;sdown,pdown"
- }
- wimp_icon {
- extent:452,-400,484,-368
- icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text_and_sprite.text:""
- text_and_sprite.size:1
- text_and_sprite.validation:"r5;sup,pup"
- }
- wimp_icon {
- extent:492,-404,644,-360
- icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text.text:"seconden"
- text.size:9
- text.validation:""
- }
- wimp_icon {
extent:236,-460,616,-416
icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO
icon_esg:0
-----------------------------------------------------------------------
Summary of changes:
desktop/options.h | 3 --
docs/netsurf-fb.1 | 3 --
docs/netsurf-gtk.1 | 2 --
docs/netsurf-options.md | 1 -
frontends/amiga/gui_options.c | 35 +---------------------
frontends/atari/res/netsurf.rsh | 3 --
frontends/atari/res/netsurf.rsm | 3 --
frontends/atari/settings.c | 29 ------------------
frontends/gtk/preferences.c | 3 --
frontends/gtk/res/options.gtk2.ui | 49 -------------------------------
frontends/gtk/res/options.gtk3.ui | 45 ----------------------------
frontends/riscos/configure/con_image.c | 21 --------------
frontends/riscos/templates/de | 50 --------------------------------
frontends/riscos/templates/en | 50 --------------------------------
frontends/riscos/templates/fr | 50 --------------------------------
frontends/riscos/templates/nl | 50 --------------------------------
frontends/windows/prefs.c | 24 ---------------
frontends/windows/res/resource.rc | 3 --
frontends/windows/resourceid.h | 2 --
test/data/Choices | 1 -
test/data/Choices-all | 1 -
21 files changed, 1 insertion(+), 427 deletions(-)
diff --git a/desktop/options.h b/desktop/options.h
index 0e56ad3..326e041 100644
--- a/desktop/options.h
+++ b/desktop/options.h
@@ -105,9 +105,6 @@ NSOPTION_BOOL(block_advertisements, false)
* http://www.w3.org/Submission/2011/SUBM-web-tracking-protection-20110224/#... */
NSOPTION_BOOL(do_not_track, false)
-/** Minimum GIF animation delay */
-NSOPTION_INTEGER(minimum_gif_delay, 10)
-
/** Whether to send the referer HTTP header */
NSOPTION_BOOL(send_referer, true)
diff --git a/docs/netsurf-fb.1 b/docs/netsurf-fb.1
index aa30ab3..045c1fe 100644
--- a/docs/netsurf-fb.1
+++ b/docs/netsurf-fb.1
@@ -95,9 +95,6 @@ Maximum disc cache size.
.B \-\-block_advertisements
Boolean to enable ad blocking.
.TP
-.B \-\-minimum_gif_delay
-Minimum time between gif frames
-.TP
.B \-\-send_referer
Boolean controlling whether referer data should be sent
.TP
diff --git a/docs/netsurf-gtk.1 b/docs/netsurf-gtk.1
index 10f0ae5..2ae61be 100644
--- a/docs/netsurf-gtk.1
+++ b/docs/netsurf-gtk.1
@@ -67,8 +67,6 @@ Maximum memory cache size.
Maximum disc cache size.
.It Fl -block_advertisements
Boolean to enable ad blocking.
-.It Fl -minimum_gif_delay
-Minimum time between gif frames
.It Fl -send_referer
Boolean controlling whether referrer data should be sent
.It Fl -animate_images
diff --git a/docs/netsurf-options.md b/docs/netsurf-options.md
index 5538138..4e87d9b 100644
--- a/docs/netsurf-options.md
+++ b/docs/netsurf-options.md
@@ -44,7 +44,6 @@ General Options
disc_cache_age | int | 28 | Preferred expiry age of disc cache in days.
block_advertisements | bool | false | Whether to block advertisements
do_not_track | bool | false | Disable website tracking [1]
- minimum_gif_delay | int | 10 | Minimum GIF animation delay
send_referer | bool | true | Whether to send the referer HTTP header.
foreground_images | bool | true | Whether to fetch foreground images
background_images | bool | true | Whether to fetch background images
diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c
index 36d8546..fa8cdee 100755
--- a/frontends/amiga/gui_options.c
+++ b/frontends/amiga/gui_options.c
@@ -116,7 +116,6 @@ enum
GID_OPTS_NATIVEBM,
GID_OPTS_SCALEQ,
GID_OPTS_DITHERQ,
- GID_OPTS_ANIMSPEED,
GID_OPTS_ANIMDISABLE,
GID_OPTS_DPI_Y,
GID_OPTS_FONT_SANS,
@@ -377,7 +376,6 @@ static void ami_gui_opts_setup(struct ami_gui_opts_window *gow)
gadlab[GID_OPTS_NATIVEBM] = (char *)ami_utf8_easy((char *)messages_get("CacheNative"));
gadlab[GID_OPTS_SCALEQ] = (char *)ami_utf8_easy((char *)messages_get("ScaleQuality"));
gadlab[GID_OPTS_DITHERQ] = (char *)ami_utf8_easy((char *)messages_get("DitherQuality"));
- gadlab[GID_OPTS_ANIMSPEED] = (char *)ami_utf8_easy((char *)messages_get("AnimSpeedLimit"));
gadlab[GID_OPTS_DPI_Y] = (char *)ami_utf8_easy((char *)messages_get("ResolutionY"));
gadlab[GID_OPTS_ANIMDISABLE] = (char *)ami_utf8_easy((char *)messages_get("AnimDisable"));
gadlab[GID_OPTS_FONT_SANS] = (char *)ami_utf8_easy((char *)messages_get("FontSans"));
@@ -423,7 +421,6 @@ static void ami_gui_opts_setup(struct ami_gui_opts_window *gow)
gadlab[LAB_OPTS_WINTITLE] = (char *)ami_utf8_easy((char *)messages_get("Preferences"));
gadlab[LAB_OPTS_RESTART] = (char *)ami_utf8_easy((char *)messages_get("NeedRestart"));
gadlab[LAB_OPTS_DAYS] = (char *)ami_utf8_easy((char *)messages_get("Days"));
- gadlab[LAB_OPTS_SECS] = (char *)ami_utf8_easy((char *)messages_get("AnimSpeedFrames"));
gadlab[LAB_OPTS_PT] = (char *)ami_utf8_easy((char *)messages_get("Pt"));
gadlab[LAB_OPTS_MM] = (char *)ami_utf8_easy((char *)messages_get("MM"));
gadlab[LAB_OPTS_MB] = (char *)ami_utf8_easy((char *)messages_get("MBytes"));
@@ -514,12 +511,11 @@ void ami_gui_opts_open(void)
ULONG proxytype = 0;
BOOL screenmodedisabled = FALSE, screennamedisabled = FALSE;
BOOL proxyhostdisabled = TRUE, proxyauthdisabled = TRUE, proxybypassdisabled = FALSE;
- BOOL disableanims, animspeeddisabled = FALSE, acceptlangdisabled = FALSE;
+ BOOL disableanims, acceptlangdisabled = FALSE;
BOOL scaleselected = nsoption_bool(scale_quality), scaledisabled = FALSE;
BOOL ditherdisable = TRUE;
BOOL download_notify_disabled = FALSE, tab_always_show_disabled = FALSE;
BOOL ptr_disable = FALSE;
- char animspeed[10];
char *homepage_url_lc = ami_utf8_easy(nsoption_charp(homepage_url));
struct TextAttr fontsans, fontserif, fontmono, fontcursive, fontfantasy;
@@ -583,17 +579,13 @@ void ami_gui_opts_open(void)
proxybypassdisabled = TRUE;
}
- sprintf(animspeed,"%.2f",(float)(nsoption_int(minimum_gif_delay)/100.0));
-
if(nsoption_bool(animate_images))
{
disableanims = FALSE;
- animspeeddisabled = FALSE;
}
else
{
disableanims = TRUE;
- animspeeddisabled = TRUE;
}
if(nsoption_bool(accept_lang_locale))
@@ -1071,24 +1063,6 @@ void ami_gui_opts_open(void)
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_ANIMS],
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_ANIMSPEED] = StringObj,
- GA_ID, GID_OPTS_ANIMSPEED,
- GA_RelVerify, TRUE,
- GA_Disabled, animspeeddisabled,
- STRINGA_HookType, SHK_FLOAT,
- STRINGA_TextVal, animspeed,
- STRINGA_BufferPos,0,
- StringEnd,
- CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
- LABEL_Text, gadlab[LAB_OPTS_SECS],
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
- LABEL_Text, gadlab[GID_OPTS_ANIMSPEED],
- LabelEnd,
LAYOUT_AddChild, gow->objects[GID_OPTS_ANIMDISABLE] = CheckBoxObj,
GA_ID, GID_OPTS_ANIMDISABLE,
GA_RelVerify, TRUE,
@@ -1684,7 +1658,6 @@ void ami_gui_opts_open(void)
static void ami_gui_opts_use(bool save)
{
ULONG data, id = 0;
- float animspeed;
struct TextAttr *tattr;
char *dot;
bool rescan_fonts = false;
@@ -1835,10 +1808,6 @@ static void ami_gui_opts_use(bool save)
GetAttr(CHOOSER_Selected,gow->objects[GID_OPTS_DITHERQ],(ULONG *)&nsoption_int(dither_quality));
- GetAttr(STRINGA_TextVal,gow->objects[GID_OPTS_ANIMSPEED],(ULONG *)&data);
- animspeed = strtof((char *)data, NULL);
- nsoption_set_int(minimum_gif_delay, (int)(animspeed * 100));
-
GetAttr(GA_Selected,gow->objects[GID_OPTS_ANIMDISABLE],(ULONG *)&data);
if(data) {
nsoption_set_bool(animate_images, false);
@@ -2250,8 +2219,6 @@ static BOOL ami_gui_opts_event(void *w)
break;
case GID_OPTS_ANIMDISABLE:
- RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_ANIMSPEED],
- gow->win,NULL, GA_Disabled, code, TAG_DONE);
break;
case GID_OPTS_FONT_SANS:
diff --git a/frontends/atari/res/netsurf.rsh b/frontends/atari/res/netsurf.rsh
index c856501..be2bc94 100755
--- a/frontends/atari/res/netsurf.rsh
+++ b/frontends/atari/res/netsurf.rsh
@@ -147,9 +147,6 @@
#define SETTINGS_EDIT_MIN_FONT_SIZE 28 /* FTEXT in tree SETTINGS */
#define SETTINGS_DEC_MIN_FONT_SIZE 29 /* BOXCHAR in tree SETTINGS */
#define SETTINGS_INC_MIN_FONT_SIZE 30 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_EDIT_MIN_GIF_DELAY 35 /* FTEXT in tree SETTINGS */
-#define SETTINGS_INC_GIF_DELAY 36 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_DEC_GIF_DELAY 37 /* BOXCHAR in tree SETTINGS */
#define SETTINGS_CB_ENABLE_ANIMATION 40 /* BUTTON in tree SETTINGS */
#define SETTINGS_CB_BG_IMAGES 42 /* BUTTON in tree SETTINGS */
#define SETTINGS_CB_FG_IMAGES 44 /* BUTTON in tree SETTINGS */
diff --git a/frontends/atari/res/netsurf.rsm b/frontends/atari/res/netsurf.rsm
index 6c240d3..3122791 100755
--- a/frontends/atari/res/netsurf.rsm
+++ b/frontends/atari/res/netsurf.rsm
@@ -132,9 +132,6 @@ ResourceMaster v3.651
#O 28@29@EDIT_MIN_FONT_SIZE@@
#O 29@27@DEC_MIN_FONT_SIZE@@
#O 30@27@INC_MIN_FONT_SIZE@@
-#O 35@29@EDIT_MIN_GIF_DELAY@@
-#O 36@27@INC_GIF_DELAY@@
-#O 37@27@DEC_GIF_DELAY@@
#O 40@26@CB_ENABLE_ANIMATION@@
#O 42@26@CB_BG_IMAGES@@
#O 44@26@CB_FG_IMAGES@@
diff --git a/frontends/atari/settings.c b/frontends/atari/settings.c
index 7084bac..d76468c 100644
--- a/frontends/atari/settings.c
+++ b/frontends/atari/settings.c
@@ -48,7 +48,6 @@
extern char options[PATH_MAX];
extern GRECT desk_area;
-static float tmp_option_minimum_gif_delay;
static unsigned tmp_option_memory_cache_size;
static unsigned int tmp_option_disc_cache_size;
static unsigned int tmp_option_expire_url;
@@ -308,10 +307,6 @@ static void display_settings(void)
INPUT_MIN_REFLOW_PERIOD_MAX_LEN );
- tmp_option_minimum_gif_delay = (float)nsoption_int(minimum_gif_delay) / (float)100;
- snprintf( spare, 255, "%01.1f", tmp_option_minimum_gif_delay );
- set_text( SETTINGS_EDIT_MIN_GIF_DELAY, spare, 3 );
-
/* "Network" tab: */
set_text( SETTINGS_EDIT_PROXY_HOST, nsoption_charp(http_proxy_host),
INPUT_PROXY_HOST_MAX_LEN );
@@ -464,11 +459,6 @@ static void form_event(int index, int external)
break;
case SETTINGS_CB_ENABLE_ANIMATION:
- if( checked ) {
- ENABLE_OBJ( SETTINGS_EDIT_MIN_GIF_DELAY );
- } else {
- DISABLE_OBJ( SETTINGS_EDIT_MIN_GIF_DELAY );
- }
break;
case SETTINGS_BT_SEL_FONT_RENDERER:
@@ -697,23 +687,6 @@ static void form_event(int index, int external)
OBJ_REDRAW(SETTINGS_EDIT_HISTORY_AGE);
break;
- case SETTINGS_INC_GIF_DELAY:
- case SETTINGS_DEC_GIF_DELAY:
- if( index == SETTINGS_INC_GIF_DELAY )
- tmp_option_minimum_gif_delay += 0.1;
- else
- tmp_option_minimum_gif_delay -= 0.1;
-
- if( tmp_option_minimum_gif_delay < 0.1 )
- tmp_option_minimum_gif_delay = 0.1;
- if( tmp_option_minimum_gif_delay > 9.0 )
- tmp_option_minimum_gif_delay = 9.0;
- snprintf( spare, 255, "%01.1f", tmp_option_minimum_gif_delay );
- set_text( SETTINGS_EDIT_MIN_GIF_DELAY, spare, 3 );
- is_button = true;
- OBJ_REDRAW(SETTINGS_EDIT_MIN_GIF_DELAY);
- break;
-
case SETTINGS_INC_MIN_FONT_SIZE:
case SETTINGS_DEC_MIN_FONT_SIZE:
if( index == SETTINGS_INC_MIN_FONT_SIZE )
@@ -817,8 +790,6 @@ static void apply_settings(void)
OBJ_SELECTED(SETTINGS_CB_TRANSPARENCY));
nsoption_set_bool(animate_images,
OBJ_SELECTED(SETTINGS_CB_ENABLE_ANIMATION));
- nsoption_set_int(minimum_gif_delay,
- (int)(tmp_option_minimum_gif_delay*100+0.5));
/* nsoption_set_bool(incremental_reflow,
OBJ_SELECTED(SETTINGS_CB_INCREMENTAL_REFLOW));*/
nsoption_set_int(min_reflow_period, tmp_option_min_reflow_period);
diff --git a/frontends/gtk/preferences.c b/frontends/gtk/preferences.c
index 8ec41ca..a44e724 100644
--- a/frontends/gtk/preferences.c
+++ b/frontends/gtk/preferences.c
@@ -475,9 +475,6 @@ nsgtk_preferences_comboboxLoadImages_realize(GtkWidget *widget,
/* enable animation */
TOGGLEBUTTON_SIGNALS(checkEnableAnimations, animate_images)
-/* frame time */
-SPINBUTTON_SIGNALS(spinAnimationSpeed, minimum_gif_delay, 100.0)
-
/* Fonts */
/* default font */
diff --git a/frontends/gtk/res/options.gtk2.ui b/frontends/gtk/res/options.gtk2.ui
index ed596c0..907d0b5 100644
--- a/frontends/gtk/res/options.gtk2.ui
+++ b/frontends/gtk/res/options.gtk2.ui
@@ -1240,55 +1240,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkHBox" id="hbox9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">preferencesAnimationMinimum</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinAnimationSpeed">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">preferencesAnimationMinimumTooltip</property>
- <property name="invisible_char">●</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
- <property name="adjustment">adjustment_animation_time</property>
- <property name="climb_rate">1</property>
- <property name="digits">1</property>
- <property name="numeric">True</property>
- <property name="update_policy">if-valid</property>
- <signal name="value-changed" handler="nsgtk_preferences_spinAnimationSpeed_valuechanged" swapped="no"/>
- <signal name="realize" handler="nsgtk_preferences_spinAnimationSpeed_realize" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
</object>
</child>
</object>
diff --git a/frontends/gtk/res/options.gtk3.ui b/frontends/gtk/res/options.gtk3.ui
index af0dd5c..4d3a426 100644
--- a/frontends/gtk/res/options.gtk3.ui
+++ b/frontends/gtk/res/options.gtk3.ui
@@ -1085,51 +1085,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkHBox" id="hbox9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">preferencesAnimationMinimum</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinAnimationSpeed">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">preferencesAnimationMinimumTooltip</property>
- <property name="invisible_char">●</property>
- <property name="adjustment">adjustment_animation_time</property>
- <property name="climb_rate">1</property>
- <property name="digits">1</property>
- <property name="numeric">True</property>
- <property name="update_policy">if-valid</property>
- <signal name="value-changed" handler="nsgtk_preferences_spinAnimationSpeed_valuechanged" swapped="no"/>
- <signal name="realize" handler="nsgtk_preferences_spinAnimationSpeed_realize" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
</object>
</child>
</object>
diff --git a/frontends/riscos/configure/con_image.c b/frontends/riscos/configure/con_image.c
index c7fc7f3..3f12f89 100644
--- a/frontends/riscos/configure/con_image.c
+++ b/frontends/riscos/configure/con_image.c
@@ -38,11 +38,6 @@
#define IMAGE_BACKGROUND_FIELD 6
#define IMAGE_BACKGROUND_MENU 7
#define IMAGE_CURRENT_DISPLAY 8
-#define IMAGE_SPEED_TEXT 11
-#define IMAGE_SPEED_FIELD 12
-#define IMAGE_SPEED_DEC 13
-#define IMAGE_SPEED_INC 14
-#define IMAGE_SPEED_CS 15
#define IMAGE_DISABLE_ANIMATION 16
#define IMAGE_DEFAULT_BUTTON 17
#define IMAGE_CANCEL_BUTTON 18
@@ -88,8 +83,6 @@ bool ro_gui_options_image_initialise(wimp_w w)
image_quality_menu->entries[i].
data.indirected_text.text, true);
}
- ro_gui_set_icon_decimal(w, IMAGE_SPEED_FIELD,
- nsoption_int(minimum_gif_delay), 2);
ro_gui_set_icon_selected_state(w, IMAGE_DISABLE_ANIMATION,
!nsoption_bool(animate_images));
ro_gui_options_update_shading(w);
@@ -99,11 +92,7 @@ bool ro_gui_options_image_initialise(wimp_w w)
IMAGE_FOREGROUND_MENU, image_quality_menu);
ro_gui_wimp_event_register_menu_gright(w, IMAGE_BACKGROUND_FIELD,
IMAGE_BACKGROUND_MENU, image_quality_menu);
- ro_gui_wimp_event_register_text_field(w, IMAGE_SPEED_TEXT);
- ro_gui_wimp_event_register_numeric_field(w, IMAGE_SPEED_FIELD,
- IMAGE_SPEED_INC, IMAGE_SPEED_DEC, 0, 6000, 10, 2);
ro_gui_wimp_event_register_checkbox(w, IMAGE_DISABLE_ANIMATION);
- ro_gui_wimp_event_register_text_field(w, IMAGE_SPEED_CS);
ro_gui_wimp_event_register_redraw_window(w,
ro_gui_options_image_redraw);
ro_gui_wimp_event_register_mouse_click(w,
@@ -218,8 +207,6 @@ bool ro_gui_options_image_click(wimp_pointer *pointer)
IMAGE_BACKGROUND_FIELD,
image_quality_menu->entries[2].
data.indirected_text.text, true);
- ro_gui_set_icon_decimal(pointer->w, IMAGE_SPEED_FIELD,
- 10, 2);
ro_gui_set_icon_selected_state(pointer->w,
IMAGE_DISABLE_ANIMATION, false);
case IMAGE_DISABLE_ANIMATION:
@@ -245,11 +232,6 @@ void ro_gui_options_update_shading(wimp_w w)
bool shaded;
shaded = ro_gui_get_icon_selected_state(w, IMAGE_DISABLE_ANIMATION);
- ro_gui_set_icon_shaded_state(w, IMAGE_SPEED_TEXT, shaded);
- ro_gui_set_icon_shaded_state(w, IMAGE_SPEED_FIELD, shaded);
- ro_gui_set_icon_shaded_state(w, IMAGE_SPEED_DEC, shaded);
- ro_gui_set_icon_shaded_state(w, IMAGE_SPEED_INC, shaded);
- ro_gui_set_icon_shaded_state(w, IMAGE_SPEED_CS, shaded);
}
bool ro_gui_options_image_ok(wimp_w w)
@@ -258,9 +240,6 @@ bool ro_gui_options_image_ok(wimp_w w)
(unsigned int *)&nsoption_int(plot_bg_quality),
(unsigned int *)&nsoption_int(plot_fg_quality));
- nsoption_set_int(minimum_gif_delay,
- ro_gui_get_icon_decimal(w, IMAGE_SPEED_FIELD, 2));
-
nsoption_set_bool(animate_images,
!ro_gui_get_icon_selected_state(w,
IMAGE_DISABLE_ANIMATION));
diff --git a/frontends/riscos/templates/de b/frontends/riscos/templates/de
index ee35750..ef67b2c 100644
--- a/frontends/riscos/templates/de
+++ b/frontends/riscos/templates/de
@@ -858,56 +858,6 @@ wimp_window {
text_and_sprite.validation:""
}
wimp_icon {
- extent:20,-404,208,-360
- icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text.text:"Speedlimit"
- text.size:12
- text.validation:""
- }
- wimp_icon {
- extent:212,-408,380,-356
- icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_WHITE
- text.text:"12.34"
- text.size:*
- text.validation:"Pptr_write;Kta"
- }
- wimp_icon {
- extent:396,-400,428,-368
- icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text_and_sprite.text:""
- text_and_sprite.size:*
- text_and_sprite.validation:"r5;sdown,pdown"
- }
- wimp_icon {
- extent:428,-400,460,-368
- icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text_and_sprite.text:""
- text_and_sprite.size:*
- text_and_sprite.validation:"r5;sup,pup"
- }
- wimp_icon {
- extent:468,-404,612,-360
- icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text.text:"Sekunden"
- text.size:*
- text.validation:""
- }
- wimp_icon {
extent:212,-460,640,-416
icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO
icon_esg:0
diff --git a/frontends/riscos/templates/en b/frontends/riscos/templates/en
index fa7c2ce..8db0f94 100644
--- a/frontends/riscos/templates/en
+++ b/frontends/riscos/templates/en
@@ -856,56 +856,6 @@ wimp_window {
text_and_sprite.validation:""
}
wimp_icon {
- extent:20,-404,208,-360
- icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text.text:"Speed limit"
- text.size:*
- text.validation:""
- }
- wimp_icon {
- extent:212,-408,380,-356
- icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_WHITE
- text.text:"12.34"
- text.size:*
- text.validation:"Pptr_write;Kta;A0-9."
- }
- wimp_icon {
- extent:396,-400,428,-368
- icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text_and_sprite.text:""
- text_and_sprite.size:*
- text_and_sprite.validation:"r5;sdown,pdown"
- }
- wimp_icon {
- extent:428,-400,460,-368
- icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text_and_sprite.text:""
- text_and_sprite.size:*
- text_and_sprite.validation:"r5;sup,pup"
- }
- wimp_icon {
- extent:468,-404,592,-360
- icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text.text:"seconds"
- text.size:*
- text.validation:""
- }
- wimp_icon {
extent:212,-460,556,-416
icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO
icon_esg:0
diff --git a/frontends/riscos/templates/fr b/frontends/riscos/templates/fr
index 48b4ab0..9ca0d7c 100644
--- a/frontends/riscos/templates/fr
+++ b/frontends/riscos/templates/fr
@@ -860,56 +860,6 @@ wimp_window {
text_and_sprite.validation:""
}
wimp_icon {
- extent:20,-404,208,-360
- icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text.text:"Vitesse limite"
- text.size:*
- text.validation:""
- }
- wimp_icon {
- extent:212,-408,380,-356
- icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_WHITE
- text.text:"12.34"
- text.size:*
- text.validation:"Pptr_write;Kta"
- }
- wimp_icon {
- extent:396,-400,428,-368
- icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text_and_sprite.text:""
- text_and_sprite.size:*
- text_and_sprite.validation:"r5;sdown,pdown"
- }
- wimp_icon {
- extent:428,-400,460,-368
- icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text_and_sprite.text:""
- text_and_sprite.size:*
- text_and_sprite.validation:"r5;sup,pup"
- }
- wimp_icon {
- extent:468,-404,592,-360
- icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text.text:"secondes"
- text.size:*
- text.validation:""
- }
- wimp_icon {
extent:212,-460,628,-416
icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO
icon_esg:0
diff --git a/frontends/riscos/templates/nl b/frontends/riscos/templates/nl
index 19b6e70..a3426a1 100644
--- a/frontends/riscos/templates/nl
+++ b/frontends/riscos/templates/nl
@@ -858,56 +858,6 @@ wimp_window {
text_and_sprite.validation:""
}
wimp_icon {
- extent:20,-404,232,-360
- icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text.text:"Animatietijd"
- text.size:15
- text.validation:""
- }
- wimp_icon {
- extent:236,-408,404,-356
- icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_WHITE
- text.text:"12.34"
- text.size:6
- text.validation:"Pptr_write;Kta;A0-9."
- }
- wimp_icon {
- extent:420,-400,452,-368
- icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text_and_sprite.text:""
- text_and_sprite.size:1
- text_and_sprite.validation:"r5;sdown,pdown"
- }
- wimp_icon {
- extent:452,-400,484,-368
- icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text_and_sprite.text:""
- text_and_sprite.size:1
- text_and_sprite.validation:"r5;sup,pup"
- }
- wimp_icon {
- extent:492,-404,644,-360
- icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED
- icon_esg:0
- icon_fg:wimp_COLOUR_BLACK
- icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
- text.text:"seconden"
- text.size:9
- text.validation:""
- }
- wimp_icon {
extent:236,-460,616,-416
icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO
icon_esg:0
diff --git a/frontends/windows/prefs.c b/frontends/windows/prefs.c
index 9937f2e..37f5584 100644
--- a/frontends/windows/prefs.c
+++ b/frontends/windows/prefs.c
@@ -230,13 +230,6 @@ static BOOL CALLBACK options_appearance_dialog_handler(HWND hwnd,
sub = GetDlgItem(hwnd, IDC_PREFS_NOANIMATION);
SendMessage(sub, BM_SETCHECK, (WPARAM)((nsoption_bool(animate_images))
? BST_UNCHECKED : BST_CHECKED), 0);
-
- if (nsoption_int(minimum_gif_delay) != 0) {
- sub = GetDlgItem(hwnd, IDC_PREFS_ANIMATIONDELAY);
- snprintf(number, 6, "%.1f", nsoption_int(minimum_gif_delay) /
- 100.0);
- SendMessage(sub, WM_SETTEXT, 0, (LPARAM)number);
- }
break;
case WM_NOTIFY:
@@ -268,18 +261,6 @@ static BOOL CALLBACK options_appearance_dialog_handler(HWND hwnd,
nsoption_set_bool(animate_images,
(IsDlgButtonChecked(hwnd, IDC_PREFS_NOANIMATION) == BST_CHECKED) ? true : false);
-
- sub = GetDlgItem(hwnd, IDC_PREFS_ANIMATIONDELAY);
- len = SendMessage(sub, WM_GETTEXTLENGTH, 0, 0);
- temp = malloc(len + 1);
- if (temp != NULL) {
- SendMessage(sub, WM_GETTEXT, (WPARAM)
- (len + 1), (LPARAM) temp);
- nsoption_set_int(minimum_gif_delay,
- (int)(100 * strtod(temp, NULL)));
- free(temp);
- }
-
break;
case UDN_DELTAPOS: {
@@ -292,11 +273,6 @@ static BOOL CALLBACK options_appearance_dialog_handler(HWND hwnd,
case IDC_PREFS_FONT_MINSIZE_SPIN:
change_spinner(GetDlgItem(hwnd, IDC_PREFS_FONT_MINSIZE), 0.1 * ud->iDelta, 1.0, 50.0);
return TRUE;
-
- case IDC_PREFS_ANIMATIONDELAY_SPIN:
- change_spinner(GetDlgItem(hwnd, IDC_PREFS_ANIMATIONDELAY), 0.1 * ud->iDelta, 0.1, 100.0);
- return TRUE;
-
}
}
break;
diff --git a/frontends/windows/res/resource.rc b/frontends/windows/res/resource.rc
index 2d9e6cf..9e9927b 100644
--- a/frontends/windows/res/resource.rc
+++ b/frontends/windows/res/resource.rc
@@ -242,9 +242,6 @@ FONT 8, "MS Shell Dlg", 0, 0, 1
LTEXT "Animation", IDC_STATIC, 7, 148, 36, 8, NOT WS_GROUP | SS_LEFT, WS_EX_LEFT
CONTROL "", IDC_STATIC, WC_STATIC, SS_ETCHEDFRAME, 43, 152, 170, 1, WS_EX_LEFT
AUTOCHECKBOX "Disable", IDC_PREFS_NOANIMATION, 43, 163, 39, 10, 0, WS_EX_LEFT
- LTEXT "Minimum delay:", IDC_STATIC, 55, 180, 56, 8, SS_LEFT, WS_EX_LEFT
- EDITTEXT IDC_PREFS_ANIMATIONDELAY, 113, 177, 35, 14, NOT WS_BORDER, WS_EX_CLIENTEDGE
- CONTROL "Min delay", IDC_PREFS_ANIMATIONDELAY_SPIN, UPDOWN_CLASS, UDS_ALIGNRIGHT | UDS_AUTOBUDDY, 43, 210, 11, 15, WS_EX_LEFT
}
diff --git a/frontends/windows/resourceid.h b/frontends/windows/resourceid.h
index a0642b1..2933b15 100644
--- a/frontends/windows/resourceid.h
+++ b/frontends/windows/resourceid.h
@@ -88,8 +88,6 @@
#define IDC_PREFS_FANTASY 1219
#define IDC_PREFS_FONTDEF 1220
#define IDC_PREFS_NOANIMATION 1227
-#define IDC_PREFS_ANIMATIONDELAY 1228
-#define IDC_PREFS_ANIMATIONDELAY_SPIN 1229
#define IDD_SSLCERT 1600
#define IDC_SSLCERT_IMG1 1601
diff --git a/test/data/Choices b/test/data/Choices
index a1fc15b..511ecf8 100644
--- a/test/data/Choices
+++ b/test/data/Choices
@@ -30,7 +30,6 @@ disc_cache_size:1073741824
disc_cache_age:28
block_advertisements:0
do_not_track:0
-minimum_gif_delay:10
send_referer:1
foreground_images:1
background_images:1
diff --git a/test/data/Choices-all b/test/data/Choices-all
index b430db5..65a467d 100644
--- a/test/data/Choices-all
+++ b/test/data/Choices-all
@@ -20,7 +20,6 @@ disc_cache_size:1073741824
disc_cache_age:28
block_advertisements:0
do_not_track:0
-minimum_gif_delay:10
send_referer:1
foreground_images:1
background_images:1
--
NetSurf Browser
2 years, 11 months
- 1
- 0
netsurf-wiki: branch master updated. fb2a55dd8a1d819d14080020ba4256c9001ad437
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf-wiki.git/shortlog/fb2a55dd8a1d819d...
...commit http://git.netsurf-browser.org/netsurf-wiki.git/commit/fb2a55dd8a1d819d14...
...tree http://git.netsurf-browser.org/netsurf-wiki.git/tree/fb2a55dd8a1d819d1408...
The branch, master has been updated
via fb2a55dd8a1d819d14080020ba4256c9001ad437 (commit)
from 1eca1629ab7d1ded34a67293a35694f79d03a5b8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf-wiki.git/commit/?id=fb2a55dd8a1d81...
commit fb2a55dd8a1d819d14080020ba4256c9001ad437
Author: Daniel Silverstone <dsilvers(a)digital-scurf.org>
Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org>
Update with roadmap and topics
diff --git a/developer-weekend/feb-2020.mdwn b/developer-weekend/feb-2020.mdwn
index 84ff4e6..4caf72f 100644
--- a/developer-weekend/feb-2020.mdwn
+++ b/developer-weekend/feb-2020.mdwn
@@ -16,15 +16,16 @@ Outstanding work (from December)
============================
* General
- * Implement any appropriate auto fill auth handlers
- * Continue styling the generated query pages.
+ * Implement any appropriate auto fill auth handlers **IGNORING**
+ * Continue styling the generated query pages. (Michael)
* Review TODOs.
* Framebuffer
- * Language support for resources (Vince)
+ * Language support for resources (Vince) **SHITCANNED**
* Listing of compiled-in surfaces (Vince)
* Internationalisation
* Translations of all messages for the SSL/privacy internal query page.
* Translations of all messages for the authentication internal query page.
+ * Short of finding a native speaker there's not a lot we can do. **Nothing**
* Text layout
- Continue implementing. (Michael)
* Release 3.10
@@ -32,10 +33,22 @@ Outstanding work (from December)
* And then do Debian package releases, including removing framebuffer
from Debian.
* Events
- * Michael to do more UI event support in NetSurf
+ * Michael to do more UI event support in NetSurf **SHITCANNED**
-Topics
-======
+Pathway to 3.10
+===============
+
+* Completion of MVP for page info core window (Michael to work on this)
+* DER exfiltration and SSL Certificate viewer `about:certificate` (Vince)
+* Completion of integration of that into GTK and RISC OS frontends, with others
+ being given at least two weeks to integrate before they cease blocking.
+ (Assigned to Vince)
+* At least some attention given to GTK focus issues (Daniel to complete this)
+* Review styling for internal pages. (Assigned to Michael)
+* Listing compiled-in surfaces for nsfb (Assigned to Vincent)
+* [[!bug 2650]] Inappropriate error message (Assigned to Vincent)
+* [[!bug 2722]] GTK3 UI vertical scrollbar wrong (Assigned to Vincent)
+* [[!bug 2721]] Bizarre corners on download box in highdpi (Assigned to Michael)
Bug Triage
==========
@@ -63,19 +76,12 @@ Bug Triage
* [[!bug 2736]] - Assigned to Daniel
* [[!bug 2620]] - Assigned to Vincent
-Pathway to 3.10
-===============
+Topics
+======
-* Completion of MVP for page info core window (Assigned to Vince, Michael to
- help)
-* Completion of integration of that into GTK and RISC OS frontends, with others
- being given at least two weeks to integrate before they cease blocking.
- (Assigned to Vince)
-* At least some attention given to GTK focus issues (Assigned to Vince, Daniel
- to assist)
+* We need a discussion about framebuffer, but won't block 3.10 mostly
* See if we can exfiltrate better SSL session error information such as a lack
of cipher list overlap. [[!bug 2719]] (Assigned to Daniel)
-* Verify webp on riscos, disable if too buggy (Assigned to Michael)
Activity
========
-----------------------------------------------------------------------
Summary of changes:
developer-weekend/feb-2020.mdwn | 38 ++++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/developer-weekend/feb-2020.mdwn b/developer-weekend/feb-2020.mdwn
index 84ff4e6..4caf72f 100644
--- a/developer-weekend/feb-2020.mdwn
+++ b/developer-weekend/feb-2020.mdwn
@@ -16,15 +16,16 @@ Outstanding work (from December)
============================
* General
- * Implement any appropriate auto fill auth handlers
- * Continue styling the generated query pages.
+ * Implement any appropriate auto fill auth handlers **IGNORING**
+ * Continue styling the generated query pages. (Michael)
* Review TODOs.
* Framebuffer
- * Language support for resources (Vince)
+ * Language support for resources (Vince) **SHITCANNED**
* Listing of compiled-in surfaces (Vince)
* Internationalisation
* Translations of all messages for the SSL/privacy internal query page.
* Translations of all messages for the authentication internal query page.
+ * Short of finding a native speaker there's not a lot we can do. **Nothing**
* Text layout
- Continue implementing. (Michael)
* Release 3.10
@@ -32,10 +33,22 @@ Outstanding work (from December)
* And then do Debian package releases, including removing framebuffer
from Debian.
* Events
- * Michael to do more UI event support in NetSurf
+ * Michael to do more UI event support in NetSurf **SHITCANNED**
-Topics
-======
+Pathway to 3.10
+===============
+
+* Completion of MVP for page info core window (Michael to work on this)
+* DER exfiltration and SSL Certificate viewer `about:certificate` (Vince)
+* Completion of integration of that into GTK and RISC OS frontends, with others
+ being given at least two weeks to integrate before they cease blocking.
+ (Assigned to Vince)
+* At least some attention given to GTK focus issues (Daniel to complete this)
+* Review styling for internal pages. (Assigned to Michael)
+* Listing compiled-in surfaces for nsfb (Assigned to Vincent)
+* [[!bug 2650]] Inappropriate error message (Assigned to Vincent)
+* [[!bug 2722]] GTK3 UI vertical scrollbar wrong (Assigned to Vincent)
+* [[!bug 2721]] Bizarre corners on download box in highdpi (Assigned to Michael)
Bug Triage
==========
@@ -63,19 +76,12 @@ Bug Triage
* [[!bug 2736]] - Assigned to Daniel
* [[!bug 2620]] - Assigned to Vincent
-Pathway to 3.10
-===============
+Topics
+======
-* Completion of MVP for page info core window (Assigned to Vince, Michael to
- help)
-* Completion of integration of that into GTK and RISC OS frontends, with others
- being given at least two weeks to integrate before they cease blocking.
- (Assigned to Vince)
-* At least some attention given to GTK focus issues (Assigned to Vince, Daniel
- to assist)
+* We need a discussion about framebuffer, but won't block 3.10 mostly
* See if we can exfiltrate better SSL session error information such as a lack
of cipher list overlap. [[!bug 2719]] (Assigned to Daniel)
-* Verify webp on riscos, disable if too buggy (Assigned to Michael)
Activity
========
--
NetSurf Developer Wiki Backing Store
2 years, 11 months
- 1
- 0
netsurf-wiki: branch master updated. 1eca1629ab7d1ded34a67293a35694f79d03a5b8
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf-wiki.git/shortlog/1eca1629ab7d1ded...
...commit http://git.netsurf-browser.org/netsurf-wiki.git/commit/1eca1629ab7d1ded34...
...tree http://git.netsurf-browser.org/netsurf-wiki.git/tree/1eca1629ab7d1ded34a6...
The branch, master has been updated
via 1eca1629ab7d1ded34a67293a35694f79d03a5b8 (commit)
from 32902312a54e5c273ca6e99a08e999867707be59 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf-wiki.git/commit/?id=1eca1629ab7d1d...
commit 1eca1629ab7d1ded34a67293a35694f79d03a5b8
Author: Daniel Silverstone <dsilvers(a)digital-scurf.org>
Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org>
Daniel did some work
diff --git a/developer-weekend/feb-2020.mdwn b/developer-weekend/feb-2020.mdwn
index 2e69496..84ff4e6 100644
--- a/developer-weekend/feb-2020.mdwn
+++ b/developer-weekend/feb-2020.mdwn
@@ -89,8 +89,11 @@ Michael
Daniel
------
-TODO: Look at 2702
-TODO: Look at 2736
+* Went through [[!bug 2702]] worked out that we weren't completing the
+ content state machine when async scripts completed after `dom_to_box` had
+ finished. Fixed that.
+* Went through [[!bug 2736]] and fixed the tests to use `__func__` instead.
+
Vince
-----------------------------------------------------------------------
Summary of changes:
developer-weekend/feb-2020.mdwn | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/developer-weekend/feb-2020.mdwn b/developer-weekend/feb-2020.mdwn
index 2e69496..84ff4e6 100644
--- a/developer-weekend/feb-2020.mdwn
+++ b/developer-weekend/feb-2020.mdwn
@@ -89,8 +89,11 @@ Michael
Daniel
------
-TODO: Look at 2702
-TODO: Look at 2736
+* Went through [[!bug 2702]] worked out that we weren't completing the
+ content state machine when async scripts completed after `dom_to_box` had
+ finished. Fixed that.
+* Went through [[!bug 2736]] and fixed the tests to use `__func__` instead.
+
Vince
--
NetSurf Developer Wiki Backing Store
2 years, 11 months
- 1
- 0
libnslog: branch master updated. release/0.1.2-2-g6f42c73
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/libnslog.git/shortlog/6f42c731b926c9ccb553...
...commit http://git.netsurf-browser.org/libnslog.git/commit/6f42c731b926c9ccb553fb...
...tree http://git.netsurf-browser.org/libnslog.git/tree/6f42c731b926c9ccb553fb30...
The branch, master has been updated
via 6f42c731b926c9ccb553fb3031dea34ac5bddc85 (commit)
from a9e47c8ccb2eefbc707ee5b13dffef29cf8bdb5d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/libnslog.git/commit/?id=6f42c731b926c9ccb5...
commit 6f42c731b926c9ccb553fb3031dea34ac5bddc85
Author: Daniel Silverstone <dsilvers(a)digital-scurf.org>
Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org>
TEST: Ensure we use __func__ for function name checking
In order to cope when Check 0.13 changes the test function name
in the `START_TEST()` macro, we need to use __func__ rather than
open-coding the expected function names.
Signed-off-by: Daniel Silverstone <dsilvers(a)digital-scurf.org>
diff --git a/test/basictests.c b/test/basictests.c
index c6dd9dd..2650bfe 100644
--- a/test/basictests.c
+++ b/test/basictests.c
@@ -83,7 +83,7 @@ START_TEST (test_nslog_trivial_corked_message)
"Captured message wasn't correct");
fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0,
"Captured message wasn't correct filename");
- fail_unless(strcmp(captured_context.funcname, "test_nslog_trivial_corked_message") == 0,
+ fail_unless(strcmp(captured_context.funcname, __func__) == 0,
"Captured message wasn't correct function name");
}
END_TEST
@@ -109,7 +109,7 @@ START_TEST (test_nslog_trivial_uncorked_message)
"Captured message wasn't correct");
fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0,
"Captured message wasn't correct filename");
- fail_unless(strcmp(captured_context.funcname, "test_nslog_trivial_uncorked_message") == 0,
+ fail_unless(strcmp(captured_context.funcname, __func__) == 0,
"Captured message wasn't correct function name");
}
END_TEST
@@ -150,7 +150,7 @@ START_TEST (test_nslog_two_corked_messages)
"Captured message wasn't correct");
fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0,
"Captured message wasn't correct filename");
- fail_unless(strcmp(captured_context.funcname, "test_nslog_two_corked_messages") == 0,
+ fail_unless(strcmp(captured_context.funcname, __func__) == 0,
"Captured message wasn't correct function name");
}
END_TEST
@@ -223,7 +223,7 @@ START_TEST (test_nslog_simple_filter_corked_message)
"Captured message wasn't correct");
fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0,
"Captured message wasn't correct filename");
- fail_unless(strcmp(captured_context.funcname, "test_nslog_simple_filter_corked_message") == 0,
+ fail_unless(strcmp(captured_context.funcname, __func__) == 0,
"Captured message wasn't correct function name");
}
@@ -250,7 +250,7 @@ START_TEST (test_nslog_simple_filter_uncorked_message)
"Captured message wasn't correct");
fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0,
"Captured message wasn't correct filename");
- fail_unless(strcmp(captured_context.funcname, "test_nslog_simple_filter_uncorked_message") == 0,
+ fail_unless(strcmp(captured_context.funcname, __func__) == 0,
"Captured message wasn't correct function name");
}
@@ -277,7 +277,7 @@ START_TEST (test_nslog_simple_filter_subcategory_message)
"Captured message wasn't correct");
fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0,
"Captured message wasn't correct filename");
- fail_unless(strcmp(captured_context.funcname, "test_nslog_simple_filter_subcategory_message") == 0,
+ fail_unless(strcmp(captured_context.funcname, __func__) == 0,
"Captured message wasn't correct function name");
}
@@ -524,7 +524,7 @@ END_TEST
START_TEST (test_nslog_filter_funcname)
{
nslog_filter_t *filter;
- fail_unless(nslog_filter_funcname_new("test_nslog_filter_funcname", &filter) == NSLOG_NO_ERROR,
+ fail_unless(nslog_filter_funcname_new(__func__, &filter) == NSLOG_NO_ERROR,
"Unable to create level filter");
fail_unless(nslog_filter_set_active(filter, NULL) == NSLOG_NO_ERROR,
"Unable to set active filter to dir:test");
-----------------------------------------------------------------------
Summary of changes:
test/basictests.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/test/basictests.c b/test/basictests.c
index c6dd9dd..2650bfe 100644
--- a/test/basictests.c
+++ b/test/basictests.c
@@ -83,7 +83,7 @@ START_TEST (test_nslog_trivial_corked_message)
"Captured message wasn't correct");
fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0,
"Captured message wasn't correct filename");
- fail_unless(strcmp(captured_context.funcname, "test_nslog_trivial_corked_message") == 0,
+ fail_unless(strcmp(captured_context.funcname, __func__) == 0,
"Captured message wasn't correct function name");
}
END_TEST
@@ -109,7 +109,7 @@ START_TEST (test_nslog_trivial_uncorked_message)
"Captured message wasn't correct");
fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0,
"Captured message wasn't correct filename");
- fail_unless(strcmp(captured_context.funcname, "test_nslog_trivial_uncorked_message") == 0,
+ fail_unless(strcmp(captured_context.funcname, __func__) == 0,
"Captured message wasn't correct function name");
}
END_TEST
@@ -150,7 +150,7 @@ START_TEST (test_nslog_two_corked_messages)
"Captured message wasn't correct");
fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0,
"Captured message wasn't correct filename");
- fail_unless(strcmp(captured_context.funcname, "test_nslog_two_corked_messages") == 0,
+ fail_unless(strcmp(captured_context.funcname, __func__) == 0,
"Captured message wasn't correct function name");
}
END_TEST
@@ -223,7 +223,7 @@ START_TEST (test_nslog_simple_filter_corked_message)
"Captured message wasn't correct");
fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0,
"Captured message wasn't correct filename");
- fail_unless(strcmp(captured_context.funcname, "test_nslog_simple_filter_corked_message") == 0,
+ fail_unless(strcmp(captured_context.funcname, __func__) == 0,
"Captured message wasn't correct function name");
}
@@ -250,7 +250,7 @@ START_TEST (test_nslog_simple_filter_uncorked_message)
"Captured message wasn't correct");
fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0,
"Captured message wasn't correct filename");
- fail_unless(strcmp(captured_context.funcname, "test_nslog_simple_filter_uncorked_message") == 0,
+ fail_unless(strcmp(captured_context.funcname, __func__) == 0,
"Captured message wasn't correct function name");
}
@@ -277,7 +277,7 @@ START_TEST (test_nslog_simple_filter_subcategory_message)
"Captured message wasn't correct");
fail_unless(strcmp(captured_context.filename, "test/basictests.c") == 0,
"Captured message wasn't correct filename");
- fail_unless(strcmp(captured_context.funcname, "test_nslog_simple_filter_subcategory_message") == 0,
+ fail_unless(strcmp(captured_context.funcname, __func__) == 0,
"Captured message wasn't correct function name");
}
@@ -524,7 +524,7 @@ END_TEST
START_TEST (test_nslog_filter_funcname)
{
nslog_filter_t *filter;
- fail_unless(nslog_filter_funcname_new("test_nslog_filter_funcname", &filter) == NSLOG_NO_ERROR,
+ fail_unless(nslog_filter_funcname_new(__func__, &filter) == NSLOG_NO_ERROR,
"Unable to create level filter");
fail_unless(nslog_filter_set_active(filter, NULL) == NSLOG_NO_ERROR,
"Unable to set active filter to dir:test");
--
NetSurf Parametric Logging Library
2 years, 11 months
- 1
- 0
netsurf: branch master updated. release/3.9-416-gdb370bf
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/db370bfdb7a091bb85a4e...
...commit http://git.netsurf-browser.org/netsurf.git/commit/db370bfdb7a091bb85a4e21...
...tree http://git.netsurf-browser.org/netsurf.git/tree/db370bfdb7a091bb85a4e2120...
The branch, master has been updated
via db370bfdb7a091bb85a4e2120e641fea0c663734 (commit)
from 4ef5c6cdb4f69b3fe232979cccc7c670a0938939 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=db370bfdb7a091bb85a...
commit db370bfdb7a091bb85a4e2120e641fea0c663734
Author: Daniel Silverstone <dsilvers(a)digital-scurf.org>
Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org>
HTML: Complete content state machine after async script
The async script completion process needs to complete the
content state machine so that browser throbbers eventually
stop once async scripts have fetched and run, even if that
happens *after* conversion finishes.
Signed-off-by: Daniel Silverstone <dsilvers(a)digital-scurf.org>
diff --git a/content/handlers/html/html.c b/content/handlers/html/html.c
index 6e389ab..c7a9afe 100644
--- a/content/handlers/html/html.c
+++ b/content/handlers/html/html.c
@@ -268,13 +268,31 @@ static void html_box_convert_done(html_content *c, bool success)
content_set_ready(&c->base);
- if (c->base.active == 0) {
- content_set_done(&c->base);
- }
+ html_proceed_to_done(c);
dom_node_unref(html);
}
+/* Documented in html_internal.h */
+nserror
+html_proceed_to_done(html_content *html)
+{
+ switch (content__get_status(&html->base)) {
+ case CONTENT_STATUS_READY:
+ if (html->base.active == 0) {
+ content_set_done(&html->base);
+ return NSERROR_OK;
+ }
+ break;
+ case CONTENT_STATUS_DONE:
+ return NSERROR_OK;
+ default:
+ NSLOG(netsurf, ERROR, "Content status unexpectedly not READY/DONE");
+ break;
+ }
+ return NSERROR_UNKNOWN;
+}
+
/** process link node */
static bool html_process_link(html_content *c, dom_node *node)
diff --git a/content/handlers/html/html_internal.h b/content/handlers/html/html_internal.h
index 2ff3410..9b363dc 100644
--- a/content/handlers/html/html_internal.h
+++ b/content/handlers/html/html_internal.h
@@ -396,6 +396,12 @@ nserror html_object_close_objects(html_content *html);
nserror html_object_open_objects(html_content *html, struct browser_window *bw);
nserror html_object_abort_objects(html_content *html);
+/**
+ * Complete the HTML content state machine *iff* all scripts are finished
+ */
+nserror html_proceed_to_done(html_content *html);
+
+
/* Events */
/**
* Construct an event and fire it at the DOM
diff --git a/content/handlers/html/html_script.c b/content/handlers/html/html_script.c
index e11e47c..ed73f50 100644
--- a/content/handlers/html/html_script.c
+++ b/content/handlers/html/html_script.c
@@ -108,7 +108,7 @@ nserror html_script_exec(html_content *c, bool allow_defer)
}
}
- return NSERROR_OK;
+ return html_proceed_to_done(c);
}
/* create new html script entry */
@@ -208,7 +208,7 @@ convert_script_async_cb(hlcache_handle *script,
* scripts as they come in.
*/
else if (parent->conversion_begun) {
- html_script_exec(parent, false);
+ return html_script_exec(parent, false);
}
return NSERROR_OK;
-----------------------------------------------------------------------
Summary of changes:
content/handlers/html/html.c | 24 +++++++++++++++++++++---
content/handlers/html/html_internal.h | 6 ++++++
content/handlers/html/html_script.c | 4 ++--
3 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/content/handlers/html/html.c b/content/handlers/html/html.c
index 6e389ab..c7a9afe 100644
--- a/content/handlers/html/html.c
+++ b/content/handlers/html/html.c
@@ -268,13 +268,31 @@ static void html_box_convert_done(html_content *c, bool success)
content_set_ready(&c->base);
- if (c->base.active == 0) {
- content_set_done(&c->base);
- }
+ html_proceed_to_done(c);
dom_node_unref(html);
}
+/* Documented in html_internal.h */
+nserror
+html_proceed_to_done(html_content *html)
+{
+ switch (content__get_status(&html->base)) {
+ case CONTENT_STATUS_READY:
+ if (html->base.active == 0) {
+ content_set_done(&html->base);
+ return NSERROR_OK;
+ }
+ break;
+ case CONTENT_STATUS_DONE:
+ return NSERROR_OK;
+ default:
+ NSLOG(netsurf, ERROR, "Content status unexpectedly not READY/DONE");
+ break;
+ }
+ return NSERROR_UNKNOWN;
+}
+
/** process link node */
static bool html_process_link(html_content *c, dom_node *node)
diff --git a/content/handlers/html/html_internal.h b/content/handlers/html/html_internal.h
index 2ff3410..9b363dc 100644
--- a/content/handlers/html/html_internal.h
+++ b/content/handlers/html/html_internal.h
@@ -396,6 +396,12 @@ nserror html_object_close_objects(html_content *html);
nserror html_object_open_objects(html_content *html, struct browser_window *bw);
nserror html_object_abort_objects(html_content *html);
+/**
+ * Complete the HTML content state machine *iff* all scripts are finished
+ */
+nserror html_proceed_to_done(html_content *html);
+
+
/* Events */
/**
* Construct an event and fire it at the DOM
diff --git a/content/handlers/html/html_script.c b/content/handlers/html/html_script.c
index e11e47c..ed73f50 100644
--- a/content/handlers/html/html_script.c
+++ b/content/handlers/html/html_script.c
@@ -108,7 +108,7 @@ nserror html_script_exec(html_content *c, bool allow_defer)
}
}
- return NSERROR_OK;
+ return html_proceed_to_done(c);
}
/* create new html script entry */
@@ -208,7 +208,7 @@ convert_script_async_cb(hlcache_handle *script,
* scripts as they come in.
*/
else if (parent->conversion_begun) {
- html_script_exec(parent, false);
+ return html_script_exec(parent, false);
}
return NSERROR_OK;
--
NetSurf Browser
2 years, 11 months
- 1
- 0
netsurf-wiki: branch master updated. 32902312a54e5c273ca6e99a08e999867707be59
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf-wiki.git/shortlog/32902312a54e5c27...
...commit http://git.netsurf-browser.org/netsurf-wiki.git/commit/32902312a54e5c273c...
...tree http://git.netsurf-browser.org/netsurf-wiki.git/tree/32902312a54e5c273ca6...
The branch, master has been updated
via 32902312a54e5c273ca6e99a08e999867707be59 (commit)
from 949aaef3e6fbf81ee50502f9c7c78af44be012d0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf-wiki.git/commit/?id=32902312a54e5c...
commit 32902312a54e5c273ca6e99a08e999867707be59
Author: Daniel Silverstone <dsilvers(a)digital-scurf.org>
Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org>
Initial weekend data
Signed-off-by: Daniel Silverstone <dsilvers(a)digital-scurf.org>
diff --git a/developer-weekend/feb-2020.mdwn b/developer-weekend/feb-2020.mdwn
new file mode 100644
index 0000000..2e69496
--- /dev/null
+++ b/developer-weekend/feb-2020.mdwn
@@ -0,0 +1,113 @@
+[[!meta title="Developer Weekend (February 2020)"]]
+[[!meta author="NetSurf Developers"]]
+[[!meta date="2020-02-21 09:00:00"]]
+
+[[!toc]]
+
+Attendees
+=========
+
+* Michael Drake
+* Vincent Sanders
+* Daniel Silverstone
+
+
+Outstanding work (from December)
+============================
+
+* General
+ * Implement any appropriate auto fill auth handlers
+ * Continue styling the generated query pages.
+ * Review TODOs.
+* Framebuffer
+ * Language support for resources (Vince)
+ * Listing of compiled-in surfaces (Vince)
+* Internationalisation
+ * Translations of all messages for the SSL/privacy internal query page.
+ * Translations of all messages for the authentication internal query page.
+* Text layout
+ - Continue implementing. (Michael)
+* Release 3.10
+ * Which means do the work first needed to complete it
+ * And then do Debian package releases, including removing framebuffer
+ from Debian.
+* Events
+ * Michael to do more UI event support in NetSurf
+
+Topics
+======
+
+Bug Triage
+==========
+
+* [[!bug 2704]] - Closed, can't reproduce.
+* [[!bug 2702]] - Definitely still happening, Daniel will look. (NOT ASSIGNING)
+* [[!bug 2716]] - Acknowledged (CURL ARES)
+* [[!bug 2717]] - Acknowledged (CURL ARES)
+* [[!bug 2703]] - Closed, notabug
+* [[!bug 2722]] - Selected for this weekend.
+* [[!bug 2719]] - Closed, no resolution required
+* [[!bug 2727]] - Acknowledged (Our scaling sucks)
+* [[!bug 2729]] - Closed, macOS sucks
+* [[!bug 2730]] - Misguided attempt at typo fix, closed.
+* [[!bug 2726]] - Closed, can't reproduce
+* [[!bug 2708]] - Fixed in 3.10
+* [[!bug 2731]] - Acknowledged
+* [[!bug 2732]] - Resolved in 3.10
+* [[!bug 2733]] - Acknowledged feature request
+* [[!bug 2734]] - Acknowledged feature request
+* [[!bug 2735]] - Acknowledged feature request
+* [[!bug 2737]] - Assigned to Daniel
+* [[!bug 2739]] - Assigned to Vincent
+* [[!bug 2738]] - Michael to explain user stylesheet
+* [[!bug 2736]] - Assigned to Daniel
+* [[!bug 2620]] - Assigned to Vincent
+
+Pathway to 3.10
+===============
+
+* Completion of MVP for page info core window (Assigned to Vince, Michael to
+ help)
+* Completion of integration of that into GTK and RISC OS frontends, with others
+ being given at least two weeks to integrate before they cease blocking.
+ (Assigned to Vince)
+* At least some attention given to GTK focus issues (Assigned to Vince, Daniel
+ to assist)
+* See if we can exfiltrate better SSL session error information such as a lack
+ of cipher list overlap. [[!bug 2719]] (Assigned to Daniel)
+* Verify webp on riscos, disable if too buggy (Assigned to Michael)
+
+Activity
+========
+
+Mostly individual activity here
+
+Michael
+-------
+
+
+Daniel
+------
+
+TODO: Look at 2702
+TODO: Look at 2736
+
+
+Vince
+-----
+
+
+
+
+Statement of work
+=================
+
+If at all possible, we'd like to see some of the following addressed before
+the next developer weekend…
+
+
+Next time
+=========
+
+* February 21st to 24th (Fri through Monday) as a full 4 day event
+* Manchester, unless something changes.
-----------------------------------------------------------------------
Summary of changes:
developer-weekend/feb-2020.mdwn | 113 +++++++++++++++++++++++++++++++++++++++
1 file changed, 113 insertions(+)
create mode 100644 developer-weekend/feb-2020.mdwn
diff --git a/developer-weekend/feb-2020.mdwn b/developer-weekend/feb-2020.mdwn
new file mode 100644
index 0000000..2e69496
--- /dev/null
+++ b/developer-weekend/feb-2020.mdwn
@@ -0,0 +1,113 @@
+[[!meta title="Developer Weekend (February 2020)"]]
+[[!meta author="NetSurf Developers"]]
+[[!meta date="2020-02-21 09:00:00"]]
+
+[[!toc]]
+
+Attendees
+=========
+
+* Michael Drake
+* Vincent Sanders
+* Daniel Silverstone
+
+
+Outstanding work (from December)
+============================
+
+* General
+ * Implement any appropriate auto fill auth handlers
+ * Continue styling the generated query pages.
+ * Review TODOs.
+* Framebuffer
+ * Language support for resources (Vince)
+ * Listing of compiled-in surfaces (Vince)
+* Internationalisation
+ * Translations of all messages for the SSL/privacy internal query page.
+ * Translations of all messages for the authentication internal query page.
+* Text layout
+ - Continue implementing. (Michael)
+* Release 3.10
+ * Which means do the work first needed to complete it
+ * And then do Debian package releases, including removing framebuffer
+ from Debian.
+* Events
+ * Michael to do more UI event support in NetSurf
+
+Topics
+======
+
+Bug Triage
+==========
+
+* [[!bug 2704]] - Closed, can't reproduce.
+* [[!bug 2702]] - Definitely still happening, Daniel will look. (NOT ASSIGNING)
+* [[!bug 2716]] - Acknowledged (CURL ARES)
+* [[!bug 2717]] - Acknowledged (CURL ARES)
+* [[!bug 2703]] - Closed, notabug
+* [[!bug 2722]] - Selected for this weekend.
+* [[!bug 2719]] - Closed, no resolution required
+* [[!bug 2727]] - Acknowledged (Our scaling sucks)
+* [[!bug 2729]] - Closed, macOS sucks
+* [[!bug 2730]] - Misguided attempt at typo fix, closed.
+* [[!bug 2726]] - Closed, can't reproduce
+* [[!bug 2708]] - Fixed in 3.10
+* [[!bug 2731]] - Acknowledged
+* [[!bug 2732]] - Resolved in 3.10
+* [[!bug 2733]] - Acknowledged feature request
+* [[!bug 2734]] - Acknowledged feature request
+* [[!bug 2735]] - Acknowledged feature request
+* [[!bug 2737]] - Assigned to Daniel
+* [[!bug 2739]] - Assigned to Vincent
+* [[!bug 2738]] - Michael to explain user stylesheet
+* [[!bug 2736]] - Assigned to Daniel
+* [[!bug 2620]] - Assigned to Vincent
+
+Pathway to 3.10
+===============
+
+* Completion of MVP for page info core window (Assigned to Vince, Michael to
+ help)
+* Completion of integration of that into GTK and RISC OS frontends, with others
+ being given at least two weeks to integrate before they cease blocking.
+ (Assigned to Vince)
+* At least some attention given to GTK focus issues (Assigned to Vince, Daniel
+ to assist)
+* See if we can exfiltrate better SSL session error information such as a lack
+ of cipher list overlap. [[!bug 2719]] (Assigned to Daniel)
+* Verify webp on riscos, disable if too buggy (Assigned to Michael)
+
+Activity
+========
+
+Mostly individual activity here
+
+Michael
+-------
+
+
+Daniel
+------
+
+TODO: Look at 2702
+TODO: Look at 2736
+
+
+Vince
+-----
+
+
+
+
+Statement of work
+=================
+
+If at all possible, we'd like to see some of the following addressed before
+the next developer weekend…
+
+
+Next time
+=========
+
+* February 21st to 24th (Fri through Monday) as a full 4 day event
+* Manchester, unless something changes.
--
NetSurf Developer Wiki Backing Store
2 years, 11 months
- 1
- 0
netsurf: branch master updated. release/3.9-415-g4ef5c6c
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/4ef5c6cdb4f69b3fe2329...
...commit http://git.netsurf-browser.org/netsurf.git/commit/4ef5c6cdb4f69b3fe232979...
...tree http://git.netsurf-browser.org/netsurf.git/tree/4ef5c6cdb4f69b3fe232979cc...
The branch, master has been updated
via 4ef5c6cdb4f69b3fe232979cccc7c670a0938939 (commit)
via 12af8617f804f761a9d5a8efd4a4c2499dd63e52 (commit)
from 4ba326d71d09eecd005782f264b1832d10f095b2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=4ef5c6cdb4f69b3fe23...
commit 4ef5c6cdb4f69b3fe232979cccc7c670a0938939
Author: Michael Drake <michael.drake(a)codethink.co.uk>
Commit: Michael Drake <michael.drake(a)codethink.co.uk>
README: Add markdown extension.
diff --git a/README b/README
deleted file mode 100644
index a6b6884..0000000
--- a/README
+++ /dev/null
@@ -1,27 +0,0 @@
-NetSurf
-=======
-
-This document should help point you at various useful bits of information.
-
-
-Building NetSurf
-----------------
-
-Read the [Quick Start](docs/quick-start.md) document for instructions.
-
-
-Creating a new port
--------------------
-
-Look at the existing front ends for example implementations.
-The framebuffer front end is simplest and most self-contained.
-Also, you can [contact the developers](http://www.netsurf-browser.org/contact/)
-for help.
-
-
-Further documentation
----------------------
-
-* [Developer documentation](http://www.netsurf-browser.org/developers/)
-* [Developer wiki](http://wiki.netsurf-browser.org/Documentation/)
-* [Code style guide](http://www.netsurf-browser.org/developers/StyleGuide.pdf)
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..a6b6884
--- /dev/null
+++ b/README.md
@@ -0,0 +1,27 @@
+NetSurf
+=======
+
+This document should help point you at various useful bits of information.
+
+
+Building NetSurf
+----------------
+
+Read the [Quick Start](docs/quick-start.md) document for instructions.
+
+
+Creating a new port
+-------------------
+
+Look at the existing front ends for example implementations.
+The framebuffer front end is simplest and most self-contained.
+Also, you can [contact the developers](http://www.netsurf-browser.org/contact/)
+for help.
+
+
+Further documentation
+---------------------
+
+* [Developer documentation](http://www.netsurf-browser.org/developers/)
+* [Developer wiki](http://wiki.netsurf-browser.org/Documentation/)
+* [Code style guide](http://www.netsurf-browser.org/developers/StyleGuide.pdf)
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=12af8617f804f761a9d...
commit 12af8617f804f761a9d5a8efd4a4c2499dd63e52
Author: Michael Drake <michael.drake(a)codethink.co.uk>
Commit: Michael Drake <michael.drake(a)codethink.co.uk>
README: Convert to markdown.
diff --git a/README b/README
index f983b9e..a6b6884 100644
--- a/README
+++ b/README
@@ -1,40 +1,27 @@
---------------------------------------------------------------------------------
- NetSurf README
---------------------------------------------------------------------------------
+NetSurf
+=======
- This document should help point you at various useful bits of information.
+This document should help point you at various useful bits of information.
- Building NetSurf
-==================
-
- Read the QUICK-START document in the Docs/ directory for instructions.
+Building NetSurf
+----------------
+Read the [Quick Start](docs/quick-start.md) document for instructions.
- Creating a new port
-=====================
- Look at the existing front ends for example implementations. The framebuffer
- front end is simplest and most self-contained. Also, you can contact the
- developers for help:
+Creating a new port
+-------------------
- http://www.netsurf-browser.org/contact/
+Look at the existing front ends for example implementations.
+The framebuffer front end is simplest and most self-contained.
+Also, you can [contact the developers](http://www.netsurf-browser.org/contact/)
+for help.
- Check out the developer documentation sources listed below too.
+Further documentation
+---------------------
- Further documentation
-=======================
-
- The Developer section of the web site has loads of info to get you started:
-
- http://www.netsurf-browser.org/developers/
-
- General documentation on how NetSurf's code works can be found on the
- development wiki:
-
- http://wiki.netsurf-browser.org/Documentation/
-
- The code style guide is here:
-
- http://www.netsurf-browser.org/developers/StyleGuide.pdf
+* [Developer documentation](http://www.netsurf-browser.org/developers/)
+* [Developer wiki](http://wiki.netsurf-browser.org/Documentation/)
+* [Code style guide](http://www.netsurf-browser.org/developers/StyleGuide.pdf)
-----------------------------------------------------------------------
Summary of changes:
README | 40 ----------------------------------------
README.md | 27 +++++++++++++++++++++++++++
2 files changed, 27 insertions(+), 40 deletions(-)
delete mode 100644 README
create mode 100644 README.md
diff --git a/README b/README
deleted file mode 100644
index f983b9e..0000000
--- a/README
+++ /dev/null
@@ -1,40 +0,0 @@
---------------------------------------------------------------------------------
- NetSurf README
---------------------------------------------------------------------------------
-
- This document should help point you at various useful bits of information.
-
-
- Building NetSurf
-==================
-
- Read the QUICK-START document in the Docs/ directory for instructions.
-
-
- Creating a new port
-=====================
-
- Look at the existing front ends for example implementations. The framebuffer
- front end is simplest and most self-contained. Also, you can contact the
- developers for help:
-
- http://www.netsurf-browser.org/contact/
-
- Check out the developer documentation sources listed below too.
-
-
- Further documentation
-=======================
-
- The Developer section of the web site has loads of info to get you started:
-
- http://www.netsurf-browser.org/developers/
-
- General documentation on how NetSurf's code works can be found on the
- development wiki:
-
- http://wiki.netsurf-browser.org/Documentation/
-
- The code style guide is here:
-
- http://www.netsurf-browser.org/developers/StyleGuide.pdf
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..a6b6884
--- /dev/null
+++ b/README.md
@@ -0,0 +1,27 @@
+NetSurf
+=======
+
+This document should help point you at various useful bits of information.
+
+
+Building NetSurf
+----------------
+
+Read the [Quick Start](docs/quick-start.md) document for instructions.
+
+
+Creating a new port
+-------------------
+
+Look at the existing front ends for example implementations.
+The framebuffer front end is simplest and most self-contained.
+Also, you can [contact the developers](http://www.netsurf-browser.org/contact/)
+for help.
+
+
+Further documentation
+---------------------
+
+* [Developer documentation](http://www.netsurf-browser.org/developers/)
+* [Developer wiki](http://wiki.netsurf-browser.org/Documentation/)
+* [Code style guide](http://www.netsurf-browser.org/developers/StyleGuide.pdf)
--
NetSurf Browser
2 years, 11 months
- 1
- 0