From b59616c9ab85b0f58c0318f62e39f197932a712b Mon Sep 17 00:00:00 2001
From: Andrew Timmins <atimmins@blueyonder.co.uk>
Date: Mon, 26 Jul 2004 20:13:45 +0000
Subject: [PATCH] [project @ 2004-07-26 20:13:45 by atimmins] Updated to
 support new config options (homepage, open on startup).  Bug fixes with new
 config pane window (sticky selected radio icon bug!).  Also includes
 up-to-date French templates.

svn path=/import/netsurf/; revision=1150
---
 !NCNetSurf/Resources/en/Templates,fec | Bin 7233 -> 8475 bytes
 !NCNetSurf/Resources/fr/Templates,fec | Bin 7233 -> 8583 bytes
 !NetSurf/Resources/en/Templates,fec   | Bin 7899 -> 8371 bytes
 !NetSurf/Resources/fr/Templates,fec   | Bin 7227 -> 8569 bytes
 desktop/browser.c                     |   1 +
 desktop/netsurf.c                     |  22 +++++++++++++++++++++-
 riscos/dialog.c                       |  20 ++++++++++++++++++++
 riscos/gui.c                          |  14 +++++++++++---
 riscos/gui.h                          |   5 +++++
 riscos/menus.c                        |  15 +++++++++++++++
 riscos/options.h                      |  11 ++++++++---
 riscos/window.c                       |  11 +++++++++++
 12 files changed, 92 insertions(+), 7 deletions(-)

diff --git a/!NCNetSurf/Resources/en/Templates,fec b/!NCNetSurf/Resources/en/Templates,fec
index 455e2c1011e6eaf815655878a533f92fa977c89e..c9c9a875e02f3eb945acfff0a42f744f61b200cc 100644
GIT binary patch
delta 3315
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

