From ba23e4b69341e5f3f2dbcd824663e75ebe2a581f Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 27 Nov 2006 15:35:18 +0000 Subject: [PATCH] Update project URL. svn path=/trunk/netsurf/; revision=3073 --- content/content.c | 2 +- content/content.h | 2 +- content/content_type.h | 2 +- content/fetch.c | 2 +- content/fetch.h | 2 +- content/fetchcache.c | 2 +- content/fetchcache.h | 2 +- content/urldb.c | 2 +- content/urldb.h | 2 +- css/css.c | 2 +- css/css.h | 2 +- css/makeenum | 2 +- css/parser.y | 2 +- css/ruleset.c | 2 +- css/scanner.l | 2 +- debug/debug_bitmap.c | 4 +- debug/filetyped.c | 2 +- debug/fontd.c | 2 +- debug/netsurfd.c | 2 +- desktop/401login.h | 2 +- desktop/browser.c | 4 +- desktop/browser.h | 22 ++--- desktop/cookies.h | 2 +- desktop/frames.c | 2 +- desktop/frames.h | 2 +- desktop/gesture_core.c | 44 +++++----- desktop/gesture_core.h | 8 +- desktop/gui.h | 2 +- desktop/history_core.c | 14 +-- desktop/history_core.h | 2 +- desktop/knockout.c | 18 ++-- desktop/knockout.h | 2 +- desktop/netsurf.c | 2 +- desktop/netsurf.h | 2 +- desktop/options.c | 2 +- desktop/options.h | 2 +- desktop/plotters.h | 2 +- desktop/save_text.c | 2 +- desktop/save_text.h | 2 +- desktop/selection.c | 2 +- desktop/selection.h | 2 +- desktop/textinput.c | 2 +- desktop/textinput.h | 2 +- desktop/tree.c | 4 +- desktop/tree.h | 2 +- gtk/font_pango.c | 24 +++--- gtk/font_pango.h | 2 +- gtk/gtk_bitmap.c | 12 +-- gtk/gtk_bitmap.h | 2 +- gtk/gtk_completion.c | 8 +- gtk/gtk_completion.h | 2 +- gtk/gtk_gui.c | 28 +++--- gtk/gtk_gui.h | 2 +- gtk/gtk_history.c | 36 ++++---- gtk/gtk_history.h | 2 +- gtk/gtk_login.c | 8 +- gtk/gtk_options.c | 22 ++--- gtk/gtk_options.h | 2 +- gtk/gtk_plotters.c | 2 +- gtk/gtk_plotters.h | 2 +- gtk/gtk_schedule.c | 8 +- gtk/gtk_throbber.c | 42 ++++----- gtk/gtk_throbber.h | 2 +- gtk/gtk_thumbnail.c | 2 +- gtk/gtk_treeview.c | 2 +- gtk/gtk_window.c | 16 ++-- gtk/gtk_window.h | 2 +- gtk/options.h | 2 +- gtk/res/netsurf.glade | 2 +- image/bitmap.h | 2 +- image/bmp.c | 2 +- image/bmp.h | 2 +- image/bmpread.c | 2 +- image/bmpread.h | 2 +- image/gif.c | 6 +- image/gif.h | 2 +- image/gifread.c | 6 +- image/gifread.h | 2 +- image/ico.c | 2 +- image/ico.h | 2 +- image/jpeg.c | 2 +- image/jpeg.h | 2 +- image/mng.c | 2 +- image/mng.h | 2 +- makefile | 2 +- render/box.c | 2 +- render/box.h | 2 +- render/box_construct.c | 2 +- render/box_normalise.c | 2 +- render/directory.c | 16 ++-- render/directory.h | 2 +- render/font.h | 2 +- render/form.c | 2 +- render/form.h | 2 +- render/html.c | 2 +- render/html.h | 14 +-- render/html_redraw.c | 2 +- render/imagemap.c | 2 +- render/imagemap.h | 2 +- render/layout.c | 2 +- render/layout.h | 2 +- render/list.c | 28 +++--- render/list.h | 2 +- render/table.c | 2 +- render/table.h | 2 +- render/textplain.c | 2 +- render/textplain.h | 2 +- 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 +- utils/config.h | 2 +- utils/container.c | 146 ++++++++++++++++---------------- utils/container.h | 6 +- utils/filename.c | 2 +- utils/filename.h | 2 +- utils/hashtable.c | 4 +- utils/hashtable.h | 2 +- utils/log.h | 2 +- utils/messages.c | 2 +- utils/messages.h | 2 +- utils/themes.c | 6 +- utils/themes.h | 4 +- utils/tt2code | 2 +- utils/url.c | 2 +- utils/url.h | 2 +- utils/utf8.c | 2 +- utils/utf8.h | 2 +- utils/utils.c | 2 +- utils/utils.h | 2 +- 222 files changed, 561 insertions(+), 561 deletions(-) diff --git a/content/content.c b/content/content.c index 6b8d7b9fe..5e915075e 100644 --- a/content/content.c +++ b/content/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 2005 James Bursa diff --git a/content/content.h b/content/content.h index ec4bc1add..aca53e448 100644 --- a/content/content.h +++ b/content/content.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 James Bursa diff --git a/content/content_type.h b/content/content_type.h index 388cbfb38..dc6483f3f 100644 --- a/content/content_type.h +++ b/content/content_type.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 James Bursa diff --git a/content/fetch.c b/content/fetch.c index 42526f187..c051e635c 100644 --- a/content/fetch.c +++ b/content/fetch.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 Daniel Silverstone diff --git a/content/fetch.h b/content/fetch.h index 5dd2d80cb..4f8795add 100644 --- a/content/fetch.h +++ b/content/fetch.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 James Bursa diff --git a/content/fetchcache.c b/content/fetchcache.c index 009dd8021..220359df0 100644 --- a/content/fetchcache.c +++ b/content/fetchcache.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/content/fetchcache.h b/content/fetchcache.h index 7d8b3c341..76537cd93 100644 --- a/content/fetchcache.h +++ b/content/fetchcache.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 James Bursa diff --git a/content/urldb.c b/content/urldb.c index d2a5e22db..70f82c519 100644 --- a/content/urldb.c +++ b/content/urldb.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/content/urldb.h b/content/urldb.h index aa8ec7742..678e169df 100644 --- a/content/urldb.h +++ b/content/urldb.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 M Bell diff --git a/css/css.c b/css/css.c index 641b58dba..15ac9511c 100644 --- a/css/css.c +++ b/css/css.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/css/css.h b/css/css.h index a5bd81acf..086f469b9 100644 --- a/css/css.h +++ b/css/css.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/css/makeenum b/css/makeenum index 6c5f156da..0bf4a8f36 100755 --- a/css/makeenum +++ b/css/makeenum @@ -1,6 +1,6 @@ #!/usr/bin/perl -W # -# 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 James Bursa diff --git a/css/parser.y b/css/parser.y index 2ede0ec25..d131926c8 100644 --- a/css/parser.y +++ b/css/parser.y @@ -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/css/ruleset.c b/css/ruleset.c index 7a51faa27..bcfe302f7 100644 --- a/css/ruleset.c +++ b/css/ruleset.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/css/scanner.l b/css/scanner.l index d40007e87..6a5549a19 100644 --- a/css/scanner.l +++ b/css/scanner.l @@ -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/debug/debug_bitmap.c b/debug/debug_bitmap.c index 9c8942f7d..e3b56922a 100644 --- a/debug/debug_bitmap.c +++ b/debug/debug_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 @@ -133,4 +133,4 @@ void bitmap_modified(struct bitmap *bitmap) { */ void bitmap_set_suspendable(struct bitmap *bitmap, void *private_word, void (*invalidate)(struct bitmap *bitmap, void *private_word)) { -} +} diff --git a/debug/filetyped.c b/debug/filetyped.c index 3bf10ece5..950b626c5 100644 --- a/debug/filetyped.c +++ b/debug/filetyped.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 James Bursa diff --git a/debug/fontd.c b/debug/fontd.c index 8269a392e..82115fa13 100644 --- a/debug/fontd.c +++ b/debug/fontd.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/debug/netsurfd.c b/debug/netsurfd.c index 59643d65b..10ef66a48 100644 --- a/debug/netsurfd.c +++ b/debug/netsurfd.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/desktop/401login.h b/desktop/401login.h index 9e6030ab4..e88c7638f 100644 --- a/desktop/401login.h +++ b/desktop/401login.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/desktop/browser.c b/desktop/browser.c index d9fbfa4ad..052e8bad8 100644 --- a/desktop/browser.c +++ b/desktop/browser.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 @@ -931,7 +931,7 @@ void browser_window_reformat(struct browser_window *bw, int width, int height) * \param all Scale all windows in the tree (ie work up aswell as down) */ -void browser_window_set_scale(struct browser_window *bw, float scale, bool all) +void browser_window_set_scale(struct browser_window *bw, float scale, bool all) { while (bw->parent && all) bw = bw->parent; diff --git a/desktop/browser.h b/desktop/browser.h index e783e6199..e64e0ae21 100644 --- a/desktop/browser.h +++ b/desktop/browser.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 @@ -50,10 +50,10 @@ struct browser_window { /** Window history structure. */ struct history *history; - + /** Gesturer for this browser window */ struct _gesturer_state *gesturer; - + /** Selection state */ struct selection *sel; @@ -116,13 +116,13 @@ struct browser_window { /** Refresh interval (-1 if undefined) */ int refresh_interval; - + /** Window dimensions */ int x0; int y0; int x1; int y1; - + /** Window characteristics */ enum { BROWSER_WINDOW_NORMAL, @@ -130,33 +130,33 @@ struct browser_window { BROWSER_WINDOW_FRAME, BROWSER_WINDOW_FRAMESET, } browser_window_type; - + /** frameset characteristics */ int rows; int cols; - + /** frame dimensions */ struct frame_dimension frame_width; struct frame_dimension frame_height; int margin_width; int margin_height; - + /** frame name for targetting */ char *name; - + /** frame characteristics */ bool no_resize; frame_scrolling scrolling; bool border; colour border_colour; - + /** iframe parent box */ struct box *box; /** [cols * rows] children */ struct browser_window *children; struct browser_window *parent; - + /** [iframe_count] iframes */ int iframe_count; struct browser_window *iframes; diff --git a/desktop/cookies.h b/desktop/cookies.h index 4e2753037..3bda58a49 100644 --- a/desktop/cookies.h +++ b/desktop/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/desktop/frames.c b/desktop/frames.c index 77876efb4..abb34dd99 100644 --- a/desktop/frames.c +++ b/desktop/frames.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/desktop/frames.h b/desktop/frames.h index 404af179d..d3acccd2a 100644 --- a/desktop/frames.h +++ b/desktop/frames.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/desktop/gesture_core.c b/desktop/gesture_core.c index f3019bca6..40d4295af 100644 --- a/desktop/gesture_core.c +++ b/desktop/gesture_core.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 Daniel Silverstone @@ -71,21 +71,21 @@ GestureRecogniser gesture_recogniser_create(void) * \param gesture_str The gesture string to add * \param gesture_tag The tag to return for this gesture */ -void gesture_recogniser_add(GestureRecogniser recog, +void gesture_recogniser_add(GestureRecogniser recog, const char* gesture_str, int gesture_tag) { InternalGesture g = malloc(sizeof(struct _internal_gesture)); InternalGesture g2,g3; int i; Gesturer gest = recog->gesture_users; - + g->gesture_tag = gesture_tag; g->gesture_len = strlen(gesture_str); g->gesture = malloc(g->gesture_len); - + for(i = 0; i < g->gesture_len; ++i) g->gesture[i] = gesture_str[g->gesture_len - i - 1]; - + g2 = recog->gestures; g3 = NULL; while( g2 && g->gesture_len < g2->gesture_len ) g3=g3, g2 = g2->next; if( g3 == NULL ) { @@ -95,9 +95,9 @@ void gesture_recogniser_add(GestureRecogniser recog, /* prev == something; we're inserting somewhere */ g3->next = g; g->next = g2; } - + if( recog->max_len < g->gesture_len ) recog->max_len = g->gesture_len; - + while( gest != NULL ) { gesturer_notify_recognition_change(gest); gest = gest->next; @@ -132,7 +132,7 @@ void gesture_recogniser_destroy(GestureRecogniser recog) * \param recog The recogniser. * \param min_distance The minimum distance in pixels */ -void gesture_recogniser_set_distance_threshold(GestureRecogniser recog, +void gesture_recogniser_set_distance_threshold(GestureRecogniser recog, int min_distance) { recog->min_distance = min_distance * min_distance; @@ -144,7 +144,7 @@ void gesture_recogniser_set_distance_threshold(GestureRecogniser recog, * \param recog The recogniser. * \param max_nonmove The maximum number of non-movement adds. */ -void gesture_recogniser_set_count_threshold(GestureRecogniser recog, +void gesture_recogniser_set_count_threshold(GestureRecogniser recog, int max_nonmove) { recog->max_nonmove = max_nonmove; @@ -205,7 +205,7 @@ static void gesturer_notify_recognition_change(Gesturer gesturer) { char *new_gesture = calloc(gesturer->recogniser->max_len+1, 1); int i; - for(i = 0; i < gesturer->elements; ++i) + for(i = 0; i < gesturer->elements; ++i) new_gesture[i] = gesturer->gesture[i]; free(gesturer->gesture); gesturer->gesture = new_gesture; @@ -260,14 +260,14 @@ static char gesturer_find_direction(Gesturer gesturer, int x, int y) bool x_neg = dx < 0; bool y_neg = dy < 0; int i; - + if( x_neg ) dx = -dx; if( y_neg ) dy = -dy; arc = atanf(dy/dx); for( i = 0; i < 12; ++i ) { if( directions[i].lower > arc || directions[i].upper <= arc ) continue; /* Not within this entry */ - if( directions[i].x_neg != x_neg || + if( directions[i].x_neg != x_neg || directions[i].y_neg != y_neg ) continue; /* Signs not matching */ return directions[i].direction; @@ -293,26 +293,26 @@ int gesturer_add_point(Gesturer gesturer, int x, int y) { int distance = ((gesturer->last_x - x) * (gesturer->last_x - x)) + ((gesturer->last_y - y) * (gesturer->last_y - y)); - char last_direction = (gesturer->elements == 0) ? 0 : + char last_direction = (gesturer->elements == 0) ? 0 : (gesturer->gesture[0]); char this_direction = gesturer_find_direction(gesturer, x, y); InternalGesture ig = gesturer->recogniser->gestures; int ret = GESTURE_NONE; - + if( distance < gesturer->recogniser->min_distance ) { gesturer->bored_count++; - if( gesturer->elements && - (gesturer->bored_count >= + if( gesturer->elements && + (gesturer->bored_count >= gesturer->recogniser->max_nonmove) ) { LOG(("Bored now.")); gesturer_clear_points(gesturer); } - if( gesturer->elements && - gesturer->bored_count == + if( gesturer->elements && + gesturer->bored_count == (gesturer->recogniser->max_nonmove >> 1)) { LOG(("Decided to look")); while( ig && ig->gesture_len <= gesturer->elements ) { - if( strcmp(gesturer->gesture, + if( strcmp(gesturer->gesture, ig->gesture) == 0 ) ret = ig->gesture_tag; ig = ig->next; @@ -327,12 +327,12 @@ int gesturer_add_point(Gesturer gesturer, int x, int y) if( this_direction == last_direction ) { return GESTURE_NONE; /* Nothing */ } - + /* Shunt the gesture one up */ if( gesturer->elements ) { - if( gesturer->elements == gesturer->nelements ) + if( gesturer->elements == gesturer->nelements ) gesturer->elements--; - memmove(gesturer->gesture+1, gesturer->gesture, + memmove(gesturer->gesture+1, gesturer->gesture, gesturer->elements); } gesturer->elements++; diff --git a/desktop/gesture_core.h b/desktop/gesture_core.h index ccba38988..786fcf2de 100644 --- a/desktop/gesture_core.h +++ b/desktop/gesture_core.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 Daniel Silverstone @@ -18,12 +18,12 @@ typedef struct _gesture_recogniser* GestureRecogniser; typedef struct _gesturer_state* Gesturer; GestureRecogniser gesture_recogniser_create(void); -void gesture_recogniser_add(GestureRecogniser recog, +void gesture_recogniser_add(GestureRecogniser recog, const char* gesture_str, int gesture_tag); void gesture_recogniser_destroy(GestureRecogniser recog); -void gesture_recogniser_set_distance_threshold(GestureRecogniser recog, +void gesture_recogniser_set_distance_threshold(GestureRecogniser recog, int min_distance); -void gesture_recogniser_set_count_threshold(GestureRecogniser recog, +void gesture_recogniser_set_count_threshold(GestureRecogniser recog, int max_nonmove); diff --git a/desktop/gui.h b/desktop/gui.h index bcce94272..25cac55ca 100644 --- a/desktop/gui.h +++ b/desktop/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 diff --git a/desktop/history_core.c b/desktop/history_core.c index 227e811a5..dcf8c6efd 100644 --- a/desktop/history_core.c +++ b/desktop/history_core.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 @@ -169,7 +169,7 @@ struct history_entry *history_clone_entry(struct history *history, free(new_entry); return 0; } - + /* update references */ if (history->current == entry) history->current = new_entry; @@ -291,7 +291,7 @@ void history_update(struct history *history, struct content *content) history->current->page.title = strdup(content->title); else history->current->page.title = 0; - + thumbnail_create(content, history->current->bitmap, 0); } @@ -440,7 +440,7 @@ void history_layout(struct history *history) time_t t = time(0); struct tm *tp = localtime(&t); bool shuffle = tp->tm_mon == 3 && tp->tm_mday == 1; - + if (!history) return; @@ -479,7 +479,7 @@ int history_layout_subtree(struct history *history, if (history->width < x + WIDTH) history->width = x + WIDTH; - + if (!entry->forward) { entry->x = x; entry->y = y; @@ -556,7 +556,7 @@ bool history_redraw_entry(struct history *history, struct history_entry *child; colour c = entry == history->current ? 0x0000ff : 0x333333; int tailsize = 5; - + if (!plot.bitmap(entry->x, entry->y, WIDTH, HEIGHT, entry->bitmap, 0xffffff)) return false; @@ -657,7 +657,7 @@ struct history_entry *history_find_position(struct history_entry *entry, { struct history_entry *child; struct history_entry *found; - + if (!entry) return 0; diff --git a/desktop/history_core.h b/desktop/history_core.h index d1f55ad83..b4b3518dc 100644 --- a/desktop/history_core.h +++ b/desktop/history_core.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 James Bursa diff --git a/desktop/knockout.c b/desktop/knockout.c index 59f3aaf8f..e2333d1ad 100644 --- a/desktop/knockout.c +++ b/desktop/knockout.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 @@ -230,7 +230,7 @@ bool knockout_plot_start(struct plotter_table *plotter) assert(!memcmp(plotter, &knockout_plotters, sizeof(struct plotter_table))); return true; } - + /* end any previous sessions */ if (knockout_entry_cur > 0) knockout_plot_end(); @@ -252,7 +252,7 @@ bool knockout_plot_end(void) /* only output when we've finished any nesting */ if (--nested_depth == 0) return knockout_plot_flush(); - + assert(nested_depth > 0); return true; } @@ -407,7 +407,7 @@ bool knockout_plot_flush(void) knockout_box_cur = 0; knockout_polygon_cur = 0; knockout_list = NULL; - + /* re-instate knockout plotters if we are still active */ if (nested_depth > 0) knockout_set_plotters(); @@ -443,7 +443,7 @@ void knockout_calculate(int x0, int y0, int x1, int y1, struct knockout_box *own struct knockout_box *parent; struct knockout_box *prev = NULL; int nx0, ny0, nx1, ny1; - + if (owner == NULL) box = knockout_list; else @@ -655,11 +655,11 @@ bool knockout_plot_polygon(int *p, unsigned int n, colour fill) knockout_plot_flush(); return success; } - + /* ensure we have enough room right now */ if (knockout_polygon_cur + n * 2 >= KNOCKOUT_POLYGONS) knockout_plot_flush(); - + /* copy our data */ dest = &(knockout_polygons[knockout_polygon_cur]); memcpy(dest, p, n * 2 * sizeof(int)); @@ -719,7 +719,7 @@ bool knockout_plot_clip(int clip_x0, int clip_y0, clip_x0, clip_y0, clip_x1, clip_y1)); return false; } - + /* memorise clip for bitmap tiling */ clip_x0_cur = clip_x0; clip_y0_cur = clip_y0; @@ -816,7 +816,7 @@ bool knockout_plot_bitmap_tile(int x, int y, int width, int height, bool repeat_x, bool repeat_y) { int kx0, ky0, kx1, ky1; - + /* get our bounds */ kx0 = clip_x0_cur; ky0 = clip_y0_cur; diff --git a/desktop/knockout.h b/desktop/knockout.h index d564ee6f0..29718f9b5 100644 --- a/desktop/knockout.h +++ b/desktop/knockout.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/desktop/netsurf.c b/desktop/netsurf.c index f0b7e32f6..8f3a31845 100644 --- a/desktop/netsurf.c +++ b/desktop/netsurf.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/desktop/netsurf.h b/desktop/netsurf.h index 43af3a141..71422d76e 100644 --- a/desktop/netsurf.h +++ b/desktop/netsurf.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/desktop/options.c b/desktop/options.c index 9679e82fe..aa0876f8e 100644 --- a/desktop/options.c +++ b/desktop/options.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/desktop/options.h b/desktop/options.h index 64944eb47..47f36d91e 100644 --- a/desktop/options.h +++ b/desktop/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/desktop/plotters.h b/desktop/plotters.h index cf8143307..57b9dc9c7 100644 --- a/desktop/plotters.h +++ b/desktop/plotters.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/desktop/save_text.c b/desktop/save_text.c index 9b3ff563f..78d04a2a0 100644 --- a/desktop/save_text.c +++ b/desktop/save_text.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/desktop/save_text.h b/desktop/save_text.h index 94dcc5fb7..9f8fa064f 100644 --- a/desktop/save_text.h +++ b/desktop/save_text.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/desktop/selection.c b/desktop/selection.c index e47a9d91b..c6578ec9f 100644 --- a/desktop/selection.c +++ b/desktop/selection.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/desktop/selection.h b/desktop/selection.h index d0e3af886..779740439 100644 --- a/desktop/selection.h +++ b/desktop/selection.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/desktop/textinput.c b/desktop/textinput.c index 97f793b9f..d8965725b 100644 --- a/desktop/textinput.c +++ b/desktop/textinput.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/desktop/textinput.h b/desktop/textinput.h index 14ddb35eb..2d37427dd 100644 --- a/desktop/textinput.h +++ b/desktop/textinput.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/desktop/tree.c b/desktop/tree.c index ea3797d03..5af782878 100644 --- a/desktop/tree.c +++ b/desktop/tree.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 Richard Wilson @@ -909,7 +909,7 @@ void tree_delete_node_internal(struct tree *tree, struct node *node, bool siblin char *space; assert(node); - + if (tree->temp_selection == node) tree->temp_selection = NULL; if (tree->root == node) diff --git a/desktop/tree.h b/desktop/tree.h index 5ebb906ac..ba3ce4015 100644 --- a/desktop/tree.h +++ b/desktop/tree.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/gtk/font_pango.c b/gtk/font_pango.c index 90d1a150c..c0d107988 100644 --- a/gtk/font_pango.c +++ b/gtk/font_pango.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 @@ -164,7 +164,7 @@ bool nsfont_split(const struct css_style *style, *char_offset = index; *actual_x = PANGO_PIXELS(rect.width); - + return true; } @@ -216,10 +216,10 @@ bool nsfont_paint(const struct css_style *style, context = gdk_pango_context_get(); layout = pango_layout_new(context); #endif - + pango_layout_set_font_description(layout, desc); pango_layout_set_text(layout, string, length); - + #ifdef CAIRO_VERSION pango_layout_get_pixel_size(layout, &width, &height); cairo_move_to(current_cr, x, y - height); @@ -256,7 +256,7 @@ PangoFontDescription *nsfont_style_to_description( PangoStyle styl = PANGO_STYLE_NORMAL; assert(style->font_size.size == CSS_FONT_SIZE_LENGTH); - + switch (style->font_family) { case CSS_FONT_FAMILY_SERIF: desc = pango_font_description_from_string(option_font_serif); @@ -275,16 +275,16 @@ PangoFontDescription *nsfont_style_to_description( desc = pango_font_description_from_string(option_font_sans); break; } - - + + if (style->font_size.value.length.unit == CSS_UNIT_PX) size = style->font_size.value.length.value; else size = css_len2pt(&style->font_size.value.length, style); - + if (size < abs(option_font_min_size / 10)) size = option_font_min_size / 10; - + size *= PANGO_SCALE; switch (style->font_style) { @@ -299,7 +299,7 @@ PangoFontDescription *nsfont_style_to_description( } pango_font_description_set_style(desc, styl); - + switch (style->font_weight) { case CSS_FONT_WEIGHT_NORMAL: weight = PANGO_WEIGHT_NORMAL; break; @@ -323,7 +323,7 @@ PangoFontDescription *nsfont_style_to_description( pango_font_description_set_absolute_size(desc, size); else pango_font_description_set_size(desc, size); - + switch (style->font_variant) { case CSS_FONT_VARIANT_SMALL_CAPS: pango_font_description_set_variant(desc, PANGO_VARIANT_SMALL_CAPS); @@ -332,6 +332,6 @@ PangoFontDescription *nsfont_style_to_description( default: pango_font_description_set_variant(desc, PANGO_VARIANT_NORMAL); } - + return desc; } diff --git a/gtk/font_pango.h b/gtk/font_pango.h index 758b8273b..b99629834 100644 --- a/gtk/font_pango.h +++ b/gtk/font_pango.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 James Bursa diff --git a/gtk/gtk_bitmap.c b/gtk/gtk_bitmap.c index e33b436d0..a587a0768 100644 --- a/gtk/gtk_bitmap.c +++ b/gtk/gtk_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 @@ -182,7 +182,7 @@ void bitmap_modified(struct bitmap *bitmap) { */ void bitmap_set_suspendable(struct bitmap *bitmap, void *private_word, void (*invalidate)(struct bitmap *bitmap, void *private_word)) { -} +} static GdkPixbuf * gtk_bitmap_generate_pretile(GdkPixbuf *primary, int repeat_x, int repeat_y) @@ -197,18 +197,18 @@ gtk_bitmap_generate_pretile(GdkPixbuf *primary, int repeat_x, int repeat_y) int x,y,row; /* This algorithm won't work if the strides are not multiples */ assert(target_stride == (primary_stride * repeat_x)); - + if (repeat_x == 1 && repeat_y == 1) { g_object_ref(primary); g_object_unref(result); return primary; } - + for (y = 0; y < repeat_y; ++y) { char *primary_buffer = (char *)gdk_pixbuf_get_pixels(primary); for (row = 0; row < height; ++row) { for (x = 0; x < repeat_x; ++x) { - memcpy(target_buffer, + memcpy(target_buffer, primary_buffer, primary_stride); target_buffer += primary_stride; } @@ -245,7 +245,7 @@ gtk_bitmap_get_pretile_x(struct bitmap* bitmap) bitmap->pretile_x = gtk_bitmap_generate_pretile(bitmap->primary, xmult, 1); } return bitmap->pretile_x; - + } /** diff --git a/gtk/gtk_bitmap.h b/gtk/gtk_bitmap.h index 719bb0ab5..61a800b5d 100644 --- a/gtk/gtk_bitmap.h +++ b/gtk/gtk_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 2006 Daniel Silverstone diff --git a/gtk/gtk_completion.c b/gtk/gtk_completion.c index 7ad9897d2..dd6aa086f 100644 --- a/gtk/gtk_completion.c +++ b/gtk/gtk_completion.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 Rob Kendrick @@ -20,7 +20,7 @@ static bool nsgtk_completion_udb_callback(const char *url, void nsgtk_completion_init(void) { nsgtk_completion_list = gtk_list_store_new(1, G_TYPE_STRING); - + } gboolean nsgtk_completion_match(GtkEntryCompletion *completion, @@ -34,7 +34,7 @@ gboolean nsgtk_completion_match(GtkEntryCompletion *completion, /* TODO: work out why this works, when there's no code to implement * it. I boggle. */ - + return TRUE; } @@ -47,7 +47,7 @@ void nsgtk_completion_empty(void) bool nsgtk_completion_udb_callback(const char *url, const struct url_data *data) { GtkTreeIter iter; - + if (data->visits != 0) { gtk_list_store_append(nsgtk_completion_list, &iter); gtk_list_store_set(nsgtk_completion_list, &iter, 0, url, -1); diff --git a/gtk/gtk_completion.h b/gtk/gtk_completion.h index 73cda1eae..bccf4084f 100644 --- a/gtk/gtk_completion.h +++ b/gtk/gtk_completion.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 Rob Kendrick diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c index 413d3320a..d38a0fa17 100644 --- a/gtk/gtk_gui.c +++ b/gtk/gtk_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 2005 James Bursa @@ -110,7 +110,7 @@ static char *find_resource(char *buf, const char *filename, const char *def) } else { realpath(def, buf); } - + return buf; } @@ -121,14 +121,14 @@ static void check_homedir(void) { char *hdir = getenv("HOME"); char buf[BUFSIZ]; - + if (hdir == NULL) { /* we really can't continue without a home directory. */ LOG(("HOME is not set - nowhere to store state!")); die("NetSurf requires HOME to be set in order to run.\n"); - + } - + snprintf(buf, BUFSIZ, "%s/.netsurf", hdir); if (access(buf, F_OK) != 0) { LOG(("You don't have a ~/.netsurf - creating one for you.")); @@ -144,23 +144,23 @@ void gui_init(int argc, char** argv) char buf[PATH_MAX]; gtk_init(&argc, &argv); - + check_homedir(); - + find_resource(buf, "netsurf.glade", "./gtk/netsurf.glade"); LOG(("Using '%s' as Glade template file", buf)); glade_file_location = strdup(buf); - + glade_init(); gladeWindows = glade_xml_new(glade_file_location, NULL, NULL); if (gladeWindows == NULL) die("Unable to load Glade window definitions.\n"); glade_xml_signal_autoconnect(gladeWindows); - + wndTooltip = glade_xml_get_widget(gladeWindows, "wndTooltip"); labelTooltip = glade_xml_get_widget(gladeWindows, "tooltip"); - nsgtk_completion_init(); + nsgtk_completion_init(); find_resource(buf, "throbber.gif", "./gtk/throbber.gif"); nsgtk_throbber_initialise(buf); @@ -218,7 +218,7 @@ void gui_init(int argc, char** argv) urldb_load(option_url_file); urldb_load_cookies(option_cookie_file); - + wndAbout = GTK_WINDOW(glade_xml_get_widget(gladeWindows, "wndAbout")); gtk_label_set_text(GTK_LABEL( glade_xml_get_widget(gladeWindows, "labelVersion")), @@ -232,7 +232,7 @@ void gui_init(int argc, char** argv) void gui_init2(int argc, char** argv) { - const char *addr = "http://netsurf.sourceforge.net/"; + const char *addr = "http://netsurf-browser.org/"; if (option_homepage_url != NULL) addr = option_homepage_url; @@ -347,10 +347,10 @@ void gui_create_form_select_menu(struct browser_window *bw, struct form_option *option; LOG(("Trying to open select menu...")); - + for (i = 0, option = control->data.select.items; option; i++, option = option->next) { - LOG(("Option: %s", option->text)); + LOG(("Option: %s", option->text)); } } diff --git a/gtk/gtk_gui.h b/gtk/gtk_gui.h index 30e0cb06f..448448425 100644 --- a/gtk/gtk_gui.h +++ b/gtk/gtk_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 2005 James Bursa diff --git a/gtk/gtk_history.c b/gtk/gtk_history.c index a93192408..424ce333e 100644 --- a/gtk/gtk_history.c +++ b/gtk/gtk_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 Rob Kendrick @@ -33,7 +33,7 @@ static void nsgtk_history_selection_changed(GtkTreeSelection *, gpointer); void nsgtk_history_init(void) { GtkCellRenderer *renderer; - + wndHistory = GTK_WINDOW(glade_xml_get_widget(gladeWindows, "wndHistory")); treeview = GTK_TREE_VIEW(glade_xml_get_widget(gladeWindows, @@ -44,21 +44,21 @@ void nsgtk_history_init(void) G_TYPE_STRING, /* last visit */ G_TYPE_INT, /* nr. visits */ GDK_TYPE_PIXBUF); /* thumbnail */ - + selection = gtk_tree_view_get_selection(treeview); gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE); g_signal_connect(G_OBJECT(selection), "changed", G_CALLBACK(nsgtk_history_selection_changed), NULL); - + renderer = gtk_cell_renderer_text_new(); gtk_tree_view_insert_column_with_attributes(treeview, -1, "Title", renderer, "text", COL_TITLE, NULL); - + gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(history_tree)); - + nsgtk_history_update(); } @@ -82,40 +82,40 @@ bool nsgtk_history_add_internal(const char *url, const struct url_data *data) COL_TOTALVISITS, data->visits, -1); } - + return true; } void nsgtk_history_selection_changed(GtkTreeSelection *treesel, gpointer g) { GtkTreeIter iter; - + if (gtk_tree_selection_get_selected(treesel, &history_tree, &iter)) { gchar *b; gint i; char buf[20]; - + gtk_tree_model_get(history_tree, &iter, COL_ADDRESS, &b, -1); gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(gladeWindows, "labelHistoryAddress")), b); - + gtk_tree_model_get(history_tree, &iter, COL_LASTVISIT, &b, -1); gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(gladeWindows, "labelHistoryLastVisit")), b); - + gtk_tree_model_get(history_tree, &iter, COL_TOTALVISITS, &i, -1); snprintf(buf, 20, "%d", i); gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(gladeWindows, "labelHistoryVisits")), buf); - - - + + + } else { - + } } @@ -124,14 +124,14 @@ void nsgtk_history_row_activated(GtkTreeView *tv, GtkTreePath *path, { GtkTreeModel *model; GtkTreeIter iter; - + model = gtk_tree_view_get_model(tv); if (gtk_tree_model_get_iter(model, &iter, path)) { gchar *b; - + gtk_tree_model_get(model, &iter, COL_ADDRESS, &b, -1); - + browser_window_create((const char *)b, NULL, NULL, true); } } diff --git a/gtk/gtk_history.h b/gtk/gtk_history.h index 230279b0b..8648e5ddd 100644 --- a/gtk/gtk_history.h +++ b/gtk/gtk_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 2006 Rob Kendrick diff --git a/gtk/gtk_login.c b/gtk/gtk_login.c index 9400a0699..176fc1339 100644 --- a/gtk/gtk_login.c +++ b/gtk/gtk_login.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 Rob Kendrick @@ -65,8 +65,8 @@ void create_login_window(struct browser_window *bw, const char *host, GladeXML *x = glade_xml_new(glade_file_location, NULL, NULL); GtkWindow *wnd = GTK_WINDOW(glade_xml_get_widget(x, "wndLogin")); - GtkLabel *lhost, *lrealm; - GtkEntry *euser, *epass; + GtkLabel *lhost, *lrealm; + GtkEntry *euser, *epass; GtkButton *bok, *bcan; lhost = GTK_LABEL(glade_xml_get_widget(x, "labelLoginHost")); @@ -115,7 +115,7 @@ void create_login_window(struct browser_window *bw, const char *host, /* make sure the username entry box currently has the focus */ gtk_widget_grab_focus(GTK_WIDGET(euser)); - + /* finally, show the window */ gtk_widget_show(GTK_WIDGET(wnd)); } diff --git a/gtk/gtk_options.c b/gtk/gtk_options.c index 9a2f7b8e5..59a00927c 100644 --- a/gtk/gtk_options.c +++ b/gtk/gtk_options.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 Rob Kendrick @@ -28,7 +28,7 @@ static GtkWidget *entryHomePageURL, *checkRequestOverwrite, *checkDisplayRecentURLs, *checkSendReferer, - + *comboProxyType, *entryProxyHost, *entryProxyPort, @@ -37,7 +37,7 @@ static GtkWidget *entryHomePageURL, *spinMaxFetchers, *spinFetchesPerHost, *spinCachedConnections, - + *checkUseCairo, *checkResampleImages, *spinAnimationSpeed, @@ -110,7 +110,7 @@ void nsgtk_options_init(void) { void nsgtk_options_load(void) { char b[20]; - + SET_ENTRY(entryHomePageURL, option_homepage_url); SET_CHECK(checkHideAdverts, option_block_ads); SET_CHECK(checkDisplayRecentURLs, option_url_suggestion); @@ -122,7 +122,7 @@ void nsgtk_options_load(void) { SET_ENTRY(entryProxyPort, b); SET_ENTRY(entryProxyUser, option_http_proxy_auth_user); SET_ENTRY(entryProxyPassword, option_http_proxy_auth_pass); - + SET_SPIN(spinMaxFetchers, option_max_fetchers); SET_SPIN(spinFetchesPerHost, option_max_fetchers_per_host); SET_SPIN(spinCachedConnections, option_max_cached_fetch_handles); @@ -156,7 +156,7 @@ void nsgtk_options_load(void) { void nsgtk_options_save(void) { char *b = NULL; int i; - + GET_ENTRY(entryHomePageURL, option_homepage_url); GET_CHECK(checkDisplayRecentURLs, option_url_suggestion); @@ -178,23 +178,23 @@ void nsgtk_options_save(void) { option_http_proxy_auth = OPTION_HTTP_PROXY_AUTH_NONE; break; } - + GET_ENTRY(entryProxyHost, option_http_proxy_host); GET_ENTRY(entryProxyPort, b); option_http_proxy_port = atoi(b); free(b); GET_ENTRY(entryProxyUser, option_http_proxy_auth_user); GET_ENTRY(entryProxyPassword, option_http_proxy_auth_pass); - + GET_SPIN(spinMaxFetchers, option_max_fetchers); GET_SPIN(spinFetchesPerHost, option_max_fetchers_per_host); - GET_SPIN(spinCachedConnections, option_max_cached_fetch_handles); + GET_SPIN(spinCachedConnections, option_max_cached_fetch_handles); GET_CHECK(checkUseCairo, option_render_cairo); GET_CHECK(checkResampleImages, option_render_resample); GET_SPIN(spinAnimationSpeed, option_minimum_gif_delay); option_minimum_gif_delay *= 10; - + GET_FONT(fontSansSerif, option_font_sans); GET_FONT(fontSerif, option_font_serif); GET_FONT(fontMonospace, option_font_mono); @@ -202,7 +202,7 @@ void nsgtk_options_save(void) { GET_FONT(fontFantasy, option_font_fantasy); GET_COMBO(comboDefault, option_font_default); option_font_default++; - + GET_SPIN(spinDefaultSize, option_font_size); option_font_size *= 10; GET_SPIN(spinMinimumSize, option_font_min_size); diff --git a/gtk/gtk_options.h b/gtk/gtk_options.h index 379b32c4b..15a7e934d 100644 --- a/gtk/gtk_options.h +++ b/gtk/gtk_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 2006 Rob Kendrick diff --git a/gtk/gtk_plotters.c b/gtk/gtk_plotters.c index b04c394d2..d782d6d13 100644 --- a/gtk/gtk_plotters.c +++ b/gtk/gtk_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 2006 Rob Kendrick diff --git a/gtk/gtk_plotters.h b/gtk/gtk_plotters.h index e758b417b..85ab4b9b0 100644 --- a/gtk/gtk_plotters.h +++ b/gtk/gtk_plotters.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 James Bursa diff --git a/gtk/gtk_schedule.c b/gtk/gtk_schedule.c index 071b6b95f..73568fa93 100644 --- a/gtk/gtk_schedule.c +++ b/gtk/gtk_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 2006 Daniel Silverstone @@ -32,7 +32,7 @@ static gboolean ns_generic_gtk_callback(gpointer data) return FALSE; } -void schedule_remove(void (*callback)(void *p), void *p) +void schedule_remove(void (*callback)(void *p), void *p) { _nsgtkcallback *cb; GList *l; @@ -47,7 +47,7 @@ void schedule_remove(void (*callback)(void *p), void *p) } } -void schedule(int t, void (*callback)(void *p), void *p) +void schedule(int t, void (*callback)(void *p), void *p) { _nsgtkcallback *cb = (_nsgtkcallback*)malloc(sizeof(_nsgtkcallback)); schedule_remove(callback, p); @@ -58,7 +58,7 @@ void schedule(int t, void (*callback)(void *p), void *p) g_timeout_add(t * 10, ns_generic_gtk_callback, cb); } -void schedule_run(void) +void schedule_run(void) { /* Nothing to do, the running is done via the gtk mainloop of joy */ } diff --git a/gtk/gtk_throbber.c b/gtk/gtk_throbber.c index a0b76b14d..a95cf1609 100644 --- a/gtk/gtk_throbber.c +++ b/gtk/gtk_throbber.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 Rob Kendrick @@ -22,32 +22,32 @@ bool nsgtk_throbber_initialise(const char *fn) struct gif_animation *gif; /**< structure for gifread.c */ struct nsgtk_throbber *throb; /**< structure we generate */ int i; - + FILE *fh = fopen(fn, "rb"); - + if (fh == NULL) { LOG(("Unable to open throbber image '%s' for reading!", fn)); return false; } - + gif = (struct gif_animation *)malloc(sizeof(struct gif_animation)); throb = (struct nsgtk_throbber *)malloc(sizeof(struct nsgtk_throbber)); - + /* discover the size of the data file. */ fseek(fh, 0, SEEK_END); gif->buffer_size = ftell(fh); fseek(fh, 0, SEEK_SET); - + /* allocate a block of sufficient size, and load the data in. */ gif->gif_data = (unsigned char *)malloc(gif->buffer_size); fread(gif->gif_data, gif->buffer_size, 1, fh); fclose(fh); - + /* set current position within GIF file to beginning, in order to * signal to gifread that we're brand new. */ gif->buffer_position = 0; - + /* initialise the gif_animation structure. */ switch (gif_initialise(gif)) { @@ -69,9 +69,9 @@ bool nsgtk_throbber_initialise(const char *fn) return false; break; } - + throb->nframes = gif->frame_count; - + if (throb->nframes < 2) { /* we need at least two frames - one for idle, one for active */ @@ -97,35 +97,35 @@ bool nsgtk_throbber_initialise(const char *fn) throb->framedata[i] = gdk_pixbuf_copy( gtk_bitmap_get_primary(gif->frame_image)); } - + gif_finalise(gif); free(gif->gif_data); free(gif); - + /* debug code: save out each frame as a PNG to make sure decoding is - * working correctly. - + * working correctly. + for (i = 0; i < throb->nframes; i++) { char fname[20]; sprintf(fname, "frame%d.png", i); gdk_pixbuf_save(throb->framedata[i], fname, "png", NULL, NULL); } - */ - + */ + nsgtk_throbber = throb; - - return true; + + return true; } void nsgtk_throbber_finalise(void) { int i; - + for (i = 0; i < nsgtk_throbber->nframes; i++) gdk_pixbuf_unref(nsgtk_throbber->framedata[i]); - + free(nsgtk_throbber->framedata); free(nsgtk_throbber); - + nsgtk_throbber = NULL; } diff --git a/gtk/gtk_throbber.h b/gtk/gtk_throbber.h index 4c04a6904..04fb912c9 100644 --- a/gtk/gtk_throbber.h +++ b/gtk/gtk_throbber.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 Rob Kendrick diff --git a/gtk/gtk_thumbnail.c b/gtk/gtk_thumbnail.c index c5e03c479..60c7b9752 100644 --- a/gtk/gtk_thumbnail.c +++ b/gtk/gtk_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 2006 Rob Kendrick diff --git a/gtk/gtk_treeview.c b/gtk/gtk_treeview.c index f62602c4d..9b5f2c2c0 100644 --- a/gtk/gtk_treeview.c +++ b/gtk/gtk_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 2004 Richard Wilson diff --git a/gtk/gtk_window.c b/gtk/gtk_window.c index cd952b220..636880bd5 100644 --- a/gtk/gtk_window.c +++ b/gtk/gtk_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 2006 Rob Kendrick @@ -494,7 +494,7 @@ gboolean nsgtk_window_reload_button_clicked(GtkWidget *widget, gpointer data) gboolean nsgtk_window_home_button_clicked(GtkWidget *widget, gpointer data) { struct gui_window *g = data; - static const char *addr = "http://netsurf.sourceforge.net/"; + static const char *addr = "http://netsurf-browser.org/"; if (option_homepage_url != NULL) addr = option_homepage_url; @@ -695,25 +695,25 @@ gboolean nsgtk_history_motion_notify_event(GtkWidget *widget, struct gtk_history_window *gw = g; const char *url; int winx, winy; - + // if (!option_history_tooltip) // return TRUE; - + url = history_position_url(gw->g->bw->history, event->x, event->y); if (url == NULL) { gtk_widget_hide(wndTooltip); return TRUE; } - + gtk_label_set_text(labelTooltip, url); gtk_window_get_position(gw->g->window, &winx, &winy); - + LOG(("winx = %d, winy = %d, event->x = %d, event->y = %d", winx, winy, event->x, event->y)); - + gtk_widget_show(GTK_WIDGET(wndTooltip)); gtk_window_move(wndTooltip, event->x + winx, event->y + winy); - + return TRUE; } diff --git a/gtk/gtk_window.h b/gtk/gtk_window.h index 6b446fc15..3da9d56f8 100644 --- a/gtk/gtk_window.h +++ b/gtk/gtk_window.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 James Bursa diff --git a/gtk/options.h b/gtk/options.h index f1763a66f..3796a1c43 100644 --- a/gtk/options.h +++ b/gtk/options.h @@ -1,4 +1,4 @@ -/* This s file is part of NetSurf, http://netsurf.sourceforge.net/ +/* This s 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 Rob Kendrick diff --git a/gtk/res/netsurf.glade b/gtk/res/netsurf.glade index 1502408c8..42ab4f97d 100644 --- a/gtk/res/netsurf.glade +++ b/gtk/res/netsurf.glade @@ -1932,7 +1932,7 @@ True True 0 - http://netsurf.sourceforge.net/ + http://netsurf-browser.org/ True ● False diff --git a/image/bitmap.h b/image/bitmap.h index 3581564b5..57955ae9d 100644 --- a/image/bitmap.h +++ b/image/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 diff --git a/image/bmp.c b/image/bmp.c index 1eaef0592..c58bc044f 100644 --- a/image/bmp.c +++ b/image/bmp.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/image/bmp.h b/image/bmp.h index 11f329b4d..3cc31cfd2 100644 --- a/image/bmp.h +++ b/image/bmp.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/image/bmpread.c b/image/bmpread.c index d4f3940c8..e9d71588c 100644 --- a/image/bmpread.c +++ b/image/bmpread.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/image/bmpread.h b/image/bmpread.h index 60b9d9854..379d8cecb 100644 --- a/image/bmpread.h +++ b/image/bmpread.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/image/gif.c b/image/gif.c index 5bd2c25aa..02148f264 100644 --- a/image/gif.c +++ b/image/gif.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 @@ -118,7 +118,7 @@ bool nsgif_convert(struct content *c, int iwidth, int iheight) { void nsgif_invalidate(struct bitmap *bitmap, void *private_word) { struct gif_animation *gif = (struct gif_animation *)private_word; - + gif->decoded_frame = -1; } @@ -190,7 +190,7 @@ void nsgif_animate(void *p) struct gif_animation *gif; int delay; int f; - + /* Advance by a frame, updating the loop count accordingly */ gif = c->data.gif.gif; diff --git a/image/gif.h b/image/gif.h index 88b50e947..d0020a1b8 100644 --- a/image/gif.h +++ b/image/gif.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/image/gifread.c b/image/gifread.c index 52aa6254f..e8bf059bf 100644 --- a/image/gifread.c +++ b/image/gifread.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 Richard Wilson @@ -925,9 +925,9 @@ static bool gif_next_LZW(struct gif_animation *gif) { return false; } } - + *stack_pointer++ = firstcode = table[1][code]; - + if ((code = max_code) < (1 << GIF_MAX_LZW)) { table[0][code] = oldcode; table[1][code] = firstcode; diff --git a/image/gifread.h b/image/gifread.h index 5099ae4fe..ec6bbf7f8 100644 --- a/image/gifread.h +++ b/image/gifread.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/image/ico.c b/image/ico.c index cdb21eb57..546727595 100644 --- a/image/ico.c +++ b/image/ico.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/image/ico.h b/image/ico.h index 401962e96..b02ddcf5e 100644 --- a/image/ico.h +++ b/image/ico.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/image/jpeg.c b/image/jpeg.c index 197a977b4..87d251bac 100644 --- a/image/jpeg.c +++ b/image/jpeg.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/image/jpeg.h b/image/jpeg.h index 9375a10b6..3cc2b7917 100644 --- a/image/jpeg.h +++ b/image/jpeg.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/image/mng.c b/image/mng.c index 19123ca7e..37ca1460a 100644 --- a/image/mng.c +++ b/image/mng.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/image/mng.h b/image/mng.h index 1dbcb849c..6e729cf64 100644 --- a/image/mng.h +++ b/image/mng.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/makefile b/makefile index 09805639a..0d1a248d8 100644 --- a/makefile +++ b/makefile @@ -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 # diff --git a/render/box.c b/render/box.c index 590b673a8..fe70c61f8 100644 --- a/render/box.c +++ b/render/box.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/render/box.h b/render/box.h index adefcdc1e..e932b7480 100644 --- a/render/box.h +++ b/render/box.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 James Bursa diff --git a/render/box_construct.c b/render/box_construct.c index b6806c106..0b00570bf 100644 --- a/render/box_construct.c +++ b/render/box_construct.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/render/box_normalise.c b/render/box_normalise.c index 9cc49bdce..69ccc2259 100644 --- a/render/box_normalise.c +++ b/render/box_normalise.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/render/directory.c b/render/directory.c index eaaea35c6..1449b46f0 100644 --- a/render/directory.c +++ b/render/directory.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 @@ -53,7 +53,7 @@ bool directory_convert(struct content *c, int width, int height) { if (!path) { msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - return false; + return false; } nice_path = malloc(strlen(path) * 4 + 1); if (!nice_path) { @@ -63,13 +63,13 @@ bool directory_convert(struct content *c, int width, int height) { } for (cnv = nice_path, tmp = path; *tmp != '\0'; *tmp++) { if (*tmp == '<') { - *cnv++ = '&'; - *cnv++ = 'l'; + *cnv++ = '&'; + *cnv++ = 'l'; *cnv++ = 't'; *cnv++ = ';'; } else if (*tmp == '>') { - *cnv++ = '&'; - *cnv++ = 'g'; + *cnv++ = '&'; + *cnv++ = 'g'; *cnv++ = 't'; *cnv++ = ';'; } else { @@ -104,13 +104,13 @@ bool directory_convert(struct content *c, int width, int height) { if ((entry->d_ino == 0) || (!strcmp(entry->d_name, ".")) || (!strcmp(entry->d_name, ".."))) continue; - + snprintf(buffer, sizeof(buffer), "%s\n", c->url, entry->d_name, entry->d_name); htmlParseChunk(c->data.html.parser, buffer, strlen(buffer), 0); } closedir(parent); - + htmlParseChunk(c->data.html.parser, footer, sizeof(footer) - 1, 0); c->type = CONTENT_HTML; return html_convert(c, width, height); diff --git a/render/directory.h b/render/directory.h index 93193fbad..ce1b212c3 100644 --- a/render/directory.h +++ b/render/directory.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/render/font.h b/render/font.h index e9066a23d..8e9e6e52a 100644 --- a/render/font.h +++ b/render/font.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/render/form.c b/render/form.c index 459fc4da2..b9aa654a0 100644 --- a/render/form.c +++ b/render/form.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/render/form.h b/render/form.h index cf9a0e746..f691eea8f 100644 --- a/render/form.h +++ b/render/form.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/render/html.c b/render/html.c index f50ce8d65..e53df7326 100644 --- a/render/html.c +++ b/render/html.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/render/html.h b/render/html.h index 4e19364e3..a9fa574d1 100644 --- a/render/html.h +++ b/render/html.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 @@ -68,20 +68,20 @@ struct content_html_object { struct content_html_frames { int cols; /** number of columns in frameset */ int rows; /** number of rows in frameset */ - + struct frame_dimension width; /** frame width */ struct frame_dimension height; /** frame width */ int margin_width; /** frame margin width */ int margin_height; /** frame margin height */ - + char *name; /** frame name (for targetting) */ char *url; /** frame url */ - + bool no_resize; /** frame is not resizable */ frame_scrolling scrolling; /** scrolling characteristics */ bool border; /** frame has a border */ colour border_colour; /** frame border colour */ - + struct content_html_frames *children; /** [cols * rows] children */ }; @@ -91,10 +91,10 @@ struct content_html_iframe { int margin_width; /** frame margin width */ int margin_height; /** frame margin height */ - + char *name; /** frame name (for targetting) */ char *url; /** frame url */ - + frame_scrolling scrolling; /** scrolling characteristics */ bool border; /** frame has a border */ colour border_colour; /** frame border colour */ diff --git a/render/html_redraw.c b/render/html_redraw.c index bc57d3cba..f3a1e6d18 100644 --- a/render/html_redraw.c +++ b/render/html_redraw.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/render/imagemap.c b/render/imagemap.c index fc6e9bec8..e004c01a8 100644 --- a/render/imagemap.c +++ b/render/imagemap.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/render/imagemap.h b/render/imagemap.h index 8af50e79d..95d740023 100644 --- a/render/imagemap.h +++ b/render/imagemap.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/render/layout.c b/render/layout.c index a135cc03c..6c52b25c1 100644 --- a/render/layout.c +++ b/render/layout.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/render/layout.h b/render/layout.h index f37f8fd7c..31a096a2d 100644 --- a/render/layout.h +++ b/render/layout.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 James Bursa diff --git a/render/list.c b/render/list.c index 432d31776..dd42e291c 100644 --- a/render/list.c +++ b/render/list.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 @@ -95,7 +95,7 @@ void render_list_destroy_counters(void) { struct list_counter *next_counter; struct list_counter_state *state; struct list_counter_state *next_state; - + while (counter) { next_counter = counter->next; free(counter->name); @@ -123,7 +123,7 @@ bool render_list_counter_reset(char *name, int value) { struct list_counter *counter; struct list_counter_state *state; struct list_counter_state *link; - + assert(name); counter = render_list_find_counter(name); if (!counter) @@ -156,7 +156,7 @@ bool render_list_counter_reset(char *name, int value) { */ bool render_list_counter_increment(char *name, int value) { struct list_counter *counter; - + assert(name); counter = render_list_find_counter(name); if (!counter) @@ -186,7 +186,7 @@ bool render_list_counter_increment(char *name, int value) { */ bool render_list_counter_end_scope(char *name) { struct list_counter *counter; - + assert(name); counter = render_list_find_counter(name); if ((!counter) || (!counter->state)) @@ -209,7 +209,7 @@ char *render_list_counter(struct css_counter *css_counter) { struct list_counter_state *state; char *compound = NULL; char *merge, *extend; - + assert(css_counter); counter = render_list_find_counter(css_counter->name); if (!counter) { @@ -221,7 +221,7 @@ char *render_list_counter(struct css_counter *css_counter) { if (!css_counter->separator) return render_list_encode_counter(counter->state, css_counter->style); - + /* loop through all states for counters() */ for (state = counter->first; state; state = state->next) { merge = render_list_encode_counter(state, @@ -243,7 +243,7 @@ char *render_list_counter(struct css_counter *css_counter) { } compound = extend; strcat(compound, merge); - } + } if (state->next) { merge = realloc(compound, strlen(compound) + strlen(css_counter->separator) + 1); @@ -332,13 +332,13 @@ static char *render_list_encode_counter(struct list_counter_state *state, assert(0); break; } - + /* perform case conversion */ if ((style == CSS_LIST_STYLE_TYPE_LOWER_ALPHA) || (style == CSS_LIST_STYLE_TYPE_LOWER_ROMAN)) for (i = 0; result[i]; i++) - result[i] = tolower(result[i]); - + result[i] = tolower(result[i]); + return result; } @@ -354,7 +354,7 @@ static char *render_list_encode_roman(int value) { int i, overflow, p = 0; char temp[10]; char *result; - + /* zero and below is returned as an empty string and not erred as * if it is counters() will fail to complete other scopes. */ if (value <= 0) { @@ -431,14 +431,14 @@ static void render_list_counter_output(char *name) { struct list_counter *counter; char *result; struct css_counter css_counter; - + assert(name); counter = render_list_find_counter(name); if (!counter) { fprintf(stderr, "Unable to create counter '%s'\n", name); return; } - + css_counter.name = name; css_counter.style = CSS_LIST_STYLE_TYPE_LOWER_ALPHA; css_counter.separator = NULL; diff --git a/render/list.h b/render/list.h index 0aa7d68ac..975aebcdc 100644 --- a/render/list.h +++ b/render/list.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/render/table.c b/render/table.c index a7c79dd19..1fba74565 100644 --- a/render/table.c +++ b/render/table.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/render/table.h b/render/table.h index 9b4b416fb..f206e251f 100644 --- a/render/table.h +++ b/render/table.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 James Bursa diff --git a/render/textplain.c b/render/textplain.c index ff6ca2f9d..8984ff851 100644 --- a/render/textplain.c +++ b/render/textplain.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/render/textplain.h b/render/textplain.h index 0775381fc..54d843f29 100644 --- a/render/textplain.h +++ b/render/textplain.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 James Bursa 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 diff --git a/utils/config.h b/utils/config.h index 459336e88..3f74b7fc1 100644 --- a/utils/config.h +++ b/utils/config.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,4 John M Bell diff --git a/utils/container.c b/utils/container.c index 5104b1875..c85e15ef1 100644 --- a/utils/container.c +++ b/utils/container.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 Rob Kendrick @@ -56,11 +56,11 @@ inline static size_t container_filelen(FILE *fd) { size_t o = ftell(fd); size_t a; - + fseek(fd, 0, SEEK_END); a = ftell(fd); fseek(fd, o, SEEK_SET); - + return a; } @@ -86,36 +86,36 @@ struct container_ctx *container_open(const char *filename) struct container_ctx *ctx = calloc(sizeof(struct container_ctx), 1); ctx->fh = fopen(filename, "rb"); - + if (ctx->fh == NULL) { free(ctx); return NULL; } - + /* we don't actually load any of the data (including directory) * until we need to, such that _get_name and _get_author are as quick * as possible. When we have, this gets set to true. */ ctx->processed = false; - + fread(&ctx->header.magic, 4, 1, ctx->fh); ctx->header.magic = ntohl(ctx->header.magic); - + fread(&ctx->header.parser, 4, 1, ctx->fh); ctx->header.parser = ntohl(ctx->header.parser); - + fread(ctx->header.name, 32, 1, ctx->fh); fread(ctx->header.author, 64, 1, ctx->fh); - + fread(&ctx->header.diroffset, 4, 1, ctx->fh); ctx->header.diroffset = ntohl(ctx->header.diroffset); - + if (ctx->header.magic != 0x4e53544d || ctx->header.parser != 3) { fclose(ctx->fh); free(ctx); return NULL; } - + return ctx; } @@ -128,14 +128,14 @@ static void container_process(struct container_ctx *ctx) ctx->data = mmap(NULL, ctx->header.diroffset, PROT_READ, MAP_PRIVATE, fileno(ctx->fh), 0); #else - ctx->data = malloc(ctx->header.diroffset); + ctx->data = malloc(ctx->header.diroffset); fseek(ctx->fh, 0, SEEK_SET); fread(ctx->data, ctx->header.diroffset, 1, ctx->fh); #endif fseek(ctx->fh, ctx->header.diroffset, SEEK_SET); /* now work through the directory structure taking it apart into * our structure */ -#define BEREAD(x) do { fread(&(x), 4, 1, ctx->fh);(x) = ntohl((x)); } while (0) +#define BEREAD(x) do { fread(&(x), 4, 1, ctx->fh);(x) = ntohl((x)); } while (0) do { fread(filename, 16, 1, ctx->fh); BEREAD(start); @@ -154,13 +154,13 @@ static const struct container_dirent *container_lookup( const unsigned char *entryname) { int i; - + for (i = 1; i <= ctx->entries; i++) { struct container_dirent *e = ctx->directory + i - 1; if (strcmp((char *)e->filename, (char *)entryname) == 0) return e; } - + return NULL; } @@ -169,10 +169,10 @@ const unsigned char *container_get(struct container_ctx *ctx, u_int32_t *size) { const struct container_dirent *e; - + if (ctx->processed == false) container_process(ctx); - + e = container_lookup(ctx, entryname); if (e == NULL) @@ -190,17 +190,17 @@ const unsigned char *container_iterate(struct container_ctx *ctx, int *state) if (ctx->processed == false) container_process(ctx); - + e = ctx->directory + *state; - + r = e->filename; - + if (r == NULL || r[0] == '\0') r = NULL; - + *state += 1; - - return r; + + return r; } const unsigned char *container_get_name(struct container_ctx *ctx) @@ -240,32 +240,32 @@ struct container_ctx *container_create(const char *filename, struct container_ctx *ctx = calloc(sizeof(struct container_ctx), 1); ctx->fh = fopen(filename, "wb"); - + if (ctx->fh == NULL) { free(ctx); return NULL; } - + ctx->creating = true; ctx->entries = 0; ctx->directory = NULL; ctx->header.parser = htonl(3); strncpy((char *)ctx->header.name, (char *)name, 32); strncpy((char *)ctx->header.author, (char *)author, 64); - + fwrite("NSTM", 4, 1, ctx->fh); fwrite(&ctx->header.parser, 4, 1, ctx->fh); fwrite(ctx->header.name, 32, 1, ctx->fh); fwrite(ctx->header.author, 64, 1, ctx->fh); - + ctx->header.diroffset = 108; - + /* skip over the directory offset for now, and fill it in later. * we don't know where it'll be yet! */ - + fseek(ctx->fh, 108, SEEK_SET); - + return ctx; } @@ -276,7 +276,7 @@ void container_add(struct container_ctx *ctx, const unsigned char *entryname, container_add_to_dir(ctx, entryname, ftell(ctx->fh), datalen); fwrite(data, datalen, 1, ctx->fh); } - + void container_close(struct container_ctx *ctx) { if (ctx->creating == true) { @@ -285,16 +285,16 @@ void container_close(struct container_ctx *ctx) /* discover where the directory's going to go. */ flen = container_filelen(ctx->fh); flen = (flen + 3) & (~3); /* round up to nearest 4 bytes */ - + /* write this location to the header */ fseek(ctx->fh, 104, SEEK_SET); nflen = htonl(flen); fwrite(&nflen, 4, 1, ctx->fh); - + /* seek to where the directory will be, and write it */ fseek(ctx->fh, flen, SEEK_SET); container_write_dir(ctx); - + } else if (ctx->processed) { #ifdef WITH_MMAP munmap(ctx->data, ctx->header.diroffset); @@ -315,26 +315,26 @@ int main(int argc, char *argv[]) u_int32_t size; int state = 0; char *n; - + container_add(ctx, "CHEESE", "This is a test of some cheese.\0", 31); container_add(ctx, "FOO", "This is a test of some cheese.\0", 31); - + container_close(ctx); - + ctx = container_open("test.theme"); - + printf("Theme name: %s\n", container_get_name(ctx)); printf("Theme author: %s\n", container_get_author(ctx)); - + printf("Test string: %s\n", container_get(ctx, "CHEESE", &size)); printf("Length of text: %d\n", size); - + while ( (n = container_iterate(ctx, &state)) ) { printf("%s\n", n); } - + container_close(ctx); - + exit(0); } #endif @@ -370,30 +370,30 @@ static void extract_theme(const char *themefile, const char *dirname) char path[PATH_MAX]; int state = 0; u_int32_t flen; - - + + if (stat(dirname, &statbuf) != -1) { fprintf(stderr, "error: directory '%s' already exists.\n", dirname); exit(1); } - + mkdir(dirname, 00777); - + cctx = container_open(themefile); if (cctx == NULL) { fprintf(stderr, "error: unable to open theme file '%s'\n", themefile); exit(1); } - + if (verbose == true) { printf("theme name: %s\n", container_get_name(cctx)); printf("theme author: %s\n", container_get_author(cctx)); } - + while ( (e = container_iterate(cctx, &state)) ) { - if (verbose == true) + if (verbose == true) printf("extracting %s\n", e); snprintf(path, PATH_MAX, "%s/%s", dirname, e); fh = fopen(path, "wb"); @@ -405,9 +405,9 @@ static void extract_theme(const char *themefile, const char *dirname) fclose(fh); } } - + container_close(cctx); - + } static void create_theme(const char *themefile, const char *dirname, @@ -423,16 +423,16 @@ static void create_theme(const char *themefile, const char *dirname, char path[PATH_MAX]; size_t flen; int t; - + if (dir == NULL) { perror("error: unable to open directory"); exit(1); } - + cctx = container_create(themefile, name, author); - + errno = 0; /* to distinguish between end of dir and err */ - + while ((e = readdir(dir)) != NULL) { if (strcmp(e->d_name, ".") != 0 && strcmp(e->d_name, "..") != 0) { @@ -443,9 +443,9 @@ static void create_theme(const char *themefile, const char *dirname, fprintf(stderr, "warning: name truncated to 15 characters.\n"); } - + snprintf(path, PATH_MAX, "%s/%s", dirname, e->d_name); - + stat(path, &statbuf); if (S_ISDIR(statbuf.st_mode)) { fprintf(stderr, @@ -453,7 +453,7 @@ static void create_theme(const char *themefile, const char *dirname, e->d_name); continue; } - + fh = fopen(path, "rb"); if (fh == NULL) { fprintf(stderr, @@ -470,14 +470,14 @@ static void create_theme(const char *themefile, const char *dirname, } errno = 0; } - + if (errno != 0) { perror("error: couldn't enumerate directory"); closedir(dir); container_close(cctx); exit(1); } - + closedir(dir); container_close(cctx); } @@ -491,16 +491,16 @@ int main(int argc, char *argv[]) { "name", 1, 0, 'n' }, { "author", 1, 0, 'a' }, { "verbose", 0, 0, 'v' }, - + { NULL, 0, 0, 0 } }; - + static char *s_opts = "hcxn:a:v"; int optch, optidx; bool creating = false, extracting = false; unsigned char name[32] = { '\0' }, author[64] = { '\0' }; char *themefile, *dirname; - + while ((optch = getopt_long(argc, argv, s_opts, l_opts, &optidx)) != -1) switch (optch) { case 'h': @@ -531,40 +531,40 @@ int main(int argc, char *argv[]) exit(1); break; } - + if (creating == extracting) { show_usage(argv[0]); exit(1); } - + if ((argc - optind) < 2) { show_usage(argv[0]); exit(1); } - - if (creating == true && + + if (creating == true && (strlen((char *)name) == 0 || strlen((char *)author) == 0)) { fprintf(stderr, "No theme name and/or author specified.\n"); show_usage(argv[0]); exit(1); } - + themefile = strdup(argv[optind]); dirname = strdup(argv[optind + 1]); - + if (verbose == true) printf("%s '%s' %s directory '%s'\n", creating ? "creating" : "extracting", themefile, creating ? "from" : "to", dirname); - + if (creating) { if (verbose == true) printf("name = %s, author = %s\n", name, author); - create_theme(themefile, dirname, name, author); + create_theme(themefile, dirname, name, author); } else { extract_theme(themefile, dirname); } - - return 0; + + return 0; } #endif diff --git a/utils/container.h b/utils/container.h index c96a79921..5a82ace2b 100644 --- a/utils/container.h +++ b/utils/container.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 Rob Kendrick @@ -7,7 +7,7 @@ /** \file * Container format handling for themes etc. */ - + #ifndef __CONTAINER_H__ #define __CONTAINER_H__ @@ -32,7 +32,7 @@ struct container_ctx *container_create(const char *filename, void container_add(struct container_ctx *ctx, const unsigned char *entryname, const unsigned char *data, const u_int32_t datalen); - + /* common interface */ void container_close(struct container_ctx *ctx); diff --git a/utils/filename.c b/utils/filename.c index 518a0a207..194d11c74 100644 --- a/utils/filename.c +++ b/utils/filename.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/utils/filename.h b/utils/filename.h index f38a29cb8..7c8c6e39d 100644 --- a/utils/filename.h +++ b/utils/filename.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/utils/hashtable.c b/utils/hashtable.c index ff5dad1ca..6c82be0b4 100644 --- a/utils/hashtable.c +++ b/utils/hashtable.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 Rob Kendrick @@ -123,7 +123,7 @@ bool hash_add(struct hash_table *ht, const char *key, const char *value) h = hash_string_fnv(key, &(e->key_length)); c = h % ht->nchains; - + v = strlen(value) ; e->pairing = malloc(v + e->key_length + 2); if (e->pairing == NULL) { diff --git a/utils/hashtable.h b/utils/hashtable.h index e48c76646..f4a36a538 100644 --- a/utils/hashtable.h +++ b/utils/hashtable.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 Rob Kendrick diff --git a/utils/log.h b/utils/log.h index 65417b930..6ad17bb0d 100644 --- a/utils/log.h +++ b/utils/log.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 James Bursa diff --git a/utils/messages.c b/utils/messages.c index e3a8d5c90..a10eec025 100644 --- a/utils/messages.c +++ b/utils/messages.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/utils/messages.h b/utils/messages.h index 6f9dfb763..db1f713c8 100644 --- a/utils/messages.h +++ b/utils/messages.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/utils/themes.c b/utils/themes.c index 4f5322134..0387a1d1d 100644 --- a/utils/themes.c +++ b/utils/themes.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 Rob Kendrick @@ -9,7 +9,7 @@ struct theme_descriptor; -/** +/** * Initialise the themes interface. This must be called once only before any * other themes_ functions are called. It will enumerate all the themes * found in the directory path names passed. Further themes can be added at @@ -63,7 +63,7 @@ struct theme_descriptor *themes_open(const unsigned char *themename) * from it. * * \param theme Theme that the caller is finished with. - */ + */ void themes_close(struct theme_descriptor *theme) { diff --git a/utils/themes.h b/utils/themes.h index 8d3336f7c..bbebec381 100644 --- a/utils/themes.h +++ b/utils/themes.h @@ -1,10 +1,10 @@ /* - * 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 Rob Kendrick */ - + #ifndef __THEMES_H__ #define __THEMES_H__ diff --git a/utils/tt2code b/utils/tt2code index e747bc5fc..8012f31e6 100755 --- a/utils/tt2code +++ b/utils/tt2code @@ -2,7 +2,7 @@ print < diff --git a/utils/url.c b/utils/url.c index 0d3605d2e..1c8005a5d 100644 --- a/utils/url.c +++ b/utils/url.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/utils/url.h b/utils/url.h index 5877b9e9a..e9ad7fcb4 100644 --- a/utils/url.h +++ b/utils/url.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 James Bursa diff --git a/utils/utf8.c b/utils/utf8.c index ea9f8c85f..b811a6595 100644 --- a/utils/utf8.c +++ b/utils/utf8.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 diff --git a/utils/utf8.h b/utils/utf8.h index a1a1c4e9a..fafce6d0c 100644 --- a/utils/utf8.h +++ b/utils/utf8.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/utils/utils.c b/utils/utils.c index fca35ab21..63b8e9b29 100644 --- a/utils/utils.c +++ b/utils/utils.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/utils/utils.h b/utils/utils.h index ba541cced..3e5ed6318 100644 --- a/utils/utils.h +++ b/utils/utils.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