Implemented Search Dialog

svn path=/trunk/netsurf/; revision=11536

53 files changed, 283 insertions, 4 deletions

diff --git a/atari/bitmap.c b/atari/bitmap.c
index d6bd13667..d6bd13667 100644..100755
--- a/atari/bitmap.c
+++ b/atari/bitmap.c
diff --git a/atari/bitmap.h b/atari/bitmap.h
index a1e381095..a1e381095 100644..100755
--- a/atari/bitmap.h
+++ b/atari/bitmap.h
diff --git a/atari/browser.c b/atari/browser.c
index ff92e360d..ff92e360d 100644..100755
--- a/atari/browser.c
+++ b/atari/browser.c
diff --git a/atari/browser.h b/atari/browser.h
index 3c71238d0..3c71238d0 100644..100755
--- a/atari/browser.h
+++ b/atari/browser.h
diff --git a/atari/browser_win.c b/atari/browser_win.c
index 9baa2b368..9baa2b368 100644..100755
--- a/atari/browser_win.c
+++ b/atari/browser_win.c
diff --git a/atari/browser_win.h b/atari/browser_win.h
index 61f98bb64..61f98bb64 100644..100755
--- a/atari/browser_win.h
+++ b/atari/browser_win.h
diff --git a/atari/clipboard.h b/atari/clipboard.h
index e505d9f6d..e505d9f6d 100644..100755
--- a/atari/clipboard.h
+++ b/atari/clipboard.h
diff --git a/atari/download.c b/atari/download.c
index b03af177c..b03af177c 100644..100755
--- a/atari/download.c
+++ b/atari/download.c
diff --git a/atari/download.h b/atari/download.h
index e6bff590a..e6bff590a 100644..100755
--- a/atari/download.h
+++ b/atari/download.h
diff --git a/atari/filetype.c b/atari/filetype.c
index 85cfc59cd..85cfc59cd 100644..100755
--- a/atari/filetype.c
+++ b/atari/filetype.c
diff --git a/atari/findfile.h b/atari/findfile.h
index de02608f6..de02608f6 100644..100755
--- a/atari/findfile.h
+++ b/atari/findfile.h
diff --git a/atari/font.c b/atari/font.c
index fb23abd26..fb23abd26 100644..100755
--- a/atari/font.c
+++ b/atari/font.c
diff --git a/atari/font.h b/atari/font.h
index 72271803e..72271803e 100644..100755
--- a/atari/font.h
+++ b/atari/font.h
diff --git a/atari/global_evnt.c b/atari/global_evnt.c
index 95dbdba6d..95dbdba6d 100644..100755
--- a/atari/global_evnt.c
+++ b/atari/global_evnt.c
diff --git a/atari/global_evnt.h b/atari/global_evnt.h
index e9e343696..e9e343696 100644..100755
--- a/atari/global_evnt.h
+++ b/atari/global_evnt.h
diff --git a/atari/gui.c b/atari/gui.c
index 962570e57..c7147bb39 100644..100755
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -1130,7 +1130,7 @@ int main(int argc, char** argv)
 	netsurf_init(&argc, &argv, options, messages);

 	gui_init(argc, argv);

 	gui_init2(argc, argv);

-	browser_window_create(cfg_homepage_url, 0, 0, true, false);

+	//browser_window_create(cfg_homepage_url, 0, 0, true, false);

 	graf_mouse( ARROW , NULL);

 	netsurf_main_loop();

 	netsurf_exit();

