Fix line endings.
This commit is contained in:
Michael Drake
parent
a7d44f9707
commit
b31f224f42
390
atari/search.c
390
atari/search.c
|
|
@ -1,58 +1,58 @@
|
|||
/*
|
||||
* Copyright 2013 Ole Loots <ole@monochrom.net>
|
||||
*
|
||||
* This file is part of NetSurf, http://www.netsurf-browser.org/
|
||||
*
|
||||
* NetSurf is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; version 2 of the License.
|
||||
*
|
||||
* NetSurf is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* Module Description:
|
||||
*
|
||||
*
|
||||
*
|
||||
*/
|
||||
/*
|
||||
* Copyright 2013 Ole Loots <ole@monochrom.net>
|
||||
*
|
||||
* This file is part of NetSurf, http://www.netsurf-browser.org/
|
||||
*
|
||||
* NetSurf is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; version 2 of the License.
|
||||
*
|
||||
* NetSurf is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* Module Description:
|
||||
*
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include <limits.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <stdbool.h>
|
||||
#include <assert.h>
|
||||
|
||||
#include "desktop/gui.h"
|
||||
#include "desktop/browser.h"
|
||||
#include "desktop/browser_private.h"
|
||||
#include "desktop/search.h"
|
||||
#include "utils/log.h"
|
||||
#include "utils/messages.h"
|
||||
#include <limits.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <stdbool.h>
|
||||
#include <assert.h>
|
||||
|
||||
#include "desktop/gui.h"
|
||||
#include "desktop/browser.h"
|
||||
#include "desktop/browser_private.h"
|
||||
#include "desktop/search.h"
|
||||
#include "utils/log.h"
|
||||
#include "utils/messages.h"
|
||||
#include "atari/gui.h"
|
||||
#include "atari/rootwin.h"
|
||||
#include "atari/misc.h"
|
||||
#include "atari/rootwin.h"
|
||||
#include "atari/misc.h"
|
||||
#include "atari/toolbar.h"
|
||||
#include "atari/search.h"
|
||||
#include "atari/gemtk/gemtk.h"
|
||||
#include "atari/res/netsurf.rsh"
|
||||
|
||||
extern struct gui_window * input_window;
|
||||
|
||||
|
||||
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);
|
||||
|
||||
#include "atari/gemtk/gemtk.h"
|
||||
#include "atari/res/netsurf.rsh"
|
||||
|
||||
extern struct gui_window * input_window;
|
||||
|
||||
|
||||
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 gui_search_table search_table = {
|
||||
nsatari_search_set_status,
|
||||
nsatari_search_set_hourglass,
|
||||
|
|
@ -63,65 +63,65 @@ static struct gui_search_table search_table = {
|
|||
|
||||
struct gui_search_table *atari_search_table = &search_table;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 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)
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
* 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));
|
||||
// TODO: maybe update GUI
|
||||
}
|
||||
|
||||
/**
|
||||
* 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;
|
||||
LOG(("active: %d, session: %p", active, 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)
|
||||
// TODO: maybe update GUI
|
||||
}
|
||||
|
||||
/**
|
||||
* 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;
|
||||
LOG(("active: %d, session: %p", active, 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)
|
||||
{
|
||||
struct gui_window *gw;
|
||||
OBJECT *toolbar;
|
||||
GRECT area;
|
||||
SEARCH_FORM_SESSION s = (SEARCH_FORM_SESSION)p;
|
||||
/* deactivate back cb */
|
||||
GRECT area;
|
||||
SEARCH_FORM_SESSION s = (SEARCH_FORM_SESSION)p;
|
||||
/* deactivate back cb */
|
||||
LOG(("%p: set forward state: %d\n", p, active));
|
||||
|
||||
|
||||
gw = s->bw->window;
|
||||
|
||||
toolbar = toolbar_get_form(gw->root->toolbar);
|
||||
|
|
@ -131,22 +131,22 @@ void nsatari_search_set_forward_state(bool active, void *p)
|
|||
toolbar[TOOLBAR_BT_SEARCH_FWD].ob_state |= OS_DISABLED;
|
||||
window_get_grect(gw->root, BROWSER_AREA_SEARCH, &area);
|
||||
window_schedule_redraw_grect(gw->root, &area);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 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)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 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)
|
||||
{
|
||||
struct gui_window *gw;
|
||||
OBJECT *toolbar;
|
||||
GRECT area;
|
||||
SEARCH_FORM_SESSION s = (SEARCH_FORM_SESSION)p;
|
||||
/* deactivate back cb */
|
||||
SEARCH_FORM_SESSION s = (SEARCH_FORM_SESSION)p;
|
||||
/* deactivate back cb */
|
||||
LOG(("%p: set back state: %d\n", p, active));
|
||||
|
||||
s->state.back_avail = active;
|
||||
|
|
@ -158,42 +158,42 @@ void nsatari_search_set_back_state(bool active, void *p)
|
|||
else
|
||||
toolbar[TOOLBAR_BT_SEARCH_BACK].ob_state |= OS_DISABLED;
|
||||
window_get_grect(gw->root, BROWSER_AREA_SEARCH, &area);
|
||||
window_schedule_redraw_grect(gw->root, &area);
|
||||
window_schedule_redraw_grect(gw->root, &area);
|
||||
}
|
||||
|
||||
|
||||
static int apply_form(OBJECT *obj, struct s_search_form_state *s)
|
||||
{
|
||||
|
||||
static int apply_form(OBJECT *obj, struct s_search_form_state *s)
|
||||
{
|
||||
char * cstr;
|
||||
|
||||
assert(s != NULL);
|
||||
|
||||
|
||||
s->flags = 0;
|
||||
|
||||
if( (obj[TOOLBAR_CB_CASESENSE].ob_state & OS_SELECTED) != 0 )
|
||||
s->flags |= SEARCH_FLAG_CASE_SENSITIVE;
|
||||
if( (obj[TOOLBAR_CB_SHOWALL].ob_state & OS_SELECTED) != 0 )
|
||||
s->flags |= SEARCH_FLAG_SHOWALL;
|
||||
|
||||
if( (obj[TOOLBAR_CB_CASESENSE].ob_state & OS_SELECTED) != 0 )
|
||||
s->flags |= SEARCH_FLAG_CASE_SENSITIVE;
|
||||
if( (obj[TOOLBAR_CB_SHOWALL].ob_state & OS_SELECTED) != 0 )
|
||||
s->flags |= SEARCH_FLAG_SHOWALL;
|
||||
|
||||
cstr = gemtk_obj_get_text(obj, TOOLBAR_TB_SRCH);
|
||||
snprintf(s->text, 32, "%s", cstr);
|
||||
return ( 0 );
|
||||
|
||||
}
|
||||
return ( 0 );
|
||||
|
||||
static void set_text(OBJECT *obj, short idx, char * text, int len)
|
||||
{
|
||||
char spare[255];
|
||||
|
||||
if( len > 254 )
|
||||
len = 254;
|
||||
if( text != NULL ){
|
||||
strncpy(spare, text, 254);
|
||||
} else {
|
||||
strcpy(spare, "");
|
||||
}
|
||||
|
||||
static void set_text(OBJECT *obj, short idx, char * text, int len)
|
||||
{
|
||||
char spare[255];
|
||||
|
||||
if( len > 254 )
|
||||
len = 254;
|
||||
if( text != NULL ){
|
||||
strncpy(spare, text, 254);
|
||||
} else {
|
||||
strcpy(spare, "");
|
||||
}
|
||||
|
||||
set_string(obj, idx, spare);
|
||||
|
||||
set_string(obj, idx, spare);
|
||||
}
|
||||
|
||||
void nsatari_search_restore_form( struct s_search_form_session *s, OBJECT *obj)
|
||||
|
|
@ -222,75 +222,75 @@ void nsatari_search_restore_form( struct s_search_form_session *s, OBJECT *obj)
|
|||
set_text(obj, TOOLBAR_TB_SRCH, s->state.text, t->te_txtlen);
|
||||
|
||||
}
|
||||
|
||||
void nsatari_search_session_destroy(struct s_search_form_session *s)
|
||||
{
|
||||
if (s != NULL) {
|
||||
|
||||
void nsatari_search_session_destroy(struct s_search_form_session *s)
|
||||
{
|
||||
if (s != NULL) {
|
||||
LOG((""));
|
||||
browser_window_search_clear(s->bw);
|
||||
free(s);
|
||||
}
|
||||
}
|
||||
|
||||
/** checks for search parameters changes */
|
||||
static bool search_session_compare(struct s_search_form_session *s, OBJECT *obj)
|
||||
{
|
||||
browser_window_search_clear(s->bw);
|
||||
free(s);
|
||||
}
|
||||
}
|
||||
|
||||
/** checks for search parameters changes */
|
||||
static bool search_session_compare(struct s_search_form_session *s, OBJECT *obj)
|
||||
{
|
||||
bool check;
|
||||
uint32_t flags_old;
|
||||
uint32_t flags_old;
|
||||
uint32_t flags_mask = SEARCH_FLAG_SHOWALL | SEARCH_FLAG_CASE_SENSITIVE;
|
||||
struct s_search_form_state cur;
|
||||
struct s_search_form_state cur;
|
||||
|
||||
assert(s != NULL && obj != NULL);
|
||||
|
||||
|
||||
flags_old = s->state.flags;
|
||||
|
||||
apply_form(obj, &cur);
|
||||
if ((cur.flags&flags_mask) != (flags_old&flags_mask)) {
|
||||
return( true );
|
||||
}
|
||||
|
||||
|
||||
apply_form(obj, &cur);
|
||||
if ((cur.flags&flags_mask) != (flags_old&flags_mask)) {
|
||||
return( true );
|
||||
}
|
||||
|
||||
char * cstr;
|
||||
cstr = gemtk_obj_get_text(obj, TOOLBAR_TB_SRCH);
|
||||
if (cstr != NULL){
|
||||
if (strcmp(cstr, (char*)&s->state.text) != 0) {
|
||||
return (true);
|
||||
}
|
||||
}
|
||||
|
||||
return( false );
|
||||
}
|
||||
|
||||
|
||||
cstr = gemtk_obj_get_text(obj, TOOLBAR_TB_SRCH);
|
||||
if (cstr != NULL){
|
||||
if (strcmp(cstr, (char*)&s->state.text) != 0) {
|
||||
return (true);
|
||||
}
|
||||
}
|
||||
|
||||
return( false );
|
||||
}
|
||||
|
||||
|
||||
void nsatari_search_perform(struct s_search_form_session *s, OBJECT *obj,
|
||||
search_flags_t f)
|
||||
{
|
||||
|
||||
bool fwd;
|
||||
search_flags_t f)
|
||||
{
|
||||
|
||||
bool fwd;
|
||||
search_flags_t flags = f;
|
||||
|
||||
assert(s!=null);
|
||||
assert(input_window->browser->bw == s->bw);
|
||||
|
||||
|
||||
|
||||
|
||||
if(search_session_compare(s, obj)){
|
||||
browser_window_search_clear(s->bw);
|
||||
apply_form(obj, &s->state);
|
||||
} else {
|
||||
|
||||
browser_window_search_clear(s->bw);
|
||||
apply_form(obj, &s->state);
|
||||
} else {
|
||||
|
||||
}
|
||||
|
||||
/* get search direction manually: */
|
||||
if ( (f&SEARCH_FLAG_FORWARDS) != 0 )
|
||||
s->state.flags |= SEARCH_FLAG_FORWARDS;
|
||||
else
|
||||
/* get search direction manually: */
|
||||
if ( (f&SEARCH_FLAG_FORWARDS) != 0 )
|
||||
s->state.flags |= SEARCH_FLAG_FORWARDS;
|
||||
else
|
||||
s->state.flags &= (~SEARCH_FLAG_FORWARDS);
|
||||
|
||||
browser_window_search(s->bw, s,
|
||||
s->state.flags,
|
||||
gemtk_obj_get_text(obj, TOOLBAR_TB_SRCH));
|
||||
|
||||
}
|
||||
|
||||
|
||||
browser_window_search(s->bw, s,
|
||||
s->state.flags,
|
||||
gemtk_obj_get_text(obj, TOOLBAR_TB_SRCH));
|
||||
|
||||
}
|
||||
|
||||
|
||||
struct s_search_form_session * nsatari_search_session_create(OBJECT * obj,
|
||||
struct browser_window *bw)
|
||||
|
|
|
|||
Loading…
Reference in New Issue