diff options
-rw-r--r-- | debug/netsurfd.c | 9 | ||||
-rw-r--r-- | makefile | 4 | ||||
-rw-r--r-- | render/textplain.c | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/debug/netsurfd.c b/debug/netsurfd.c index 645d43aa8..a185255cd 100644 --- a/debug/netsurfd.c +++ b/debug/netsurfd.c @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) default_stylesheet_url = malloc(200); adblock_stylesheet_url = malloc(200); getcwd(url, sizeof url); - snprintf(default_stylesheet_url, 200, "file:%s/CSS", url); + snprintf(default_stylesheet_url, 200, "file:%s/ns.css", url); snprintf(adblock_stylesheet_url, 200, "file:%s/AdBlock", url); #endif @@ -175,11 +175,11 @@ void bitmap_set_opaque(struct bitmap *bitmap, bool opaque) {} void tree_initialise_redraw(struct tree *tree) {} void tree_redraw_area(struct tree *tree, int x, int y, int width, int height) {} -void tree_draw_line(struct tree *tree, int x, int y, int width, int height) {} +void tree_draw_line(int x, int y, int width, int height) {} void tree_draw_node_element(struct tree *tree, struct node_element *element) {} void tree_draw_node_expansion(struct tree *tree, struct node *node) {} void tree_recalculate_node_element(struct node_element *element) {} -void tree_update_URL_node(struct node *node) {} +void tree_update_URL_node(struct node *node, struct url_content *data) {} void tree_resized(struct tree *tree) {} void tree_set_node_sprite_folder(struct node *node) {} @@ -191,7 +191,8 @@ void schedule_run(void) {} bool selection_highlighted(struct selection *s, struct box *box, unsigned *start_idx, unsigned *end_idx) { return false; } -bool gui_search_term_highlighted(struct gui_window *g, struct box *box, +bool gui_search_term_highlighted(struct gui_window *g, + unsigned start_offset, unsigned end_offset, unsigned *start_idx, unsigned *end_idx) { return false; } const char *local_encoding_name(void) { return "ISO-8859-1"; } @@ -115,10 +115,10 @@ CFLAGS_RISCOS = -std=c9x -D_BSD_SOURCE -Driscos -DBOOL_DEFINED -O \ # -include netsurf/utils/memdebug.h CFLAGS_RISCOS_SMALL = $(CFLAGS_RISCOS) -Dsmall CFLAGS_NCOS = $(CFLAGS_RISCOS) -Dncos -CFLAGS_DEBUG = -std=c9x -D_BSD_SOURCE -Ddebug $(WARNFLAGS) -I.. \ +CFLAGS_DEBUG = -std=c9x -D_BSD_SOURCE -DDEBUG_BUILD $(WARNFLAGS) -I.. \ $(PLATFORM_CFLAGS_DEBUG) -g CFLAGS_GTK = -std=c9x -D_BSD_SOURCE -D_POSIX_C_SOURCE -Dgtk \ - $(WARNFLAGS) -I.. -g \ + $(WARNFLAGS) -I.. -g -O \ `pkg-config --cflags gtk+-2.0` `xml2-config --cflags` AFLAGS_RISCOS = -I..,. $(PLATFORM_AFLAGS_RISCOS) diff --git a/render/textplain.c b/render/textplain.c index d7561abd1..653ea943b 100644 --- a/render/textplain.c +++ b/render/textplain.c @@ -355,7 +355,7 @@ bool textplain_redraw(struct content *c, int x, int y, * \return ptr to start of line containing (or nearest to) point */ -unsigned textplain_offset_from_coords(struct content *c, int x, int y, int dir) +size_t textplain_offset_from_coords(struct content *c, int x, int y, int dir) { float line_height = css_len2px(&textplain_style.font_size.value.length, &textplain_style) * 1.2; |