diff --git a/atari/gui.h b/atari/gui.h
index dad25fa80..dad25fa80 100644..100755
--- a/atari/gui.h
+++ b/atari/gui.h
diff --git a/atari/history.c b/atari/history.c
index b26257475..b26257475 100644..100755
--- a/atari/history.c
+++ b/atari/history.c
diff --git a/atari/history.h b/atari/history.h
index 5899e4cf9..5899e4cf9 100644..100755
--- a/atari/history.h
+++ b/atari/history.h
diff --git a/atari/hotlist.c b/atari/hotlist.c
index e060c4a3d..e060c4a3d 100644..100755
--- a/atari/hotlist.c
+++ b/atari/hotlist.c
diff --git a/atari/hotlist.h b/atari/hotlist.h
index 78a88e27c..78a88e27c 100644..100755
--- a/atari/hotlist.h
+++ b/atari/hotlist.h
diff --git a/atari/login.c b/atari/login.c
index 2dc766f56..2dc766f56 100644..100755
--- a/atari/login.c
+++ b/atari/login.c
diff --git a/atari/login.h b/atari/login.h
index 52a4832c9..52a4832c9 100644..100755
--- a/atari/login.h
+++ b/atari/login.h
diff --git a/atari/misc.c b/atari/misc.c
index 5bfdd7f59..5bfdd7f59 100644..100755
--- a/atari/misc.c
+++ b/atari/misc.c
diff --git a/atari/misc.h b/atari/misc.h
index 852a93236..852a93236 100644..100755
--- a/atari/misc.h
+++ b/atari/misc.h
diff --git a/atari/options.h b/atari/options.h
index 3425930fb..3425930fb 100644..100755
--- a/atari/options.h
+++ b/atari/options.h
diff --git a/atari/plot.c b/atari/plot.c
index 1dd807356..1dd807356 100644..100755
--- a/atari/plot.c
+++ b/atari/plot.c
diff --git a/atari/plot.h b/atari/plot.h
index ed86041e5..ed86041e5 100644..100755
--- a/atari/plot.h
+++ b/atari/plot.h
diff --git a/atari/plot/eddi.h b/atari/plot/eddi.h
index 7d6b90d4b..7d6b90d4b 100644..100755
--- a/atari/plot/eddi.h
+++ b/atari/plot/eddi.h
diff --git a/atari/plot/eddi.s b/atari/plot/eddi.s
index f0ea18a1e..f0ea18a1e 100644..100755
--- a/atari/plot/eddi.s
+++ b/atari/plot/eddi.s
diff --git a/atari/plot/font_freetype.c b/atari/plot/font_freetype.c
index 0a1addfdf..0a1addfdf 100644..100755
--- a/atari/plot/font_freetype.c
+++ b/atari/plot/font_freetype.c
diff --git a/atari/plot/font_freetype.h b/atari/plot/font_freetype.h
index bca6d9956..bca6d9956 100644..100755
--- a/atari/plot/font_freetype.h
+++ b/atari/plot/font_freetype.h
diff --git a/atari/plot/font_vdi.c b/atari/plot/font_vdi.c
index 7d6a3f494..7d6a3f494 100644..100755
--- a/atari/plot/font_vdi.c
+++ b/atari/plot/font_vdi.c
diff --git a/atari/plot/font_vdi.h b/atari/plot/font_vdi.h
index e9f1894b4..e9f1894b4 100644..100755
--- a/atari/plot/font_vdi.h
+++ b/atari/plot/font_vdi.h
diff --git a/atari/plot/plotter.c b/atari/plot/plotter.c
index a54c15f6d..a54c15f6d 100644..100755
--- a/atari/plot/plotter.c
+++ b/atari/plot/plotter.c
diff --git a/atari/plot/plotter.h b/atari/plot/plotter.h
index 973b70058..973b70058 100644..100755
--- a/atari/plot/plotter.h
+++ b/atari/plot/plotter.h
diff --git a/atari/plot/plotter_vdi.c b/atari/plot/plotter_vdi.c
index 60153f64c..60153f64c 100644..100755
--- a/atari/plot/plotter_vdi.c
+++ b/atari/plot/plotter_vdi.c
diff --git a/atari/plot/plotter_vdi.h b/atari/plot/plotter_vdi.h
index 8c0a95c9c..8c0a95c9c 100644..100755
--- a/atari/plot/plotter_vdi.h
+++ b/atari/plot/plotter_vdi.h
diff --git a/atari/schedule.c b/atari/schedule.c
index e72e1bcbe..e72e1bcbe 100644..100755
--- a/atari/schedule.c
+++ b/atari/schedule.c
diff --git a/atari/schedule.h b/atari/schedule.h
index 0ca3f910a..0ca3f910a 100644..100755
--- a/atari/schedule.h
+++ b/atari/schedule.h
diff --git a/atari/search.c b/atari/search.c
new file mode 100644
index 000000000..6af6caf12
--- /dev/null
+++ b/atari/search.c
@@ -0,0 +1,257 @@
+#include <limits.h>

+#include <stdlib.h>

+#include <stdio.h>

+#include <unistd.h>

+#include <string.h>

+#include <stdbool.h>

+#include <assert.h>

+#include <windom.h>

+

+#include "desktop/gui.h"

+#include "desktop/browser.h"

+#include "desktop/search.h"

+#include "utils/log.h"

+#include "utils/messages.h"

+#include "atari/gui.h"

+#include "atari/misc.h"

+#include "atari/search.h"

+#include "atari/res/netsurf.rsh"

+

+extern void * h_gem_rsrc;

