aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-02-02 15:09:23 -05:00
Code

do_typeahead: restructure.

Browse Source 
Reduce indentation, eliminate a goto, and make the code a little clearer
(IMO).
This commit is contained in:
Miciah Dashiel Butler Masters 2008-12-27 07:43:12 +00:00
parent d17a632417
commit 0ced0c9851
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1320,36 +1320,14 @@ do_typeahead(struct session *ses, struct document_view *doc_view,
case ACT_EDIT_UP:
direction = -1;
i--;
if (i >= 0) break;
if (!get_opt_bool("document.browse.search.wraparound", NULL)) {
search_hit_boundary:
if (match_link_text(&document->links[current],
text, strlen(text),
get_opt_bool("document"
".browse"
".search"
".case",
NULL))
>= 0) {
return TYPEAHEAD_ERROR_NO_FURTHER;
}
return TYPEAHEAD_ERROR;
}
i = doc_view->document->nlinks - 1;
break;
case ACT_EDIT_NEXT_ITEM:
case ACT_EDIT_DOWN:
direction = 1;
i++;
if (i < doc_view->document->nlinks) break;
if (!get_opt_bool("document.browse.search.wraparound",
NULL))
goto search_hit_boundary;
i = 0;
break;
case ACT_EDIT_ENTER:
@ -1360,6 +1338,22 @@ search_hit_boundary:
direction = 1;
}
if (i < 0 || i >= doc_view->document->nlinks) {
if (!get_opt_bool("document.browse.search.wraparound", NULL)) {
if (match_link_text(&document->links[current],
text, strlen(text),
get_opt_bool("document.browse"
".search.case", NULL))
>= 0) {
return TYPEAHEAD_ERROR_NO_FURTHER;
}
return TYPEAHEAD_ERROR;
}
i = direction > 0 ? 0 : doc_view->document->nlinks - 1;
}
match = search_link_text(document, current, i, text, direction, offset);
if (match == current && i != current)