forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

menuconfig: Assign jump keys per-page instead of globally

Browse source 
At the moment, keys 1-9 are assigned to the first 9 search results. This patch
makes them assigned to the first 9 results per-page instead. We are much less
likely to run out of keys that way.

Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
Benjamin Poirier 2012-08-23 14:55:08 -04:00 • committed by Michal Marek
parent 1a374ae619
commit 95ac9b3b58
6 changed files with 148 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

73
scripts/kconfig/mconf.c
View file

@ -286,8 +286,9 @@ static void conf_choice(struct menu *menu);
static void conf_string(struct menu *menu);
static void conf_load(void);
static void conf_save(void);
static int show_textbox_ext(const char *title, const char *text, int r, int c,
int *keys, int *vscroll, int *hscroll);
static int show_textbox_ext(const char *title, char *text, int r, int c,
int *keys, int *vscroll, int *hscroll,
update_text_fn update_text, void *data);
static void show_textbox(const char *title, const char *text, int r, int c);
static void show_helptext(const char *title, const char *text);
static void show_help(struct menu *menu);
@ -310,6 +311,39 @@ static void set_config_filename(const char *config_filename)
}
struct search_data {
struct jk_head *head;
struct menu **targets;
int *keys;
};
static void update_text(char *buf, size_t start, size_t end, void *_data)
{
struct search_data *data = _data;
struct jump_key *pos;
int k = 0;
CIRCLEQ_FOREACH(pos, data->head, entries) {
if (pos->offset >= start && pos->offset < end) {
char header[4];
if (k < JUMP_NB) {
int key = '0' + (pos->index % JUMP_NB) + 1;
sprintf(header, "(%c)", key);
data->keys[k] = key;
data->targets[k] = pos->target;
k++;
} else {
sprintf(header, " ");
}
memcpy(buf + pos->offset, header, sizeof(header) - 1);
}
}
data->keys[k] = 0;
}
static void search_conf(void)
{
struct symbol **sym_arr;
@ -341,18 +375,24 @@ again:
sym_arr = sym_re_search(dialog_input);
do {
struct menu *jumps[JUMP_NB] = {0};
int keys[JUMP_NB + 1] = {0}, i;
struct jk_head head = CIRCLEQ_HEAD_INITIALIZER(head);
struct menu *targets[JUMP_NB];
int keys[JUMP_NB + 1], i;
struct search_data data = {
.head = &head,
.targets = targets,
.keys = keys,
};
res = get_relations_str(sym_arr, jumps);
for (i = 0; i < JUMP_NB && jumps[i]; i++)
keys[i] = '1' + i;
dres = show_textbox_ext(_("Search Results"), str_get(&res), 0,
0, keys, &vscroll, &hscroll);
res = get_relations_str(sym_arr, &head);
dres = show_textbox_ext(_("Search Results"), (char *)
str_get(&res), 0, 0, keys, &vscroll,
&hscroll, &update_text, (void *)
&data);
again = false;
for (i = 0; i < JUMP_NB && jumps[i]; i++)
for (i = 0; i < JUMP_NB && keys[i]; i++)
if (dres == keys[i]) {
conf(jumps[i]->parent, jumps[i]);
conf(targets[i]->parent, targets[i]);
again = true;
}
str_free(&res);
@ -642,16 +682,19 @@ static void conf(struct menu *menu, struct menu *active_menu)
}
}
static int show_textbox_ext(const char *title, const char *text, int r, int c,
int *keys, int *vscroll, int *hscroll)
static int show_textbox_ext(const char *title, char *text, int r, int c, int
*keys, int *vscroll, int *hscroll, update_text_fn
update_text, void *data)
{
dialog_clear();
return dialog_textbox(title, text, r, c, keys, vscroll, hscroll);
return dialog_textbox(title, text, r, c, keys, vscroll, hscroll,
update_text, data);
}
static void show_textbox(const char *title, const char *text, int r, int c)
{
show_textbox_ext(title, text, r, c, (int []) {0}, NULL, NULL);
show_textbox_ext(title, (char *) text, r, c, (int []) {0}, NULL, NULL,
NULL, NULL);
}
static void show_helptext(const char *title, const char *text)