+

+

+static SEARCH_FORM_SESSION current;

+

+static void nsatari_search_set_status(bool found, void *p);

+static void nsatari_search_set_hourglass(bool active, void *p);

+static void nsatari_search_add_recent(const char *string, void *p);

+void nsatari_search_set_forward_state(bool active, void *p);

+void nsatari_search_set_back_state(bool active, void *p);

+

+static struct search_callbacks nsatari_search_callbacks = {

+	nsatari_search_set_forward_state,

+	nsatari_search_set_back_state,

+	nsatari_search_set_status,

+	nsatari_search_set_hourglass,

+	nsatari_search_add_recent

+};

+

+

+/**

+* Change the displayed search status.

+* \param found  search pattern matched in text

+* \param p the pointer sent to search_verify_new() / search_create_context()

+*/

+

+void nsatari_search_set_status(bool found, void *p)

+{

+	LOG(("%p set status: %d\n", p, found));

+}

+

+/**

+* display hourglass while searching

+* \param active start/stop indicator

+* \param p the pointer sent to search_verify_new() / search_create_context()

+*/

+

+void nsatari_search_set_hourglass(bool active, void *p)

+{

+	SEARCH_FORM_SESSION s = (SEARCH_FORM_SESSION)p;

+	if( active ) 

+		gui_window_set_pointer(s->bw->window, GUI_POINTER_PROGRESS);

+	else

+		gui_window_set_pointer(s->bw->window, GUI_POINTER_DEFAULT);

+}

+

+/**

+* add search string to recent searches list

+* front is at liberty how to implement the bare notification

+* should normally store a strdup() of the string;

+* core gives no guarantee of the integrity of the const char *

+* \param string search pattern

+* \param p the pointer sent to search_verify_new() / search_create_context()

+*/

+

+void nsatari_search_add_recent(const char *string, void *p)

+{

+	LOG(("%p add recent: %s\n", p, string));

+}

+

+/**

+* activate search forwards button in gui

+* \param active activate/inactivate

+* \param p the pointer sent to search_verify_new() / search_create_context()

+*/

+

+void nsatari_search_set_forward_state(bool active, void *p)

+{

+	SEARCH_FORM_SESSION s = (SEARCH_FORM_SESSION)p;

+	/* deactivate back cb */

+	LOG(("%p: set forward state: %d\n", p, active));

+}

+

+/**

+* activate search back button in gui

+* \param active activate/inactivate

+* \param p the pointer sent to search_verify_new() / search_create_context()

+*/

+

+void nsatari_search_set_back_state(bool active, void *p)

+{

+	SEARCH_FORM_SESSION s = (SEARCH_FORM_SESSION)p;

+	/* deactivate back cb */

+	LOG(("%p: set back state: %d\n", p, active));

+}

+

+

+static SEARCH_FORM_SESSION get_search_session(WINDOW * win)

+{

+	return (current);

+}

+

+static void destroy_search_session( SEARCH_FORM_SESSION s )

+{

+	free( s );

+}

+

+static int apply_form( WINDOW * win, struct s_search_form_state * s )

+{

+	OBJECT * obj = ObjcTree(OC_FORM, win );

+	if( obj == NULL ){

+		goto error;

+	}

+	s->flags = 0;

+	if( (obj[SEARCH_CB_FWD].ob_state & CROSSED) != 0 )

+		s->flags = SEARCH_FLAG_FORWARDS;

+	if( (obj[SEARCH_CB_CASESENSE].ob_state & CROSSED) != 0 )

+		s->flags |= SEARCH_FLAG_CASE_SENSITIVE;

+	if( (obj[SEARCH_CB_SHOWALL].ob_state & CROSSED) != 0 )

+		s->flags |= SEARCH_FLAG_SHOWALL;

+

+	char * cstr = ObjcString( obj, SEARCH_TB_SRCH, NULL );

+	if( cstr != NULL ) {

+		strncpy((char*)&s->text[0], cstr, 31 );

+	}

+	return ( 0 );

+

+error: 

+	s->flags = SEARCH_FLAG_FORWARDS;	

+	/* s->forward = true; */

+	strncpy((char*)&s->text[0], "", 31 );

+	return( 1 );

+}

+

+/* checks if search parameters changes */

+static bool form_changed( WINDOW * w )

