diff options
| -rw-r--r-- | desktop/browser.h | 11 | ||||
| -rw-r--r-- | desktop/sslcert_viewer.c | 2 | ||||
| -rw-r--r-- | desktop/treeview.c | 8 | ||||
| -rw-r--r-- | framebuffer/clipboard.c | 5 | ||||
| -rw-r--r-- | gtk/dialogs/about.c | 3 | ||||
| -rw-r--r-- | gtk/dialogs/preferences.c | 7 | ||||
| -rw-r--r-- | gtk/dialogs/source.c | 4 | ||||
| -rw-r--r-- | gtk/scaffolding.c | 1 | ||||
| -rw-r--r-- | gtk/selection.c | 3 | ||||
| -rw-r--r-- | gtk/toolbar.c | 1 | ||||
| -rw-r--r-- | render/form.h | 3 | ||||
| -rw-r--r-- | render/html_interaction.c | 1 |
12 files changed, 33 insertions, 16 deletions
diff --git a/desktop/browser.h b/desktop/browser.h index 4901c112e..549570f91 100644 --- a/desktop/browser.h +++ b/desktop/browser.h @@ -25,12 +25,13 @@ #define _NETSURF_DESKTOP_BROWSER_H_ #include <stdbool.h> +#include <stdio.h> -#include "content/content.h" -#include "content/hlcache.h" +#include "utils/types.h" +#include "utils/nsurl.h" +#include "desktop/plot_style.h" #include "desktop/frame_types.h" #include "desktop/mouse.h" -#include "utils/types.h" struct browser_window; @@ -39,7 +40,7 @@ struct gui_window; struct history; struct selection; struct fetch_multipart_data; - +struct form_control; typedef enum { DRAGGING_NONE, @@ -116,7 +117,7 @@ nserror browser_window_navigate(struct browser_window *bw, enum browser_window_nav_flags flags, char *post_urlenc, struct fetch_multipart_data *post_multipart, - hlcache_handle *parent); + struct hlcache_handle *parent); void browser_window_get_dimensions(struct browser_window *bw, int *width, int *height, bool scaled); diff --git a/desktop/sslcert_viewer.c b/desktop/sslcert_viewer.c index e0e87fbbe..d465af8d6 100644 --- a/desktop/sslcert_viewer.c +++ b/desktop/sslcert_viewer.c @@ -24,9 +24,9 @@ #include <assert.h> #include <stdlib.h> - #include "content/fetch.h" #include "content/urldb.h" +#include "content/hlcache.h" #include "desktop/sslcert_viewer.h" #include "desktop/treeview.h" #include "utils/messages.h" diff --git a/desktop/treeview.c b/desktop/treeview.c index d380882b1..d24924ac7 100644 --- a/desktop/treeview.c +++ b/desktop/treeview.c @@ -20,15 +20,17 @@ * Treeview handling (implementation). */ +#include "utils/log.h" #include "css/utils.h" +#include "image/bitmap.h" +#include "render/font.h" +#include "content/hlcache.h" + #include "desktop/system_colour.h" #include "desktop/knockout.h" #include "desktop/plotters.h" #include "desktop/textarea.h" #include "desktop/treeview.h" -#include "image/bitmap.h" -#include "render/font.h" -#include "utils/log.h" /* TODO: get rid of REDRAW_MAX -- need to be able to know window size */ #define REDRAW_MAX 8000 diff --git a/framebuffer/clipboard.c b/framebuffer/clipboard.c index b4bd296c6..3729cd49b 100644 --- a/framebuffer/clipboard.c +++ b/framebuffer/clipboard.c @@ -23,11 +23,14 @@ #include <assert.h> #include <stdint.h> #include <string.h> +#include <stdlib.h> + +#include "utils/log.h" #include "desktop/browser.h" #include "desktop/gui.h" + #include "framebuffer/gui.h" #include "framebuffer/clipboard.h" -#include "utils/log.h" static struct gui_clipboard { diff --git a/gtk/dialogs/about.c b/gtk/dialogs/about.c index 3ebb4c078..eb662c873 100644 --- a/gtk/dialogs/about.c +++ b/gtk/dialogs/about.c @@ -18,10 +18,11 @@ #include <stdint.h> +#include "utils/utils.h" + #include "gtk/compat.h" #include "gtk/gui.h" #include "gtk/dialogs/about.h" -#include "desktop/browser.h" static void diff --git a/gtk/dialogs/preferences.c b/gtk/dialogs/preferences.c index 18c8d7b6c..b0a829325 100644 --- a/gtk/dialogs/preferences.c +++ b/gtk/dialogs/preferences.c @@ -19,12 +19,13 @@ #include <stdint.h> #include <math.h> -#include "desktop/browser_private.h" -#include "utils/nsoption.h" -#include "desktop/searchweb.h" #include "utils/log.h" #include "utils/utils.h" #include "utils/messages.h" +#include "desktop/browser_private.h" +#include "utils/nsoption.h" +#include "desktop/searchweb.h" +#include "content/hlcache.h" #include "gtk/compat.h" #include "gtk/window.h" diff --git a/gtk/dialogs/source.c b/gtk/dialogs/source.c index 8d74d20c1..a30cc675f 100644 --- a/gtk/dialogs/source.c +++ b/gtk/dialogs/source.c @@ -17,6 +17,7 @@ */ #include <stdlib.h> +#include <string.h> #include <gtk/gtk.h> #include "utils/log.h" @@ -24,9 +25,12 @@ #include "utils/utf8.h" #include "utils/messages.h" #include "utils/url.h" +#include "utils/utils.h" #include "desktop/netsurf.h" #include "desktop/browser_private.h" #include "render/html.h" +#include "content/hlcache.h" +#include "content/content.h" #include "gtk/dialogs/about.h" #include "gtk/fetch.h" diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index 7a9f9fa4a..91cbe1d06 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -46,6 +46,7 @@ #include "desktop/textinput.h" #include "render/font.h" #include "render/html.h" +#include "content/hlcache.h" #include "gtk/compat.h" #include "gtk/cookies.h" diff --git a/gtk/selection.c b/gtk/selection.c index c07e8889b..231e5fd0d 100644 --- a/gtk/selection.c +++ b/gtk/selection.c @@ -18,11 +18,12 @@ #include <string.h> #include <gtk/gtk.h> +#include <stdlib.h> #include "utils/log.h" - #include "desktop/browser.h" #include "desktop/gui.h" + #include "gtk/window.h" static GString *current_selection = NULL; diff --git a/gtk/toolbar.c b/gtk/toolbar.c index 8453f4e27..8cff4ed18 100644 --- a/gtk/toolbar.c +++ b/gtk/toolbar.c @@ -23,6 +23,7 @@ #include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" +#include "content/hlcache.h" #include "gtk/toolbar.h" #include "gtk/gui.h" diff --git a/render/form.h b/render/form.h index 78211ee19..84377a55b 100644 --- a/render/form.h +++ b/render/form.h @@ -35,6 +35,7 @@ struct form_option; struct form_select_menu; struct html_content; struct dom_string; +struct content; /** Form submit method. */ typedef enum { @@ -186,7 +187,7 @@ void form_select_mouse_drag_end(struct form_control *control, browser_mouse_state mouse, int x, int y); void form_select_get_dimensions(struct form_control *control, int *width, int *height); -void form_select_process_selection(hlcache_handle *h, +void form_select_process_selection(struct hlcache_handle *h, struct form_control *control, int item); void form_submit(nsurl *page_url, struct browser_window *target, struct form *form, struct form_control *submit_button); diff --git a/render/html_interaction.c b/render/html_interaction.c index 415e7b1cf..5304c0227 100644 --- a/render/html_interaction.c +++ b/render/html_interaction.c @@ -29,6 +29,7 @@ #include <dom/dom.h> #include "content/content.h" +#include "content/hlcache.h" #include "desktop/browser.h" #include "desktop/gui_factory.h" #include "desktop/frames.h" |