summaryrefslogtreecommitdiff
path: root/riscos/configure
diff options
context:
space:
mode:
Diffstat (limited to 'riscos/configure')
-rw-r--r--riscos/configure/con_cache.c44
-rw-r--r--riscos/configure/con_content.c9
-rw-r--r--riscos/configure/con_fonts.c11
-rw-r--r--riscos/configure/con_home.c8
-rw-r--r--riscos/configure/con_image.c17
-rw-r--r--riscos/configure/con_inter.c7
-rw-r--r--riscos/configure/con_language.c10
-rw-r--r--riscos/configure/con_secure.c9
-rw-r--r--riscos/configure/con_theme.c6
9 files changed, 79 insertions, 42 deletions
diff --git a/riscos/configure/con_cache.c b/riscos/configure/con_cache.c
index 6e402fe81..adaaa82b7 100644
--- a/riscos/configure/con_cache.c
+++ b/riscos/configure/con_cache.c
@@ -17,25 +17,33 @@
*/
#include <stdbool.h>
-#include "oslib/hourglass.h"
+#include <oslib/hourglass.h>
+
#include "utils/nsoption.h"
-#include "riscos/dialog.h"
+#include "utils/filename.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
+
#include "riscos/gui.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/configure.h"
#include "riscos/configure/configure.h"
-#include "utils/filename.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
+#include "riscos/dialog.h"
#define CACHE_MEMORY_SIZE 3
#define CACHE_MEMORY_DEC 4
#define CACHE_MEMORY_INC 5
-#define CACHE_DEFAULT_BUTTON 7
-#define CACHE_CANCEL_BUTTON 8
-#define CACHE_OK_BUTTON 9
+#define CACHE_DISC_SIZE 10
+#define CACHE_DISC_DEC 11
+#define CACHE_DISC_INC 12
+#define CACHE_DISC_EXPIRE 15
+#define CACHE_DISC_EXPIRE_DEC 16
+#define CACHE_DISC_EXPIRE_INC 17
+#define CACHE_DEFAULT_BUTTON 19
+#define CACHE_CANCEL_BUTTON 20
+#define CACHE_OK_BUTTON 21
static bool ro_gui_options_cache_click(wimp_pointer *pointer);
static bool ro_gui_options_cache_ok(wimp_w w);
@@ -45,10 +53,19 @@ bool ro_gui_options_cache_initialise(wimp_w w)
/* set the current values */
ro_gui_set_icon_decimal(w, CACHE_MEMORY_SIZE,
(nsoption_int(memory_cache_size) * 10) >> 20, 1);
+ ro_gui_set_icon_decimal(w, CACHE_DISC_SIZE,
+ (int) ((nsoption_uint(disc_cache_size)) >> 20), 0);
+ ro_gui_set_icon_decimal(w, CACHE_DISC_EXPIRE,
+ (nsoption_int(disc_cache_age)), 0);
/* initialise all functions for a newly created window */
ro_gui_wimp_event_register_numeric_field(w, CACHE_MEMORY_SIZE,
CACHE_MEMORY_INC, CACHE_MEMORY_DEC, 0, 640, 1, 1);
+ ro_gui_wimp_event_register_numeric_field(w, CACHE_DISC_SIZE,
+ CACHE_DISC_INC, CACHE_DISC_DEC, 0, 4095, 1, 0);
+ ro_gui_wimp_event_register_numeric_field(w, CACHE_DISC_EXPIRE,
+ CACHE_DISC_EXPIRE_INC, CACHE_DISC_EXPIRE_DEC, 1, 3650,
+ 1, 0);
ro_gui_wimp_event_register_mouse_click(w, ro_gui_options_cache_click);
ro_gui_wimp_event_register_cancel(w, CACHE_CANCEL_BUTTON);
ro_gui_wimp_event_register_ok(w, CACHE_OK_BUTTON,
@@ -65,7 +82,11 @@ bool ro_gui_options_cache_click(wimp_pointer *pointer)
case CACHE_DEFAULT_BUTTON:
/* set the default values */
ro_gui_set_icon_decimal(pointer->w, CACHE_MEMORY_SIZE,
- 20, 1);
+ 120, 1);
+ ro_gui_set_icon_decimal(pointer->w, CACHE_DISC_SIZE,
+ 1024, 0);
+ ro_gui_set_icon_decimal(pointer->w, CACHE_DISC_EXPIRE,
+ 28, 0);
return true;
}
return false;
@@ -76,6 +97,11 @@ bool ro_gui_options_cache_ok(wimp_w w)
nsoption_set_int(memory_cache_size,
(((ro_gui_get_icon_decimal(w,
CACHE_MEMORY_SIZE, 1) + 1) << 20) - 1) / 10);
+ nsoption_set_uint(disc_cache_size,
+ (uint) (ro_gui_get_icon_decimal(w,
+ CACHE_DISC_SIZE, 0) << 20));
+ nsoption_set_int(disc_cache_age,
+ ro_gui_get_icon_decimal(w, CACHE_DISC_EXPIRE, 0));
ro_gui_save_options();
return true;
diff --git a/riscos/configure/con_content.c b/riscos/configure/con_content.c
index d4f3e46bb..a1d27375f 100644
--- a/riscos/configure/con_content.c
+++ b/riscos/configure/con_content.c
@@ -17,16 +17,17 @@
*/
#include <stdbool.h>
+
#include "utils/nsoption.h"
-#include "riscos/dialog.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
+
#include "riscos/gui.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/configure.h"
#include "riscos/configure/configure.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
-
+#include "riscos/dialog.h"
#define CONTENT_BLOCK_ADVERTISEMENTS 2
#define CONTENT_BLOCK_POPUPS 3
diff --git a/riscos/configure/con_fonts.c b/riscos/configure/con_fonts.c
index 626115523..1fe427c24 100644
--- a/riscos/configure/con_fonts.c
+++ b/riscos/configure/con_fonts.c
@@ -17,18 +17,21 @@
*/
#include <stdbool.h>
-#include "css/css.h"
+
#include "utils/nsoption.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#include "desktop/plot_style.h"
-#include "riscos/dialog.h"
+#include "css/css.h"
+
#include "riscos/gui.h"
+#include "riscos/font.h"
#include "riscos/menus.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/configure.h"
#include "riscos/configure/configure.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
+#include "riscos/dialog.h"
#define FONT_SANS_FIELD 3
diff --git a/riscos/configure/con_home.c b/riscos/configure/con_home.c
index 6f7d01043..4dec6ad61 100644
--- a/riscos/configure/con_home.c
+++ b/riscos/configure/con_home.c
@@ -17,8 +17,11 @@
*/
#include <stdbool.h>
+
+#include "utils/messages.h"
+#include "utils/utils.h"
#include "utils/nsoption.h"
-#include "riscos/dialog.h"
+
#include "riscos/gui.h"
#include "riscos/menus.h"
#include "riscos/url_suggest.h"
@@ -26,8 +29,7 @@
#include "riscos/wimp_event.h"
#include "riscos/configure.h"
#include "riscos/configure/configure.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
+#include "riscos/dialog.h"
#define HOME_URL_FIELD 3
#define HOME_URL_GRIGHT 4
diff --git a/riscos/configure/con_image.c b/riscos/configure/con_image.c
index 4982423a3..ee4281856 100644
--- a/riscos/configure/con_image.c
+++ b/riscos/configure/con_image.c
@@ -17,18 +17,21 @@
*/
#include <stdbool.h>
-#include "swis.h"
-#include "oslib/osspriteop.h"
-#include "oslib/wimp.h"
+#include <swis.h>
+#include <oslib/osspriteop.h>
+#include <oslib/wimp.h>
+
#include "utils/nsoption.h"
+#include "utils/log.h"
+#include "utils/utils.h"
+
+#include "riscos/gui.h"
#include "riscos/configure/configure.h"
#include "riscos/dialog.h"
#include "riscos/menus.h"
#include "riscos/tinct.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
-#include "utils/log.h"
-#include "utils/utils.h"
#define IMAGE_FOREGROUND_FIELD 3
@@ -62,11 +65,11 @@ unsigned int tinct_options[] = {tinct_USE_OS_SPRITE_OP, 0, tinct_DITHER,
bool ro_gui_options_image_initialise(wimp_w w)
{
- char pathname[256];
int i;
/* load the sprite file */
if (example_users == 0) {
+ char pathname[256];
snprintf(pathname, 256, "%s.Resources.Image", NETSURF_DIR);
pathname[255] = '\0';
example_images = ro_gui_load_sprite_file(pathname);
@@ -138,7 +141,6 @@ bool ro_gui_options_image_update(wimp_w w, wimp_i i, wimp_menu *m,
void ro_gui_options_image_redraw(wimp_draw *redraw)
{
osbool more;
- int origin_x, origin_y;
os_error *error;
wimp_icon_state icon_state;
osspriteop_header *bg = NULL, *fg = NULL;
@@ -168,6 +170,7 @@ void ro_gui_options_image_redraw(wimp_draw *redraw)
/* perform the redraw */
more = wimp_redraw_window(redraw);
while (more) {
+ int origin_x, origin_y;
origin_x = redraw->box.x0 - redraw->xscroll +
icon_state.icon.extent.x0 + 2;
origin_y = redraw->box.y1 - redraw->yscroll +
diff --git a/riscos/configure/con_inter.c b/riscos/configure/con_inter.c
index 2af5e3aa5..7ab912c54 100644
--- a/riscos/configure/con_inter.c
+++ b/riscos/configure/con_inter.c
@@ -17,14 +17,15 @@
*/
#include <stdbool.h>
-#include "riscos/dialog.h"
-#include "riscos/gui.h"
+
#include "utils/nsoption.h"
+
+#include "riscos/gui.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/configure.h"
#include "riscos/configure/configure.h"
-
+#include "riscos/dialog.h"
#define INTERFACE_STRIP_EXTNS_OPTION 2
#define INTERFACE_CONFIRM_OVWR_OPTION 3
diff --git a/riscos/configure/con_language.c b/riscos/configure/con_language.c
index 7e483b5af..ace7a6fdf 100644
--- a/riscos/configure/con_language.c
+++ b/riscos/configure/con_language.c
@@ -18,17 +18,19 @@
*/
#include <stdbool.h>
+
#include "utils/nsoption.h"
-#include "riscos/dialog.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
+
#include "riscos/gui.h"
#include "riscos/menus.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/configure.h"
#include "riscos/configure/configure.h"
-#include "utils/log.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
+#include "riscos/dialog.h"
#define LANGUAGE_INTERFACE_FIELD 3
diff --git a/riscos/configure/con_secure.c b/riscos/configure/con_secure.c
index 75e2bc705..2e3c31484 100644
--- a/riscos/configure/con_secure.c
+++ b/riscos/configure/con_secure.c
@@ -17,16 +17,17 @@
*/
#include <stdbool.h>
+
#include "utils/nsoption.h"
-#include "riscos/dialog.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
+
#include "riscos/gui.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/configure.h"
#include "riscos/configure/configure.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
-
+#include "riscos/dialog.h"
#define SECURITY_REFERRER 2
#define SECURITY_DURATION_FIELD 6
diff --git a/riscos/configure/con_theme.c b/riscos/configure/con_theme.c
index c4d605c88..13ba3165c 100644
--- a/riscos/configure/con_theme.c
+++ b/riscos/configure/con_theme.c
@@ -172,10 +172,9 @@ bool ro_gui_options_theme_initialise(wimp_w w)
void ro_gui_options_theme_finalise(wimp_w w)
{
- os_error *error;
-
ro_gui_options_theme_free();
if (theme_pane) {
+ os_error *error;
ro_gui_wimp_event_finalise(theme_pane);
error = xwimp_delete_window(theme_pane);
if (error) {
@@ -249,7 +248,6 @@ void ro_gui_options_theme_load(void)
wimp_icon_create new_icon;
wimp_window_state state;
int parent_width, nested_y, min_extent, base_extent;
- int item_height;
int *radio_icons, *radio_set;
int theme_count;
@@ -315,7 +313,7 @@ void ro_gui_options_theme_load(void)
(wimp_COLOUR_VERY_LIGHT_GREY << wimp_ICON_BG_COLOUR_SHIFT);
while (link) {
/* update the toolbar */
- item_height = 44 + 44 + 16;
+ int item_height = 44 + 44 + 16;
if (link->next) item_height += 16;
ro_toolbar_process(link->toolbar, parent_width, false);
extent.y0 = nested_y -
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-18 23:14:10 +0000