+{

+	bool check;

+	struct s_search_form_state cur;

+	SEARCH_FORM_SESSION s = get_search_session(w);

+	OBJECT * obj = ObjcTree(OC_FORM,  w);

+	assert( s != NULL && obj != NULL );

+	uint32_t flags_old = s->state.flags;

+	apply_form(w, &cur);

+	

+	/* adjust the forward flag, it should not init an new search */

+	flags_old |= SEARCH_FLAG_FORWARDS;

+	cur.flags |= SEARCH_FLAG_FORWARDS;

+	if( cur.flags != flags_old ){

+		return( true );

+	}

+

+	char * cstr = ObjcString( obj, SEARCH_TB_SRCH, NULL );

+	if( cstr != NULL ){

+		if( strcmp(cstr, (char*)&s->state.text) != 0 ) {

+			return ( true );

+		}

+	}

+	

+	return( false );

+}

+

+

+static void __CDECL evnt_bt_srch_click( WINDOW *win, int index, int unused, void *unused2) {

+

+	ObjcChange( OC_FORM, win, index, ~SELECTED, TRUE);

+	bool fwd;

+	SEARCH_FORM_SESSION s = get_search_session(win);

+	OBJECT * obj = ObjcTree(OC_FORM, s->formwind );

+	search_flags_t flags = 0;

+

+		if( s->bw->search_context == NULL || form_changed(win) ){

+			if( s->bw->search_context != NULL ) {

+				search_destroy_context(s->bw->search_context);

+				s->bw->search_context = NULL;

+			}

+			apply_form( win, &s->state );

+		} else {

+			/* get search direction manually: */

+			if( (obj[SEARCH_CB_FWD].ob_state & CROSSED) != 0 )

+				s->state.flags |= SEARCH_FLAG_FORWARDS;

+			 else 

+				s->state.flags &= (~SEARCH_FLAG_FORWARDS);

+		}

+		if( search_verify_new(s->bw, &nsatari_search_callbacks, s) ){

+			search_step(s->bw->search_context, s->state.flags,  ObjcString( obj, SEARCH_TB_SRCH, NULL ) ); 

+		}

+

+}

+

+static void __CDECL evnt_cb_click( WINDOW *win, int index, int unused, void *unused2) {

+

+	short newstate;

+	OBJECT * obj = ObjcTree(OC_FORM, get_search_session(win)->formwind );

+	ObjcChange( OC_FORM, win, index, ~SELECTED, TRUE);

+	newstate = (obj[index].ob_state & CROSSED) ? ~CROSSED : CROSSED;

+	ObjcChange( OC_FORM, win, index, newstate , TRUE);

+}

+

+static void __CDECL evnt_close( WINDOW *win, short buff[8]) {

+	/* Free Search Contexts */

+	/* todo: destroy search context, if any */

+	destroy_search_session( get_search_session(win) );

+	current = NULL;

+	ApplWrite( _AESapid, WM_DESTROY, win->handle, 0,0,0,0); 	

+}

+

+SEARCH_FORM_SESSION open_browser_search( struct gui_window * gw )

+{

+	char * title;

+	SEARCH_FORM_SESSION sfs;

+	OBJECT * tree = get_tree(SEARCH);

+	if( tree == NULL ){

+		return( NULL );

+	} 

+	sfs = malloc(sizeof(struct s_search_form_session));

+	if( sfs == NULL )

+		return( NULL );

+	memset(sfs, 0, sizeof(struct s_search_form_session));

+	title = (char*)messages_get("FindTextNS");

+	if( title == NULL )

+		title = (char*)"Find text ...";

+

+	if( current != NULL ){

+		ApplWrite( _AESapid, WM_CLOSED, current->formwind->handle, 0,0,0,0);

+		/* Handle Close event */

+		EvntWindom( MU_MESAG );

+		/* Handle Destroy Event */

+		EvntWindom( MU_MESAG );

+	}

+	current = sfs;

+	sfs->bw = gw->browser->bw;

+	/* todo: check if we already have an form for this gw! */

+	sfs->formwind = mt_FormCreate( &app, tree, WAT_FORM,

+								NULL, title, 

+								NULL, true, false);

+

+	ObjcAttachFormFunc( sfs->formwind, SEARCH_BT_SEARCH, evnt_bt_srch_click, NULL);

+	ObjcAttachFormFunc( sfs->formwind, SEARCH_CB_CASESENSE, evnt_cb_click, NULL);

+	ObjcAttachFormFunc( sfs->formwind, SEARCH_CB_SHOWALL, evnt_cb_click, NULL);

+	ObjcAttachFormFunc( sfs->formwind, SEARCH_CB_FWD, evnt_cb_click, NULL);

+	EvntAdd( sfs->formwind, WM_CLOSED, evnt_close, EV_TOP);

+	apply_form(sfs->formwind, &sfs->state );

+	strncpy( ObjcString( tree, SEARCH_TB_SRCH, NULL ), "", SEARCH_MAX_SLEN);

+

+	return( current );

+	

+}
\ No newline at end of file
diff --git a/atari/search.h b/atari/search.h
new file mode 100644
index 000000000..f7e43dcb6
--- /dev/null
+++ b/atari/search.h
@@ -0,0 +1,23 @@
+#ifndef NS_ATARI_SEARCH_H

