aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-01-03 14:57:44 -05:00
Code

BFU: Fix searching in menus past unselectable items.

Browse Source 
The bug was that menu_search_handler gave scroll_menu an incorrect
count because it didn't know that scroll_menu skips unselectable
items.
This commit is contained in:
Kalle Olavi Niemitalo 2006-05-21 18:12:34 +03:00 committed by Kalle Olavi Niemitalo
parent 756e08b90e
commit 9fa5ae374f
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/bfu/menu.c
View File

@ -61,6 +61,7 @@ static int m_submenu_len = sizeof(m_submenu) - 1;
static window_handler_T menu_handler; static window_handler_T menu_handler;
static window_handler_T mainmenu_handler; static window_handler_T mainmenu_handler;
static void display_mainmenu(struct terminal *term, struct menu *menu); static void display_mainmenu(struct terminal *term, struct menu *menu);
static void set_menu_selection(struct menu *menu, int pos);
static inline int static inline int
@ -266,7 +267,7 @@ count_menu_size(struct terminal *term, struct menu *menu)
static void static void
scroll_menu(struct menu *menu, int steps, int wrap) scroll_menu(struct menu *menu, int steps, int wrap)
{ {
int height, scr_i, pos, start; int pos, start;
int s = steps ? steps/abs(steps) : 1; /* Selectable item search direction. */ int s = steps ? steps/abs(steps) : 1; /* Selectable item search direction. */
if (menu->size <= 0) { if (menu->size <= 0) {
@ -314,6 +315,20 @@ no_item:
select_item: select_item:
if (!mi_is_selectable(&menu->items[pos])) if (!mi_is_selectable(&menu->items[pos]))
goto no_item; goto no_item;
set_menu_selection(menu, pos);
}
/* Set menu->selected = pos, and adjust menu->first if needed.
* This neither redraws the menu nor runs the item's action.
* The caller must ensure that menu->items[pos] is selectable. */
static void
set_menu_selection(struct menu *menu, int pos)
{
int height, scr_i;
assert(pos >= 0 && pos < menu->size);
assert(mi_is_selectable(&menu->items[pos]));
if_assert_failed return;
menu->selected = pos; menu->selected = pos;
@ -654,7 +669,8 @@ search_menu_item(struct menu_item *item, unsigned char *buffer,
{ {
unsigned char *text, *match; unsigned char *text, *match;
if (!mi_has_left_text(item)) return 0; /* set_menu_selection asserts selectability. */
if (!mi_has_left_text(item) || !mi_is_selectable(item)) return 0;
text = mi_text_translate(item) ? _(item->text, term) : item->text; text = mi_text_translate(item) ? _(item->text, term) : item->text;
@ -716,7 +732,7 @@ menu_search_handler(struct input_line *line, int action_id)
struct menu_item *item = &menu->items[pos]; struct menu_item *item = &menu->items[pos];
if (search_menu_item(item, buffer, term)) { if (search_menu_item(item, buffer, term)) {
scroll_menu(menu, pos - menu->selected, 0); set_menu_selection(menu, pos);
display_menu(term, menu); display_menu(term, menu);
return INPUT_LINE_PROCEED; return INPUT_LINE_PROCEED;
} }