diff options
author | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2010-03-28 12:56:39 +0000 |
---|---|---|
committer | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2010-03-28 12:56:39 +0000 |
commit | 270ef59a98d34fef418fb6cd27e46f3edc912948 (patch) | |
tree | 9d363b42d441640e1d2dbff3ba548a2cdf8d67a9 /desktop/selection.c | |
parent | 21da4f5bdf74c6654730c32dfcc1c6b3d24da4b4 (diff) | |
download | netsurf-270ef59a98d34fef418fb6cd27e46f3edc912948.tar.gz netsurf-270ef59a98d34fef418fb6cd27e46f3edc912948.tar.bz2 |
Merge jmb/new-cache; r=dsilvers,rs=vince
svn path=/trunk/netsurf/; revision=10180
Diffstat (limited to 'desktop/selection.c')
-rw-r--r-- | desktop/selection.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/desktop/selection.c b/desktop/selection.c index 93f5cc1a3..821dbb9bc 100644 --- a/desktop/selection.c +++ b/desktop/selection.c @@ -27,6 +27,7 @@ #include <stdbool.h> #include <string.h> +#include "content/hlcache.h" #include "desktop/gui.h" #include "desktop/plotters.h" #include "desktop/save_text.h" @@ -155,8 +156,8 @@ void selection_reinit(struct selection *s, struct box *root) s->max_idx = selection_label_subtree(root, root_idx); } else { - struct content *c = s->bw->current_content; - if (c && c->type == CONTENT_TEXTPLAIN) + hlcache_handle *c = s->bw->current_content; + if (c && content_get_type(c) == CONTENT_TEXTPLAIN) s->max_idx = textplain_size(c); else s->max_idx = 0; @@ -560,7 +561,7 @@ bool traverse_tree(struct box *box, unsigned start_idx, unsigned end_idx, bool selection_traverse(struct selection *s, seln_traverse_handler handler, void *handle) { - struct content *c; + hlcache_handle *c; save_text_whitespace before = WHITESPACE_NONE; bool first = true; const char *text; @@ -664,8 +665,9 @@ void selection_redraw(struct selection *s, unsigned start_idx, unsigned end_idx) return; } else { - struct content *c = s->bw->current_content; - if (c && c->type == CONTENT_TEXTPLAIN && end_idx > start_idx) { + hlcache_handle *c = s->bw->current_content; + if (c && content_get_type(c) == CONTENT_TEXTPLAIN && + end_idx > start_idx) { textplain_coords_from_range(c, start_idx, end_idx, &rdw.r); rdw.inited = true; @@ -952,7 +954,7 @@ bool save_handler(const char *text, size_t length, struct box *box, bool selection_save_text(struct selection *s, const char *path) { - struct content *c = s->bw->current_content; + hlcache_handle *c = s->bw->current_content; struct save_text_state sv = { NULL, 0, 0 }; utf8_convert_ret ret; char *result; |