mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Amiga changes for core search update (r12646). Note: untested. 

svn path=/trunk/netsurf/; revision=12650
This commit is contained in:
Michael Drake 2011-08-24 12:33:15 +00:00
parent 4adcb4277f
commit f3deebaa8e
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
amiga/search.c
View File

@ -100,23 +100,15 @@ static struct search_callbacks ami_search_callbacks = {
*/
void ami_search_open(struct gui_window *gwin)
{
struct hlcache_handle *c = gwin->shared->bw->current_content;
/* only handle html/textplain contents */
if ((!c) || (content_get_type(c) != CONTENT_HTML &&
content_get_type(c) != CONTENT_TEXTPLAIN))
if (browser_window_search_create_context(gwin->shared->bw,
&ami_search_callbacks, NULL) == false)
return;
if (gwin->shared->bw->search_context == NULL)
search_create_context(gwin->shared->bw,
&ami_search_callbacks, NULL);
search_insert = true;
if(fwin)
{
if(fwin->gwin->shared->bw->search_context != NULL)
search_destroy_context(fwin->gwin->shared->bw->
search_context);
browser_window_search_destroy_context(fwin->gwin->shared->bw);
ami_search_set_forward_state(true, NULL);
ami_search_set_back_state(true, NULL);
fwin->gwin->shared->searchwin = NULL;
@ -200,8 +192,7 @@ void ami_search_open(struct gui_window *gwin)
void ami_search_close(void)
{
if (fwin->gwin->shared->bw->search_context != NULL)
search_destroy_context(fwin->gwin->shared->bw->search_context);
browser_window_search_destroy_context(fwin->gwin->shared->bw);
ami_search_set_forward_state(true, NULL);
ami_search_set_back_state(true, NULL);
fwin->gwin->shared->searchwin = NULL;
@ -229,10 +220,11 @@ BOOL ami_search_event(void)
search_insert = true;
flags = SEARCH_FLAG_FORWARDS |
ami_search_flags();
if (search_verify_new(
if (browser_window_search_verify_new(
fwin->gwin->shared->bw,
&ami_search_callbacks, NULL))
search_step(fwin->gwin->shared->bw->search_context,
browser_window_search_step(
fwin->gwin->shared->bw,
flags,
ami_search_string());
ActivateWindow(fwin->gwin->shared->win);
@ -242,23 +234,19 @@ BOOL ami_search_event(void)
search_insert = true;
flags = ~SEARCH_FLAG_FORWARDS &
ami_search_flags();
if (search_verify_new(
if (browser_window_search_verify_new(
fwin->gwin->shared->bw,
&ami_search_callbacks, NULL))
search_step(fwin->gwin->shared->bw->search_context,
flags,
ami_search_string());
browser_window_search_step(
fwin->gwin->shared->bw,
flags,
ami_search_string());
ActivateWindow(fwin->gwin->shared->win);
break;
case GID_SEARCHSTRING:
if (fwin->gwin->shared->
bw->search_context
!= NULL)
search_destroy_context(
fwin->gwin->
shared->bw->
search_context);
browser_window_search_destroy_context(
fwin->gwin->shared->bw);
ami_search_set_forward_state(
true, NULL);
ami_search_set_back_state(