rowan/wmenu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Keep track of end of match list

Browse source
This commit is contained in:
adnano 2024-02-26 10:43:52 -05:00
parent 542c307ef2
commit 906b55019e
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
main.c
View file

@ -90,6 +90,7 @@ struct menu_state {
struct menu_item *items; struct menu_item *items;
struct menu_item *matches; struct menu_item *matches;
struct menu_item *matchend;
struct menu_item *selection; struct menu_item *selection;
struct menu_item *leftmost, *rightmost; struct menu_item *leftmost, *rightmost;
}; };
@ -726,14 +727,9 @@ void keypress(struct menu_state *state, enum wl_keyboard_key_state key_state,
state->cursor = len; state->cursor = len;
render_frame(state); render_frame(state);
} else { } else {
if (!state->selection || !state->selection->right) { state->selection = state->matchend;
return; state->rightmost = state->matchend;
}
while (state->selection && state->selection->right) {
state->selection = state->selection->right;
}
state->leftmost = NULL; state->leftmost = NULL;
state->rightmost = state->selection;
scroll_matches(state); scroll_matches(state);
render_frame(state); render_frame(state);
} }
@ -932,6 +928,7 @@ void match(struct menu_state *state) {
struct menu_item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend; struct menu_item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
state->matches = NULL; state->matches = NULL;
state->matchend = NULL;
state->leftmost = NULL; state->leftmost = NULL;
size_t len = strlen(state->text); size_t len = strlen(state->text);
state->matches = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL; state->matches = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
@ -962,11 +959,12 @@ void match(struct menu_state *state) {
if (itemend) { if (itemend) {
itemend->right = lsubstr; itemend->right = lsubstr;
lsubstr->left = itemend; lsubstr->left = itemend;
itemend = substrend;
} else { } else {
state->matches = lsubstr; state->matches = lsubstr;
} }
itemend = substrend;
} }
state->matchend = itemend;
state->selection = state->matches; state->selection = state->matches;
state->leftmost = state->matches; state->leftmost = state->matches;
state->rightmost = NULL; state->rightmost = NULL;