delta 2267
zcmZvdTWB0*6vxkOwr(zNnoE<diH+M*(g-o6nAXHzs6}n7O$tqgiVxdOb~f3%*;zN!
zCauCotTqomgpNp!eGs22M2r@+f)5dbM1)$ZLIlC6FGY$}2&klF{GHtyn<ftV=X`Vi
z=k}fNd^_*%|FUzUH9umA@F)FNCYc%tvl7`G6qzhpsgL#Lpyop&AKhag%jT@n@cA;4
zo_qE7Aof3$iySAO#ve=#+g9#OA;BXRB1=X4yreQotC&`#g~hHw(c!FR4f*>1^&&5N
z39P=8X1`tZx>hAJ<|VK#D{ZH;1(%*`k<UH*Y<$4<bA)Q|7F67DK4uTbvf<bYB4PHO
z@){wZp|AD|N?0SAv=vWihPgVCZZAQ`9Eq73yRf&qh{zqUAk`<Wbi$-{)f+|Xy^f}>
zfmFuZ*|tcdNP`z>B%aHpGR4%+jIm`$a4ZxE870R3L=<UrU3Zok`s@+erV>w?Ex94R
z@zZ8BKCDrlNMJhu3^gx9R&tWRvi2WBxHS@deP!GSHLeEY*<;*|tM7jU^{Gd$1D)8l
z@O~AUM()`zkxJIpK=~=q?z(xm6-B}`(EV)&OpoYRUO|5ec?(%VfHt_DfGHByE8oJq
z&mUra#N$=3ycXc|Cs-#vzQ?qCPvvTo(c<x*%Ej%Jl?fkt_CiCG^G)5M{5iT|)5V)~
z<__>5Vy@}T=(6i3yzZ^;%qV*GX(9mACi4{VCichCUq@<Z-e&y{&_g>2|JE{{nPV~M
z8N3hq0npBD05b$^hu57|mq_GOxH(V*r}{6@Uq;?WQc&b;xNiaXOr|w1`s>J>$i~eQ
zxdHbbKqac5Bfoolg@Mk-Z=Qh`Fot70{1j3P_ybPM_Y2V0YXQ?pEx>>a0l$E8^qS~0
zQVS@Ds{p791&rq*v;g0r0kY9E(9_rluLY!$T0k>g7vLTiI<Oo4R*K3ZwSdRr_5&@x
z6}|fF5vYG7NAMKf(?D;A#?J>KGyzjuNbo#l8fXGF_=%%YzSQG~;Lduy>Tknq0bAj<
zfS2K31AYOE@LE6=UJG~w?mW-}7|u;hXENHCvqpx^+?pZ%q#<DBOYtrT3zTyU=|2Qy
zLZfT$?!0G1HUIr4sLw{KRUe(u`@li$T6x!jDzuO4I<R>RP@w3Q>d?E}iNPR-I>P%<
z9svH`okQQk`y#UTV~HGN-4FPImM6hD`gZ(h)c;Qj>E~q>xNzDQ<!4v$7vLPg54mXG
z3AfXAkFn5Ee}MjesLnjPgW}~*M)jj}W=-?-hBr68kpCTzaxnQn{R^z_AEz}<Hhot2
zZyudy*8b^aM6qkd{yk(CsqI-r{}<5yO^~xgZ+I03gPws-en^4A3FJBSm*B5@{04N*
zKrfh%kn)Fl_jw(;CxHIM_}jM!%^`Em_QOYawm!P6$8t&=>bnk@c9ic=v|u{i*47q2
zx<lCk(++pXGkg-)P(uZ^^Ht!XK=7jTOU))HSkh$#uk0;ZG(tb_GlDe|a=O+%T;AIs
zPn*%xDRbmXdR-`hi5)s=7(wUf(mXG*vPomRj?EajNMokhuK#F10}`BA`ThBxEgyGY
zDy!A~%kJkgcFInhiM_>7r1MXCQy@4&K^;za#TF7|E2=c<tKq|%^jhT-{}*a@TyfVg
Ipl7-CFQRupqyPW_

diff --git a/!NCNetSurf/Resources/fr/Templates,fec b/!NCNetSurf/Resources/fr/Templates,fec
index 455e2c1011e6eaf815655878a533f92fa977c89e..78746568e8b18f8290a73e6faa1d074f4489937b 100644
GIT binary patch
delta 3563
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

delta 2392
zcmZvdUu;u#6vt1yVqvp`bwF{Gc}ED0WG*8P+~iMCQ9#)sFcN&RbnER_?C!1Y9UW-W
z8BuufVeuLRga_jjCKzW(6cZmXA!fz|32HJE6H#A?AqJBrY9L%cr@dFk#xMQ${O<Xl
z-#O=Ze*aE9`&IWud$|-6;U|N(mB|jp=!tBNh@7dJtxpaVpr)fDpWJ7k%opsj*oj3V
zefR5~VeEgb6*-7M^*@{~I(Fe`CBWl#BDbsdWyx9@yBb!cjn1ZUb-*#(9tre=i$z}X
z1K0zH%|WL+>dF$4aX)}#+c_tjuMFvH5c$Hl&!>jWAV#$DUP9Fgmy^zLG9OFMBGTr-
zs9y;A9DReIP}(k8IXjis2vf^Mdi?;FSxTCgQ<>YcgvcE~A=PK>T-u~`4J$;J`xVXE
zLs`q8+1f<2NR#iVlqy(Rs~Xz96k4?*G9C>_Lp7m?@hH;adERAwXxk#PRwX0la?Lf_
zpE_b1siJyy6XD773*>wkvYwUvjegK@;l(BL)@;9zs$X?P+Y-9xSHJ%OI%YX?0qDlA
zjqi)d9CFKgNz~JC0Lq^Sot{_r+EJu^1D#(hVE2el<#qIDkvEZbIOu@e2-roUdga^r
z4)|U4_xQZ(mDdCU{t*3)&-a<m{?S4_V^o)Sw2*SLwiVm+qTAZi;(ohqSNS;Qa46#q
zN^=JU4X5);Gj`YW(ti2omSzmSj%mRG+fAm);2rD_qQ8pN(!5XqG|*Ms3IE<*N;5@g
z$~X8B@*|+7Sqd)UuoGUV)=(pf&)}v&98UFLqCbbcg(RWGH*ntp4w_7=U-VazH;~P(
zlDG!<JwPR@pCZ0@YnFj-j^BL)O<<gXo$%+8n!ulMntqUg)?O2sL}~&dxF`q`IEh{Z
zokMB@wQzL+RV9IwWe80mFld5o_6>A3w!v!xIix1A2CfHi5GxhfjD9sq<&m1eQ*h4!
zO}-tyj@Kp7@y#s3b8ycCJsRr29D&dPY|~1BmmqUM1E|5zERFIDeSQS)n9r;J7Q7~~
z8eS844em`4BrpT72^jF2z}s*qfF{81T*>y#7y|{nR5S|@+@<mDW+pY7bBv5_IYu#i
z%#67`O>5%4St~m-Ix<JyxXW_PLMAn68o87;G|Fukb0?dO*1ZKYV-^Z#`kp>!XN;0L
zVCa=ttXP#7l4&it&eU%rgGTb424mhuG40zh^Zzd(9kYVU=omc>4}qQ7wezi;x3W}J
zq6?cR0mTqKzg>D!bYn1#p&plQD0hJ1qL@P8#`g@e@l#3k(;o!92C^NTMBmByOFI59
ziRxQ620S=j0_88y;@^dH0k4K=+zGGS^ZM!Nv3i8H{8$ImbOzO%BxC3ccl3b^Rezvp
z8aw;@_f~D(ms@(vf8e1OoOwV!!*lD&PMIXSwz>73MyHu*J#|+a*tKK-0Wy!&a?POs
z8)!Wzh}osL%MuKReFHspQ3VEvkjK%Vg}><YOVO<XdboA_D!-fWfY<H*G|=lUD2Fp_
zj+pbx5!<)1{fSL|w!5xndCv~hF?jrpifOT<qa(I&gR(=W6YEV`Y`%HaNJZ^_9eykv
zIpzKuU+G3_dP0#4TWe-Q(Vw=3B5{ejJqy;=?jKC$Oyfw_EM3Sgh=wt7qK8AFi2KXJ
zG9SrBXF}_B8;yfg6y`kB4Vu<7ERl)XkKYeW`JnsiqDGy+Y(8K)Stn<vw^rY0_utx<
oaAbmny4>EnRRqY_EzzKF#CB`YEA_YezaHOk!CQPCJ>A>?0Vi>4VgLXD

diff --git a/!NetSurf/Resources/en/Templates,fec b/!NetSurf/Resources/en/Templates,fec
index a775010e10943dbb04bb8ab1485a7656579ee197..402102193385e373aa6fe1ef3e13d02060e9511e 100644
GIT binary patch
delta 2953
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

delta 2909
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
KcP74AsnCBf-YOXY

diff --git a/!NetSurf/Resources/fr/Templates,fec b/!NetSurf/Resources/fr/Templates,fec
index 6f97d68939fb08af225b772a40e3cc26563fa4bf..f522f27fbab589aca170b69eaddbe473b17193a6 100644
GIT binary patch
delta 3665
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

delta 2279
zcmZXVU2GIp6vxkOm$sDdwuREB3zRJ%2Bp-BG^r_7A{aoi5CN%%q;9*@?wIY)W;@#!
zFfIfXVo0ov4@yYXCoySEO<zdFgeYQ7i1I)xi4u_~G(^D=#gDN5&g^U~Fxme-cmDr#
z&pmVQ$Nu%?r|o0SxmOJle$r>B`mKQwJ&{d8k>e#Z`JUbk($zANkMHvDNoVZQ(AaE|
zZFlod0{<%&A_oJ7I7xfJN)^IOAGVKq7?P8OHRRZtJ)U$<TYrF+>bHG=IaejJ%jfsn
z_F$1;G*{%ZKXE!XU>3*xJx}C7VFGb%JLy<yZ^*t{kvDvQyZ2?Y&&d^r%&HTq_JxsH
zCS|1xrI=qY((MN-RH(;E^rS<BGx)gKoAnDPU&7b;iN@`bRML*cb>`^?k*$9GlsVF4
zrX25+m)9>4shc76+sU{|ttZbI6-M}JLft_PvmjRk?)UQ=OBd$z`Ll-G6t2tNCNOV#
zV#_Shj^_&APhpeT&PSxahJGzjeH^sHH}f9%^+oiTgL1S=@QRMdUdPU1{A#pLFbD30
zudm=8eT(Oy>;61o3y2C{fP#ak56~a<_4VE!%VuJZWv8NXGumZ3+q0Se(AH<%4}yzl
zcg2RSftX`v-7n_1EWI{phPF51GK5P<my<9dt`q7a*hWQmmv|K!y_3(!171Z&sTYao
zmyt{jP|u^tJK!&1wIV0zzX#agvH|^V__Nq4Uq6X90kk4h#5x0Zpld~HN~HcXv}vGK
zSN=5odF+jRK9{Fd_1__025f#W0S$5shiljcO;Uda?I!>w%Bx<>dr`kZ|E90E<Fg-K
zCmP3U0{@~_kv)6dOF%2G2~04*mq0aQ9VjMn1P7hyBvun>K#Kq<F9FpxfujB(+C#pM
zi>yP}J(I+00&Qq(0k?rDzZO2q_;ikrR-hB{DZpuy6$lzYmp}t7U<o#%Z3e|-9E8_E
zx;b@%-Dq_4)jB)R4=j!9<-VRo-wVQM%HKfO1YTT*gC?*K@gOKBa0>@bAd0RDypDDl
zXae_a%4{@M+=ZEY_NQAFDVv+NlUAP@O~*3P_|N^ZtP^rqMpjk&^q`fplz6~>Gg4}V
z+#e%R_wz_3xXbMIUc%*MQ30;7f3N?4qAz*-*PW;-&oz=$DcFQpGx<(o)B0WH{V*S^
zCz8}fPx%`7cJzd=cfhR&#nU_muZQv$cHSpauZOi4aBa#4a0I@U@n>}WO(`2Tq*q38
z$Rl<msKePA4sW3y1G+Lg@ff-mRu4e~g&)_kJo*9m6;}T%_V{PLW~XB%tsyfLO;Su1
z+-;4|uKtDb72vp69)kFf#$=k;$^vCZiJ=#j$U+u%LhIJ()r=9Mo1hu`eQX-5HTw<z
zcc3*JBlH^hYV?G!|Dzhb*6bzhA$YwbPWih2Ei46k+;l&wzJ>RqzRHj#UeWmrx&ND;
zgkEEX`|XJ?J3DN~vZGOt9cpQ52|d@={Afqlfa!!bnnV7zICP&r7)$Z*=6)UcsHu%A
z|H1SDQq)ztq$yFI^O`cYZPG322pCcK+gX;;={{DvnDzy)-J|W~yQR}5Q0WR4#=Ley
z+sO+Rs|`cklFI!?&^=VS8Tp$^b^6t7!=XHUIIMhk_`~jXB(Wd7Lt)36y!aHBDmXTC
zsV-78-A?*+YSUV{eYCrFXUeghq#1v_a2>e$@Guh%S6K~uln*e4?y8lzo(6ivYu(#b
m8%bkb^^)*cAr`)s9J-GNq<S)4U1u1<$-^~W7<YQ^pZ@{4Epjmc

diff --git a/desktop/browser.c b/desktop/browser.c
index a3480a1d1..fabd7ab4e 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -4,6 +4,7 @@
  *                http://www.opensource.org/licenses/gpl-license
  * Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net>
  * Copyright 2004 James Bursa <bursa@users.sourceforge.net>
+ * Copyright 2004 Andrew Timmins <atimmins@blueyonder.co.uk>
  */
 
 /** \file
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 507840454..b38f198a1 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -4,6 +4,7 @@
  *                http://www.opensource.org/licenses/gpl-license
  * Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net>
  * Copyright 2004 James Bursa <bursa@users.sourceforge.net>
+ * Copyright 2004 Andrew Timmins <atimmins@blueyonder.co.uk>
  */
 
 #include <locale.h>
@@ -13,7 +14,11 @@
 #include "netsurf/utils/config.h"
 #include "netsurf/content/fetch.h"
 #include "netsurf/content/fetchcache.h"
-#include "netsurf/desktop/options.h"
+#ifdef riscos
+     #include "netsurf/riscos/options.h"
+#else
+     #include "netsurf/desktop/options.h"
+#endif
 #include "netsurf/desktop/netsurf.h"
 #include "netsurf/desktop/browser.h"
 #include "netsurf/desktop/gui.h"
@@ -38,12 +43,27 @@ static void lib_init(void);
 
 int main(int argc, char** argv)
 {
+        char url[80];
+       	int length;
+
   	netsurf_init(argc, argv);
 
 #ifdef WITH_KIOSK_BROWSING
  	browser_window_create("file:/<NetSurf$Dir>/Docs/Intro_En", NULL);
 #endif
 
+        if (option_open_browser_at_startup == true){
+                   if (!(option_homepage_url == NULL)){
+                         browser_window_create(option_homepage_url, NULL);
+                   }
+                   else {
+		   if ((length = snprintf(url, sizeof(url),
+				"file:/<NetSurf$Dir>/Docs/intro_%s",
+				option_language)) >= 0 && length < (int)sizeof(url))
+				browser_window_create(url, NULL);
+                  }
+        }
+
 	while (!netsurf_quit)
 		netsurf_poll();
 
diff --git a/riscos/dialog.c b/riscos/dialog.c
index 2449fb011..0f48448c4 100644
--- a/riscos/dialog.c
+++ b/riscos/dialog.c
@@ -537,6 +537,16 @@ void ro_gui_dialog_open_config(void)
 			wimp_CHILD_LINKS_PARENT_VISIBLE_TOP_OR_RIGHT									<< wimp_CHILD_TS_EDGE_SHIFT)) {
 		LOG(("Unable to open config proxy pane window"));
 	}
+
+	/* Always reset the selected panes to the default option */
+	ro_gui_set_icon_selected_state(dialog_config, ICON_CONFIG_PROXY,
+			true);
+	ro_gui_set_icon_selected_state(dialog_config, ICON_CONFIG_BROWSER,
+			false);
+	ro_gui_set_icon_selected_state(dialog_config, ICON_CONFIG_THEME,
+			false);
+	ro_gui_set_icon_selected_state(dialog_config, ICON_CONFIG_MISC,
+			false);
 }
 
 /**
@@ -952,6 +962,12 @@ void set_browser_choices(void) {
 	ro_gui_set_icon_string(dialog_config_br, ICON_CONFIG_BR_ALANG,
 			language_name(option_accept_language ?
 					option_accept_language : "en"));
+	ro_gui_set_icon_string(dialog_config_br, ICON_CONFIG_BR_HOMEPAGE_URL,
+	                              option_homepage_url);
+
+        ro_gui_set_icon_selected_state(dialog_config_br, ICON_CONFIG_BR_OPENBROWSER,
+			option_open_browser_at_startup);
+
 }
 
 
@@ -962,6 +978,10 @@ void set_browser_choices(void) {
 void get_browser_choices(void) {
 	option_font_size = font_size;
 	option_font_min_size = font_min_size;
+        option_homepage_url = ro_gui_get_icon_string(dialog_config_br,
+			ICON_CONFIG_BR_HOMEPAGE_URL);
+        option_open_browser_at_startup = ro_gui_get_icon_selected_state(dialog_config_br,
+			ICON_CONFIG_BR_OPENBROWSER);
 }
 
 
diff --git a/riscos/gui.c b/riscos/gui.c
index 90e73096a..3ee556698 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -807,10 +807,18 @@ void ro_gui_icon_bar_click(wimp_pointer *pointer)
 		char url[80];
 		int length;
 
-		if ((length = snprintf(url, sizeof(url),
+                /* Open the homepage based on our the user options. */
+                if (!(option_homepage_url == NULL)){
+                  browser_window_create(option_homepage_url, NULL);
+                }
+                else {
+		  if ((length = snprintf(url, sizeof(url),
 				"file:/<NetSurf$Dir>/Docs/intro_%s",
 				option_language)) >= 0 && length < (int)sizeof(url))
-			browser_window_create(url, NULL);
+				browser_window_create(url, NULL);
+                }
+
+
 	} else if (pointer->buttons == wimp_CLICK_ADJUST) {
 	  	/*	I've no idea what the correct way to scan for keys is when in the
 	  		desktop, so I've used os_byte to scan directly. This may cause some
@@ -995,7 +1003,7 @@ void ro_msg_dataload(wimp_message *message)
 		url = ro_gui_url_file_parse(message->data.data_xfer.file_name);
 	else if (file_type == 0xfaf ||
 			file_type == 0xf78 ||
-			file_type == 0xf83 || 
+			file_type == 0xf83 ||
 			file_type == 0x695 ||
 			file_type == 0xaff ||
 			file_type == 0xb60 ||
diff --git a/riscos/gui.h b/riscos/gui.h
index 152da4826..9d23ef1e5 100644
--- a/riscos/gui.h
+++ b/riscos/gui.h
@@ -284,6 +284,11 @@ void ro_gui_debugwin_redraw(wimp_draw *redraw);
 #define ICON_CONFIG_BR_LANG_PICK 12
 #define ICON_CONFIG_BR_ALANG 15
 #define ICON_CONFIG_BR_ALANG_PICK 16
+#define ICON_CONFIG_BR_HOMEPAGE_URL 20
+#define ICON_CONFIG_BR_HOMEPAGE_CURRENT 21
+#define ICON_CONFIG_BR_HOMEPAGE_DEFAULT 22
+#define ICON_CONFIG_BR_HOMEPAGE_BLANK 23
+#define ICON_CONFIG_BR_OPENBROWSER 24
 
 #define ICON_CONFIG_PROX_OK 0
 #define ICON_CONFIG_PROX_CANCEL 1
diff --git a/riscos/menus.c b/riscos/menus.c
index 651962416..65577c5d4 100644
--- a/riscos/menus.c
+++ b/riscos/menus.c
@@ -571,6 +571,8 @@ void ro_gui_popup_menu(wimp_menu *menu, wimp_w w, wimp_i i)
 
 void ro_gui_menu_selection(wimp_selection *selection)
 {
+        char url[80];
+        int length;
 	wimp_pointer pointer;
 	wimp_window_state state;
 	os_error *error;
@@ -720,6 +722,19 @@ void ro_gui_menu_selection(wimp_selection *selection)
 			case MENU_NAVIGATE:
 				switch (selection->items[1]) {
 					case 0: /* Home */
+
+					        /* Open the homepage based on our the user options. */
+
+                                                if (!(option_homepage_url == NULL)){
+                                                     browser_window_create(option_homepage_url, NULL);
+                                                }
+                                                else {
+		                                if ((length = snprintf(url, sizeof(url),
+				                     "file:/<NetSurf$Dir>/Docs/intro_%s",
+				                     option_language)) >= 0 && length < (int)sizeof(url))
+				                     browser_window_create(url, NULL);
+                                                }
+
 						break;
 					case 1: /* Back */
 						history_back(current_gui->bw,
diff --git a/riscos/options.h b/riscos/options.h
index 8e6f1d4fa..6b6d1a60f 100644
--- a/riscos/options.h
+++ b/riscos/options.h
@@ -45,6 +45,8 @@ extern bool option_background_images;
 extern bool option_background_blending;
 extern bool option_buffer_animations;
 extern bool option_buffer_everything;
+extern char *option_homepage_url;
+extern bool option_open_browser_at_startup;
 
 #define EXTRA_OPTION_DEFINE \
 bool option_use_mouse_gestures = false;\
@@ -75,7 +77,9 @@ int option_minimum_gif_delay = 10; \
 bool option_background_images = true; \
 bool option_background_blending = true; \
 bool option_buffer_animations = true; \
-bool option_buffer_everything = false;
+bool option_buffer_everything = false; \
+char *option_homepage_url =0;\
+bool option_open_browser_at_startup = false;
 
 #define EXTRA_OPTION_TABLE \
 { "use_mouse_gestures",     OPTION_BOOL,    &option_use_mouse_gestures },\
@@ -106,6 +110,7 @@ bool option_buffer_everything = false;
 { "background_images",      OPTION_BOOL,    &option_background_images }, \
 { "background_blending",    OPTION_BOOL,    &option_background_blending }, \
 { "buffer_animations",      OPTION_BOOL,    &option_buffer_animations }, \
-{ "buffer_everything",      OPTION_BOOL,    &option_buffer_animations }
-
+{ "buffer_everything",      OPTION_BOOL,    &option_buffer_animations }, \
+{ "homepage_url",           OPTION_STRING,  &option_homepage_url }, \
+{ "open_browser_at_startup",OPTION_BOOL,    &option_open_browser_at_startup }
 #endif
diff --git a/riscos/window.c b/riscos/window.c
index 0c451934e..0aeaa7c8a 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -1258,10 +1258,21 @@ bool ro_gui_window_keypress(struct gui_window *g, int key, bool toolbar)
 			ro_gui_open_help_page("docs");
 			return true;
 
+                case wimp_KEY_F5:       /* Refresh. */
+                        browser_window_reload(g->bw, false);
+                        return true;
+
 		case wimp_KEY_F6:	/* Help. */
 			ro_gui_hotlist_show();
 			return true;
 
+                case wimp_KEY_F7:       /* Toggle fullscreen browsing. */
+
+
+
+                        return true;
+
+
 		case wimp_KEY_F8:	/* View source. */
 			ro_gui_view_source(content);
 			return true;