Commit b1c5f1c6 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

kconfig: Lindent scripts/lxdialog 



The lxdialog code was not easy to read. So as first step the code
was run through Lindent.
Fix-ups will come in next patchset.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent b286e392

scripts/lxdialog/checklist.c

+344 −312
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@ static int list_width, check_x, item_x, checkflag; 
 * Print list item

 */

static void

print_item (WINDOW * win, const char *item, int status,

	    int choice, int selected)

print_item(WINDOW * win, const char *item, int status, int choice, int selected)

{

	int i;
@@ -70,8 +69,7 @@ print_arrows (WINDOW * win, int choice, int item_no, int scroll, 
		wattrset(win, uarrow_attr);

		waddch(win, ACS_UARROW);

		waddstr(win, "(-)");

    }

    else {

	} else {

		wattrset(win, menubox_attr);

		waddch(win, ACS_HLINE);

		waddch(win, ACS_HLINE);
@@ -86,8 +84,7 @@ print_arrows (WINDOW * win, int choice, int item_no, int scroll, 
		wattrset(win, darrow_attr);

		waddch(win, ACS_DARROW);

		waddstr(win, "(+)");

    }

    else {

	} else {

		wattrset(win, menubox_border_attr);

		waddch(win, ACS_HLINE);

		waddch(win, ACS_HLINE);
@@ -99,8 +96,7 @@ print_arrows (WINDOW * win, int choice, int item_no, int scroll, 
/*

 *  Display the termination buttons

 */

static void

print_buttons( WINDOW *dialog, int height, int width, int selected)

static void print_buttons(WINDOW * dialog, int height, int width, int selected)

{

	int x = width / 2 - 11;

	int y = height - 2;
@@ -118,8 +114,8 @@ print_buttons( WINDOW *dialog, int height, int width, int selected) 
 */

int

dialog_checklist(const char *title, const char *prompt, int height, int width,

	int list_height, int item_no, const char * const * items, int flag)

	

		 int list_height, int item_no, const char *const *items,

		 int flag)

{

	int i, x, y, box_x, box_y;

	int key = 0, button = 0, choice = 0, scroll = 0, max_choice, *status;
@@ -138,7 +134,8 @@ dialog_checklist (const char *title, const char *prompt, int height, int width, 
	/* Initializes status */

	for (i = 0; i < item_no; i++) {

		status[i] = !strcasecmp(items[i * 3 + 2], "on");

	if ((!choice && status[i]) || !strcasecmp (items[i * 3 + 2], "selected"))

		if ((!choice && status[i])

		    || !strcasecmp(items[i * 3 + 2], "selected"))

			choice = i + 1;

	}

	if (choice)
@@ -186,7 +183,9 @@ dialog_checklist (const char *title, const char *prompt, int height, int width, 
	box_x = (width - list_width) / 2 - 1;



	/* create new window for the list */

    list = subwin (dialog, list_height, list_width, y+box_y+1, x+box_x+1);

	list =

	    subwin(dialog, list_height, list_width, y + box_y + 1,

		   x + box_x + 1);



	keypad(list, TRUE);
@@ -226,10 +225,10 @@ dialog_checklist (const char *title, const char *prompt, int height, int width, 
		key = wgetch(dialog);



		for (i = 0; i < max_choice; i++)

            if (toupper(key) == toupper(items[(scroll+i)*3+1][0]))

			if (toupper(key) ==

			    toupper(items[(scroll + i) * 3 + 1][0]))

				break;





		if (i < max_choice || key == KEY_UP || key == KEY_DOWN ||

		    key == '+' || key == '-') {

			if (key == KEY_UP || key == '-') {
@@ -239,8 +238,11 @@ dialog_checklist (const char *title, const char *prompt, int height, int width, 
					/* Scroll list down */

					if (list_height > 1) {

						/* De-highlight current first item */

			print_item (list, items[scroll * 3 + 1],

					status[scroll], 0, FALSE);

						print_item(list,

							   items[scroll * 3 +

								 1],

							   status[scroll], 0,

							   FALSE);

						scrollok(list, TRUE);

						wscrl(list, -1);

						scrollok(list, FALSE);
@@ -250,8 +252,10 @@ dialog_checklist (const char *title, const char *prompt, int height, int width, 
						   status[scroll], 0, TRUE);

					wnoutrefresh(list);



    		    print_arrows(dialog, choice, item_no, scroll,

				box_y, box_x + check_x + 5, list_height);

					print_arrows(dialog, choice, item_no,

						     scroll, box_y,

						     box_x + check_x + 5,

						     list_height);



					wrefresh(dialog);
@@ -265,21 +269,32 @@ dialog_checklist (const char *title, const char *prompt, int height, int width, 
					/* Scroll list up */

					if (list_height > 1) {

						/* De-highlight current last item before scrolling up */

			print_item (list, items[(scroll + max_choice - 1) * 3 + 1],

				    status[scroll + max_choice - 1],

				    max_choice - 1, FALSE);

						print_item(list,

							   items[(scroll +

								  max_choice -

								  1) * 3 + 1],

							   status[scroll +

								  max_choice -

								  1],

							   max_choice - 1,

							   FALSE);

						scrollok(list, TRUE);

						wscrl(list, 1);

						scrollok(list, FALSE);

					}

					scroll++;

		    print_item (list, items[(scroll + max_choice - 1) * 3 + 1],

				status[scroll + max_choice - 1],

				max_choice - 1, TRUE);

					print_item(list,

						   items[(scroll + max_choice -

							  1) * 3 + 1],

						   status[scroll + max_choice -

							  1], max_choice - 1,

						   TRUE);

					wnoutrefresh(list);



    		    print_arrows(dialog, choice, item_no, scroll,

				box_y, box_x + check_x + 5, list_height);

					print_arrows(dialog, choice, item_no,

						     scroll, box_y,

						     box_x + check_x + 5,

						     list_height);



					wrefresh(dialog);
@@ -289,12 +304,16 @@ dialog_checklist (const char *title, const char *prompt, int height, int width, 
			}

			if (i != choice) {

				/* De-highlight current item */

		print_item (list, items[(scroll + choice) * 3 + 1],

			    status[scroll + choice], choice, FALSE);

				print_item(list,

					   items[(scroll + choice) * 3 + 1],

					   status[scroll + choice], choice,

					   FALSE);

				/* Highlight new item */

				choice = i;

		print_item (list, items[(scroll + choice) * 3 + 1],

			    status[scroll + choice], choice, TRUE);

				print_item(list,

					   items[(scroll + choice) * 3 + 1],

					   status[scroll + choice], choice,

					   TRUE);

				wnoutrefresh(list);

				wrefresh(dialog);

			}
@@ -323,18 +342,28 @@ dialog_checklist (const char *title, const char *prompt, int height, int width, 
		case '\n':

			if (!button) {

				if (flag == FLAG_CHECK) {

		    status[scroll + choice] = !status[scroll + choice];

					status[scroll + choice] =

					    !status[scroll + choice];

					wmove(list, choice, check_x);

					wattrset(list, check_selected_attr);

		    wprintw (list, "[%c]", status[scroll + choice] ? 'X' : ' ');

					wprintw(list, "[%c]",

						status[scroll +

						       choice] ? 'X' : ' ');

				} else {

					if (!status[scroll + choice]) {

						for (i = 0; i < item_no; i++)

							status[i] = 0;

						status[scroll + choice] = 1;

						for (i = 0; i < max_choice; i++)

			    print_item (list, items[(scroll + i) * 3 + 1],

					status[scroll + i], i, i == choice);

							print_item(list,

								   items[(scroll

									  +

									  i) *

									 3 + 1],

								   status[scroll

									  + i],

								   i,

								   i == choice);

					}

				}

				wnoutrefresh(list);
@@ -343,15 +372,19 @@ dialog_checklist (const char *title, const char *prompt, int height, int width, 
				for (i = 0; i < item_no; i++) {

					if (status[i]) {

						if (flag == FLAG_CHECK) {

			    fprintf (stderr, "\"%s\" ", items[i * 3]);

							fprintf(stderr,

								"\"%s\" ",

								items[i * 3]);

						} else {

			    fprintf (stderr, "%s", items[i * 3]);

							fprintf(stderr, "%s",

								items[i * 3]);

						}



					}

				}

			} else

		fprintf (stderr, "%s", items[(scroll + choice) * 3]);

				fprintf(stderr, "%s",

					items[(scroll + choice) * 3]);

			delwin(dialog);

			free(status);

			return button;
@@ -366,7 +399,6 @@ dialog_checklist (const char *title, const char *prompt, int height, int width, 
		doupdate();

	}





	delwin(dialog);

	free(status);

	return -1;		/* ESC pressed */

scripts/lxdialog/colors.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 */





/*

 *   Default color definitions

 *

scripts/lxdialog/dialog.h

+28 −31
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ 
#define MIN(x,y) (x < y ? x : y)

#define MAX(x,y) (x > y ? x : y)





#ifndef ACS_ULCORNER

#define ACS_ULCORNER '+'

#endif
@@ -140,7 +139,6 @@ extern const char *backtitle; 
extern void create_rc(const char *filename);

extern int parse_rc(void);





void init_dialog(void);

void end_dialog(void);

void attr_clear(WINDOW * win, int height, int width, chtype attr);
@@ -178,7 +176,6 @@ int dialog_inputbox (const char *title, const char *prompt, int height, 
 */

#define M_EVENT (KEY_MAX+1)





/*

 * The `flag' parameter in checklist is used to select between

 * radiolist and checklist

scripts/lxdialog/inputbox.c

+212 −196
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ char dialog_input_result[MAX_LEN + 1]; 
/*

 *  Print the termination buttons

 */

static void

print_buttons(WINDOW *dialog, int height, int width, int selected)

static void print_buttons(WINDOW * dialog, int height, int width, int selected)

{

	int x = width / 2 - 11;

	int y = height - 2;
@@ -55,7 +54,6 @@ dialog_inputbox (const char *title, const char *prompt, int height, int width, 
	x = (COLS - width) / 2;

	y = (LINES - height) / 2;





	draw_shadow(stdscr, y, x, height, width);



	dialog = newwin(height, width, y, x);
@@ -138,17 +136,26 @@ dialog_inputbox (const char *title, const char *prompt, int height, int width, 
				if (input_x || scroll) {

					wattrset(dialog, inputbox_attr);

					if (!input_x) {

			scroll = scroll < box_width - 1 ?

			    0 : scroll - (box_width - 1);

						scroll =

						    scroll <

						    box_width - 1 ? 0 : scroll -

						    (box_width - 1);

						wmove(dialog, box_y, box_x);

						for (i = 0; i < box_width; i++)

			    waddch (dialog, instr[scroll + input_x + i] ?

				    instr[scroll + input_x + i] : ' ');

			input_x = strlen (instr) - scroll;

							waddch(dialog,

							       instr[scroll +

								     input_x +

								     i] ?

							       instr[scroll +

								     input_x +

								     i] : ' ');

						input_x =

						    strlen(instr) - scroll;

					} else

						input_x--;

					instr[scroll + input_x] = '\0';

		    mvwaddch (dialog, box_y, input_x + box_x, ' ');

					mvwaddch(dialog, box_y, input_x + box_x,

						 ' ');

					wmove(dialog, box_y, input_x + box_x);

					wrefresh(dialog);

				}
@@ -158,14 +165,23 @@ dialog_inputbox (const char *title, const char *prompt, int height, int width, 
					if (scroll + input_x < MAX_LEN) {

						wattrset(dialog, inputbox_attr);

						instr[scroll + input_x] = key;

			instr[scroll + input_x + 1] = '\0';

						instr[scroll + input_x + 1] =

						    '\0';

						if (input_x == box_width - 1) {

							scroll++;

			    wmove (dialog, box_y, box_x);

			    for (i = 0; i < box_width - 1; i++)

				waddch (dialog, instr[scroll + i]);

							wmove(dialog, box_y,

							      box_x);

							for (i = 0;

							     i < box_width - 1;

							     i++)

								waddch(dialog,

								       instr

								       [scroll +

									i]);

						} else {

			    wmove (dialog, box_y, input_x++ + box_x);

							wmove(dialog, box_y,

							      input_x++ +

							      box_x);

							waddch(dialog, key);

						}

						wrefresh(dialog);

scripts/lxdialog/lxdialog.c

+112 −126
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ struct Mode { 
jumperFn j_menu, j_checklist, j_radiolist, j_yesno, j_textbox, j_inputbox;

jumperFn j_msgbox, j_infobox;



static struct Mode modes[] =

{

static struct Mode modes[] = {

	{"--menu", 9, 0, 3, j_menu},

	{"--checklist", 9, 0, 3, j_checklist},

	{"--radiolist", 9, 0, 3, j_radiolist},
@@ -53,8 +52,7 @@ static struct Mode *modePtr; 
#include <locale.h>

#endif



int

main (int argc, const char * const * argv)

int main(int argc, const char *const *argv)

{

	int offset = 0, opt_clear = 0, end_common_opts = 0, retval;

	const char *title = NULL;
@@ -122,8 +120,6 @@ main (int argc, const char * const * argv) 
	if (modePtr->argmax && argc - offset > modePtr->argmax)

		Usage(argv[0]);







	init_dialog();

	retval = (*(modePtr->jumper)) (title, argc - offset, argv + offset);
@@ -139,8 +135,7 @@ main (int argc, const char * const * argv) 
/*

 * Print program usage

 */

static void

Usage (const char *name)

static void Usage(const char *name)

{

	fprintf(stderr, "\

\ndialog, by Savio Lam (lam836@cs.cuhk.hk).\
@@ -169,41 +164,35 @@ Usage (const char *name) 
 * These are the program jumpers

 */



int

j_menu (const char *t, int ac, const char * const * av)

int j_menu(const char *t, int ac, const char *const *av)

{

	return dialog_menu(t, av[2], atoi(av[3]), atoi(av[4]),

			   atoi(av[5]), av[6], (ac - 6) / 2, av + 7);

}



int

j_checklist (const char *t, int ac, const char * const * av)

int j_checklist(const char *t, int ac, const char *const *av)

{

	return dialog_checklist(t, av[2], atoi(av[3]), atoi(av[4]),

				atoi(av[5]), (ac - 6) / 3, av + 6, FLAG_CHECK);

}



int

j_radiolist (const char *t, int ac, const char * const * av)

int j_radiolist(const char *t, int ac, const char *const *av)

{

	return dialog_checklist(t, av[2], atoi(av[3]), atoi(av[4]),

				atoi(av[5]), (ac - 6) / 3, av + 6, FLAG_RADIO);

}



int

j_textbox (const char *t, int ac, const char * const * av)

int j_textbox(const char *t, int ac, const char *const *av)

{

	return dialog_textbox(t, av[2], atoi(av[3]), atoi(av[4]));

}



int

j_yesno (const char *t, int ac, const char * const * av)

int j_yesno(const char *t, int ac, const char *const *av)

{

	return dialog_yesno(t, av[2], atoi(av[3]), atoi(av[4]));

}



int

j_inputbox (const char *t, int ac, const char * const * av)

int j_inputbox(const char *t, int ac, const char *const *av)

{

	int ret = dialog_inputbox(t, av[2], atoi(av[3]), atoi(av[4]),

				  ac == 6 ? av[5] : (char *)NULL);
@@ -212,15 +201,12 @@ j_inputbox (const char *t, int ac, const char * const * av) 
	return ret;

}



int

j_msgbox (const char *t, int ac, const char * const * av)

int j_msgbox(const char *t, int ac, const char *const *av)

{

	return dialog_msgbox(t, av[2], atoi(av[3]), atoi(av[4]), 1);

}



int

j_infobox (const char *t, int ac, const char * const * av)

int j_infobox(const char *t, int ac, const char *const *av)

{

	return dialog_msgbox(t, av[2], atoi(av[3]), atoi(av[4]), 0);

}