mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-20 08:44:33 +00:00
Fix improperly re-entrant code which caused the menu spammage we've
been seeing since 2.2.1. Pointed-in-the-right-direction by: phk
This commit is contained in:
Jordan K. Hubbard
parent
7a0e9135d7
commit
d1b7206119
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=30333
|
|
@ -25,14 +25,10 @@
|
|||
#include "dialog.priv.h"
|
||||
|
||||
|
||||
static void print_item(WINDOW *win, unsigned char *tag, unsigned char *item, int status, int choice, int selected,
|
||||
dialogMenuItem *me);
|
||||
static void print_item(WINDOW *win, unsigned char *tag, unsigned char *item, int status, int choice, int selected, dialogMenuItem *me, int list_width, int item_x, int check_x);
|
||||
|
||||
#define DREF(di, item) ((di) ? &((di)[(item)]) : NULL)
|
||||
|
||||
static int list_width, check_x, item_x;
|
||||
|
||||
|
||||
/*
|
||||
* Display a dialog box with a list of options that can be turned on or off
|
||||
*/
|
||||
|
|
@ -48,7 +44,8 @@ dialog_checklist(unsigned char *title, unsigned char *prompt, int height, int wi
|
|||
WINDOW *dialog, *list;
|
||||
unsigned char **items = NULL;
|
||||
dialogMenuItem *ditems;
|
||||
|
||||
int list_width, check_x, item_x;
|
||||
|
||||
/* Allocate space for storing item on/off status */
|
||||
if ((status = alloca(sizeof(int) * abs(cnt))) == NULL) {
|
||||
endwin();
|
||||
|
|
@ -172,7 +169,7 @@ dialog_checklist(unsigned char *title, unsigned char *prompt, int height, int wi
|
|||
|
||||
/* Print the list */
|
||||
for (i = 0; i < max_choice; i++)
|
||||
print_item(list, items[i * 3], items[i * 3 + 1], status[i], i, i == choice, DREF(ditems, i));
|
||||
print_item(list, items[i * 3], items[i * 3 + 1], status[i], i, i == choice, DREF(ditems, i), list_width, item_x, check_x);
|
||||
wnoutrefresh(list);
|
||||
print_arrows(dialog, scroll, list_height, item_no, box_x, box_y, check_x + 4, cur_x, cur_y);
|
||||
|
||||
|
|
@ -271,14 +268,14 @@ dialog_checklist(unsigned char *title, unsigned char *prompt, int height, int wi
|
|||
if (list_height > 1) {
|
||||
/* De-highlight current first item before scrolling down */
|
||||
print_item(list, items[scroll * 3], items[scroll * 3 + 1], status[scroll], 0,
|
||||
FALSE, DREF(ditems, scroll));
|
||||
FALSE, DREF(ditems, scroll), list_width, item_x, check_x);
|
||||
scrollok(list, TRUE);
|
||||
wscrl(list, -1);
|
||||
scrollok(list, FALSE);
|
||||
}
|
||||
scroll--;
|
||||
print_item(list, items[scroll*3], items[scroll*3 + 1], status[scroll], 0,
|
||||
TRUE, DREF(ditems, scroll));
|
||||
TRUE, DREF(ditems, scroll), list_width, item_x, check_x);
|
||||
wnoutrefresh(list);
|
||||
print_arrows(dialog, scroll, list_height, item_no, box_x, box_y, check_x + 4, cur_x, cur_y);
|
||||
wrefresh(dialog);
|
||||
|
|
@ -298,7 +295,7 @@ dialog_checklist(unsigned char *title, unsigned char *prompt, int height, int wi
|
|||
print_item(list, items[(scroll + max_choice - 1) * 3],
|
||||
items[(scroll + max_choice - 1) * 3 + 1],
|
||||
status[scroll + max_choice - 1], max_choice - 1,
|
||||
FALSE, DREF(ditems, scroll + max_choice - 1));
|
||||
FALSE, DREF(ditems, scroll + max_choice - 1), list_width, item_x, check_x);
|
||||
scrollok(list, TRUE);
|
||||
scroll(list);
|
||||
scrollok(list, FALSE);
|
||||
|
|
@ -307,7 +304,7 @@ dialog_checklist(unsigned char *title, unsigned char *prompt, int height, int wi
|
|||
print_item(list, items[(scroll + max_choice - 1) * 3],
|
||||
items[(scroll + max_choice - 1) * 3 + 1],
|
||||
status[scroll + max_choice - 1], max_choice - 1, TRUE,
|
||||
DREF(ditems, scroll + max_choice - 1));
|
||||
DREF(ditems, scroll + max_choice - 1), list_width, item_x, check_x);
|
||||
wnoutrefresh(list);
|
||||
print_arrows(dialog, scroll, list_height, item_no, box_x, box_y, check_x + 4, cur_x, cur_y);
|
||||
wrefresh(dialog);
|
||||
|
|
@ -338,7 +335,7 @@ dialog_checklist(unsigned char *title, unsigned char *prompt, int height, int wi
|
|||
status[i] = ditems[i].checked ? ditems[i].checked(&ditems[i]) : FALSE;
|
||||
for (i = 0; i < max_choice; i++) {
|
||||
print_item(list, items[(scroll + i) * 3], items[(scroll + i) * 3 + 1],
|
||||
status[scroll + i], i, i == choice, DREF(ditems, scroll + i));
|
||||
status[scroll + i], i, i == choice, DREF(ditems, scroll + i), list_width, item_x, check_x);
|
||||
}
|
||||
wnoutrefresh(list);
|
||||
print_arrows(dialog, scroll, list_height, item_no, box_x, box_y, check_x + 4,
|
||||
|
|
@ -386,12 +383,11 @@ dialog_checklist(unsigned char *title, unsigned char *prompt, int height, int wi
|
|||
/* De-highlight current item */
|
||||
getyx(dialog, cur_y, cur_x); /* Save cursor position */
|
||||
print_item(list, items[(scroll + choice) * 3], items[(scroll + choice) * 3 + 1],
|
||||
status[scroll + choice], choice, FALSE, DREF(ditems, scroll + choice));
|
||||
status[scroll + choice], choice, FALSE, DREF(ditems, scroll + choice), list_width, item_x, check_x);
|
||||
|
||||
/* Highlight new item */
|
||||
choice = i;
|
||||
print_item(list, items[(scroll + choice) * 3], items[(scroll + choice) * 3 + 1],
|
||||
status[scroll + choice], choice, TRUE, DREF(ditems, scroll + choice));
|
||||
print_item(list, items[(scroll + choice) * 3], items[(scroll + choice) * 3 + 1], status[scroll + choice], choice, TRUE, DREF(ditems, scroll + choice), list_width, item_x, check_x);
|
||||
wnoutrefresh(list);
|
||||
wmove(dialog, cur_y, cur_x); /* Restore cursor to previous position */
|
||||
wrefresh(dialog);
|
||||
|
|
@ -499,7 +495,7 @@ dialog_checklist(unsigned char *title, unsigned char *prompt, int height, int wi
|
|||
wclear(list);
|
||||
for (i = 0; i < max_choice; i++)
|
||||
print_item(list, items[(scroll + i) * 3], items[(scroll + i) * 3 + 1], status[scroll + i],
|
||||
i, i == choice, DREF(ditems, scroll + i));
|
||||
i, i == choice, DREF(ditems, scroll + i), list_width, item_x, check_x);
|
||||
wnoutrefresh(list);
|
||||
print_arrows(dialog, scroll, list_height, item_no, box_x, box_y, check_x + 4, cur_x, cur_y);
|
||||
wrefresh(dialog);
|
||||
|
|
@ -516,8 +512,7 @@ dialog_checklist(unsigned char *title, unsigned char *prompt, int height, int wi
|
|||
* Print list item
|
||||
*/
|
||||
static void
|
||||
print_item(WINDOW *win, unsigned char *tag, unsigned char *item, int status, int choice, int selected,
|
||||
dialogMenuItem *me)
|
||||
print_item(WINDOW *win, unsigned char *tag, unsigned char *item, int status, int choice, int selected, dialogMenuItem *me, int list_width, int item_x, int check_x)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
|
|||
|
|
@ -25,19 +25,15 @@
|
|||
#include "dialog.priv.h"
|
||||
#include <ncurses.h>
|
||||
|
||||
static void print_item(WINDOW *win, unsigned char *tag, unsigned char *item, int choice, int selected,
|
||||
dialogMenuItem *me);
|
||||
static void print_item(WINDOW *win, unsigned char *tag, unsigned char *item, int choice, int selected, dialogMenuItem *me, int menu_width, int tag_x, int item_x);
|
||||
|
||||
#define DREF(di, item) ((di) ? &((di)[(item)]) : NULL)
|
||||
|
||||
static int menu_width, tag_x, item_x;
|
||||
|
||||
/*
|
||||
* Display a menu for choosing among a number of options
|
||||
*/
|
||||
int
|
||||
dialog_menu(unsigned char *title, unsigned char *prompt, int height, int width, int menu_height,
|
||||
int cnt, void *it, unsigned char *result, int *ch, int *sc)
|
||||
dialog_menu(unsigned char *title, unsigned char *prompt, int height, int width, int menu_height, int cnt, void *it, unsigned char *result, int *ch, int *sc)
|
||||
{
|
||||
int i, j, x, y, cur_x, cur_y, box_x, box_y, key = 0, button, choice,
|
||||
l, k, scroll, max_choice, item_no, redraw_menu = FALSE;
|
||||
|
|
@ -46,6 +42,7 @@ dialog_menu(unsigned char *title, unsigned char *prompt, int height, int width,
|
|||
WINDOW *dialog, *menu;
|
||||
unsigned char **items = NULL;
|
||||
dialogMenuItem *ditems;
|
||||
int menu_width, tag_x, item_x;
|
||||
|
||||
draw:
|
||||
choice = ch ? *ch : 0;
|
||||
|
|
@ -161,8 +158,7 @@ dialog_menu(unsigned char *title, unsigned char *prompt, int height, int width,
|
|||
|
||||
/* Print the menu */
|
||||
for (i = 0; i < max_choice; i++)
|
||||
print_item(menu, items[(scroll + i) * 2], items[(scroll + i) * 2 + 1], i,
|
||||
i == choice, DREF(ditems, scroll + i));
|
||||
print_item(menu, items[(scroll + i) * 2], items[(scroll + i) * 2 + 1], i, i == choice, DREF(ditems, scroll + i), menu_width, tag_x, item_x);
|
||||
wnoutrefresh(menu);
|
||||
print_arrows(dialog, scroll, menu_height, item_no, box_x, box_y, tag_x, cur_x, cur_y);
|
||||
|
||||
|
|
@ -247,13 +243,13 @@ dialog_menu(unsigned char *title, unsigned char *prompt, int height, int width,
|
|||
getyx(dialog, cur_y, cur_x); /* Save cursor position */
|
||||
if (menu_height > 1) {
|
||||
/* De-highlight current first item before scrolling down */
|
||||
print_item(menu, items[scroll * 2], items[scroll * 2 + 1], 0, FALSE, DREF(ditems, scroll));
|
||||
print_item(menu, items[scroll * 2], items[scroll * 2 + 1], 0, FALSE, DREF(ditems, scroll), menu_width, tag_x, item_x);
|
||||
scrollok(menu, TRUE);
|
||||
wscrl(menu, -1);
|
||||
scrollok(menu, FALSE);
|
||||
}
|
||||
scroll--;
|
||||
print_item(menu, items[scroll * 2], items[scroll * 2 + 1], 0, TRUE, DREF(ditems, scroll));
|
||||
print_item(menu, items[scroll * 2], items[scroll * 2 + 1], 0, TRUE, DREF(ditems, scroll), menu_width, tag_x, item_x);
|
||||
wnoutrefresh(menu);
|
||||
print_arrows(dialog, scroll, menu_height, item_no, box_x, box_y, tag_x, cur_x, cur_y);
|
||||
wrefresh(dialog);
|
||||
|
|
@ -272,7 +268,7 @@ dialog_menu(unsigned char *title, unsigned char *prompt, int height, int width,
|
|||
/* De-highlight current last item before scrolling up */
|
||||
print_item(menu, items[(scroll + max_choice - 1) * 2],
|
||||
items[(scroll + max_choice - 1) * 2 + 1],
|
||||
max_choice-1, FALSE, DREF(ditems, scroll + max_choice - 1));
|
||||
max_choice-1, FALSE, DREF(ditems, scroll + max_choice - 1), menu_width, tag_x, item_x);
|
||||
scrollok(menu, TRUE);
|
||||
scroll(menu);
|
||||
scrollok(menu, FALSE);
|
||||
|
|
@ -280,7 +276,7 @@ dialog_menu(unsigned char *title, unsigned char *prompt, int height, int width,
|
|||
scroll++;
|
||||
print_item(menu, items[(scroll + max_choice - 1) * 2],
|
||||
items[(scroll + max_choice - 1) * 2 + 1],
|
||||
max_choice - 1, TRUE, DREF(ditems, scroll + max_choice - 1));
|
||||
max_choice - 1, TRUE, DREF(ditems, scroll + max_choice - 1), menu_width, tag_x, item_x);
|
||||
wnoutrefresh(menu);
|
||||
print_arrows(dialog, scroll, menu_height, item_no, box_x, box_y, tag_x, cur_x, cur_y);
|
||||
wrefresh(dialog);
|
||||
|
|
@ -293,13 +289,11 @@ dialog_menu(unsigned char *title, unsigned char *prompt, int height, int width,
|
|||
if (i != choice) {
|
||||
/* De-highlight current item */
|
||||
getyx(dialog, cur_y, cur_x); /* Save cursor position */
|
||||
print_item(menu, items[(scroll + choice) * 2], items[(scroll + choice) * 2 + 1], choice, FALSE,
|
||||
DREF(ditems, scroll + choice));
|
||||
print_item(menu, items[(scroll + choice) * 2], items[(scroll + choice) * 2 + 1], choice, FALSE, DREF(ditems, scroll + choice), menu_width, tag_x, item_x);
|
||||
|
||||
/* Highlight new item */
|
||||
choice = i;
|
||||
print_item(menu, items[(scroll + choice) * 2], items[(scroll + choice) * 2 + 1], choice, TRUE,
|
||||
DREF(ditems, scroll + choice));
|
||||
print_item(menu, items[(scroll + choice) * 2], items[(scroll + choice) * 2 + 1], choice, TRUE, DREF(ditems, scroll + choice), menu_width, tag_x, item_x);
|
||||
wnoutrefresh(menu);
|
||||
wmove(dialog, cur_y, cur_x); /* Restore cursor to previous position */
|
||||
wrefresh(dialog);
|
||||
|
|
@ -418,8 +412,7 @@ dialog_menu(unsigned char *title, unsigned char *prompt, int height, int width,
|
|||
|
||||
if (redraw_menu) {
|
||||
for (i = 0; i < max_choice; i++) {
|
||||
print_item(menu, items[(scroll + i) * 2], items[(scroll + i) * 2 + 1], i, i == choice,
|
||||
DREF(ditems, scroll + i));
|
||||
print_item(menu, items[(scroll + i) * 2], items[(scroll + i) * 2 + 1], i, i == choice, DREF(ditems, scroll + i), menu_width, tag_x, item_x);
|
||||
}
|
||||
wnoutrefresh(menu);
|
||||
getyx(dialog, cur_y, cur_x); /* Save cursor position */
|
||||
|
|
@ -439,7 +432,7 @@ dialog_menu(unsigned char *title, unsigned char *prompt, int height, int width,
|
|||
* Print menu item
|
||||
*/
|
||||
static void
|
||||
print_item(WINDOW *win, unsigned char *tag, unsigned char *item, int choice, int selected, dialogMenuItem *me)
|
||||
print_item(WINDOW *win, unsigned char *tag, unsigned char *item, int choice, int selected, dialogMenuItem *me, int menu_width, int tag_x, int item_x)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue