Added context menu,

Allow to set bitmap for iconified window. ( altough it's usesless right now because favicon support has been dropped) 

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

1 files changed, 16 insertions, 16 deletions

diff --git a/atari/search.c b/atari/search.c
index 2f36f5cf6..2717652a6 100644
--- a/atari/search.c
+++ b/atari/search.c
@@ -60,7 +60,7 @@ void nsatari_search_set_hourglass(bool active, void *p)
 {

 	SEARCH_FORM_SESSION s = (SEARCH_FORM_SESSION)p;

 	LOG((""));

-	if( active && current != NULL ) 

+	if( active && current != NULL )

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

 	else

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

@@ -140,8 +140,8 @@ static int apply_form( WINDOW * win, struct s_search_form_state * s )
 	}

 	return ( 0 );

 

-error: 

-	s->flags = SEARCH_FLAG_FORWARDS;	

+error:

+	s->flags = SEARCH_FLAG_FORWARDS;

 	/* s->forward = true; */

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

 	return( 1 );

@@ -159,7 +159,7 @@ static bool form_changed( WINDOW * 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;

@@ -173,12 +173,12 @@ static bool form_changed( WINDOW * w )
 			return ( true );

 		}

 	}

-	

+

 	return( false );

 }

 

 

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

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

 {

 

 	bool fwd;

@@ -186,7 +186,7 @@ static void __CDECL evnt_bt_srch_click( WINDOW *win, int index, int unused, void
 	OBJECT * obj = ObjcTree(OC_FORM, s->formwind );

 	search_flags_t flags = 0;

 

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

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

 	if( form_changed(win) ){

 		browser_window_search_destroy_context(s->bw);

 		apply_form( win, &s->state );

@@ -194,32 +194,32 @@ static void __CDECL evnt_bt_srch_click( WINDOW *win, int index, int unused, void
 		/* get search direction manually: */

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

 			s->state.flags |= SEARCH_FLAG_FORWARDS;

-		 else 

+		 else

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

 	}

 	if( browser_window_search_verify_new(s->bw, &nsatari_search_callbacks, s) ){

-		browser_window_search_step(s->bw, s->state.flags,  ObjcString( obj, SEARCH_TB_SRCH, NULL ) ); 

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

 	}

 

 }

 

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

+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 );

 }

 

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

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

 {

 	/* Free Search Contexts */

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

 	SEARCH_FORM_SESSION s = get_search_session(win);

-	if( s != NULL ){ 

+	if( s != NULL ){

 		destroy_search_session( s );

 	}

 	current = NULL;

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

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

 }

 

 void search_destroy( struct gui_window * gw )

@@ -242,7 +242,7 @@ SEARCH_FORM_SESSION open_browser_search( struct gui_window * gw )
 	OBJECT * tree = get_tree(SEARCH);

 	if( tree == NULL ){

 		return( NULL );

-	} 

+	}

 	sfs = calloc(1, sizeof(struct s_search_form_session));

 	if( sfs == NULL )

 		return( NULL );

@@ -254,7 +254,7 @@ SEARCH_FORM_SESSION open_browser_search( struct gui_window * gw )
 	current = sfs;

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

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

-								NULL, title, 

+								NULL, title,

 								NULL, true, false);

 

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

@@ -266,5 +266,5 @@ SEARCH_FORM_SESSION open_browser_search( struct gui_window * gw )
 	strncpy( ObjcString( tree, SEARCH_TB_SRCH, NULL ), "", SEARCH_MAX_SLEN);

 

 	return( current );

-	

+

 }