From ba23e4b69341e5f3f2dbcd824663e75ebe2a581f Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 27 Nov 2006 15:35:18 +0000 Subject: Update project URL. svn path=/trunk/netsurf/; revision=3073 --- 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 +- 26 files changed, 76 insertions(+), 76 deletions(-) (limited to 'desktop') 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 -- cgit v1.2.3