From 25e7c86fb7d4867be59ab2659960f2d25dd6aca5 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Tue, 28 Jun 2011 12:30:56 +0000 Subject: Make search_term_highlighted a core function. svn path=/trunk/netsurf/; revision=12524 --- desktop/gui.h | 5 ----- desktop/search.c | 6 +++--- desktop/search.h | 5 +++++ 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'desktop') diff --git a/desktop/gui.h b/desktop/gui.h index 815bbe3ca..a3c853633 100644 --- a/desktop/gui.h +++ b/desktop/gui.h @@ -135,11 +135,6 @@ void gui_create_form_select_menu(struct browser_window *bw, void gui_launch_url(const char *url); -bool gui_search_term_highlighted(struct gui_window *g, - unsigned start_offset, unsigned end_offset, - unsigned *start_idx, unsigned *end_idx, - struct search_context *context); - struct ssl_cert_info; void gui_cert_verify(const char *url, const struct ssl_cert_info *certs, diff --git a/desktop/search.c b/desktop/search.c index 790f3d4a0..977f12ebe 100644 --- a/desktop/search.c +++ b/desktop/search.c @@ -598,7 +598,7 @@ bool find_occurrences_text(const char *pattern, int p_len, * Determines whether any portion of the given text box should be * selected because it matches the current search string. * - * \param g gui window + * \param bw browser window * \param start_offset byte offset within text of string to be checked * \param end_offset byte offset within text * \param start_idx byte offset within string of highlight start @@ -606,12 +606,12 @@ bool find_occurrences_text(const char *pattern, int p_len, * \return true iff part of the box should be highlighted */ -bool gui_search_term_highlighted(struct gui_window *g, +bool search_term_highlighted(struct browser_window *bw, unsigned start_offset, unsigned end_offset, unsigned *start_idx, unsigned *end_idx, struct search_context *context) { - if (g == context->bw->window) { + if (bw == context->bw) { struct list_entry *a; for(a = context->found->next; a; a = a->next) if (a->sel && selection_defined(a->sel) && diff --git a/desktop/search.h b/desktop/search.h index 15a4f6c9e..ad72ddacd 100644 --- a/desktop/search.h +++ b/desktop/search.h @@ -88,4 +88,9 @@ 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); + #endif -- cgit v1.2.3