Remove support for lxdialog --checklist The checklist lxdialog functionality is not used by menuconfig (only the radiolist variant is used) and supporting it would significantly complicate the forthcoming liblxdialog API.
Showing the changes to scripts (3 of 3 files). Show all
Unified · Split
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | |
| 24 | 24 | #include "dialog.h" |
| 25 | 25 | |
| 26 | −static int list_width, check_x, item_x, checkflag; | |
| 26 | +static int list_width, check_x, item_x; | |
| 27 | 27 | |
| 28 | 28 | /* |
| 29 | 29 | * Print list item |
| @@ -41,10 +41,7 @@ static void print_item(WINDOW * win, const char *item, int status, int choice, · 11 unmodified lines | ||
| 41 | 41 | |
| 42 | 42 | wmove(win, choice, check_x); |
| 43 | 43 | wattrset(win, selected ? check_selected_attr : check_attr); |
| 44 | − if (checkflag == FLAG_CHECK) | |
| 45 | − wprintw(win, "[%c]", status ? 'X' : ' '); | |
| 46 | − else | |
| 47 | − wprintw(win, "(%c)", status ? 'X' : ' '); | |
| 44 | + wprintw(win, "(%c)", status ? 'X' : ' '); | |
| 48 | 45 | |
| 49 | 46 | wattrset(win, selected ? tag_selected_attr : tag_attr); |
| 50 | 47 | mvwaddch(win, choice, item_x, item[0]); |
| @@ -109,18 +106,16 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected) · 58 unmodified lines | ||
| 109 | 106 | |
| 110 | 107 | /* |
| 111 | 108 | * Display a dialog box with a list of options that can be turned on or off |
| 112 | − * The `flag' parameter is used to select between radiolist and checklist. | |
| 109 | + * in the style of radiolist (only one option turned on at a time). | |
| 113 | 110 | */ |
| 114 | 111 | int dialog_checklist(const char *title, const char *prompt, int height, |
| 115 | 112 | int width, int list_height, int item_no, |
| 116 | − const char *const *items, int flag) | |
| 113 | + const char *const *items) | |
| 117 | 114 | { |
| 118 | 115 | int i, x, y, box_x, box_y; |
| 119 | 116 | int key = 0, button = 0, choice = 0, scroll = 0, max_choice, *status; |
| 120 | 117 | WINDOW *dialog, *list; |
| 121 | 118 | |
| 122 | − checkflag = flag; | |
| 123 | − | |
| 124 | 119 | /* Allocate space for storing item on/off status */ |
| 125 | 120 | if ((status = malloc(sizeof(int) * item_no)) == NULL) { |
| 126 | 121 | endwin(); |
| @@ -303,34 +298,20 @@ int dialog_checklist(const char *title, const char *prompt, int height, · 176 unmodified lines | ||
| 303 | 298 | case ' ': |
| 304 | 299 | case '\n': |
| 305 | 300 | if (!button) { |
| 306 | − if (flag == FLAG_CHECK) { | |
| 307 | − status[scroll + choice] = !status[scroll + choice]; | |
| 308 | − wmove(list, choice, check_x); | |
| 309 | − wattrset(list, check_selected_attr); | |
| 310 | − wprintw(list, "[%c]", status[scroll + choice] ? 'X' : ' '); | |
| 311 | − } else { | |
| 312 | − if (!status[scroll + choice]) { | |
| 313 | − for (i = 0; i < item_no; i++) | |
| 314 | − status[i] = 0; | |
| 315 | − status[scroll + choice] = 1; | |
| 316 | − for (i = 0; i < max_choice; i++) | |
| 317 | − print_item(list, items[(scroll + i) * 3 + 1], | |
| 318 | − status[scroll + i], i, i == choice); | |
| 319 | − } | |
| 301 | + if (!status[scroll + choice]) { | |
| 302 | + for (i = 0; i < item_no; i++) | |
| 303 | + status[i] = 0; | |
| 304 | + status[scroll + choice] = 1; | |
| 305 | + for (i = 0; i < max_choice; i++) | |
| 306 | + print_item(list, items[(scroll + i) * 3 + 1], | |
| 307 | + status[scroll + i], i, i == choice); | |
| 320 | 308 | } |
| 321 | 309 | wnoutrefresh(list); |
| 322 | 310 | wrefresh(dialog); |
| 323 | 311 | |
| 324 | − for (i = 0; i < item_no; i++) { | |
| 325 | − if (status[i]) { | |
| 326 | − if (flag == FLAG_CHECK) { | |
| 327 | − fprintf(stderr, "\"%s\" ", items[i * 3]); | |
| 328 | − } else { | |
| 329 | − fprintf(stderr, "%s", items[i * 3]); | |
| 330 | − } | |
| 331 | − | |
| 332 | − } | |
| 333 | − } | |
| 312 | + for (i = 0; i < item_no; i++) | |
| 313 | + if (status[i]) | |
| 314 | + fprintf(stderr, "%s", items[i * 3]); | |
| 334 | 315 | } else |
| 335 | 316 | fprintf(stderr, "%s", items[(scroll + choice) * 3]); |
| 336 | 317 | delwin(dialog); |
| @@ -160,7 +160,7 @@ int dialog_menu(const char *title, const char *prompt, int height, int width, · 159 unmodified lines | ||
| 160 | 160 | const char *const *items); |
| 161 | 161 | int dialog_checklist(const char *title, const char *prompt, int height, |
| 162 | 162 | int width, int list_height, int item_no, |
| 163 | − const char *const *items, int flag); | |
| 163 | + const char *const *items); | |
| 164 | 164 | extern char dialog_input_result[]; |
| 165 | 165 | int dialog_inputbox(const char *title, const char *prompt, int height, |
| 166 | 166 | int width, const char *init); |
| @@ -175,10 +175,3 @@ int dialog_inputbox(const char *title, const char *prompt, int height, · 8 unmodified lines | ||
| 175 | 175 | * -- uppercase chars are used to invoke the button (M_EVENT + 'O') |
| 176 | 176 | */ |
| 177 | 177 | #define M_EVENT (KEY_MAX+1) |
| 178 | − | |
| 179 | −/* | |
| 180 | − * The `flag' parameter in checklist is used to select between | |
| 181 | − * radiolist and checklist | |
| 182 | − */ | |
| 183 | −#define FLAG_CHECK 1 | |
| 184 | −#define FLAG_RADIO 0 | |
| @@ -31,12 +31,11 @@ struct Mode { · 30 unmodified lines | ||
| 31 | 31 | jumperFn *jumper; |
| 32 | 32 | }; |
| 33 | 33 | |
| 34 | −jumperFn j_menu, j_checklist, j_radiolist, j_yesno, j_textbox, j_inputbox; | |
| 34 | +jumperFn j_menu, j_radiolist, j_yesno, j_textbox, j_inputbox; | |
| 35 | 35 | jumperFn j_msgbox, j_infobox; |
| 36 | 36 | |
| 37 | 37 | static struct Mode modes[] = { |
| 38 | 38 | {"--menu", 9, 0, 3, j_menu}, |
| 39 | − {"--checklist", 9, 0, 3, j_checklist}, | |
| 40 | 39 | {"--radiolist", 9, 0, 3, j_radiolist}, |
| 41 | 40 | {"--yesno", 5, 5, 1, j_yesno}, |
| 42 | 41 | {"--textbox", 5, 5, 1, j_textbox}, |
| @@ -151,7 +150,6 @@ static void Usage(const char *name) · 108 unmodified lines | ||
| 151 | 150 | \nBox options:\ |
| 152 | 151 | \n\ |
| 153 | 152 | \n --menu <text> <height> <width> <menu height> <tag1> <item1>...\ |
| 154 | −\n --checklist <text> <height> <width> <list height> <tag1> <item1> <status1>...\ | |
| 155 | 153 | \n --radiolist <text> <height> <width> <list height> <tag1> <item1> <status1>...\ |
| 156 | 154 | \n --textbox <file> <height> <width>\ |
| 157 | 155 | \n --inputbox <text> <height> <width> [<init>]\ |
| @@ -170,16 +168,10 @@ int j_menu(const char *t, int ac, const char *const *av) · 12 unmodified lines | ||
| 170 | 168 | atoi(av[5]), av[6], (ac - 6) / 2, av + 7); |
| 171 | 169 | } |
| 172 | 170 | |
| 173 | −int j_checklist(const char *t, int ac, const char *const *av) | |
| 174 | −{ | |
| 175 | − return dialog_checklist(t, av[2], atoi(av[3]), atoi(av[4]), | |
| 176 | − atoi(av[5]), (ac - 6) / 3, av + 6, FLAG_CHECK); | |
| 177 | −} | |
| 178 | − | |
| 179 | 171 | int j_radiolist(const char *t, int ac, const char *const *av) |
| 180 | 172 | { |
| 181 | 173 | return dialog_checklist(t, av[2], atoi(av[3]), atoi(av[4]), |
| 182 | − atoi(av[5]), (ac - 6) / 3, av + 6, FLAG_RADIO); | |
| 174 | + atoi(av[5]), (ac - 6) / 3, av + 6); | |
| 183 | 175 | } |
| 184 | 176 | |
| 185 | 177 | int j_textbox(const char *t, int ac, const char *const *av) |