eukara
/
WebSurf
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the netsurf/ from the include paths and rationalise use of <> vs "" in includes 

NetSurf includes are now done with ""s and other system includes with <>s as C intended.
The scandeps tool has been updated to only look for ""ed includes, and to verify that the
files exist in the tree before adding them to the dependency lines. The depend rule has
therefore been augmented to make sure the autogenerated files are built before it is run.

This is untested under self-hosted RISC OS builds. All else tested and works.


svn path=/trunk/netsurf/; revision=3307
This commit is contained in:
Daniel Silverstone 2007-05-30 22:39:54 +00:00
parent 25e22eb1f5
commit 6807b4208a
173 changed files with 1268 additions and 1273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
content/content.c
View File

@ -20,45 +20,45 @@
#include <string.h>
#include <strings.h>
#include <time.h>
#include "netsurf/utils/config.h"
#include "netsurf/content/content.h"
#include "netsurf/content/fetch.h"
#include "netsurf/content/fetchcache.h"
#include "netsurf/css/css.h"
#include "netsurf/image/bitmap.h"
#include "netsurf/desktop/options.h"
#include "netsurf/render/directory.h"
#include "netsurf/render/html.h"
#include "netsurf/render/textplain.h"
#include "utils/config.h"
#include "content/content.h"
#include "content/fetch.h"
#include "content/fetchcache.h"
#include "css/css.h"
#include "image/bitmap.h"
#include "desktop/options.h"
#include "render/directory.h"
#include "render/html.h"
#include "render/textplain.h"
#ifdef WITH_JPEG
#include "netsurf/image/jpeg.h"
#include "image/jpeg.h"
#endif
#ifdef WITH_MNG
#include "netsurf/image/mng.h"
#include "image/mng.h"
#endif
#ifdef WITH_GIF
#include "netsurf/image/gif.h"
#include "image/gif.h"
#endif
#ifdef WITH_BMP
#include "netsurf/image/bmp.h"
#include "netsurf/image/ico.h"
#include "image/bmp.h"
#include "image/ico.h"
#endif
#ifdef WITH_SPRITE
#include "netsurf/riscos/sprite.h"
#include "riscos/sprite.h"
#endif
#ifdef WITH_DRAW
#include "netsurf/riscos/draw.h"
#include "riscos/draw.h"
#endif
#ifdef WITH_PLUGIN
#include "netsurf/riscos/plugin.h"
#include "riscos/plugin.h"
#endif
#ifdef WITH_ARTWORKS
#include "netsurf/riscos/artworks.h"
#include "riscos/artworks.h"
#endif
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/talloc.h"
#include "netsurf/utils/utils.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
#include "utils/utils.h"
/** Linked list of all content structures. May include more than one content

28
content/content.h
View File

@ -16,35 +16,35 @@
#define _NETSURF_DESKTOP_CONTENT_H_
#include <stdint.h>
#include "netsurf/utils/config.h"
#include "netsurf/content/content_type.h"
#include "netsurf/css/css.h"
#include "netsurf/render/html.h"
#include "netsurf/render/textplain.h"
#include "utils/config.h"
#include "content/content_type.h"
#include "css/css.h"
#include "render/html.h"
#include "render/textplain.h"
#ifdef WITH_JPEG
#include "netsurf/image/jpeg.h"
#include "image/jpeg.h"
#endif
#ifdef WITH_GIF
#include "netsurf/image/gif.h"
#include "image/gif.h"
#endif
#ifdef WITH_BMP
#include "netsurf/image/bmp.h"
#include "netsurf/image/ico.h"
#include "image/bmp.h"
#include "image/ico.h"
#endif
#ifdef WITH_PLUGIN
#include "netsurf/riscos/plugin.h"
#include "riscos/plugin.h"
#endif
#ifdef WITH_MNG
#include "netsurf/image/mng.h"
#include "image/mng.h"
#endif
#ifdef WITH_SPRITE
#include "netsurf/riscos/sprite.h"
#include "riscos/sprite.h"
#endif
#ifdef WITH_DRAW
#include "netsurf/riscos/draw.h"
#include "riscos/draw.h"
#endif
#ifdef WITH_ARTWORKS
#include "netsurf/riscos/artworks.h"
#include "riscos/artworks.h"
#endif

2
content/content_type.h
View File

@ -14,7 +14,7 @@
#ifndef _NETSURF_DESKTOP_CONTENT_TYPE_H_
#define _NETSURF_DESKTOP_CONTENT_TYPE_H_
#include "netsurf/utils/config.h"
#include "utils/config.h"
/** The type of a content. */

20
content/fetch.c
View File

@ -32,20 +32,20 @@
#include <unixlib/local.h>
#endif
#include <curl/curl.h>
#include "netsurf/utils/config.h"
#include "utils/config.h"
#ifdef WITH_SSL
#include <openssl/ssl.h>
#endif
#include "netsurf/content/fetch.h"
#include "netsurf/content/urldb.h"
#include "netsurf/desktop/netsurf.h"
#include "netsurf/desktop/options.h"
#include "netsurf/render/form.h"
#include "content/fetch.h"
#include "content/urldb.h"
#include "desktop/netsurf.h"
#include "desktop/options.h"
#include "render/form.h"
#undef NDEBUG
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/url.h"
#include "netsurf/utils/utils.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/url.h"
#include "utils/utils.h"
bool fetch_active; /**< Fetches in progress, please call fetch_poll(). */

2
content/fetch.h
View File

