diff options
author | Michael Drake <tlsa@netsurf-browser.org> | 2012-08-22 12:22:58 +0100 |
---|---|---|
committer | Michael Drake <tlsa@netsurf-browser.org> | 2012-08-22 12:22:58 +0100 |
commit | 153c4444543411b00fc8682bd38d6e1758a63082 (patch) | |
tree | 736bacbb3170ae71f6134811669b3a6ef60ab31d /desktop | |
parent | d489908af8cda59c94ad2375e1340bad6957e64a (diff) | |
download | netsurf-153c4444543411b00fc8682bd38d6e1758a63082.tar.gz netsurf-153c4444543411b00fc8682bd38d6e1758a63082.tar.bz2 |
Move browser_window struct to private header. Places that shouldn't include it do, such as front end code.
Frontends that have been updated to build:
framebuffer
gtk
monkey
riscos
TODO:
amiga
atari
beos
cocoa
windows
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/browser.c | 2 | ||||
-rw-r--r-- | desktop/browser.h | 146 | ||||
-rw-r--r-- | desktop/browser_private.h | 177 | ||||
-rw-r--r-- | desktop/frames.c | 2 | ||||
-rw-r--r-- | desktop/search.c | 2 | ||||
-rw-r--r-- | desktop/selection.c | 1 | ||||
-rw-r--r-- | desktop/selection.h | 3 | ||||
-rw-r--r-- | desktop/textinput.c | 2 | ||||
-rw-r--r-- | desktop/tree_url_node.h | 2 |
9 files changed, 187 insertions, 150 deletions
diff --git a/desktop/browser.c b/desktop/browser.c index 42acc3452..5175fc469 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -42,7 +42,7 @@ #include "content/hlcache.h" #include "content/urldb.h" #include "desktop/401login.h" -#include "desktop/browser.h" +#include "desktop/browser_private.h" #include "desktop/download.h" #include "desktop/frames.h" #include "desktop/history_core.h" diff --git a/desktop/browser.h b/desktop/browser.h index dda2d3eed..d5ad064cc 100644 --- a/desktop/browser.h +++ b/desktop/browser.h @@ -33,17 +33,11 @@ #include "utils/types.h" -struct box; +struct browser_window; struct hlcache_handle; -struct form; -struct form_control; struct gui_window; struct history; struct selection; -struct browser_window; -struct url_data; -struct bitmap; -struct scroll_msg_data; struct fetch_multipart_data; typedef bool (*browser_caret_callback)(struct browser_window *bw, uint32_t key, @@ -66,144 +60,6 @@ typedef enum { DRAGGING_OTHER } browser_drag_type; -/** Browser window data. */ -struct browser_window { - /** Page currently displayed, or 0. Must have status READY or DONE. */ - struct hlcache_handle *current_content; - /** Page being loaded, or 0. */ - struct hlcache_handle *loading_content; - - /** Page Favicon */ - struct hlcache_handle *current_favicon; - /** handle for favicon which we started loading early */ - struct hlcache_handle *loading_favicon; - /** favicon fetch already failed - prevents infinite error looping */ - bool failed_favicon; - - /** Window history structure. */ - struct history *history; - - /** Handler for keyboard input, or 0. */ - browser_caret_callback caret_callback; - /** Handler for pasting text, or 0. */ - browser_paste_callback paste_callback; - /** Handler for repositioning caret, or 0. */ - browser_move_callback move_callback; - - /** User parameters for caret_callback, paste_callback, and - * move_callback */ - void *caret_p1; - void *caret_p2; - - /** Platform specific window data. */ - struct gui_window *window; - - /** Busy indicator is active. */ - bool throbbing; - /** Add loading_content to the window history when it loads. */ - bool history_add; - - /** Fragment identifier for current_content. */ - lwc_string *frag_id; - - /** Current drag status. */ - browser_drag_type drag_type; - - /** Current drag's browser window, when not in root bw. */ - struct browser_window *drag_window; - - /** Mouse position at start of current scroll drag. */ - int drag_start_x; - int drag_start_y; - /** Scroll offsets at start of current scroll draw. */ - int drag_start_scroll_x; - int drag_start_scroll_y; - /** Frame resize directions for current frame resize drag. */ - unsigned int drag_resize_left : 1; - unsigned int drag_resize_right : 1; - unsigned int drag_resize_up : 1; - unsigned int drag_resize_down : 1; - - /** Current fetch is download */ - bool download; - - /** Refresh interval (-1 if undefined) */ - int refresh_interval; - - /** Window has been resized, and content needs reformatting. */ - bool reformat_pending; - - /** Window dimensions */ - int x; - int y; - int width; - int height; - - struct scrollbar *scroll_x; /**< Horizontal scroll. */ - struct scrollbar *scroll_y; /**< Vertical scroll. */ - - /** scale of window contents */ - float scale; - - /** Window characteristics */ - enum { - BROWSER_WINDOW_NORMAL, - BROWSER_WINDOW_IFRAME, - 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; - - /** browser window child of root browser window which has input focus */ - struct browser_window *focus; - - /** Last time a link was followed in this window */ - unsigned int last_action; - - /** Current selection, or NULL if none */ - struct selection *cur_sel; - - /** Current context for free text search, or NULL if none */ - struct search_context *cur_search; - - /** current javascript context */ - struct jscontext *jsctx; - - /** cache of the currently displayed status text. */ - char *status_text; /**< Current status bar text. */ - int status_text_len; /**< Length of the browser_window::status_text buffer. */ - int status_match; /**< Number of times an idempotent status-set operation was performed. */ - int status_miss; /**< Number of times status was really updated. */ -}; extern bool browser_reformat_pending; diff --git a/desktop/browser_private.h b/desktop/browser_private.h new file mode 100644 index 000000000..91372acc3 --- /dev/null +++ b/desktop/browser_private.h @@ -0,0 +1,177 @@ +/* + * Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net> + * Copyright 2006 James Bursa <bursa@users.sourceforge.net> + * + * This file is part of NetSurf, http://www.netsurf-browser.org/ + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +/** \file + * Browser window private structure. + */ + +#ifndef _NETSURF_DESKTOP_BROWSER_PRIVATE_H_ +#define _NETSURF_DESKTOP_BROWSER_PRIVATE_H_ + +#include <stdbool.h> + +#include "desktop/browser.h" + + +struct box; +struct hlcache_handle; +struct gui_window; +struct history; +struct selection; + +/** Browser window data. */ +struct browser_window { + /** Page currently displayed, or 0. Must have status READY or DONE. */ + struct hlcache_handle *current_content; + /** Page being loaded, or 0. */ + struct hlcache_handle *loading_content; + + /** Page Favicon */ + struct hlcache_handle *current_favicon; + /** handle for favicon which we started loading early */ + struct hlcache_handle *loading_favicon; + /** favicon fetch already failed - prevents infinite error looping */ + bool failed_favicon; + + /** Window history structure. */ + struct history *history; + + /** Handler for keyboard input, or 0. */ + browser_caret_callback caret_callback; + /** Handler for pasting text, or 0. */ + browser_paste_callback paste_callback; + /** Handler for repositioning caret, or 0. */ + browser_move_callback move_callback; + + /** User parameters for caret_callback, paste_callback, and + * move_callback */ + void *caret_p1; + void *caret_p2; + + /** Platform specific window data. */ + struct gui_window *window; + + /** Busy indicator is active. */ + bool throbbing; + /** Add loading_content to the window history when it loads. */ + bool history_add; + + /** Fragment identifier for current_content. */ + lwc_string *frag_id; + + /** Current drag status. */ + browser_drag_type drag_type; + + /** Current drag's browser window, when not in root bw. */ + struct browser_window *drag_window; + + /** Mouse position at start of current scroll drag. */ + int drag_start_x; + int drag_start_y; + /** Scroll offsets at start of current scroll draw. */ + int drag_start_scroll_x; + int drag_start_scroll_y; + /** Frame resize directions for current frame resize drag. */ + unsigned int drag_resize_left : 1; + unsigned int drag_resize_right : 1; + unsigned int drag_resize_up : 1; + unsigned int drag_resize_down : 1; + + /** Current fetch is download */ + bool download; + + /** Refresh interval (-1 if undefined) */ + int refresh_interval; + + /** Window has been resized, and content needs reformatting. */ + bool reformat_pending; + + /** Window dimensions */ + int x; + int y; + int width; + int height; + + struct scrollbar *scroll_x; /**< Horizontal scroll. */ + struct scrollbar *scroll_y; /**< Vertical scroll. */ + + /** scale of window contents */ + float scale; + + /** Window characteristics */ + enum { + BROWSER_WINDOW_NORMAL, + BROWSER_WINDOW_IFRAME, + 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; + + /** browser window child of root browser window which has input focus */ + struct browser_window *focus; + + /** Last time a link was followed in this window */ + unsigned int last_action; + + /** Current selection, or NULL if none */ + struct selection *cur_sel; + + /** Current context for free text search, or NULL if none */ + struct search_context *cur_search; + + /** current javascript context */ + struct jscontext *jsctx; + + /** cache of the currently displayed status text. */ + char *status_text; /**< Current status bar text. */ + int status_text_len; /**< Length of the browser_window::status_text buffer. */ + int status_match; /**< Number of times an idempotent status-set operation was performed. */ + int status_miss; /**< Number of times status was really updated. */ +}; + +#endif diff --git a/desktop/frames.c b/desktop/frames.c index 0d67ad8c5..cc2cabfd2 100644 --- a/desktop/frames.c +++ b/desktop/frames.c @@ -30,7 +30,7 @@ #include <math.h> #include "utils/config.h" #include "content/hlcache.h" -#include "desktop/browser.h" +#include "desktop/browser_private.h" #include "desktop/frames.h" #include "desktop/history_core.h" #include "desktop/gui.h" diff --git a/desktop/search.c b/desktop/search.c index 2fe762941..29d28bdaa 100644 --- a/desktop/search.c +++ b/desktop/search.c @@ -28,7 +28,7 @@ #include <dom/dom.h> #include "content/content.h" #include "content/hlcache.h" -#include "desktop/browser.h" +#include "desktop/browser_private.h" #include "desktop/gui.h" #include "desktop/options.h" #include "desktop/search.h" diff --git a/desktop/selection.c b/desktop/selection.c index 15f82bfd6..5633b1823 100644 --- a/desktop/selection.c +++ b/desktop/selection.c @@ -28,6 +28,7 @@ #include <string.h> #include <dom/dom.h> +#include "desktop/browser_private.h" #include "desktop/gui.h" #include "desktop/mouse.h" #include "desktop/plotters.h" diff --git a/desktop/selection.h b/desktop/selection.h index 7ece4bd85..aebb1698f 100644 --- a/desktop/selection.h +++ b/desktop/selection.h @@ -23,7 +23,8 @@ #ifndef _NETSURF_DESKTOP_SELECTION_H_ #define _NETSURF_DESKTOP_SELECTION_H_ -#include "desktop/browser.h" +#include <stdbool.h> +#include "desktop/mouse.h" struct box; diff --git a/desktop/textinput.c b/desktop/textinput.c index 36011bed9..8efc71963 100644 --- a/desktop/textinput.c +++ b/desktop/textinput.c @@ -29,7 +29,7 @@ #include <string.h> #include <dom/dom.h> -#include "desktop/browser.h" +#include "desktop/browser_private.h" #include "desktop/gui.h" #include "desktop/mouse.h" #include "desktop/scrollbar.h" diff --git a/desktop/tree_url_node.h b/desktop/tree_url_node.h index 15243e93d..1fa89cdba 100644 --- a/desktop/tree_url_node.h +++ b/desktop/tree_url_node.h @@ -27,6 +27,8 @@ #include "desktop/tree.h" +struct url_data; + void tree_url_node_init(const char *folder_icon_name); void tree_url_node_cleanup(void); struct node *tree_create_URL_node(struct tree *tree, |