From ba23e4b69341e5f3f2dbcd824663e75ebe2a581f Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 27 Nov 2006 15:35:18 +0000 Subject: Update project URL. svn path=/trunk/netsurf/; revision=3073 --- riscos/401login.c | 2 +- riscos/artworks.c | 2 +- riscos/artworks.h | 4 ++-- riscos/assert.c | 2 +- riscos/bitmap.c | 2 +- riscos/bitmap.h | 6 +++--- riscos/buffer.c | 4 ++-- riscos/buffer.h | 2 +- riscos/configure.c | 2 +- riscos/configure.h | 2 +- riscos/configure/con_cache.c | 4 ++-- riscos/configure/con_connect.c | 2 +- riscos/configure/con_content.c | 10 +++++----- riscos/configure/con_fonts.c | 2 +- riscos/configure/con_home.c | 4 ++-- riscos/configure/con_image.c | 8 ++++---- riscos/configure/con_inter.c | 2 +- riscos/configure/con_language.c | 2 +- riscos/configure/con_memory.c | 2 +- riscos/configure/con_secure.c | 4 ++-- riscos/configure/con_theme.c | 10 +++++----- riscos/configure/configure.h | 2 +- riscos/cookies.c | 10 +++++----- riscos/cookies.h | 2 +- riscos/debugwin.c | 2 +- riscos/dialog.c | 4 ++-- riscos/dialog.h | 2 +- riscos/download.c | 2 +- riscos/draw.c | 2 +- riscos/draw.h | 2 +- riscos/filetype.c | 2 +- riscos/font.c | 2 +- riscos/global_history.c | 2 +- riscos/global_history.h | 2 +- riscos/gui.c | 2 +- riscos/gui.h | 4 ++-- riscos/gui/progress_bar.c | 40 ++++++++++++++++++++-------------------- riscos/gui/progress_bar.h | 2 +- riscos/gui/status_bar.c | 36 ++++++++++++++++++------------------ riscos/gui/status_bar.h | 2 +- riscos/help.c | 2 +- riscos/help.h | 2 +- riscos/history.c | 6 +++--- riscos/hotlist.c | 8 ++++---- riscos/image.c | 8 ++++---- riscos/image.h | 2 +- riscos/menus.c | 4 ++-- riscos/menus.h | 4 ++-- riscos/message.c | 6 +++--- riscos/message.h | 2 +- riscos/options.h | 2 +- riscos/palettes.c | 2 +- riscos/palettes.h | 2 +- riscos/plotters.c | 6 +++--- riscos/plugin.c | 2 +- riscos/plugin.h | 2 +- riscos/print.c | 4 ++-- riscos/print.h | 2 +- riscos/query.c | 2 +- riscos/query.h | 2 +- riscos/save.c | 2 +- riscos/save.h | 2 +- riscos/save_complete.c | 2 +- riscos/save_complete.h | 2 +- riscos/save_draw.c | 2 +- riscos/save_draw.h | 2 +- riscos/schedule.c | 4 ++-- riscos/search.c | 2 +- riscos/sprite.c | 6 +++--- riscos/sprite.h | 2 +- riscos/sslcert.c | 2 +- riscos/textarea.c | 4 ++-- riscos/textarea.h | 2 +- riscos/textselection.c | 6 +++--- riscos/textselection.h | 2 +- riscos/theme.c | 10 +++++----- riscos/theme.h | 2 +- riscos/theme_install.c | 2 +- riscos/thumbnail.c | 2 +- riscos/thumbnail.h | 2 +- riscos/tinct.h | 4 ++-- riscos/treeview.c | 4 ++-- riscos/treeview.h | 2 +- riscos/ucstables.c | 4 ++-- riscos/ucstables.h | 2 +- riscos/uri.c | 2 +- riscos/uri.h | 2 +- riscos/url_complete.c | 2 +- riscos/url_complete.h | 2 +- riscos/url_protocol.c | 2 +- riscos/url_protocol.h | 2 +- riscos/wimp.c | 2 +- riscos/wimp.h | 2 +- riscos/wimp_event.c | 2 +- riscos/wimp_event.h | 2 +- riscos/window.c | 2 +- 96 files changed, 184 insertions(+), 184 deletions(-) (limited to 'riscos') diff --git a/riscos/401login.c b/riscos/401login.c index 9eec1c0ba..166097b91 100644 --- a/riscos/401login.c +++ b/riscos/401login.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2003 John M Bell diff --git a/riscos/artworks.c b/riscos/artworks.c index ec3833bed..6a52c5512 100644 --- a/riscos/artworks.c +++ b/riscos/artworks.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Adrian Lees diff --git a/riscos/artworks.h b/riscos/artworks.h index 01686138d..171e99d97 100644 --- a/riscos/artworks.h +++ b/riscos/artworks.h @@ -1,8 +1,8 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license - * Copyright 2005 Adrian Lees + * Copyright 2005 Adrian Lees */ /** \file diff --git a/riscos/assert.c b/riscos/assert.c index 96309bcef..e741d5f75 100644 --- a/riscos/assert.c +++ b/riscos/assert.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 James Bursa diff --git a/riscos/bitmap.c b/riscos/bitmap.c index 3b7ab83c9..1ac260b6b 100644 --- a/riscos/bitmap.c +++ b/riscos/bitmap.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 James Bursa diff --git a/riscos/bitmap.h b/riscos/bitmap.h index ac196661a..d90679c25 100644 --- a/riscos/bitmap.h +++ b/riscos/bitmap.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 James Bursa @@ -16,9 +16,9 @@ struct osspriteop_area; struct bitmap { int width; int height; - + unsigned int state; - + void *private_word; void (*invalidate)(struct bitmap *bitmap, void *private_word); diff --git a/riscos/buffer.c b/riscos/buffer.c index ba001c668..4351acf3e 100644 --- a/riscos/buffer.c +++ b/riscos/buffer.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004, 2005 Richard Wilson @@ -227,7 +227,7 @@ void ro_gui_buffer_open(wimp_draw *redraw) { */ ro_plot_origin_x -= clipping.x0; ro_plot_origin_y -= clipping.y0; - + /* Update the ECF origin */ if ((error = xos_set_ecf_origin(-ro_plot_origin_x, diff --git a/riscos/buffer.h b/riscos/buffer.h index 8340dd24f..6bd2ef0cf 100644 --- a/riscos/buffer.h +++ b/riscos/buffer.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 Richard Wilson diff --git a/riscos/configure.c b/riscos/configure.c index 643576974..689ee2019 100644 --- a/riscos/configure.c +++ b/riscos/configure.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Richard Wilson diff --git a/riscos/configure.h b/riscos/configure.h index 5e040d533..e7c9708e2 100644 --- a/riscos/configure.h +++ b/riscos/configure.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Richard Wilson diff --git a/riscos/configure/con_cache.c b/riscos/configure/con_cache.c index a21b54fbf..1835ea607 100644 --- a/riscos/configure/con_cache.c +++ b/riscos/configure/con_cache.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Richard Wilson @@ -35,7 +35,7 @@ static bool ro_gui_options_cache_ok(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, + ro_gui_set_icon_decimal(w, CACHE_MEMORY_SIZE, (option_memory_cache_size * 10) >> 20, 1); ro_gui_set_icon_decimal(w, CACHE_DURATION_SIZE, option_disc_cache_age, 0); diff --git a/riscos/configure/con_connect.c b/riscos/configure/con_connect.c index 97356aa6c..42dac5f72 100644 --- a/riscos/configure/con_connect.c +++ b/riscos/configure/con_connect.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Richard Wilson diff --git a/riscos/configure/con_content.c b/riscos/configure/con_content.c index 7ad1dd0f5..6e762eeb0 100644 --- a/riscos/configure/con_content.c +++ b/riscos/configure/con_content.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Richard Wilson @@ -30,13 +30,13 @@ static bool ro_gui_options_content_ok(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, + ro_gui_set_icon_selected_state(w, CONTENT_BLOCK_ADVERTISEMENTS, option_block_ads); - ro_gui_set_icon_selected_state(w, CONTENT_BLOCK_POPUPS, + ro_gui_set_icon_selected_state(w, CONTENT_BLOCK_POPUPS, option_block_popups); - ro_gui_set_icon_selected_state(w, CONTENT_NO_PLUGINS, + ro_gui_set_icon_selected_state(w, CONTENT_NO_PLUGINS, option_no_plugins); - ro_gui_set_icon_selected_state(w, CONTENT_TARGET_BLANK, + ro_gui_set_icon_selected_state(w, CONTENT_TARGET_BLANK, option_target_blank); /* initialise all functions for a newly created window */ diff --git a/riscos/configure/con_fonts.c b/riscos/configure/con_fonts.c index 2c967107b..4fa26f7be 100644 --- a/riscos/configure/con_fonts.c +++ b/riscos/configure/con_fonts.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Richard Wilson diff --git a/riscos/configure/con_home.c b/riscos/configure/con_home.c index c98608730..26d104ebf 100644 --- a/riscos/configure/con_home.c +++ b/riscos/configure/con_home.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Richard Wilson @@ -34,7 +34,7 @@ bool ro_gui_options_home_initialise(wimp_w w) { /* set the current values */ ro_gui_set_icon_string(w, HOME_URL_FIELD, option_homepage_url ? option_homepage_url : ""); - ro_gui_set_icon_selected_state(w, HOME_OPEN_STARTUP, + ro_gui_set_icon_selected_state(w, HOME_OPEN_STARTUP, option_open_browser_at_startup); global_history_get_recent(&suggestions); ro_gui_set_icon_shaded_state(w, diff --git a/riscos/configure/con_image.c b/riscos/configure/con_image.c index 09dee68d4..3d67fc1f4 100644 --- a/riscos/configure/con_image.c +++ b/riscos/configure/con_image.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Richard Wilson @@ -134,7 +134,7 @@ void ro_gui_options_image_redraw(wimp_draw *redraw) { warn_user("MenuError", error->errmess); return; } - + /* find the sprites */ if (example_images) { ro_gui_options_image_read(redraw->w, &bg_tinct, &fg_tinct); @@ -165,7 +165,7 @@ void ro_gui_options_image_redraw(wimp_draw *redraw) { void ro_gui_options_image_read(wimp_w w, unsigned int *bg, unsigned int *fg) { char *text; int i; - + text = ro_gui_get_icon_string(w, IMAGE_FOREGROUND_FIELD); for (i = 0; (i < 4); i++) if (!strcmp(text, image_quality_menu->entries[i]. @@ -180,7 +180,7 @@ void ro_gui_options_image_read(wimp_w w, unsigned int *bg, unsigned int *fg) { 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); switch (pointer->i) { case IMAGE_DEFAULT_BUTTON: diff --git a/riscos/configure/con_inter.c b/riscos/configure/con_inter.c index 84d48bb85..a649270a5 100644 --- a/riscos/configure/con_inter.c +++ b/riscos/configure/con_inter.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Adrian Lees diff --git a/riscos/configure/con_language.c b/riscos/configure/con_language.c index 07b7422da..637f84ac9 100644 --- a/riscos/configure/con_language.c +++ b/riscos/configure/con_language.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 John M Bell diff --git a/riscos/configure/con_memory.c b/riscos/configure/con_memory.c index 971c06be4..c5c7466e1 100644 --- a/riscos/configure/con_memory.c +++ b/riscos/configure/con_memory.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Richard Wilson diff --git a/riscos/configure/con_secure.c b/riscos/configure/con_secure.c index c4b9ddf91..2b16f3116 100644 --- a/riscos/configure/con_secure.c +++ b/riscos/configure/con_secure.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Richard Wilson @@ -31,7 +31,7 @@ static bool ro_gui_options_security_ok(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, + ro_gui_set_icon_selected_state(w, SECURITY_REFERRER, option_send_referer); ro_gui_set_icon_integer(w, SECURITY_DURATION_FIELD, option_expire_url); diff --git a/riscos/configure/con_theme.c b/riscos/configure/con_theme.c index 33e7b9761..de0a10583 100644 --- a/riscos/configure/con_theme.c +++ b/riscos/configure/con_theme.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Richard Wilson @@ -152,7 +152,7 @@ bool ro_gui_options_theme_initialise(wimp_w w) { ro_gui_options_theme_ok); ro_gui_wimp_event_set_help_prefix(w, "HelpThemeConfig"); ro_gui_wimp_event_memorise(w); - + return true; } @@ -184,7 +184,7 @@ bool ro_gui_options_theme_ok(wimp_w w) { break; } } - + /* set the options */ if (option_theme) free(option_theme); @@ -194,7 +194,7 @@ bool ro_gui_options_theme_ok(wimp_w w) { } else option_theme = NULL; ro_gui_save_options(); - + /* store the pane status */ ro_gui_wimp_event_memorise(theme_pane); return true; @@ -370,7 +370,7 @@ void ro_gui_options_theme_load(void) { *radio_set = -1; ro_gui_wimp_event_register_radio(theme_pane, radio_icons); - /* update our display */ + /* update our display */ xwimp_force_redraw(theme_pane, 0, -16384, 16384, 16384); } diff --git a/riscos/configure/configure.h b/riscos/configure/configure.h index a48020042..972ac6662 100644 --- a/riscos/configure/configure.h +++ b/riscos/configure/configure.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Richard Wilson diff --git a/riscos/cookies.c b/riscos/cookies.c index b51720c14..03358cf89 100644 --- a/riscos/cookies.c +++ b/riscos/cookies.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Richard Wilson @@ -126,7 +126,7 @@ bool cookies_update(const char *domain, const struct cookie_data *data) bool expanded; assert(domain); - + /* check if we're a domain, and add get the first cookie */ if (data) for (cookie = data; cookie->prev; cookie = cookie->prev); @@ -153,12 +153,12 @@ bool cookies_update(const char *domain, const struct cookie_data *data) return true; } } - + if (!node) { for (parent = cookies_tree->root->child; parent; parent = parent->next) { if (strcmp(domain, parent->data.text) < 0) - break; + break; } if (!parent) { node = tree_create_folder_node(cookies_tree->root, @@ -172,7 +172,7 @@ bool cookies_update(const char *domain, const struct cookie_data *data) if (!node) return true; node->editable = false; - + for (; cookie; cookie = cookie->next) { add = tree_create_cookie_node(node, cookie); if (add && !cookies_init) diff --git a/riscos/cookies.h b/riscos/cookies.h index 505f89722..ca64f4c91 100644 --- a/riscos/cookies.h +++ b/riscos/cookies.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Richard Wilson diff --git a/riscos/debugwin.c b/riscos/debugwin.c index a38f2e442..f01735893 100644 --- a/riscos/debugwin.c +++ b/riscos/debugwin.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 James Bursa diff --git a/riscos/dialog.c b/riscos/dialog.c index e16fdeb24..72163b7ef 100644 --- a/riscos/dialog.c +++ b/riscos/dialog.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2003 Phil Mellor @@ -367,7 +367,7 @@ void ro_gui_dialog_close(wimp_w close) } /* Close any child windows */ - for (i = 0; i < MAX_PERSISTENT; i++) + for (i = 0; i < MAX_PERSISTENT; i++) if (persistent_dialog[i].parent == close) ro_gui_dialog_close(persistent_dialog[i].dialog); diff --git a/riscos/dialog.h b/riscos/dialog.h index d221d919f..2fcc206c2 100644 --- a/riscos/dialog.h +++ b/riscos/dialog.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Richard Wilson diff --git a/riscos/download.c b/riscos/download.c index d8266c633..492180d2d 100644 --- a/riscos/download.c +++ b/riscos/download.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 James Bursa diff --git a/riscos/draw.c b/riscos/draw.c index 75caacda2..489da7ff9 100644 --- a/riscos/draw.c +++ b/riscos/draw.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2003 John M Bell diff --git a/riscos/draw.h b/riscos/draw.h index e18e42cc7..e7f5cc9b3 100644 --- a/riscos/draw.h +++ b/riscos/draw.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2003 John M Bell diff --git a/riscos/filetype.c b/riscos/filetype.c index 3144d3d5a..eb226685a 100644 --- a/riscos/filetype.c +++ b/riscos/filetype.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 James Bursa diff --git a/riscos/font.c b/riscos/font.c index 2017a58ec..eca4ae80f 100644 --- a/riscos/font.c +++ b/riscos/font.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 James Bursa diff --git a/riscos/global_history.c b/riscos/global_history.c index 355b70cf5..ab3fac1d1 100644 --- a/riscos/global_history.c +++ b/riscos/global_history.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Richard Wilson diff --git a/riscos/global_history.h b/riscos/global_history.h index e3a187412..b96787d1b 100644 --- a/riscos/global_history.h +++ b/riscos/global_history.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Richard Wilson diff --git a/riscos/gui.c b/riscos/gui.c index 25f54d590..3e4b3c4b8 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2003 Phil Mellor diff --git a/riscos/gui.h b/riscos/gui.h index ab31e7b1d..aa18e9dcc 100644 --- a/riscos/gui.h +++ b/riscos/gui.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2003 Phil Mellor @@ -89,7 +89,7 @@ struct gui_window { int throbtime; /**< Time of last throbber frame. */ int iconise_icon; /**< ID number of icon when window is iconised */ - + char validation[12]; /**< Validation string for colours */ /** Options. */ diff --git a/riscos/gui/progress_bar.c b/riscos/gui/progress_bar.c index 82829def7..0ca2d28b0 100644 --- a/riscos/gui/progress_bar.c +++ b/riscos/gui/progress_bar.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Richard Wilson @@ -276,25 +276,25 @@ void ro_gui_progress_bar_update(struct progress_bar *pb, int width, int height) schedule(20, ro_gui_progress_bar_animate, pb); pb->animating = true; } - + /* get old and new positions */ cur = pb->visible; pb->recalculate = true; ro_gui_progress_bar_calculate(pb, width, height); - + /* see if the progress bar hasn't moved. we don't need to consider * the left edge moving as this is handled by the icon setting * function */ if (cur.x1 == pb->visible.x1) return; - + /* if size has decreased then we must force a redraw */ if (cur.x1 > pb->visible.x1) { xwimp_force_redraw(pb->w, pb->visible.x1, pb->visible.y0, cur.x1, pb->visible.y1); return; } - + /* perform a minimal redraw update */ redraw.w = pb->w; redraw.box = pb->visible; @@ -342,14 +342,14 @@ void ro_gui_progress_bar_animate(void *p) { struct progress_bar *pb = p; if (!progress_icon) - return; + return; pb->offset -= 6; if (pb->offset < 0) pb->offset += progress_width * 2; - + if (pb->animating) schedule(20, ro_gui_progress_bar_animate, pb); - + redraw.w = pb->w; redraw.box = pb->visible; error = xwimp_update_window(&redraw, &more); @@ -372,12 +372,12 @@ void ro_gui_progress_bar_calculate(struct progress_bar *pb, int width, int heigh int icon_x0 = 0, icon_y0 = 0, progress_x0, progress_x1, progress_ymid = 0; osspriteop_header *icon = NULL; bool icon_redraw = false; - + /* try to use cached values */ if ((!pb->recalculate) && (pb->cur_width == width) && (pb->cur_height == height)) return; - + /* update cache status */ pb->recalculate = false; pb->cur_width = width; @@ -409,18 +409,18 @@ void ro_gui_progress_bar_calculate(struct progress_bar *pb, int width, int heigh } } } - + /* update the icon */ if ((pb->icon_obscured) || (icon_redraw)) { if (icon_x0 != pb->icon_x0) xwimp_force_redraw(pb->w, 0, 0, 32 + MARGIN, 65536); } - pb->icon_obscured = icon_redraw; - + pb->icon_obscured = icon_redraw; + progress_x1 = progress_x0; if ((pb->range > 0) && (width > 0)) progress_x1 += (width * pb->value) / pb->range; - + pb->visible.x0 = progress_x0; pb->visible.y0 = MARGIN; pb->visible.x1 = progress_x1; @@ -454,7 +454,7 @@ void ro_gui_progress_bar_redraw_window(wimp_draw *redraw, struct progress_bar *p redraw->box.y1 - redraw->box.y0); progress_ymid = redraw->box.y0 + pb->visible.y0 + ((pb->visible.y1 - pb->visible.y0) >> 1); - + /* redraw the window */ while (more) { if (pb->icon) @@ -464,12 +464,12 @@ void ro_gui_progress_bar_redraw_window(wimp_draw *redraw, struct progress_bar *p redraw->box.y0 + pb->icon_y0, tinct_ERROR_DIFFUSE); if (!pb->icon_obscured) { - clip_x0 = max(redraw->clip.x0, - redraw->box.x0 + pb->visible.x0) >> 1; + clip_x0 = max(redraw->clip.x0, + redraw->box.x0 + pb->visible.x0) >> 1; clip_y0 = -min(redraw->clip.y1, - redraw->box.y0 + pb->visible.y1) >> 1; + redraw->box.y0 + pb->visible.y1) >> 1; clip_x1 = min(redraw->clip.x1, - redraw->box.x0 + pb->visible.x1) >> 1; + redraw->box.x0 + pb->visible.x1) >> 1; clip_y1 = -max(redraw->clip.y0, redraw->box.y0 + pb->visible.y0) >> 1; if ((clip_x0 < clip_x1) && (clip_y0 < clip_y1)) { @@ -478,7 +478,7 @@ void ro_gui_progress_bar_redraw_window(wimp_draw *redraw, struct progress_bar *p _swix(Tinct_Plot, _IN(2) | _IN(3) | _IN(4) | _IN(7), progress_icon, redraw->box.x0 - pb->offset, - progress_ymid - progress_height, + progress_ymid - progress_height, tinct_FILL_HORIZONTALLY); } else { plot.fill(clip_x0, clip_y0, clip_x1, clip_y1, diff --git a/riscos/gui/progress_bar.h b/riscos/gui/progress_bar.h index 454716b7d..b93a36d39 100644 --- a/riscos/gui/progress_bar.h +++ b/riscos/gui/progress_bar.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Richard Wilson diff --git a/riscos/gui/status_bar.c b/riscos/gui/status_bar.c index 132958a4d..84ce994c8 100644 --- a/riscos/gui/status_bar.c +++ b/riscos/gui/status_bar.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Richard Wilson @@ -48,7 +48,7 @@ wimp_WINDOW(1) status_bar_definition = { 0, 0, wimp_TOP, - wimp_WINDOW_NEW_FORMAT | wimp_WINDOW_MOVEABLE | + wimp_WINDOW_NEW_FORMAT | wimp_WINDOW_MOVEABLE | wimp_WINDOW_FURNITURE_WINDOW | wimp_WINDOW_IGNORE_XEXTENT, wimp_COLOUR_BLACK, @@ -106,7 +106,7 @@ struct status_bar *ro_gui_status_bar_create(wimp_w parent, unsigned int width) { sb = calloc(1, sizeof(*sb)); if (!sb) return NULL; - + sb->pb = ro_gui_progress_bar_create(); if (!sb->pb) return NULL; @@ -151,9 +151,9 @@ void ro_gui_status_bar_destroy(struct status_bar *sb) { LOG(("xwimp_delete_window: 0x%x:%s", error->errnum, error->errmess)); } - + ro_gui_progress_bar_destroy(sb->pb); - + if (sb->text) free(sb->text); @@ -206,7 +206,7 @@ void ro_gui_status_bar_set_visible(struct status_bar *sb, bool visible) { if (error) { LOG(("xwimp_close_window: 0x%x:%s", error->errnum, error->errmess)); - } + } } } @@ -234,7 +234,7 @@ void ro_gui_status_bar_set_progress_value(struct status_bar *sb, unsigned int value) { assert(sb); - + ro_gui_status_bar_set_progress_range(sb, max(value, ro_gui_progress_bar_get_range(sb->pb))); ro_gui_progress_bar_set_value(sb->pb, value); @@ -253,10 +253,10 @@ void ro_gui_status_bar_set_progress_range(struct status_bar *sb, os_error *error; assert(sb); - + old_range = ro_gui_progress_bar_get_range(sb->pb); ro_gui_progress_bar_set_range(sb->pb, range); - + LOG(("Ranges are %i vs %i", old_range, range)); if ((old_range == 0) && (range != 0)) { ro_gui_status_position_progress_bar(sb); @@ -266,7 +266,7 @@ void ro_gui_status_bar_set_progress_range(struct status_bar *sb, if (error) { LOG(("xwimp_close_window: 0x%x:%s", error->errnum, error->errmess)); - } + } } } @@ -280,7 +280,7 @@ void ro_gui_status_bar_set_progress_range(struct status_bar *sb, void ro_gui_status_bar_set_progress_icon(struct status_bar *sb, const char *icon) { assert(sb); - + ro_gui_progress_bar_set_icon(sb->pb, icon); } @@ -293,7 +293,7 @@ void ro_gui_status_bar_set_progress_icon(struct status_bar *sb, void ro_gui_status_bar_set_text(struct status_bar *sb, const char *text) { assert(sb); - + /* check for no change */ if (sb->text) { /* strings match */ @@ -316,7 +316,7 @@ void ro_gui_status_bar_set_text(struct status_bar *sb, const char *text) { sb->text = strdup(text); else sb->text = NULL; - + /* redraw the window */ if (sb->visible) xwimp_force_redraw(sb->w, 0, 0, sb->width - WIDGET_WIDTH, 65536); @@ -409,7 +409,7 @@ void ro_gui_status_bar_resize(struct status_bar *sb) { error->errnum, error->errmess)); return; } - + redraw_left = min(status_width, sb->width) - WIDGET_WIDTH - 2; redraw_right = max(status_width, sb->width); xwimp_force_redraw(sb->w, redraw_left, 0, @@ -472,7 +472,7 @@ void ro_gui_status_bar_redraw(wimp_draw *redraw) { LOG(("rufl_paint: 0x%x", code)); } } - + /* separate the widget from the text with a line */ plot.fill((redraw->box.x0 + sb->width - WIDGET_WIDTH - 2) >> 1, -redraw->box.y0 >> 1, @@ -529,7 +529,7 @@ void ro_gui_status_bar_open(wimp_open *open) { int window_width, status_width; wimp_window_state state; os_error *error; - + /* get the parent width for scaling */ sb = (struct status_bar *)ro_gui_wimp_event_get_user_data(open->w); state.w = sb->parent; @@ -582,7 +582,7 @@ void ro_gui_status_position_progress_bar(struct status_bar *sb) { /* calculate the dimensions */ right = state.visible.x1 - WIDGET_WIDTH - 2; left = max(state.visible.x0, right - PROGRESS_WIDTH); - + /* re-open the nested window */ state.w = ro_gui_progress_bar_get_window(sb->pb); state.xscroll = 0; @@ -608,7 +608,7 @@ void ro_gui_status_position_progress_bar(struct status_bar *sb) { LOG(("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess)); } - + /* update the progress bar display on non-standard width */ if ((right - left) != PROGRESS_WIDTH) ro_gui_progress_bar_update(sb->pb, right - left, diff --git a/riscos/gui/status_bar.h b/riscos/gui/status_bar.h index b1c5baca4..dc8452456 100644 --- a/riscos/gui/status_bar.h +++ b/riscos/gui/status_bar.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Richard Wilson diff --git a/riscos/help.c b/riscos/help.c index a7e185055..b536dbc61 100644 --- a/riscos/help.c +++ b/riscos/help.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004, 2005 Richard Wilson diff --git a/riscos/help.h b/riscos/help.h index 544931707..984e97f7c 100644 --- a/riscos/help.h +++ b/riscos/help.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004, 2005 Richard Wilson diff --git a/riscos/history.c b/riscos/history.c index 89d7d4bfc..d5146701b 100644 --- a/riscos/history.c +++ b/riscos/history.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 James Bursa @@ -71,7 +71,7 @@ void ro_gui_history_open(struct browser_window *bw, os_box box = {0, 0, 0, 0}; wimp_window_state state; os_error *error; - + assert(history); history_current = history; @@ -166,7 +166,7 @@ void ro_gui_history_mouse_at(wimp_pointer *pointer) wimp_icon_state ic; os_box box = {0, 0, 0, 0}; os_error *error; - + /* If the mouse hasn't moved, or if we don't want tooltips, exit */ if ((mouse_x == pointer->pos.x && mouse_y == pointer->pos.y) || !option_history_tooltip) diff --git a/riscos/hotlist.c b/riscos/hotlist.c index 4ce2f72ea..f319c8fd9 100644 --- a/riscos/hotlist.c +++ b/riscos/hotlist.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004, 2005 Richard Wilson @@ -53,9 +53,9 @@ static const struct { const char *url; const char *msg_key; } default_entries[] = { - { "http://netsurf.sourceforge.net/", "HotlistHomepage" }, - { "http://netsurf.sourceforge.net/builds/", "HotlistTestBuild" }, - { "http://netsurf.sourceforge.net/docs", "HotlistDocumentation" }, + { "http://netsurf-browser.org/", "HotlistHomepage" }, + { "http://netsurf-browser.org/builds/", "HotlistTestBuild" }, + { "http://netsurf-browser.org/docs", "HotlistDocumentation" }, { "http://sourceforge.net/tracker/?atid=464312&group_id=51719", "HotlistBugTracker" }, { "http://sourceforge.net/tracker/?atid=464315&group_id=51719", diff --git a/riscos/image.c b/riscos/image.c index d5ae8d6e4..531b0770a 100644 --- a/riscos/image.c +++ b/riscos/image.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 John M Bell @@ -49,11 +49,11 @@ bool image_redraw(osspriteop_area *area, int x, int y, int req_width, bool repeatx, bool repeaty, bool background, image_type type) { unsigned int tinct_options; - + /* failed decompression/loading can result in no image being present */ if (!area) return false; - + osspriteop_id header = (osspriteop_id) ((char*) area + area->first); req_width *= 2; @@ -114,7 +114,7 @@ bool image_redraw_tinct(osspriteop_id header, int x, int y, /* Set up our flagword */ tinct_options |= background_colour << tinct_BACKGROUND_SHIFT; - if (print_active) + if (print_active) tinct_options |= tinct_USE_OS_SPRITE_OP; if (repeatx) tinct_options |= tinct_FILL_HORIZONTALLY; diff --git a/riscos/image.h b/riscos/image.h index e480697e6..85f913e55 100644 --- a/riscos/image.h +++ b/riscos/image.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 John M Bell diff --git a/riscos/menus.c b/riscos/menus.c index 685dd3694..e26d6069d 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2003 Phil Mellor @@ -467,7 +467,7 @@ void ro_gui_menu_create(wimp_menu *menu, int x, int y, wimp_w w) { /* read the object under the pointer for a new gui_window menu */ if ((!current_menu) && (menu == browser_menu)) { g = ro_gui_window_lookup(w); - + if (!ro_gui_window_to_window_pos(g, x, y, &pos)) return; current_menu_object_box = NULL; diff --git a/riscos/menus.h b/riscos/menus.h index 8ce3a9d71..c2264fac5 100644 --- a/riscos/menus.h +++ b/riscos/menus.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Richard Wilson @@ -43,7 +43,7 @@ typedef enum { /* cookie actions */ COOKIES_SHOW, COOKIES_DELETE, - + /* page actions */ BROWSER_PAGE, BROWSER_PAGE_INFO, diff --git a/riscos/message.c b/riscos/message.c index 40a465e61..1e2208f1c 100644 --- a/riscos/message.c +++ b/riscos/message.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Richard Wilson @@ -140,7 +140,7 @@ bool ro_message_register_handler(wimp_message *message, bool ro_message_register_route(unsigned int message_code, void (*callback)(wimp_message *message)) { assert(callback); - + return (ro_message_add(message_code, callback) != NULL); } @@ -159,7 +159,7 @@ struct active_message *ro_message_add(unsigned int message_code, add->next = current_messages; add->previous = NULL; current_messages = add; - return add; + return add; } diff --git a/riscos/message.h b/riscos/message.h index 1da372acb..14682291d 100644 --- a/riscos/message.h +++ b/riscos/message.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Richard Wilson diff --git a/riscos/options.h b/riscos/options.h index 6d880beec..6f669ab94 100644 --- a/riscos/options.h +++ b/riscos/options.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2003 Phil Mellor diff --git a/riscos/palettes.c b/riscos/palettes.c index 25b534ba2..8ab68e2a1 100644 --- a/riscos/palettes.c +++ b/riscos/palettes.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Adrian Lees diff --git a/riscos/palettes.h b/riscos/palettes.h index eeb369bd7..7a49a32d7 100644 --- a/riscos/palettes.h +++ b/riscos/palettes.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Adrian Lees diff --git a/riscos/plotters.c b/riscos/plotters.c index 37c61c921..defa68337 100644 --- a/riscos/plotters.c +++ b/riscos/plotters.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 James Bursa @@ -287,7 +287,7 @@ bool ro_plot_text(int x, int y, struct css_style *style, error->errnum, error->errmess)); return false; } - + return nsfont_paint(style, text, length, ro_plot_origin_x + x * 2, ro_plot_origin_y - y * 2, @@ -336,7 +336,7 @@ bool ro_plot_arc(int x, int y, int radius, int angle1, int angle2, colour c) x = ro_plot_origin_x + x * 2; y = ro_plot_origin_y - y * 2; radius <<= 1; - + error = xcolourtrans_set_gcol(c << 8, 0, os_ACTION_OVERWRITE, 0, 0); diff --git a/riscos/plugin.c b/riscos/plugin.c index 8fb683386..f4975c742 100644 --- a/riscos/plugin.c +++ b/riscos/plugin.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2003,4 John M Bell diff --git a/riscos/plugin.h b/riscos/plugin.h index 916893d19..63e79e597 100644 --- a/riscos/plugin.h +++ b/riscos/plugin.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2003 John M Bell diff --git a/riscos/print.c b/riscos/print.c index 395ae303a..291a823bf 100644 --- a/riscos/print.c +++ b/riscos/print.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 John M Bell @@ -97,7 +97,7 @@ static bool print_fonts_plot_clip(int clip_x0, int clip_y0, int clip_x1, int clip_y1); static bool print_fonts_plot_text(int x, int y, struct css_style *style, const char *text, size_t length, colour bg, colour c); -static bool print_fonts_plot_disc(int x, int y, int radius, colour c, +static bool print_fonts_plot_disc(int x, int y, int radius, colour c, bool filled); static bool print_fonts_plot_arc(int x, int y, int radius, int angle1, int angle2, colour c); diff --git a/riscos/print.h b/riscos/print.h index 9a338c7a6..35eba782e 100644 --- a/riscos/print.h +++ b/riscos/print.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 John M Bell diff --git a/riscos/query.c b/riscos/query.c index e619f88a0..578c32eb5 100644 --- a/riscos/query.c +++ b/riscos/query.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Adrian Lees diff --git a/riscos/query.h b/riscos/query.h index 6a4030588..28dc0e0f2 100644 --- a/riscos/query.h +++ b/riscos/query.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Adrian Lees diff --git a/riscos/save.c b/riscos/save.c index 3ca898c29..ceeef739b 100644 --- a/riscos/save.c +++ b/riscos/save.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 James Bursa diff --git a/riscos/save.h b/riscos/save.h index a4074efd7..b09ec5ef0 100644 --- a/riscos/save.h +++ b/riscos/save.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Adrian Lees diff --git a/riscos/save_complete.c b/riscos/save_complete.c index d6b3a41ef..79c521ac7 100644 --- a/riscos/save_complete.c +++ b/riscos/save_complete.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 John M Bell diff --git a/riscos/save_complete.h b/riscos/save_complete.h index 2d1af5aec..f717fb68e 100644 --- a/riscos/save_complete.h +++ b/riscos/save_complete.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 John M Bell diff --git a/riscos/save_draw.c b/riscos/save_draw.c index 012be7b85..eb96cf70c 100644 --- a/riscos/save_draw.c +++ b/riscos/save_draw.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 John M Bell diff --git a/riscos/save_draw.h b/riscos/save_draw.h index bb31b56d0..cc5224cfb 100644 --- a/riscos/save_draw.h +++ b/riscos/save_draw.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 John M Bell diff --git a/riscos/schedule.c b/riscos/schedule.c index 70d18869b..50e949470 100644 --- a/riscos/schedule.c +++ b/riscos/schedule.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 James Bursa @@ -55,7 +55,7 @@ void schedule(int t, void (*callback)(void *p), void *p) struct sched_entry *entry; struct sched_entry *queue; os_t time; - + schedule_remove(callback, p); time = os_read_monotonic_time() + t; diff --git a/riscos/search.c b/riscos/search.c index 24c3d4f9c..7aa66b612 100644 --- a/riscos/search.c +++ b/riscos/search.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 John M Bell diff --git a/riscos/sprite.c b/riscos/sprite.c index 24a4890a0..c17cd1a57 100644 --- a/riscos/sprite.c +++ b/riscos/sprite.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2003 John M Bell @@ -43,11 +43,11 @@ bool sprite_convert(struct content *c, int width, int height) int w, h; union content_msg_data msg_data; char *source_data; - + source_data = ((char *)c->source_data) - 4; osspriteop_area *area = (osspriteop_area*)source_data; c->data.sprite.data = area; - + /* check for bad data */ if ((int)c->source_size + 4 != area->used) { msg_data.error = messages_get("BadSprite"); diff --git a/riscos/sprite.h b/riscos/sprite.h index 3e9c836bb..0707871dc 100644 --- a/riscos/sprite.h +++ b/riscos/sprite.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2003 John M Bell diff --git a/riscos/sslcert.c b/riscos/sslcert.c index 449f45b7d..650babab6 100644 --- a/riscos/sslcert.c +++ b/riscos/sslcert.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 John M Bell diff --git a/riscos/textarea.c b/riscos/textarea.c index f19e24301..ca0112d9c 100644 --- a/riscos/textarea.c +++ b/riscos/textarea.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 John-Mark Bell @@ -177,7 +177,7 @@ uintptr_t textarea_create(wimp_w parent, wimp_i icon, unsigned int flags, free(ret); return 0; } - + /* set the window dimensions */ if (!textarea_update((uintptr_t)ret)) { textarea_destroy((uintptr_t)ret); diff --git a/riscos/textarea.h b/riscos/textarea.h index 5a9a5f2d6..ad810be7e 100644 --- a/riscos/textarea.h +++ b/riscos/textarea.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 John-Mark Bell diff --git a/riscos/textselection.c b/riscos/textselection.c index 7252f7b3d..25bbc7f81 100644 --- a/riscos/textselection.c +++ b/riscos/textselection.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Adrian Lees @@ -536,7 +536,7 @@ void ro_gui_selection_dragging(wimp_message *message) if (box->style && box->style->visibility == CSS_VISIBILITY_HIDDEN) continue; - + if (box->gadget) { switch (box->gadget->type) { @@ -548,7 +548,7 @@ void ro_gui_selection_dragging(wimp_message *message) case GADGET_PASSWORD: text_box = box; break; - + default: /* appease compiler */ break; } diff --git a/riscos/textselection.h b/riscos/textselection.h index 121e9b034..5576ff1f6 100644 --- a/riscos/textselection.h +++ b/riscos/textselection.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2006 Adrian Lees diff --git a/riscos/theme.c b/riscos/theme.c index 24cf3e3e3..e25cda820 100644 --- a/riscos/theme.c +++ b/riscos/theme.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004, 2005 Richard Wilson @@ -628,10 +628,10 @@ void ro_gui_theme_redraw(wimp_draw *redraw) { toolbar = (struct toolbar *)ro_gui_wimp_event_get_user_data(redraw->w); assert(toolbar); - + /* set the content-type icon */ g = ro_gui_toolbar_lookup(toolbar->toolbar_handle); - + /* only set type for browser windows */ sprintf(theme_favicon_sprite, "Ssmall_xxx"); if (g) { @@ -642,7 +642,7 @@ void ro_gui_theme_redraw(wimp_draw *redraw) { ro_content_filetype_from_type( g->bw->current_content->type)); if (!ro_gui_wimp_sprite_exists(theme_favicon_sprite + 1)) - sprintf(theme_favicon_sprite, "Ssmall_xxx"); + sprintf(theme_favicon_sprite, "Ssmall_xxx"); } } @@ -2430,7 +2430,7 @@ void ro_gui_theme_status_open(wimp_open *open) { int ro_gui_theme_height_change(struct toolbar *toolbar) { int height, cur_height; - + cur_height = ro_gui_theme_toolbar_full_height(toolbar); height = toolbar->old_height - cur_height; toolbar->old_height = cur_height; diff --git a/riscos/theme.h b/riscos/theme.h index 1b6f3b571..ab27de57a 100644 --- a/riscos/theme.h +++ b/riscos/theme.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Richard Wilson diff --git a/riscos/theme_install.c b/riscos/theme_install.c index 082860910..f8f1c43af 100644 --- a/riscos/theme_install.c +++ b/riscos/theme_install.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 James Bursa diff --git a/riscos/thumbnail.c b/riscos/thumbnail.c index 2b5f4ce91..99c888168 100644 --- a/riscos/thumbnail.c +++ b/riscos/thumbnail.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 James Bursa diff --git a/riscos/thumbnail.h b/riscos/thumbnail.h index da0528383..b7b07545e 100644 --- a/riscos/thumbnail.h +++ b/riscos/thumbnail.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 James Bursa diff --git a/riscos/tinct.h b/riscos/tinct.h index 8ab256dec..44a10e148 100644 --- a/riscos/tinct.h +++ b/riscos/tinct.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Richard Wilson @@ -68,7 +68,7 @@ * Converts a paletted sprite into its 32bpp equivalent. Sufficient memory must * have previously been allocated for the sprite (44 + width * height * 4). * As sprites with 16bpp or 32bpp do not have palettes, conversion cannot be - * performed on these variants. All sprites must be supplied with a full palette, + * performed on these variants. All sprites must be supplied with a full palette, * eg 8bpp must have 256 palette entries. * * -> R2 Source sprite pointer diff --git a/riscos/treeview.c b/riscos/treeview.c index 7bde041c7..7638e36e0 100644 --- a/riscos/treeview.c +++ b/riscos/treeview.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Richard Wilson @@ -1505,5 +1505,5 @@ void ro_gui_tree_update_theme(struct tree *tree) { ro_gui_theme_attach_toolbar(tree->toolbar, (wimp_w)tree->handle); tree_resized(tree); xwimp_force_redraw((wimp_w)tree->handle, 0, -16384, 16384, 16384); - } + } } diff --git a/riscos/treeview.h b/riscos/treeview.h index 229974aee..8413dcfd5 100644 --- a/riscos/treeview.h +++ b/riscos/treeview.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 Richard Wilson diff --git a/riscos/ucstables.c b/riscos/ucstables.c index ffe92be30..5a8eb8aec 100644 --- a/riscos/ucstables.c +++ b/riscos/ucstables.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 John M Bell @@ -667,7 +667,7 @@ utf8_convert_ret utf8_from_local_encoding(const char *string, size_t len, free(*result); return UTF8_CONVERT_NOMEM; } - + strcat((*result), temp); free(temp); diff --git a/riscos/ucstables.h b/riscos/ucstables.h index e6cef41da..f0cb87619 100644 --- a/riscos/ucstables.h +++ b/riscos/ucstables.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 John M Bell diff --git a/riscos/uri.c b/riscos/uri.c index 248838517..35ba06898 100644 --- a/riscos/uri.c +++ b/riscos/uri.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2003 Rob Jackson diff --git a/riscos/uri.h b/riscos/uri.h index 24774bc9f..f11983fa8 100644 --- a/riscos/uri.h +++ b/riscos/uri.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2003 Rob Jackson diff --git a/riscos/url_complete.c b/riscos/url_complete.c index f0edcb8f6..44614efc9 100644 --- a/riscos/url_complete.c +++ b/riscos/url_complete.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Richard Wilson diff --git a/riscos/url_complete.h b/riscos/url_complete.h index 3d79edca5..311c6c735 100644 --- a/riscos/url_complete.h +++ b/riscos/url_complete.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Richard Wilson diff --git a/riscos/url_protocol.c b/riscos/url_protocol.c index fe56341bd..101c3e19e 100644 --- a/riscos/url_protocol.c +++ b/riscos/url_protocol.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2003 John M Bell diff --git a/riscos/url_protocol.h b/riscos/url_protocol.h index 4715a5b1e..5f4ea97c8 100644 --- a/riscos/url_protocol.h +++ b/riscos/url_protocol.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2003 John M Bell diff --git a/riscos/wimp.c b/riscos/wimp.c index f8b512b53..fd99921ba 100644 --- a/riscos/wimp.c +++ b/riscos/wimp.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004, 2005 Richard Wilson diff --git a/riscos/wimp.h b/riscos/wimp.h index 456c96528..28b529f6f 100644 --- a/riscos/wimp.h +++ b/riscos/wimp.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2004 Richard Wilson diff --git a/riscos/wimp_event.c b/riscos/wimp_event.c index e6c45ef23..199010a7a 100644 --- a/riscos/wimp_event.c +++ b/riscos/wimp_event.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Richard Wilson diff --git a/riscos/wimp_event.h b/riscos/wimp_event.h index b48b59c9d..48c25a416 100644 --- a/riscos/wimp_event.h +++ b/riscos/wimp_event.h @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2005 Richard Wilson diff --git a/riscos/window.c b/riscos/window.c index 6ce59e4a6..d3b52ff3b 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -1,5 +1,5 @@ /* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license * Copyright 2003 Phil Mellor -- cgit v1.2.3