aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

Wraparound search

Browse Source
This commit is contained in:
Witold Filipczyk 2018-04-15 16:45:23 +02:00
parent 798a7cc4e6
commit ad5f8165b2
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/viewer/text/search.c
View File

@ -1330,11 +1330,20 @@ move_search_number(struct session *ses, struct document_view *doc_view, int numb
{ {
struct point *pt; struct point *pt;
int x, y; int x, y;
enum find_error ret = FIND_ERROR_NONE;
if (number < 0) if (number < 0) {
return FIND_ERROR_HIT_TOP; ret = FIND_ERROR_HIT_TOP;
if (number >= doc_view->document->number_of_search_points)
return FIND_ERROR_HIT_BOTTOM; if (!get_opt_bool("document.browse.search.wraparound", NULL)) return ret;
number = doc_view->document->number_of_search_points - 1;
}
else if (number >= doc_view->document->number_of_search_points) {
ret = FIND_ERROR_HIT_BOTTOM;
if (!get_opt_bool("document.browse.search.wraparound", NULL)) return ret;
number = 0;
}
doc_view->vs->current_search_number = number; doc_view->vs->current_search_number = number;
pt = doc_view->document->search_points; pt = doc_view->document->search_points;
@ -1344,7 +1353,7 @@ move_search_number(struct session *ses, struct document_view *doc_view, int numb
horizontal_scroll_extended(ses, doc_view, x - doc_view->vs->x, 0); horizontal_scroll_extended(ses, doc_view, x - doc_view->vs->x, 0);
vertical_scroll(ses, doc_view, y - doc_view->vs->y); vertical_scroll(ses, doc_view, y - doc_view->vs->y);
return FIND_ERROR_NONE; return ret;
} }
enum frame_event_status enum frame_event_status