From 5f6c2cbff7cd778b6487943d62e71ff9e7b04893 Mon Sep 17 00:00:00 2001 From: John Tytgat Date: Sat, 26 Jul 2008 22:29:15 +0000 Subject: - Compiler warning squash - Changed a lineending \n\r -> \n for a couple of files. - More code style conformance. svn path=/trunk/netsurf/; revision=4762 --- riscos/configure/con_cache.c | 10 +++-- riscos/configure/con_connect.c | 19 +++++---- riscos/configure/con_content.c | 10 +++-- riscos/configure/con_fonts.c | 1 + riscos/configure/con_home.c | 10 +++-- riscos/configure/con_image.c | 28 ++++++++----- riscos/configure/con_inter.c | 13 +++--- riscos/configure/con_language.c | 1 + riscos/configure/con_memory.c | 13 ++++-- riscos/configure/con_secure.c | 11 ++++-- riscos/configure/con_theme.c | 20 ++++++---- riscos/configure/configure.h | 87 +++++++++++++++++++++-------------------- 12 files changed, 133 insertions(+), 90 deletions(-) (limited to 'riscos/configure') diff --git a/riscos/configure/con_cache.c b/riscos/configure/con_cache.c index e6a9bc218..11fd8f30a 100644 --- a/riscos/configure/con_cache.c +++ b/riscos/configure/con_cache.c @@ -16,6 +16,7 @@ * along with this program. If not, see . */ +#include #include "oslib/hourglass.h" #include "desktop/options.h" #include "riscos/dialog.h" @@ -40,7 +41,8 @@ static bool ro_gui_options_cache_click(wimp_pointer *pointer); static bool ro_gui_options_cache_ok(wimp_w w); -bool ro_gui_options_cache_initialise(wimp_w w) { +bool ro_gui_options_cache_initialise(wimp_w w) +{ /* set the current values */ ro_gui_set_icon_decimal(w, CACHE_MEMORY_SIZE, (option_memory_cache_size * 10) >> 20, 1); @@ -58,7 +60,8 @@ bool ro_gui_options_cache_initialise(wimp_w w) { } -bool ro_gui_options_cache_click(wimp_pointer *pointer) { +bool ro_gui_options_cache_click(wimp_pointer *pointer) +{ switch (pointer->i) { case CACHE_DEFAULT_BUTTON: /* set the default values */ @@ -69,7 +72,8 @@ bool ro_gui_options_cache_click(wimp_pointer *pointer) { return false; } -bool ro_gui_options_cache_ok(wimp_w w) { +bool ro_gui_options_cache_ok(wimp_w w) +{ option_memory_cache_size = (((ro_gui_get_icon_decimal(w, CACHE_MEMORY_SIZE, 1) + 1) << 20) - 1) / 10; diff --git a/riscos/configure/con_connect.c b/riscos/configure/con_connect.c index b864c29e2..bc88c92ec 100644 --- a/riscos/configure/con_connect.c +++ b/riscos/configure/con_connect.c @@ -17,8 +17,8 @@ */ #include -#include -#include +#include "swis.h" +#include "oslib/osspriteop.h" #include "oslib/wimp.h" #include "desktop/options.h" #include "riscos/configure/configure.h" @@ -62,7 +62,8 @@ static void ro_gui_options_connection_default(wimp_pointer *pointer); static bool ro_gui_options_connection_ok(wimp_w w); static void ro_gui_options_connection_update(wimp_w w, wimp_i i); -bool ro_gui_options_connection_initialise(wimp_w w) { +bool ro_gui_options_connection_initialise(wimp_w w) +{ int proxy_type; /* set the current values */ @@ -123,7 +124,8 @@ bool ro_gui_options_connection_initialise(wimp_w w) { } -void ro_gui_options_connection_update(wimp_w w, wimp_i i) { +void ro_gui_options_connection_update(wimp_w w, wimp_i i) +{ int proxy_type; bool host, user; @@ -142,7 +144,8 @@ void ro_gui_options_connection_update(wimp_w w, wimp_i i) { ro_gui_set_icon_shaded_state(w, CONNECTION_PROXY_PASSWORD, !user); } -int ro_gui_options_connection_proxy_type(wimp_w w) { +int ro_gui_options_connection_proxy_type(wimp_w w) +{ char *text; int i; @@ -154,7 +157,8 @@ int ro_gui_options_connection_proxy_type(wimp_w w) { assert(false); } -void ro_gui_options_connection_default(wimp_pointer *pointer) { +void ro_gui_options_connection_default(wimp_pointer *pointer) +{ ro_gui_set_icon_string(pointer->w, CONNECTION_PROXY_FIELD, proxy_type_menu->entries[0]. data.indirected_text.text); @@ -168,7 +172,8 @@ void ro_gui_options_connection_default(wimp_pointer *pointer) { ro_gui_options_connection_update(pointer->w, -1); } -bool ro_gui_options_connection_ok(wimp_w w) { +bool ro_gui_options_connection_ok(wimp_w w) +{ int proxy_type; proxy_type = ro_gui_options_connection_proxy_type(w); diff --git a/riscos/configure/con_content.c b/riscos/configure/con_content.c index 382a1f1a9..bda7b6d57 100644 --- a/riscos/configure/con_content.c +++ b/riscos/configure/con_content.c @@ -16,6 +16,7 @@ * along with this program. If not, see . */ +#include #include "desktop/options.h" #include "riscos/dialog.h" #include "riscos/gui.h" @@ -39,7 +40,8 @@ static void ro_gui_options_content_default(wimp_pointer *pointer); static bool ro_gui_options_content_ok(wimp_w w); -bool ro_gui_options_content_initialise(wimp_w w) { +bool ro_gui_options_content_initialise(wimp_w w) +{ /* set the current values */ ro_gui_set_icon_selected_state(w, CONTENT_BLOCK_ADVERTISEMENTS, option_block_ads); @@ -66,7 +68,8 @@ bool ro_gui_options_content_initialise(wimp_w w) { } -void ro_gui_options_content_default(wimp_pointer *pointer) { +void ro_gui_options_content_default(wimp_pointer *pointer) +{ /* set the default values */ ro_gui_set_icon_selected_state(pointer->w, CONTENT_BLOCK_ADVERTISEMENTS, false); @@ -78,7 +81,8 @@ void ro_gui_options_content_default(wimp_pointer *pointer) { true); } -bool ro_gui_options_content_ok(wimp_w w) { +bool ro_gui_options_content_ok(wimp_w w) +{ option_block_ads = ro_gui_get_icon_selected_state(w, CONTENT_BLOCK_ADVERTISEMENTS); option_block_popups = ro_gui_get_icon_selected_state(w, diff --git a/riscos/configure/con_fonts.c b/riscos/configure/con_fonts.c index 980a156ba..4fea0629c 100644 --- a/riscos/configure/con_fonts.c +++ b/riscos/configure/con_fonts.c @@ -16,6 +16,7 @@ * along with this program. If not, see . */ +#include #include "css/css.h" #include "desktop/options.h" #include "riscos/dialog.h" diff --git a/riscos/configure/con_home.c b/riscos/configure/con_home.c index bbf267b38..a3f272fc9 100644 --- a/riscos/configure/con_home.c +++ b/riscos/configure/con_home.c @@ -16,6 +16,7 @@ * along with this program. If not, see . */ +#include #include "desktop/options.h" #include "riscos/dialog.h" #include "riscos/gui.h" @@ -39,7 +40,8 @@ static void ro_gui_options_home_default(wimp_pointer *pointer); static bool ro_gui_options_home_ok(wimp_w w); -bool ro_gui_options_home_initialise(wimp_w w) { +bool ro_gui_options_home_initialise(wimp_w w) +{ int suggestions; /* set the current values */ @@ -66,13 +68,15 @@ bool ro_gui_options_home_initialise(wimp_w w) { } -void ro_gui_options_home_default(wimp_pointer *pointer) { +void ro_gui_options_home_default(wimp_pointer *pointer) +{ /* set the default values */ ro_gui_set_icon_string(pointer->w, HOME_URL_FIELD, ""); ro_gui_set_icon_selected_state(pointer->w, HOME_OPEN_STARTUP, false); } -bool ro_gui_options_home_ok(wimp_w w) { +bool ro_gui_options_home_ok(wimp_w w) +{ if (option_homepage_url) free(option_homepage_url); option_homepage_url = strdup(ro_gui_get_icon_string(w, HOME_URL_FIELD)); diff --git a/riscos/configure/con_image.c b/riscos/configure/con_image.c index ce436afcf..f2583c7d9 100644 --- a/riscos/configure/con_image.c +++ b/riscos/configure/con_image.c @@ -17,8 +17,8 @@ */ #include -#include -#include +#include "swis.h" +#include "oslib/osspriteop.h" #include "oslib/wimp.h" #include "desktop/options.h" #include "riscos/configure/configure.h" @@ -59,7 +59,8 @@ int example_users = 0; unsigned int tinct_options[] = {tinct_USE_OS_SPRITE_OP, 0, tinct_DITHER, tinct_ERROR_DIFFUSE}; -bool ro_gui_options_image_initialise(wimp_w w) { +bool ro_gui_options_image_initialise(wimp_w w) +{ char pathname[256]; int i; @@ -114,7 +115,8 @@ bool ro_gui_options_image_initialise(wimp_w w) { } -void ro_gui_options_image_finalise(wimp_w w) { +void ro_gui_options_image_finalise(wimp_w w) +{ example_users--; if (example_users == 0) { free(example_images); @@ -123,11 +125,13 @@ void ro_gui_options_image_finalise(wimp_w w) { ro_gui_wimp_event_finalise(w); } -void ro_gui_options_image_update(wimp_w w, wimp_i i) { +void ro_gui_options_image_update(wimp_w w, wimp_i i) +{ ro_gui_redraw_icon(w, IMAGE_CURRENT_DISPLAY); } -void ro_gui_options_image_redraw(wimp_draw *redraw) { +void ro_gui_options_image_redraw(wimp_draw *redraw) +{ osbool more; int origin_x, origin_y; os_error *error; @@ -173,7 +177,8 @@ void ro_gui_options_image_redraw(wimp_draw *redraw) { } } -void ro_gui_options_image_read(wimp_w w, unsigned int *bg, unsigned int *fg) { +void ro_gui_options_image_read(wimp_w w, unsigned int *bg, unsigned int *fg) +{ char *text; int i; @@ -189,7 +194,8 @@ void ro_gui_options_image_read(wimp_w w, unsigned int *bg, unsigned int *fg) { *bg = tinct_options[i]; } -bool ro_gui_options_image_click(wimp_pointer *pointer) { +bool ro_gui_options_image_click(wimp_pointer *pointer) +{ unsigned int old_fg, old_bg, bg, fg; ro_gui_options_image_read(pointer->w, &old_bg, &old_fg); @@ -220,7 +226,8 @@ bool ro_gui_options_image_click(wimp_pointer *pointer) { return false; } -void ro_gui_options_update_shading(wimp_w w) { +void ro_gui_options_update_shading(wimp_w w) +{ bool shaded; shaded = ro_gui_get_icon_selected_state(w, IMAGE_DISABLE_ANIMATION); @@ -231,7 +238,8 @@ void ro_gui_options_update_shading(wimp_w w) { ro_gui_set_icon_shaded_state(w, IMAGE_SPEED_CS, shaded); } -bool ro_gui_options_image_ok(wimp_w w) { +bool ro_gui_options_image_ok(wimp_w w) +{ ro_gui_options_image_read(w, &option_bg_plot_style, &option_fg_plot_style); option_minimum_gif_delay = ro_gui_get_icon_decimal(w, IMAGE_SPEED_FIELD, 2); diff --git a/riscos/configure/con_inter.c b/riscos/configure/con_inter.c index 057ee47cb..cd036fa46 100644 --- a/riscos/configure/con_inter.c +++ b/riscos/configure/con_inter.c @@ -16,6 +16,7 @@ * along with this program. If not, see . */ +#include #include "riscos/dialog.h" #include "riscos/gui.h" #include "riscos/options.h" @@ -38,8 +39,8 @@ static void ro_gui_options_interface_default(wimp_pointer *pointer); static bool ro_gui_options_interface_ok(wimp_w w); -bool ro_gui_options_interface_initialise(wimp_w w) { - +bool ro_gui_options_interface_initialise(wimp_w w) +{ /* set the current values */ ro_gui_set_icon_selected_state(w, INTERFACE_STRIP_EXTNS_OPTION, option_strip_extensions); @@ -64,8 +65,8 @@ bool ro_gui_options_interface_initialise(wimp_w w) { } -void ro_gui_options_interface_default(wimp_pointer *pointer) { - +void ro_gui_options_interface_default(wimp_pointer *pointer) +{ ro_gui_set_icon_selected_state(pointer->w, INTERFACE_STRIP_EXTNS_OPTION, true); ro_gui_set_icon_selected_state(pointer->w, @@ -78,8 +79,8 @@ void ro_gui_options_interface_default(wimp_pointer *pointer) { INTERFACE_THUMBNAIL_ICONISE_OPTION, true); } -bool ro_gui_options_interface_ok(wimp_w w) { - +bool ro_gui_options_interface_ok(wimp_w w) +{ option_strip_extensions = ro_gui_get_icon_selected_state(w, INTERFACE_STRIP_EXTNS_OPTION); option_confirm_overwrite = ro_gui_get_icon_selected_state(w, diff --git a/riscos/configure/con_language.c b/riscos/configure/con_language.c index eddbec3c9..9f9d8b94e 100644 --- a/riscos/configure/con_language.c +++ b/riscos/configure/con_language.c @@ -17,6 +17,7 @@ * along with this program. If not, see . */ +#include #include "desktop/options.h" #include "riscos/dialog.h" #include "riscos/gui.h" diff --git a/riscos/configure/con_memory.c b/riscos/configure/con_memory.c index f665dde28..65d9bed26 100644 --- a/riscos/configure/con_memory.c +++ b/riscos/configure/con_memory.c @@ -16,6 +16,7 @@ * along with this program. If not, see . */ +#include #include "desktop/options.h" #include "riscos/bitmap.h" #include "riscos/options.h" @@ -43,7 +44,8 @@ static bool ro_gui_options_memory_click(wimp_pointer *pointer); static bool ro_gui_options_memory_ok(wimp_w w); static void ro_gui_options_update_shading(wimp_w w); -bool ro_gui_options_memory_initialise(wimp_w w) { +bool ro_gui_options_memory_initialise(wimp_w w) +{ /* set the current values */ ro_gui_set_icon_decimal(w, MEMORY_DIRECT_FIELD, (bitmap_direct_size * 10) >> 20, 1); @@ -77,7 +79,8 @@ bool ro_gui_options_memory_initialise(wimp_w w) { } -bool ro_gui_options_memory_click(wimp_pointer *pointer) { +bool ro_gui_options_memory_click(wimp_pointer *pointer) +{ switch (pointer->i) { case MEMORY_DIRECT_AUTO: ro_gui_options_update_shading(pointer->w); @@ -100,7 +103,8 @@ bool ro_gui_options_memory_click(wimp_pointer *pointer) { return false; } -void ro_gui_options_update_shading(wimp_w w) { +void ro_gui_options_update_shading(wimp_w w) +{ bool shaded; shaded = ro_gui_get_icon_selected_state(w, MEMORY_DIRECT_AUTO); @@ -115,7 +119,8 @@ void ro_gui_options_update_shading(wimp_w w) { ro_gui_set_icon_shaded_state(w, MEMORY_COMPRESSED_TEXT, shaded); } -bool ro_gui_options_memory_ok(wimp_w w) { +bool ro_gui_options_memory_ok(wimp_w w) +{ /* set the option values */ if (ro_gui_get_icon_selected_state(w, MEMORY_DIRECT_AUTO)) option_image_memory_direct = -1; diff --git a/riscos/configure/con_secure.c b/riscos/configure/con_secure.c index 764907c8a..c3b289b45 100644 --- a/riscos/configure/con_secure.c +++ b/riscos/configure/con_secure.c @@ -16,6 +16,7 @@ * along with this program. If not, see . */ +#include #include "desktop/options.h" #include "riscos/dialog.h" #include "riscos/gui.h" @@ -39,8 +40,8 @@ static void ro_gui_options_security_default(wimp_pointer *pointer); static bool ro_gui_options_security_ok(wimp_w w); -bool ro_gui_options_security_initialise(wimp_w w) { - +bool ro_gui_options_security_initialise(wimp_w w) +{ /* set the current values */ ro_gui_set_icon_selected_state(w, SECURITY_REFERRER, option_send_referer); @@ -63,13 +64,15 @@ bool ro_gui_options_security_initialise(wimp_w w) { } -void ro_gui_options_security_default(wimp_pointer *pointer) { +void ro_gui_options_security_default(wimp_pointer *pointer) +{ /* set the default values */ ro_gui_set_icon_integer(pointer->w, SECURITY_DURATION_FIELD, 28); ro_gui_set_icon_selected_state(pointer->w, SECURITY_REFERRER, true); } -bool ro_gui_options_security_ok(wimp_w w) { +bool ro_gui_options_security_ok(wimp_w w) +{ option_send_referer = ro_gui_get_icon_selected_state(w, SECURITY_REFERRER); option_expire_url = ro_gui_get_icon_decimal(w, diff --git a/riscos/configure/con_theme.c b/riscos/configure/con_theme.c index a74d820c7..003d67616 100644 --- a/riscos/configure/con_theme.c +++ b/riscos/configure/con_theme.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include "oslib/osspriteop.h" #include "oslib/wimp.h" #include "oslib/wimpspriteop.h" #include "utils/config.h" @@ -87,7 +87,8 @@ static bool ro_gui_options_theme_click(wimp_pointer *pointer); static void ro_gui_options_theme_load(void); static void ro_gui_options_theme_free(void); -bool ro_gui_options_theme_initialise(wimp_w w) { +bool ro_gui_options_theme_initialise(wimp_w w) +{ wimp_window_state state; wimp_icon_state icon_state; os_error *error; @@ -167,7 +168,8 @@ bool ro_gui_options_theme_initialise(wimp_w w) { return true; } -void ro_gui_options_theme_finalise(wimp_w w) { +void ro_gui_options_theme_finalise(wimp_w w) +{ os_error *error; ro_gui_options_theme_free(); @@ -184,7 +186,8 @@ void ro_gui_options_theme_finalise(wimp_w w) { ro_gui_wimp_event_finalise(w); } -bool ro_gui_options_theme_ok(wimp_w w) { +bool ro_gui_options_theme_ok(wimp_w w) +{ struct toolbar_display *toolbar; struct theme_descriptor *theme_new = NULL; @@ -211,7 +214,8 @@ bool ro_gui_options_theme_ok(wimp_w w) { return true; } -bool ro_gui_options_theme_click(wimp_pointer *pointer) { +bool ro_gui_options_theme_click(wimp_pointer *pointer) +{ struct theme_descriptor *theme_default; struct toolbar_display *toolbar; @@ -233,7 +237,8 @@ bool ro_gui_options_theme_click(wimp_pointer *pointer) { return false; } -void ro_gui_options_theme_load(void) { +void ro_gui_options_theme_load(void) +{ os_error *error; os_box extent = { 0, 0, 0, 0 }; struct theme_descriptor *descriptor; @@ -385,7 +390,8 @@ void ro_gui_options_theme_load(void) { xwimp_force_redraw(theme_pane, 0, -16384, 16384, 16384); } -void ro_gui_options_theme_free(void) { +void ro_gui_options_theme_free(void) +{ struct toolbar_display *toolbar; struct toolbar_display *next_toolbar; diff --git a/riscos/configure/configure.h b/riscos/configure/configure.h index b8aff9f66..5350be8f4 100644 --- a/riscos/configure/configure.h +++ b/riscos/configure/configure.h @@ -1,43 +1,44 @@ -/* - * Copyright 2005 Richard Wilson - * - * This file is part of NetSurf, http://www.netsurf-browser.org/ - * - * NetSurf is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * NetSurf is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** \file - * Automated RISC OS WIMP event handling (interface). - */ - - -#ifndef _NETSURF_RISCOS_OPTIONS_CONFIGURE_H_ -#define _NETSURF_RISCOS_OPTIONS_CONFIGURE_H_ - -#include - -bool ro_gui_options_cache_initialise(wimp_w w); -bool ro_gui_options_connection_initialise(wimp_w w); -bool ro_gui_options_content_initialise(wimp_w w); -bool ro_gui_options_fonts_initialise(wimp_w w); -bool ro_gui_options_home_initialise(wimp_w w); -bool ro_gui_options_image_initialise(wimp_w w); -void ro_gui_options_image_finalise(wimp_w w); -bool ro_gui_options_interface_initialise(wimp_w w); -bool ro_gui_options_language_initialise(wimp_w w); -bool ro_gui_options_memory_initialise(wimp_w w); -bool ro_gui_options_security_initialise(wimp_w w); -bool ro_gui_options_theme_initialise(wimp_w w); -void ro_gui_options_theme_finalise(wimp_w w); - -#endif +/* + * Copyright 2005 Richard Wilson + * + * This file is part of NetSurf, http://www.netsurf-browser.org/ + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** \file + * Automated RISC OS WIMP event handling (interface). + */ + + +#ifndef _NETSURF_RISCOS_OPTIONS_CONFIGURE_H_ +#define _NETSURF_RISCOS_OPTIONS_CONFIGURE_H_ + +#include +#include "oslib/wimp.h" + +bool ro_gui_options_cache_initialise(wimp_w w); +bool ro_gui_options_connection_initialise(wimp_w w); +bool ro_gui_options_content_initialise(wimp_w w); +bool ro_gui_options_fonts_initialise(wimp_w w); +bool ro_gui_options_home_initialise(wimp_w w); +bool ro_gui_options_image_initialise(wimp_w w); +void ro_gui_options_image_finalise(wimp_w w); +bool ro_gui_options_interface_initialise(wimp_w w); +bool ro_gui_options_language_initialise(wimp_w w); +bool ro_gui_options_memory_initialise(wimp_w w); +bool ro_gui_options_security_initialise(wimp_w w); +bool ro_gui_options_theme_initialise(wimp_w w); +void ro_gui_options_theme_finalise(wimp_w w); + +#endif -- cgit v1.2.3