+#define NS_ATARI_SEARCH_H

+

+#define SEARCH_MAX_SLEN 24

+

+struct s_search_form_state

+{

+	char text[32];

+	uint32_t flags;

+};

+

+struct s_search_form_session {

+	struct browser_window * bw;

+	WINDOW * formwind;

+	struct s_search_form_state state;

+};

+

+

+typedef struct s_search_form_session * SEARCH_FORM_SESSION;

+

+SEARCH_FORM_SESSION open_browser_search(struct gui_window * gw);

+

+#endif
\ No newline at end of file
diff --git a/atari/slider.c b/atari/slider.c
index 37eead414..37eead414 100644..100755
--- a/atari/slider.c
+++ b/atari/slider.c
diff --git a/atari/slider.h b/atari/slider.h
index 54aff43c8..54aff43c8 100644..100755
--- a/atari/slider.h
+++ b/atari/slider.h
diff --git a/atari/statusbar.c b/atari/statusbar.c
index bd8e2e7ad..bd8e2e7ad 100644..100755
--- a/atari/statusbar.c
+++ b/atari/statusbar.c
diff --git a/atari/statusbar.h b/atari/statusbar.h
index 2c8df3dae..2c8df3dae 100644..100755
--- a/atari/statusbar.h
+++ b/atari/statusbar.h
diff --git a/atari/thumbnail.c b/atari/thumbnail.c
index d267271bf..d267271bf 100644..100755
--- a/atari/thumbnail.c
+++ b/atari/thumbnail.c
diff --git a/atari/toolbar.c b/atari/toolbar.c
index 5231f7da7..ca9100c65 100644..100755
--- a/atari/toolbar.c
+++ b/atari/toolbar.c
@@ -217,10 +217,10 @@ void __CDECL evnt_url_redraw( COMPONENT *c, long buff[8] )
 	vsf_perimeter( vdih, 0 );

 	vsf_interior( vdih , 1 );

 	vsf_color( vdih, LWHITE );

-	vst_arbpt( vdih, 10, &pxy[0], &pxy[1], &pxy[2], &pxy[3] );

+	vst_point( vdih, 10, &pxy[0], &pxy[1], &pxy[2], &pxy[3] );

 	vst_alignment(vdih, 0, 5, &d, &d );

 	vst_effects( vdih, 0 );

-

+	vst_color( vdih, BLACK );

 	/* gray the whole component: */

 

 	pxy[0] = work.g_x;

@@ -261,7 +261,6 @@ void __CDECL evnt_url_redraw( COMPONENT *c, long buff[8] )
 	else 

 		strcpy(  (char*)&textcpy, " " );

 	

-	vst_color( vdih, BLACK );

 	v_gtext( vdih, work.g_x + 3, work.g_y + ((TOOLBAR_HEIGHT - URLBOX_HEIGHT)/2) + 2, (char*)&textcpy );

 	

 	if( window_url_widget_has_focus( gw ) ) {

diff --git a/atari/toolbar.h b/atari/toolbar.h
index 32b93f5c5..32b93f5c5 100644..100755
--- a/atari/toolbar.h
+++ b/atari/toolbar.h
diff --git a/atari/treeview.c b/atari/treeview.c
index de2a9fcdc..de2a9fcdc 100644..100755
--- a/atari/treeview.c
+++ b/atari/treeview.c
diff --git a/atari/treeview.h b/atari/treeview.h
index c1d35fdf0..c1d35fdf0 100644..100755
--- a/atari/treeview.h
+++ b/atari/treeview.h
diff --git a/atari/verify_ssl.c b/atari/verify_ssl.c
index 1f56e46f9..1f56e46f9 100644..100755
--- a/atari/verify_ssl.c
+++ b/atari/verify_ssl.c
diff --git a/atari/verify_ssl.h b/atari/verify_ssl.h
index 97716ab88..97716ab88 100644..100755
--- a/atari/verify_ssl.h
+++ b/atari/verify_ssl.h