@ -15,7 +15,7 @@
#include <stdbool.h>
#include <sys/select.h>
#include <curl/curl.h>
#include "netsurf/utils/config.h"
#include "utils/config.h"
typedef enum {
FETCH_TYPE,

18
content/fetchcache.c
View File

@ -20,15 +20,15 @@
#include <sys/types.h>
#include <regex.h>
#include <time.h>
#include "netsurf/utils/config.h"
#include "netsurf/content/content.h"
#include "netsurf/content/fetchcache.h"
#include "netsurf/content/fetch.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/talloc.h"
#include "netsurf/utils/url.h"
#include "netsurf/utils/utils.h"
#include "utils/config.h"
#include "content/content.h"
#include "content/fetchcache.h"
#include "content/fetch.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
#include "utils/url.h"
#include "utils/utils.h"
static char error_page[1000];

2
content/fetchcache.h
View File

@ -17,7 +17,7 @@
#include <stdbool.h>
#include <stdint.h>
#include "netsurf/content/content.h"
#include "content/content.h"
struct form_successful_control;

20
content/urldb.c
View File

@ -82,19 +82,19 @@
#include <sys/select.h>
#include <curl/curl.h>
#include "netsurf/image/bitmap.h"
#include "netsurf/content/content.h"
#include "netsurf/content/urldb.h"
#include "netsurf/desktop/cookies.h"
#include "netsurf/desktop/options.h"
#include "image/bitmap.h"
#include "content/content.h"
#include "content/urldb.h"
#include "desktop/cookies.h"
#include "desktop/options.h"
#ifdef riscos
/** \todo lose this */
#include "netsurf/riscos/bitmap.h"
#include "riscos/bitmap.h"
#endif
#include "netsurf/utils/log.h"
#include "netsurf/utils/filename.h"
#include "netsurf/utils/url.h"
#include "netsurf/utils/utils.h"
#include "utils/log.h"
#include "utils/filename.h"
#include "utils/url.h"
#include "utils/utils.h"
struct cookie_internal_data {
char *name; /**< Cookie name */

4
content/urldb.h
View File

@ -14,8 +14,8 @@
#include <stdbool.h>
#include <time.h>
#include "netsurf/content/content.h"
#include "netsurf/content/content_type.h"
#include "content/content.h"
#include "content/content_type.h"
typedef enum {
COOKIE_NETSCAPE = 0,

24
css/css.c
View File

@ -80,20 +80,20 @@
#include <strings.h>
#define CSS_INTERNALS
#undef NDEBUG
#include "netsurf/utils/config.h"
#include "netsurf/content/content.h"
#include "netsurf/content/fetch.h"
#include "netsurf/content/fetchcache.h"
#include "netsurf/css/css.h"
#include "netsurf/css/parser.h"
#include "utils/config.h"
#include "content/content.h"
#include "content/fetch.h"
#include "content/fetchcache.h"
#include "css/css.h"
#include "css/parser.h"
#ifdef riscos
#include "netsurf/desktop/gui.h"
#include "desktop/gui.h"
#endif
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/talloc.h"
#include "netsurf/utils/url.h"
#include "netsurf/utils/utils.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
#include "utils/url.h"
#include "utils/utils.h"
struct css_working_stylesheet {

4
css/css.h
View File

@ -25,8 +25,8 @@
#define _NETSURF_CSS_CSS_H_
#include <stdbool.h>
#include "libxml/HTMLparser.h"
#include "netsurf/css/css_enum.h"
#include <libxml/HTMLparser.h>
#include "css/css_enum.h"
typedef unsigned long colour; /* 0xbbggrr */

4
css/parser.y
View File

@ -400,8 +400,8 @@ any(A) ::= ASTERISK(B).
%include {
#include <strings.h>
#define CSS_INTERNALS
#include "netsurf/css/css.h"
#include "netsurf/utils/utils.h" }
#include "css/css.h"
#include "utils/utils.h" }
%name css_parser_
%token_type { struct css_parser_token }

12
css/ruleset.c
View File

@ -26,12 +26,12 @@
#include <strings.h>
#define CSS_INTERNALS
#define NDEBUG
#include "netsurf/css/css.h"
#include "netsurf/content/content.h"
#include "netsurf/desktop/options.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/url.h"
#include "netsurf/utils/utils.h"
#include "css/css.h"
#include "content/content.h"
#include "desktop/options.h"
#include "utils/log.h"
#include "utils/url.h"
#include "utils/utils.h"

4
css/scanner.l
View File

@ -16,8 +16,8 @@
#include <stdbool.h>
#define CSS_INTERNALS
#include "netsurf/css/css.h"
#include "netsurf/css/parser.h"
#include "css/css.h"
#include "css/parser.h"
#define YYCTYPE unsigned char
#define YYCURSOR (*buffer)

2
debug/debug_bitmap.c
View File

@ -15,7 +15,7 @@
#include <assert.h>
#include <stdbool.h>
#include <stdlib.h>
#include "netsurf/image/bitmap.h"
#include "image/bitmap.h"
struct bitmap {

6
debug/filetyped.c
View File

@ -7,9 +7,9 @@
#include <stdlib.h>
#include <string.h>
#include "netsurf/content/fetch.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/utils.h"
#include "content/fetch.h"
#include "utils/log.h"
#include "utils/utils.h"
/**
* filetype -- determine the MIME type of a local file

4
debug/fontd.c
View File

@ -6,8 +6,8 @@
*/
#include <assert.h>
#include "netsurf/css/css.h"
#include "netsurf/render/font.h"
#include "css/css.h"
#include "render/font.h"
bool nsfont_width(const struct css_style *style,

36
debug/netsurfd.c
View File

@ -9,24 +9,24 @@
#include <stdbool.h>
#include <string.h>
#include <time.h>
#include "netsurf/utils/config.h"
#include "netsurf/content/fetch.h"
#include "netsurf/content/content.h"
#include "netsurf/content/fetchcache.h"
#include "netsurf/content/urldb.h"
#include "netsurf/desktop/cookies.h"
#include "netsurf/desktop/gui.h"
#include "netsurf/desktop/options.h"
#include "netsurf/desktop/selection.h"
#include "netsurf/desktop/textinput.h"
#include "netsurf/desktop/tree.h"
#include "netsurf/image/bitmap.h"
#include "netsurf/render/box.h"
#include "netsurf/riscos/save_complete.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/url.h"
#include "netsurf/utils/utils.h"
#include "utils/config.h"
#include "content/fetch.h"
#include "content/content.h"
#include "content/fetchcache.h"
#include "content/urldb.h"
#include "desktop/cookies.h"
#include "desktop/gui.h"
#include "desktop/options.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
#include "desktop/tree.h"
#include "image/bitmap.h"
#include "render/box.h"
#include "riscos/save_complete.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/url.h"
#include "utils/utils.h"
int done, destroyed;
bool print_active = false;

6
desktop/401login.h
View File

@ -8,9 +8,9 @@
#ifndef NETSURF_DESKTOP_401LOGIN_H
#define NETSURF_DESKTOP_401LOGIN_H
#include "netsurf/utils/config.h"
#include "netsurf/content/content.h"
#include "netsurf/desktop/browser.h"
#include "utils/config.h"
#include "content/content.h"
#include "desktop/browser.h"
#ifdef WITH_AUTH

52
desktop/browser.c
View File

@ -22,34 +22,34 @@
#include <string.h>
#include <sys/select.h>
#include "curl/curl.h"
#include "netsurf/utils/config.h"
#include "netsurf/content/fetch.h"
#include "netsurf/content/fetchcache.h"
#include "netsurf/content/urldb.h"
#include "netsurf/css/css.h"
#include "utils/config.h"
#include "content/fetch.h"
#include "content/fetchcache.h"
#include "content/urldb.h"
#include "css/css.h"
#ifdef WITH_AUTH
#include "netsurf/desktop/401login.h"
#include "desktop/401login.h"
#endif
#include "netsurf/desktop/browser.h"
#include "netsurf/desktop/frames.h"
#include "netsurf/desktop/history_core.h"
#include "netsurf/desktop/gui.h"
#include "netsurf/desktop/options.h"
#include "netsurf/desktop/selection.h"
#include "netsurf/desktop/textinput.h"
#include "netsurf/desktop/gesture_core.h"
#include "netsurf/render/box.h"
#include "netsurf/render/form.h"
#include "netsurf/render/font.h"
#include "netsurf/render/imagemap.h"
#include "netsurf/render/layout.h"
#include "netsurf/render/textplain.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/talloc.h"
#include "netsurf/utils/url.h"
#include "netsurf/utils/utils.h"
#include "netsurf/utils/utf8.h"
#include "desktop/browser.h"
#include "desktop/frames.h"
#include "desktop/history_core.h"
#include "desktop/gui.h"
#include "desktop/options.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
#include "desktop/gesture_core.h"
#include "render/box.h"
#include "render/form.h"
#include "render/font.h"
#include "render/imagemap.h"
#include "render/layout.h"
#include "render/textplain.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
#include "utils/url.h"
#include "utils/utils.h"
#include "utils/utf8.h"
/** browser window which is being redrawn. Valid only during redraw. */
struct browser_window *current_redraw_browser;

2
desktop/browser.h
View File

@ -16,7 +16,7 @@
#include <stdbool.h>
#include <stddef.h>
#include <time.h>
#include "netsurf/render/html.h"
#include "render/html.h"
struct box;
struct content;

18
desktop/frames.c
View File

@ -17,15 +17,15 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include "netsurf/utils/config.h"
#include "netsurf/desktop/browser.h"
#include "netsurf/desktop/frames.h"
#include "netsurf/desktop/history_core.h"
#include "netsurf/desktop/gui.h"
#include "netsurf/desktop/selection.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/utils.h"
#include "utils/config.h"
#include "desktop/browser.h"
#include "desktop/frames.h"
#include "desktop/history_core.h"
#include "desktop/gui.h"
#include "desktop/selection.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
/** maximum frame resize margin */
#define FRAME_RESIZE 6

4
desktop/frames.h
View File

@ -12,8 +12,8 @@
#ifndef _NETSURF_DESKTOP_FRAMES_H_
#define _NETSURF_DESKTOP_FRAMES_H_
#include "netsurf/desktop/browser.h"
#include "netsurf/desktop/gui.h"
#include "desktop/browser.h"
#include "desktop/gui.h"
void browser_window_create_iframes(struct browser_window *bw,

4
desktop/gesture_core.c
View File

@ -9,8 +9,8 @@
* Mouse gesture core (implementation)
*/
#include "netsurf/utils/log.h"
#include "netsurf/desktop/gesture_core.h"
#include "utils/log.h"
#include "desktop/gesture_core.h"
#include <string.h>
#include <math.h>
#include <stdlib.h>

6
desktop/gui.h
View File

@ -41,9 +41,9 @@ typedef enum { GUI_POINTER_DEFAULT, GUI_POINTER_POINT, GUI_POINTER_CARET,
GUI_POINTER_PROGRESS } gui_pointer_shape;
#include <stdbool.h>
#include "netsurf/utils/config.h"
#include "netsurf/content/content.h"
#include "netsurf/desktop/browser.h"
#include "utils/config.h"
#include "content/content.h"
#include "desktop/browser.h"
extern struct gui_window *search_current_window;

22
desktop/history_core.c
View File

@ -15,17 +15,17 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include "netsurf/content/content.h"
#include "netsurf/content/urldb.h"
#include "netsurf/css/css.h"
#include "netsurf/desktop/gui.h"
#include "netsurf/desktop/history_core.h"
#include "netsurf/desktop/plotters.h"
#include "netsurf/image/bitmap.h"
#include "netsurf/render/font.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/url.h"
#include "netsurf/utils/utils.h"
#include "content/content.h"
#include "content/urldb.h"
#include "css/css.h"
#include "desktop/gui.h"
#include "desktop/history_core.h"
#include "desktop/plotters.h"
#include "image/bitmap.h"
#include "render/font.h"
#include "utils/log.h"
#include "utils/url.h"
#include "utils/utils.h"
#define WIDTH 100

8
desktop/knockout.c
View File

@ -13,10 +13,10 @@
#include <assert.h>
#include <string.h>
#include "netsurf/desktop/knockout.h"
#include "netsurf/desktop/plotters.h"
#include "netsurf/image/bitmap.h"
#include "netsurf/utils/log.h"
#include "desktop/knockout.h"
#include "desktop/plotters.h"
#include "image/bitmap.h"
#include "utils/log.h"
#define KNOCKOUT_ENTRIES 3072 /* 40 bytes each */
#define KNOCKOUT_BOXES 768 /* 28 bytes each */

2
desktop/knockout.h
View File

@ -9,7 +9,7 @@
* Knockout rendering (interface).
*/
#include "netsurf/desktop/plotters.h"
#include "desktop/plotters.h"
bool knockout_plot_start(struct plotter_table *plotter);

24
desktop/netsurf.c
View File

@ -15,20 +15,20 @@
#include <libxml/encoding.h>
#include <libxml/globals.h>
#include <libxml/xmlversion.h>
#include "netsurf/utils/config.h"
#include "netsurf/content/fetch.h"
#include "netsurf/content/fetchcache.h"
#include "netsurf/content/urldb.h"
#include "netsurf/desktop/netsurf.h"
#include "netsurf/desktop/browser.h"
#include "netsurf/desktop/gui.h"
#include "utils/config.h"
#include "content/fetch.h"
#include "content/fetchcache.h"
#include "content/urldb.h"
#include "desktop/netsurf.h"
#include "desktop/browser.h"
#include "desktop/gui.h"
#ifdef riscos
#include "netsurf/riscos/buffer.h"
#include "riscos/buffer.h"
#endif
#include "netsurf/utils/log.h"
#include "netsurf/utils/url.h"
#include "netsurf/utils/utf8.h"
#include "netsurf/utils/utils.h"
#include "utils/log.h"
#include "utils/url.h"
#include "utils/utf8.h"
#include "utils/utils.h"
bool netsurf_quit = false;
bool verbose_log = false;

22
desktop/options.c
View File

@ -19,20 +19,20 @@
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
#include "libxml/HTMLparser.h"
#include "libxml/HTMLtree.h"
#include "netsurf/content/urldb.h"
#include "netsurf/css/css.h"
#include "netsurf/desktop/options.h"
#include "netsurf/desktop/tree.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/utils.h"
#include <libxml/HTMLparser.h>
#include <libxml/HTMLtree.h>
#include "content/urldb.h"
#include "css/css.h"
#include "desktop/options.h"
#include "desktop/tree.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
#if defined(riscos)
#include "netsurf/riscos/options.h"
#include "riscos/options.h"
#elif defined(nsgtk)
#include "netsurf/gtk/options.h"
#include "gtk/options.h"
#else
#define EXTRA_OPTION_DEFINE
#define EXTRA_OPTION_TABLE

2
desktop/plotters.h
View File

@ -13,7 +13,7 @@
#define _NETSURF_DESKTOP_PLOTTERS_H_
#include <stdbool.h>
#include "netsurf/css/css.h"
#include "css/css.h"
struct bitmap;

12
desktop/save_text.c
View File

@ -8,13 +8,13 @@
#include <stdbool.h>
#include <string.h>
#include "libxml/HTMLtree.h"
#include <libxml/HTMLtree.h>
#include "netsurf/utils/config.h"
#include "netsurf/content/content.h"
#include "netsurf/desktop/save_text.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/utils.h"
#include "utils/config.h"
#include "content/content.h"
#include "desktop/save_text.h"
#include "utils/log.h"
#include "utils/utils.h"
#ifdef WITH_TEXT_EXPORT

18
desktop/selection.c
View File

@ -14,15 +14,15 @@
#include <stdlib.h>
#include <stdbool.h>
#include "netsurf/desktop/gui.h"
#include "netsurf/desktop/plotters.h"
#include "netsurf/desktop/selection.h"
#include "netsurf/render/box.h"
#include "netsurf/render/form.h"
#include "netsurf/render/textplain.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/utf8.h"
#include "netsurf/utils/utils.h"
#include "desktop/gui.h"
#include "desktop/plotters.h"
#include "desktop/selection.h"
#include "render/box.h"
#include "render/form.h"
#include "render/textplain.h"
#include "utils/log.h"
#include "utils/utf8.h"
#include "utils/utils.h"
/**

4
desktop/selection.h
View File

@ -12,8 +12,8 @@
#ifndef _NETSURF_DESKTOP_SELECTION_H_
#define _NETSURF_DESKTOP_SELECTION_H_
#include "netsurf/desktop/browser.h"
#include "netsurf/render/box.h"
#include "desktop/browser.h"
#include "render/box.h"
typedef enum {

24
desktop/textinput.c
View File

@ -17,19 +17,19 @@
#include <ctype.h>
#include <string.h>
#include "netsurf/desktop/browser.h"
#include "netsurf/desktop/gui.h"
#include "netsurf/desktop/selection.h"
#include "netsurf/desktop/textinput.h"
#include "netsurf/render/box.h"
#include "netsurf/render/font.h"
#include "netsurf/render/form.h"
#include "netsurf/render/layout.h"
#include "desktop/browser.h"
#include "desktop/gui.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
#include "render/box.h"
#include "render/font.h"
#include "render/form.h"
#include "render/layout.h"
#define NDEBUG
#include "netsurf/utils/log.h"
#include "netsurf/utils/talloc.h"
#include "netsurf/utils/utf8.h"
#include "netsurf/utils/utils.h"
#include "utils/log.h"
#include "utils/talloc.h"
#include "utils/utf8.h"
#include "utils/utils.h"
/** ghost caret used to indicate the insertion point when dragging text

12
desktop/tree.c
View File

@ -14,12 +14,12 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "netsurf/content/urldb.h"
#include "netsurf/desktop/tree.h"
#include "netsurf/desktop/options.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/utils.h"
#include "content/urldb.h"
#include "desktop/tree.h"
#include "desktop/options.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
static void tree_draw_node(struct tree *tree, struct node *node, int clip_x,
int clip_y, int clip_width, int clip_height);

14
gtk/font_pango.c
View File

@ -15,13 +15,13 @@
#include <assert.h>
#include <stdio.h>
#include <gtk/gtk.h>
#include "netsurf/css/css.h"
#include "netsurf/gtk/font_pango.h"
#include "netsurf/gtk/gtk_plotters.h"
#include "netsurf/render/font.h"
#include "netsurf/utils/utils.h"
#include "netsurf/utils/log.h"
#include "netsurf/desktop/options.h"
#include "css/css.h"
#include "gtk/font_pango.h"
#include "gtk/gtk_plotters.h"
#include "render/font.h"
#include "utils/utils.h"
#include "utils/log.h"
#include "desktop/options.h"
/* Until we can consider the descenders etc, we need to not render using cairo */
#undef CAIRO_VERSION

10
gtk/gtk_bitmap.c
View File

@ -16,11 +16,11 @@
#include <string.h>
#include <gdk/gdk.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include "netsurf/content/content.h"
#include "netsurf/gtk/gtk_bitmap.h"
#include "netsurf/gtk/gtk_scaffolding.h"
#include "netsurf/image/bitmap.h"
#include "netsurf/utils/log.h"
#include "content/content.h"
#include "gtk/gtk_bitmap.h"
#include "gtk/gtk_scaffolding.h"
#include "image/bitmap.h"
#include "utils/log.h"
struct bitmap {

2
gtk/gtk_bitmap.h
View File

@ -10,7 +10,7 @@
#include <gdk/gdk.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include "netsurf/image/bitmap.h"
#include "image/bitmap.h"
GdkPixbuf *gtk_bitmap_get_primary(struct bitmap*);
GdkPixbuf *gtk_bitmap_get_pretile_x(struct bitmap*);

8
gtk/gtk_completion.c
View File

@ -6,10 +6,10 @@
*/
#include <gtk/gtk.h>
#include "netsurf/gtk/gtk_completion.h"
#include "netsurf/content/urldb.h"
#include "netsurf/utils/log.h"
#include "netsurf/desktop/options.h"
#include "gtk/gtk_completion.h"
#include "content/urldb.h"
#include "utils/log.h"
#include "desktop/options.h"
GtkListStore *nsgtk_completion_list;

8
gtk/gtk_filetype.c
View File

@ -15,10 +15,10 @@
#include <sys/stat.h>
#include <unistd.h>
#include "netsurf/gtk/gtk_filetype.h"
#include "netsurf/content/fetch.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/hashtable.h"
#include "gtk/gtk_filetype.h"
#include "content/fetch.h"
#include "utils/log.h"
#include "utils/hashtable.h"
static struct hash_table *mime_hash = NULL;

48
gtk/gtk_gui.c
View File

@ -20,30 +20,30 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
#include "netsurf/content/content.h"
#include "netsurf/content/fetch.h"
#include "netsurf/content/urldb.h"
#include "netsurf/desktop/401login.h"
#include "netsurf/desktop/browser.h"
#include "netsurf/desktop/cookies.h"
#include "netsurf/desktop/gui.h"
#include "netsurf/desktop/netsurf.h"
#include "netsurf/desktop/options.h"
#include "netsurf/gtk/gtk_gui.h"
#include "netsurf/gtk/gtk_options.h"
#include "netsurf/gtk/gtk_completion.h"
#include "netsurf/gtk/options.h"
#include "netsurf/gtk/gtk_throbber.h"
#include "netsurf/gtk/gtk_history.h"
#include "netsurf/gtk/gtk_filetype.h"
#include "netsurf/render/box.h"
#include "netsurf/render/form.h"
#include "netsurf/render/html.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/url.h"
#include "netsurf/utils/utf8.h"
#include "netsurf/utils/utils.h"
#include "content/content.h"
#include "content/fetch.h"
#include "content/urldb.h"
#include "desktop/401login.h"
#include "desktop/browser.h"
#include "desktop/cookies.h"
#include "desktop/gui.h"
#include "desktop/netsurf.h"
#include "desktop/options.h"
#include "gtk/gtk_gui.h"
#include "gtk/gtk_options.h"
#include "gtk/gtk_completion.h"
#include "gtk/options.h"
#include "gtk/gtk_throbber.h"
#include "gtk/gtk_history.h"
#include "gtk/gtk_filetype.h"
#include "render/box.h"
#include "render/form.h"
#include "render/html.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/url.h"
#include "utils/utf8.h"
#include "utils/utils.h"
/* Where to search for shared resources. Must have trailing / */
#define RESPATH "/usr/share/netsurf/"

10
gtk/gtk_history.c
View File

@ -7,11 +7,11 @@
#include <gtk/gtk.h>
#include <glade/glade.h>
#include "netsurf/utils/log.h"
#include "netsurf/content/urldb.h"
#include "netsurf/gtk/gtk_history.h"
#include "netsurf/gtk/gtk_gui.h"
#include "netsurf/gtk/gtk_window.h"
#include "utils/log.h"
#include "content/urldb.h"
#include "gtk/gtk_history.h"
#include "gtk/gtk_gui.h"
#include "gtk/gtk_window.h"
enum
{

20
gtk/gtk_login.c
View File

@ -11,16 +11,16 @@
#include <assert.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
#include "netsurf/utils/log.h"
#include "netsurf/gtk/gtk_gui.h"
#include "netsurf/content/content.h"
#include "netsurf/content/urldb.h"
#include "netsurf/desktop/browser.h"
#include "netsurf/desktop/401login.h"
#include "netsurf/desktop/gui.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/url.h"
#include "netsurf/utils/utils.h"
#include "utils/log.h"
#include "gtk/gtk_gui.h"
#include "content/content.h"
#include "content/urldb.h"
#include "desktop/browser.h"
#include "desktop/401login.h"
#include "desktop/gui.h"
#include "utils/messages.h"
#include "utils/url.h"
#include "utils/utils.h"
struct session_401 {
char *url; /**< URL being fetched */

14
gtk/gtk_options.c
View File

@ -10,13 +10,13 @@
#include <string.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
#include "netsurf/utils/log.h"
#include "netsurf/desktop/options.h"
#include "netsurf/gtk/options.h"
#include "netsurf/gtk/gtk_gui.h"
#include "netsurf/gtk/gtk_scaffolding.h"
#include "netsurf/gtk/gtk_options.h"
#include "netsurf/gtk/gtk_window.h"
#include "utils/log.h"
#include "desktop/options.h"
#include "gtk/options.h"
#include "gtk/gtk_gui.h"
#include "gtk/gtk_scaffolding.h"
#include "gtk/gtk_options.h"
#include "gtk/gtk_window.h"
GtkWindow *wndChoices;

18
gtk/gtk_plotters.c
View File

@ -18,15 +18,15 @@
#include <math.h>
#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include "netsurf/desktop/plotters.h"
#include "netsurf/gtk/font_pango.h"
#include "netsurf/gtk/gtk_plotters.h"
#include "netsurf/gtk/gtk_scaffolding.h"
#include "netsurf/render/font.h"
#include "netsurf/utils/log.h"
#include "netsurf/desktop/options.h"
#include "netsurf/gtk/options.h"
#include "netsurf/gtk/gtk_bitmap.h"
#include "desktop/plotters.h"
#include "gtk/font_pango.h"
#include "gtk/gtk_plotters.h"
#include "gtk/gtk_scaffolding.h"
#include "render/font.h"
#include "utils/log.h"
#include "desktop/options.h"
#include "gtk/options.h"
#include "gtk/gtk_bitmap.h"
GtkWidget *current_widget;
GdkDrawable *current_drawable;

50
gtk/gtk_scaffolding.c
View File

@ -12,32 +12,32 @@
#include <string.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
#include "netsurf/content/content.h"
#include "netsurf/desktop/browser.h"
#include "netsurf/desktop/history_core.h"
#include "netsurf/desktop/gui.h"
#include "netsurf/desktop/netsurf.h"
#include "netsurf/desktop/plotters.h"
#include "netsurf/desktop/options.h"
#include "netsurf/desktop/textinput.h"
#include "netsurf/desktop/gesture_core.h"
#include "netsurf/gtk/gtk_gui.h"
#include "netsurf/gtk/gtk_plotters.h"
#include "netsurf/gtk/gtk_scaffolding.h"
#include "netsurf/gtk/gtk_options.h"
#include "netsurf/gtk/gtk_completion.h"
#include "netsurf/gtk/gtk_throbber.h"
#include "netsurf/gtk/gtk_history.h"
#include "netsurf/gtk/gtk_window.h"
#include "netsurf/gtk/gtk_schedule.h"
#include "netsurf/render/box.h"
#include "netsurf/render/font.h"
#include "netsurf/render/form.h"
#include "netsurf/render/html.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/utils.h"
#include "content/content.h"
#include "desktop/browser.h"
#include "desktop/history_core.h"
#include "desktop/gui.h"
#include "desktop/netsurf.h"
#include "desktop/plotters.h"
#include "desktop/options.h"
#include "desktop/textinput.h"
#include "desktop/gesture_core.h"
#include "gtk/gtk_gui.h"
#include "gtk/gtk_plotters.h"
#include "gtk/gtk_scaffolding.h"
#include "gtk/gtk_options.h"
#include "gtk/gtk_completion.h"
#include "gtk/gtk_throbber.h"
#include "gtk/gtk_history.h"
#include "gtk/gtk_window.h"
#include "gtk/gtk_schedule.h"
#include "render/box.h"
#include "render/font.h"
#include "render/form.h"
#include "render/html.h"
#include "utils/messages.h"
#include "utils/utils.h"
#undef NDEBUG
#include "netsurf/utils/log.h"
#include "utils/log.h"
struct gtk_history_window;

4
gtk/gtk_scaffolding.h
View File

@ -9,8 +9,8 @@
#define NETSURF_GTK_SCAFFOLDING_H 1
#include <gtk/gtk.h>
#include "netsurf/desktop/gui.h"
#include "netsurf/desktop/plotters.h"
#include "desktop/gui.h"
#include "desktop/plotters.h"
typedef struct gtk_scaffolding nsgtk_scaffolding;

2
gtk/gtk_schedule.c
View File

@ -8,7 +8,7 @@
#include <glib.h>
#include <stdlib.h>
#include "netsurf/desktop/browser.h"
#include "desktop/browser.h"
typedef struct {
void (*callback)(void *);

8
gtk/gtk_throbber.c
View File

@ -7,10 +7,10 @@
#include <stdio.h>
#include <stdlib.h>
#include "netsurf/utils/log.h"
#include "netsurf/image/gifread.h"
#include "netsurf/gtk/gtk_throbber.h"
#include "netsurf/gtk/gtk_bitmap.h"
#include "utils/log.h"
#include "image/gifread.h"
#include "gtk/gtk_throbber.h"
#include "gtk/gtk_bitmap.h"
struct nsgtk_throbber *nsgtk_throbber = NULL;

20
gtk/gtk_thumbnail.c
View File

@ -15,16 +15,16 @@
#include <assert.h>
#include <gtk/gtk.h>
#include "netsurf/content/content.h"
#include "netsurf/content/urldb.h"
#include "netsurf/desktop/plotters.h"
#include "netsurf/desktop/browser.h"
#include "netsurf/image/bitmap.h"
#include "netsurf/render/font.h"
#include "netsurf/utils/log.h"
#include "netsurf/gtk/gtk_scaffolding.h"
#include "netsurf/gtk/gtk_plotters.h"
#include "netsurf/gtk/gtk_bitmap.h"
#include "content/content.h"
#include "content/urldb.h"
#include "desktop/plotters.h"
#include "desktop/browser.h"
#include "image/bitmap.h"
#include "render/font.h"
#include "utils/log.h"
#include "gtk/gtk_scaffolding.h"
#include "gtk/gtk_plotters.h"
#include "gtk/gtk_bitmap.h"
/**
* Create a thumbnail of a page.

2
gtk/gtk_treeview.c
View File

@ -10,7 +10,7 @@
*/
#include "netsurf/desktop/tree.h"
#include "desktop/tree.h"
/**

18
gtk/gtk_window.c
View File

@ -6,16 +6,16 @@
* Copyright 2006 Rob Kendrick <rjek@rjek.com>
*/
#include "netsurf/gtk/gtk_window.h"
#include "netsurf/desktop/browser.h"
#include "netsurf/desktop/textinput.h"
#include "netsurf/gtk/gtk_gui.h"
#include "netsurf/gtk/gtk_scaffolding.h"
#include "netsurf/gtk/gtk_plotters.h"
#include "netsurf/gtk/gtk_schedule.h"
#include "gtk/gtk_window.h"
#include "desktop/browser.h"
#include "desktop/textinput.h"
#include "gtk/gtk_gui.h"
#include "gtk/gtk_scaffolding.h"
#include "gtk/gtk_plotters.h"
#include "gtk/gtk_schedule.h"
#undef NDEBUG
#include "netsurf/utils/log.h"
#include "netsurf/utils/utils.h"
#include "utils/log.h"
#include "utils/utils.h"
#include <gdk/gdkkeysyms.h>
#include <assert.h>

4
gtk/gtk_window.h
View File

@ -8,8 +8,8 @@
#ifndef NETSURF_GTK_WINDOW_H
#define NETSURF_GTK_WINDOW_H 1
#include "netsurf/desktop/gui.h"
#include "netsurf/gtk/gtk_scaffolding.h"
#include "desktop/gui.h"
#include "gtk/gtk_scaffolding.h"
void nsgtk_window_reflow_content(struct gui_window *g);
void nsgtk_reflow_all_windows(void);

2
gtk/options.h
View File

@ -8,7 +8,7 @@
#ifndef _NETSURF_GTK_OPTIONS_H_
#define _NETSURF_GTK_OPTIONS_H_
#include "netsurf/desktop/options.h"
#include "desktop/options.h"
extern bool option_render_cairo;
extern bool option_render_resample;

18
image/bmp.c
View File

@ -9,15 +9,15 @@
#include <string.h>
#include <stdbool.h>
#include <stdlib.h>
#include "netsurf/utils/config.h"
#include "netsurf/content/content.h"
#include "netsurf/desktop/plotters.h"
#include "netsurf/image/bitmap.h"
#include "netsurf/image/bmp.h"
#include "netsurf/image/bmpread.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/utils.h"
#include "utils/config.h"
#include "content/content.h"
#include "desktop/plotters.h"
#include "image/bitmap.h"
#include "image/bmp.h"
#include "image/bmpread.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
#ifdef WITH_BMP

2
image/bmp.h
View File

@ -9,7 +9,7 @@
#define _NETSURF_IMAGE_BMP_H_
#include <stdbool.h>
#include "netsurf/image/bmpread.h"
#include "image/bmpread.h"
struct content;

6
image/bmpread.c
View File

@ -10,9 +10,9 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include "netsurf/image/bmpread.h"
#include "netsurf/image/bitmap.h"
#include "netsurf/utils/log.h"
#include "image/bmpread.h"
#include "image/bitmap.h"
#include "utils/log.h"
#define READ_SHORT(a, o) (a[o]|(a[o+1]<<8))
#define READ_INT(a, o) (a[o]|(a[o+1]<<8)|(a[o+2]<<16)|(a[o+3]<<24))

2
image/bmpread.h
View File

@ -13,7 +13,7 @@
#define _NETSURF_IMAGE_BMPREAD_H_
#include <stdbool.h>
#include "netsurf/image/bitmap.h"
#include "image/bitmap.h"
/* error return values */
typedef enum {

22
image/gif.c
View File

@ -10,17 +10,17 @@
#include <string.h>
#include <stdbool.h>
#include <stdlib.h>
#include "netsurf/utils/config.h"
#include "netsurf/content/content.h"
#include "netsurf/desktop/browser.h"
#include "netsurf/desktop/options.h"
#include "netsurf/desktop/plotters.h"
#include "netsurf/image/bitmap.h"
#include "netsurf/image/gif.h"
#include "netsurf/image/gifread.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/utils.h"
#include "utils/config.h"
#include "content/content.h"
#include "desktop/browser.h"
#include "desktop/options.h"
#include "desktop/plotters.h"
#include "image/bitmap.h"
#include "image/gif.h"
#include "image/gifread.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
/* GIF FUNCTIONALITY

2
image/gif.h
View File

@ -9,7 +9,7 @@
#define _NETSURF_IMAGE_GIF_H_
#include <stdbool.h>
#include "netsurf/image/gifread.h"
#include "image/gifread.h"
struct content;

4
image/gifread.c
View File

@ -11,8 +11,8 @@
#include <string.h>
#include <stdlib.h>
#include "gifread.h"
#include "netsurf/image/bitmap.h"
#include "netsurf/utils/log.h"
#include "image/bitmap.h"
#include "utils/log.h"
/* READING GIF FILES
=================

2
image/gifread.h
View File

@ -13,7 +13,7 @@
#define _NETSURF_IMAGE_GIFREAD_H_
#include <stdbool.h>
#include "netsurf/image/bitmap.h"
#include "image/bitmap.h"
/* Error return values
*/

18
image/ico.c
View File

@ -9,15 +9,15 @@
#include <string.h>
#include <stdbool.h>
#include <stdlib.h>
#include "netsurf/utils/config.h"
#include "netsurf/content/content.h"
#include "netsurf/desktop/plotters.h"
#include "netsurf/image/bitmap.h"
#include "netsurf/image/bmpread.h"
#include "netsurf/image/ico.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/utils.h"
#include "utils/config.h"
#include "content/content.h"
#include "desktop/plotters.h"
#include "image/bitmap.h"
#include "image/bmpread.h"
#include "image/ico.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
#ifdef WITH_BMP

2
image/ico.h
View File

@ -9,7 +9,7 @@
#define _NETSURF_IMAGE_ICO_H_
#include <stdbool.h>
#include "netsurf/image/bmpread.h"
#include "image/bmpread.h"
struct content;

16
image/jpeg.c
View File

@ -19,14 +19,14 @@
#include <stdlib.h>
#define JPEG_INTERNAL_OPTIONS
#include "jpeglib.h"
#include "netsurf/utils/config.h"
#include "netsurf/content/content.h"
#include "netsurf/desktop/plotters.h"
#include "netsurf/image/bitmap.h"
#include "netsurf/image/jpeg.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/utils.h"
#include "utils/config.h"
#include "content/content.h"
#include "desktop/plotters.h"
#include "image/bitmap.h"
#include "image/jpeg.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
/* We prefer the library to be configured with these options to save

22
image/mng.c
View File

@ -15,17 +15,17 @@
#include <stdlib.h>
#include <sys/time.h>
#include <time.h>
#include "libmng.h"
#include "netsurf/utils/config.h"
#include "netsurf/content/content.h"
#include "netsurf/desktop/browser.h"
#include "netsurf/desktop/options.h"
#include "netsurf/desktop/plotters.h"
#include "netsurf/image/bitmap.h"
#include "netsurf/image/mng.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/utils.h"
#include <libmng.h>
#include "utils/config.h"
#include "content/content.h"
#include "desktop/browser.h"
#include "desktop/options.h"
#include "desktop/plotters.h"
#include "image/bitmap.h"
#include "image/mng.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
#ifdef WITH_MNG

2
image/mng.h
View File

@ -13,7 +13,7 @@
#define _NETSURF_IMAGE_MNG_H_
#include <stdbool.h>
#include "libmng.h"
#include <libmng.h>
struct content;

12
makefile
View File

@ -121,17 +121,17 @@ WARNFLAGS = -W -Wall -Wundef -Wpointer-arith -Wcast-qual \
# PLATFORM_CFLAGS variables are defined in them
CFLAGS_RISCOS = -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE -Driscos -DBOOL_DEFINED -O \
$(WARNFLAGS) -I.. $(PLATFORM_CFLAGS_RISCOS) -mpoke-function-name \
# -include netsurf/utils/memdebug.h
$(WARNFLAGS) -I. $(PLATFORM_CFLAGS_RISCOS) -mpoke-function-name \
# -include utils/memdebug.h
CFLAGS_RISCOS_SMALL = $(CFLAGS_RISCOS) -Dsmall
CFLAGS_NCOS = $(CFLAGS_RISCOS) -Dncos
CFLAGS_DEBUG = -std=c99 -D_BSD_SOURCE -DDEBUG_BUILD $(WARNFLAGS) -I.. \
CFLAGS_DEBUG = -std=c99 -D_BSD_SOURCE -DDEBUG_BUILD $(WARNFLAGS) -I. \
$(PLATFORM_CFLAGS_DEBUG) -g
CFLAGS_GTK = -std=c99 -Dgtk -Dnsgtk \
-D_BSD_SOURCE \
-DGTK_DISABLE_DEPRECATED \
-D_POSIX_C_SOURCE \
$(WARNFLAGS) -I.. -g -O2 -Wformat=2 \
$(WARNFLAGS) -I. -g -O2 -Wformat=2 \
`pkg-config --cflags libglade-2.0 gtk+-2.0` `xml2-config --cflags`
# Stop GCC under Cygwin throwing a fit
@ -209,10 +209,10 @@ $(OBJDIR_NCOS)/%.o : %.s
# available), remove */*.[ch] from the line below.
# Under RISC OS, you may require *Set UnixFS$sfix "", if perl gives
# "No such file or directory" errors.
depend: */*.[ch]
depend: css/css_enum.c css/parser.c css/scanner.c utils/translit.c */*.[ch]
@echo "--> modified files $?"
@echo "--> updating dependencies"
@-mkdir -p $(OBJDIR_RISCOS) $(OBJDIR_RISCOS_SMALL) $(OBJDIR_NCOS) $(OBJDIR_DEBUG) $(OBJDIR_GTK)
@perl scandeps netsurf $(OBJDIR_RISCOS) $(OBJDIR_RISCOS_SMALL) $(OBJDIR_NCOS) $(OBJDIR_DEBUG) $(OBJDIR_GTK) -- $^ > depend
@perl scandeps $(OBJDIR_RISCOS) $(OBJDIR_RISCOS_SMALL) $(OBJDIR_NCOS) $(OBJDIR_DEBUG) $(OBJDIR_GTK) -- $^ > depend
include depend

2
posix.mk
View File

@ -30,7 +30,7 @@ NCRUNIMAGE = !NCNetSurf/!RunImage,ff8
# special cases - in here, cos RISC OS can't cope :(
css/css_enum.c css/css_enum.h: css/css_enums css/makeenum
cd ..; perl netsurf/css/makeenum netsurf/css/css_enum < netsurf/css/css_enums
perl css/makeenum css/css_enum < css/css_enums
css/parser.c css/parser.h: css/parser.y
-cd css; lemon parser.y
css/scanner.c: css/scanner.l

12
render/box.c
View File

@ -14,12 +14,12 @@
#include <assert.h>
#include <stdbool.h>
#include <string.h>
#include "netsurf/content/content.h"
#include "netsurf/css/css.h"
#include "netsurf/render/box.h"
#include "netsurf/render/form.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/talloc.h"
#include "content/content.h"
#include "css/css.h"
#include "render/box.h"
#include "render/form.h"
#include "utils/log.h"
#include "utils/talloc.h"
static bool box_contains_point(struct box *box, int x, int y);

2
render/box.h
View File

@ -77,7 +77,7 @@
#include <limits.h>
#include <stdbool.h>
#include "libxml/HTMLparser.h"
#include <libxml/HTMLparser.h>
struct box;

32
render/box_construct.c
View File

@ -20,25 +20,25 @@
#include <stdlib.h>
#include <string.h>
#include <strings.h>
#include "libxml/HTMLparser.h"
#include "libxml/parserInternals.h"
#include "netsurf/utils/config.h"
#include "netsurf/content/content.h"
#include "netsurf/css/css.h"
#include "netsurf/desktop/browser.h"
#include "netsurf/desktop/options.h"
#include "netsurf/render/box.h"
#include "netsurf/render/form.h"
#include "netsurf/render/html.h"
#include <libxml/HTMLparser.h>
#include <libxml/parserInternals.h>
#include "utils/config.h"
#include "content/content.h"
#include "css/css.h"
#include "desktop/browser.h"
#include "desktop/options.h"
#include "render/box.h"
#include "render/form.h"
#include "render/html.h"
#ifdef riscos
#include "netsurf/desktop/gui.h"
#include "desktop/gui.h"
#endif
//#define NDEBUG
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/talloc.h"
#include "netsurf/utils/url.h"
#include "netsurf/utils/utils.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
#include "utils/url.h"
#include "utils/utils.h"
static const content_type image_types[] = {

12
render/box_normalise.c
View File

@ -14,15 +14,15 @@
#include <assert.h>
#include <stdbool.h>
#include "netsurf/css/css.h"
#include "netsurf/render/box.h"
#include "netsurf/render/table.h"
#include "css/css.h"
#include "render/box.h"
#include "render/table.h"
#ifdef riscos
#include "netsurf/desktop/gui.h"
#include "desktop/gui.h"
#endif
#define NDEBUG
#include "netsurf/utils/log.h"
#include "netsurf/utils/talloc.h"
#include "utils/log.h"
#include "utils/talloc.h"
struct span_info {

12
render/directory.c
View File

@ -16,12 +16,12 @@
#include <stdlib.h>
#include <sys/stat.h>
#include <time.h>
#include "libxml/HTMLparser.h"
#include "netsurf/content/content.h"
#include "netsurf/render/directory.h"
#include "netsurf/render/html.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/url.h"
#include <libxml/HTMLparser.h>
#include "content/content.h"
#include "render/directory.h"
#include "render/html.h"
#include "utils/messages.h"
#include "utils/url.h"
#define MAX_LENGTH 2048

2
render/directory.h
View File

@ -15,7 +15,7 @@
#define _NETSURF_RENDER_DIRECTORY_H_
#include <stdbool.h>
#include "netsurf/content/content_type.h"
#include "content/content_type.h"
bool directory_create(struct content *c, const char *params[]);

12
render/form.c
View File

@ -18,12 +18,12 @@
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
#include "netsurf/render/box.h"
#include "netsurf/render/form.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/url.h"
#include "netsurf/utils/utf8.h"
#include "netsurf/utils/utils.h"
#include "render/box.h"
#include "render/form.h"
#include "utils/log.h"
#include "utils/url.h"
#include "utils/utf8.h"
#include "utils/utils.h"
static char *form_textarea_value(struct form_control *textarea);

2
render/form.h
View File

@ -14,7 +14,7 @@
#define _NETSURF_RENDER_FORM_H_
#include <stdbool.h>
#include "netsurf/utils/config.h"
#include "utils/config.h"
struct box;
struct form_control;

36
render/html.c
View File

@ -15,24 +15,24 @@
#include <string.h>
#include <strings.h>
#include <stdlib.h>
#include "libxml/parserInternals.h"
#include "netsurf/utils/config.h"
#include "netsurf/content/content.h"
#include "netsurf/content/fetch.h"
#include "netsurf/content/fetchcache.h"
#include "netsurf/desktop/browser.h"
#include "netsurf/desktop/gui.h"
#include "netsurf/desktop/options.h"
#include "netsurf/render/box.h"
#include "netsurf/render/font.h"
#include "netsurf/render/html.h"
#include "netsurf/render/imagemap.h"
#include "netsurf/render/layout.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/talloc.h"
#include "netsurf/utils/url.h"
#include "netsurf/utils/utils.h"
#include <libxml/parserInternals.h>
#include "utils/config.h"
#include "content/content.h"
#include "content/fetch.h"
#include "content/fetchcache.h"
#include "desktop/browser.h"
#include "desktop/gui.h"
#include "desktop/options.h"
#include "render/box.h"
#include "render/font.h"
#include "render/html.h"
#include "render/imagemap.h"
#include "render/layout.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
#include "utils/url.h"
#include "utils/utils.h"
#define CHUNK 4096

6
render/html.h
View File

@ -15,9 +15,9 @@
#define _NETSURF_RENDER_HTML_H_
#include <stdbool.h>
#include "libxml/HTMLparser.h"
#include "netsurf/content/content_type.h"
#include "netsurf/css/css.h"
#include <libxml/HTMLparser.h>
#include "content/content_type.h"
#include "css/css.h"
struct box;
struct rect;

32
render/html_redraw.c
View File

@ -12,22 +12,22 @@
#include <assert.h>
#include <stdbool.h>
#include <string.h>
#include "netsurf/utils/config.h"
#include "netsurf/content/content.h"
#include "netsurf/css/css.h"
#include "netsurf/desktop/gui.h"
#include "netsurf/desktop/plotters.h"
#include "netsurf/desktop/knockout.h"
#include "netsurf/desktop/selection.h"
#include "netsurf/desktop/textinput.h"
#include "netsurf/desktop/options.h"
#include "netsurf/render/box.h"
#include "netsurf/render/font.h"
#include "netsurf/render/form.h"
#include "netsurf/render/layout.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/utils.h"
#include "utils/config.h"
#include "content/content.h"
#include "css/css.h"
#include "desktop/gui.h"
#include "desktop/plotters.h"
#include "desktop/knockout.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
#include "desktop/options.h"
#include "render/box.h"
#include "render/font.h"
#include "render/form.h"
#include "render/layout.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
static bool html_redraw_box(struct box *box,

10
render/imagemap.c
View File

@ -10,11 +10,11 @@
#include <assert.h>
#include <stdbool.h>
#include <string.h>
#include "netsurf/content/content.h"
#include "netsurf/render/box.h"
#include "netsurf/render/imagemap.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/utils.h"
#include "content/content.h"
#include "render/box.h"
#include "render/imagemap.h"
#include "utils/log.h"
#include "utils/utils.h"
#define HASH_SIZE 31 /* fixed size hash table */

2
render/imagemap.h
View File

@ -8,7 +8,7 @@
#ifndef _NETSURF_RENDER_IMAGEMAP_H_
#define _NETSURF_RENDER_IMAGEMAP_H_
#include "libxml/HTMLtree.h"
#include <libxml/HTMLtree.h>
struct content;

20
render/layout.c
View File

@ -27,19 +27,19 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "netsurf/css/css.h"
#include "netsurf/content/content.h"
#include "css/css.h"
#include "content/content.h"
#ifdef riscos
#include "netsurf/desktop/gui.h"
#include "desktop/gui.h"
#endif
#include "netsurf/desktop/options.h"
#include "netsurf/render/box.h"
#include "netsurf/render/font.h"
#include "netsurf/render/layout.h"
#include "desktop/options.h"
#include "render/box.h"
#include "render/font.h"
#include "render/layout.h"
#define NDEBUG
#include "netsurf/utils/log.h"
#include "netsurf/utils/talloc.h"
#include "netsurf/utils/utils.h"
#include "utils/log.h"
#include "utils/talloc.h"
#include "utils/utils.h"
#define AUTO INT_MIN

6
render/list.c
View File

@ -12,9 +12,9 @@
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include "netsurf/css/css.h"
#include "netsurf/render/list.h"
#include "netsurf/utils/log.h"
#include "css/css.h"
#include "render/list.h"
#include "utils/log.h"
struct list_counter {

10
render/table.c
View File

@ -11,12 +11,12 @@
*/
#include <assert.h>
#include "netsurf/css/css.h"
#include "netsurf/render/box.h"
#include "netsurf/render/table.h"
#include "css/css.h"
#include "render/box.h"
#include "render/table.h"
#define NDEBUG
#include "netsurf/utils/log.h"
#include "netsurf/utils/talloc.h"
#include "utils/log.h"
#include "utils/talloc.h"
static void table_collapse_borders_h(struct box *parent, struct box *child,

26
render/textplain.c
View File

@ -14,19 +14,19 @@
#include <errno.h>
#include <stddef.h>
#include <iconv.h>
#include "netsurf/content/content.h"
#include "netsurf/css/css.h"
#include "netsurf/desktop/gui.h"
#include "netsurf/desktop/plotters.h"
#include "netsurf/desktop/selection.h"
#include "netsurf/render/box.h"
#include "netsurf/render/font.h"
#include "netsurf/render/textplain.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/talloc.h"
#include "netsurf/utils/utils.h"
#include "netsurf/utils/utf8.h"
#include "content/content.h"
#include "css/css.h"
#include "desktop/gui.h"
#include "desktop/plotters.h"
#include "desktop/selection.h"
#include "render/box.h"
#include "render/font.h"
#include "render/textplain.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
#include "utils/utils.h"
#include "utils/utf8.h"
#define CHUNK 20480

4
riscos.mk
View File

@ -19,9 +19,7 @@ NCRUNIMAGE = !NCNetSurf/!RunImage
# special cases
css/css_enum.c css/css_enum.h: css/css_enums css/makeenum
@dir ^
perl netsurf/css/makeenum netsurf/css/css_enum < netsurf/css/css_enums
@dir netsurf
perl css/makeenum css/css_enum < css/css_enums
css/parser.c css/parser.h: css/parser.y
@dir css
-lemon parser.y

24
riscos/401login.c
View File

@ -11,18 +11,18 @@
#include <stdbool.h>
#include <string.h>
#include "oslib/wimp.h"
#include "netsurf/utils/config.h"
#include "netsurf/content/content.h"
#include "netsurf/content/urldb.h"
#include "netsurf/desktop/browser.h"
#include "netsurf/desktop/401login.h"
#include "netsurf/desktop/gui.h"
#include "netsurf/riscos/dialog.h"
#include "netsurf/riscos/wimp_event.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/url.h"
#include "netsurf/utils/utils.h"
#include "utils/config.h"
#include "content/content.h"
#include "content/urldb.h"
#include "desktop/browser.h"
#include "desktop/401login.h"
#include "desktop/gui.h"
#include "riscos/dialog.h"
#include "riscos/wimp_event.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/url.h"
#include "utils/utils.h"
#ifdef WITH_AUTH

16
riscos/artworks.c
View File

@ -17,14 +17,14 @@
#include "swis.h"
#include "oslib/os.h"
#include "oslib/wimp.h"
#include "netsurf/utils/config.h"
#include "netsurf/desktop/plotters.h"
#include "netsurf/content/content.h"
#include "netsurf/riscos/artworks.h"
#include "netsurf/riscos/gui.h"
#include "netsurf/utils/utils.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/log.h"
#include "utils/config.h"
#include "desktop/plotters.h"
#include "content/content.h"
#include "riscos/artworks.h"
#include "riscos/gui.h"
#include "utils/utils.h"
#include "utils/messages.h"
#include "utils/log.h"
#ifdef WITH_ARTWORKS

24
riscos/bitmap.c
View File

@ -19,18 +19,18 @@
#include <swis.h>
#include <unixlib/local.h>
#include "oslib/osfile.h"
#include "oslib/osspriteop.h"
#include "netsurf/content/content.h"
#include "netsurf/image/bitmap.h"
#include "netsurf/riscos/bitmap.h"
#include "netsurf/riscos/image.h"
#include "netsurf/riscos/options.h"
#include "netsurf/riscos/palettes.h"
#include "netsurf/riscos/sprite.h"
#include "netsurf/riscos/tinct.h"
#include "netsurf/utils/filename.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/utils.h"
#include <oslib/osspriteop.h>
#include "content/content.h"
#include "image/bitmap.h"
#include "riscos/bitmap.h"
#include "riscos/image.h"
#include "riscos/options.h"
#include "riscos/palettes.h"
#include "riscos/sprite.h"
#include "riscos/tinct.h"
#include "utils/filename.h"
#include "utils/log.h"
#include "utils/utils.h"
/** Colour in the overlay sprite that allows the bitmap to show through */
#define OVERLAY_INDEX 0xfe

4
riscos/bitmap.h
View File

@ -8,8 +8,8 @@
#ifndef _NETSURF_RISCOS_BITMAP_H_
#define _NETSURF_RISCOS_BITMAP_H_
#include "oslib/osspriteop.h"
#include "netsurf/image/bitmap.h"
#include <oslib/osspriteop.h>
#include "image/bitmap.h"
struct osspriteop_area;

14
riscos/buffer.c
View File

@ -11,15 +11,15 @@
#include <swis.h>
#include "oslib/colourtrans.h"
#include "oslib/os.h"
#include "oslib/osspriteop.h"
#include <oslib/osspriteop.h>
#include "oslib/wimp.h"
#include "oslib/wimpreadsysinfo.h"
#include "netsurf/riscos/buffer.h"
#include "netsurf/riscos/gui.h"
#include "netsurf/riscos/options.h"
#include "netsurf/riscos/tinct.h"
#include "netsurf/riscos/wimp.h"
#include "netsurf/utils/log.h"
#include "riscos/buffer.h"
#include "riscos/gui.h"
#include "riscos/options.h"
#include "riscos/tinct.h"
#include "riscos/wimp.h"
#include "utils/log.h"
//#define NDEBUG
#define BUFFER_EXCLUSIVE_USER_REDRAW "Only support pure user redraw (faster)"
//#define BUFFER_EMULATE_32BPP "Redirect to a 32bpp sprite and plot with Tinct"

16
riscos/configure.c
View File

@ -18,14 +18,14 @@
#include "oslib/osbyte.h"
#include "oslib/territory.h"
#include "oslib/wimp.h"
#include "netsurf/riscos/dialog.h"
#include "netsurf/riscos/configure.h"
#include "netsurf/riscos/wimp.h"
#include "netsurf/riscos/wimp_event.h"
#include "netsurf/riscos/configure/configure.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/utils.h"
#include "netsurf/utils/messages.h"
#include "riscos/dialog.h"
#include "riscos/configure.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/configure/configure.h"
#include "utils/log.h"
#include "utils/utils.h"
#include "utils/messages.h"
#define CONFIGURE_ICON_PADDING_H 32
#define CONFIGURE_ICON_PADDING_V 32

22
riscos/configure/con_cache.c
View File

@ -6,17 +6,17 @@
*/
#include "oslib/hourglass.h"
#include "netsurf/desktop/options.h"
#include "netsurf/riscos/dialog.h"
#include "netsurf/riscos/gui.h"
#include "netsurf/riscos/options.h"
#include "netsurf/riscos/wimp.h"
#include "netsurf/riscos/wimp_event.h"
#include "netsurf/riscos/configure.h"
#include "netsurf/riscos/configure/configure.h"
#include "netsurf/utils/filename.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/utils.h"
#include "desktop/options.h"
#include "riscos/dialog.h"
#include "riscos/gui.h"
#include "riscos/options.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/configure.h"
#include "riscos/configure/configure.h"
#include "utils/filename.h"
#include "utils/messages.h"
#include "utils/utils.h"
#define CACHE_MEMORY_SIZE 3

22
riscos/configure/con_connect.c
View File

@ -7,18 +7,18 @@
#include <stdbool.h>
#include <swis.h>
#include "oslib/osspriteop.h"
#include <oslib/osspriteop.h>
#include "oslib/wimp.h"
#include "netsurf/desktop/options.h"
#include "netsurf/riscos/configure/configure.h"
#include "netsurf/riscos/dialog.h"
#include "netsurf/riscos/menus.h"
#include "netsurf/riscos/options.h"
#include "netsurf/riscos/tinct.h"
#include "netsurf/riscos/wimp.h"
#include "netsurf/riscos/wimp_event.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/utils.h"
#include "desktop/options.h"
#include "riscos/configure/configure.h"
#include "riscos/dialog.h"
#include "riscos/menus.h"
#include "riscos/options.h"
#include "riscos/tinct.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "utils/log.h"
#include "utils/utils.h"
#define CONNECTION_PROXY_FIELD 3

20
riscos/configure/con_content.c
View File

@ -5,16 +5,16 @@
* Copyright 2006 Richard Wilson <info@tinct.net>
*/
#include "netsurf/desktop/options.h"
#include "netsurf/riscos/dialog.h"
#include "netsurf/riscos/gui.h"
#include "netsurf/riscos/options.h"
#include "netsurf/riscos/wimp.h"
#include "netsurf/riscos/wimp_event.h"
#include "netsurf/riscos/configure.h"
#include "netsurf/riscos/configure/configure.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/utils.h"
#include "desktop/options.h"
#include "riscos/dialog.h"
#include "riscos/gui.h"
#include "riscos/options.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/configure.h"
#include "riscos/configure/configure.h"
#include "utils/messages.h"
#include "utils/utils.h"
#define CONTENT_BLOCK_ADVERTISEMENTS 2

24
riscos/configure/con_fonts.c
View File

@ -5,18 +5,18 @@
* Copyright 2005 Richard Wilson <info@tinct.net>
*/
#include "netsurf/css/css.h"
#include "netsurf/desktop/options.h"
#include "netsurf/riscos/dialog.h"
#include "netsurf/riscos/gui.h"
#include "netsurf/riscos/menus.h"
#include "netsurf/riscos/options.h"
#include "netsurf/riscos/wimp.h"
#include "netsurf/riscos/wimp_event.h"
#include "netsurf/riscos/configure.h"
#include "netsurf/riscos/configure/configure.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/utils.h"
#include "css/css.h"
#include "desktop/options.h"
#include "riscos/dialog.h"
#include "riscos/gui.h"
#include "riscos/menus.h"
#include "riscos/options.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/configure.h"
#include "riscos/configure/configure.h"
#include "utils/messages.h"
#include "utils/utils.h"
#define FONT_SANS_FIELD 3

22
riscos/configure/con_home.c
View File

@ -5,17 +5,17 @@
* Copyright 2005 Richard Wilson <info@tinct.net>
*/
#include "netsurf/desktop/options.h"
#include "netsurf/riscos/dialog.h"
#include "netsurf/riscos/gui.h"
#include "netsurf/riscos/menus.h"
#include "netsurf/riscos/options.h"
#include "netsurf/riscos/wimp.h"
#include "netsurf/riscos/wimp_event.h"
#include "netsurf/riscos/configure.h"
#include "netsurf/riscos/configure/configure.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/utils.h"
#include "desktop/options.h"
#include "riscos/dialog.h"
#include "riscos/gui.h"
#include "riscos/menus.h"
#include "riscos/options.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/configure.h"
#include "riscos/configure/configure.h"
#include "utils/messages.h"
#include "utils/utils.h"
#define HOME_URL_FIELD 3

22
riscos/configure/con_image.c
View File

@ -7,18 +7,18 @@
#include <stdbool.h>
#include <swis.h>
#include "oslib/osspriteop.h"
#include <oslib/osspriteop.h>
#include "oslib/wimp.h"
#include "netsurf/desktop/options.h"
#include "netsurf/riscos/configure/configure.h"
#include "netsurf/riscos/dialog.h"
#include "netsurf/riscos/menus.h"
#include "netsurf/riscos/options.h"
#include "netsurf/riscos/tinct.h"
#include "netsurf/riscos/wimp.h"
#include "netsurf/riscos/wimp_event.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/utils.h"
#include "desktop/options.h"
#include "riscos/configure/configure.h"
#include "riscos/dialog.h"
#include "riscos/menus.h"
#include "riscos/options.h"
#include "riscos/tinct.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "utils/log.h"
#include "utils/utils.h"
#define IMAGE_FOREGROUND_FIELD 3

Some files were not shown because too many files have changed in this diff Show More