mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-09 21:12:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #1917: again search in viewer

Browse Source 
Added new confirm box for repeat search from begining of file

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
This commit is contained in:
Slava Zanko 2010-02-15 12:05:31 +02:00
parent 0a91123913
commit 9e2768be46
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/viewer/search.c
View File

@ -206,6 +206,7 @@ mcview_do_search (mcview_t * view)
{ {
off_t search_start, growbufsize; off_t search_start, growbufsize;
gboolean isFound = FALSE; gboolean isFound = FALSE;
gboolean need_search_again = TRUE;
Dlg_head *d = NULL; Dlg_head *d = NULL;
@ -247,17 +248,34 @@ mcview_do_search (mcview_t * view)
break; break;
search_start = growbufsize - view->search->original_len; search_start = growbufsize - view->search->original_len;
if (search_start < 0 ) if ( search_start <= 0 ) {
search_start = 0; search_start = 0;
break;
}
continue; continue;
} }
mcview_search_show_result(view, &d, match_len); mcview_search_show_result(view, &d, match_len);
need_search_again = FALSE;
isFound = TRUE; isFound = TRUE;
break; break;
} while (mcview_may_still_grow (view)); } while (mcview_may_still_grow (view));
if (!isFound && need_search_again && !view->search_backwards) {
int result;
mcview_update (view);
result =
query_dialog (_("Search done"), _("Continue from begining?"), D_NORMAL, 2, _("&Yes"), _("&No"));
if (result != 0) {
isFound=TRUE;
} else {
search_start = 0;
}
}
if (!isFound && view->search->error_str != NULL && mcview_find (view, search_start, &match_len)) { if (!isFound && view->search->error_str != NULL && mcview_find (view, search_start, &match_len)) {
mcview_search_show_result(view, &d, match_len); mcview_search_show_result(view, &d, match_len);
isFound = TRUE; isFound = TRUE;