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

kconfig: fixup after Lindent 



Readability are more important then the 80 coloumn limit, so fold
several lines to greatly improve readability.
Also keep return type on same line as function definition.

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

scripts/lxdialog/checklist.c

+30 −69
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ 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)

static void print_item(WINDOW * win, const char *item, int status, int choice,

		       int selected)

{

	int i;
@@ -59,8 +59,7 @@ print_item(WINDOW * win, const char *item, int status, int choice, int selected) 
/*

 * Print the scroll indicators.

 */

static void

print_arrows(WINDOW * win, int choice, int item_no, int scroll,

static void print_arrows(WINDOW * win, int choice, int item_no, int scroll,

	     int y, int x, int height)

{

	wmove(win, y, x);
@@ -112,10 +111,9 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected) 
 * Display a dialog box with a list of options that can be turned on or off

 * The `flag' parameter is used to select between radiolist and checklist.

 */

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 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 i, x, y, box_x, box_y;

	int key = 0, button = 0, choice = 0, scroll = 0, max_choice, *status;
@@ -183,8 +181,7 @@ 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,

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

	              x + box_x + 1);



	keypad(list, TRUE);
@@ -238,24 +235,18 @@ 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);

					}

					scroll--;

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

						   status[scroll], 0, TRUE);

					print_item(list, items[scroll * 3 + 1], status[scroll], 0, TRUE);

					wnoutrefresh(list);



					print_arrows(dialog, choice, item_no,

						     scroll, box_y,

						     box_x + check_x + 5,

						     list_height);

						     scroll, box_y, box_x + check_x + 5, list_height);



					wrefresh(dialog);
@@ -269,32 +260,20 @@ 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);

						     scroll, box_y, box_x + check_x + 5, list_height);



					wrefresh(dialog);
@@ -304,16 +283,12 @@ 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);

			}
@@ -342,28 +317,18 @@ 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);
@@ -372,19 +337,15 @@ 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;

scripts/lxdialog/dialog.h

+1 −2
Original line number Diff line number Diff line 


/*

 *  dialog.h -- common declarations for all dialog modules

 *

scripts/lxdialog/inputbox.c

+15 −34
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected) 
/*

 * Display a dialog box for inputing a string

 */

int

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

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

                    const char *init)

{

	int i, x, y, box_y, box_x, box_width;
@@ -90,8 +89,7 @@ dialog_inputbox(const char *title, const char *prompt, int height, int width, 
	getyx(dialog, y, x);

	box_y = y + 2;

	box_x = (width - box_width) / 2;

	draw_box(dialog, y + 1, box_x - 1, 3, box_width + 2,

		 border_attr, dialog_attr);

	draw_box(dialog, y + 1, box_x - 1, 3, box_width + 2, border_attr, dialog_attr);



	print_buttons(dialog, height, width, 0);
@@ -111,8 +109,9 @@ dialog_inputbox(const char *title, const char *prompt, int height, int width, 
		input_x = box_width - 1;

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

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

	} else

	} else {

		waddstr(dialog, instr);

	}



	wmove(dialog, box_y, box_x + input_x);
@@ -136,26 +135,17 @@ 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;

							       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);

				}
@@ -165,23 +155,14 @@ 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/menubox.c

+26 −57
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ static int menu_width, item_x; 
/*

 * Print menu item

 */

static void

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

static void print_item(WINDOW * win, const char *item, int choice,

		       int selected, int hotkey)

{

	int j;

	char menu_item[menu_width + 1];
@@ -100,8 +100,8 @@ print_item(WINDOW * win, const char *item, int choice, int selected, int hotkey) 
/*

 * Print the scroll indicators.

 */

static void

print_arrows(WINDOW * win, int item_no, int scroll, int y, int x, int height)

static void print_arrows(WINDOW * win, int item_no, int scroll, int y, int x,

			 int height)

{

	int cur_y, cur_x;
@@ -158,8 +158,7 @@ static void print_buttons(WINDOW * win, int height, int width, int selected) 
/*

 * Display a menu for choosing among a number of options

 */

int

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

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

                int menu_height, const char *current, int item_no,

                const char *const *items)

{
@@ -283,20 +282,14 @@ dialog_menu(const char *title, const char *prompt, int height, int width, 
			i = max_choice;

		else {

			for (i = choice + 1; i < max_choice; i++) {

				j = first_alpha(items[(scroll + i) * 2 + 1],

						"YyNnMmHh");

				if (key ==

				    tolower(items[(scroll + i) * 2 + 1][j]))

				j = first_alpha(items[(scroll + i) * 2 + 1], "YyNnMmHh");

				if (key == tolower(items[(scroll + i) * 2 + 1][j]))

					break;

			}

			if (i == max_choice)

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

					j = first_alpha(items

							[(scroll + i) * 2 + 1],

							"YyNnMmHh");

					if (key ==

					    tolower(items[(scroll + i) * 2 + 1]

						    [j]))

					j = first_alpha(items [(scroll + i) * 2 + 1], "YyNnMmHh");

					if (key == tolower(items[(scroll + i) * 2 + 1][j]))

						break;

				}

		}
@@ -319,24 +312,19 @@ dialog_menu(const char *title, const char *prompt, int height, int width, 


					scroll--;



					print_item(menu, items[scroll * 2 + 1],

						   0, FALSE,

						   (items[scroll * 2][0] !=

						    ':'));

					print_item(menu, items[scroll * 2 + 1], 0, FALSE,

						   (items[scroll * 2][0] != ':'));

				} else

					choice = MAX(choice - 1, 0);



			} else if (key == KEY_DOWN || key == '+') {



				print_item(menu,

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

					   choice, FALSE,

					   (items[(scroll + choice) * 2][0] !=

					    ':'));

					   items[(scroll + choice) * 2 + 1], choice, FALSE,

					   (items[(scroll + choice) * 2][0] != ':'));



				if ((choice > max_choice - 3) &&

				    (scroll + max_choice < item_no)

				    ) {

				    (scroll + max_choice < item_no)) {

					/* Scroll menu up */

					scrollok(menu, TRUE);

					wscrl(menu, 1);
@@ -344,16 +332,11 @@ dialog_menu(const char *title, const char *prompt, int height, int width, 


					scroll++;



					print_item(menu,

						   items[(scroll + max_choice -

							  1) * 2 + 1],

					print_item(menu, items[(scroll + max_choice - 1) * 2 + 1],

						   max_choice - 1, FALSE,

						   (items

						    [(scroll + max_choice -

						      1) * 2][0] != ':'));

						   (items [(scroll + max_choice - 1) * 2][0] != ':'));

				} else

					choice =

					    MIN(choice + 1, max_choice - 1);

					choice = MIN(choice + 1, max_choice - 1);



			} else if (key == KEY_PPAGE) {

				scrollok(menu, TRUE);
@@ -361,11 +344,8 @@ dialog_menu(const char *title, const char *prompt, int height, int width, 
					if (scroll > 0) {

						wscrl(menu, -1);

						scroll--;

						print_item(menu,

							   items[scroll * 2 +

								 1], 0, FALSE,

							   (items[scroll * 2][0]

							    != ':'));

						print_item(menu, items[scroll * 2 + 1], 0, FALSE,

							   (items[scroll * 2][0] != ':'));

					} else {

						if (choice > 0)

							choice--;
@@ -380,17 +360,9 @@ dialog_menu(const char *title, const char *prompt, int height, int width, 
						wscrl(menu, 1);

						scrollok(menu, FALSE);

						scroll++;

						print_item(menu,

							   items[(scroll +

								  max_choice -

								  1) * 2 + 1],

							   max_choice - 1,

							   FALSE,

							   (items

							    [(scroll +

							      max_choice -

							      1) * 2][0] !=

							    ':'));

						print_item(menu, items[(scroll + max_choice - 1) * 2 + 1],

							   max_choice - 1, FALSE,

							   (items [(scroll + max_choice - 1) * 2][0] != ':'));

					} else {

						if (choice + 1 < max_choice)

							choice++;
@@ -401,8 +373,7 @@ dialog_menu(const char *title, const char *prompt, int height, int width, 
				choice = i;



			print_item(menu, items[(scroll + choice) * 2 + 1],

				   choice, TRUE,

				   (items[(scroll + choice) * 2][0] != ':'));

				   choice, TRUE, (items[(scroll + choice) * 2][0] != ':'));



			print_arrows(dialog, item_no, scroll,

				     box_y, box_x + item_x + 1, menu_height);
@@ -460,9 +431,7 @@ dialog_menu(const char *title, const char *prompt, int height, int width, 
				fprintf(stderr, "%s \"%s\"\n",

					items[(scroll + choice) * 2],

					items[(scroll + choice) * 2 + 1] +

					first_alpha(items

						    [(scroll + choice) * 2 + 1],

						    ""));

					first_alpha(items [(scroll + choice) * 2 + 1], ""));

			else

				fprintf(stderr, "%s\n",

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

scripts/lxdialog/msgbox.c

+2 −3
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ 
 * Display a message box. Program will pause and display an "OK" button

 * if the parameter 'pause' is non-zero.

 */

int

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

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

                  int pause)

{

	int i, x, y, key = 0;