From 3c11ffdc9ffef96056504228577ab99046b49caf Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Sun, 24 Aug 2003 22:39:55 +0000
Subject: [project @ 2003-08-24 22:39:55 by jmb] Make plugins work. Improve
 initialisation of AcornURI. Add support for <iframe> (still needs rendering
 tweaks). Add Ctrl-F2 key sequence to close window.

svn path=/import/netsurf/; revision=246
---
 !NetSurf/!Boot,feb |  5 -----
 !NetSurf/!Run,feb  | 34 +++++++++++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 10 deletions(-)

(limited to '!NetSurf')

diff --git a/!NetSurf/!Boot,feb b/!NetSurf/!Boot,feb
index e2e7e6ce1..ae72986e2 100644
--- a/!NetSurf/!Boot,feb
+++ b/!NetSurf/!Boot,feb
@@ -4,11 +4,6 @@ IconSprites <NetSurf$Dir>.!Sprites
 Set File$Type_F79 CSS
 
 | Acorn URI protocol
-Set NetSurf$start_uri_handler "no"
-RMEnsure AcornURI 0.10 Set NetSurf$start_uri_handler "yes"
-RMEnsure AcornURI 0.10 RMLoad System:310.Modules.Network.URI
-If "<NetSurf$start_uri_handler>" = "yes" Then Desktop
-
 If "<Alias$Open_URI_http>" = "" Then Set Alias$Open_URI_http <NetSurf$Dir>.URILaunch
 If "<Alias$Open_URI_https>" = "" Then Set Alias$Open_URI_https <NetSurf$Dir>.URILaunch
 If "<Alias$Open_URI_file>" = "" Then Set Alias$Open_URI_file <NetSurf$Dir>.URILaunch
diff --git a/!NetSurf/!Run,feb b/!NetSurf/!Run,feb
index fddf59b0c..f5a9332ba 100644
--- a/!NetSurf/!Run,feb
+++ b/!NetSurf/!Run,feb
@@ -1,11 +1,35 @@
-|rafs_flush
+<Obey$Dir>.!Boot
 
-If "<NetSurf$Dir>" = "" Then Obey <Obey$Dir>.!Boot
+| We need RISC OS  3
+RMEnsure UtilityModule 3.00 Error NetSurf needs RISC OS 3 or later
 
-RMensure WindowManager 3.80 Error 0 NetSurf requires the Nested Window Manager.
-RMEnsure UtilityModule 3.70 RMensure CallASWI 0.00 RMload <NetSurf$Dir>.CallASWI
-RMEnsure SharedUnixLibrary 1.00 RMLoad System:Modules.SharedULib
+| Ensure Nested WIMP is installed
+| http://acorn.riscos.com (in the universal boot archive)
+RMEnsure WindowManager 3.80 Error 0 NetSurf requires the Nested Window Manager.
 
+| Ensure CallASWI is installed
+| http://www.iyonix.com/32bit/
+RMEnsure UtilityModule 3.70 RMEnsure CallASWI 0.02 RMLoad System:Modules.CallASWI
+RMEnsure UtilityModule 3.70 RMEnsure CallASWI 0.02 Error NetSurf requires the CallASWI module
+
+| Ensure SharedUnixLibrary is installed
+| http://www.chocky.org/unix/usage.html
+RMEnsure SharedUnixLibrary 1.02 RMLoad System:Modules.SharedULib
+RMEnsure SharedUnixLibrary 1.02 Error NetSurf requires SharedUnixLibrary 1.00 or later
+
+| Load AcornURI if it isn't already
+| http://sudden.recoil.org/
+Set NetSurf$Start_URI_Handler "no"
+RMEnsure AcornURI 0.12 Set NetSurf$Start_URI_Handler "yes"
+RMEnsure AcornURI 0.12 RMLoad System:Modules.Network.URI
+RMEnsure AcornURI 0.12 Error NetSurf requires AcornURI 0.12 or later
+RMEnsure AcornURI 0.12 Set NetSurf$Start_URI_Handler "no"
+
+| Check for mime map module
+If "<InetDBase$Path>" = "" Then Error Inet databases can not be found
+If "<Inet$MimeMappings>" = "" Then Set Inet$MimeMappings InetDBase:MimeMap
+RMEnsure MimeMap 0.10 RMLoad System:Modules.Network.MimeMap
+RMEnsure MimeMap 0.10 Error NetSurf requires MimeMap 0.10 or later
 
 | drag the 'next' slot in the task manager to something huge and ridiculous,
 | and/or increase the number below
-- 
cgit v1.2.3