diff options
author | Michael Drake <tlsa@netsurf-browser.org> | 2011-08-24 12:29:30 +0000 |
---|---|---|
committer | Michael Drake <tlsa@netsurf-browser.org> | 2011-08-24 12:29:30 +0000 |
commit | 63c07ee28d890c4afd83233bb055d482b92162c9 (patch) | |
tree | f2fd049d8603c4d9c52b906358b061ebc1e78a84 /desktop/search.h | |
parent | 85ec83636d60fe945bc3df00cb20d9a850ce7ae8 (diff) | |
download | netsurf-63c07ee28d890c4afd83233bb055d482b92162c9.tar.gz netsurf-63c07ee28d890c4afd83233bb055d482b92162c9.tar.bz2 |
Core part of search improvement:
+ Split up browser window and content related elements of html & text search.
+ Associate search contexts with contents, rather than browser windows.
+ Remove highlighting of search terms dependency on current_redraw_browser.
+ Fixes issues with search contexts being applied to the wrong content.
svn path=/trunk/netsurf/; revision=12646
Diffstat (limited to 'desktop/search.h')
-rw-r--r-- | desktop/search.h | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/desktop/search.h b/desktop/search.h index ad72ddacd..f774f73df 100644 --- a/desktop/search.h +++ b/desktop/search.h @@ -29,11 +29,6 @@ typedef enum { SEARCH_FLAG_FORWARDS = (1 << 1), SEARCH_FLAG_SHOWALL = (1 << 2) } search_flags_t; - -/** - * called to clear the context; 'renews' the search too - */ -void search_destroy_context(struct search_context *context); /** * Change the displayed search status. @@ -80,17 +75,14 @@ struct search_callbacks { search_add_recent_callback add_recent; }; -bool search_verify_new(struct browser_window *bw, - struct search_callbacks *callbacks, void *p); -void search_step(struct search_context *context, search_flags_t flags, - const char * string); -bool search_create_context(struct browser_window *bw, - struct search_callbacks *callbacks, void *p); -void search_show_all(bool all, struct search_context *context); -bool search_term_highlighted(struct browser_window *bw, - unsigned start_offset, unsigned end_offset, - unsigned *start_idx, unsigned *end_idx, - struct search_context *context); +bool browser_window_search_create_context(struct browser_window *bw, + struct search_callbacks *callbacks, void *p); +void browser_window_search_destroy_context(struct browser_window *bw); +bool browser_window_search_verify_new(struct browser_window *bw, + struct search_callbacks *callbacks, void *p); +void browser_window_search_step(struct browser_window *bw, + search_flags_t flags, const char *string); +void browser_window_search_show_all(bool all, struct browser_window *bw); #endif |